From b10ad40552bf97627664f9a9c0025c2f43002385 Mon Sep 17 00:00:00 2001 From: akshay Date: Thu, 18 Aug 2022 21:03:23 -0400 Subject: [PATCH] Fixed bug with item generator crying when item is removed while its broken --- scenes/item_generator.tscn | 5 ++++- scripts/item_generator/state/broken.gd | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scenes/item_generator.tscn b/scenes/item_generator.tscn index b20d531..1c137e9 100644 --- a/scenes/item_generator.tscn +++ b/scenes/item_generator.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://scenes/item_dump.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=5] [ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=6] +[ext_resource path="res://item_types/ore.tres" type="Resource" id=7] [sub_resource type="CylinderMesh" id=1] @@ -24,9 +25,11 @@ text = "Progress: 20%" [node name="item_slot_1" parent="." groups=["conveyor_item_slots"] instance=ExtResource( 2 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, 0 ) +start_with_item = ExtResource( 7 ) [node name="item_slot_2" parent="." groups=["conveyor_item_slots"] instance=ExtResource( 2 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 0, 0 ) +start_with_item = ExtResource( 7 ) [node name="coin_machine" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true diff --git a/scripts/item_generator/state/broken.gd b/scripts/item_generator/state/broken.gd index d57f54a..c04b19c 100644 --- a/scripts/item_generator/state/broken.gd +++ b/scripts/item_generator/state/broken.gd @@ -30,7 +30,7 @@ func on_gen_timer_timeout(): assert(false, "gen timer should be disabled while broken") func on_item_slot_item_changed(item): - assert(false, "item dump should be disabled while broken") + assert(item == null, "item dump adds should be disabled while broken") func on_item_dump_item_dump_completed(): ctx.full_heal()