Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
7eda7a0
Start perils rework
EttyKitty Oct 6, 2024
d65a23b
Format scr_powers
EttyKitty Oct 7, 2024
c040286
Huge rework/refactor to powers and tomes
EttyKitty Oct 8, 2024
6356047
Powers properly work now
EttyKitty Oct 8, 2024
1dde5ce
Fix tome discipline names
EttyKitty Oct 8, 2024
93908f9
Adjusting perils and fixing broken stuff
EttyKitty Oct 8, 2024
3162810
Pass the whole world through a formatter
EttyKitty Feb 25, 2025
07ad2ee
Remove debug lines and sane var declaration
EttyKitty Feb 26, 2025
6324fbb
Move the casting timer under the librarian check and optimize stuff
EttyKitty Feb 26, 2025
90422a1
Mixin for perils and irandom instead of random+floor
EttyKitty Feb 26, 2025
a30c814
Attempts to bring sanity to the casting code
EttyKitty Feb 26, 2025
147384f
Format
EttyKitty Feb 26, 2025
8fcd846
Moar stuff
EttyKitty Feb 26, 2025
8737f9e
Proper comment out
EttyKitty Feb 26, 2025
6ae778a
TODO
EttyKitty Feb 26, 2025
13cc79c
New script name for the doc
EttyKitty Feb 27, 2025
3622039
Another bunch of fixes and changes
EttyKitty Feb 27, 2025
7911f9b
Fix P > P0 typo
EttyKitty Feb 27, 2025
9bf59be
A couple of sanity checks
EttyKitty Feb 27, 2025
7eee501
Artifact tags fixing
EttyKitty Feb 27, 2025
ad4a3f2
Tome logic fix
EttyKitty Feb 27, 2025
d6d83ba
Starting to port powers into a struct (WIP pass)
EttyKitty Feb 27, 2025
630b254
Finish transferring powers to a struct, bad format for flavor
EttyKitty Feb 27, 2025
a42ce62
Bot attempts to fix the perils crash
EttyKitty Feb 27, 2025
0a6a0a4
Small cleanup, TODO and globals
EttyKitty Feb 27, 2025
f7f16f9
New format for flavour_text and power_modifiers
EttyKitty Feb 27, 2025
bb5f7c8
I'm amazed, but this disgusting first try function works
EttyKitty Feb 28, 2025
29319a2
Moar shit but it just works
EttyKitty Feb 28, 2025
3d995be
Another todo
EttyKitty Feb 28, 2025
62185a2
JSON for the JSON god
EttyKitty Feb 28, 2025
5bea9e3
Autoformat JSON
EttyKitty Feb 28, 2025
f29724b
rune Magick > rune magic, gather_energy > Kamehameha
EttyKitty Feb 28, 2025
4a3f978
Flavor text format fix
EttyKitty Feb 28, 2025
90f301e
Unify random rolls function
EttyKitty Feb 28, 2025
2bc2355
Remove duplicate tome_roll declaration
EttyKitty Feb 28, 2025
e466b96
Format
EttyKitty Feb 28, 2025
c9735f9
Refactor small functions
EttyKitty Feb 28, 2025
6881d0c
Add letters to the main discipline struct
EttyKitty Feb 28, 2025
0631e4a
Another rune magic fix
EttyKitty Feb 28, 2025
43b2042
Another typo fix
EttyKitty Feb 28, 2025
ae04010
More function refactoring
EttyKitty Feb 28, 2025
74df406
Macros TODO
EttyKitty Feb 28, 2025
53da331
Descriptive var names
EttyKitty Feb 28, 2025
833df08
More function refactoring
EttyKitty Feb 28, 2025
2c64ed5
Apply various bot suggestions
EttyKitty Feb 28, 2025
db64c54
Variable names
EttyKitty Feb 28, 2025
27ecac4
Unnecessary variables
EttyKitty Feb 28, 2025
01aca09
We're Briish
EttyKitty Feb 28, 2025
f4ddf03
More variable naming
EttyKitty Feb 28, 2025
4c6528b
More variable names and todo
EttyKitty Feb 28, 2025
d74c6fa
More purgatory
EttyKitty Feb 28, 2025
ccc6372
TODO
EttyKitty Feb 28, 2025
bc88884
Suggestions
EttyKitty Feb 28, 2025
1393339
Fix typos
EttyKitty Feb 28, 2025
43d77cb
Helper function for battle log and a bunch of typo fixes
EttyKitty Mar 1, 2025
7bab113
Consistent naming
EttyKitty Mar 1, 2025
20b2400
Some improvements
EttyKitty Mar 1, 2025
e08166a
Fixes
EttyKitty Mar 1, 2025
da1b764
Slight sanity edits to battle logging
EttyKitty Mar 1, 2025
4c2339b
Moar fixes and removing old code
EttyKitty Mar 1, 2025
f3320a0
More comments
EttyKitty Mar 1, 2025
610484f
Moar readability
EttyKitty Mar 2, 2025
d8556ff
Even moar readability
EttyKitty Mar 2, 2025
5ea3eeb
Minor things
EttyKitty Mar 2, 2025
46b32d8
A couple of diabolical functions
EttyKitty Mar 2, 2025
8322709
God help me, I no longer understand what I'm doing
EttyKitty Mar 2, 2025
847c721
I don't think anyone is reading, so let the galaxy burn
EttyKitty Mar 2, 2025
ec4bc1a
Typo fix
EttyKitty Mar 2, 2025
af99bba
Simplify the targeting logic
EttyKitty Mar 3, 2025
8988293
Tweak the flavor script a bit
EttyKitty Mar 3, 2025
98b6cb9
Update scr_player_combat_weapon_stacks.gml
EttyKitty Mar 3, 2025
8999000
Kamehameha never worked and now it's gone
EttyKitty Mar 3, 2025
2a41203
Improve the battlelog message priority a bit and fix a bug
EttyKitty Mar 3, 2025
5259bbd
Moar
EttyKitty Mar 3, 2025
409acc4
fix: Mistakes in the `check_dead_marines` func and individual flavour…
EttyKitty Mar 5, 2025
23f1280
feat: Target type to enemy shooting flavour text
EttyKitty Mar 5, 2025
f26a158
Increase battle log message count from 8 to 24
EttyKitty Mar 5, 2025
666105c
Item specials property test
EttyKitty Mar 5, 2025
8db8b15
Fix the new property
EttyKitty Mar 6, 2025
d402458
More edits and constants
EttyKitty Mar 6, 2025
1a71c4e
Run perils after the cast
EttyKitty Mar 6, 2025
3e59e3b
Even moar
EttyKitty Mar 6, 2025
3d893d6
One day this will end
EttyKitty Mar 6, 2025
1a9e63d
I think I'm a psyker too at this point
EttyKitty Mar 8, 2025
a00d922
Proper fancy dice roll function
EttyKitty Mar 9, 2025
1a6f90f
Remove commented out functions
EttyKitty Mar 9, 2025
547ffd7
Psychic data retrieval methods error handling augmentation
EttyKitty Mar 9, 2025
d508336
= to ==
EttyKitty Mar 9, 2025
9d5ac7d
More fixes and refactors
EttyKitty Mar 9, 2025
529e520
Target search refactor
EttyKitty Mar 9, 2025
56ca65a
Todo reorder
EttyKitty Mar 9, 2025
de34d41
Remove shit luck from perils, and Warp Touched distribution
EttyKitty Mar 9, 2025
fff8778
Better documentation for the dice function
EttyKitty Mar 10, 2025
e41ebc2
Fix perils str check, CM will not die, format
EttyKitty Mar 10, 2025
c119e6c
Use priority to control perils color
EttyKitty Mar 10, 2025
44c520e
Adjust some dice related stuff
EttyKitty Mar 10, 2025
5ac4104
Perils adjustments
EttyKitty Mar 10, 2025
1c8557f
Remove the unused duration and move heretical to disciplines
EttyKitty Mar 10, 2025
872ca76
Use the valid target function for buffs
EttyKitty Mar 10, 2025
8aefce7
Ensure proper formatting
EttyKitty Mar 10, 2025
a15b564
Use the compression method made by the bot
EttyKitty Mar 10, 2025
4618f0a
Fixes and robustness
EttyKitty Mar 10, 2025
9459b14
Perils stuff
EttyKitty Mar 10, 2025
bb16ac1
Battlelog adjustments
EttyKitty Mar 10, 2025
6bb1243
Perils adjustments
EttyKitty Mar 10, 2025
e1d0326
Weird error handling
EttyKitty Mar 11, 2025
93cab4f
Adjust perils for daemon binders more
EttyKitty Mar 11, 2025
c2f02df
Daemon Binders > Warp Tainted
EttyKitty Mar 11, 2025
df0cfee
Warp Touched > Favoured By The Warp
EttyKitty Mar 11, 2025
7c274a3
Psyker Abundance > Warp Touched
EttyKitty Mar 11, 2025
09dd997
Description adjustments
EttyKitty Mar 11, 2025
2c6fa44
More description updates
EttyKitty Mar 11, 2025
5d0d74a
Zealous Faith to Psyker Intolerant
EttyKitty Mar 11, 2025
d2c9ee0
Power prefix vs letter
EttyKitty Mar 11, 2025
4f70261
I declare war on buffs and tomes
EttyKitty Mar 11, 2025
1adaf7a
More shit
EttyKitty Mar 12, 2025
13eb13a
Rename
EttyKitty Mar 12, 2025
6923b12
Update scripts/scr_powers/scr_powers.gml
EttyKitty Mar 12, 2025
df318c7
ref: Conditions checking
EttyKitty Mar 13, 2025
1e2aea7
ref: Different error handling
EttyKitty Mar 13, 2025
9b27cb9
ref: Extract to functions
EttyKitty Mar 13, 2025
cee96e4
style: Reorder functions
EttyKitty Mar 13, 2025
8bd887c
fix: Typo fix
EttyKitty Mar 13, 2025
2268d28
feat: Very basic and probably bad power priorities
EttyKitty Mar 13, 2025
34e1fcb
feat: Lexicanums are poor
EttyKitty Mar 13, 2025
bf10129
feat: Force weapon bonus damage formula
EttyKitty Mar 13, 2025
2d8c71e
Tooltip fix and adjustments
EttyKitty Mar 19, 2025
f8021d0
Take out the trash
EttyKitty Mar 19, 2025
5866e83
Proper rolls and equipment
EttyKitty Mar 19, 2025
8dd15f7
Age adjustments that I couldn't contain to only librarians
EttyKitty Mar 19, 2025
c93f0e9
Psychic powers are back to chapter masters
EttyKitty Mar 19, 2025
b0c9250
All ap powers target vehicles
EttyKitty Mar 19, 2025
578c920
Fix max kills?
EttyKitty Mar 19, 2025
8e95da0
Adjust the anti-vehicle power flipping
EttyKitty Mar 19, 2025
3d2b78e
Typo fix
EttyKitty Mar 19, 2025
d5c396b
Some sanity renamings
EttyKitty Mar 19, 2025
3b01695
Support for infinite max kills
EttyKitty Mar 19, 2025
cdab900
Rename "default" discipline to "librarius"
EttyKitty Mar 20, 2025
bb9ac58
Fix typo
EttyKitty Mar 20, 2025
564ce81
Typo fix
EttyKitty Mar 20, 2025
a39dea7
Adjust message priority a little
EttyKitty Mar 20, 2025
eeb6d6c
Desc and return in else
EttyKitty Mar 20, 2025
2773bbd
Slaneesh typo
EttyKitty Mar 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"Timelines","folderPath":"folders/Timelines.yy",},
],
"IncludedFiles": [
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"README.md","CopyToMask":-1,"filePath":"datafiles",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"psychic_disciplines.json","CopyToMask":-1,"filePath":"datafiles/data",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"psychic_powers.json","CopyToMask":-1,"filePath":"datafiles/data",},
Comment thread
EttyKitty marked this conversation as resolved.
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"traits.json","CopyToMask":-1,"filePath":"datafiles/data",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom_icons_help.txt","CopyToMask":153157610357391598,"filePath":"datafiles/icons",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/images/advisor/splash",},
Expand Down Expand Up @@ -1175,7 +1178,6 @@
{"id":{"name":"scr_clean","path":"scripts/scr_clean/scr_clean.yy",},},
{"id":{"name":"spr_weapon_boltstorm_gauntlet_small","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},},
{"id":{"name":"scr_powers","path":"scripts/scr_powers/scr_powers.yy",},},
{"id":{"name":"scr_powers_new","path":"scripts/scr_powers_new/scr_powers_new.yy",},},
{"id":{"name":"scr_recruit_data","path":"scripts/scr_recruit_data/scr_recruit_data.yy",},},
{"id":{"name":"scr_weapon","path":"scripts/scr_weapon/scr_weapon.yy",},},
{"id":{"name":"UINodeScripts","path":"scripts/UINodeScripts/UINodeScripts.yy",},},
Expand Down
203 changes: 203 additions & 0 deletions datafiles/data/psychic_disciplines.json
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."
}
}
Loading