From 94533898537c7ceef75641fce0f3065638eec86b Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Sat, 7 Feb 2026 07:20:05 +1100 Subject: [PATCH] some ui polish and project cleanup --- Enemies/BabyEyeDog/baby_eye_dog.tres | 1 + Enemies/Crystalisk/crystalisk.tres | 11 +- Enemies/ElderEyeDog/elder_eye_dog.tres | 1 + Enemies/EyeDog/eye_dog.tres | 1 + {Level1 => Levels/Level1}/specs.tres | 16 +-- {Level1 => Levels/Level1}/wave1.tres | 0 {Level1 => Levels/Level1}/wave2.tres | 0 {Level1 => Levels/Level1}/wave3.tres | 0 {Level1 => Levels/Level1}/wave4.tres | 0 {Level1 => Levels/Level1}/wave5.tres | 0 {Level1 => Levels/Level1}/wave6.tres | 0 {Level2 => Levels/Level2}/specs.tres | 20 ++-- {Level2 => Levels/Level2}/wave1.tres | 0 {Level2 => Levels/Level2}/wave2.tres | 0 {Level2 => Levels/Level2}/wave3.tres | 0 {Level2 => Levels/Level2}/wave4.tres | 0 {Level2 => Levels/Level2}/wave5.tres | 0 {Level2 => Levels/Level2}/wave6.tres | 0 {Level2 => Levels/Level2}/wave7.tres | 0 {Level2 => Levels/Level2}/wave8.tres | 0 {Level3 => Levels/Level3}/specs.tres | 9 +- {Level3 => Levels/Level3}/wave1.tres | 0 {Level3 => Levels/Level3}/wave2.tres | 0 Locales/en.mo | Bin 9924 -> 10632 bytes Locales/en.po | 28 ++++- Locales/translation_template.pot | 18 ++++ .../bricks1/bricks1.png | Bin .../bricks1/bricks1.png.import | 6 +- Materials/bricks1/bricks1.tres | 12 +++ .../cobblestone1/cobblestone1.png | Bin .../cobblestone1/cobblestone1.png.import | 6 +- .../cobblestone1/cobblestone1.tres | 10 +- .../dirt.png => Materials/dirt1/dirt1.png | Bin .../dirt1/dirt1.png.import | 6 +- .../dirt1/dirt1.tres | 10 +- .../grass1}/bridge_grass.png | Bin .../grass1}/bridge_grass.png.import | 6 +- .../grass1/grass1.tres | 10 +- steel1.png => Materials/steel1/steel1.png | Bin .../steel1/steel1.png.import | 8 +- Materials/steel1/steel1.tres | 12 +++ .../wood1/wood1.png | Bin .../wood1/wood1.png.import | 6 +- Materials/wood1/wood1.tres | 12 +++ {BigTree1 => Props/BigTree1}/big_tree.glb | Bin .../BigTree1}/big_tree.glb.import | 10 +- {BigTree1 => Props/BigTree1}/big_tree.tscn | 2 +- .../BigTree1}/big_tree_bark.tres | 0 .../BigTree1}/big_tree_leaf.png | Bin .../BigTree1}/big_tree_leaf.png.import | 6 +- .../BigTree1}/big_tree_leaf.tres | 2 +- .../BigTree1/big_tree_tree1_bark.png | Bin .../BigTree1}/big_tree_tree1_bark.png.import | 8 +- {Tree1 => Props/Tree1}/tree1.glb | Bin {Tree1 => Props/Tree1}/tree1.glb.import | 10 +- {Tree1 => Props/Tree1}/tree1.tscn | 2 +- .../Tree1/tree1_tree1_bark.png | Bin .../Tree1/tree1_tree1_bark.png.import | 15 ++- {Tree1 => Props/Tree1}/tree1_tree1_leaf.png | Bin .../Tree1}/tree1_tree1_leaf.png.import | 6 +- {Tree1 => Props/Tree1}/tree_leaves.tres | 2 +- {Tree1 => Props/Tree1}/treebark.tres | 2 +- Scenes/FlowField/flow_field_tool.tscn | 4 +- Scripts/Resources/level_specs.gd | 2 +- Scripts/enemy_spawner.gd | 2 +- Scripts/game.gd | 4 +- Scripts/level.gd | 2 - UI/Menus/MainMenu/main_menu.tscn | 6 +- Weapons/Assault/BoltGun.glb | Bin 0 -> 40736 bytes Weapons/Assault/BoltGun.glb.import | 55 ++++++++++ Weapons/Assault/g_assault.png | Bin 2903 -> 0 bytes Weapons/Assault/g_assault.png.import | 40 -------- Weapons/Assault/rifle.tscn | 10 +- Weapons/Assault/rifle_tex.png | Bin 218 -> 0 bytes Weapons/Assault/weapon_material.tres | 12 --- Worlds/GreenPlanet/Decorations/bush.tscn | 26 ----- Worlds/GreenPlanet/Decorations/tree.tscn | 31 ------ Worlds/GreenPlanet/Levels/Bridge/bricks.tres | 12 --- .../GreenPlanet/Levels/Bridge/bridge_leaf.png | Bin 419 -> 0 bytes .../Levels/Bridge/bridge_leaf.png.import | 44 -------- .../GreenPlanet/Levels/Bridge/level_mat.tres | 12 --- Worlds/GreenPlanet/tilemap.tres | 96 ------------------ Worlds/GreenPlanet/tiles.tscn | 60 ----------- .../level3.json => Zones/Cave/ffd_cave.json | 0 .../Cave/model_cave.glb | Bin .../Cave/model_cave.glb.import | 21 +--- .../Cave/model_cave_dirt.png | Bin .../Cave/model_cave_dirt.png.import | 10 +- .../cave.tscn => Zones/Cave/scn_cave.tscn | 2 +- Zones/Cave/zc_cave.tres | 11 ++ .../level1.json => Zones/Moat/ffd_moat.json | 0 .../bridge.glb => Zones/Moat/mesh_moat.glb | Bin .../Moat/mesh_moat.glb.import | 23 +++-- .../Moat/mesh_moat_bricks.png | Bin .../Moat/mesh_moat_bricks.png.import | 10 +- Zones/Moat/mesh_moat_cobblestone.png | Bin 0 -> 852 bytes .../Moat/mesh_moat_cobblestone.png.import | 13 ++- Zones/Moat/mesh_moat_grass.png | Bin 0 -> 441 bytes .../Moat/mesh_moat_grass.png.import | 13 ++- .../Moat/mesh_moat_level_tex.png | Bin .../Moat/mesh_moat_level_tex.png.import | 12 +-- .../Moat/mesh_moat_wireframe.glb | Bin .../Moat/mesh_moat_wireframe.glb.import | 6 +- .../bridge.tscn => Zones/Moat/scn_moat.tscn | 8 +- Zones/Moat/zc_moat.tres | 11 ++ bricks.png | Bin 527 -> 0 bytes crt_steel1.png | Bin 489 -> 0 bytes crt_steel1.png.import | 44 -------- foliage/Bush2GLB3.glb | Bin 127904 -> 0 bytes foliage/Bush2GLB3.glb.import | 42 -------- foliage/Bush2GLB3.tscn | 11 -- foliage/foliage.material | Bin 689 -> 0 bytes foliage/foliage.material.depren | Bin 695 -> 0 bytes generic_wood.tres | 12 --- level_mageccc.tscn | 2 +- obstacle1.tscn | 12 --- obstacle2.tscn | 12 --- obstacle3.tscn | 12 --- obstacle4.tscn | 12 --- project.godot | 3 +- wave_viewer.gd | 1 + zone_config.gd | 5 + zone_config.gd.uid | 1 + 123 files changed, 330 insertions(+), 671 deletions(-) rename {Level1 => Levels/Level1}/specs.tres (77%) rename {Level1 => Levels/Level1}/wave1.tres (100%) rename {Level1 => Levels/Level1}/wave2.tres (100%) rename {Level1 => Levels/Level1}/wave3.tres (100%) rename {Level1 => Levels/Level1}/wave4.tres (100%) rename {Level1 => Levels/Level1}/wave5.tres (100%) rename {Level1 => Levels/Level1}/wave6.tres (100%) rename {Level2 => Levels/Level2}/specs.tres (78%) rename {Level2 => Levels/Level2}/wave1.tres (100%) rename {Level2 => Levels/Level2}/wave2.tres (100%) rename {Level2 => Levels/Level2}/wave3.tres (100%) rename {Level2 => Levels/Level2}/wave4.tres (100%) rename {Level2 => Levels/Level2}/wave5.tres (100%) rename {Level2 => Levels/Level2}/wave6.tres (100%) rename {Level2 => Levels/Level2}/wave7.tres (100%) rename {Level2 => Levels/Level2}/wave8.tres (100%) rename {Level3 => Levels/Level3}/specs.tres (79%) rename {Level3 => Levels/Level3}/wave1.tres (100%) rename {Level3 => Levels/Level3}/wave2.tres (100%) rename Tree1/tree1_bricks.png => Materials/bricks1/bricks1.png (100%) rename Tree1/tree1_bricks.png.import => Materials/bricks1/bricks1.png.import (77%) create mode 100644 Materials/bricks1/bricks1.tres rename Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png => Materials/cobblestone1/cobblestone1.png (100%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png.import => Materials/cobblestone1/cobblestone1.png.import (74%) rename Worlds/GreenPlanet/Levels/Bridge/cobblestone.tres => Materials/cobblestone1/cobblestone1.tres (51%) rename Assets/Textures/dirt.png => Materials/dirt1/dirt1.png (100%) rename Assets/Textures/dirt.png.import => Materials/dirt1/dirt1.png.import (77%) rename Worlds/GreenPlanet/Levels/Cave/cave_walls.tres => Materials/dirt1/dirt1.tres (54%) rename {Worlds/GreenPlanet/Levels/Bridge => Materials/grass1}/bridge_grass.png (100%) rename {Worlds/GreenPlanet/Levels/Bridge => Materials/grass1}/bridge_grass.png.import (76%) rename Worlds/GreenPlanet/Levels/Bridge/grass.tres => Materials/grass1/grass1.tres (51%) rename steel1.png => Materials/steel1/steel1.png (100%) rename Weapons/Assault/rifle_tex.png.import => Materials/steel1/steel1.png.import (73%) create mode 100644 Materials/steel1/steel1.tres rename BigTree1/big_tree_tree1_bark.png => Materials/wood1/wood1.png (100%) rename Tree1/tree1_tree1_bark.png.import => Materials/wood1/wood1.png.import (77%) create mode 100644 Materials/wood1/wood1.tres rename {BigTree1 => Props/BigTree1}/big_tree.glb (100%) rename {BigTree1 => Props/BigTree1}/big_tree.glb.import (78%) rename {BigTree1 => Props/BigTree1}/big_tree.tscn (83%) rename {BigTree1 => Props/BigTree1}/big_tree_bark.tres (100%) rename {BigTree1 => Props/BigTree1}/big_tree_leaf.png (100%) rename {BigTree1 => Props/BigTree1}/big_tree_leaf.png.import (77%) rename {BigTree1 => Props/BigTree1}/big_tree_leaf.tres (90%) rename Tree1/tree1_tree1_bark.png => Props/BigTree1/big_tree_tree1_bark.png (100%) rename {BigTree1 => Props/BigTree1}/big_tree_tree1_bark.png.import (73%) rename {Tree1 => Props/Tree1}/tree1.glb (100%) rename {Tree1 => Props/Tree1}/tree1.glb.import (87%) rename {Tree1 => Props/Tree1}/tree1.tscn (92%) rename crt_tree1_bark.png => Props/Tree1/tree1_tree1_bark.png (100%) rename crt_tree1_bark.png.import => Props/Tree1/tree1_tree1_bark.png.import (66%) rename {Tree1 => Props/Tree1}/tree1_tree1_leaf.png (100%) rename {Tree1 => Props/Tree1}/tree1_tree1_leaf.png.import (76%) rename {Tree1 => Props/Tree1}/tree_leaves.tres (90%) rename {Tree1 => Props/Tree1}/treebark.tres (91%) create mode 100644 Weapons/Assault/BoltGun.glb create mode 100644 Weapons/Assault/BoltGun.glb.import delete mode 100644 Weapons/Assault/g_assault.png delete mode 100644 Weapons/Assault/g_assault.png.import delete mode 100644 Weapons/Assault/rifle_tex.png delete mode 100644 Weapons/Assault/weapon_material.tres delete mode 100644 Worlds/GreenPlanet/Decorations/bush.tscn delete mode 100644 Worlds/GreenPlanet/Decorations/tree.tscn delete mode 100644 Worlds/GreenPlanet/Levels/Bridge/bricks.tres delete mode 100644 Worlds/GreenPlanet/Levels/Bridge/bridge_leaf.png delete mode 100644 Worlds/GreenPlanet/Levels/Bridge/bridge_leaf.png.import delete mode 100644 Worlds/GreenPlanet/Levels/Bridge/level_mat.tres delete mode 100644 Worlds/GreenPlanet/tilemap.tres delete mode 100644 Worlds/GreenPlanet/tiles.tscn rename Worlds/GreenPlanet/Levels/Cave/level3.json => Zones/Cave/ffd_cave.json (100%) rename Worlds/GreenPlanet/Levels/Cave/cave_level.glb => Zones/Cave/model_cave.glb (100%) rename Worlds/GreenPlanet/Levels/Cave/cave_level.glb.import => Zones/Cave/model_cave.glb.import (59%) rename Worlds/GreenPlanet/Levels/Cave/cave_level_dirt.png => Zones/Cave/model_cave_dirt.png (100%) rename Worlds/GreenPlanet/Levels/Cave/cave_level_dirt.png.import => Zones/Cave/model_cave_dirt.png.import (71%) rename Worlds/GreenPlanet/Levels/Cave/cave.tscn => Zones/Cave/scn_cave.tscn (99%) create mode 100644 Zones/Cave/zc_cave.tres rename Worlds/GreenPlanet/Levels/Bridge/level1.json => Zones/Moat/ffd_moat.json (100%) rename Worlds/GreenPlanet/Levels/Bridge/bridge.glb => Zones/Moat/mesh_moat.glb (100%) rename Worlds/GreenPlanet/Levels/Bridge/bridge.glb.import => Zones/Moat/mesh_moat.glb.import (58%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_bricks.png => Zones/Moat/mesh_moat_bricks.png (100%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_bricks.png.import => Zones/Moat/mesh_moat_bricks.png.import (71%) create mode 100644 Zones/Moat/mesh_moat_cobblestone.png rename steel1.png.import => Zones/Moat/mesh_moat_cobblestone.png.import (65%) create mode 100644 Zones/Moat/mesh_moat_grass.png rename bricks.png.import => Zones/Moat/mesh_moat_grass.png.import (66%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png => Zones/Moat/mesh_moat_level_tex.png (100%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png.import => Zones/Moat/mesh_moat_level_tex.png.import (68%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb => Zones/Moat/mesh_moat_wireframe.glb (100%) rename Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb.import => Zones/Moat/mesh_moat_wireframe.glb.import (80%) rename Worlds/GreenPlanet/Levels/Bridge/bridge.tscn => Zones/Moat/scn_moat.tscn (99%) create mode 100644 Zones/Moat/zc_moat.tres delete mode 100644 bricks.png delete mode 100644 crt_steel1.png delete mode 100644 crt_steel1.png.import delete mode 100644 foliage/Bush2GLB3.glb delete mode 100644 foliage/Bush2GLB3.glb.import delete mode 100644 foliage/Bush2GLB3.tscn delete mode 100644 foliage/foliage.material delete mode 100644 foliage/foliage.material.depren delete mode 100644 generic_wood.tres delete mode 100644 obstacle1.tscn delete mode 100644 obstacle2.tscn delete mode 100644 obstacle3.tscn delete mode 100644 obstacle4.tscn create mode 100644 zone_config.gd create mode 100644 zone_config.gd.uid diff --git a/Enemies/BabyEyeDog/baby_eye_dog.tres b/Enemies/BabyEyeDog/baby_eye_dog.tres index c059771..bcd8d8e 100644 --- a/Enemies/BabyEyeDog/baby_eye_dog.tres +++ b/Enemies/BabyEyeDog/baby_eye_dog.tres @@ -9,6 +9,7 @@ [resource] script = ExtResource("1_k5sd1") title = "ENEMY_FAST_BABY" +description = "ENEMY_DESC_FAST_BABY" target_type = 1 icon = ExtResource("1_xgen5") scene = ExtResource("3_otbdk") diff --git a/Enemies/Crystalisk/crystalisk.tres b/Enemies/Crystalisk/crystalisk.tres index 1dafda5..7b0f709 100644 --- a/Enemies/Crystalisk/crystalisk.tres +++ b/Enemies/Crystalisk/crystalisk.tres @@ -9,6 +9,7 @@ [resource] script = ExtResource("4_x2l2n") title = "ENEMY_FLYING_CRYSTAL" +description = "ENEMY_DESC_FLYING_CRYSTAL" target_type = 2 icon = ExtResource("2_idym2") scene = ExtResource("3_fmkhl") @@ -18,13 +19,3 @@ spawn_power = 6 health = 120 penalty = 7 movement_speed = 1.0 -common_group = 5 -common_cost = 2 -uncommon_group = 10 -uncommon_cost = 3 -rare_group = 18 -rare_cost = 4 -epic_group = 26 -epic_cost = 6 -legendary_group = 36 -legendary_cost = 8 diff --git a/Enemies/ElderEyeDog/elder_eye_dog.tres b/Enemies/ElderEyeDog/elder_eye_dog.tres index 94dc8f0..ac35b81 100644 --- a/Enemies/ElderEyeDog/elder_eye_dog.tres +++ b/Enemies/ElderEyeDog/elder_eye_dog.tres @@ -9,6 +9,7 @@ [resource] script = ExtResource("1_q48il") title = "ENEMY_HEAVY_WALKER" +description = "ENEMY_DESC_HEAVY_WALKER" target_type = 1 icon = ExtResource("1_lck53") scene = ExtResource("3_m808b") diff --git a/Enemies/EyeDog/eye_dog.tres b/Enemies/EyeDog/eye_dog.tres index a595adc..865d62e 100644 --- a/Enemies/EyeDog/eye_dog.tres +++ b/Enemies/EyeDog/eye_dog.tres @@ -15,6 +15,7 @@ region = Rect2(0, 0, 32, 32) resource_local_to_scene = true script = ExtResource("1_ivs7a") title = "ENEMY_DOG" +description = "ENEMY_DESC_DOG" target_type = 1 icon = ExtResource("2_tyyee") scene = ExtResource("3_mxg1o") diff --git a/Level1/specs.tres b/Levels/Level1/specs.tres similarity index 77% rename from Level1/specs.tres rename to Levels/Level1/specs.tres index 7729486..5e05fcb 100644 --- a/Level1/specs.tres +++ b/Levels/Level1/specs.tres @@ -5,18 +5,18 @@ [ext_resource type="Resource" uid="uid://deer0awg4d18o" path="res://Cards/assault.tres" id="2_vvycy"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_5cjqa"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://Classes/Engineer/class.tres" id="3_ksxj8"] -[ext_resource type="Resource" uid="uid://cygfdfqhk2vhw" path="res://Level1/wave1.tres" id="6_xm2iu"] -[ext_resource type="Resource" uid="uid://bdqng70bpcvp8" path="res://Level1/wave2.tres" id="7_ginir"] -[ext_resource type="Resource" uid="uid://dasqxcoenje00" path="res://Level1/wave3.tres" id="8_heo8u"] -[ext_resource type="Resource" uid="uid://c0ln1sfxmvhaf" path="res://Level1/wave4.tres" id="9_5mf8a"] -[ext_resource type="Resource" uid="uid://b8e1xvwr2f4pf" path="res://Level1/wave5.tres" id="10_skwnu"] -[ext_resource type="Resource" uid="uid://bsmpkojn7bmqq" path="res://Level1/wave6.tres" id="11_rusuq"] -[ext_resource type="PackedScene" uid="uid://y1qa1g3ic8sp" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge.tscn" id="12_ksxj8"] +[ext_resource type="Resource" uid="uid://cygfdfqhk2vhw" path="res://Levels/Level1/wave1.tres" id="6_xm2iu"] +[ext_resource type="Resource" uid="uid://bdqng70bpcvp8" path="res://Levels/Level1/wave2.tres" id="7_ginir"] +[ext_resource type="Resource" uid="uid://dasqxcoenje00" path="res://Levels/Level1/wave3.tres" id="8_heo8u"] +[ext_resource type="Resource" uid="uid://c0ln1sfxmvhaf" path="res://Levels/Level1/wave4.tres" id="9_5mf8a"] +[ext_resource type="Resource" uid="uid://b8e1xvwr2f4pf" path="res://Levels/Level1/wave5.tres" id="10_skwnu"] +[ext_resource type="Resource" uid="uid://bsmpkojn7bmqq" path="res://Levels/Level1/wave6.tres" id="11_rusuq"] +[ext_resource type="Resource" uid="uid://cqm54pu03l510" path="res://Zones/Moat/zc_moat.tres" id="12_qh4uj"] [resource] script = ExtResource("2_52rgn") hero_class = ExtResource("3_ksxj8") allowed_cards = Array[ExtResource("1_yuhm2")]([ExtResource("2_vvycy")]) waves = Array[ExtResource("3_5cjqa")]([ExtResource("6_xm2iu"), ExtResource("7_ginir"), ExtResource("8_heo8u"), ExtResource("9_5mf8a"), ExtResource("10_skwnu"), ExtResource("11_rusuq")]) -zone_scene = ExtResource("12_ksxj8") +zone = ExtResource("12_qh4uj") metadata/_custom_type_script = "uid://dalgif6huggwg" diff --git a/Level1/wave1.tres b/Levels/Level1/wave1.tres similarity index 100% rename from Level1/wave1.tres rename to Levels/Level1/wave1.tres diff --git a/Level1/wave2.tres b/Levels/Level1/wave2.tres similarity index 100% rename from Level1/wave2.tres rename to Levels/Level1/wave2.tres diff --git a/Level1/wave3.tres b/Levels/Level1/wave3.tres similarity index 100% rename from Level1/wave3.tres rename to Levels/Level1/wave3.tres diff --git a/Level1/wave4.tres b/Levels/Level1/wave4.tres similarity index 100% rename from Level1/wave4.tres rename to Levels/Level1/wave4.tres diff --git a/Level1/wave5.tres b/Levels/Level1/wave5.tres similarity index 100% rename from Level1/wave5.tres rename to Levels/Level1/wave5.tres diff --git a/Level1/wave6.tres b/Levels/Level1/wave6.tres similarity index 100% rename from Level1/wave6.tres rename to Levels/Level1/wave6.tres diff --git a/Level2/specs.tres b/Levels/Level2/specs.tres similarity index 78% rename from Level2/specs.tres rename to Levels/Level2/specs.tres index 8c64841..bd92999 100644 --- a/Level2/specs.tres +++ b/Levels/Level2/specs.tres @@ -6,15 +6,15 @@ [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="3_05rhi"] [ext_resource type="Resource" uid="uid://b37r54q84vqoi" path="res://Cards/rocket_launcher.tres" id="3_xdjpy"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://Classes/Engineer/class.tres" id="4_ldc6i"] -[ext_resource type="Resource" uid="uid://7dqtd1owl7g3" path="res://Level2/wave1.tres" id="7_siv73"] -[ext_resource type="Resource" uid="uid://dafixx8vfmr3h" path="res://Level2/wave2.tres" id="8_kee6w"] -[ext_resource type="Resource" uid="uid://cricfym5wcf3w" path="res://Level2/wave3.tres" id="9_k6fmx"] -[ext_resource type="Resource" uid="uid://cky3wcbc3kob0" path="res://Level2/wave4.tres" id="10_dd7gv"] -[ext_resource type="Resource" uid="uid://b5wbmohc1ryla" path="res://Level2/wave5.tres" id="11_nmbqu"] -[ext_resource type="Resource" uid="uid://11e6ak5jg2pn" path="res://Level2/wave6.tres" id="12_p0fmg"] -[ext_resource type="Resource" uid="uid://cvtuui3grpslm" path="res://Level2/wave7.tres" id="13_alfsy"] -[ext_resource type="Resource" uid="uid://7t61us4e01bb" path="res://Level2/wave8.tres" id="14_jyonc"] -[ext_resource type="PackedScene" uid="uid://y1qa1g3ic8sp" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge.tscn" id="15_xdjpy"] +[ext_resource type="Resource" uid="uid://7dqtd1owl7g3" path="res://Levels/Level2/wave1.tres" id="7_siv73"] +[ext_resource type="Resource" uid="uid://dafixx8vfmr3h" path="res://Levels/Level2/wave2.tres" id="8_kee6w"] +[ext_resource type="Resource" uid="uid://cricfym5wcf3w" path="res://Levels/Level2/wave3.tres" id="9_k6fmx"] +[ext_resource type="Resource" uid="uid://cky3wcbc3kob0" path="res://Levels/Level2/wave4.tres" id="10_dd7gv"] +[ext_resource type="Resource" uid="uid://b5wbmohc1ryla" path="res://Levels/Level2/wave5.tres" id="11_nmbqu"] +[ext_resource type="Resource" uid="uid://11e6ak5jg2pn" path="res://Levels/Level2/wave6.tres" id="12_p0fmg"] +[ext_resource type="Resource" uid="uid://cvtuui3grpslm" path="res://Levels/Level2/wave7.tres" id="13_alfsy"] +[ext_resource type="Resource" uid="uid://7t61us4e01bb" path="res://Levels/Level2/wave8.tres" id="14_jyonc"] +[ext_resource type="Resource" uid="uid://cqm54pu03l510" path="res://Zones/Moat/zc_moat.tres" id="15_movdo"] [resource] script = ExtResource("2_y3kr2") @@ -22,5 +22,5 @@ hero_class = ExtResource("4_ldc6i") allowed_cards = Array[ExtResource("1_rchhl")]([ExtResource("2_geygk"), ExtResource("3_xdjpy")]) waves = Array[ExtResource("3_05rhi")]([ExtResource("7_siv73"), ExtResource("8_kee6w"), ExtResource("9_k6fmx"), ExtResource("10_dd7gv"), ExtResource("11_nmbqu"), ExtResource("12_p0fmg"), ExtResource("13_alfsy"), ExtResource("14_jyonc")]) points_blocked = Array[int]([34, 33, 41, 40, 39, 47, 79, 86, 85, 78, 91, 84]) -zone_scene = ExtResource("15_xdjpy") +zone = ExtResource("15_movdo") metadata/_custom_type_script = "uid://dalgif6huggwg" diff --git a/Level2/wave1.tres b/Levels/Level2/wave1.tres similarity index 100% rename from Level2/wave1.tres rename to Levels/Level2/wave1.tres diff --git a/Level2/wave2.tres b/Levels/Level2/wave2.tres similarity index 100% rename from Level2/wave2.tres rename to Levels/Level2/wave2.tres diff --git a/Level2/wave3.tres b/Levels/Level2/wave3.tres similarity index 100% rename from Level2/wave3.tres rename to Levels/Level2/wave3.tres diff --git a/Level2/wave4.tres b/Levels/Level2/wave4.tres similarity index 100% rename from Level2/wave4.tres rename to Levels/Level2/wave4.tres diff --git a/Level2/wave5.tres b/Levels/Level2/wave5.tres similarity index 100% rename from Level2/wave5.tres rename to Levels/Level2/wave5.tres diff --git a/Level2/wave6.tres b/Levels/Level2/wave6.tres similarity index 100% rename from Level2/wave6.tres rename to Levels/Level2/wave6.tres diff --git a/Level2/wave7.tres b/Levels/Level2/wave7.tres similarity index 100% rename from Level2/wave7.tres rename to Levels/Level2/wave7.tres diff --git a/Level2/wave8.tres b/Levels/Level2/wave8.tres similarity index 100% rename from Level2/wave8.tres rename to Levels/Level2/wave8.tres diff --git a/Level3/specs.tres b/Levels/Level3/specs.tres similarity index 79% rename from Level3/specs.tres rename to Levels/Level3/specs.tres index 75adf3e..c6710e5 100644 --- a/Level3/specs.tres +++ b/Levels/Level3/specs.tres @@ -6,15 +6,14 @@ [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://Classes/Engineer/class.tres" id="4_5rrxx"] [ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://Scripts/Resources/level_specs.gd" id="5_kje1i"] [ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="6_gmv8c"] -[ext_resource type="Resource" uid="uid://cwy6wxuujgqbq" path="res://Level3/wave1.tres" id="7_43tyk"] -[ext_resource type="Resource" uid="uid://c0jg2k4igwt7y" path="res://Level3/wave2.tres" id="8_mblpn"] -[ext_resource type="PackedScene" uid="uid://csq7if8wojp4g" path="res://Worlds/GreenPlanet/Levels/Cave/cave.tscn" id="9_dlvj1"] +[ext_resource type="Resource" uid="uid://cwy6wxuujgqbq" path="res://Levels/Level3/wave1.tres" id="7_43tyk"] +[ext_resource type="Resource" uid="uid://c0jg2k4igwt7y" path="res://Levels/Level3/wave2.tres" id="8_mblpn"] +[ext_resource type="Resource" uid="uid://dicfpbrig37m8" path="res://Zones/Cave/zc_cave.tres" id="9_sbxeq"] [resource] script = ExtResource("5_kje1i") hero_class = ExtResource("4_5rrxx") allowed_cards = Array[ExtResource("1_ldkvi")]([ExtResource("2_0atj5"), ExtResource("3_wfxcl")]) waves = Array[ExtResource("6_gmv8c")]([ExtResource("7_43tyk"), ExtResource("8_mblpn")]) -zone_scene = ExtResource("9_dlvj1") -data_path = "res://Worlds/GreenPlanet/Levels/Cave/level3.json" +zone = ExtResource("9_sbxeq") metadata/_custom_type_script = "uid://dalgif6huggwg" diff --git a/Level3/wave1.tres b/Levels/Level3/wave1.tres similarity index 100% rename from Level3/wave1.tres rename to Levels/Level3/wave1.tres diff --git a/Level3/wave2.tres b/Levels/Level3/wave2.tres similarity index 100% rename from Level3/wave2.tres rename to Levels/Level3/wave2.tres diff --git a/Locales/en.mo b/Locales/en.mo index 8f856ad6d4c7fb8ca158e4da62c74e5bfa3e9fa3..63ed0277cab0604ac666ae494d4850e4b9bdf754 100644 GIT binary patch delta 3913 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 diff --git a/Locales/en.po b/Locales/en.po index 858a4a3..4adfd9e 100644 --- a/Locales/en.po +++ b/Locales/en.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.5\n" +"X-Generator: Poedit 3.6\n" #: Scenes/Menus/MainMenu/main_menu.tscn msgid "TITLE_GAME_NAME" @@ -559,20 +559,38 @@ msgstr "Press %Ready% to start wave" #: Enemies/BabyEyeDog/baby_eye_dog.tres msgid "ENEMY_FAST_BABY" -msgstr "Baby Eye Dog" +msgstr "Skitter" + +msgid "ENEMY_DESC_FAST_BABY" +msgstr "Just a little guy that runs real quick. Keep up!" #: Enemies/Crystalisk/crystalisk.tres msgid "ENEMY_FLYING_CRYSTAL" msgstr "Crystalisk" +msgid "ENEMY_DESC_FLYING_CRYSTAL" +msgstr "" +"The crystalisk actually dies from heartbreak if its babies are attacked too " +"much, even though baby crystalisks have been demonstated to be bulletproof." + #: Enemies/ElderEyeDog/elder_eye_dog.tres msgid "ENEMY_HEAVY_WALKER" msgstr "Heavy Eye Dog" +msgid "ENEMY_DESC_HEAVY_WALKER" +msgstr "" +"As the eye dog ages it seems to become much more durable, although they've " +"clearly put on mass..." + #: Enemies/EyeDog/eye_dog.tres msgid "ENEMY_DOG" msgstr "Eye Dog" +msgid "ENEMY_DESC_DOG" +msgstr "" +"The most common encountered creature, often walking into defenses for " +"seemingly no reason. Tasty meat though!" + #: Scenes/CardPrinter/card_printer.gd msgid "PROMPT_RADIO_INTERACT" msgstr "%Interact% Insert blank cassette" @@ -627,6 +645,12 @@ msgstr "Coins: $" msgid "PROMPT_QUIT" msgstr "Are you sure you want to quit?" +msgid "TITLE_WAVE_VIEWER" +msgstr "Wave Preview" + +msgid "BUTTON_CLOSE" +msgstr "Close" + #, fuzzy #~| msgid "LABEL_DISPLAY_NAME" #~ msgid "LABEL_CARD_NAME" diff --git a/Locales/translation_template.pot b/Locales/translation_template.pot index 992937d..1fc2705 100644 --- a/Locales/translation_template.pot +++ b/Locales/translation_template.pot @@ -525,18 +525,30 @@ msgstr "" msgid "ENEMY_FAST_BABY" msgstr "" +msgid "ENEMY_DESC_FAST_BABY" +msgstr "" + #: Enemies/Crystalisk/crystalisk.tres msgid "ENEMY_FLYING_CRYSTAL" msgstr "" +msgid "ENEMY_DESC_FLYING_CRYSTAL" +msgstr "" + #: Enemies/ElderEyeDog/elder_eye_dog.tres msgid "ENEMY_HEAVY_WALKER" msgstr "" +msgid "ENEMY_DESC_HEAVY_WALKER" +msgstr "" + #: Enemies/EyeDog/eye_dog.tres msgid "ENEMY_DOG" msgstr "" +msgid "ENEMY_DESC_DOG" +msgstr "" + #: Scenes/CardPrinter/card_printer.gd msgid "PROMPT_RADIO_INTERACT" msgstr "" @@ -590,3 +602,9 @@ msgstr "" msgid "PROMPT_QUIT" msgstr "" + +msgid "TITLE_WAVE_VIEWER" +msgstr "" + +msgid "BUTTON_CLOSE" +msgstr "" diff --git a/Tree1/tree1_bricks.png b/Materials/bricks1/bricks1.png similarity index 100% rename from Tree1/tree1_bricks.png rename to Materials/bricks1/bricks1.png diff --git a/Tree1/tree1_bricks.png.import b/Materials/bricks1/bricks1.png.import similarity index 77% rename from Tree1/tree1_bricks.png.import rename to Materials/bricks1/bricks1.png.import index 33fde89..46ca8be 100644 --- a/Tree1/tree1_bricks.png.import +++ b/Materials/bricks1/bricks1.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bct2kqajrdfxl" -path.s3tc="res://.godot/imported/tree1_bricks.png-46e31610f6e07663a8205e419956fff7.s3tc.ctex" +path.s3tc="res://.godot/imported/bricks1.png-e0129b63316362cbdd8d4238dd281c84.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://Tree1/tree1_bricks.png" -dest_files=["res://.godot/imported/tree1_bricks.png-46e31610f6e07663a8205e419956fff7.s3tc.ctex"] +source_file="res://Materials/bricks1/bricks1.png" +dest_files=["res://.godot/imported/bricks1.png-e0129b63316362cbdd8d4238dd281c84.s3tc.ctex"] [params] diff --git a/Materials/bricks1/bricks1.tres b/Materials/bricks1/bricks1.tres new file mode 100644 index 0000000..68aaeec --- /dev/null +++ b/Materials/bricks1/bricks1.tres @@ -0,0 +1,12 @@ +[gd_resource type="ShaderMaterial" format=3 uid="uid://b7wnk32j3acfr"] + +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_1jj6e"] +[ext_resource type="Texture2D" uid="uid://bct2kqajrdfxl" path="res://Materials/bricks1/bricks1.png" id="2_6khar"] + +[resource] +render_priority = 0 +shader = ExtResource("1_1jj6e") +shader_parameter/albedo = ExtResource("2_6khar") +shader_parameter/jitter_z_coordinate = true +shader_parameter/jitter_depth_independent = true +shader_parameter/alpha_scissor = 1.0 diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png b/Materials/cobblestone1/cobblestone1.png similarity index 100% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png rename to Materials/cobblestone1/cobblestone1.png diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png.import b/Materials/cobblestone1/cobblestone1.png.import similarity index 74% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png.import rename to Materials/cobblestone1/cobblestone1.png.import index 92fc2f7..ae16ed0 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png.import +++ b/Materials/cobblestone1/cobblestone1.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://b2prrul2qc8j2" -path.s3tc="res://.godot/imported/bridge_cobblestone.png-8720f2f8b463ee2fad012c7fe5431e79.s3tc.ctex" +path.s3tc="res://.godot/imported/cobblestone1.png-5c0a85598b2b3d717c2a019b9591be43.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png" -dest_files=["res://.godot/imported/bridge_cobblestone.png-8720f2f8b463ee2fad012c7fe5431e79.s3tc.ctex"] +source_file="res://Materials/cobblestone1/cobblestone1.png" +dest_files=["res://.godot/imported/cobblestone1.png-5c0a85598b2b3d717c2a019b9591be43.s3tc.ctex"] [params] diff --git a/Worlds/GreenPlanet/Levels/Bridge/cobblestone.tres b/Materials/cobblestone1/cobblestone1.tres similarity index 51% rename from Worlds/GreenPlanet/Levels/Bridge/cobblestone.tres rename to Materials/cobblestone1/cobblestone1.tres index a117d0d..6c1b099 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/cobblestone.tres +++ b/Materials/cobblestone1/cobblestone1.tres @@ -1,12 +1,12 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://dc8e1xjspjt32"] +[gd_resource type="ShaderMaterial" format=3 uid="uid://ci2m26g6b7ao5"] -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_rwo67"] -[ext_resource type="Texture2D" uid="uid://b2prrul2qc8j2" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge_cobblestone.png" id="2_punq1"] +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_jn4tl"] +[ext_resource type="Texture2D" uid="uid://b2prrul2qc8j2" path="res://Materials/cobblestone1/cobblestone1.png" id="2_ta7ej"] [resource] render_priority = 0 -shader = ExtResource("1_rwo67") -shader_parameter/albedo = ExtResource("2_punq1") +shader = ExtResource("1_jn4tl") +shader_parameter/albedo = ExtResource("2_ta7ej") shader_parameter/jitter_z_coordinate = true shader_parameter/jitter_depth_independent = true shader_parameter/alpha_scissor = 1.0 diff --git a/Assets/Textures/dirt.png b/Materials/dirt1/dirt1.png similarity index 100% rename from Assets/Textures/dirt.png rename to Materials/dirt1/dirt1.png diff --git a/Assets/Textures/dirt.png.import b/Materials/dirt1/dirt1.png.import similarity index 77% rename from Assets/Textures/dirt.png.import rename to Materials/dirt1/dirt1.png.import index 01c20ea..e5c464f 100644 --- a/Assets/Textures/dirt.png.import +++ b/Materials/dirt1/dirt1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cnvndwp3q7rke" -path="res://.godot/imported/dirt.png-b7d765add9f3db18f86c41222bdb9877.ctex" +path="res://.godot/imported/dirt1.png-56dc4c8875013ba35890e280f63043d9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Textures/dirt.png" -dest_files=["res://.godot/imported/dirt.png-b7d765add9f3db18f86c41222bdb9877.ctex"] +source_file="res://Materials/dirt1/dirt1.png" +dest_files=["res://.godot/imported/dirt1.png-56dc4c8875013ba35890e280f63043d9.ctex"] [params] diff --git a/Worlds/GreenPlanet/Levels/Cave/cave_walls.tres b/Materials/dirt1/dirt1.tres similarity index 54% rename from Worlds/GreenPlanet/Levels/Cave/cave_walls.tres rename to Materials/dirt1/dirt1.tres index 061a5a3..f24dd2a 100644 --- a/Worlds/GreenPlanet/Levels/Cave/cave_walls.tres +++ b/Materials/dirt1/dirt1.tres @@ -1,12 +1,12 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://d28nsq46a2hkt"] +[gd_resource type="ShaderMaterial" format=3 uid="uid://vu21wvwrmhlj"] -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_hv8n5"] -[ext_resource type="Texture2D" uid="uid://cnvndwp3q7rke" path="res://Assets/Textures/dirt.png" id="2_6xq7p"] +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_lp0jk"] +[ext_resource type="Texture2D" uid="uid://cnvndwp3q7rke" path="res://Materials/dirt1/dirt1.png" id="2_pspnn"] [resource] render_priority = 0 -shader = ExtResource("1_hv8n5") -shader_parameter/albedo = ExtResource("2_6xq7p") +shader = ExtResource("1_lp0jk") +shader_parameter/albedo = ExtResource("2_pspnn") shader_parameter/jitter_z_coordinate = true shader_parameter/jitter_depth_independent = true shader_parameter/alpha_scissor = 1.0 diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png b/Materials/grass1/bridge_grass.png similarity index 100% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png rename to Materials/grass1/bridge_grass.png diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png.import b/Materials/grass1/bridge_grass.png.import similarity index 76% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png.import rename to Materials/grass1/bridge_grass.png.import index df5c42e..bdd6385 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png.import +++ b/Materials/grass1/bridge_grass.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://b8lj1l8gqpftn" -path.s3tc="res://.godot/imported/bridge_grass.png-9ce4e269dfce2a98228d73bf3c6575b6.s3tc.ctex" +path.s3tc="res://.godot/imported/bridge_grass.png-e46277dc57ddab124bfa3fb58ecdb7b3.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png" -dest_files=["res://.godot/imported/bridge_grass.png-9ce4e269dfce2a98228d73bf3c6575b6.s3tc.ctex"] +source_file="res://Materials/grass1/bridge_grass.png" +dest_files=["res://.godot/imported/bridge_grass.png-e46277dc57ddab124bfa3fb58ecdb7b3.s3tc.ctex"] [params] diff --git a/Worlds/GreenPlanet/Levels/Bridge/grass.tres b/Materials/grass1/grass1.tres similarity index 51% rename from Worlds/GreenPlanet/Levels/Bridge/grass.tres rename to Materials/grass1/grass1.tres index 48bbc74..dd5a13d 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/grass.tres +++ b/Materials/grass1/grass1.tres @@ -1,12 +1,12 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://1lymu5otuh7f"] +[gd_resource type="ShaderMaterial" format=3 uid="uid://c4qub458rqpt2"] -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_ubi2a"] -[ext_resource type="Texture2D" uid="uid://b8lj1l8gqpftn" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge_grass.png" id="2_ubi2a"] +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_1juhk"] +[ext_resource type="Texture2D" uid="uid://b8lj1l8gqpftn" path="res://Materials/grass1/bridge_grass.png" id="2_7kehx"] [resource] render_priority = 0 -shader = ExtResource("1_ubi2a") -shader_parameter/albedo = ExtResource("2_ubi2a") +shader = ExtResource("1_1juhk") +shader_parameter/albedo = ExtResource("2_7kehx") shader_parameter/jitter_z_coordinate = true shader_parameter/jitter_depth_independent = true shader_parameter/alpha_scissor = 1.0 diff --git a/steel1.png b/Materials/steel1/steel1.png similarity index 100% rename from steel1.png rename to Materials/steel1/steel1.png diff --git a/Weapons/Assault/rifle_tex.png.import b/Materials/steel1/steel1.png.import similarity index 73% rename from Weapons/Assault/rifle_tex.png.import rename to Materials/steel1/steel1.png.import index 5da5a10..b9c5c6b 100644 --- a/Weapons/Assault/rifle_tex.png.import +++ b/Materials/steel1/steel1.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://u8p3xcl3gvie" -path.s3tc="res://.godot/imported/rifle_tex.png-066373a8f602fd3a3436ea7b29f3f62c.s3tc.ctex" +uid="uid://d02g31nntdjmw" +path.s3tc="res://.godot/imported/steel1.png-d0dcb8e6e826656ba1df13b87e80980f.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://Weapons/Assault/rifle_tex.png" -dest_files=["res://.godot/imported/rifle_tex.png-066373a8f602fd3a3436ea7b29f3f62c.s3tc.ctex"] +source_file="res://Materials/steel1/steel1.png" +dest_files=["res://.godot/imported/steel1.png-d0dcb8e6e826656ba1df13b87e80980f.s3tc.ctex"] [params] diff --git a/Materials/steel1/steel1.tres b/Materials/steel1/steel1.tres new file mode 100644 index 0000000..1d13f92 --- /dev/null +++ b/Materials/steel1/steel1.tres @@ -0,0 +1,12 @@ +[gd_resource type="ShaderMaterial" format=3 uid="uid://qq11jacogcec"] + +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_raav3"] +[ext_resource type="Texture2D" uid="uid://d02g31nntdjmw" path="res://Materials/steel1/steel1.png" id="2_r3yqm"] + +[resource] +render_priority = 0 +shader = ExtResource("1_raav3") +shader_parameter/albedo = ExtResource("2_r3yqm") +shader_parameter/jitter_z_coordinate = true +shader_parameter/jitter_depth_independent = true +shader_parameter/alpha_scissor = 1.0 diff --git a/BigTree1/big_tree_tree1_bark.png b/Materials/wood1/wood1.png similarity index 100% rename from BigTree1/big_tree_tree1_bark.png rename to Materials/wood1/wood1.png diff --git a/Tree1/tree1_tree1_bark.png.import b/Materials/wood1/wood1.png.import similarity index 77% rename from Tree1/tree1_tree1_bark.png.import rename to Materials/wood1/wood1.png.import index cadbe3c..def55d5 100644 --- a/Tree1/tree1_tree1_bark.png.import +++ b/Materials/wood1/wood1.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dovi2js4g7jnu" -path.s3tc="res://.godot/imported/tree1_tree1_bark.png-a67dc4ed946470e50353849f5bd53560.s3tc.ctex" +path.s3tc="res://.godot/imported/wood1.png-04c0345ca89df1bcb4aaedc3cbb66e02.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://Tree1/tree1_tree1_bark.png" -dest_files=["res://.godot/imported/tree1_tree1_bark.png-a67dc4ed946470e50353849f5bd53560.s3tc.ctex"] +source_file="res://Materials/wood1/wood1.png" +dest_files=["res://.godot/imported/wood1.png-04c0345ca89df1bcb4aaedc3cbb66e02.s3tc.ctex"] [params] diff --git a/Materials/wood1/wood1.tres b/Materials/wood1/wood1.tres new file mode 100644 index 0000000..2c57ab5 --- /dev/null +++ b/Materials/wood1/wood1.tres @@ -0,0 +1,12 @@ +[gd_resource type="ShaderMaterial" format=3 uid="uid://c21fh4gsnunfg"] + +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_xclpc"] +[ext_resource type="Texture2D" uid="uid://dovi2js4g7jnu" path="res://Materials/wood1/wood1.png" id="2_rmos7"] + +[resource] +render_priority = 0 +shader = ExtResource("1_xclpc") +shader_parameter/albedo = ExtResource("2_rmos7") +shader_parameter/jitter_z_coordinate = true +shader_parameter/jitter_depth_independent = true +shader_parameter/alpha_scissor = 1.0 diff --git a/BigTree1/big_tree.glb b/Props/BigTree1/big_tree.glb similarity index 100% rename from BigTree1/big_tree.glb rename to Props/BigTree1/big_tree.glb diff --git a/BigTree1/big_tree.glb.import b/Props/BigTree1/big_tree.glb.import similarity index 78% rename from BigTree1/big_tree.glb.import rename to Props/BigTree1/big_tree.glb.import index 272b8a7..c000e92 100644 --- a/BigTree1/big_tree.glb.import +++ b/Props/BigTree1/big_tree.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://dipfsdrfnst0k" -path="res://.godot/imported/big_tree.glb-a87ce870ec2894d5d972619aeb0902ba.scn" +path="res://.godot/imported/big_tree.glb-2fb8bec04ac0498fbb6bb54bccc27647.scn" [deps] -source_file="res://BigTree1/big_tree.glb" -dest_files=["res://.godot/imported/big_tree.glb-a87ce870ec2894d5d972619aeb0902ba.scn"] +source_file="res://Props/BigTree1/big_tree.glb" +dest_files=["res://.godot/imported/big_tree.glb-2fb8bec04ac0498fbb6bb54bccc27647.scn"] [params] @@ -41,12 +41,12 @@ _subresources={ "materials": { "Material.001": { "use_external/enabled": true, -"use_external/fallback_path": "res://BigTree1/big_tree_leaf.tres", +"use_external/fallback_path": "res://Props/BigTree1/big_tree_leaf.tres", "use_external/path": "uid://msn0x7d83tc1" }, "Material.003": { "use_external/enabled": true, -"use_external/fallback_path": "res://BigTree1/big_tree_bark.tres", +"use_external/fallback_path": "res://Props/BigTree1/big_tree_bark.tres", "use_external/path": "uid://bo8hb5kchxsaj" } }, diff --git a/BigTree1/big_tree.tscn b/Props/BigTree1/big_tree.tscn similarity index 83% rename from BigTree1/big_tree.tscn rename to Props/BigTree1/big_tree.tscn index f6bc566..c76c64a 100644 --- a/BigTree1/big_tree.tscn +++ b/Props/BigTree1/big_tree.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://c8ecof4oeng1f"] -[ext_resource type="PackedScene" uid="uid://dipfsdrfnst0k" path="res://BigTree1/big_tree.glb" id="1_jd860"] +[ext_resource type="PackedScene" uid="uid://dipfsdrfnst0k" path="res://Props/BigTree1/big_tree.glb" id="1_jd860"] [node name="Node3D" type="Node3D" unique_id=924363235] diff --git a/BigTree1/big_tree_bark.tres b/Props/BigTree1/big_tree_bark.tres similarity index 100% rename from BigTree1/big_tree_bark.tres rename to Props/BigTree1/big_tree_bark.tres diff --git a/BigTree1/big_tree_leaf.png b/Props/BigTree1/big_tree_leaf.png similarity index 100% rename from BigTree1/big_tree_leaf.png rename to Props/BigTree1/big_tree_leaf.png diff --git a/BigTree1/big_tree_leaf.png.import b/Props/BigTree1/big_tree_leaf.png.import similarity index 77% rename from BigTree1/big_tree_leaf.png.import rename to Props/BigTree1/big_tree_leaf.png.import index ea9df52..46d6d04 100644 --- a/BigTree1/big_tree_leaf.png.import +++ b/Props/BigTree1/big_tree_leaf.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://ccg78jovw5432" -path.s3tc="res://.godot/imported/big_tree_leaf.png-bc8fc320bde8e302694ca9c0a5c008a5.s3tc.ctex" +path.s3tc="res://.godot/imported/big_tree_leaf.png-3f3e36a5570890087f28bbc39d3540ad.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://BigTree1/big_tree_leaf.png" -dest_files=["res://.godot/imported/big_tree_leaf.png-bc8fc320bde8e302694ca9c0a5c008a5.s3tc.ctex"] +source_file="res://Props/BigTree1/big_tree_leaf.png" +dest_files=["res://.godot/imported/big_tree_leaf.png-3f3e36a5570890087f28bbc39d3540ad.s3tc.ctex"] [params] diff --git a/BigTree1/big_tree_leaf.tres b/Props/BigTree1/big_tree_leaf.tres similarity index 90% rename from BigTree1/big_tree_leaf.tres rename to Props/BigTree1/big_tree_leaf.tres index d39fb81..988130d 100644 --- a/BigTree1/big_tree_leaf.tres +++ b/Props/BigTree1/big_tree_leaf.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://msn0x7d83tc1"] [ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_7m0va"] -[ext_resource type="Texture2D" uid="uid://ccg78jovw5432" path="res://BigTree1/big_tree_leaf.png" id="2_qmu85"] +[ext_resource type="Texture2D" uid="uid://ccg78jovw5432" path="res://Props/BigTree1/big_tree_leaf.png" id="2_qmu85"] [resource] render_priority = 0 diff --git a/Tree1/tree1_tree1_bark.png b/Props/BigTree1/big_tree_tree1_bark.png similarity index 100% rename from Tree1/tree1_tree1_bark.png rename to Props/BigTree1/big_tree_tree1_bark.png diff --git a/BigTree1/big_tree_tree1_bark.png.import b/Props/BigTree1/big_tree_tree1_bark.png.import similarity index 73% rename from BigTree1/big_tree_tree1_bark.png.import rename to Props/BigTree1/big_tree_tree1_bark.png.import index 3036f11..041a5fe 100644 --- a/BigTree1/big_tree_tree1_bark.png.import +++ b/Props/BigTree1/big_tree_tree1_bark.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dmv1t70b2befg" -path.s3tc="res://.godot/imported/big_tree_tree1_bark.png-7551e8f72fc144804f5004423073f946.s3tc.ctex" +uid="uid://1fudnfgxctbc" +path.s3tc="res://.godot/imported/big_tree_tree1_bark.png-11db26644d40a58c1d1b623d52b4e041.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://BigTree1/big_tree_tree1_bark.png" -dest_files=["res://.godot/imported/big_tree_tree1_bark.png-7551e8f72fc144804f5004423073f946.s3tc.ctex"] +source_file="res://Props/BigTree1/big_tree_tree1_bark.png" +dest_files=["res://.godot/imported/big_tree_tree1_bark.png-11db26644d40a58c1d1b623d52b4e041.s3tc.ctex"] [params] diff --git a/Tree1/tree1.glb b/Props/Tree1/tree1.glb similarity index 100% rename from Tree1/tree1.glb rename to Props/Tree1/tree1.glb diff --git a/Tree1/tree1.glb.import b/Props/Tree1/tree1.glb.import similarity index 87% rename from Tree1/tree1.glb.import rename to Props/Tree1/tree1.glb.import index 3bebfbf..4f7743d 100644 --- a/Tree1/tree1.glb.import +++ b/Props/Tree1/tree1.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://cjc1yge0o0xxr" -path="res://.godot/imported/tree1.glb-1b07a3f1777f6d8ed5004071ca71d985.scn" +path="res://.godot/imported/tree1.glb-d41d3e238a98b03fe92a7f03852ebf93.scn" [deps] -source_file="res://Tree1/tree1.glb" -dest_files=["res://.godot/imported/tree1.glb-1b07a3f1777f6d8ed5004071ca71d985.scn"] +source_file="res://Props/Tree1/tree1.glb" +dest_files=["res://.godot/imported/tree1.glb-d41d3e238a98b03fe92a7f03852ebf93.scn"] [params] @@ -41,12 +41,12 @@ _subresources={ "materials": { "Bark": { "use_external/enabled": true, -"use_external/fallback_path": "res://Tree1/treebark.tres", +"use_external/fallback_path": "res://Props/Tree1/treebark.tres", "use_external/path": "uid://dgkyl751a1muh" }, "Leaf": { "use_external/enabled": true, -"use_external/fallback_path": "res://Tree1/tree_leaves.tres", +"use_external/fallback_path": "res://Props/Tree1/tree_leaves.tres", "use_external/path": "uid://cvpln4e4e8fe2" } }, diff --git a/Tree1/tree1.tscn b/Props/Tree1/tree1.tscn similarity index 92% rename from Tree1/tree1.tscn rename to Props/Tree1/tree1.tscn index c68bda2..c996045 100644 --- a/Tree1/tree1.tscn +++ b/Props/Tree1/tree1.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://42dsbdlkvbfq"] -[ext_resource type="PackedScene" uid="uid://cjc1yge0o0xxr" path="res://Tree1/tree1.glb" id="1_nd06h"] +[ext_resource type="PackedScene" uid="uid://cjc1yge0o0xxr" path="res://Props/Tree1/tree1.glb" id="1_nd06h"] [sub_resource type="BoxShape3D" id="BoxShape3D_7ooih"] size = Vector3(3.2922363, 10.074348, 3.1652832) diff --git a/crt_tree1_bark.png b/Props/Tree1/tree1_tree1_bark.png similarity index 100% rename from crt_tree1_bark.png rename to Props/Tree1/tree1_tree1_bark.png diff --git a/crt_tree1_bark.png.import b/Props/Tree1/tree1_tree1_bark.png.import similarity index 66% rename from crt_tree1_bark.png.import rename to Props/Tree1/tree1_tree1_bark.png.import index 35391f0..d5d8765 100644 --- a/crt_tree1_bark.png.import +++ b/Props/Tree1/tree1_tree1_bark.png.import @@ -2,11 +2,10 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bs0lypwyo5jf6" -path.s3tc="res://.godot/imported/crt_tree1_bark.png-1dead196d22dff548392d132e81f26e3.s3tc.ctex" +uid="uid://by7p2g1rkfvda" +path="res://.godot/imported/tree1_tree1_bark.png-0168ef7cd3f8f6a4b482f49ec2543b82.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } generator_parameters={ "md5": "3a9eb64baf1362d22626d5e08a5eea2e" @@ -14,12 +13,12 @@ generator_parameters={ [deps] -source_file="res://crt_tree1_bark.png" -dest_files=["res://.godot/imported/crt_tree1_bark.png-1dead196d22dff548392d132e81f26e3.s3tc.ctex"] +source_file="res://Props/Tree1/tree1_tree1_bark.png" +dest_files=["res://.godot/imported/tree1_tree1_bark.png-0168ef7cd3f8f6a4b482f49ec2543b82.ctex"] [params] -compress/mode=2 +compress/mode=0 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -41,4 +40,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/Tree1/tree1_tree1_leaf.png b/Props/Tree1/tree1_tree1_leaf.png similarity index 100% rename from Tree1/tree1_tree1_leaf.png rename to Props/Tree1/tree1_tree1_leaf.png diff --git a/Tree1/tree1_tree1_leaf.png.import b/Props/Tree1/tree1_tree1_leaf.png.import similarity index 76% rename from Tree1/tree1_tree1_leaf.png.import rename to Props/Tree1/tree1_tree1_leaf.png.import index 1b2f2aa..2e41c84 100644 --- a/Tree1/tree1_tree1_leaf.png.import +++ b/Props/Tree1/tree1_tree1_leaf.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cat5o8mesmnpj" -path.s3tc="res://.godot/imported/tree1_tree1_leaf.png-157d3e46e162b2d09b15016679c9cdf2.s3tc.ctex" +path.s3tc="res://.godot/imported/tree1_tree1_leaf.png-a6092fc7e6c025b94ffa4a8aff2acb24.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -14,8 +14,8 @@ generator_parameters={ [deps] -source_file="res://Tree1/tree1_tree1_leaf.png" -dest_files=["res://.godot/imported/tree1_tree1_leaf.png-157d3e46e162b2d09b15016679c9cdf2.s3tc.ctex"] +source_file="res://Props/Tree1/tree1_tree1_leaf.png" +dest_files=["res://.godot/imported/tree1_tree1_leaf.png-a6092fc7e6c025b94ffa4a8aff2acb24.s3tc.ctex"] [params] diff --git a/Tree1/tree_leaves.tres b/Props/Tree1/tree_leaves.tres similarity index 90% rename from Tree1/tree_leaves.tres rename to Props/Tree1/tree_leaves.tres index f1250a2..e01d9fb 100644 --- a/Tree1/tree_leaves.tres +++ b/Props/Tree1/tree_leaves.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://cvpln4e4e8fe2"] [ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_yy13x"] -[ext_resource type="Texture2D" uid="uid://cat5o8mesmnpj" path="res://Tree1/tree1_tree1_leaf.png" id="2_0kunm"] +[ext_resource type="Texture2D" uid="uid://cat5o8mesmnpj" path="res://Props/Tree1/tree1_tree1_leaf.png" id="2_0kunm"] [resource] render_priority = 0 diff --git a/Tree1/treebark.tres b/Props/Tree1/treebark.tres similarity index 91% rename from Tree1/treebark.tres rename to Props/Tree1/treebark.tres index 8403a31..ed14d84 100644 --- a/Tree1/treebark.tres +++ b/Props/Tree1/treebark.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://dgkyl751a1muh"] [ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_84kqg"] -[ext_resource type="Texture2D" uid="uid://dovi2js4g7jnu" path="res://Tree1/tree1_tree1_bark.png" id="2_s6boq"] +[ext_resource type="Texture2D" uid="uid://dovi2js4g7jnu" path="res://Materials/wood1/wood1.png" id="2_s6boq"] [resource] render_priority = 0 diff --git a/Scenes/FlowField/flow_field_tool.tscn b/Scenes/FlowField/flow_field_tool.tscn index 7046e97..4f0be36 100644 --- a/Scenes/FlowField/flow_field_tool.tscn +++ b/Scenes/FlowField/flow_field_tool.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://cccowrgelgswj"] [ext_resource type="Script" uid="uid://05c5q1v2nv8p" path="res://Scenes/FlowField/flow_field_tool.gd" id="1_e7pmn"] -[ext_resource type="PackedScene" uid="uid://y1qa1g3ic8sp" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge.tscn" id="2_030xf"] -[ext_resource type="PackedScene" uid="uid://csq7if8wojp4g" path="res://Worlds/GreenPlanet/Levels/Cave/cave.tscn" id="3_xar7e"] +[ext_resource type="PackedScene" uid="uid://y1qa1g3ic8sp" path="res://Zones/Moat/scn_moat.tscn" id="2_030xf"] +[ext_resource type="PackedScene" uid="uid://csq7if8wojp4g" path="res://Zones/Cave/scn_cave.tscn" id="3_xar7e"] [sub_resource type="Environment" id="Environment_e7pmn"] ambient_light_source = 2 diff --git a/Scripts/Resources/level_specs.gd b/Scripts/Resources/level_specs.gd index 321ffc8..8774dfd 100644 --- a/Scripts/Resources/level_specs.gd +++ b/Scripts/Resources/level_specs.gd @@ -4,4 +4,4 @@ class_name LevelSpecs extends Resource @export var allowed_cards: Array[Card] @export var waves: Array[WaveConfig] @export var points_blocked: Array[int] -@export var zone_scene: PackedScene +@export var zone: ZoneConfig diff --git a/Scripts/enemy_spawner.gd b/Scripts/enemy_spawner.gd index 411857b..5b39067 100644 --- a/Scripts/enemy_spawner.gd +++ b/Scripts/enemy_spawner.gd @@ -97,7 +97,7 @@ func create_path() -> void: func update_path() -> void: - if type != Data.EnemyType.LAND: + if type != Data.EnemyType.LAND or !flow_field.nodes: return path.curve = Curve3D.new() var node: FlowNode = flow_field.get_closest_traversable_point(global_position) diff --git a/Scripts/game.gd b/Scripts/game.gd index 4059fc5..aac67db 100644 --- a/Scripts/game.gd +++ b/Scripts/game.gd @@ -94,7 +94,7 @@ func spawn_level(scene: PackedScene) -> void: var flow_field: FlowField = FlowField.new() level.flow_field = flow_field level.add_child(flow_field) - flow_field.load_from_data(FlowFieldTool.load_flow_field_from_disc(level.data_path)) + flow_field.load_from_data(FlowFieldTool.load_flow_field_from_disc(level_specs.zone.flow_field_data_path)) level.load_flow_field() level.game_manager = self for x: EnemySpawner in level.enemy_spawns: @@ -324,7 +324,7 @@ func setup() -> void: connected_players_nodes.clear() #Spawn new stuff - spawn_level(level_specs.zone_scene) + spawn_level(level_specs.zone.scene) #Set starting parameters game_active = false diff --git a/Scripts/level.gd b/Scripts/level.gd index b1753ac..ff41e62 100644 --- a/Scripts/level.gd +++ b/Scripts/level.gd @@ -10,9 +10,7 @@ extends Node3D @export var cinematic_cam: CinematicCamManager @export var printer: CardPrinter @export var shop: ShopStand -@export var obstacle_scenes: Array[PackedScene] @export var obstacles: Array[PackedScene] -@export var data_path: String var walls: Dictionary[FlowNode, TowerBase] = {} var wall_id: int = 0 var tower_base_scene: PackedScene = load("res://Scenes/TowerBase/tower_base.tscn") diff --git a/UI/Menus/MainMenu/main_menu.tscn b/UI/Menus/MainMenu/main_menu.tscn index 64e9bd2..e984b4a 100644 --- a/UI/Menus/MainMenu/main_menu.tscn +++ b/UI/Menus/MainMenu/main_menu.tscn @@ -4,9 +4,9 @@ [ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="5_cwn2i"] [ext_resource type="Script" uid="uid://bwsw4oq150v3p" path="res://UI/Menus/MainMenu/level_selecter_main_menu.gd" id="8_qshe4"] [ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://Scripts/Resources/level_specs.gd" id="9_nt3t4"] -[ext_resource type="Resource" uid="uid://b67b70x1uf2el" path="res://Level1/specs.tres" id="10_kjkav"] -[ext_resource type="Resource" uid="uid://dffoufw4bnfn7" path="res://Level2/specs.tres" id="11_kjkav"] -[ext_resource type="Resource" uid="uid://dgrcneuv4fut" path="res://Level3/specs.tres" id="12_eonxx"] +[ext_resource type="Resource" uid="uid://b67b70x1uf2el" path="res://Levels/Level1/specs.tres" id="10_kjkav"] +[ext_resource type="Resource" uid="uid://dffoufw4bnfn7" path="res://Levels/Level2/specs.tres" id="11_kjkav"] +[ext_resource type="Resource" uid="uid://dgrcneuv4fut" path="res://Levels/Level3/specs.tres" id="12_eonxx"] [ext_resource type="Texture2D" uid="uid://cr1ucbuw3iotp" path="res://Assets/Textures/first_win_achievements.png" id="15_74epv"] [ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://UI/Menus/MainMenu/achievements_menu.gd" id="15_sv1gy"] [ext_resource type="Texture2D" uid="uid://cpa1hl36xfplg" path="res://Assets/Textures/first_scroll_seen.png" id="16_sv1gy"] diff --git a/Weapons/Assault/BoltGun.glb b/Weapons/Assault/BoltGun.glb new file mode 100644 index 0000000000000000000000000000000000000000..6167a64e2ad9e54707af1be0d441340cacd5fe55 GIT binary patch literal 40736 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 literal 0 HcmV?d00001 diff --git a/Weapons/Assault/BoltGun.glb.import b/Weapons/Assault/BoltGun.glb.import new file mode 100644 index 0000000..853d3fe --- /dev/null +++ b/Weapons/Assault/BoltGun.glb.import @@ -0,0 +1,55 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bjjlhmhfytbvm" +path="res://.godot/imported/BoltGun.glb-17106ef91980249c6c534736ccdb2932.scn" + +[deps] + +source_file="res://Weapons/Assault/BoltGun.glb" +dest_files=["res://.godot/imported/BoltGun.glb-17106ef91980249c6c534736ccdb2932.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"steel1": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/steel1/steel1.tres", +"use_external/path": "uid://qq11jacogcec" +}, +"wood1": { +"use_external/enabled": true, +"use_external/fallback_path": "res://Materials/wood1/wood1.tres", +"use_external/path": "uid://c21fh4gsnunfg" +} +} +} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/Weapons/Assault/g_assault.png b/Weapons/Assault/g_assault.png deleted file mode 100644 index 9b651a80c9b0bec6dd6fa93260f520baab15e96a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2903 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 diff --git a/Weapons/Assault/g_assault.png.import b/Weapons/Assault/g_assault.png.import deleted file mode 100644 index 0d2ce47..0000000 --- a/Weapons/Assault/g_assault.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://celay30i4soud" -path="res://.godot/imported/g_assault.png-ac036fe68b061c3981bb7c49d4a5a4cc.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Weapons/Assault/g_assault.png" -dest_files=["res://.godot/imported/g_assault.png-ac036fe68b061c3981bb7c49d4a5a4cc.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/Weapons/Assault/rifle.tscn b/Weapons/Assault/rifle.tscn index ff11090..383688a 100644 --- a/Weapons/Assault/rifle.tscn +++ b/Weapons/Assault/rifle.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://bp3o5klntwmhd" path="res://Scripts/Weapons/hitscan_weapon.gd" id="1_yvp43"] [ext_resource type="Resource" uid="uid://smctw4ogm4rx" path="res://Weapons/Assault/weapon_stats.tres" id="2_2k4c7"] [ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://Audio/shot1.wav" id="2_5wfsb"] -[ext_resource type="PackedScene" uid="uid://6qv8uwwuoiys" path="res://Gun Thing.glb" id="3_2k4c7"] +[ext_resource type="PackedScene" uid="uid://bjjlhmhfytbvm" path="res://Weapons/Assault/BoltGun.glb" id="4_5wfsb"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_1hdrg"] random_pitch = 1.1 @@ -30,11 +30,7 @@ one_shot = true stream = SubResource("AudioStreamRandomizer_1hdrg") bus = &"SFX" -[node name="Gun Thing" parent="." unique_id=1024288520 instance=ExtResource("3_2k4c7")] - -[node name="Cube_001" parent="Gun Thing" index="0" unique_id=1455961016] -layers = 2 +[node name="BoltGun" parent="." unique_id=566167059 instance=ExtResource("4_5wfsb")] +transform = Transform3D(-0.07, 0, -1.0569706e-08, 0, 0.07, 0, 1.0569706e-08, 0, -0.07, 0, 0.15755616, -0.10932771) [connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] - -[editable path="Gun Thing"] diff --git a/Weapons/Assault/rifle_tex.png b/Weapons/Assault/rifle_tex.png deleted file mode 100644 index b235e5641ae15a3e33f54721f9430946d1c80013..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE@VRjJynr0xX6H_IC?&ahffA-*EOz{`oVp58t=k|2IF6f%S;EgM!?F zpa!N#+zJBx2mA#XSs*M?2ZqKUOdLm;3s?ml6!tMNePoDXWD)4lZ*Z_-2xlNcnGIh! XbH@Ki5&sw%7#KWV{an^LB{Ts5u#Y^j diff --git a/Weapons/Assault/weapon_material.tres b/Weapons/Assault/weapon_material.tres deleted file mode 100644 index 8ec351c..0000000 --- a/Weapons/Assault/weapon_material.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://bjdi4f801k0xt"] - -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_kbuty"] -[ext_resource type="Texture2D" uid="uid://u8p3xcl3gvie" path="res://Weapons/Assault/rifle_tex.png" id="2_kb7v3"] - -[resource] -render_priority = 0 -shader = ExtResource("1_kbuty") -shader_parameter/albedo = ExtResource("2_kb7v3") -shader_parameter/jitter_z_coordinate = true -shader_parameter/jitter_depth_independent = true -shader_parameter/alpha_scissor = 1.0 diff --git a/Worlds/GreenPlanet/Decorations/bush.tscn b/Worlds/GreenPlanet/Decorations/bush.tscn deleted file mode 100644 index c679be8..0000000 --- a/Worlds/GreenPlanet/Decorations/bush.tscn +++ /dev/null @@ -1,26 +0,0 @@ -[gd_scene format=3 uid="uid://d3h3lmlf3hljl"] - -[ext_resource type="Texture2D" uid="uid://drbfdp7kugbri" path="res://Assets/Textures/bush.png" id="1_2ubx8"] -[ext_resource type="Texture2D" uid="uid://dg47vgt0uccw1" path="res://Assets/Textures/minimap_tree.png" id="2_6w34c"] - -[node name="Bush" type="Node3D" unique_id=1507836882] - -[node name="Sprite3D" type="Sprite3D" parent="." unique_id=322300994] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.15464, 0) -pixel_size = 0.05 -alpha_cut = 1 -texture_filter = 0 -texture = ExtResource("1_2ubx8") - -[node name="Sprite3D2" type="Sprite3D" parent="." unique_id=855452475] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.15464, 0) -pixel_size = 0.05 -alpha_cut = 1 -texture_filter = 0 -texture = ExtResource("1_2ubx8") - -[node name="Sprite3D3" type="Sprite3D" parent="." unique_id=207000330] -transform = Transform3D(7.5, 0, 0, 0, -3.27835e-07, 7.5, 0, -7.5, -3.27835e-07, 0, 5.98547, 0) -layers = 4 -texture_filter = 0 -texture = ExtResource("2_6w34c") diff --git a/Worlds/GreenPlanet/Decorations/tree.tscn b/Worlds/GreenPlanet/Decorations/tree.tscn deleted file mode 100644 index cdbd8d9..0000000 --- a/Worlds/GreenPlanet/Decorations/tree.tscn +++ /dev/null @@ -1,31 +0,0 @@ -[gd_scene format=3 uid="uid://iohlxrso4bl8"] - -[ext_resource type="Texture2D" uid="uid://dy2ukmg6koun1" path="res://Assets/Textures/tree.png" id="1_sisdp"] -[ext_resource type="Texture2D" uid="uid://dg47vgt0uccw1" path="res://Assets/Textures/minimap_tree.png" id="2_85nm0"] -[ext_resource type="PackedScene" uid="uid://406wnf58lo7h" path="res://3dtree.tscn" id="3_q6n84"] - -[node name="Tree" type="Node3D" unique_id=551277176] - -[node name="Sprite3D" type="Sprite3D" parent="." unique_id=107422458] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.15464, 0) -visible = false -pixel_size = 0.05 -alpha_cut = 1 -texture_filter = 0 -texture = ExtResource("1_sisdp") - -[node name="Sprite3D2" type="Sprite3D" parent="." unique_id=97997649] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.15464, 0) -visible = false -pixel_size = 0.05 -alpha_cut = 1 -texture_filter = 0 -texture = ExtResource("1_sisdp") - -[node name="Sprite3D3" type="Sprite3D" parent="." unique_id=765187915] -transform = Transform3D(7.5, 0, 0, 0, -3.27835e-07, 7.5, 0, -7.5, -3.27835e-07, 0, 5.98547, 0) -layers = 4 -texture_filter = 0 -texture = ExtResource("2_85nm0") - -[node name="tree_test" parent="." unique_id=613864103 instance=ExtResource("3_q6n84")] diff --git a/Worlds/GreenPlanet/Levels/Bridge/bricks.tres b/Worlds/GreenPlanet/Levels/Bridge/bricks.tres deleted file mode 100644 index d75e45e..0000000 --- a/Worlds/GreenPlanet/Levels/Bridge/bricks.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://eey3o4c8r2sb"] - -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_waxle"] -[ext_resource type="Texture2D" uid="uid://cvqq5j4dxucih" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge_bricks.png" id="2_waxle"] - -[resource] -render_priority = 0 -shader = ExtResource("1_waxle") -shader_parameter/albedo = ExtResource("2_waxle") -shader_parameter/jitter_z_coordinate = true -shader_parameter/jitter_depth_independent = true -shader_parameter/alpha_scissor = 1.0 diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_leaf.png b/Worlds/GreenPlanet/Levels/Bridge/bridge_leaf.png deleted file mode 100644 index a09a258d500e8908da4fc6000aa55731d3ab5896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V2t&2 zaSVxQ-8x-2@34bFYdp758Y|08)++|?8j(-sSZ!VTCj?78k(=n*A0W|eu$bwzj#~7V zNlz>GbrnXugW0Cx@IGyBhFyj$gl8OD&KWUzf$!^U zKP_uC8#kl|FA$#aU}N@8mZXNAEYTr8pMOLKrtyR@&C1xCyntm%+x6ef*MB=tIiaR- z(7#>RuYIk?L|=!db{3V+dcg>$WgaV7t~rEpMl~=-sAw?yCa+~tRWQACr|ia^vPCXt zjGT61w#Qb9t8U`-_%NYC<)Fx4%X{&Cb$s%x|9NW6`Th6D$={Z7OlO5Rs5o-3X$(@y zXp~6EVCM65 zaSVxQof^J3?~#Lm+=Thb+~OVoRymufuZ{W0(9!Nt$?`o@>A9>qFbesS0$Y}RkJ**ZlBZUhoYIri_5p|-n;ZlJ?jCd z8v7mo%B&`m-?`Zr2_HDO_ufp~{rh4Cejb0AaQuAv>etg73#afN%QJoW^3HRI@YlY4 z5!&rbxb+e_mbSh>GqI2(_1%ML->9QAtYymN4mSQ2ahB%3+~l)so8%YPD%Yy2`X&A6YSm=sMA>74|EjHiC&y)Eu9jf`zU;_ZuAq=Bmmbd!6gT<(@$>bgc^bwq zHLCg!IR7_rs>(m|=I7V9Ob^%Px(OSwo)6x9Z)@+`YtrK3ds4bIMWXdi3Gx|KhBmFO z4sM=z^W8VIbj5w@Q+kZ!)|%g($bLSjTR8FN(?v2N%MU0rw7eI49_Lx9HRbrXkT7jS zCZ#kZ0pHYB0jq2DGydttoaAIZ=c8SazxYx4kuycD-0NEk*7dTO?79AMLSVpQ?T&_^ zSL=T>_%r`{Q1b4x<*eh{k44H_0-{78Ye+mx*O<4-Ybt-oXFD)^Jnf ze~+Ix4R6n?>D%g}!{KmAq2%?^?^$~#9oGxR9lN}9znP+T;pdl0heSWfl;lpHK5^yM zIk{p6Cj?)wXsp<}&()*ptK_XpA-DAl-Cyw5{$x1Y!>RRLFg)#C#d<$S#VM60)4Lzu zsGP9o#(L$B)U>Vlc+8dV=9wtuoO%=U@!p$k$HwIM^9AFwp5@Hx_0!C3Eoqt%8*9(& zcB{JM%)W9beluHFUEBTtSFOIjiZjG8j`;)2ySe}QmtN`LmfG{k{(RA@`wi91(-{~T O7(8A5T-G@yGywqm0g;UW literal 0 HcmV?d00001 diff --git a/steel1.png.import b/Zones/Moat/mesh_moat_cobblestone.png.import similarity index 65% rename from steel1.png.import rename to Zones/Moat/mesh_moat_cobblestone.png.import index a67c18d..b4d7f1b 100644 --- a/steel1.png.import +++ b/Zones/Moat/mesh_moat_cobblestone.png.import @@ -2,16 +2,19 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d02g31nntdjmw" -path="res://.godot/imported/steel1.png-48f9afe4f43ffe832b24316c988ae25e.ctex" +uid="uid://vqji3458oxk" +path="res://.godot/imported/mesh_moat_cobblestone.png-2dc3858667c8d48b81ecde3ebb6fb3ec.ctex" metadata={ "vram_texture": false } +generator_parameters={ +"md5": "4cb1f838ef5968fed908002c6419a080" +} [deps] -source_file="res://steel1.png" -dest_files=["res://.godot/imported/steel1.png-48f9afe4f43ffe832b24316c988ae25e.ctex"] +source_file="res://Zones/Moat/mesh_moat_cobblestone.png" +dest_files=["res://.godot/imported/mesh_moat_cobblestone.png-2dc3858667c8d48b81ecde3ebb6fb3ec.ctex"] [params] @@ -23,7 +26,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Zones/Moat/mesh_moat_grass.png b/Zones/Moat/mesh_moat_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..aa1b5c40447ffd03a476196d9ca7943166137491 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-D%yJzX3_ zB3jpm85S`a@`%i8G;*HYwtmSI)jvw6qWurlCB5tzU9D!7l&qX|>g3#;Q?Hq=%k#Td zm7BRYPG`Iq13-9FpBapKYY=i|#Ns+ShF1Qy*n^XBnqYah3dm*4*TzIWG}!!<2| zMROQaxP2JE?|$m+*9PIGED4!(PN=FZ_PK`2T*fbNc0JjWP{A@mw}Iic@;QS!r3H+q zo`fCCltXVY$i&!aRdS4HUlQyG$}>;u82}u5?nek;6mNzh5Pt zMM+_)&Dwbz?&}&dvMiaxuBoNW8QRcrW%kCYDxr-`C*DmEn{I&#J{;Sp4_Rmnn50Gd{go?eS8)U#)*%7l>;VwO|i_)b6+< zXOo?A41cRzopr0NYo>p#T5? literal 0 HcmV?d00001 diff --git a/bricks.png.import b/Zones/Moat/mesh_moat_grass.png.import similarity index 66% rename from bricks.png.import rename to Zones/Moat/mesh_moat_grass.png.import index c3c39ea..6afea56 100644 --- a/bricks.png.import +++ b/Zones/Moat/mesh_moat_grass.png.import @@ -2,16 +2,19 @@ importer="texture" type="CompressedTexture2D" -uid="uid://okvy3vxo27mj" -path="res://.godot/imported/bricks.png-d949ec369d9f5322a1ea15fdf6b91ae6.ctex" +uid="uid://r6t8tw8wdg0k" +path="res://.godot/imported/mesh_moat_grass.png-ff8f81b04c8e8a850d68fcdbc1bd8b0b.ctex" metadata={ "vram_texture": false } +generator_parameters={ +"md5": "90c8db677a98042ac33135e89c44851a" +} [deps] -source_file="res://bricks.png" -dest_files=["res://.godot/imported/bricks.png-d949ec369d9f5322a1ea15fdf6b91ae6.ctex"] +source_file="res://Zones/Moat/mesh_moat_grass.png" +dest_files=["res://.godot/imported/mesh_moat_grass.png-ff8f81b04c8e8a850d68fcdbc1bd8b0b.ctex"] [params] @@ -23,7 +26,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png b/Zones/Moat/mesh_moat_level_tex.png similarity index 100% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png rename to Zones/Moat/mesh_moat_level_tex.png diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png.import b/Zones/Moat/mesh_moat_level_tex.png.import similarity index 68% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png.import rename to Zones/Moat/mesh_moat_level_tex.png.import index 548e607..00f8a71 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png.import +++ b/Zones/Moat/mesh_moat_level_tex.png.import @@ -2,8 +2,8 @@ importer="texture" type="CompressedTexture2D" -uid="uid://deh5dk1wn7n46" -path="res://.godot/imported/bridge_level_tex.png-285a08b52860b75771157e135c44ca0b.ctex" +uid="uid://d3frq1qqxo6py" +path="res://.godot/imported/mesh_moat_level_tex.png-7de3230baae0928690a37428dd1e0993.ctex" metadata={ "vram_texture": false } @@ -13,13 +13,13 @@ generator_parameters={ [deps] -source_file="res://Worlds/GreenPlanet/Levels/Bridge/bridge_level_tex.png" -dest_files=["res://.godot/imported/bridge_level_tex.png-285a08b52860b75771157e135c44ca0b.ctex"] +source_file="res://Zones/Moat/mesh_moat_level_tex.png" +dest_files=["res://.godot/imported/mesh_moat_level_tex.png-7de3230baae0928690a37428dd1e0993.ctex"] [params] compress/mode=0 -compress/high_quality=true +compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 compress/rdo_quality_loss=0.0 @@ -40,4 +40,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=0 +detect_3d/compress_to=1 diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb b/Zones/Moat/mesh_moat_wireframe.glb similarity index 100% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb rename to Zones/Moat/mesh_moat_wireframe.glb diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb.import b/Zones/Moat/mesh_moat_wireframe.glb.import similarity index 80% rename from Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb.import rename to Zones/Moat/mesh_moat_wireframe.glb.import index 6a5dee0..7f17346 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb.import +++ b/Zones/Moat/mesh_moat_wireframe.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://dxyx6rhy6fkc2" -path="res://.godot/imported/bridge_widget.glb-ac80e4548395483ae360d6203e10a1c2.scn" +path="res://.godot/imported/mesh_moat_wireframe.glb-9e490e572edb5cc53b8d915a07d6a12d.scn" [deps] -source_file="res://Worlds/GreenPlanet/Levels/Bridge/bridge_widget.glb" -dest_files=["res://.godot/imported/bridge_widget.glb-ac80e4548395483ae360d6203e10a1c2.scn"] +source_file="res://Zones/Moat/mesh_moat_wireframe.glb" +dest_files=["res://.godot/imported/mesh_moat_wireframe.glb-9e490e572edb5cc53b8d915a07d6a12d.scn"] [params] diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge.tscn b/Zones/Moat/scn_moat.tscn similarity index 99% rename from Worlds/GreenPlanet/Levels/Bridge/bridge.tscn rename to Zones/Moat/scn_moat.tscn index 3f246f8..2a4100d 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/bridge.tscn +++ b/Zones/Moat/scn_moat.tscn @@ -13,14 +13,14 @@ [ext_resource type="Script" uid="uid://yk54owkf7pgj" path="res://Scripts/cinema_cam.gd" id="9_xuyhn"] [ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://Audio/shot1.wav" id="11_l537x"] [ext_resource type="PackedScene" uid="uid://7g3jev3v6d3l" path="res://Scenes/ShopStand/shop_stand.tscn" id="19_h6brl"] -[ext_resource type="PackedScene" uid="uid://42dsbdlkvbfq" path="res://Tree1/tree1.tscn" id="20_j6d65"] +[ext_resource type="PackedScene" uid="uid://42dsbdlkvbfq" path="res://Props/Tree1/tree1.tscn" id="20_j6d65"] [ext_resource type="PackedScene" uid="uid://cmneu5o0m02l8" path="res://Worlds/GreenPlanet/Enemies/leaping_enemy.tscn" id="20_ttr7n"] -[ext_resource type="PackedScene" uid="uid://c8ecof4oeng1f" path="res://BigTree1/big_tree.tscn" id="21_6tcu8"] +[ext_resource type="PackedScene" uid="uid://c8ecof4oeng1f" path="res://Props/BigTree1/big_tree.tscn" id="21_6tcu8"] [ext_resource type="PackedScene" uid="uid://c6isprnkaliqr" path="res://Scenes/MixingTable/remix_table.tscn" id="21_ks6qx"] [ext_resource type="Script" uid="uid://cy6oj2hr8q8br" path="res://Scripts/killbox.gd" id="26_tuncf"] [ext_resource type="PackedScene" uid="uid://c2avjln5vmr0y" path="res://Scenes/Shredder/shredder.tscn" id="27_gppb4"] [ext_resource type="Texture2D" uid="uid://dqrfgw65d0sq8" path="res://Assets/Textures/bridge_map.png" id="28_6od8s"] -[ext_resource type="PackedScene" uid="uid://ca174636iktc6" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge.glb" id="30_ttr7n"] +[ext_resource type="PackedScene" uid="uid://ca174636iktc6" path="res://Zones/Moat/mesh_moat.glb" id="30_ttr7n"] [sub_resource type="Curve3D" id="Curve3D_3rdl2"] _data = { @@ -410,7 +410,7 @@ shape = SubResource("BoxShape3D_134um") [node name="Shredder" parent="." unique_id=964733986 instance=ExtResource("27_gppb4")] transform = Transform3D(0.748886, 0, 0.662699, 0, 1, 0, -0.662699, 0, 0.748886, 34.8662, 0.5, 16.6183) -[node name="bridge" parent="." unique_id=333162325 instance=ExtResource("30_ttr7n")] +[node name="bridge" parent="." unique_id=142248090 instance=ExtResource("30_ttr7n")] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.5, 0) [node name="Sprite3D" type="Sprite3D" parent="." unique_id=1926664882] diff --git a/Zones/Moat/zc_moat.tres b/Zones/Moat/zc_moat.tres new file mode 100644 index 0000000..700775c --- /dev/null +++ b/Zones/Moat/zc_moat.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" script_class="ZoneConfig" format=3 uid="uid://cqm54pu03l510"] + +[ext_resource type="PackedScene" uid="uid://y1qa1g3ic8sp" path="res://Zones/Moat/scn_moat.tscn" id="1_i6w1j"] +[ext_resource type="Script" uid="uid://q0vwwqs066g8" path="res://zone_config.gd" id="2_5ugqa"] + +[resource] +script = ExtResource("2_5ugqa") +zone_name = "Moat" +scene = ExtResource("1_i6w1j") +flow_field_data_path = "res://Zones/Moat/ffd_moat.json" +metadata/_custom_type_script = "uid://q0vwwqs066g8" diff --git a/bricks.png b/bricks.png deleted file mode 100644 index 15ee626177dc55c6a1135266fc02d076b1f985e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U_9yR z;usRqdNzD_?qLG~TftigTN#)PzMZ>wIeTz5aC{zf2Q-C_NC^WyU&cGDZyU!c2OYOHYJ-g!Kt*$xNleb=7AbYdT;@n(!vyOZlM=Nei$5g)O=Pp!o9Fr~< z%KH5E0?%>_S(XFg2kNDk^oI3+mCU`bvcoq=I_QUs%h9UMp{W&nzif$EcjZCR5B~Ga zPm^}e3Voi%u;)?fE7P~9T^{fCzqnI|y^yEN%PUAtb;^>UV~!1sOHOEoe(yN_G|%Z+ z(XpMK$JUFLpE_=INn&bh!osJ|YcrTMo{RjmHJE)R_EaQ9Z1on1fkzAf!WPnu8evPs#PEvf0gO;T=R+3{jarKwBePVc$< z;pwEgQQIc}jaoNhbz1J%&8!-G7cmBU@!dQc7b2%>pR%Xt!q>Ma)Q&j5opk@}TlF^6iA%kf-oK>mkK%u}p9~BP44$rjF6*2UngEk44ofy`glX=O&z_{4c z#WAE}&fD3JUWXF|TI1{fb+1rpx?b?~mM}+biQ+n&Htuje8@F&46gsKkDRon zR?Ibf`6M-M)5%A_7rvip@Og&k>fi0h)2u4l7}i`fWmqs}{qMBhEDRCPuIB8^kZ8^P zctppqSv{>#%4T{{FxTZrm78OOxGq0>*PRfzHrp#P%I1Dd{G!^u^?UwWX3X53-#jyP zhS>QvhqhFh&eoT5ON_GF%+;;2=E%xL9~K%v|MB<9O&f;*mUbh%3c)Fo`!|cXMD(m? zS2TNUZ~EZn)2$cHPhDhcd@u9hYK^9?Z%fLtukrbu?@a_JNj|T7lv{Vn#UpLb=g#dv z0|ReN`Y0>zo;b5ouUP0_wX}@%`>niv6OSjUh$*XYarB;(rQ~v#ZSAKcI(l6RA_p~^ z(x1O;4%oMA$I@HZvx~py7JN8*;=-N3WfuDc5=F%VBRbX73MXZ6as6;%=KY-dnD=&# zeQ!5}KhARWNV}6DFiBFruKUVQ-U*UV-x{6V{PU&Cw!<4`#e7?Ir0##LUw+8w@tk8z wYTnzs+00;1Qo6F1H|oJg3Cm@?QBUS?QGRd4X|iA*0|Nttr>mdKI;Vst0N%9TaR2}S diff --git a/crt_steel1.png.import b/crt_steel1.png.import deleted file mode 100644 index 2c44747..0000000 --- a/crt_steel1.png.import +++ /dev/null @@ -1,44 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://3rvy1up8f1k5" -path.s3tc="res://.godot/imported/crt_steel1.png-1421a6154113d1324830bea2a4343485.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} -generator_parameters={ -"md5": "97569a5489f5b2ed001ce20310e8deb2" -} - -[deps] - -source_file="res://crt_steel1.png" -dest_files=["res://.godot/imported/crt_steel1.png-1421a6154113d1324830bea2a4343485.s3tc.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/foliage/Bush2GLB3.glb b/foliage/Bush2GLB3.glb deleted file mode 100644 index c86469588c167b5912c770bc66184d49fee97b38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127904 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 diff --git a/foliage/Bush2GLB3.glb.import b/foliage/Bush2GLB3.glb.import deleted file mode 100644 index d5628e1..0000000 --- a/foliage/Bush2GLB3.glb.import +++ /dev/null @@ -1,42 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://w7vkshth36rr" -path="res://.godot/imported/Bush2GLB3.glb-ac453049ba98460916f151972326e065.scn" - -[deps] - -source_file="res://foliage/Bush2GLB3.glb" -dest_files=["res://.godot/imported/Bush2GLB3.glb-ac453049ba98460916f151972326e065.scn"] - -[params] - -nodes/root_type="Spatial" -nodes/root_name="Scene Root" -nodes/root_script=null -nodes/apply_root_scale=true -nodes/root_scale=1.0 -nodes/import_as_skeleton_bones=false -nodes/use_name_suffixes=true -nodes/use_node_type_suffixes=true -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=0 -meshes/lightmap_texel_size=0.1 -meshes/force_disable_compression=false -skins/use_named_skins=true -animation/import=true -animation/fps=15 -animation/trimming=false -animation/remove_immutable_tracks=true -animation/import_rest_as_RESET=false -import_script/path="" -materials/extract=0 -materials/extract_format=0 -materials/extract_path="" -_subresources={} -gltf/naming_version=0 -gltf/embedded_image_handling=1 diff --git a/foliage/Bush2GLB3.tscn b/foliage/Bush2GLB3.tscn deleted file mode 100644 index 01081aa..0000000 --- a/foliage/Bush2GLB3.tscn +++ /dev/null @@ -1,11 +0,0 @@ -[gd_scene format=3 uid="uid://b7e0ywe1g86fa"] - -[ext_resource type="PackedScene" uid="uid://w7vkshth36rr" path="res://foliage/Bush2GLB3.glb" id="1"] -[ext_resource type="Material" uid="uid://cqwo7la40rbkn" path="res://foliage/foliage.material" id="2"] - -[node name="Bush2GLB3" unique_id=415245138 instance=ExtResource("1")] - -[node name="Cube" parent="." index="0" unique_id=337622575] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.0632358) -cast_shadow = 0 -surface_material_override/0 = ExtResource("2") diff --git a/foliage/foliage.material b/foliage/foliage.material deleted file mode 100644 index b34130fa6985aea079f47f20c290826a5660c92c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmWFvc6MfBU|?VnU|_IeV_=xc#K54jRsU~-4Qs6kLzrx)E5qc;d}>`x3;Gv%F`vDFH0|#iv-M&> z&#w5odPU~$f7}19w())`vGGy6$I*JmexB_3x|MrBc7BOJ_@8l(eW7!_-@)HITt)Vs z>{FP^(LUAo1gHM_HS+xte%9yww#Dz_UbNZ8x=&F%x@6a!H&xs7ZcUWWoNU0Rx@}9W zd(EQ2W>53?a~GU@-DB*MelqxXnfSHMjUP7_`CSs5?$63SzyGa>IeWio?2E2l#<8=+ zIC@07Cf7WUnw2cE{A9AN9M87b@(-pT`Za6v9M2zXYvw=6UdZ9Jd~?w(b!pYhrB}qx z@yS~99V=04p24`VXG*DqYEXcm+#j|5&1@3PZ&bL~&7Liye4}@kjJ#a0u%U~P0>{Ck zJq<4%V}t&yOGJE}(YSGjPlP9LACp#SNA}jD!a|oD39J4qO>}&A>)@edt&}=rO|B?3|Ed1%8_v+Gz4_o5o8Fm!>+LC+5 zx~X3Kya&6r?bQ;c8en zeG$Xf?P^g|a@69_74N;Zt$gv`?Mt@{YTs0CslD9u<>a=Kg@;>G=dxZtQ^50UF+0N> z=aU`NQ>HQbFa$9~F!*epeEUC3o^J5lb6ft%7tP{+-7+<6tGVZ=cM*MiQteltUF}+D zob`8A)~$8_ZU2YPTU$0E;$!oYNA@T9A52Vqds=_1x!=rx>Obrkd}f#V^@;1=ao<%R ze9J^ux>&6FDFR6e~Da{Z^q&6P}`Rry||HZFaRvX%dWTidPIFbu+H8oFP)EZQUyC%gg^O ziZ~QS7)9tO)jW=xl`NsomEyR7XWMJ}2h$Jznl*Wj=a02D^PglZavplVxoDPpwCd%p zSH%4IWi9!R)hM;kFkF0QO0A1pP=KG@AGQ6>Y!b|GxJ6>j%rreV$mqxjoM-EjROaC8 zNU$(Ss0o;U^*<+DUe%QY5dj)&T9z($SgrbK*UrMiQnxD!YyWF4bbR*cAk*=siwYmr zpR8w;J3s$Y=EcrCANEMi$XZdj*D)<4<&cLX*QKNdOcOOXTM8){2YM}>p_Y_-*3~p; zEn|F}b;==QwRlbQ8}rNd|HyHh_Ps#0)`h|OX3Qb|8Mn*)KU^r&&VQv?ld)wIfBQ}i zg)K)O%TBCcoZfP*bJ~XXNR5|fHkBc}Q|#ZcPE$JlxNw8p(y2*1N>}NvS+!sPl6bwJ zP|#)P#1}i(-B2i1etq_g!~4xeiU~|cCZSXP?W&hbU)0J_)-*in+p}=afzbD;HQS53J_MPlUQUmgsPlfsywKbWpXbINw06v{&DwK^ H5tL*BS2aU` diff --git a/generic_wood.tres b/generic_wood.tres deleted file mode 100644 index 332d146..0000000 --- a/generic_wood.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="ShaderMaterial" format=3 uid="uid://bdlgg2ei0yrvd"] - -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_f4i1m"] -[ext_resource type="Texture2D" uid="uid://bs0lypwyo5jf6" path="res://crt_tree1_bark.png" id="2_dt32w"] - -[resource] -render_priority = 0 -shader = ExtResource("1_f4i1m") -shader_parameter/albedo = ExtResource("2_dt32w") -shader_parameter/jitter_z_coordinate = true -shader_parameter/jitter_depth_independent = true -shader_parameter/alpha_scissor = 1.0 diff --git a/level_mageccc.tscn b/level_mageccc.tscn index 340933e..4eca03e 100644 --- a/level_mageccc.tscn +++ b/level_mageccc.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://b2ta3p7n7g1dx" path="res://level_magec.gd" id="1_w3kbw"] [ext_resource type="PackedScene" uid="uid://cxarqns8onckw" path="res://crt.glb" id="2_75n78"] -[ext_resource type="PackedScene" uid="uid://ca174636iktc6" path="res://Worlds/GreenPlanet/Levels/Bridge/bridge.glb" id="2_kfofo"] +[ext_resource type="PackedScene" uid="uid://ca174636iktc6" path="res://Zones/Moat/mesh_moat.glb" id="2_kfofo"] [ext_resource type="PackedScene" uid="uid://dse6msy2hrctc" path="res://wire_frame.tscn" id="3_kfofo"] [node name="MainMenu" type="Node3D" unique_id=984017026 node_paths=PackedStringArray("level_parent", "widget_parent")] diff --git a/obstacle1.tscn b/obstacle1.tscn deleted file mode 100644 index 278c98c..0000000 --- a/obstacle1.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene format=3 uid="uid://cjvgqek2phoq1"] - -[ext_resource type="MeshLibrary" uid="uid://jfr8j8kycfa5" path="res://Worlds/GreenPlanet/tilemap.tres" id="1_5n7rt"] - -[node name="Node3D" type="GridMap" unique_id=150600707] -mesh_library = ExtResource("1_5n7rt") -cell_size = Vector3(1, 1, 1) -cell_center_x = false -cell_center_z = false -data = { -"cells": PackedInt32Array(0, 0, 0, 65535, 65534, 0, 0, 65534, 0, 1, 65534, 0, 2, 65535, 0, 2, 0, 0, 2, 1, 0, 1, 2, 0, 0, 2, 0, 65535, 2, 0, 65534, 1, 0, 65534, 0, 0, 65534, 65535, 0, 65535, 65535, 0, 0, 65535, 0, 1, 65535, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 65535, 1, 0, 65535, 0, 0) -} diff --git a/obstacle2.tscn b/obstacle2.tscn deleted file mode 100644 index e054f4a..0000000 --- a/obstacle2.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene format=3 uid="uid://dk0k7ndwhaenh"] - -[ext_resource type="MeshLibrary" uid="uid://jfr8j8kycfa5" path="res://Worlds/GreenPlanet/tilemap.tres" id="1_vcqgp"] - -[node name="Node3D" type="GridMap" unique_id=943507789] -mesh_library = ExtResource("1_vcqgp") -cell_size = Vector3(1, 1, 1) -cell_center_x = false -cell_center_z = false -data = { -"cells": PackedInt32Array(0, 0, 0, 0, 65535, 0, 65535, 0, 0, 65535, 65535, 0, 65534, 65535, 0) -} diff --git a/obstacle3.tscn b/obstacle3.tscn deleted file mode 100644 index aee9412..0000000 --- a/obstacle3.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene format=3 uid="uid://ds4sa5xyfgyo0"] - -[ext_resource type="MeshLibrary" uid="uid://jfr8j8kycfa5" path="res://Worlds/GreenPlanet/tilemap.tres" id="1_rgq2d"] - -[node name="Node3D" type="GridMap" unique_id=1467787585] -mesh_library = ExtResource("1_rgq2d") -cell_size = Vector3(1, 1, 1) -cell_center_x = false -cell_center_z = false -data = { -"cells": PackedInt32Array(0, 0, 0, 1, 0, 0, 1, 65535, 0, 2, 65534, 0, 2, 65535, 0, 0, 65535, 0, 0, 1, 0, 65535, 65535, 0, 65535, 65534, 0) -} diff --git a/obstacle4.tscn b/obstacle4.tscn deleted file mode 100644 index 1ca1edc..0000000 --- a/obstacle4.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene format=3 uid="uid://sud13mytdwhv"] - -[ext_resource type="MeshLibrary" uid="uid://jfr8j8kycfa5" path="res://Worlds/GreenPlanet/tilemap.tres" id="1_fmyjr"] - -[node name="Node3D" type="GridMap" unique_id=2078145437] -mesh_library = ExtResource("1_fmyjr") -cell_size = Vector3(1, 1, 1) -cell_center_x = false -cell_center_z = false -data = { -"cells": PackedInt32Array(0, 0, 0, 1, 0, 0, 0, 65535, 0, 0, 1, 0) -} diff --git a/project.godot b/project.godot index 857f0e6..3675272 100644 --- a/project.godot +++ b/project.godot @@ -53,7 +53,8 @@ folder_colors={ "res://UI/Keybinding/": "green", "res://UI/Menus/": "orange", "res://UI/Themes/": "pink", -"res://Worlds/": "teal" +"res://Worlds/": "teal", +"res://Zones/": "orange" } [filesystem] diff --git a/wave_viewer.gd b/wave_viewer.gd index bd4be5f..fbba883 100644 --- a/wave_viewer.gd +++ b/wave_viewer.gd @@ -29,6 +29,7 @@ func set_waves(waves: Array[Wave], starting_wave_number: int) -> void: for enemy: Enemy in enemy_dict.keys(): enemy_row.add_enemy_tag(enemy, enemy_dict[enemy]) + set_enemy_desc(waves[0].enemy_groups[0].enemy) func group_to_count(group: EnemyCard) -> int: diff --git a/zone_config.gd b/zone_config.gd new file mode 100644 index 0000000..095290b --- /dev/null +++ b/zone_config.gd @@ -0,0 +1,5 @@ +class_name ZoneConfig extends Resource + +@export var zone_name: String +@export var scene: PackedScene +@export var flow_field_data_path: String diff --git a/zone_config.gd.uid b/zone_config.gd.uid new file mode 100644 index 0000000..2fd4b39 --- /dev/null +++ b/zone_config.gd.uid @@ -0,0 +1 @@ +uid://q0vwwqs066g8