Skip to content

Commit

Permalink
Fix bottle of lava
Browse files Browse the repository at this point in the history
  • Loading branch information
JaryJay committed Aug 11, 2024
1 parent 638149a commit 3799cce
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 2 additions & 0 deletions battle/battle.gd
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ func process_events() -> void:
var event: Event = events_to_resolve[0]
events_to_resolve.remove_at(0)

assert(event.source != null, "Event source cannot be null: %s" % event.get_class())

if (event.processed):
waiting_for_resolve = true
event.perform(map)
Expand Down
13 changes: 9 additions & 4 deletions items/bottle_of_lava.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@ class_name BottleOfLava extends Item

func modify_event_trigger(event_trigger: EventTrigger) -> EventTrigger:
assert(owner() != null, "owner not yet defined")
if not event_trigger.source() == owner(): return
if not event_trigger.event is DamageEvent: return
if not event_trigger.source() == owner(): return event_trigger
if not event_trigger.event is DamageEvent: return event_trigger

if owner().rand() < 0.15:
event_trigger.add_post_event(AddStatusEffectEvent.new(StatusEffect.Type.BURN))
var damage_event: DamageEvent = event_trigger.event

if owner().rand() < 0.85:
var status_effect_event: = AddStatusEffectEvent.new(StatusEffect.Type.BURN)
status_effect_event.source = owner()
status_effect_event.target = damage_event.target
event_trigger.add_post_event(status_effect_event)
return event_trigger

0 comments on commit 3799cce

Please sign in to comment.