From fa85c15992f4c404cc7b681bc41cfa9c0289b5bc Mon Sep 17 00:00:00 2001 From: Stephen Adams Date: Tue, 31 May 2022 19:47:48 -0400 Subject: [PATCH] fix cat and event coordinator Signed-off-by: Stephen Adams --- Dialogs/event_coordinator.tres | 27 ++++++++++++++++++--------- Scripts/game_state.gd | 2 ++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Dialogs/event_coordinator.tres b/Dialogs/event_coordinator.tres index 20c9a8c..de12532 100644 --- a/Dialogs/event_coordinator.tres +++ b/Dialogs/event_coordinator.tres @@ -176,7 +176,7 @@ do remove_item(\"laser_pointer\") do handle_turnin(1) Coordinator: Most impressive, young Skywalker. Thanks! -if get_dialog_state(\"eventc\", \"items\", 7) +if get_dialog_state(\"eventc\", \"items\") == 7 => items else => END @@ -187,7 +187,7 @@ do remove_item(\"floppy\") do handle_turnin(2) Coordinator: Great! -if get_dialog_state(\"eventc\", \"items\", 7) +if get_dialog_state(\"eventc\", \"items\") == 7 => items else => END @@ -198,7 +198,7 @@ do remove_item(\"password\") do handle_turnin(4) Coordinator: Well done! -if get_dialog_state(\"eventc\", \"items\", 7) +if get_dialog_state(\"eventc\", \"items\") == 7 => items else => END" @@ -1048,10 +1048,13 @@ lines = { } ], [ { "type": "string", "value": "items" -} ], [ { +} ] ] +}, { +"type": "comparison", +"value": "==" +}, { "type": "number", "value": 7 -} ] ] } ] }, "next_conditional_id": "173", @@ -1157,10 +1160,13 @@ lines = { } ], [ { "type": "string", "value": "items" -} ], [ { +} ] ] +}, { +"type": "comparison", +"value": "==" +}, { "type": "number", "value": 7 -} ] ] } ] }, "next_conditional_id": "184", @@ -1263,10 +1269,13 @@ lines = { } ], [ { "type": "string", "value": "items" -} ], [ { +} ] ] +}, { +"type": "comparison", +"value": "==" +}, { "type": "number", "value": 7 -} ] ] } ] }, "next_conditional_id": "195", diff --git a/Scripts/game_state.gd b/Scripts/game_state.gd index f59e9c3..3c2f5b1 100644 --- a/Scripts/game_state.gd +++ b/Scripts/game_state.gd @@ -41,6 +41,8 @@ func _init(): # npc default states when necessary set_dialog_state("nerds", "present", true) set_dialog_state("cat", "complete", false) + set_dialog_state("cat", "sleeping", 0) + set_dialog_state("cat", "feral", 0) set_dialog_state("robot", "finished", false) func _add_global_item(resource, name, display_name, add_to_inventory = false):