Skip to content
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

Spell Flags Refactor #3751

Merged
merged 99 commits into from
Jan 5, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
c4ceee5
SpellFlagsRefactor
walt253 Dec 11, 2024
2f09848
Clarify comments about CastAtThing & SelfCasted
walt253 Dec 11, 2024
6c89475
Clean-up config_creature.h
walt253 Dec 11, 2024
9b5c3be
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 11, 2024
13d8db6
Fix for slap not exploding frozen creature
walt253 Dec 12, 2024
7d39d6e
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 12, 2024
fbab7f7
Better check&fix for backward compatibility
walt253 Dec 12, 2024
2136b17
Split 'delete_effects_attached_to_creature'
walt253 Dec 12, 2024
7e6d84e
Fix a mistake
walt253 Dec 12, 2024
979d1b9
delete_armour_effects_attached_to_creature
walt253 Dec 12, 2024
877610d
Added comments for every spell flags on magic.cfg
walt253 Dec 13, 2024
28a4d3b
Handles all the cases for the "useless" spell flags
walt253 Dec 13, 2024
b612098
Revert last commit
walt253 Dec 13, 2024
8f28750
Stop non functional spell flags to be set on config
walt253 Dec 13, 2024
2348021
Fix related to delete_thing_structure
walt253 Dec 13, 2024
beb5e1d
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 13, 2024
6b9b186
Fix Chicken countdown and implements HealingRecovery
walt253 Dec 13, 2024
d1a2ea2
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 13, 2024
bfaa0fb
Fix a mistake
walt253 Dec 13, 2024
f9ead38
Update magic.cfg
walt253 Dec 14, 2024
e5bbc68
Various bug fixes
walt253 Dec 14, 2024
9b6ea71
Update engine_redraw.c
walt253 Dec 14, 2024
f07080d
Update engine_redraw.c
walt253 Dec 14, 2024
b4ed9cb
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 14, 2024
a0b9cb5
Complete Fear Implementation
walt253 Dec 14, 2024
8944082
Update creature_states_combt.c
walt253 Dec 14, 2024
48ffea9
Remove CSAfF_ExpLevelUp + Various clean-up.
walt253 Dec 14, 2024
1f9ef9c
Define WEIGHT_DIVISOR constant
walt253 Dec 14, 2024
3127255
Names changes for functions
walt253 Dec 14, 2024
01d50e3
Remove EXP_LEVEL_UP from configs
walt253 Dec 14, 2024
662b59d
Remove Fat check on compute_creature_weight + grammar fix
walt253 Dec 14, 2024
237489b
Rename another function
walt253 Dec 14, 2024
b04e0ff
Remove SPLK_NONE constant
walt253 Dec 14, 2024
1b52dde
Clean-up CSAfF_CalledToArms
walt253 Dec 14, 2024
9119b3a
Implements Cleanse Support
walt253 Dec 14, 2024
6285d08
Implements DamageOverTime + Better Cleanse
walt253 Dec 15, 2024
cdea7e5
Update config for new properties flags
walt253 Dec 15, 2024
075101a
Update thing_creature.c
walt253 Dec 15, 2024
047cffb
Oops fix GameTurnDelta duration
walt253 Dec 15, 2024
e9ec104
Fix: better aura effect implementation & clean-up bad code
walt253 Dec 15, 2024
a668ec4
Update thing_creature.c
walt253 Dec 15, 2024
a519cdc
lvl_script_commands.c replace the switch with bitwise left shift oper…
walt253 Dec 15, 2024
746da13
Update lvl_script_commands.c
walt253 Dec 15, 2024
31371df
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 17, 2024
d9a6313
fix
walt253 Dec 18, 2024
4991e05
Update magic.cfg
walt253 Dec 18, 2024
d4b9dae
Various fixes based on feedback
walt253 Dec 18, 2024
ef12eae
Mad Killing remove traces of combat when it ends
walt253 Dec 18, 2024
d48ae80
Fix SelfCasted comment + -script command check
walt253 Dec 18, 2024
8d696fe
Better Cleanse implementation & Improved DoT implementation
walt253 Dec 18, 2024
ee4f677
Update thing_creature.c
walt253 Dec 18, 2024
ea9d060
IMPORTANT BUG FIX
walt253 Dec 19, 2024
0985e82
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 19, 2024
cf241f8
remove damage type
walt253 Dec 20, 2024
459d436
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 21, 2024
ed53570
random sound play in script command too
walt253 Dec 21, 2024
9cecf97
use to_flag for clarity
walt253 Dec 21, 2024
625bd44
Update lvl_script_commands.c
walt253 Dec 21, 2024
fd5535d
script command accepts numbers
walt253 Dec 21, 2024
2a90333
Fixed blocking build warning
Loobinex Dec 22, 2024
1f357c5
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 22, 2024
1a120cc
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 27, 2024
5fb4138
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 27, 2024
c8d4e93
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 28, 2024
0328475
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 29, 2024
d458089
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 29, 2024
2088e08
Init immunity flags at correct location
walt253 Dec 29, 2024
0105983
clean-up removed variable from init
walt253 Dec 29, 2024
ffbe100
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 29, 2024
166a0e4
Merge branch 'master' into SpellFlagsRefactor
walt253 Dec 29, 2024
29da00e
Update creature_control.h
walt253 Dec 29, 2024
bc05ed6
Merge branch 'master' into SpellFlagsRefactor
walt253 Jan 1, 2025
35c0fbd
fix aura for special
walt253 Jan 2, 2025
b348be8
Merge branch 'master' into SpellFlagsRefactor
walt253 Jan 2, 2025
3196595
clean-up comment + fix aura/duration
walt253 Jan 2, 2025
04ba982
better implementation for script command
walt253 Jan 3, 2025
5cd573f
Update lvl_script_commands.c
walt253 Jan 3, 2025
190de96
fix longs
walt253 Jan 3, 2025
7e43301
Merge branch 'master' into SpellFlagsRefactor
walt253 Jan 3, 2025
7427daf
cleanup of toflag stuff
Loobinex Jan 3, 2025
55e7b3d
fix indentation
walt253 Jan 3, 2025
b7e124f
Update config_magic.c
walt253 Jan 3, 2025
b461ac8
error when invalid flag on config
walt253 Jan 3, 2025
0df8b4c
Update config_crtrmodel.c
walt253 Jan 3, 2025
ec94a85
Update lvl_script_commands.c
walt253 Jan 3, 2025
2acd405
deallocate script value if spellimmunity flag is out of range
walt253 Jan 3, 2025
6fb1cfa
value1 < 0
walt253 Jan 3, 2025
3815881
Update lvl_script_commands.c
walt253 Jan 3, 2025
16fe7e0
CleanseFlag clean-up too
walt253 Jan 3, 2025
a72e94d
renamed magic_spell_flags
Loobinex Jan 3, 2025
68278ad
adding numbers power of 2 on magic.cfg
walt253 Jan 3, 2025
de925aa
Update magic.cfg
walt253 Jan 3, 2025
6fa761e
Update imp.cfg
walt253 Jan 3, 2025
044c884
Reworked jobs to be the same as spellimmunity
Loobinex Jan 4, 2025
03999ab
Update lvl_script_commands.c
walt253 Jan 4, 2025
7e271e9
Merge branch 'master' into SpellFlagsRefactor
walt253 Jan 4, 2025
234c6e3
fix mistake
walt253 Jan 4, 2025
1c0e287
Update imp.cfg
walt253 Jan 4, 2025
7666302
Don't duplicate SpellImmunity on campaign configs
Loobinex Jan 5, 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
Prev Previous commit
Next Next commit
Mad Killing remove traces of combat when it ends
Should stop infighting.
  • Loading branch information
