From e922975179e58320c9abb03e302ed89a2d1aae2e Mon Sep 17 00:00:00 2001 From: akshay Date: Sat, 20 Aug 2022 01:57:14 -0400 Subject: [PATCH] New items. new recipes. Balance changes. --- item_types/advanced_repair_kit.tres | 2 +- item_types/chip.tres | 9 +++++++++ item_types/crystal.tres | 9 +++++++++ item_types/gem.tres | 9 +++++++++ item_types/geode.tres | 9 +++++++++ item_types/ingot.tres | 9 +++++++++ item_types/metal_plate.tres | 9 +++++++++ item_types/repair_kit.tres | 2 +- recipes/advanced_repair_kit_recipe.tres | 5 +++-- recipes/all_recipes.tres | 10 ++++++++-- recipes/chip_recipe.tres | 11 +++++++++++ recipes/crystal_recipe.tres | 10 ++++++++++ recipes/gem_recipe.tres | 10 ++++++++++ recipes/ingot_recipe.tres | 10 ++++++++++ recipes/metal_plate_recipe.tres | 10 ++++++++++ recipes/repair_kit_recipe.tres | 5 +++-- scenes/comm_station.tscn | 12 +++++------- scenes/crafting_station.tscn | 10 +++++++--- scenes/dinner_table.tscn | 1 + scenes/hydroponics_station.tscn | 10 +++++----- scenes/item_generator.tscn | 6 +++--- scenes/main.tscn | 12 +++++++++--- scenes/oven.tscn | 4 ++-- scenes/player.tscn | 2 +- scenes/power_station.tscn | 1 + scenes/rover_station.tscn | 10 +++++++--- scenes/status_light.tscn | 6 +++--- 27 files changed, 165 insertions(+), 38 deletions(-) create mode 100644 item_types/chip.tres create mode 100644 item_types/crystal.tres create mode 100644 item_types/gem.tres create mode 100644 item_types/geode.tres create mode 100644 item_types/ingot.tres create mode 100644 item_types/metal_plate.tres create mode 100644 recipes/chip_recipe.tres create mode 100644 recipes/crystal_recipe.tres create mode 100644 recipes/gem_recipe.tres create mode 100644 recipes/ingot_recipe.tres create mode 100644 recipes/metal_plate_recipe.tres diff --git a/item_types/advanced_repair_kit.tres b/item_types/advanced_repair_kit.tres index 1eeb7f0..8e535c3 100644 --- a/item_types/advanced_repair_kit.tres +++ b/item_types/advanced_repair_kit.tres @@ -5,5 +5,5 @@ [resource] script = ExtResource( 1 ) -name = "Repair Kit" +name = "Wrench++" visual_scene = ExtResource( 2 ) diff --git a/item_types/chip.tres b/item_types/chip.tres new file mode 100644 index 0000000..d444240 --- /dev/null +++ b/item_types/chip.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/ItemType.gd" type="Script" id=1] +[ext_resource path="res://assets/ore/ore.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "Chip" +visual_scene = ExtResource( 2 ) diff --git a/item_types/crystal.tres b/item_types/crystal.tres new file mode 100644 index 0000000..22bd8e1 --- /dev/null +++ b/item_types/crystal.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/ItemType.gd" type="Script" id=1] +[ext_resource path="res://assets/ore/ore.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "Crystal" +visual_scene = ExtResource( 2 ) diff --git a/item_types/gem.tres b/item_types/gem.tres new file mode 100644 index 0000000..6a28c7d --- /dev/null +++ b/item_types/gem.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/ItemType.gd" type="Script" id=1] +[ext_resource path="res://assets/ore/ore.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "Gem" +visual_scene = ExtResource( 2 ) diff --git a/item_types/geode.tres b/item_types/geode.tres new file mode 100644 index 0000000..61eccee --- /dev/null +++ b/item_types/geode.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/ItemType.gd" type="Script" id=1] +[ext_resource path="res://assets/ore/ore.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "Geode" +visual_scene = ExtResource( 2 ) diff --git a/item_types/ingot.tres b/item_types/ingot.tres new file mode 100644 index 0000000..abfae41 --- /dev/null +++ b/item_types/ingot.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/ItemType.gd" type="Script" id=1] +[ext_resource path="res://assets/ore/ore.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "Ingot" +visual_scene = ExtResource( 2 ) diff --git a/item_types/metal_plate.tres b/item_types/metal_plate.tres new file mode 100644 index 0000000..f314018 --- /dev/null +++ b/item_types/metal_plate.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/ItemType.gd" type="Script" id=1] +[ext_resource path="res://assets/ore/ore.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "Metal Plate" +visual_scene = ExtResource( 2 ) diff --git a/item_types/repair_kit.tres b/item_types/repair_kit.tres index 1eeb7f0..dbb9f52 100644 --- a/item_types/repair_kit.tres +++ b/item_types/repair_kit.tres @@ -5,5 +5,5 @@ [resource] script = ExtResource( 1 ) -name = "Repair Kit" +name = "Wrench" visual_scene = ExtResource( 2 ) diff --git a/recipes/advanced_repair_kit_recipe.tres b/recipes/advanced_repair_kit_recipe.tres index 5a8bb63..45a3d5e 100644 --- a/recipes/advanced_repair_kit_recipe.tres +++ b/recipes/advanced_repair_kit_recipe.tres @@ -1,10 +1,11 @@ -[gd_resource type="Resource" load_steps=4 format=2] +[gd_resource type="Resource" load_steps=5 format=2] [ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] [ext_resource path="res://item_types/advanced_repair_kit.tres" type="Resource" id=2] [ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=3] +[ext_resource path="res://item_types/crystal.tres" type="Resource" id=4] [resource] script = ExtResource( 1 ) -item_type_slots = [ ExtResource( 3 ), ExtResource( 3 ) ] +item_type_slots = [ ExtResource( 3 ), ExtResource( 4 ) ] item_type_out = ExtResource( 2 ) diff --git a/recipes/all_recipes.tres b/recipes/all_recipes.tres index ae60d92..ca7d5dd 100644 --- a/recipes/all_recipes.tres +++ b/recipes/all_recipes.tres @@ -1,8 +1,14 @@ -[gd_resource type="Resource" load_steps=3 format=2] +[gd_resource type="Resource" load_steps=9 format=2] [ext_resource path="res://scripts/RecipeDB.gd" type="Script" id=1] [ext_resource path="res://recipes/repair_kit_recipe.tres" type="Resource" id=2] +[ext_resource path="res://recipes/chip_recipe.tres" type="Resource" id=3] +[ext_resource path="res://recipes/crystal_recipe.tres" type="Resource" id=4] +[ext_resource path="res://recipes/gem_recipe.tres" type="Resource" id=5] +[ext_resource path="res://recipes/ingot_recipe.tres" type="Resource" id=6] +[ext_resource path="res://recipes/metal_plate_recipe.tres" type="Resource" id=7] +[ext_resource path="res://recipes/advanced_repair_kit_recipe.tres" type="Resource" id=8] [resource] script = ExtResource( 1 ) -recipes = [ ExtResource( 2 ) ] +recipes = [ ExtResource( 2 ), ExtResource( 8 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ) ] diff --git a/recipes/chip_recipe.tres b/recipes/chip_recipe.tres new file mode 100644 index 0000000..fb5c5da --- /dev/null +++ b/recipes/chip_recipe.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" load_steps=5 format=2] + +[ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] +[ext_resource path="res://item_types/chip.tres" type="Resource" id=2] +[ext_resource path="res://item_types/gem.tres" type="Resource" id=3] +[ext_resource path="res://item_types/metal_plate.tres" type="Resource" id=4] + +[resource] +script = ExtResource( 1 ) +item_type_slots = [ ExtResource( 4 ), ExtResource( 3 ) ] +item_type_out = ExtResource( 2 ) diff --git a/recipes/crystal_recipe.tres b/recipes/crystal_recipe.tres new file mode 100644 index 0000000..afb9112 --- /dev/null +++ b/recipes/crystal_recipe.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=4 format=2] + +[ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] +[ext_resource path="res://item_types/geode.tres" type="Resource" id=2] +[ext_resource path="res://item_types/crystal.tres" type="Resource" id=3] + +[resource] +script = ExtResource( 1 ) +item_type_slots = [ ExtResource( 2 ), ExtResource( 2 ) ] +item_type_out = ExtResource( 3 ) diff --git a/recipes/gem_recipe.tres b/recipes/gem_recipe.tres new file mode 100644 index 0000000..b453f49 --- /dev/null +++ b/recipes/gem_recipe.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=4 format=2] + +[ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] +[ext_resource path="res://item_types/gem.tres" type="Resource" id=2] +[ext_resource path="res://item_types/crystal.tres" type="Resource" id=3] + +[resource] +script = ExtResource( 1 ) +item_type_slots = [ ExtResource( 3 ), ExtResource( 3 ) ] +item_type_out = ExtResource( 2 ) diff --git a/recipes/ingot_recipe.tres b/recipes/ingot_recipe.tres new file mode 100644 index 0000000..204c0f9 --- /dev/null +++ b/recipes/ingot_recipe.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=4 format=2] + +[ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] +[ext_resource path="res://item_types/ore.tres" type="Resource" id=2] +[ext_resource path="res://item_types/ingot.tres" type="Resource" id=3] + +[resource] +script = ExtResource( 1 ) +item_type_slots = [ ExtResource( 2 ), ExtResource( 2 ) ] +item_type_out = ExtResource( 3 ) diff --git a/recipes/metal_plate_recipe.tres b/recipes/metal_plate_recipe.tres new file mode 100644 index 0000000..43d97fe --- /dev/null +++ b/recipes/metal_plate_recipe.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=4 format=2] + +[ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] +[ext_resource path="res://item_types/metal_plate.tres" type="Resource" id=2] +[ext_resource path="res://item_types/ingot.tres" type="Resource" id=3] + +[resource] +script = ExtResource( 1 ) +item_type_slots = [ ExtResource( 3 ), ExtResource( 3 ) ] +item_type_out = ExtResource( 2 ) diff --git a/recipes/repair_kit_recipe.tres b/recipes/repair_kit_recipe.tres index 493774e..56180b6 100644 --- a/recipes/repair_kit_recipe.tres +++ b/recipes/repair_kit_recipe.tres @@ -1,10 +1,11 @@ -[gd_resource type="Resource" load_steps=4 format=2] +[gd_resource type="Resource" load_steps=5 format=2] [ext_resource path="res://scripts/Recipe.gd" type="Script" id=1] [ext_resource path="res://item_types/ore.tres" type="Resource" id=2] [ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=3] +[ext_resource path="res://item_types/ingot.tres" type="Resource" id=4] [resource] script = ExtResource( 1 ) -item_type_slots = [ ExtResource( 2 ), ExtResource( 2 ) ] +item_type_slots = [ ExtResource( 4 ), ExtResource( 2 ) ] item_type_out = ExtResource( 3 ) diff --git a/scenes/comm_station.tscn b/scenes/comm_station.tscn index 41a3880..283fd3c 100644 --- a/scenes/comm_station.tscn +++ b/scenes/comm_station.tscn @@ -3,8 +3,8 @@ [ext_resource path="res://scenes/item_dump.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/comm_station/comm_station.gd" type="Script" id=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=3] -[ext_resource path="res://item_types/ore.tres" type="Resource" id=4] -[ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=5] +[ext_resource path="res://item_types/chip.tres" type="Resource" id=4] +[ext_resource path="res://item_types/advanced_repair_kit.tres" type="Resource" id=5] [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=6] [node name="comm_station" type="Spatial"] @@ -13,9 +13,9 @@ start_broken = true [node name="item_dump" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true -item_type_0 = ExtResource( 5 ) +item_type_0 = ExtResource( 4 ) item_count_0 = 1 -item_type_1 = ExtResource( 4 ) +item_type_1 = ExtResource( 5 ) item_count_1 = 1 [node name="coin_machine" parent="." instance=ExtResource( 3 )] @@ -29,9 +29,7 @@ text = "Status: Broken" [node name="status_light" parent="." instance=ExtResource( 6 )] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.90735e-06, 1.34568, -0.13027 ) -omni_range = 1.547 -omni_attenuation = 0.5 +omni_attenuation = 0.933 [connection signal="item_dump_completed" from="item_dump" to="." method="_on_item_dump_item_dump_completed"] [connection signal="item_dumped" from="item_dump" to="." method="_on_item_dump_item_dumped"] diff --git a/scenes/crafting_station.tscn b/scenes/crafting_station.tscn index 6de1842..497901b 100644 --- a/scenes/crafting_station.tscn +++ b/scenes/crafting_station.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/crafting_station/crafting_station.gd" type="Script" id=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=3] [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/crystal.tres" type="Resource" id=6] [ext_resource path="res://item_types/ore.tres" type="Resource" id=7] [node name="crafting_station" type="Spatial" groups=["damageable"]] @@ -13,6 +14,7 @@ start_broken = true [node name="item_slot_1" parent="." groups=["crafting_item_slots"] instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.553907, -0.287795, 4.17596 ) +start_with_item = ExtResource( 6 ) [node name="item_slot_2" parent="." groups=["crafting_item_slots"] instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.553907, -0.287795, 2.17596 ) @@ -28,11 +30,13 @@ one_shot = true unique_name_in_owner = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.366242, 0, 0 ) item_type_0 = ExtResource( 7 ) -item_count_0 = 6 +item_count_0 = 2 [node name="status_light" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.627, 0.786, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.68222, 0.532975, 0.157571 ) +omni_range = 0.843 +omni_attenuation = 0.933034 [node name="progress_text" type="Label3D" parent="."] unique_name_in_owner = true diff --git a/scenes/dinner_table.tscn b/scenes/dinner_table.tscn index e6d2090..589ce3a 100644 --- a/scenes/dinner_table.tscn +++ b/scenes/dinner_table.tscn @@ -19,5 +19,6 @@ shape = SubResource( 4 ) [node name="item_holder" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.776869, 0 ) +start_with_item = ExtResource( 3 ) [connection signal="item_changed" from="item_holder" to="." method="_on_item_holder_item_changed"] diff --git a/scenes/hydroponics_station.tscn b/scenes/hydroponics_station.tscn index 8563659..8c70ee4 100644 --- a/scenes/hydroponics_station.tscn +++ b/scenes/hydroponics_station.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/hydroponics_station/hydroponics_station.gd" type="Script" id=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=3] [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/item_dump.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] +[ext_resource path="res://item_types/ingot.tres" type="Resource" id=6] [node name="hydroponics_station" type="Spatial"] script = ExtResource( 2 ) @@ -29,12 +28,13 @@ one_shot = true [node name="status_light" parent="." instance=ExtResource( 4 )] unique_name_in_owner = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.88956, 0 ) +omni_range = 1.0 +omni_attenuation = 0.933034 [node name="item_dump" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true item_type_0 = ExtResource( 6 ) -item_type_1 = ExtResource( 7 ) -item_count_1 = 2 +item_count_0 = 1 [connection signal="coin_requirement_met" from="coin_machine" to="." method="_on_coin_machine_coin_requirement_met"] [connection signal="item_changed" from="item_holder" to="." method="_on_item_holder_item_changed"] diff --git a/scenes/item_generator.tscn b/scenes/item_generator.tscn index 4015638..d936df1 100644 --- a/scenes/item_generator.tscn +++ b/scenes/item_generator.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://scripts/item_generator/item_generator.gd" type="Script" id=3] [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/gem.tres" type="Resource" id=6] [ext_resource path="res://item_types/ore.tres" type="Resource" id=7] [node name="item_generator" type="Spatial"] @@ -29,11 +29,11 @@ one_shot = true [node name="item_dump" parent="." instance=ExtResource( 4 )] unique_name_in_owner = true item_type_0 = ExtResource( 6 ) -item_type_1 = ExtResource( 7 ) +item_count_0 = 1 [node name="status_light" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.16106, 0.276903 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9.53674e-07, 1.40916, 0.00164795 ) [node name="Machine_Label" type="Label3D" parent="."] transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 1.88, 3, -1.043 ) diff --git a/scenes/main.tscn b/scenes/main.tscn index 5aff2db..4728646 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=30 format=2] [ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/cameras.gd" type="Script" id=2] @@ -21,6 +21,7 @@ [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=19] [ext_resource path="res://recipes/all_recipes.tres" type="Resource" id=20] [ext_resource path="res://scenes/rover_station.tscn" type="PackedScene" id=21] +[ext_resource path="res://item_types/geode.tres" type="Resource" id=22] [sub_resource type="CylinderShape" id=1] height = 5.22615 @@ -267,8 +268,9 @@ modulate = Color( 0, 0, 0, 1 ) text = "Ore Conveyor" [node name="item_generator" parent="Ore_Conveyor_Room" instance=ExtResource( 9 )] +start_broken = true -[node name="status_light" parent="Ore_Conveyor_Room" instance=ExtResource( 19 )] +[node name="conveyor_light" parent="Ore_Conveyor_Room" instance=ExtResource( 19 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.5684, 1.79682, -10.1376 ) omni_range = 2.39 omni_attenuation = 2.54912 @@ -283,7 +285,8 @@ modulate = Color( 0, 0, 0, 1 ) text = "Storage" [node name="item_holder" parent="Storage_Room" instance=ExtResource( 17 )] -transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 0.595228, 1.14717, -8.87313 ) +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 0.595225, 1.14717, -8.87313 ) +start_with_item = ExtResource( 22 ) [node name="item_holder2" parent="Storage_Room" instance=ExtResource( 17 )] transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 3.18382, 0.988555, -8.65995 ) @@ -293,6 +296,7 @@ transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, [node name="item_holder4" parent="Storage_Room" instance=ExtResource( 17 )] transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -4.17989, 1.15542, -5.03403 ) +start_with_item = ExtResource( 22 ) [node name="item_holder5" parent="Storage_Room" instance=ExtResource( 17 )] transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 4.6338, 1.01416, -9.90946 ) @@ -314,6 +318,7 @@ text = "Crafting" [node name="crafting_station" parent="Crafting_Room" instance=ExtResource( 12 )] transform = Transform( 0, 0, -0.999999, 0, 1, 0, 0.999999, 0, 0, 3.43733, 0.789991, -9.25881 ) +start_broken = false recipes = ExtResource( 20 ) gen_time = 20.0 @@ -394,6 +399,7 @@ transform = Transform( 1, 6.98492e-10, -8.19564e-08, -1.45519e-09, 1, 5.78439e-1 transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, -11, 0, 11 ) [node name="rover_station" parent="Rover_Room" instance=ExtResource( 21 )] +start_broken = true [node name="CanvasLayer" type="CanvasLayer" parent="."] diff --git a/scenes/oven.tscn b/scenes/oven.tscn index ca7e3bf..405ccc0 100644 --- a/scenes/oven.tscn +++ b/scenes/oven.tscn @@ -6,7 +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] +[ext_resource path="res://item_types/ingot.tres" type="Resource" id=7] [sub_resource type="BoxShape" id=4] extents = Vector3( 0.648623, 1, 0.516904 ) @@ -23,7 +23,7 @@ collision_mask = 0 item_type_0 = ExtResource( 6 ) item_count_0 = 1 item_type_1 = ExtResource( 7 ) -item_count_1 = 4 +item_count_1 = 1 [node name="item_holder" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true diff --git a/scenes/player.tscn b/scenes/player.tscn index 93c10ff..f33b636 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -714,7 +714,7 @@ mesh = SubResource( 1 ) skin = SubResource( 2 ) [node name="head_bone" type="BoneAttachment" parent="model_transform/DungMan/Armature/Skeleton" index="1"] -transform = Transform( 1, -2.22045e-16, 5.12852e-23, 1.32349e-23, 2.83122e-07, 1, -2.22045e-16, -1, 2.83122e-07, -3.33067e-16, 5.21541e-08, -1.5 ) +transform = Transform( 1, -2.20707e-16, -2.35891e-17, 2.74492e-19, -0.105045, 0.994467, -2.21964e-16, -0.994467, -0.105045, -3.31838e-16, -0.0380623, -1.50372 ) bone_name = "Item" [node name="ItemSpawn" type="Spatial" parent="model_transform/DungMan/Armature/Skeleton/head_bone"] diff --git a/scenes/power_station.tscn b/scenes/power_station.tscn index 342af76..148cac9 100644 --- a/scenes/power_station.tscn +++ b/scenes/power_station.tscn @@ -19,6 +19,7 @@ shape = SubResource( 2 ) [node name="CointCount" type="Label3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0275149, 0.721019, 1.58046 ) +visible = false billboard = 1 [node name="sounds" type="Node" parent="."] diff --git a/scenes/rover_station.tscn b/scenes/rover_station.tscn index d19324a..0a2cbe6 100644 --- a/scenes/rover_station.tscn +++ b/scenes/rover_station.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=3] [ext_resource path="res://scenes/item_dump.tscn" type="PackedScene" id=4] +[ext_resource path="res://item_types/metal_plate.tres" type="Resource" id=5] [ext_resource path="res://scripts/rover_station/rover_station.gd" type="Script" id=6] [ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=11] @@ -12,8 +13,9 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.173937, 0, -3.56739 ) script = ExtResource( 6 ) [node name="status_light" parent="." instance=ExtResource( 1 )] -transform = Transform( 0.999404, 0, 0.0345158, 0, 1, 0, -0.0345158, 0, 0.999404, 0.0140028, -0.0739165, 1.81011 ) -omni_range = 2.3706 +transform = Transform( 0.999404, 0, 0.0345158, 0, 1, 0, -0.0345158, 0, 0.999404, -0.0265484, 1.33993, 0.635927 ) +omni_range = 1.69 +omni_attenuation = 1.03523 [node name="coin_machine" parent="." instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.02357, 0.126143 ) @@ -25,6 +27,8 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.26269, 0.778543, -0.31761 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.53674e-07, 0.993049, 0.0943546 ) item_type_0 = ExtResource( 11 ) item_count_0 = 1 +item_type_1 = ExtResource( 5 ) +item_count_1 = 1 [node name="game_canvas" type="CanvasLayer" parent="."] layer = 0 diff --git a/scenes/status_light.tscn b/scenes/status_light.tscn index e9d2eba..f3a738d 100644 --- a/scenes/status_light.tscn +++ b/scenes/status_light.tscn @@ -171,9 +171,9 @@ tracks/1/keys = { } [node name="status_light" type="OmniLight"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.400717, 0.897655 ) -omni_range = 1.03219 -omni_attenuation = 0.120742 +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.90735e-06, 1.34568, -0.13027 ) +omni_range = 1.547 +omni_attenuation = 0.5 script = ExtResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."]