snider/project-dung
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated oven to extend Damageable and updated code to override base class properly

Browse Source
This commit is contained in:
akshay committed 2022-08-18 21:30:21 -04:00
1 parent b10ad40552
commit 8974f0cc56
8 files changed
+19 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scenes/crafting_station.tscn
+4 -1
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 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]
@@ -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]
height = 0.936
@@ -57,6 +58,8 @@ unique_name_in_owner = true
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.366242, 0, 0 )
item_type_0 = ExtResource( 6 )
item_count_0 = 1
item_type_1 = ExtResource( 7 )
item_count_1 = 2
[node name="status_light" parent="." instance=ExtResource( 5 )]
unique_name_in_owner = true
scenes/dev-akshay.tscn
+4 -1
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=27 format=2]
[gd_scene load_steps=28 format=2]
[ext_resource path="res://scenes/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://scripts/dof_focus.gd" type="Script" id=2]
@@ -20,6 +20,7 @@
[ext_resource path="res://scenes/comm_station.tscn" type="PackedScene" id=18]
[ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=19]
[ext_resource path="res://scenes/bed.tscn" type="PackedScene" id=20]
[ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=21]
[sub_resource type="CylinderShape" id=8]
height = 5.22615
@@ -248,9 +249,11 @@ 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.0128546, 0, -8.17408 )
start_with_item = ExtResource( 21 )
[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, -2.64011, 0, -8.27395 )
start_with_item = ExtResource( 6 )
[node name="item_holder3" parent="Storage_Room" instance=ExtResource( 17 )]
transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 2.23318, 0, -8.0887 )
scenes/item_generator.tscn
+2
View File
@@ -42,6 +42,8 @@ one_shot = true
unique_name_in_owner = true
item_type_0 = ExtResource( 6 )
item_count_0 = 1
item_type_1 = ExtResource( 7 )
item_count_1 = 2
[node name="status_light" parent="." instance=ExtResource( 5 )]
unique_name_in_owner = true