-
Notifications
You must be signed in to change notification settings - Fork 44
feat: Psychic system overhaul P1 #424
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
143 commits
Select commit
Hold shift + click to select a range
7eda7a0
Start perils rework
EttyKitty d65a23b
Format scr_powers
EttyKitty c040286
Huge rework/refactor to powers and tomes
EttyKitty 6356047
Powers properly work now
EttyKitty 1dde5ce
Fix tome discipline names
EttyKitty 93908f9
Adjusting perils and fixing broken stuff
EttyKitty 3162810
Pass the whole world through a formatter
EttyKitty 07ad2ee
Remove debug lines and sane var declaration
EttyKitty 6324fbb
Move the casting timer under the librarian check and optimize stuff
EttyKitty 90422a1
Mixin for perils and irandom instead of random+floor
EttyKitty a30c814
Attempts to bring sanity to the casting code
EttyKitty 147384f
Format
EttyKitty 8fcd846
Moar stuff
EttyKitty 8737f9e
Proper comment out
EttyKitty 6ae778a
TODO
EttyKitty 13cc79c
New script name for the doc
EttyKitty 3622039
Another bunch of fixes and changes
EttyKitty 7911f9b
Fix P > P0 typo
EttyKitty 9bf59be
A couple of sanity checks
EttyKitty 7eee501
Artifact tags fixing
EttyKitty ad4a3f2
Tome logic fix
EttyKitty d6d83ba
Starting to port powers into a struct (WIP pass)
EttyKitty 630b254
Finish transferring powers to a struct, bad format for flavor
EttyKitty a42ce62
Bot attempts to fix the perils crash
EttyKitty 0a6a0a4
Small cleanup, TODO and globals
EttyKitty f7f16f9
New format for flavour_text and power_modifiers
EttyKitty bb5f7c8
I'm amazed, but this disgusting first try function works
EttyKitty 29319a2
Moar shit but it just works
EttyKitty 3d995be
Another todo
EttyKitty 62185a2
JSON for the JSON god
EttyKitty 5bea9e3
Autoformat JSON
EttyKitty f29724b
rune Magick > rune magic, gather_energy > Kamehameha
EttyKitty 4a3f978
Flavor text format fix
EttyKitty 90f301e
Unify random rolls function
EttyKitty 2bc2355
Remove duplicate tome_roll declaration
EttyKitty e466b96
Format
EttyKitty c9735f9
Refactor small functions
EttyKitty 6881d0c
Add letters to the main discipline struct
EttyKitty 0631e4a
Another rune magic fix
EttyKitty 43b2042
Another typo fix
EttyKitty ae04010
More function refactoring
EttyKitty 74df406
Macros TODO
EttyKitty 53da331
Descriptive var names
EttyKitty 833df08
More function refactoring
EttyKitty 2c64ed5
Apply various bot suggestions
EttyKitty db64c54
Variable names
EttyKitty 27ecac4
Unnecessary variables
EttyKitty 01aca09
We're Briish
EttyKitty f4ddf03
More variable naming
EttyKitty 4c6528b
More variable names and todo
EttyKitty d74c6fa
More purgatory
EttyKitty ccc6372
TODO
EttyKitty bc88884
Suggestions
EttyKitty 1393339
Fix typos
EttyKitty 43d77cb
Helper function for battle log and a bunch of typo fixes
EttyKitty 7bab113
Consistent naming
EttyKitty 20b2400
Some improvements
EttyKitty e08166a
Fixes
EttyKitty da1b764
Slight sanity edits to battle logging
EttyKitty 4c2339b
Moar fixes and removing old code
EttyKitty f3320a0
More comments
EttyKitty 610484f
Moar readability
EttyKitty d8556ff
Even moar readability
EttyKitty 5ea3eeb
Minor things
EttyKitty 46b32d8
A couple of diabolical functions
EttyKitty 8322709
God help me, I no longer understand what I'm doing
EttyKitty 847c721
I don't think anyone is reading, so let the galaxy burn
EttyKitty ec4bc1a
Typo fix
EttyKitty af99bba
Simplify the targeting logic
EttyKitty 8988293
Tweak the flavor script a bit
EttyKitty 98b6cb9
Update scr_player_combat_weapon_stacks.gml
EttyKitty 8999000
Kamehameha never worked and now it's gone
EttyKitty 2a41203
Improve the battlelog message priority a bit and fix a bug
EttyKitty 5259bbd
Moar
EttyKitty 409acc4
fix: Mistakes in the `check_dead_marines` func and individual flavour…
EttyKitty 23f1280
feat: Target type to enemy shooting flavour text
EttyKitty f26a158
Increase battle log message count from 8 to 24
EttyKitty 666105c
Item specials property test
EttyKitty 8db8b15
Fix the new property
EttyKitty d402458
More edits and constants
EttyKitty 1a71c4e
Run perils after the cast
EttyKitty 3e59e3b
Even moar
EttyKitty 3d893d6
One day this will end
EttyKitty 1a9e63d
I think I'm a psyker too at this point
EttyKitty a00d922
Proper fancy dice roll function
EttyKitty 1a6f90f
Remove commented out functions
EttyKitty 547ffd7
Psychic data retrieval methods error handling augmentation
EttyKitty d508336
= to ==
EttyKitty 9d5ac7d
More fixes and refactors
EttyKitty 529e520
Target search refactor
EttyKitty 56ca65a
Todo reorder
EttyKitty de34d41
Remove shit luck from perils, and Warp Touched distribution
EttyKitty fff8778
Better documentation for the dice function
EttyKitty e41ebc2
Fix perils str check, CM will not die, format
EttyKitty c119e6c
Use priority to control perils color
EttyKitty 44c520e
Adjust some dice related stuff
EttyKitty 5ac4104
Perils adjustments
EttyKitty 1c8557f
Remove the unused duration and move heretical to disciplines
EttyKitty 872ca76
Use the valid target function for buffs
EttyKitty 8aefce7
Ensure proper formatting
EttyKitty a15b564
Use the compression method made by the bot
EttyKitty 4618f0a
Fixes and robustness
EttyKitty 9459b14
Perils stuff
EttyKitty bb16ac1
Battlelog adjustments
EttyKitty 6bb1243
Perils adjustments
EttyKitty e1d0326
Weird error handling
EttyKitty 93cab4f
Adjust perils for daemon binders more
EttyKitty c2f02df
Daemon Binders > Warp Tainted
EttyKitty df0cfee
Warp Touched > Favoured By The Warp
EttyKitty 7c274a3
Psyker Abundance > Warp Touched
EttyKitty 09dd997
Description adjustments
EttyKitty 2c6fa44
More description updates
EttyKitty 5d0d74a
Zealous Faith to Psyker Intolerant
EttyKitty d2c9ee0
Power prefix vs letter
EttyKitty 4f70261
I declare war on buffs and tomes
EttyKitty 1adaf7a
More shit
EttyKitty 13eb13a
Rename
EttyKitty 6923b12
Update scripts/scr_powers/scr_powers.gml
EttyKitty df318c7
ref: Conditions checking
EttyKitty 1e2aea7
ref: Different error handling
EttyKitty 9b27cb9
ref: Extract to functions
EttyKitty cee96e4
style: Reorder functions
EttyKitty 8bd887c
fix: Typo fix
EttyKitty 2268d28
feat: Very basic and probably bad power priorities
EttyKitty 34e1fcb
feat: Lexicanums are poor
EttyKitty bf10129
feat: Force weapon bonus damage formula
EttyKitty 2d8c71e
Tooltip fix and adjustments
EttyKitty f8021d0
Take out the trash
EttyKitty 5866e83
Proper rolls and equipment
EttyKitty 8dd15f7
Age adjustments that I couldn't contain to only librarians
EttyKitty c93f0e9
Psychic powers are back to chapter masters
EttyKitty b0c9250
All ap powers target vehicles
EttyKitty 578c920
Fix max kills?
EttyKitty 8e95da0
Adjust the anti-vehicle power flipping
EttyKitty 3d2b78e
Typo fix
EttyKitty d5c396b
Some sanity renamings
EttyKitty 3b01695
Support for infinite max kills
EttyKitty cdab900
Rename "default" discipline to "librarius"
EttyKitty bb9ac58
Fix typo
EttyKitty 564ce81
Typo fix
EttyKitty a39dea7
Adjust message priority a little
EttyKitty eeb6d6c
Desc and return in else
EttyKitty 2773bbd
Slaneesh typo
EttyKitty File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,203 @@ | ||
| { | ||
| "example": { | ||
| "name": "", | ||
| "prefix": "", | ||
| "description": "", | ||
| "powers": [], | ||
| "perils_chance": 0, | ||
| "perils_strength": 0, | ||
| "sourcery": false, | ||
| "tags": [] | ||
| }, | ||
| "minor_nu": { | ||
| "name": "Minor Not Nurgle", | ||
| "prefix": "MFAL", | ||
| "powers": [ | ||
| "wave_of_entropy", | ||
| "insect_swarm", | ||
| "blood_dementia" | ||
| ], | ||
| "perils_chance": 0.10, | ||
| "perils_strength": 10, | ||
| "sourcery": true, | ||
| "tags": ["PRE", "FALL"] | ||
| }, | ||
| "minor_nu_daemon": { | ||
| "name": "Minor Nurgle", | ||
| "prefix": "MNUR", | ||
| "powers": [ | ||
| "wave_of_entropy", | ||
| "insect_swarm", | ||
| "blood_dementia", | ||
| "putrid_vomit" | ||
| ], | ||
| "perils_chance": 0.30, | ||
| "perils_strength": 30, | ||
| "sourcery": true, | ||
| "tags": ["NURGLE"] | ||
| }, | ||
| "minor_tz_daemon": { | ||
| "name": "Minor Tzeentch", | ||
| "prefix": "MTZE", | ||
| "powers": [ | ||
| "wave_of_change", | ||
| "warp_bolts", | ||
| "warp_beam", | ||
| "iron_arm" | ||
| ], | ||
| "perils_chance": 0.30, | ||
| "perils_strength": 30, | ||
| "sourcery": true, | ||
| "tags": ["MIN", "TZEENTCH"] | ||
| }, | ||
| "minor_sl_daemon": { | ||
| "name": "Minor Slaanesh", | ||
| "prefix": "MSLA", | ||
| "powers": [ | ||
| "warp_bolts", | ||
| "rainbow_beam", | ||
| "hysterical_frenzy", | ||
| "symphony_of_pain" | ||
| ], | ||
| "perils_chance": 0.30, | ||
| "perils_strength": 30, | ||
| "sourcery": true, | ||
| "tags": ["SLAANESH"] | ||
| }, | ||
| "minor_default": { | ||
| "name": "Minor Librarius", | ||
| "prefix": "MLIB", | ||
| "powers": [ | ||
| "avenge", | ||
| "spatial_distortion", | ||
| "stormbringer" | ||
| ], | ||
| "perils_chance": 0, | ||
| "perils_strength": 0, | ||
| "tags": ["GLOW", "GOLD", "ADAMANTINE"] | ||
| }, | ||
| "minor_telekinesis": { | ||
| "name": "Minor Telekinesis", | ||
| "prefix": "MTEL", | ||
| "powers": [ | ||
| "spatial_distortion", | ||
| "telekinetic_dome", | ||
| "vortex_of_doom" | ||
| ], | ||
| "perils_chance": 0, | ||
| "perils_strength": 0, | ||
| "tags": ["CRU"] | ||
| }, | ||
| "minor_biomancy": { | ||
| "name": "Minor Biomancy", | ||
| "prefix": "MBIO", | ||
| "powers": [ | ||
| "haemorrhage", | ||
| "regenerate", | ||
| "iron_arm", | ||
| "insect_swarm" | ||
| ], | ||
| "perils_chance": 0.10, | ||
| "perils_strength": 10, | ||
| "tags": ["THI"] | ||
| }, | ||
| "minor_pyromancy": { | ||
| "name": "Minor Pyromancy", | ||
| "prefix": "MPYR", | ||
| "powers": [ | ||
| "inferno", | ||
| "sun_burst", | ||
| "molten_beam" | ||
| ], | ||
| "perils_chance": 0, | ||
| "perils_strength": 0, | ||
| "tags": ["SAL", "BUR"] | ||
| }, | ||
| "minor_what_the_fuck_man": { | ||
| "name": "Occultism", | ||
| "prefix": "OCC", | ||
| "powers": [ | ||
| "blood_dementia", | ||
| "spatial_distortion", | ||
| "haemorrhage" | ||
| ], | ||
| "perils_chance": 0.20, | ||
| "perils_strength": 20, | ||
| "sourcery": true, | ||
| "tags": ["TENTACLES"] | ||
| }, | ||
| "hacks": { | ||
| "name": "Hacks", | ||
| "prefix": "Z", | ||
| "powers": [ | ||
| "gather_energy" | ||
| ] | ||
| }, | ||
| "rune_magic": { | ||
| "name": "Rune Magick", | ||
| "prefix": "RUN", | ||
| "powers": [ | ||
| "living_lightning", | ||
| "murderous_hurricane", | ||
| "stormbringer", | ||
| "fury_of_the_wolf_spirits", | ||
| "thunderclap", | ||
| "spatial_distortion" | ||
| ], | ||
| "description": "Summons Deadly Elements and Feral Spirits." | ||
| }, | ||
| "biomancy": { | ||
| "name": "Biomancy", | ||
| "prefix": "BIO", | ||
| "powers": [ | ||
| "minor_smite", | ||
| "blood_boil", | ||
| "iron_arm", | ||
| "endurance", | ||
| "regenerate", | ||
| "haemorrhage" | ||
| ], | ||
| "description": "Manipulates Biology to Buff or Heal." | ||
| }, | ||
| "pyromancy": { | ||
| "name": "Pyromancy", | ||
| "prefix": "PYR", | ||
| "powers": [ | ||
| "breathe_fire", | ||
| "fiery_form", | ||
| "fire_shield", | ||
| "inferno", | ||
| "sun_burst", | ||
| "molten_beam" | ||
| ], | ||
| "description": "Unleashes Blasts and Walls of Flame." | ||
| }, | ||
| "telekinesis": { | ||
| "name": "Telekinesis", | ||
| "prefix": "TEL", | ||
| "powers": [ | ||
| "crush", | ||
| "shockwave", | ||
| "wave_of_force", | ||
| "telekinetic_dome", | ||
| "spatial_distortion", | ||
| "vortex_of_doom" | ||
| ], | ||
| "description": "Manipulates Gravity to Throw or Shield." | ||
| }, | ||
| "librarius": { | ||
| "name": "Librarius", | ||
| "prefix": "LIB", | ||
| "powers": [ | ||
| "minor_smite", | ||
| "smite", | ||
| "force_dome", | ||
| "machine_curse", | ||
| "avenge", | ||
| "quickening", | ||
| "might_of_the_ancients", | ||
| "vortex_of_doom" | ||
| ], | ||
| "description": "All about battle and smashing foes or protecting allies." | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.