Rendo/newlon
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Last column fixed and pause in choose your seeds

Browse source
This commit is contained in:
Rendo 2025-07-12 21:12:01 +05:00
commit 1ad0e18869
6 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scenes/entities/Zombies/hobo.tscn
View file

@ -778,7 +778,7 @@ texture = SubResource("AtlasTexture_b583s")
scale = Vector2(0.999831, 0.999831) scale = Vector2(0.999831, 0.999831)
[node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"] [node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"]
scale = Vector2(0.999829, 0.999829) scale = Vector2(0.99983, 0.99983)
[node name="Right_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg/RightFoot" index="0"] [node name="Right_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg/RightFoot" index="0"]
texture = SubResource("AtlasTexture_uoit3") texture = SubResource("AtlasTexture_uoit3")
@ -793,7 +793,7 @@ scale = Vector2(0.999828, 0.999828)
texture = SubResource("AtlasTexture_yb81c") texture = SubResource("AtlasTexture_yb81c")
[node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"]
scale = Vector2(0.999829, 0.999829) scale = Vector2(0.99983, 0.99983)
[node name="Left_Lower_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="0"] [node name="Left_Lower_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="0"]
texture = SubResource("AtlasTexture_nlwsb") texture = SubResource("AtlasTexture_nlwsb")
@ -808,13 +808,13 @@ texture = SubResource("AtlasTexture_8y6c0")
scale = Vector2(0.999828, 0.999828) scale = Vector2(0.999828, 0.999828)
[node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] [node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"]
scale = Vector2(0.999825, 0.999825) scale = Vector2(0.999824, 0.999824)
[node name="Right_Upper_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="0"] [node name="Right_Upper_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="0"]
texture = SubResource("AtlasTexture_nc6p3") texture = SubResource("AtlasTexture_nc6p3")
[node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"]
scale = Vector2(0.999814, 0.999814) scale = Vector2(0.999815, 0.999815)
[node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"] [node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"]
scale = Vector2(0.999828, 0.999828) scale = Vector2(0.999828, 0.999828)
@ -942,7 +942,7 @@ scale = Vector2(0.999652, 0.999652)
texture = SubResource("AtlasTexture_dntsa") texture = SubResource("AtlasTexture_dntsa")
[node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"]
scale = Vector2(0.999828, 0.999828) scale = Vector2(0.999827, 0.999827)
[node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"]
scale = Vector2(0.999822, 0.999822) scale = Vector2(0.999822, 0.999822)

42
scenes/entities/Zombies/zombie.tscn
View file

@ -754,7 +754,7 @@ _data = {
} }
[sub_resource type="RectangleShape2D" id="RectangleShape2D_hxyad"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_hxyad"]
size = Vector2(2, 48) size = Vector2(9, 48)
[sub_resource type="Resource" id="Resource_ruqsf"] [sub_resource type="Resource" id="Resource_ruqsf"]
resource_local_to_scene = true resource_local_to_scene = true
@ -825,7 +825,7 @@ 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"]
use_parent_material = true use_parent_material = true
position = Vector2(-6, 3) position = Vector2(-6, 3)
scale = Vector2(0.999833, 0.999833) scale = Vector2(0.999834, 0.999834)
rest = Transform2D(1, 0, 0, 1, -6, 3) rest = Transform2D(1, 0, 0, 1, -6, 3)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -837,13 +837,13 @@ 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"]
position = Vector2(-2, 12) position = Vector2(-2, 12)
scale = Vector2(0.999832, 0.999832) scale = Vector2(0.999831, 0.999831)
rest = Transform2D(1, 0, 0, 1, -2, 12) rest = Transform2D(1, 0, 0, 1, -2, 12)
editor_settings/show_bone_gizmo = false 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"]
position = Vector2(-2, 14) position = Vector2(-2, 14)
scale = Vector2(0.999834, 0.999834) scale = Vector2(0.999835, 0.999835)
rest = Transform2D(1, 0, 0, 1, -2, 14) rest = Transform2D(1, 0, 0, 1, -2, 14)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 12.0 length = 12.0
@ -866,7 +866,7 @@ 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"]
use_parent_material = true use_parent_material = true
position = Vector2(6, 4) position = Vector2(6, 4)
scale = Vector2(0.999836, 0.999836) scale = Vector2(0.999834, 0.999834)
rest = Transform2D(1, 0, 0, 1, 6, 4) rest = Transform2D(1, 0, 0, 1, 6, 4)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -890,7 +890,7 @@ 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"]
position = Vector2(6, 10) position = Vector2(6, 10)
scale = Vector2(0.999829, 0.999829) scale = Vector2(0.999831, 0.999831)
rest = Transform2D(1, 0, 0, 1, 6, 10) rest = Transform2D(1, 0, 0, 1, 6, 10)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 12.0 length = 12.0
@ -906,7 +906,7 @@ 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"]
use_parent_material = true use_parent_material = true
position = Vector2(1, -2) position = Vector2(1, -2)
scale = Vector2(0.99983, 0.99983) scale = Vector2(0.999832, 0.999832)
rest = Transform2D(1, 0, 0, 1, 1, -2) rest = Transform2D(1, 0, 0, 1, 1, -2)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -932,7 +932,7 @@ 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"]
position = Vector2(-1, 13) position = Vector2(-1, 13)
scale = Vector2(0.999829, 0.999829) scale = Vector2(0.999828, 0.999828)
rest = Transform2D(1, 0, 0, 1, -1, 13) rest = Transform2D(1, 0, 0, 1, -1, 13)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 8.0 length = 8.0
@ -960,7 +960,9 @@ 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"]
visible = false visible = false
skew = -0.000391841 position = Vector2(-9, -21)
rotation = 0.1519
skew = -0.000392079
rest = Transform2D(1, 0, 0, 1, -9, -21) rest = Transform2D(1, 0, 0, 1, -9, -21)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 24.0 length = 24.0
@ -975,7 +977,7 @@ 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"]
position = Vector2(-10, -25) position = Vector2(-10, -25)
scale = Vector2(0.999828, 0.999828) scale = Vector2(0.999826, 0.999826)
rest = Transform2D(1, 0, 0, 1, -10, -25) rest = Transform2D(1, 0, 0, 1, -10, -25)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -998,6 +1000,7 @@ 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"]
position = Vector2(-16, -8) position = Vector2(-16, -8)
scale = Vector2(1, 1)
texture = SubResource("AtlasTexture_vcc72") texture = SubResource("AtlasTexture_vcc72")
centered = false centered = false
offset = Vector2(-2, -2) offset = Vector2(-2, -2)
@ -1005,14 +1008,16 @@ metadata/_edit_lock_ = true
[node name="Left_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] [node name="Left_Eye" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"]
position = Vector2(-4, -9) position = Vector2(-4, -9)
scale = Vector2(1, 1)
texture = SubResource("AtlasTexture_kto0i") texture = SubResource("AtlasTexture_kto0i")
centered = false centered = false
offset = Vector2(-2, -2) offset = Vector2(-2, -2)
metadata/_edit_lock_ = true metadata/_edit_lock_ = true
[node name="Jaw" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"] [node name="Jaw" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head"]
position = Vector2(-3, 3) position = Vector2(-2.96949, 2.91851)
scale = Vector2(0.999828, 0.999828) rotation = 0.017854
scale = Vector2(0.999827, 0.999827)
texture = SubResource("AtlasTexture_x5uj2") texture = SubResource("AtlasTexture_x5uj2")
centered = false centered = false
offset = Vector2(-12, -2) offset = Vector2(-12, -2)
@ -1029,7 +1034,7 @@ _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"]
position = Vector2(-3, 3) position = Vector2(-3, 3)
scale = Vector2(0.999828, 0.999828) scale = Vector2(0.999827, 0.999827)
rest = Transform2D(1, 0, 0, 1, -3, 3) rest = Transform2D(1, 0, 0, 1, -3, 3)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 11.0 length = 11.0
@ -1063,7 +1068,7 @@ remote_path = NodePath("../../HeadParticle/Head/Left_Eye")
[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"]
position = Vector2(-1, -20) position = Vector2(-1, -20)
scale = Vector2(0.999826, 0.999826) scale = Vector2(0.999828, 0.999828)
rest = Transform2D(1, 0, 0, 1, -1, -20) rest = Transform2D(1, 0, 0, 1, -1, -20)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -1085,6 +1090,7 @@ minTorque = -45.0
maxTorque = 45.0 maxTorque = 45.0
[node name="Left_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile"] [node name="Left_Lower_Arm" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile"]
rotation = 0.156803
scale = Vector2(0.999997, 0.999997) scale = Vector2(0.999997, 0.999997)
texture = SubResource("AtlasTexture_auqeq") texture = SubResource("AtlasTexture_auqeq")
centered = false centered = false
@ -1094,7 +1100,8 @@ 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"]
show_behind_parent = true show_behind_parent = true
position = Vector2(-0.99983, 12.9978) position = Vector2(-0.99983, 12.9978)
scale = Vector2(0.999658, 0.999658) rotation = -0.0763408
scale = Vector2(0.999659, 0.999659)
texture = SubResource("AtlasTexture_vlvtp") texture = SubResource("AtlasTexture_vlvtp")
centered = false centered = false
offset = Vector2(-4, -1) offset = Vector2(-4, -1)
@ -1116,7 +1123,7 @@ 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"]
position = Vector2(-1, 13) position = Vector2(-1, 13)
scale = Vector2(0.999828, 0.999828) scale = Vector2(0.999829, 0.999829)
rest = Transform2D(1, 0, 0, 1, -1, 13) rest = Transform2D(1, 0, 0, 1, -1, 13)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 6.0 length = 6.0
@ -1141,7 +1148,7 @@ collision_layer = 8
collision_mask = 0 collision_mask = 0
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
position = Vector2(2, -24) position = Vector2(-1.5, -24)
shape = SubResource("RectangleShape2D_hxyad") shape = SubResource("RectangleShape2D_hxyad")
[node name="Eatbox" type="Area2D" parent="."] [node name="Eatbox" type="Area2D" parent="."]
@ -1166,6 +1173,7 @@ entity = NodePath("..")
[node name="Mover" type="Node" parent="."] [node name="Mover" type="Node" parent="."]
script = ExtResource("4_u5syx") script = ExtResource("4_u5syx")
_speed = SubResource("Resource_ckb7n") _speed = SubResource("Resource_ckb7n")
_speedControlMult = 0.593528
[node name="ChompPlayer" type="Node" parent="."] [node name="ChompPlayer" type="Node" parent="."]
script = ExtResource("10_ruqsf") script = ExtResource("10_ruqsf")

1
scenes/gui/runtime_gui.tscn
View file

@ -134,6 +134,7 @@ channel = "fastfw"
metadata/_custom_type_script = "uid://c36bj8u7jghc7" metadata/_custom_type_script = "uid://c36bj8u7jghc7"
[node name="PauseButton" parent="MarginContainer/Control/Hotbar" instance=ExtResource("5_jyq78")] [node name="PauseButton" parent="MarginContainer/Control/Hotbar" instance=ExtResource("5_jyq78")]
process_mode = 3
layout_mode = 2 layout_mode = 2
[node name="ChannelPlayer" type="Node" parent="MarginContainer/Control/Hotbar/PauseButton"] [node name="ChannelPlayer" type="Node" parent="MarginContainer/Control/Hotbar/PauseButton"]

8
scripts/gui/PauseMenu.cs
View file

@ -4,15 +4,16 @@ using System;
public partial class PauseMenu : Control public partial class PauseMenu : Control
{ {
private static PauseMenu Instance; private static PauseMenu Instance;
private bool previousPaused;
public override void _Ready() public override void _Ready()
{ {
Instance = this; Instance = this;
} }
public void Continue() public void Continue()
{ {
GetParent<Control>().Visible = false; GetParent<Control>().Visible = false;
GetTree().Paused = false; GetTree().Paused = previousPaused;
} }
public void Restart() public void Restart()
{ {
@ -26,6 +27,7 @@ public partial class PauseMenu : Control
public static void Pause() public static void Pause()
{ {
Instance.GetParent<Control>().Visible = true; Instance.GetParent<Control>().Visible = true;
Instance.previousPaused = Instance.GetTree().Paused;
Instance.GetTree().Paused = true; Instance.GetTree().Paused = true;
} }
} }

2
scripts/gui/choose_your_seeds/Previewport.cs
View file

@ -1,8 +1,6 @@
using Godot; using Godot;
using Newlon;
using Newlon.Components; using Newlon.Components;
using Newlon.Components.GUI.Seedpackets; using Newlon.Components.GUI.Seedpackets;
using Newlon.Components.Plants;
public partial class Previewport : SubViewport public partial class Previewport : SubViewport
{ {

2
scripts/plants/PlantEyesightLimiter.cs
View file

@ -8,7 +8,7 @@ public partial class PlantEyesightLimiter : CollisionShape2D
{ {
if (Shape is SegmentShape2D segment) if (Shape is SegmentShape2D segment)
{ {
segment.B = new Vector2(Utility.RightFieldBoundary.X - GlobalPosition.X, 0); segment.B = new Vector2(Utility.RightFieldBoundary.X - GlobalPosition.X+Utility.TileWidth/2.0f, 0);
} }
} }
} }