From 91237270f2255bd02909bc46e86a7840ce310622 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Sat, 20 Jul 2024 09:53:16 +0200 Subject: [PATCH] Renamed all files to snake_case.ending. --- .../{Engineer.tscn => engineer.tscn} | 0 assets/characters/{Rogue.tscn => rogue.tscn} | 0 assets/resources/{Door.png => door.png} | Bin .../{Door.png.import => door.png.import} | 6 +- assets/resources/{Stick.tscn => stick.tscn} | 0 assets/resources/{Stone.tscn => stone.tscn} | 0 .../resources/{TreeLog.png => tree_log.png} | Bin ...TreeLog.png.import => tree_log.png.import} | 6 +- .../resources/{TreeLog.tscn => tree_log.tscn} | 0 .../{WoodPlank.png => wood_planks.png} | Bin ...lank.png.import => wood_planks.png.import} | 6 +- .../{WoodPlanks.tscn => wood_planks.tscn} | 0 data/items/stick.tres | 2 +- data/items/stone.tres | 2 +- data/items/treelog.tres | 4 +- data/items/woodplanks.tres | 4 +- Game.gd => game.gd | 0 Game.tscn => game.tscn | 174 +++++++++--------- GameUI.gd => game_ui.gd | 0 objects/{Actionable.tscn => actionable.tscn} | 0 objects/{PickupItem.tscn => pickup_item.tscn} | 0 Player.gd => player.gd | 0 project.godot | 2 +- RootUI.gd => root_ui.gd | 0 ui/game_ui.tscn | 2 +- World.gd => world.gd | 0 world/level.tscn | 10 +- 27 files changed, 109 insertions(+), 109 deletions(-) rename assets/characters/{Engineer.tscn => engineer.tscn} (100%) rename assets/characters/{Rogue.tscn => rogue.tscn} (100%) rename assets/resources/{Door.png => door.png} (100%) rename assets/resources/{Door.png.import => door.png.import} (73%) rename assets/resources/{Stick.tscn => stick.tscn} (100%) rename assets/resources/{Stone.tscn => stone.tscn} (100%) rename assets/resources/{TreeLog.png => tree_log.png} (100%) rename assets/resources/{TreeLog.png.import => tree_log.png.import} (71%) rename assets/resources/{TreeLog.tscn => tree_log.tscn} (100%) rename assets/resources/{WoodPlank.png => wood_planks.png} (100%) rename assets/resources/{WoodPlank.png.import => wood_planks.png.import} (71%) rename assets/resources/{WoodPlanks.tscn => wood_planks.tscn} (100%) rename Game.gd => game.gd (100%) rename Game.tscn => game.tscn (90%) rename GameUI.gd => game_ui.gd (100%) rename objects/{Actionable.tscn => actionable.tscn} (100%) rename objects/{PickupItem.tscn => pickup_item.tscn} (100%) rename Player.gd => player.gd (100%) rename RootUI.gd => root_ui.gd (100%) rename World.gd => world.gd (100%) diff --git a/assets/characters/Engineer.tscn b/assets/characters/engineer.tscn similarity index 100% rename from assets/characters/Engineer.tscn rename to assets/characters/engineer.tscn diff --git a/assets/characters/Rogue.tscn b/assets/characters/rogue.tscn similarity index 100% rename from assets/characters/Rogue.tscn rename to assets/characters/rogue.tscn diff --git a/assets/resources/Door.png b/assets/resources/door.png similarity index 100% rename from assets/resources/Door.png rename to assets/resources/door.png diff --git a/assets/resources/Door.png.import b/assets/resources/door.png.import similarity index 73% rename from assets/resources/Door.png.import rename to assets/resources/door.png.import index ef4ab52..d36792b 100644 --- a/assets/resources/Door.png.import +++ b/assets/resources/door.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cnk5evriq2ayx" -path="res://.godot/imported/Door.png-145ec46e1204f0ef4edc7c38b96826ec.ctex" +path="res://.godot/imported/door.png-4773fa46d37f0eeb39c2983dbabcd688.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/resources/Door.png" -dest_files=["res://.godot/imported/Door.png-145ec46e1204f0ef4edc7c38b96826ec.ctex"] +source_file="res://assets/resources/door.png" +dest_files=["res://.godot/imported/door.png-4773fa46d37f0eeb39c2983dbabcd688.ctex"] [params] diff --git a/assets/resources/Stick.tscn b/assets/resources/stick.tscn similarity index 100% rename from assets/resources/Stick.tscn rename to assets/resources/stick.tscn diff --git a/assets/resources/Stone.tscn b/assets/resources/stone.tscn similarity index 100% rename from assets/resources/Stone.tscn rename to assets/resources/stone.tscn diff --git a/assets/resources/TreeLog.png b/assets/resources/tree_log.png similarity index 100% rename from assets/resources/TreeLog.png rename to assets/resources/tree_log.png diff --git a/assets/resources/TreeLog.png.import b/assets/resources/tree_log.png.import similarity index 71% rename from assets/resources/TreeLog.png.import rename to assets/resources/tree_log.png.import index 4a6a230..58607ec 100644 --- a/assets/resources/TreeLog.png.import +++ b/assets/resources/tree_log.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://16ro4vt2obea" -path="res://.godot/imported/TreeLog.png-db62f094f2963276a02c5369c99c4c79.ctex" +path="res://.godot/imported/tree_log.png-d87ebeb4287fdaeb09b73b4d4e061e2b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/resources/TreeLog.png" -dest_files=["res://.godot/imported/TreeLog.png-db62f094f2963276a02c5369c99c4c79.ctex"] +source_file="res://assets/resources/tree_log.png" +dest_files=["res://.godot/imported/tree_log.png-d87ebeb4287fdaeb09b73b4d4e061e2b.ctex"] [params] diff --git a/assets/resources/TreeLog.tscn b/assets/resources/tree_log.tscn similarity index 100% rename from assets/resources/TreeLog.tscn rename to assets/resources/tree_log.tscn diff --git a/assets/resources/WoodPlank.png b/assets/resources/wood_planks.png similarity index 100% rename from assets/resources/WoodPlank.png rename to assets/resources/wood_planks.png diff --git a/assets/resources/WoodPlank.png.import b/assets/resources/wood_planks.png.import similarity index 71% rename from assets/resources/WoodPlank.png.import rename to assets/resources/wood_planks.png.import index d0fa78f..3a910f8 100644 --- a/assets/resources/WoodPlank.png.import +++ b/assets/resources/wood_planks.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://52wdejv20ogj" -path="res://.godot/imported/WoodPlank.png-dd6fcf30b33f5d76c4a05b736723549f.ctex" +path="res://.godot/imported/wood_planks.png-33bd750bd8ac9cf6721f3e489ebb2390.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/resources/WoodPlank.png" -dest_files=["res://.godot/imported/WoodPlank.png-dd6fcf30b33f5d76c4a05b736723549f.ctex"] +source_file="res://assets/resources/wood_planks.png" +dest_files=["res://.godot/imported/wood_planks.png-33bd750bd8ac9cf6721f3e489ebb2390.ctex"] [params] diff --git a/assets/resources/WoodPlanks.tscn b/assets/resources/wood_planks.tscn similarity index 100% rename from assets/resources/WoodPlanks.tscn rename to assets/resources/wood_planks.tscn diff --git a/data/items/stick.tres b/data/items/stick.tres index cebfedc..be21e79 100644 --- a/data/items/stick.tres +++ b/data/items/stick.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="Item" load_steps=4 format=3 uid="uid://bn5j38jbwlj1f"] [ext_resource type="Texture2D" uid="uid://c3jmpy6x5m4gj" path="res://assets/3rdparty/kenney/survival-kit/Previews/resourceWood.png" id="1_c3g8n"] -[ext_resource type="PackedScene" uid="uid://dtd7p4wjaumae" path="res://assets/resources/Stick.tscn" id="2_mrxum"] +[ext_resource type="PackedScene" uid="uid://dtd7p4wjaumae" path="res://assets/resources/stick.tscn" id="2_mrxum"] [ext_resource type="Script" path="res://model/item.gd" id="3_45lxd"] [resource] diff --git a/data/items/stone.tres b/data/items/stone.tres index 88310c0..bdf90f6 100644 --- a/data/items/stone.tres +++ b/data/items/stone.tres @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://model/item.gd" id="1_dao2u"] [ext_resource type="Texture2D" uid="uid://g3681g7x22eg" path="res://assets/3rdparty/kenney/survival-kit/Previews/resourceStone.png" id="1_t2qva"] -[ext_resource type="PackedScene" uid="uid://lp0bgqyd2pnr" path="res://assets/resources/Stone.tscn" id="2_6nus0"] +[ext_resource type="PackedScene" uid="uid://lp0bgqyd2pnr" path="res://assets/resources/stone.tscn" id="2_6nus0"] [resource] script = ExtResource("1_dao2u") diff --git a/data/items/treelog.tres b/data/items/treelog.tres index 0de90a4..2e92e17 100644 --- a/data/items/treelog.tres +++ b/data/items/treelog.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="Item" load_steps=4 format=3 uid="uid://c1ll2snhgv3m1"] -[ext_resource type="Texture2D" uid="uid://16ro4vt2obea" path="res://assets/resources/TreeLog.png" id="1_ak0y2"] +[ext_resource type="Texture2D" uid="uid://16ro4vt2obea" path="res://assets/resources/tree_log.png" id="1_ak0y2"] [ext_resource type="Script" path="res://model/item.gd" id="1_tlj5a"] -[ext_resource type="PackedScene" uid="uid://bbmt7xom1j84b" path="res://assets/resources/TreeLog.tscn" id="2_ufvdy"] +[ext_resource type="PackedScene" uid="uid://bbmt7xom1j84b" path="res://assets/resources/tree_log.tscn" id="2_ufvdy"] [resource] script = ExtResource("1_tlj5a") diff --git a/data/items/woodplanks.tres b/data/items/woodplanks.tres index c83ace0..186994e 100644 --- a/data/items/woodplanks.tres +++ b/data/items/woodplanks.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="Item" load_steps=4 format=3 uid="uid://dmjr6pmb17l2y"] -[ext_resource type="Texture2D" uid="uid://52wdejv20ogj" path="res://assets/resources/WoodPlank.png" id="1_plody"] -[ext_resource type="PackedScene" uid="uid://ysfnsrvgemi6" path="res://assets/resources/WoodPlanks.tscn" id="2_4oehn"] +[ext_resource type="Texture2D" uid="uid://52wdejv20ogj" path="res://assets/resources/wood_planks.png" id="1_plody"] +[ext_resource type="PackedScene" uid="uid://ysfnsrvgemi6" path="res://assets/resources/wood_planks.tscn" id="2_4oehn"] [ext_resource type="Script" path="res://model/item.gd" id="3_c8yxb"] [resource] diff --git a/Game.gd b/game.gd similarity index 100% rename from Game.gd rename to game.gd diff --git a/Game.tscn b/game.tscn similarity index 90% rename from Game.tscn rename to game.tscn index 5738197..369fc54 100644 --- a/Game.tscn +++ b/game.tscn @@ -1,29 +1,29 @@ [gd_scene load_steps=36 format=3 uid="uid://bugqatylloxkl"] -[ext_resource type="Script" path="res://Player.gd" id="1_3lyis"] -[ext_resource type="Script" path="res://Game.gd" id="1_h44o7"] -[ext_resource type="Script" path="res://RootUI.gd" id="2_gg3gt"] -[ext_resource type="PackedScene" uid="uid://dy8vjf760prhq" path="res://assets/characters/Rogue.tscn" id="4_6mbva"] -[ext_resource type="Script" path="res://model/quest_state.gd" id="4_fmwrw"] -[ext_resource type="Texture2D" uid="uid://cq8ypeagpedq" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_bronze.png" id="4_pcyi0"] -[ext_resource type="Texture2D" uid="uid://c7fu3paj3b4e8" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_silver.png" id="5_24tqj"] -[ext_resource type="Texture2D" uid="uid://drpl0ql1p3pfk" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_gold.png" id="6_uid86"] -[ext_resource type="Script" path="res://GameUI.gd" id="7_mw21s"] -[ext_resource type="Theme" uid="uid://dmk7hc81l8gbw" path="res://ui/ui_theme.tres" id="8_qpuke"] -[ext_resource type="Texture2D" uid="uid://bq3b1hxl5ojh6" path="res://assets/icons/npc_emotes/attention.tres" id="10_6agi3"] -[ext_resource type="PackedScene" uid="uid://dmagdl5pi6jdj" path="res://world/level.tscn" id="11_m8tt7"] -[ext_resource type="Script" path="res://ui/inventory_dialog.gd" id="12_8cl6a"] -[ext_resource type="PackedScene" uid="uid://dp3fi0g53qrt2" path="res://ui/item_slot.tscn" id="12_v6fpp"] -[ext_resource type="PackedScene" uid="uid://2q8dhf61a7os" path="res://assets/characters/Engineer.tscn" id="13_gxr54"] -[ext_resource type="PackedScene" uid="uid://dhpc2xvlfln7o" path="res://objects/Actionable.tscn" id="14_qb8uo"] -[ext_resource type="Resource" uid="uid://b1gd54koq1h7o" path="res://dialogue/testdialogue.dialogue" id="15_2n7cr"] -[ext_resource type="PackedScene" uid="uid://bwui4acukq4x6" path="res://ui/item_grid.tscn" id="15_5xu2a"] -[ext_resource type="PackedScene" uid="uid://dnobr4inhiskv" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/tree-pine.glb" id="21_5210s"] -[ext_resource type="PackedScene" uid="uid://m4tk7vhjy310" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/tree.glb" id="22_xm4au"] -[ext_resource type="PackedScene" uid="uid://cgde10y3e7w86" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/rocks.glb" id="23_ve8c6"] -[ext_resource type="PackedScene" uid="uid://dg1rtct0vrk3p" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/poles.glb" id="24_a3mo8"] -[ext_resource type="PackedScene" uid="uid://kpyvcyklt68g" path="res://assets/scene_props/bridge.tscn" id="25_qvbtw"] -[ext_resource type="PackedScene" uid="uid://cej0a41nm3eh7" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/mushrooms.glb" id="25_tea3k"] +[ext_resource type="Script" path="res://game.gd" id="1_uwyoo"] +[ext_resource type="Texture2D" uid="uid://bq3b1hxl5ojh6" path="res://assets/icons/npc_emotes/attention.tres" id="2_4dxur"] +[ext_resource type="PackedScene" uid="uid://2q8dhf61a7os" path="res://assets/characters/engineer.tscn" id="3_gf736"] +[ext_resource type="PackedScene" uid="uid://dhpc2xvlfln7o" path="res://objects/actionable.tscn" id="4_pths5"] +[ext_resource type="Resource" uid="uid://b1gd54koq1h7o" path="res://dialogue/testdialogue.dialogue" id="5_i1opu"] +[ext_resource type="PackedScene" uid="uid://dmagdl5pi6jdj" path="res://world/level.tscn" id="6_svjo8"] +[ext_resource type="PackedScene" uid="uid://dnobr4inhiskv" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/tree-pine.glb" id="7_0tqw3"] +[ext_resource type="PackedScene" uid="uid://m4tk7vhjy310" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/tree.glb" id="8_ivm2f"] +[ext_resource type="PackedScene" uid="uid://cgde10y3e7w86" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/rocks.glb" id="9_0hvyx"] +[ext_resource type="PackedScene" uid="uid://dg1rtct0vrk3p" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/poles.glb" id="10_8fhnl"] +[ext_resource type="PackedScene" uid="uid://cej0a41nm3eh7" path="res://assets/3rdparty/kenney/platformer-kit/Models/GLB format/mushrooms.glb" id="11_ytfwt"] +[ext_resource type="PackedScene" uid="uid://kpyvcyklt68g" path="res://assets/scene_props/bridge.tscn" id="12_ybrl7"] +[ext_resource type="Script" path="res://player.gd" id="13_2wo8v"] +[ext_resource type="Script" path="res://model/quest_state.gd" id="14_g3xjj"] +[ext_resource type="PackedScene" uid="uid://dy8vjf760prhq" path="res://assets/characters/rogue.tscn" id="15_2476h"] +[ext_resource type="Script" path="res://root_ui.gd" id="16_winq7"] +[ext_resource type="Theme" uid="uid://dmk7hc81l8gbw" path="res://ui/ui_theme.tres" id="17_1odts"] +[ext_resource type="Script" path="res://game_ui.gd" id="18_i4pxl"] +[ext_resource type="Texture2D" uid="uid://c7fu3paj3b4e8" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_silver.png" id="19_mn7wc"] +[ext_resource type="Texture2D" uid="uid://drpl0ql1p3pfk" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_gold.png" id="20_3b2hv"] +[ext_resource type="Texture2D" uid="uid://cq8ypeagpedq" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_bronze.png" id="21_act8d"] +[ext_resource type="Script" path="res://ui/inventory_dialog.gd" id="22_s3l55"] +[ext_resource type="PackedScene" uid="uid://dp3fi0g53qrt2" path="res://ui/item_slot.tscn" id="23_4kchv"] +[ext_resource type="PackedScene" uid="uid://bwui4acukq4x6" path="res://ui/item_grid.tscn" id="24_hfjh5"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_y65pc"] @@ -67,7 +67,7 @@ height = 0.952333 radius = 0.194932 [node name="Game" type="Node3D"] -script = ExtResource("1_h44o7") +script = ExtResource("1_uwyoo") [node name="World" type="Node3D" parent="."] unique_name_in_owner = true @@ -96,46 +96,82 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0272007, 0.901301, 0.16839 centered = false billboard = 1 texture_filter = 0 -texture = ExtResource("10_6agi3") +texture = ExtResource("2_4dxur") [node name="Geometry" type="Node3D" parent="World/Merchant"] transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0) -[node name="Engineer" parent="World/Merchant/Geometry" instance=ExtResource("13_gxr54")] +[node name="Engineer" parent="World/Merchant/Geometry" instance=ExtResource("3_gf736")] -[node name="Actionable" parent="World/Merchant" instance=ExtResource("14_qb8uo")] -dialogue_resource = ExtResource("15_2n7cr") +[node name="Actionable" parent="World/Merchant" instance=ExtResource("4_pths5")] +dialogue_resource = ExtResource("5_i1opu") [node name="CollisionShape3D" type="CollisionShape3D" parent="World/Merchant/Actionable"] shape = SubResource("SphereShape3D_6nrvr") -[node name="Level" parent="World" instance=ExtResource("11_m8tt7")] +[node name="Level" parent="World" instance=ExtResource("6_svjo8")] [node name="Decorations" type="Node3D" parent="World"] -[node name="tree-pine2" parent="World/Decorations" instance=ExtResource("21_5210s")] +[node name="tree-pine2" parent="World/Decorations" instance=ExtResource("7_0tqw3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.754677, 0, 0.0391712) -[node name="tree2" parent="World/Decorations" instance=ExtResource("22_xm4au")] +[node name="tree2" parent="World/Decorations" instance=ExtResource("8_ivm2f")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.80764, 0, -3.13532) -[node name="rocks2" parent="World/Decorations" instance=ExtResource("23_ve8c6")] +[node name="rocks2" parent="World/Decorations" instance=ExtResource("9_0hvyx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3817, -4.76837e-07, -3.3938) -[node name="poles2" parent="World/Decorations" instance=ExtResource("24_a3mo8")] +[node name="poles2" parent="World/Decorations" instance=ExtResource("10_8fhnl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.56186, 0, -3.13331) -[node name="mushrooms2" parent="World/Decorations" instance=ExtResource("25_tea3k")] +[node name="mushrooms2" parent="World/Decorations" instance=ExtResource("11_ytfwt")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.851, 0, 0.798104) [node name="Bridge" type="Node3D" parent="World"] unique_name_in_owner = true -[node name="BridgePart2" parent="World/Bridge" instance=ExtResource("25_qvbtw")] +[node name="BridgePart2" parent="World/Bridge" instance=ExtResource("12_ybrl7")] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.723, 0, -1.439) +[node name="Player" type="CharacterBody3D" parent="World" groups=["savable_nodes"]] +unique_name_in_owner = true +script = ExtResource("13_2wo8v") + +[node name="QuestState" type="Node" parent="World/Player"] +unique_name_in_owner = true +script = ExtResource("14_g3xjj") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="World/Player"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0) +visible = false +mesh = SubResource("CapsuleMesh_dwrtd") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="World/Player"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.470516, 0) +shape = SubResource("CapsuleShape3D_7kfad") + +[node name="Camera3D" type="Camera3D" parent="World/Player"] +transform = Transform3D(1, 0, 0, 0, 0.460138, 0.887848, 0, -0.887848, 0.460138, 0, 2.91421, 1.186) +current = true + +[node name="Geometry" type="Node3D" parent="World/Player"] +unique_name_in_owner = true +transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0) + +[node name="Rogue" parent="World/Player/Geometry" instance=ExtResource("15_2476h")] + +[node name="ActionableDetector" type="Area3D" parent="World/Player"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.325311) +collision_layer = 0 +collision_mask = 16 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="World/Player/ActionableDetector"] +shape = SubResource("SphereShape3D_wrkyq") + [node name="RootUI" type="CanvasLayer" parent="."] -script = ExtResource("2_gg3gt") +script = ExtResource("16_winq7") [node name="MainMenuUI" type="PanelContainer" parent="RootUI"] unique_name_in_owner = true @@ -151,7 +187,7 @@ offset_right = 199.0 offset_bottom = 134.5 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("8_qpuke") +theme = ExtResource("17_1odts") [node name="MarginContainer" type="MarginContainer" parent="RootUI/MainMenuUI"] layout_mode = 2 @@ -222,7 +258,7 @@ offset_right = 291.0 offset_bottom = 144.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("8_qpuke") +theme = ExtResource("17_1odts") [node name="MarginContainer" type="MarginContainer" parent="RootUI/NewGameUI"] layout_mode = 2 @@ -309,7 +345,7 @@ offset_right = 199.0 offset_bottom = 186.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("8_qpuke") +theme = ExtResource("17_1odts") [node name="MarginContainer" type="MarginContainer" parent="RootUI/GameMenuUI"] layout_mode = 2 @@ -379,8 +415,8 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -theme = ExtResource("8_qpuke") -script = ExtResource("7_mw21s") +theme = ExtResource("17_1odts") +script = ExtResource("18_i4pxl") [node name="ToolSlots" type="MarginContainer" parent="RootUI/GameUI"] layout_mode = 1 @@ -404,15 +440,15 @@ layout_mode = 2 [node name="Button2" type="Button" parent="RootUI/GameUI/ToolSlots/PanelContainer/HBoxContainer"] layout_mode = 2 -icon = ExtResource("5_24tqj") +icon = ExtResource("19_mn7wc") [node name="Button3" type="Button" parent="RootUI/GameUI/ToolSlots/PanelContainer/HBoxContainer"] layout_mode = 2 -icon = ExtResource("6_uid86") +icon = ExtResource("20_3b2hv") [node name="Button" type="Button" parent="RootUI/GameUI/ToolSlots/PanelContainer/HBoxContainer"] layout_mode = 2 -icon = ExtResource("4_pcyi0") +icon = ExtResource("21_act8d") [node name="MessagesContainer" type="MarginContainer" parent="RootUI/GameUI"] unique_name_in_owner = true @@ -450,8 +486,8 @@ theme_override_constants/margin_left = 40 theme_override_constants/margin_top = 82 theme_override_constants/margin_right = 40 theme_override_constants/margin_bottom = 128 -script = ExtResource("12_8cl6a") -slot_scene = ExtResource("12_v6fpp") +script = ExtResource("22_s3l55") +slot_scene = ExtResource("23_4kchv") [node name="Panel" type="Panel" parent="RootUI/GameUI/InventoryDialog"] layout_mode = 2 @@ -503,7 +539,7 @@ text = "Recipes" unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 -theme = ExtResource("8_qpuke") +theme = ExtResource("17_1odts") item_count = 2 item_0/text = "Blab" item_1/text = "Bloobalb" @@ -535,7 +571,7 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_vertical = 3 -[node name="IngredientsContainer" parent="RootUI/GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftIngredients/Panel/CenterContainer" instance=ExtResource("15_5xu2a")] +[node name="IngredientsContainer" parent="RootUI/GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftIngredients/Panel/CenterContainer" instance=ExtResource("24_hfjh5")] unique_name_in_owner = true layout_mode = 2 @@ -573,7 +609,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="ResultsContainer" parent="RootUI/GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftResult/Panel/CenterContainer" instance=ExtResource("15_5xu2a")] +[node name="ResultsContainer" parent="RootUI/GameUI/InventoryDialog/Panel/PanelContainer/CraftingUI/HBoxContainer/CraftResult/Panel/CenterContainer" instance=ExtResource("24_hfjh5")] unique_name_in_owner = true layout_mode = 2 @@ -601,48 +637,12 @@ layout_mode = 2 layout_mode = 2 text = "Backpack" -[node name="InventoryContainer" parent="RootUI/GameUI/InventoryDialog/Panel/PanelContainer/BackpackUI/VBoxContainer" instance=ExtResource("15_5xu2a")] +[node name="InventoryContainer" parent="RootUI/GameUI/InventoryDialog/Panel/PanelContainer/BackpackUI/VBoxContainer" instance=ExtResource("24_hfjh5")] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -[node name="Player" type="CharacterBody3D" parent="." groups=["savable_nodes"]] -unique_name_in_owner = true -script = ExtResource("1_3lyis") - -[node name="QuestState" type="Node" parent="Player"] -unique_name_in_owner = true -script = ExtResource("4_fmwrw") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0) -visible = false -mesh = SubResource("CapsuleMesh_dwrtd") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.470516, 0) -shape = SubResource("CapsuleShape3D_7kfad") - -[node name="Camera3D" type="Camera3D" parent="Player"] -transform = Transform3D(1, 0, 0, 0, 0.460138, 0.887848, 0, -0.887848, 0.460138, 0, 2.91421, 1.186) -current = true - -[node name="Geometry" type="Node3D" parent="Player"] -unique_name_in_owner = true -transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0) - -[node name="Rogue" parent="Player/Geometry" instance=ExtResource("4_6mbva")] - -[node name="ActionableDetector" type="Area3D" parent="Player"] -unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.325311) -collision_layer = 0 -collision_mask = 16 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Player/ActionableDetector"] -shape = SubResource("SphereShape3D_wrkyq") - [connection signal="pressed" from="RootUI/MainMenuUI/MarginContainer/VBoxContainer/MarginContainer/NewGameButton" to="RootUI" method="_on_new_game_button_pressed"] [connection signal="pressed" from="RootUI/MainMenuUI/MarginContainer/VBoxContainer/MarginContainer3/QuitButton" to="RootUI" method="_on_quit_button_pressed"] [connection signal="pressed" from="RootUI/NewGameUI/MarginContainer/VBoxContainer/MarginContainer3/HBoxContainer/BackButton" to="RootUI" method="_to_main_menu_button_pressed"] diff --git a/GameUI.gd b/game_ui.gd similarity index 100% rename from GameUI.gd rename to game_ui.gd diff --git a/objects/Actionable.tscn b/objects/actionable.tscn similarity index 100% rename from objects/Actionable.tscn rename to objects/actionable.tscn diff --git a/objects/PickupItem.tscn b/objects/pickup_item.tscn similarity index 100% rename from objects/PickupItem.tscn rename to objects/pickup_item.tscn diff --git a/Player.gd b/player.gd similarity index 100% rename from Player.gd rename to player.gd diff --git a/project.godot b/project.godot index ef8c18f..b9000d6 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="UIAndInteractionTests" -run/main_scene="res://Game.tscn" +run/main_scene="res://game.tscn" config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" diff --git a/RootUI.gd b/root_ui.gd similarity index 100% rename from RootUI.gd rename to root_ui.gd diff --git a/ui/game_ui.tscn b/ui/game_ui.tscn index ab3dadd..3b20692 100644 --- a/ui/game_ui.tscn +++ b/ui/game_ui.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=3 uid="uid://cqmnmqjsutedj"] [ext_resource type="Theme" uid="uid://dmk7hc81l8gbw" path="res://ui/ui_theme.tres" id="1_xu30n"] -[ext_resource type="Script" path="res://GameUI.gd" id="2_vb3s6"] +[ext_resource type="Script" path="res://game_ui.gd" id="2_vb3s6"] [ext_resource type="Texture2D" uid="uid://c7fu3paj3b4e8" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_silver.png" id="3_vepel"] [ext_resource type="Texture2D" uid="uid://drpl0ql1p3pfk" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_gold.png" id="4_ijjgh"] [ext_resource type="Texture2D" uid="uid://cq8ypeagpedq" path="res://assets/3rdparty/kenney/ui-pack-rpg-expansion/PNG/cursorSword_bronze.png" id="5_4e7rh"] diff --git a/World.gd b/world.gd similarity index 100% rename from World.gd rename to world.gd diff --git a/world/level.tscn b/world/level.tscn index 165ae4f..f6c272b 100644 --- a/world/level.tscn +++ b/world/level.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=11 format=3 uid="uid://dmagdl5pi6jdj"] [ext_resource type="MeshLibrary" uid="uid://dcpuitbu16j1a" path="res://assets/mesh_library.tres" id="1_q0eym"] -[ext_resource type="PackedScene" uid="uid://da5r82nvypfk4" path="res://objects/PickupItem.tscn" id="2_qurr0"] +[ext_resource type="PackedScene" uid="uid://da5r82nvypfk4" path="res://objects/pickup_item.tscn" id="2_qurr0"] [ext_resource type="Resource" uid="uid://bn5j38jbwlj1f" path="res://data/items/stick.tres" id="3_q180r"] -[ext_resource type="PackedScene" uid="uid://dtd7p4wjaumae" path="res://assets/resources/Stick.tscn" id="4_h3618"] +[ext_resource type="PackedScene" uid="uid://dtd7p4wjaumae" path="res://assets/resources/stick.tscn" id="4_h3618"] [ext_resource type="Resource" uid="uid://egkatj1ci0ga" path="res://data/items/wrench.tres" id="5_tmrcc"] [ext_resource type="Resource" uid="uid://coser1y1y5unl" path="res://data/items/door.tres" id="5_twsf3"] [ext_resource type="PackedScene" uid="uid://ca2l61b2j3y5b" path="res://assets/tools/Pickaxe.tscn" id="6_fq3ct"] -[ext_resource type="PackedScene" uid="uid://ysfnsrvgemi6" path="res://assets/resources/WoodPlanks.tscn" id="7_2hyvg"] +[ext_resource type="PackedScene" uid="uid://ysfnsrvgemi6" path="res://assets/resources/wood_planks.tscn" id="8_4vlpe"] [ext_resource type="Resource" uid="uid://c1ll2snhgv3m1" path="res://data/items/treelog.tres" id="8_pafka"] -[ext_resource type="PackedScene" uid="uid://bbmt7xom1j84b" path="res://assets/resources/TreeLog.tscn" id="9_51v1q"] +[ext_resource type="PackedScene" uid="uid://bbmt7xom1j84b" path="res://assets/resources/tree_log.tscn" id="9_51v1q"] [node name="Level" type="Node3D"] @@ -47,7 +47,7 @@ item = ExtResource("5_twsf3") [node name="Item2" parent="Objects" instance=ExtResource("2_qurr0")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.978853, -2.38419e-07, -1.39068) -[node name="_Node3D_153925" parent="Objects/Item2" instance=ExtResource("7_2hyvg")] +[node name="_Node3D_153925" parent="Objects/Item2" instance=ExtResource("8_4vlpe")] [node name="Item3" parent="Objects" instance=ExtResource("2_qurr0")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.28455, 0, -0.204204)