walt253 committed Dec 18, 2024
commit ef12eaee8e0e69ee86063f13b89f0ac6dbeb662e
9 changes: 5 additions & 4 deletions config/fxdata/magic.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ ShotModel = SHOT_FREEZE
SpellPower = POWER_FREEZE
SpellFlags = FREEZE
Duration = 125
SelfCasted = 1 50
SelfCasted = 0 50
SymbolSprites = 523 406

[spell4]
Expand Down Expand Up @@ -184,7 +184,7 @@ ShotModel = SHOT_SLOW
SpellPower = POWER_SLOW
SpellFlags = SLOW
Duration = 500
SelfCasted = 1 50
SelfCasted = 0 50
SymbolSprites = 366 424

[spell13]
Expand All @@ -201,6 +201,7 @@ ShotModel = SHOT_FEAR
SpellFlags = FEAR
; Fear will last at least as long as the GameTurnsInFlee rule.
Duration = 200
SelfCasted = 0 968
SymbolSprites = 817 819

[spell15]
Expand Down Expand Up @@ -296,7 +297,7 @@ ShotModel = SHOT_DISEASE
SpellPower = POWER_DISEASE
SpellFlags = DISEASE
Duration = 500
SelfCasted = 1 59
SelfCasted = 0 59
SymbolSprites = 310 319

[spell27]
Expand All @@ -307,7 +308,7 @@ SpellPower = POWER_CHICKEN
SpellFlags = CHICKEN
Countdown = 10
Duration = 200
SelfCasted = 1 109
SelfCasted = 0 109
SymbolSprites = 306 314

[spell28]
Expand Down
1 change: 1 addition & 0 deletions src/thing_creature.c
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,7 @@ TbBool clear_thing_spell_flags_f(struct Thing *thing, unsigned long spell_flags,
&& (creature_under_spell_effect(thing, CSAfF_MadKilling)))
{
clear_flag(cctrl->spell_flags, CSAfF_MadKilling);
remove_all_traces_of_combat(thing);
cleared = true;
}
if (flag_is_set(spell_flags, CSAfF_Fear)
Expand Down