diff --git a/event.gd b/event.gd index a7618a8..47d04c0 100644 --- a/event.gd +++ b/event.gd @@ -21,6 +21,9 @@ func requirements_satisfied() -> bool: for requirement in requirements: if Economy.get_currency_amount(requirement.currency) < requirement.amount: return false + for requirement in min_requirements: + if Economy.get_currency_amount(requirement.currency) > requirement.amount: + return false return true func will_happen() -> bool: diff --git a/game_state.gd b/game_state.gd index 80ba980..bc24b95 100644 --- a/game_state.gd +++ b/game_state.gd @@ -17,3 +17,7 @@ func on_remove_letter(l: Letter): push_error("Removed Letter not found", l) return letters.remove_at(i) + +func kill_event_archie(): + var event := preload("res://random events/taunt.tres") + event.probability = 0.0 diff --git a/test/taunt.dtl b/test/taunt.dtl index 0656352..74c4825 100644 --- a/test/taunt.dtl +++ b/test/taunt.dtl @@ -28,12 +28,13 @@ else: if {special.archie_increment} == 4.0: "P.S.\ I was lying about the whole feeding you to dinosaur's part." -elif {special.archie_increment} == 7.0 +elif {special.archie_increment} == 7.0: "P.S.\ This is the last time you'll hear from me, frankly it's late and I'm getting tired of writing these letters." "Goodnight, sleep loose, let the bed bugs eat you alive or something.\ \ - Archie" + do GameState.kill_event_archie() set {special.archie_increment} += 1.0 # If special.archie_increment >= 7 then set the probability of the taunt event to zero \ No newline at end of file