diff --git a/NewLON.csproj b/NewLON.csproj index 8eebc1d..b40b9a8 100644 --- a/NewLON.csproj +++ b/NewLON.csproj @@ -1,4 +1,4 @@ - + net8.0 true diff --git a/NewLON.csproj.old.1 b/NewLON.csproj.old.1 new file mode 100644 index 0000000..8eebc1d --- /dev/null +++ b/NewLON.csproj.old.1 @@ -0,0 +1,6 @@ + + + net8.0 + true + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..e0608ce --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +# New Liberation of Neighborville +This is a Plants versus Zombies fangame developed by @GeoPlayerRu, @CaTronick and @slaimy4. +# Features +- Level editing plugin named pvzadventure. +- Stackable stats through FloatModifier. +- Reusable zombies and plants logic. +- Decoupled GUI through signals and global signal bus. +# How to build +## Prerequisites +- Godot Mono >= 4.7 +- .NET SDK >= 8.0 +- Git +## Build +### Windows +1. Clone the repository: `git clone https://github.com/GeoPlayerRu/newlon-public.git` (or use SSH) +2. Open the project in Godot. +3. Import project if required +4. To build windows executable, run: **Project -> Export**. +5. Select **Windows Desktop** preset and click **Export Project**. If you don't have Windows export template installed, you can install it through modal window. +6. Choose an output location and export project. +### Linux +1. Clone the repository: `git clone https://github.com/GeoPlayerRu/newlon-public.git` (or use SSH) +2. Open the project in Godot. +3. Import project if required +4. To build windows executable, run: **Project -> Export**. +5. Select **Linux Desktop** preset and click **Export Project**. If you don't have Windows export template installed, you can install it through modal window. +6. Choose an output location and export project. diff --git a/assets/animations/zombies/basic_zombie_tree.tres b/assets/animations/zombies/basic_zombie_tree.tres index 1d088e0..c2c5070 100644 --- a/assets/animations/zombies/basic_zombie_tree.tres +++ b/assets/animations/zombies/basic_zombie_tree.tres @@ -1,4 +1,4 @@ -[gd_resource type="AnimationNodeStateMachine" load_steps=10 format=3 uid="uid://dj0blope85bg7"] +[gd_resource type="AnimationNodeStateMachine" format=3 uid="uid://dj0blope85bg7"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_w2cv7"] animation = &"basic/death" diff --git a/assets/audio/music/music_placeholder.tres b/assets/audio/music/music_placeholder.tres new file mode 100644 index 0000000..c6ae4f0 --- /dev/null +++ b/assets/audio/music/music_placeholder.tres @@ -0,0 +1,3 @@ +[gd_resource type="AudioStream" format=3 uid="uid://cr0o5lqt6044g"] + +[resource] diff --git a/assets/levels/video_level.tres b/assets/levels/video_level.tres index 8219e51..5a0f478 100644 --- a/assets/levels/video_level.tres +++ b/assets/levels/video_level.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=68 format=3 uid="uid://dwd5oqr0tuvhv"] +[gd_resource type="Resource" script_class="AdventureLevelResource" format=3 uid="uid://dwd5oqr0tuvhv"] [ext_resource type="Resource" uid="uid://c268ghdrraxgr" path="res://assets/rewards/NerdusReward.tres" id="1_eqa0o"] [ext_resource type="PackedScene" uid="uid://c5lplejgx7mex" path="res://scenes/entities/tiles/speed_tile.tscn" id="1_jfmww"] @@ -22,9 +22,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, null, null, null, ExtResource("7_ [sub_resource type="Resource" id="Resource_c21si"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_67vjw")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_8mi8t"] script = ExtResource("5_66y5q") @@ -33,9 +30,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, ExtResource("7_c21si"), null, nul [sub_resource type="Resource" id="Resource_icaa5"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_8mi8t")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_w7y4b"] script = ExtResource("5_66y5q") @@ -44,9 +38,6 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("7_c21si"), null, ExtResour [sub_resource type="Resource" id="Resource_kc7t2"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_w7y4b")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_h4874"] script = ExtResource("5_66y5q") @@ -55,9 +46,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, null, ExtResource("8_c21si"), nul [sub_resource type="Resource" id="Resource_66y5q"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_h4874")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_tflu2"] script = ExtResource("5_66y5q") @@ -70,9 +58,6 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("7_c21si"), null, null, Ext [sub_resource type="Resource" id="Resource_tuvrx"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_tflu2"), SubResource("Resource_o4ycu")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_j5brc"] script = ExtResource("5_66y5q") @@ -85,9 +70,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, null, ExtResource("7_c21si"), nul [sub_resource type="Resource" id="Resource_t4nit"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_j5brc"), SubResource("Resource_pu4uy")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_cce24"] script = ExtResource("5_66y5q") @@ -95,7 +77,6 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("8_c21si"), null, ExtResour [sub_resource type="Resource" id="Resource_60k6l"] script = ExtResource("5_66y5q") -zombies = Array[ExtResource("6_66y5q")]([null, null, null, null, null]) [sub_resource type="Resource" id="Resource_kligk"] script = ExtResource("5_66y5q") @@ -104,9 +85,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, ExtResource("8_c21si"), null, nul [sub_resource type="Resource" id="Resource_qx8xe"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_cce24"), SubResource("Resource_60k6l"), SubResource("Resource_kligk")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_r0qdt"] script = ExtResource("5_66y5q") @@ -123,9 +101,6 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("7_c21si"), null, ExtResour [sub_resource type="Resource" id="Resource_hyvhe"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_r0qdt"), SubResource("Resource_idcf6"), SubResource("Resource_pm6go")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_n1jd7"] script = ExtResource("5_66y5q") @@ -146,8 +121,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, ExtResource("8_c21si"), null, Ext [sub_resource type="Resource" id="Resource_8syff"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_n1jd7"), SubResource("Resource_0tojl"), SubResource("Resource_clry7"), SubResource("Resource_fbnvb")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 isHugeWave = true [sub_resource type="Resource" id="Resource_ljbqu"] @@ -161,9 +134,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, null, null, null, ExtResource("8_ [sub_resource type="Resource" id="Resource_jfmww"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_ljbqu"), SubResource("Resource_x1qhy")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_b6q86"] script = ExtResource("5_66y5q") @@ -176,9 +146,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, ExtResource("8_c21si"), null, nul [sub_resource type="Resource" id="Resource_vrqir"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_b6q86"), SubResource("Resource_kkdeh")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_lux4m"] script = ExtResource("5_66y5q") @@ -191,9 +158,6 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("8_c21si"), null, ExtResour [sub_resource type="Resource" id="Resource_2seob"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_lux4m"), SubResource("Resource_8akqo")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_dnmud"] script = ExtResource("5_66y5q") @@ -210,9 +174,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, null, ExtResource("8_c21si"), Ext [sub_resource type="Resource" id="Resource_geil0"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_dnmud"), SubResource("Resource_2g220"), SubResource("Resource_6mt11")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_lael2"] script = ExtResource("5_66y5q") @@ -229,9 +190,6 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("8_c21si"), null, ExtResour [sub_resource type="Resource" id="Resource_lxb1x"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_lael2"), SubResource("Resource_ptm5g"), SubResource("Resource_ivdh0")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_a02hf"] script = ExtResource("5_66y5q") @@ -240,9 +198,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, ExtResource("9_tuvrx"), ExtResour [sub_resource type="Resource" id="Resource_o5y12"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_a02hf")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_ojvab"] script = ExtResource("5_66y5q") @@ -255,9 +210,6 @@ zombies = Array[ExtResource("6_66y5q")]([null, ExtResource("9_tuvrx"), ExtResour [sub_resource type="Resource" id="Resource_diw66"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_ojvab"), SubResource("Resource_680eh")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 -isHugeWave = false [sub_resource type="Resource" id="Resource_3yjvk"] script = ExtResource("5_66y5q") @@ -274,20 +226,15 @@ zombies = Array[ExtResource("6_66y5q")]([ExtResource("8_c21si"), ExtResource("8_ [sub_resource type="Resource" id="Resource_pwwqn"] script = ExtResource("4_kc7t2") zombiesOrdered = Array[ExtResource("5_66y5q")]([SubResource("Resource_3yjvk"), SubResource("Resource_vqnxn"), SubResource("Resource_78ix5")]) -events = Array[ExtResource("3_icaa5")]([]) -customWaveDelay = 0.0 isHugeWave = true [resource] script = ExtResource("1_r0wru") -startSun = 50 wavePercentage = 0.5 standardWaveDelay = 30.0 initialWaveDelay = 20.0 reward = ExtResource("1_eqa0o") forbiddenPlants = Array[String](["garlic", "nerdus"]) -forbiddenTags = Array[String]([]) -prepickedPlants = Array[String]([]) waves = Array[ExtResource("4_kc7t2")]([SubResource("Resource_c21si"), SubResource("Resource_icaa5"), SubResource("Resource_kc7t2"), SubResource("Resource_66y5q"), SubResource("Resource_tuvrx"), SubResource("Resource_t4nit"), SubResource("Resource_qx8xe"), SubResource("Resource_hyvhe"), SubResource("Resource_8syff"), SubResource("Resource_jfmww"), SubResource("Resource_vrqir"), SubResource("Resource_2seob"), SubResource("Resource_geil0"), SubResource("Resource_lxb1x"), SubResource("Resource_o5y12"), SubResource("Resource_diw66"), SubResource("Resource_pwwqn")]) initialScenes = Array[PackedScene]([null, null, null, null, null, null, null, null, ExtResource("1_jfmww"), null, null, null, null, null, null, null, null, ExtResource("1_qx8xe"), null, null, null, null, null, null, null, null, ExtResource("2_8syff"), null, null, null, null, null, null, null, null, ExtResource("2_hyvhe"), null, null, null, null, null, null, null, null, ExtResource("1_jfmww")]) metadata/_custom_type_script = "uid://bximdujbkj2n4" diff --git a/assets/plants/Nerdus.tres b/assets/plants/Nerdus.tres index 90aeb8d..3202e7e 100644 --- a/assets/plants/Nerdus.tres +++ b/assets/plants/Nerdus.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="PlantResource" load_steps=5 format=3 uid="uid://8edvnmwu4tyn"] +[gd_resource type="Resource" script_class="PlantResource" format=3 uid="uid://8edvnmwu4tyn"] [ext_resource type="Texture2D" uid="uid://b06e8xhdy77d1" path="res://assets/sprites/atlases/plants/nerdus.png" id="1_of51r"] [ext_resource type="PackedScene" uid="uid://k5aj2slxar7w" path="res://scenes/entities/plants/nerdus.tscn" id="2_0i6qf"] @@ -10,14 +10,11 @@ region = Rect2(477, 9, 60, 59) [resource] script = ExtResource("3_30qd0") -Layer = 1 -DontRegister = false NameKey = "nerdus" DescriptionKey = "nerdus_desc" Cost = 125.0 Scene = ExtResource("2_0i6qf") ReloadTime = 10.0 -ReloadProgress = 0.0 Preview = SubResource("AtlasTexture_ivp5w") Order = 10 metadata/_custom_type_script = "uid://cyenlko1knygw" diff --git a/assets/sprites/particles/dirt_material.tres b/assets/sprites/particles/dirt_material.tres index 07457c9..4ab81a0 100644 --- a/assets/sprites/particles/dirt_material.tres +++ b/assets/sprites/particles/dirt_material.tres @@ -1,4 +1,4 @@ -[gd_resource type="ParticleProcessMaterial" load_steps=5 format=3 uid="uid://dmpscw60bfrj"] +[gd_resource type="ParticleProcessMaterial" format=3 uid="uid://dmpscw60bfrj"] [sub_resource type="Curve" id="Curve_oyxjr"] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.745794, 1), 0.0, -3.06933, 0, 0, Vector2(1, 0), -4.13429, 0.0, 0, 0] diff --git a/assets/themes/ChooseYourSeeds.tres b/assets/themes/ChooseYourSeeds.tres index fe483d4..31f25b7 100644 --- a/assets/themes/ChooseYourSeeds.tres +++ b/assets/themes/ChooseYourSeeds.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=13 format=3 uid="uid://e8n88g31w7x7"] +[gd_resource type="Theme" format=3 uid="uid://e8n88g31w7x7"] [ext_resource type="Texture2D" uid="uid://ci1a150qo2op2" path="res://assets/sprites/gui/ChooseYourSeeds/Panel.tres" id="1_86pbs"] [ext_resource type="Texture2D" uid="uid://bj5fouwjk3kum" path="res://assets/sprites/gui/ChooseYourSeeds/InnerPanel.tres" id="2_txg3r"] diff --git a/assets/themes/GameStyle.tres b/assets/themes/GameStyle.tres index 42764e6..948b5bd 100644 --- a/assets/themes/GameStyle.tres +++ b/assets/themes/GameStyle.tres @@ -1,6 +1,5 @@ -[gd_resource type="Theme" load_steps=40 format=3 uid="uid://b8l285cjcgeyi"] +[gd_resource type="Theme" format=3 uid="uid://b8l285cjcgeyi"] -[ext_resource type="FontFile" uid="uid://nbrt5q3t8tud" path="res://assets/fonts/pico12.ttf" id="1_103to"] [ext_resource type="Texture2D" uid="uid://d0yhee0scl7mc" path="res://assets/sprites/gui/ButtonBackground.tres" id="1_y0kbp"] [ext_resource type="Texture2D" uid="uid://dxmg20mrnpt8r" path="res://assets/sprites/gui/SelectionGeneric.tres" id="2_h0nd2"] [ext_resource type="Texture2D" uid="uid://b5skdm3q7tkh3" path="res://assets/sprites/gui/ChooseYourSeeds/Grabber.tres" id="3_i6w8j"] @@ -173,7 +172,6 @@ texture_margin_right = 7.0 texture_margin_bottom = 4.0 [resource] -default_font = ExtResource("1_103to") Button/colors/font_color = Color(0, 0, 0, 1) Button/colors/font_focus_color = Color(0, 0, 0, 1) Button/colors/font_outline_color = Color(1, 1, 1, 1) diff --git a/assets/zombies/basic.tres b/assets/zombies/basic.tres index 7d17747..df72a95 100644 --- a/assets/zombies/basic.tres +++ b/assets/zombies/basic.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://buvacn56kyy2p"] +[gd_resource type="Resource" script_class="ZombieResource" format=3 uid="uid://buvacn56kyy2p"] [ext_resource type="PackedScene" uid="uid://co11v3w8hbwgf" path="res://scenes/entities/Zombies/zombie.tscn" id="1_c2mq3"] [ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/entities/ZombieResource.cs" id="1_k277m"] @@ -15,7 +15,5 @@ DescriptionKey = "basic_desc" Cost = 1.0 Scene = ExtResource("1_c2mq3") ReloadTime = 1.0 -ReloadProgress = 0.0 Preview = SubResource("AtlasTexture_wu2q8") -Order = 0 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/assets/zombies/buckethead.tres b/assets/zombies/buckethead.tres index f288f99..72400d3 100644 --- a/assets/zombies/buckethead.tres +++ b/assets/zombies/buckethead.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://dkhjlu7u0vny6"] +[gd_resource type="Resource" script_class="ZombieResource" format=3 uid="uid://dkhjlu7u0vny6"] [ext_resource type="PackedScene" uid="uid://xu4i6tmkv00a" path="res://scenes/entities/Zombies/bucket_zombie.tscn" id="1_lhcag"] [ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/entities/ZombieResource.cs" id="1_sngfh"] @@ -15,7 +15,6 @@ DescriptionKey = "buckethead_desc" Cost = 5.0 Scene = ExtResource("1_lhcag") ReloadTime = 1.0 -ReloadProgress = 0.0 Preview = SubResource("AtlasTexture_drksh") Order = 2 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/assets/zombies/conehead.tres b/assets/zombies/conehead.tres index 64b2f05..93ec3d5 100644 --- a/assets/zombies/conehead.tres +++ b/assets/zombies/conehead.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://nceohd32fkxk"] +[gd_resource type="Resource" script_class="ZombieResource" format=3 uid="uid://nceohd32fkxk"] [ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_f7g7v"] [ext_resource type="PackedScene" uid="uid://hhjbqkjqpt7x" path="res://scenes/entities/Zombies/cone_zombie.tscn" id="1_llf5l"] @@ -15,7 +15,6 @@ DescriptionKey = "conehead_desc" Cost = 2.0 Scene = ExtResource("1_llf5l") ReloadTime = 1.0 -ReloadProgress = 0.0 Preview = SubResource("AtlasTexture_q44xp") Order = 1 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/assets/zombies/hobo.tres b/assets/zombies/hobo.tres index ed23809..25ebc14 100644 --- a/assets/zombies/hobo.tres +++ b/assets/zombies/hobo.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://c38vfdw5b60xw"] +[gd_resource type="Resource" script_class="ZombieResource" format=3 uid="uid://c38vfdw5b60xw"] [ext_resource type="PackedScene" uid="uid://bgqmwsb6ynm81" path="res://scenes/entities/Zombies/hobo.tscn" id="1_4myt6"] [ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_nt7w3"] @@ -15,7 +15,6 @@ DescriptionKey = "hobo_desc" Cost = 7.0 Scene = ExtResource("1_4myt6") ReloadTime = 1.0 -ReloadProgress = 0.0 Preview = SubResource("AtlasTexture_73ahc") Order = 5 metadata/_custom_type_script = "uid://cqxj7o8hdm82n" diff --git a/project.godot b/project.godot index 96ed95b..cbd622f 100644 --- a/project.godot +++ b/project.godot @@ -12,13 +12,14 @@ config_version=5 warnings/check_invalid_track_paths=false warnings/check_angle_interpolation_type_conflicting=false +compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application] config/name="Liberation of the Neighbourville" config/version="0.3.0" run/main_scene="uid://bfstrli64u23y" -config/features=PackedStringArray("4.4", "C#", "Forward Plus") +config/features=PackedStringArray("4.7", "C#", "Forward Plus") config/icon="res://icon.png" config/windows_native_icon="res://icon.ico" @@ -68,7 +69,7 @@ import/blender/enabled=false [gui] theme/custom="res://assets/themes/GameStyle.tres" -theme/custom_font="res://assets/fonts/pico12.ttf" +theme/custom_font="uid://bor21ae1lks57" [input] diff --git a/scenes/entities/Zombies/cone_zombie.tscn b/scenes/entities/Zombies/cone_zombie.tscn index 26d0608..50c63ed 100644 --- a/scenes/entities/Zombies/cone_zombie.tscn +++ b/scenes/entities/Zombies/cone_zombie.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=69 format=3 uid="uid://hhjbqkjqpt7x"] +[gd_scene format=3 uid="uid://hhjbqkjqpt7x"] [ext_resource type="Script" uid="uid://dildme6epx8l4" path="res://scripts/entities/zombies/RuntimeZombieData.cs" id="1_ffeg6"] [ext_resource type="Material" uid="uid://jr0vpg030jqv" path="res://assets/ZombieMaterial.tres" id="2_ffeg6"] @@ -88,7 +88,7 @@ joint_data/1/bone2d_node = NodePath("Butt/RightUpperLeg/RightLowerLeg") joint_data/1/rotate_from_joint = false joint_data/1/enable_constraint = true joint_data/1/constraint_angle_min = 0.0 -joint_data/1/constraint_angle_max = 160.0 +joint_data/1/constraint_angle_max = 159.99998 joint_data/1/constraint_angle_invert = false joint_data/1/constraint_in_localspace = true joint_data/1/editor_draw_gizmo = true @@ -763,7 +763,6 @@ size = Vector2(26, 48) resource_local_to_scene = true script = ExtResource("4_qof5v") flat_value = 5.0 -percentage_value = 0.0 mult_value = 1.0 [sub_resource type="RectangleShape2D" id="RectangleShape2D_r4ug6"] @@ -776,13 +775,12 @@ nodes/TimeScale/node = SubResource("AnimationNodeTimeScale_2q05d") nodes/TimeScale/position = Vector2(60, 120) nodes/Tree/node = ExtResource("16_q51xn") nodes/Tree/position = Vector2(-240, 120) -node_connections = [&"TimeScale", 0, &"Tree", &"output", 0, &"TimeScale"] +node_connections = [&"output", 0, &"TimeScale", &"TimeScale", 0, &"Tree"] [sub_resource type="Resource" id="Resource_b6mal"] resource_local_to_scene = true script = ExtResource("4_qof5v") flat_value = 0.2 -percentage_value = 0.0 mult_value = 1.0 [sub_resource type="Resource" id="Resource_dn8ha"] @@ -790,7 +788,7 @@ script = ExtResource("31_uyysk") restartTreshold = -1.0 metadata/_custom_type_script = "uid://c1x4n4nqyq72f" -[node name="ConeZombie" type="Node2D" node_paths=PackedStringArray("_armor", "_player", "_tree")] +[node name="ConeZombie" type="Node2D" unique_id=1999406667 node_paths=PackedStringArray("_armor", "_player", "_tree")] y_sort_enabled = true script = ExtResource("1_ffeg6") _armor = NodePath("Armor") @@ -799,187 +797,187 @@ _player = NodePath("CanvasGroup/basic_zombie_walk/AnimationPlayer") _tree = NodePath("AnimationTree") metadata/_edit_vertical_guides_ = [-159.0] -[node name="CanvasGroup" type="CanvasGroup" parent="."] +[node name="CanvasGroup" type="CanvasGroup" parent="." unique_id=1129309871] material = ExtResource("2_ffeg6") -[node name="basic_zombie_walk" type="Node2D" parent="CanvasGroup"] +[node name="basic_zombie_walk" type="Node2D" parent="CanvasGroup" unique_id=385596969] -[node name="Zombie" type="Skeleton2D" parent="CanvasGroup/basic_zombie_walk"] +[node name="Zombie" type="Skeleton2D" parent="CanvasGroup/basic_zombie_walk" unique_id=1943185794] use_parent_material = true modification_stack = SubResource("SkeletonModificationStack2D_wn68q") -[node name="Butt" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie"] +[node name="Butt" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie" unique_id=795974917] use_parent_material = true position = Vector2(5, -35) scale = Vector2(0.999903, 0.999903) rest = Transform2D(1, 0, 0, 1, 5, -35) editor_settings/show_bone_gizmo = false -[node name="Butt" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt"] +[node name="Butt" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" unique_id=164696415] use_parent_material = true texture = SubResource("AtlasTexture_jvn5w") centered = false offset = Vector2(-10, -3) metadata/_edit_lock_ = true -[node name="RightUpperLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt"] +[node name="RightUpperLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" unique_id=1034286519] use_parent_material = true position = Vector2(-6, 3) -scale = Vector2(0.999834, 0.999834) +scale = Vector2(0.9998335, 0.9998335) rest = Transform2D(1, 0, 0, 1, -6, 3) editor_settings/show_bone_gizmo = false -[node name="Right_Upper_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg"] +[node name="Right_Upper_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" unique_id=584013320] texture = SubResource("AtlasTexture_vmdbp") centered = false offset = Vector2(-6, -2) metadata/_edit_lock_ = true -[node name="RightLowerLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg"] +[node name="RightLowerLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" unique_id=162145444] position = Vector2(-2, 12) -scale = Vector2(0.999834, 0.999834) +scale = Vector2(0.99983305, 0.99983305) rest = Transform2D(1, 0, 0, 1, -2, 12) editor_settings/show_bone_gizmo = false -[node name="RightFoot" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg"] +[node name="RightFoot" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" unique_id=677635125] position = Vector2(-2, 14) -scale = Vector2(0.999833, 0.999833) +scale = Vector2(0.99983346, 0.99983346) rest = Transform2D(1, 0, 0, 1, -2, 14) auto_calculate_length_and_angle = false length = 12.0 bone_angle = 0.0 editor_settings/show_bone_gizmo = false -[node name="Right_Foot" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg/RightFoot"] +[node name="Right_Foot" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg/RightFoot" unique_id=932037777] texture = SubResource("AtlasTexture_x1oyw") centered = false offset = Vector2(-4, -3) metadata/_edit_lock_ = true -[node name="Right_Lower_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg"] +[node name="Right_Lower_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" unique_id=1843247467] position = Vector2(-18, -2) texture = SubResource("AtlasTexture_vjx3c") centered = false offset = Vector2(12, 1) metadata/_edit_lock_ = true -[node name="LeftUpperLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt"] +[node name="LeftUpperLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" unique_id=1905444680] use_parent_material = true position = Vector2(6, 4) -scale = Vector2(0.999835, 0.999835) +scale = Vector2(0.99983406, 0.99983406) rest = Transform2D(1, 0, 0, 1, 6, 4) editor_settings/show_bone_gizmo = false -[node name="Left_Upper_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg"] +[node name="Left_Upper_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" unique_id=2084109444] texture = SubResource("AtlasTexture_f31xd") centered = false offset = Vector2(-4, -2) metadata/_edit_lock_ = true -[node name="LeftLowerLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg"] +[node name="LeftLowerLeg" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" unique_id=959607445] position = Vector2(-1, 13) -scale = Vector2(0.999831, 0.999831) +scale = Vector2(0.999832, 0.999832) rest = Transform2D(1, 0, 0, 1, -1, 13) editor_settings/show_bone_gizmo = false -[node name="Left_Lower_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg"] +[node name="Left_Lower_Leg" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" unique_id=76301716] texture = SubResource("AtlasTexture_od8jf") centered = false offset = Vector2(-1, 0) metadata/_edit_lock_ = true -[node name="LeftFoot" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg"] +[node name="LeftFoot" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" unique_id=1062821486] position = Vector2(6, 10) -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.9998278, 0.9998278) rest = Transform2D(1, 0, 0, 1, 6, 10) auto_calculate_length_and_angle = false length = 12.0 -bone_angle = 160.0 +bone_angle = 159.99998 editor_settings/show_bone_gizmo = false -[node name="Left_Foot" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg/LeftFoot"] +[node name="Left_Foot" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg/LeftFoot" unique_id=15553433] texture = SubResource("AtlasTexture_p4711") centered = false offset = Vector2(-14, -3) metadata/_edit_lock_ = true -[node name="Body" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt"] +[node name="Body" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" unique_id=1907869417] use_parent_material = true position = Vector2(1, -2) -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.9998302, 0.9998302) rest = Transform2D(1, 0, 0, 1, 1, -2) editor_settings/show_bone_gizmo = false -[node name="RightUpperArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] +[node name="RightUpperArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" unique_id=946087935] use_parent_material = true position = Vector2(-14, -23) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.9998299, 0.9998299) rest = Transform2D(1, 0, 0, 1, -14, -23) editor_settings/show_bone_gizmo = false -[node name="Right_Upper_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm"] +[node name="Right_Upper_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" unique_id=746692844] texture = SubResource("AtlasTexture_1bk2b") centered = false offset = Vector2(-4, -2) metadata/_edit_lock_ = true -[node name="RightLowerArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm"] +[node name="RightLowerArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" unique_id=1789170061] position = Vector2(-2, 15) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.9998273, 0.9998273) rest = Transform2D(1, 0, 0, 1, -2, 15) editor_settings/show_bone_gizmo = false -[node name="RightHand" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm"] +[node name="RightHand" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" unique_id=145342599] position = Vector2(-1, 13) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.9998282, 0.9998282) rest = Transform2D(1, 0, 0, 1, -1, 13) auto_calculate_length_and_angle = false length = 8.0 bone_angle = 90.0 editor_settings/show_bone_gizmo = false -[node name="Right_Hand" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm/RightHand"] +[node name="Right_Hand" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm/RightHand" unique_id=1274473728] texture = SubResource("AtlasTexture_y06yv") centered = false offset = Vector2(-4, -2) metadata/_edit_lock_ = true -[node name="Right_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm"] +[node name="Right_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" unique_id=1352830962] texture = SubResource("AtlasTexture_lu8go") centered = false offset = Vector2(-5, -1) metadata/_edit_lock_ = true -[node name="Body" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] +[node name="Body" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" unique_id=771620428] rotation = 0.00163735 texture = SubResource("AtlasTexture_cdq7v") centered = false offset = Vector2(-15, -27) metadata/_edit_lock_ = true -[node name="Tie" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] +[node name="Tie" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" unique_id=1947555003] position = Vector2(-9, -21) -rotation = -0.128654 -skew = -0.000155091 +rotation = 0.019353122 +skew = -0.00015544891 rest = Transform2D(1, 0, 0, 1, -9, -21) auto_calculate_length_and_angle = false length = 24.0 -bone_angle = 100.0 +bone_angle = 99.99999 editor_settings/show_bone_gizmo = false -[node name="Tie" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Tie"] +[node name="Tie" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Tie" unique_id=1901132754] texture = SubResource("AtlasTexture_e7wc3") centered = false offset = Vector2(-10, -1) metadata/_edit_lock_ = true -[node name="Head" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] +[node name="Head" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" unique_id=1041113385] position = Vector2(-10, -25) -scale = Vector2(0.999827, 0.999827) +scale = Vector2(0.9998268, 0.9998268) rest = Transform2D(1, 0, 0, 1, -10, -25) editor_settings/show_bone_gizmo = false -[node name="HeadParticle" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" node_paths=PackedStringArray("data")] +[node name="HeadParticle" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" unique_id=1483790769 node_paths=PackedStringArray("data")] collision_layer = 128 collision_mask = 64 freeze = true @@ -990,57 +988,57 @@ minTorque = -45.0 maxTorque = 45.0 Impulse = 100.0 -[node name="Head" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle"] +[node name="Head" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle" unique_id=598225201] texture = SubResource("AtlasTexture_wn68q") centered = false offset = Vector2(-20, -24) metadata/_edit_lock_ = true -[node name="Right_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] +[node name="Right_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" unique_id=1749601143] position = Vector2(-16, -8) texture = SubResource("AtlasTexture_vcc72") centered = false offset = Vector2(-2, -2) metadata/_edit_lock_ = true -[node name="Left_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] -position = Vector2(-4, -9.00001) +[node name="Left_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" unique_id=986909267] +position = Vector2(-4, -9) texture = SubResource("AtlasTexture_kto0i") centered = false offset = Vector2(-2, -2) metadata/_edit_lock_ = true -[node name="Jaw" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] -position = Vector2(-2.84023, 2.61439) -rotation = -0.0898652 -scale = Vector2(0.999827, 0.999827) +[node name="Jaw" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" unique_id=1069419130] +position = Vector2(-3.0002377, 2.9995995) +rotation = 0.0018781578 +scale = Vector2(0.99982774, 0.99982774) texture = SubResource("AtlasTexture_x5uj2") centered = false offset = Vector2(-12, -2) metadata/_edit_lock_ = true -[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle" unique_id=6887028] position = Vector2(-4.58496, -8.21035) shape = SubResource("CircleShape2D_dn8ha") -[node name="Observer" type="Node" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle" node_paths=PackedStringArray("_observedEntity")] +[node name="Observer" type="Node" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle" unique_id=988397786 node_paths=PackedStringArray("_observedEntity")] script = ExtResource("5_25dv7") _threshold = 0.0 _observedEntity = NodePath("../../../../../../../..") -[node name="Jaw" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head"] +[node name="Jaw" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" unique_id=2111714051] position = Vector2(-3, 3) -scale = Vector2(0.999827, 0.999827) +scale = Vector2(0.99982774, 0.99982774) rest = Transform2D(1, 0, 0, 1, -3, 3) auto_calculate_length_and_angle = false length = 11.0 bone_angle = 180.0 editor_settings/show_bone_gizmo = false -[node name="RemoteTransform2D" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Jaw"] +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Jaw" unique_id=342549113] remote_path = NodePath("../../HeadParticle/Head/Jaw") -[node name="RightEye" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head"] +[node name="RightEye" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" unique_id=407223440] position = Vector2(-16, -8) rest = Transform2D(1, 0, 0, 1, -16, -8) auto_calculate_length_and_angle = false @@ -1048,10 +1046,10 @@ length = 2.0 bone_angle = 180.0 editor_settings/show_bone_gizmo = false -[node name="RemoteTransform2D" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/RightEye"] +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/RightEye" unique_id=1248656797] remote_path = NodePath("../../HeadParticle/Head/Right_Eye") -[node name="LeftEye" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head"] +[node name="LeftEye" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" unique_id=959830729] position = Vector2(-4, -9) rest = Transform2D(1, 0, 0, 1, -4, -9) auto_calculate_length_and_angle = false @@ -1059,10 +1057,10 @@ length = 2.0 bone_angle = 180.0 editor_settings/show_bone_gizmo = false -[node name="RemoteTransform2D" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/LeftEye"] +[node name="RemoteTransform2D" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/LeftEye" unique_id=1818970779] remote_path = NodePath("../../HeadParticle/Head/Left_Eye") -[node name="Hat" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" node_paths=PackedStringArray("data")] +[node name="Hat" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" unique_id=1134701617 node_paths=PackedStringArray("data")] position = Vector2(-2.5, -13.5) collision_layer = 128 collision_mask = 64 @@ -1076,7 +1074,7 @@ minTorque = -45.0 maxTorque = 45.0 Impulse = 100.0 -[node name="Sprite" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Hat" node_paths=PackedStringArray("armor")] +[node name="Sprite" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Hat" unique_id=1279935408 node_paths=PackedStringArray("armor")] material = ExtResource("3_b8kja") position = Vector2(-1, -12) texture = ExtResource("4_qdhik") @@ -1085,24 +1083,24 @@ armor = NodePath("../../../../../../../../Armor") degradationStages = Array[Texture]([ExtResource("4_qdhik"), ExtResource("6_b6mal"), ExtResource("7_011r0")]) thresholdPercentage = Array[float]([1.0, 0.667, 0.333]) -[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Hat"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/Hat" unique_id=227061930] position = Vector2(1, -6) shape = SubResource("CircleShape2D_67t4t") -[node name="LeftUpperArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body"] +[node name="LeftUpperArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" unique_id=1323908108] position = Vector2(-1, -20) -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.9998292, 0.9998292) rest = Transform2D(1, 0, 0, 1, -1, -20) editor_settings/show_bone_gizmo = false -[node name="Left_Upper_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm"] +[node name="Left_Upper_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" unique_id=2132464215] position = Vector2(-37, 10) texture = SubResource("AtlasTexture_djocr") centered = false offset = Vector2(33, -12) metadata/_edit_lock_ = true -[node name="HandProjectile" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" node_paths=PackedStringArray("data")] +[node name="HandProjectile" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" unique_id=952092305 node_paths=PackedStringArray("data")] position = Vector2(-2, 14) collision_layer = 128 collision_mask = 64 @@ -1112,84 +1110,82 @@ data = NodePath("../../../../../../..") minTorque = -45.0 maxTorque = 45.0 -[node name="Left_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile"] -rotation = -0.136361 -scale = Vector2(0.999995, 0.999995) +[node name="Left_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" unique_id=463473818] +rotation = 0.018196192 +scale = Vector2(0.99999845, 0.99999845) texture = SubResource("AtlasTexture_auqeq") centered = false offset = Vector2(-5, 0) metadata/_edit_lock_ = true -[node name="Left_Hand" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm"] +[node name="Left_Hand" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" unique_id=488142694] show_behind_parent = true -position = Vector2(-0.99983, 12.9978) -rotation = -0.112403 -scale = Vector2(0.999658, 0.999658) +position = Vector2(-0.9998299, 12.997793) +rotation = -0.00803068 +scale = Vector2(0.9996578, 0.9996578) texture = SubResource("AtlasTexture_vlvtp") centered = false offset = Vector2(-4, -1) metadata/_edit_lock_ = true -[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" unique_id=533330192] position = Vector2(-0.00104554, 13.0063) shape = SubResource("CapsuleShape2D_ccrjo") -[node name="Observer" type="Node" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" node_paths=PackedStringArray("_observedEntity")] +[node name="Observer" type="Node" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" unique_id=852053571 node_paths=PackedStringArray("_observedEntity")] script = ExtResource("5_25dv7") _observedEntity = NodePath("../../../../../../../..") -[node name="LeftLowerArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm"] +[node name="LeftLowerArm" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" unique_id=3124898] position = Vector2(-2, 14) -scale = Vector2(0.999825, 0.999825) +scale = Vector2(0.9998285, 0.9998285) rest = Transform2D(1, 0, 0, 1, -2, 14) editor_settings/show_bone_gizmo = false -[node name="LeftHand" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm"] +[node name="LeftHand" type="Bone2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" unique_id=732280987] position = Vector2(-1, 13) -scale = Vector2(0.999828, 0.999828) +scale = Vector2(0.99982774, 0.99982774) rest = Transform2D(1, 0, 0, 1, -1, 13) auto_calculate_length_and_angle = false length = 6.0 bone_angle = 90.0 editor_settings/show_bone_gizmo = false -[node name="Left_Hand_Remote" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm/LeftHand"] +[node name="Left_Hand_Remote" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm/LeftHand" unique_id=1867280343] remote_path = NodePath("../../../HandProjectile/Left_Lower_Arm/Left_Hand") -[node name="Left_Lower_Arm_Remote" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm"] +[node name="Left_Lower_Arm_Remote" type="RemoteTransform2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" unique_id=910352972] scale = Vector2(1.00017, 1.00017) remote_path = NodePath("../../HandProjectile/Left_Lower_Arm") -[node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasGroup/basic_zombie_walk"] -libraries = { -&"": SubResource("AnimationLibrary_x5uj2"), -&"basic": ExtResource("12_1gn3d") -} +[node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasGroup/basic_zombie_walk" unique_id=506659006] +libraries/ = SubResource("AnimationLibrary_x5uj2") +libraries/basic = ExtResource("12_1gn3d") -[node name="EatingStatistics" type="Node" parent="CanvasGroup/basic_zombie_walk/AnimationPlayer"] +[node name="EatingStatistics" type="Node" parent="CanvasGroup/basic_zombie_walk/AnimationPlayer" unique_id=700981960] script = ExtResource("13_xh0ny") animationName = "basic/eating" trackToFind = "../../Eatbox" -[node name="Hitbox" type="Area2D" parent="."] +[node name="Hitbox" type="Area2D" parent="." unique_id=251807560] collision_layer = 8 collision_mask = 0 -[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox" unique_id=816449133] position = Vector2(4, -24) shape = SubResource("RectangleShape2D_hxyad") -[node name="Eatbox" type="Area2D" parent="."] +[node name="Eatbox" type="Area2D" parent="." unique_id=595724131] collision_layer = 0 collision_mask = 2 script = ExtResource("14_kx47n") _damage = SubResource("Resource_011r0") -[node name="CollisionShape2D" type="CollisionShape2D" parent="Eatbox"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Eatbox" unique_id=1581084579] position = Vector2(-10, -24) shape = SubResource("RectangleShape2D_r4ug6") -[node name="AnimationTree" type="AnimationTree" parent="." node_paths=PackedStringArray("entity")] +[node name="AnimationTree" type="AnimationTree" parent="." unique_id=1329054274 node_paths=PackedStringArray("entity")] root_node = NodePath("../CanvasGroup/basic_zombie_walk") tree_root = SubResource("AnimationNodeBlendTree_ccrjo") advance_expression_base_node = NodePath("../Eatbox") @@ -1198,51 +1194,50 @@ parameters/TimeScale/scale = 1.0 script = ExtResource("17_tttgn") entity = NodePath("..") -[node name="Mover" type="Node" parent="."] +[node name="Mover" type="Node" parent="." unique_id=1042035982] script = ExtResource("18_1pso5") _speed = SubResource("Resource_b6mal") -_speedControlMult = 0.706804 -[node name="HitPlayer" type="Node" parent="."] +[node name="HitPlayer" type="Node" parent="." unique_id=1140799369] script = ExtResource("19_n3dlr") playlist = Array[AudioStream]([ExtResource("7_0amn8"), ExtResource("7_67t4t")]) channels = Array[String](["plastic_hit", "hit"]) metadata/_custom_type_script = "uid://c36bj8u7jghc7" -[node name="Armor" type="Node" parent="."] +[node name="Armor" type="Node" parent="." unique_id=990267966] script = ExtResource("3_5s7in") MaxHP = 195.0 -[node name="FlashController" type="Node" parent="Armor"] +[node name="FlashController" type="Node" parent="Armor" unique_id=1365989252] script = ExtResource("13_7fceb") shaderMaterial = ExtResource("3_b8kja") -[node name="GroanPlayer" type="Node" parent="."] +[node name="GroanPlayer" type="Node" parent="." unique_id=2003013600] script = ExtResource("24_v3jd8") audioStream = ExtResource("25_6yd48") channel = "groan" metadata/_custom_type_script = "uid://c36bj8u7jghc7" -[node name="Timer" type="Timer" parent="GroanPlayer"] +[node name="Timer" type="Timer" parent="GroanPlayer" unique_id=374275492] wait_time = 20.0 -[node name="StartTimer" type="Timer" parent="GroanPlayer/Timer"] +[node name="StartTimer" type="Timer" parent="GroanPlayer/Timer" unique_id=1716066968] wait_time = 5.0 one_shot = true autostart = true -[node name="EffectPlayer" type="Node" parent="."] +[node name="EffectPlayer" type="Node" parent="." unique_id=392459671] script = ExtResource("26_myimu") effectsToMap = Array[Resource]([ExtResource("27_dxxec"), ExtResource("28_wg63k")]) streamsToMapTo = Array[AudioStream]([ExtResource("29_fah3r"), ExtResource("30_p00wq")]) streamSettings = Array[Object]([null, SubResource("Resource_dn8ha")]) -[node name="DeathHandler" type="Node" parent="." node_paths=PackedStringArray("_tree", "_collider")] +[node name="DeathHandler" type="Node" parent="." unique_id=142096281 node_paths=PackedStringArray("_tree", "_collider")] script = ExtResource("32_1sywa") _tree = NodePath("../AnimationTree") _collider = NodePath("../Hitbox/CollisionShape2D") -[node name="FlashController" type="Node" parent="."] +[node name="FlashController" type="Node" parent="." unique_id=1494745309] script = ExtResource("13_7fceb") shaderMaterial = ExtResource("2_ffeg6") diff --git a/scenes/gui/choose_your_seeds.tscn b/scenes/gui/choose_your_seeds.tscn index 50f1fab..62617b5 100644 --- a/scenes/gui/choose_your_seeds.tscn +++ b/scenes/gui/choose_your_seeds.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://dpxxjfd5lv5sv"] +[gd_scene format=3 uid="uid://dpxxjfd5lv5sv"] [ext_resource type="Theme" uid="uid://e8n88g31w7x7" path="res://assets/themes/ChooseYourSeeds.tres" id="1_bfo8i"] [ext_resource type="Texture2D" uid="uid://dr8a0rx42o3qy" path="res://assets/sprites/gui/ChooseYourSeeds/PlantFrame.tres" id="2_so2bw"] @@ -14,7 +14,7 @@ [ext_resource type="AudioStream" uid="uid://bdx83fokp6kha" path="res://assets/audio/sfx/buttonclick.mp3" id="9_v7xff"] [ext_resource type="Script" uid="uid://c1x4n4nqyq72f" path="res://scripts/audio/ChannelSettings.cs" id="10_nlh6x"] [ext_resource type="PackedScene" uid="uid://bvpt0q4j6nx18" path="res://scenes/gui/almanach.tscn" id="11_nlh6x"] -[ext_resource type="AudioStream" uid="uid://mu86q1r1dvgo" path="res://assets/audio/music/03. Choose Your Seeds.mp3" id="13_y65t1"] +[ext_resource type="AudioStream" uid="uid://cr0o5lqt6044g" path="res://assets/audio/music/music_placeholder.tres" id="13_y65t1"] [ext_resource type="Script" uid="uid://b4ysi1iutmju3" path="res://scripts/audio/ChooseYourSeedsMusic.cs" id="14_rptyw"] [ext_resource type="Script" uid="uid://bksslrqq5vhm3" path="res://scripts/gui/choose_your_seeds/CYSFocusSetup.cs" id="15_rptyw"] diff --git a/scenes/main_menu.tscn b/scenes/main_menu.tscn index 57e395f..8aa69d5 100644 --- a/scenes/main_menu.tscn +++ b/scenes/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://bfstrli64u23y"] +[gd_scene format=3 uid="uid://bfstrli64u23y"] [ext_resource type="Texture2D" uid="uid://dvldjlg0nr355" path="res://assets/sprites/atlases/atlas1.png" id="1_jk1qb"] [ext_resource type="Script" uid="uid://drru785m4eep" path="res://scripts/gui/main_menu_rich_text.gd" id="2_5dd4i"] @@ -11,7 +11,7 @@ [ext_resource type="Script" uid="uid://c36bj8u7jghc7" path="res://scripts/audio/ChannelPlayer.cs" id="7_7b55j"] [ext_resource type="Texture2D" uid="uid://drydueofrb448" path="res://assets/sprites/gui/almanach/book.tres" id="7_flqon"] [ext_resource type="AudioStream" uid="uid://bdx83fokp6kha" path="res://assets/audio/sfx/buttonclick.mp3" id="8_5pajh"] -[ext_resource type="AudioStream" uid="uid://cp7c8ys8sk2r0" path="res://assets/audio/music/Toxa/Upcoming Serenity.wav" id="12_1ajci"] +[ext_resource type="AudioStream" uid="uid://cr0o5lqt6044g" path="res://assets/audio/music/music_placeholder.tres" id="12_1ajci"] [ext_resource type="PackedScene" uid="uid://bvpt0q4j6nx18" path="res://scenes/gui/almanach.tscn" id="12_rcqid"] [ext_resource type="PackedScene" uid="uid://djfsa0pxqeoq1" path="res://scenes/gui/cursor_canvas_layer.tscn" id="14_1ajci"] diff --git a/scenes/templates/level_template.tscn b/scenes/templates/level_template.tscn index 60fa513..1dbe793 100644 --- a/scenes/templates/level_template.tscn +++ b/scenes/templates/level_template.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=57 format=3 uid="uid://dd3yegl1xo44m"] +[gd_scene format=3 uid="uid://dd3yegl1xo44m"] [ext_resource type="AudioStream" uid="uid://b6xb6mjdecg6a" path="res://assets/audio/sfx/level/readysetplant.mp3" id="1_4gg2g"] [ext_resource type="Script" uid="uid://bndu1h5kgcde8" path="res://scripts/level/RuntimeLevelData.cs" id="1_31ltw"] @@ -34,8 +34,8 @@ [ext_resource type="Script" uid="uid://bc3s06ejbotma" path="res://scripts/gui/ZombieLevelPreviewer.cs" id="24_y5tw7"] [ext_resource type="Script" uid="uid://b31mnk4enldc4" path="res://scripts/level/InitialPackedSceneSpawner.cs" id="26_i7rp7"] [ext_resource type="AudioStream" uid="uid://bwnmx7t3hcw6h" path="res://assets/audio/sfx/level/awooga.mp3" id="32_xsaqy"] -[ext_resource type="AudioStream" uid="uid://cfybn7wn04frs" path="res://assets/audio/music/Grasswalk_Standard.mp3" id="34_tqd4v"] -[ext_resource type="AudioStream" uid="uid://get7nh1goi1c" path="res://assets/audio/music/Grasswalk_cool.mp3" id="35_4gg2g"] +[ext_resource type="AudioStream" uid="uid://cr0o5lqt6044g" path="res://assets/audio/music/music_placeholder.tres" id="34_tqd4v"] +[ext_resource type="AudioStream" uid="uid://cr0o5lqt6044g" path="res://assets/audio/music/music_placeholder.tres" id="35_4gg2g"] [ext_resource type="Script" uid="uid://bnj5tlcpmep2o" path="res://scripts/audio/MusicTransitioner.cs" id="36_wwgye"] [ext_resource type="PackedScene" uid="uid://djfsa0pxqeoq1" path="res://scenes/gui/cursor_canvas_layer.tscn" id="38_wwgye"] diff --git a/scripts/entities/AnimationStatistics.cs b/scripts/entities/AnimationStatistics.cs index 1db029e..50a2516 100644 --- a/scripts/entities/AnimationStatistics.cs +++ b/scripts/entities/AnimationStatistics.cs @@ -12,6 +12,6 @@ public partial class AnimationStatistics : Node var animation = GetParent().GetAnimation(animationName); var track_id = animation.FindTrack(trackToFind,Animation.TrackType.Method); - invokationsPerSecond = animation.TrackGetKeyCount(track_id)/ animation.Length; + invokationsPerSecond = animation.TrackGetKeyCount(track_id)/(float)animation.Length; } }