Skip to content

Commit

Permalink
Merge pull request #731 from doug1234/ScoutSkirmishIconFix
Browse files Browse the repository at this point in the history
Fix scout skirmish initial arg value
  • Loading branch information
doug1234 authored Sep 28, 2023
2 parents 13407c6 + 5a86bd7 commit 337bee4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tpdatasrc/tpgamefiles/rules/feats/sudden still.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Sudden Still
flags: 4325376
prereqs:
description: nce per day, you can apply the effect of the Still Spell feat to any spell you cast without increasing the level of the spell or specially preparing it ahead of time. You can still use Still Spell normally if you have it.
description: Once per day, you can apply the effect of the Still Spell feat to any spell you cast without increasing the level of the spell or specially preparing it ahead of time. You can still use Still Spell normally if you have it.
prereq descr:
2 changes: 1 addition & 1 deletion tpdatasrc/tpgamefiles/scr/tpModifiers/arcane_archer.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ def HailOfArrowsRadial(attachee, args, evt_obj):

def HailOfArrowsReset(attachee, args, evt_obj):
args.set_arg(0, 0)

return 0

hailOfArrowsFeat = PythonModifier("Hail of Arrows Feat", 3) # arg0 - used this day
hailOfArrowsFeat.MapToFeat("Hail of Arrows")
Expand Down
5 changes: 5 additions & 0 deletions tpdatasrc/tpgamefiles/scr/tpModifiers/scout.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ def SkirmishReset(attachee, args, evt_obj):
#Zero out the total distance moved from the start position
args.set_arg(0, 0)
return 0

def SkirmishAdd(attachee, args, evt_obj):
args.set_arg(0, 0) #Zero out the total distance moved from the start position
return 0

def SkirmishAcBonus(attachee, args, evt_obj):
# not active, do nothing
Expand Down Expand Up @@ -234,6 +238,7 @@ def SkirmishDamageBonus(attachee, args, evt_obj):
scoutSkirmish.AddHook(ET_OnDealingDamage, EK_NONE, SkirmishDamageBonus, ())
scoutSkirmish.AddHook(ET_OnGetAC, EK_NONE, SkirmishAcBonus, ())
scoutSkirmish.AddHook(ET_OnBeginRound, EK_NONE, SkirmishReset, ())
scoutSkirmish.AddHook(ET_OnConditionAdd, EK_NONE, SkirmishAdd, ())
scoutSkirmish.AddHook(ET_OnD20Signal, EK_S_Combat_Critter_Moved, ScoutMovedDistance, ())
scoutSkirmish.AddHook(ET_OnGetTooltip, EK_NONE, SkirmishTooltip, ())
scoutSkirmish.AddHook(ET_OnGetEffectTooltip, EK_NONE, SkirmishEffectTooltip, ())
Expand Down

0 comments on commit 337bee4

Please sign in to comment.