From adc5281f77a35c9c1a3768f03fe8f0e215f4792b Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 23 Feb 2025 12:19:18 -0500 Subject: [PATCH 1/3] improved cronies --- objects/boney.gd | 7 ++++--- objects/boney.tscn | 16 ++++++++-------- test_scene.tscn | 2 -- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/objects/boney.gd b/objects/boney.gd index a3968ff..6c47a30 100644 --- a/objects/boney.gd +++ b/objects/boney.gd @@ -5,6 +5,8 @@ extends CharacterBody3D @export_range(0,1,1,"or_less","or_greater","radians_as_degrees") var rotation_speed: float @export var death_delay: float +@export var sound_pitch_min: float +@export var sound_pitch_max: float @export_group("Node References") @export var model: Node3D @@ -29,7 +31,6 @@ func _physics_process(delta: float) -> void: func _on_player_detector_body_entered(body: Node3D) -> void: if body is Player: model.visible = false + death_sound.pitch_scale = randf_range(sound_pitch_min, sound_pitch_max) death_sound.play() - var tween = create_tween() - tween.set_process_mode(Tween.TWEEN_PROCESS_PHYSICS) - tween.tween_callback(queue_free).set_delay(death_delay) + get_tree().create_timer(death_delay, false, true).timeout.connect(queue_free) diff --git a/objects/boney.tscn b/objects/boney.tscn index 1112da0..53c29de 100644 --- a/objects/boney.tscn +++ b/objects/boney.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://b4a8aif3iigdw"] +[gd_scene load_steps=6 format=3 uid="uid://b4a8aif3iigdw"] [ext_resource type="Script" path="res://objects/boney.gd" id="1_bofrm"] [ext_resource type="PackedScene" uid="uid://46kyrtlb6b0a" path="res://assets/models/enemies/boney.glb" id="2_ssgky"] @@ -10,20 +10,20 @@ radius = 0.4 [sub_resource type="CylinderShape3D" id="CylinderShape3D_cdksx"] height = 0.5 - -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_5d27a"] -random_pitch = 1.5 -streams_count = 1 -stream_0/stream = ExtResource("3_a4a2f") +radius = 0.475 [node name="Boney" type="CharacterBody3D" node_paths=PackedStringArray("model", "death_sound")] script = ExtResource("1_bofrm") +speed = 2.0 +rotation_speed = 3.14159 death_delay = 0.2 +sound_pitch_min = 0.8 +sound_pitch_max = 1.5 model = NodePath("Model") death_sound = NodePath("DeathSound") [node name="Model" parent="." instance=ExtResource("2_ssgky")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0) +transform = Transform3D(0.368124, 0, 0.929775, 0, 1, 0, -0.929775, 0, 0.368124, 0, 0.75, 0) [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) @@ -39,7 +39,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_cdksx") [node name="DeathSound" type="AudioStreamPlayer3D" parent="."] -stream = SubResource("AudioStreamRandomizer_5d27a") +stream = ExtResource("3_a4a2f") bus = &"Sounds" [connection signal="body_entered" from="PlayerDetector" to="." method="_on_player_detector_body_entered" flags=6] diff --git a/test_scene.tscn b/test_scene.tscn index 18c7d23..16048da 100644 --- a/test_scene.tscn +++ b/test_scene.tscn @@ -72,5 +72,3 @@ polygon = PackedVector2Array(0, -1, 1, -1, 3, 0, 3, 2, 2, 3, -1, 2, -2, 0) [node name="Boney" parent="." instance=ExtResource("6_gpbt0")] transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 1.98854, 0, 1.02292) -speed = 1.0 -rotation_speed = 3.14159 From 53d564b4a4a836dc899eb16575008570bf78828d Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 24 Feb 2025 14:11:18 -0500 Subject: [PATCH 2/3] scale up canny --- objects/canny_cat.tscn | 8 ++++---- objects/goal_post.tscn | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/objects/canny_cat.tscn b/objects/canny_cat.tscn index 2bdbac7..38cba80 100644 --- a/objects/canny_cat.tscn +++ b/objects/canny_cat.tscn @@ -20,12 +20,12 @@ shading_mode = 0 albedo_color = Color(0.916968, 0.113727, 0, 1) [sub_resource type="SphereShape3D" id="SphereShape3D_4o01j"] -radius = 0.45 +radius = 0.9 [sub_resource type="CylinderMesh" id="CylinderMesh_b16dl"] top_radius = 0.05 bottom_radius = 0.05 -height = 4.0 +height = 8.0 radial_segments = 4 rings = 0 @@ -73,7 +73,7 @@ shape = SubResource("SphereShape3D_4o01j") [node name="Graphics" type="Node3D" parent="."] [node name="CannySprite" type="Sprite3D" parent="Graphics"] -pixel_size = 0.0156 +pixel_size = 0.0313 billboard = 1 texture_filter = 0 texture = ExtResource("1_cp4br") @@ -91,7 +91,7 @@ texture = ExtResource("2_fwt6m") visible = false [node name="PowerLine" type="MeshInstance3D" parent="PowerIndicator"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 2) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 4) material_override = SubResource("StandardMaterial3D_2xpb7") cast_shadow = 0 gi_mode = 0 diff --git a/objects/goal_post.tscn b/objects/goal_post.tscn index 880dbcf..3f4a32d 100644 --- a/objects/goal_post.tscn +++ b/objects/goal_post.tscn @@ -11,9 +11,9 @@ metallic_specular = 0.0 [sub_resource type="CylinderMesh" id="CylinderMesh_i27ie"] material = SubResource("StandardMaterial3D_e2vbu") -top_radius = 0.1 -bottom_radius = 0.1 -height = 4.0 +top_radius = 0.2 +bottom_radius = 0.2 +height = 6.0 radial_segments = 6 rings = 8 @@ -30,12 +30,13 @@ shader_parameter/wave_scale = 0.25 [sub_resource type="QuadMesh" id="QuadMesh_mfpmh"] material = SubResource("ShaderMaterial_3urv4") -size = Vector2(2, 1) +size = Vector2(3, 1.5) subdivide_width = 6 -center_offset = Vector3(1, 0, 0) +center_offset = Vector3(1.5, -0.75, 0) [sub_resource type="CylinderShape3D" id="CylinderShape3D_eshe3"] height = 0.5 +radius = 1.0 [node name="GoalPost" type="Node3D"] script = ExtResource("1_08x2x") @@ -43,16 +44,16 @@ script = ExtResource("1_08x2x") [node name="Graphics" type="Node3D" parent="."] [node name="Pole" type="MeshInstance3D" parent="Graphics"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) mesh = SubResource("CylinderMesh_i27ie") [node name="Flag" type="MeshInstance3D" parent="Graphics"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.5, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, 0) mesh = SubResource("QuadMesh_mfpmh") [node name="Sprite3D" type="Sprite3D" parent="Graphics"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.01, 0) -pixel_size = 0.0313 +pixel_size = 0.0625 axis = 1 alpha_cut = 2 texture_filter = 0 From 26deb746e7d8b4a451f89e07fc5295237999428c Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 24 Feb 2025 14:15:06 -0500 Subject: [PATCH 3/3] recreate level 1-1 --- assets/mesh_libraries/w1/w1_walls.meshlib | Bin 5969 -> 5968 bytes .../models/tiles/w1_walls/grey_block.material | Bin 340 -> 370 bytes levels/level.gd | 2 + levels/w1/1_01.tscn | 83 ++++++++++++++++++ test_scene.tscn | 4 +- 5 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 levels/level.gd create mode 100644 levels/w1/1_01.tscn diff --git a/assets/mesh_libraries/w1/w1_walls.meshlib b/assets/mesh_libraries/w1/w1_walls.meshlib index 5aefc5ada7beae53162ee108fda122ce27b020e7..96a852f430095b948bb0756b8095e190bffe03b0 100644 GIT binary patch delta 609 zcmV-n0-pWRF3>I!Qd2`i0ssI201yBGHIo1UN|6yRe+41{)+&xi5U(a304iAkP@y6q zRROy~K5PU4pn@QvdU2>`iNblb~#bjR$}(`q^Ip>ohrBsiJKnW39BqzNW|qdzu4i%I|0e$jTpS9h zcmX4YgQu>%*p%6DU--}QU-bX;AM^(j6lee~%!x?EHI|wh5Q|^425T`T?|rc>7ZPa! zb^(S!@qtr0WtL(w)mO7HrSgl{XW^zZTbNone>cX`vRoLP%6U6WjsKnNx~}WGuCFJm zZ|8A*J0}|G+Gd7cXaC&unP94u zO7=}ND2zI`WYShe=o43nI`3Hh$$z4l>@(YM@Y*Lj;S3s;d zf9QSRooV@OsU3*n#6j#sVby9WYG=SkRU5&8jEPfhJ7E?|=Qfaf6+c-8`IPI3sXMkSG!60l49{-%S|LLdF}&PSe$4!Wmv&_f4>F8b)A(LDjPege}Jmx?DK delta 610 zcmV-o0-gQPF3~O#Qd2`i0ssI201yBGHIo1UOOX*Se+?o4)@qJN5U(a304iAkP@y6q zRROy~Iz9jZpi*G~^zvv%EZN(iY_e2}CTH%4 zHI6;Wf8l8Anr1O~lZ#z5ar9)(+&1Zdkav|G$Gd9{N1G#+nx(O|`&r!gf64y=7>5EV zTDUmj;HxWdHe)#47yfVj7ybYI2mJvO6lhS{7ZXv4Z!4!0NX4;v!dqO)dtI)pg+yY( zEL0#&c&I5T&C)Ec`feAdRDux$FWhwI3)2hdf5uo|R||tvId5l~@xOy%7=~dO2KG$# z^*WAkuOu}g(Ak;gHdC@AIj+~v;7;BgM=q7CcAhwQ(|WzhI%Srou9=~CGymN4nPBSX z%9~0J$JFg z4FO=jl9fhA3L*a!9A!BgR17yFZg586ggH4m*ptosR^0Mj+b0GB5Kkt0xx#*yKItM*;Q0StME*jkvvwZ^76rjl@E&u=k diff --git a/assets/models/tiles/w1_walls/grey_block.material b/assets/models/tiles/w1_walls/grey_block.material index 68549b3c586bd9530a4d7004a5b669711f321173..cd8e04b31bb37cd66de69f4a6ee9d1e34fa0eda3 100644 GIT binary patch literal 370 zcmV-&0ge7rQ$s@n000005C8yU0ssJ70RR9fwJ-f(V*!N<0M-yXG+MKQN6{DR>Y&Gol$Qz-x`04xBEuhC`n z9BQ=HW8MGIe*=UF9`Sg5aNK2E?X*~Bxw-sT_)qYE@?YQ&E_-?zZQo|Cwo184p~Lxq z!I_i7_UQEg;Gb^$+ETd6riH7NQ^Ix9DE#n>%0+-P4TV!7bNf2HxRp8An&8U+fH&1P z(yiK~jgKkDWy4!JlX=LgFcg-H<-Y{_2Owx70U)t+*+B@`da+aXB#Hl$>wZeH5Xdv?l zR=``Zh4MvL@S@->JV10lC;Sj##-W41q_r0sOBbpbsek z06-)W0QzRrc9VnbO=z|SatY}_n(tssE~sIp2O5=zQvpY7k^&JGOXdF~fuLXVfJnWY z8*EtiRIe^4J^X)i<0AyaBSYbsHccubw-@XvW0Y!!OHe3AzAzID4X$Ok!Ohp)1!I>{ zt@>$qDh1J${{Vjz<49TaIQq~ny=*Ghr&4lGxbW`I2_Hw>|AKcOW5;+x*3}ZOQnrI@ z)2Pus+>G3!MyzqI{2%&HVBpXq9F7i+Z!*@G6RayUmj4L<2mS~A7x)7vAW(uaWmpdo z3aAor7NGgwhT)6J6mS%P0CQZ^y992aC