Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions stratagems/initial/immunities_via_324.tph
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ BEGIN
12 76 FEEBLEMIND_IMMUNITY
13 16 HASTE_IMMUNITY
14 40 SLOW_IMMUNITY
15 55 DEATH_IMMUNITY
15 13 DEATH_IMMUNITY
16 minorglobe MINOR_GLOBE
17 majorglobe MAJOR_GLOBE
>>>>>>>>
Expand Down Expand Up @@ -153,8 +153,8 @@ BEGIN

// do this here because we don't want repetitions in the immunity items

OUTER_SET $opcode_splstate_map("209")=$opcode_splstate_map("55") // Death Immunity protects from PW:Kill
OUTER_SET $opcode_splstate_map("13")=$opcode_splstate_map("55") // Death Immunity protects from 'kill target'
OUTER_SET $opcode_splstate_map("209")=$opcode_splstate_map("13") // Death Immunity protects from PW:Kill
OUTER_SET $opcode_splstate_map("55")=$opcode_splstate_map("13") // Death Immunity protects from 'kill target'
OUTER_SET $opcode_splstate_map("210")=$opcode_splstate_map("45") // Stun Immunity protects from PW:Stun
OUTER_SET $opcode_splstate_map("217")=$opcode_splstate_map("39") // Unconsciousness Immunity protects from PW:Sleep

Expand Down
4 changes: 2 additions & 2 deletions stratagems/sfo2e/lib_immunity.tph
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ DEFINE_ACTION_MACRO immunity_effects_load BEGIN
icons=>"51"
animations=>""
display_icon=>"99"
immune_opcode=>55
extra_immune_opcode=>"13 209"
immune_opcode=>13
extra_immune_opcode=>"209"
splstate=>DEATH_IMMUNITY
END

Expand Down
2 changes: 1 addition & 1 deletion stratagems/ssl/libdata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
39 101 Sleep SLEEP_IMMUNITY *
40 101 Slow SLOW_IMMUNITY *
45 101 Stun STUN_IMMUNITY *
55 101 Slay DEATH_IMMUNITY *
13 101 Slay DEATH_IMMUNITY *
128 101 ConfuseProof CONFUSION_IMMUNITY *
134 101 Petrify PETRIFY_IMMUNITY *
175 101 Hold HOLD_IMMUNITY *
Expand Down