Merge branch 'master' into level-editor
This commit is contained in:
commit
57f30b8018
305 changed files with 4203 additions and 738 deletions
BIN
resources/animations/zombies/basic.res
Normal file
BIN
resources/animations/zombies/basic.res
Normal file
Binary file not shown.
BIN
resources/animations/zombies/basic_zombie_anim.res
Normal file
BIN
resources/animations/zombies/basic_zombie_anim.res
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -1,39 +1,53 @@
|
|||
[gd_resource type="AnimationNodeStateMachine" load_steps=9 format=3 uid="uid://dj0blope85bg7"]
|
||||
[gd_resource type="AnimationNodeStateMachine" load_steps=10 format=3 uid="uid://dj0blope85bg7"]
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_w2cv7"]
|
||||
animation = &"basic/death"
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_h0rfo"]
|
||||
animation = &"basic_zombie/eat"
|
||||
animation = &"basic/eating"
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_nog33"]
|
||||
animation = &"basic_zombie/idle"
|
||||
animation = &"basic/stand"
|
||||
|
||||
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_g2uel"]
|
||||
animation = &"basic_zombie/walk"
|
||||
animation = &"basic/walk"
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vxhht"]
|
||||
advance_mode = 2
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_r8rju"]
|
||||
xfade_time = 0.5
|
||||
break_loop_at_end = true
|
||||
switch_mode = 2
|
||||
advance_mode = 2
|
||||
advance_expression = "can_process()"
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_y2ivb"]
|
||||
xfade_time = 0.5
|
||||
break_loop_at_end = true
|
||||
switch_mode = 2
|
||||
advance_mode = 2
|
||||
advance_expression = "get(\"isEating\") == true"
|
||||
advance_expression = "get(\"isEating\") == true and can_process()"
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7d3k4"]
|
||||
xfade_time = 0.5
|
||||
advance_mode = 2
|
||||
advance_expression = "get(\"isEating\") == true"
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_kk4wi"]
|
||||
xfade_time = 0.5
|
||||
advance_mode = 2
|
||||
advance_expression = "get(\"isEating\") == false"
|
||||
|
||||
[resource]
|
||||
states/Death/node = SubResource("AnimationNodeAnimation_w2cv7")
|
||||
states/Death/position = Vector2(778, 100)
|
||||
states/Eat/node = SubResource("AnimationNodeAnimation_h0rfo")
|
||||
states/Eat/position = Vector2(575, 185)
|
||||
states/End/position = Vector2(977, 90)
|
||||
states/basic_zombie_eat/node = SubResource("AnimationNodeAnimation_h0rfo")
|
||||
states/basic_zombie_eat/position = Vector2(575, 185)
|
||||
states/basic_zombie_idle/node = SubResource("AnimationNodeAnimation_nog33")
|
||||
states/basic_zombie_idle/position = Vector2(366, 100)
|
||||
states/basic_zombie_walk/node = SubResource("AnimationNodeAnimation_g2uel")
|
||||
states/basic_zombie_walk/position = Vector2(575, 35)
|
||||
transitions = ["Start", "basic_zombie_idle", SubResource("AnimationNodeStateMachineTransition_vxhht"), "basic_zombie_idle", "basic_zombie_walk", SubResource("AnimationNodeStateMachineTransition_r8rju"), "basic_zombie_idle", "basic_zombie_eat", SubResource("AnimationNodeStateMachineTransition_y2ivb"), "basic_zombie_walk", "basic_zombie_eat", SubResource("AnimationNodeStateMachineTransition_7d3k4"), "basic_zombie_eat", "basic_zombie_walk", SubResource("AnimationNodeStateMachineTransition_kk4wi")]
|
||||
graph_offset = Vector2(13, 26)
|
||||
states/Idle/node = SubResource("AnimationNodeAnimation_nog33")
|
||||
states/Idle/position = Vector2(366, 100)
|
||||
states/Walk/node = SubResource("AnimationNodeAnimation_g2uel")
|
||||
states/Walk/position = Vector2(575, 35)
|
||||
transitions = ["Start", "Idle", SubResource("AnimationNodeStateMachineTransition_vxhht"), "Idle", "Walk", SubResource("AnimationNodeStateMachineTransition_r8rju"), "Idle", "Eat", SubResource("AnimationNodeStateMachineTransition_y2ivb"), "Walk", "Eat", SubResource("AnimationNodeStateMachineTransition_7d3k4"), "Eat", "Walk", SubResource("AnimationNodeStateMachineTransition_kk4wi")]
|
||||
graph_offset = Vector2(120, -30)
|
||||
|
|
|
|||
Binary file not shown.
BIN
resources/animations/zombies/hobo.res
Normal file
BIN
resources/animations/zombies/hobo.res
Normal file
Binary file not shown.
BIN
resources/animations/zombies/hobo_zombie.res
Normal file
BIN
resources/animations/zombies/hobo_zombie.res
Normal file
Binary file not shown.
BIN
resources/animations/zombies/hobo_zombie.res1406874708.tmp
Normal file
BIN
resources/animations/zombies/hobo_zombie.res1406874708.tmp
Normal file
Binary file not shown.
|
|
@ -4,5 +4,5 @@
|
|||
|
||||
[resource]
|
||||
script = ExtResource("1_rfumy")
|
||||
Duration = 0.25
|
||||
Duration = 1.0
|
||||
Slot = "garlic"
|
||||
|
|
|
|||
8
resources/effects/NerdusEffect.tres
Normal file
8
resources/effects/NerdusEffect.tres
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[gd_resource type="Resource" load_steps=2 format=3 uid="uid://dme4nvp28otq6"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://bb6lv1djnqjaw" path="res://scripts/systems/effects/GarlicEffect.cs" id="1_bd12u"]
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_bd12u")
|
||||
Duration = 0.25
|
||||
Slot = "garlic"
|
||||
|
|
@ -1,20 +1,8 @@
|
|||
[gd_resource type="Resource" script_class="PlantResource" load_steps=9 format=3 uid="uid://bf7vjtufjc8kt"]
|
||||
[gd_resource type="Resource" script_class="PlantResource" load_steps=4 format=3 uid="uid://bf7vjtufjc8kt"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://d4btl7vqi4v0q" path="res://assets/sprites/plants/aloe.tres" id="1_t4137"]
|
||||
[ext_resource type="Script" uid="uid://cyenlko1knygw" path="res://scripts/resources/PlantResource.cs" id="1_vw2kg"]
|
||||
[ext_resource type="PackedScene" uid="uid://bw1w8jp0yeypy" path="res://scenes/entities/plants/aloe.tscn" id="2_6a4ia"]
|
||||
[ext_resource type="Texture2D" uid="uid://c35dr3hiy66k0" path="res://assets/sprites/gui/ChooseYourSeeds/PremiumFrameField.tres" id="3_2s3af"]
|
||||
[ext_resource type="Texture2D" uid="uid://31jc2e7dijas" path="res://assets/sprites/gui/PremiumPlantCard.tres" id="3_vfv8g"]
|
||||
[ext_resource type="Script" uid="uid://3m7xks3xq3hl" path="res://scripts/components/gui/seedpackets/CustomSeedpacketFrame.cs" id="4_d5nqg"]
|
||||
|
||||
[sub_resource type="LabelSettings" id="LabelSettings_2s3af"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_5me4i"]
|
||||
script = ExtResource("4_d5nqg")
|
||||
frame = ExtResource("3_vfv8g")
|
||||
font = SubResource("LabelSettings_2s3af")
|
||||
almanachField = ExtResource("3_2s3af")
|
||||
metadata/_custom_type_script = "uid://3m7xks3xq3hl"
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_vw2kg")
|
||||
|
|
@ -25,5 +13,5 @@ Scene = ExtResource("2_6a4ia")
|
|||
ReloadTime = 15.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_t4137")
|
||||
customFrame = SubResource("Resource_5me4i")
|
||||
Layer = 1
|
||||
Order = 6
|
||||
|
|
|
|||
22
resources/plants/Cucumber.tres
Normal file
22
resources/plants/Cucumber.tres
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[gd_resource type="Resource" script_class="PlantResource" load_steps=5 format=3 uid="uid://cl5bsa2unhcl0"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cyenlko1knygw" path="res://scripts/resources/PlantResource.cs" id="1_jrx81"]
|
||||
[ext_resource type="Texture2D" uid="uid://bt76iudw2qgnv" path="res://assets/sprites/atlases/plants/cumbucer.png" id="1_tdg4d"]
|
||||
[ext_resource type="PackedScene" uid="uid://cjoyh54cpjla7" path="res://scenes/entities/plants/cucumber.tscn" id="2_0mr6r"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_3gogt"]
|
||||
atlas = ExtResource("1_tdg4d")
|
||||
region = Rect2(2, 1, 41, 65)
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_jrx81")
|
||||
name_key = "cucumber"
|
||||
description_key = "cucumber_desc"
|
||||
Cost = 75.0
|
||||
Scene = ExtResource("2_0mr6r")
|
||||
ReloadTime = 5.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = SubResource("AtlasTexture_3gogt")
|
||||
Layer = 1
|
||||
Order = 8
|
||||
metadata/_custom_type_script = "uid://cyenlko1knygw"
|
||||
|
|
@ -14,3 +14,4 @@ ReloadTime = 7.5
|
|||
ReloadProgress = 0.67
|
||||
Preview = ExtResource("1_datic")
|
||||
Layer = 1
|
||||
Order = 7
|
||||
|
|
|
|||
22
resources/plants/Nerdus.tres
Normal file
22
resources/plants/Nerdus.tres
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[gd_resource type="Resource" script_class="PlantResource" load_steps=5 format=3 uid="uid://do7m0lfki5ere"]
|
||||
|
||||
[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"]
|
||||
[ext_resource type="Script" uid="uid://cyenlko1knygw" path="res://scripts/resources/PlantResource.cs" id="3_30qd0"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_ivp5w"]
|
||||
atlas = ExtResource("1_of51r")
|
||||
region = Rect2(477, 9, 60, 59)
|
||||
|
||||
[resource]
|
||||
script = ExtResource("3_30qd0")
|
||||
name_key = "nerdus"
|
||||
description_key = "nerdus_desc"
|
||||
Cost = 125.0
|
||||
Scene = ExtResource("2_0i6qf")
|
||||
ReloadTime = 10.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = SubResource("AtlasTexture_ivp5w")
|
||||
Layer = 1
|
||||
Order = 11
|
||||
metadata/_custom_type_script = "uid://cyenlko1knygw"
|
||||
|
|
@ -14,3 +14,4 @@ ReloadTime = 25.0
|
|||
ReloadProgress = 0.9
|
||||
Preview = ExtResource("1_xk2pg")
|
||||
Layer = 1
|
||||
Order = 3
|
||||
|
|
|
|||
|
|
@ -14,3 +14,4 @@ ReloadTime = 5.0
|
|||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_7fyy2")
|
||||
Layer = 1
|
||||
Order = 5
|
||||
|
|
|
|||
|
|
@ -14,3 +14,4 @@ ReloadTime = 5.0
|
|||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_2ol2i")
|
||||
Layer = 1
|
||||
Order = 4
|
||||
|
|
|
|||
|
|
@ -14,3 +14,4 @@ ReloadTime = 5.0
|
|||
ReloadProgress = 1.0
|
||||
Preview = ExtResource("1_8rd5i")
|
||||
Layer = 1
|
||||
Order = 1
|
||||
|
|
|
|||
|
|
@ -14,3 +14,4 @@ ReloadTime = 5.0
|
|||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_hinp6")
|
||||
Layer = 1
|
||||
Order = 10
|
||||
|
|
|
|||
|
|
@ -14,3 +14,4 @@ ReloadTime = 20.0
|
|||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_2akap")
|
||||
Layer = 1
|
||||
Order = 2
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://buvacn56kyy2p"]
|
||||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 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/ZombieResource.cs" id="1_k277m"]
|
||||
[ext_resource type="Texture2D" uid="uid://bwdqbrnn7ygtr" path="res://assets/sprites/atlases/zombies/Зондби.png" id="1_l6de4"]
|
||||
[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_l6de4"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_wu2q8"]
|
||||
atlas = ExtResource("1_l6de4")
|
||||
region = Rect2(0, 0, 43, 88)
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_k277m")
|
||||
|
|
@ -12,6 +16,7 @@ Cost = 1.0
|
|||
Scene = ExtResource("1_c2mq3")
|
||||
ReloadTime = 1.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_l6de4")
|
||||
Preview = SubResource("AtlasTexture_wu2q8")
|
||||
Layer = 1
|
||||
Order = 0
|
||||
metadata/_custom_type_script = "uid://cqxj7o8hdm82n"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://dkhjlu7u0vny6"]
|
||||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 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/ZombieResource.cs" id="1_sngfh"]
|
||||
[ext_resource type="Texture2D" uid="uid://bwdqbrnn7ygtr" path="res://assets/sprites/atlases/zombies/Зондби.png" id="1_ufs7s"]
|
||||
[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_ufs7s"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_drksh"]
|
||||
atlas = ExtResource("1_ufs7s")
|
||||
region = Rect2(137, 0, 47, 101)
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_sngfh")
|
||||
|
|
@ -12,6 +16,7 @@ Cost = 5.0
|
|||
Scene = ExtResource("1_lhcag")
|
||||
ReloadTime = 1.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_ufs7s")
|
||||
Preview = SubResource("AtlasTexture_drksh")
|
||||
Layer = 1
|
||||
Order = 2
|
||||
metadata/_custom_type_script = "uid://cqxj7o8hdm82n"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://nceohd32fkxk"]
|
||||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 format=3 uid="uid://nceohd32fkxk"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://bwdqbrnn7ygtr" path="res://assets/sprites/atlases/zombies/Зондби.png" id="1_f7g7v"]
|
||||
[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"]
|
||||
[ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="1_sw7hj"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_q44xp"]
|
||||
atlas = ExtResource("1_f7g7v")
|
||||
region = Rect2(92, 0, 45, 106)
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_sw7hj")
|
||||
name_key = "conehead"
|
||||
|
|
@ -12,6 +16,7 @@ Cost = 2.0
|
|||
Scene = ExtResource("1_llf5l")
|
||||
ReloadTime = 1.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_f7g7v")
|
||||
Preview = SubResource("AtlasTexture_q44xp")
|
||||
Layer = 1
|
||||
Order = 1
|
||||
metadata/_custom_type_script = "uid://cqxj7o8hdm82n"
|
||||
|
|
|
|||
16
resources/zombies/door_zombie.tres
Normal file
16
resources/zombies/door_zombie.tres
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=3 format=3 uid="uid://cugwy5bw4wljr"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://p5jhgg2r7e07" path="res://scenes/entities/Zombies/door_zombie.tscn" id="1_3664b"]
|
||||
[ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="3_bydiv"]
|
||||
|
||||
[resource]
|
||||
script = ExtResource("3_bydiv")
|
||||
name_key = "doorz"
|
||||
description_key = "doorz_desc"
|
||||
Cost = 4.5
|
||||
Scene = ExtResource("1_3664b")
|
||||
ReloadTime = 1.0
|
||||
ReloadProgress = 0.0
|
||||
Layer = 1
|
||||
Order = 4
|
||||
metadata/_custom_type_script = "uid://cqxj7o8hdm82n"
|
||||
|
|
@ -1,9 +1,13 @@
|
|||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=4 format=3 uid="uid://c38vfdw5b60xw"]
|
||||
[gd_resource type="Resource" script_class="ZombieResource" load_steps=5 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://bwdqbrnn7ygtr" path="res://assets/sprites/atlases/zombies/Зондби.png" id="1_nt7w3"]
|
||||
[ext_resource type="Texture2D" uid="uid://5gpf2sodhn6e" path="res://assets/sprites/zombies/previews.png" id="1_nt7w3"]
|
||||
[ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="1_u5qpq"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_73ahc"]
|
||||
atlas = ExtResource("1_nt7w3")
|
||||
region = Rect2(43, 0, 49, 95)
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_u5qpq")
|
||||
name_key = "hobo"
|
||||
|
|
@ -12,6 +16,7 @@ Cost = 7.0
|
|||
Scene = ExtResource("1_4myt6")
|
||||
ReloadTime = 1.0
|
||||
ReloadProgress = 0.0
|
||||
Preview = ExtResource("1_nt7w3")
|
||||
Preview = SubResource("AtlasTexture_73ahc")
|
||||
Layer = 1
|
||||
Order = 5
|
||||
metadata/_custom_type_script = "uid://cqxj7o8hdm82n"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue