From 29bdda6acfde2b1070efbf1fb8657955cccd606a Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Mon, 19 Aug 2024 17:18:09 +0200 Subject: [PATCH 1/5] sound changes --- gmtk_2024/objects/Player.tscn | 10 ++++++++-- gmtk_2024/scripts/player_movement.gd | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gmtk_2024/objects/Player.tscn b/gmtk_2024/objects/Player.tscn index ba328e4..dfce31e 100644 --- a/gmtk_2024/objects/Player.tscn +++ b/gmtk_2024/objects/Player.tscn @@ -10,11 +10,12 @@ [sub_resource type="CircleShape2D" id="CircleShape2D_vxfel"] radius = 12.0 -[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("sfx")] +[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("sfx", "sfx_large")] collision_layer = 4 collision_mask = 51 script = ExtResource("1_a6lhy") sfx = NodePath("AudioStreamPlayer2D") +sfx_large = NodePath("AudioStreamPlayer2D2") speed = 250 jump_strength = 600 @@ -41,7 +42,12 @@ texture_mode = 1 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("4_jit8y") -volume_db = -3.962 +volume_db = -12.876 pitch_scale = 0.92 +[node name="AudioStreamPlayer2D2" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("4_jit8y") +volume_db = -12.876 +pitch_scale = 0.51 + [connection signal="body_entered" from="Hurtbox" to="." method="_on_hurtbox_body_entered"] diff --git a/gmtk_2024/scripts/player_movement.gd b/gmtk_2024/scripts/player_movement.gd index 1ef9099..0b68c27 100644 --- a/gmtk_2024/scripts/player_movement.gd +++ b/gmtk_2024/scripts/player_movement.gd @@ -1,6 +1,8 @@ extends CharacterBody2D @export var sfx : AudioStreamPlayer2D +@export var sfx_large : AudioStreamPlayer2D + @export var speed = 340 @export var gravity = 50 var jump_count = 1 @@ -104,11 +106,12 @@ func _physics_process(delta): update_cursor() func Jump(): - sfx.play() if scale.x == 1: velocity.y = -1 * jump_strength + sfx.play() else : velocity.y = -1 * jump_strength_large + sfx_large.play() jump_count = 0 is_touching_floor = false From b6375e04c8172d8b297d837611462b83fe87e4b4 Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Mon, 19 Aug 2024 17:51:50 +0200 Subject: [PATCH 2/5] level 3 --- .../levels/Level_3_Rooms/level_3_room_2.tscn | 19 +++++++++++ gmtk_2024/levels/level_3.tscn | 32 ++++++++++-------- gmtk_2024/objects/BoxPushable_1.tscn | 4 +-- gmtk_2024/objects/box_pushable_2.tscn | 9 ++++- gmtk_2024/textures/movable-block-big.png | Bin 422 -> 268 bytes gmtk_2024/textures/movable-block-big.png~ | Bin 0 -> 422 bytes gmtk_2024/textures/movable-block-small.png | Bin 413 -> 268 bytes gmtk_2024/textures/movable-block-small.png~ | Bin 0 -> 413 bytes 8 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn create mode 100644 gmtk_2024/textures/movable-block-big.png~ create mode 100644 gmtk_2024/textures/movable-block-small.png~ diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn new file mode 100644 index 0000000..731bd45 --- /dev/null +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=4 format=4 uid="uid://bafs3yuts8e3v"] + +[ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_t601r"] +[ext_resource type="PackedScene" uid="uid://biaxahxft1xo0" path="res://objects/box_pushable_2.tscn" id="2_12bbn"] +[ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="3_rf2v0"] + +[node name="LevelBase" instance=ExtResource("1_t601r")] + +[node name="Player" parent="." index="0"] +position = Vector2(-15, -88) + +[node name="Layer0" parent="." index="5"] +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD5/wQAAAABAAAAAAD6/wQAAAAFAAIAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAADAAIAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD5//7/AAABAAEAAAD6//7/AAABAAEAAAD7//7/AAABAAEAAAD8//7/AAABAAEAAAD9//7/AAABAAEAAAD+//7/AAABAAEAAAD///7/AAABAAEAAAAGAP7/AAABAAEAAAAHAP7/AAABAAEAAAAIAP7/AAABAAEAAAD5////AAABAAEAAAD6////AAABAAEAAAD7////AAABAAEAAAD8////AAABAAEAAAD9////AAABAAEAAAD+////AAABAAEAAAD/////AAABAAEAAAAAAP//AAABAAEAAAABAP//AAABAAEAAAACAP//AAABAAEAAAAGAP//AAABAAEAAAAHAP//AAABAAEAAAAIAP//AAABAAEAAAD5/wAAAAABAAEAAAD5/wEAAAABAAEAAAD5/wIAAAABAAEAAAD5/wMAAAABAAEAAAA=") + +[node name="BoxPushable1" parent="." index="7" instance=ExtResource("2_12bbn")] +position = Vector2(64, -96) + +[node name="AnimatableBody2D" parent="." index="8" instance=ExtResource("3_rf2v0")] +position = Vector2(-255, -96) diff --git a/gmtk_2024/levels/level_3.tscn b/gmtk_2024/levels/level_3.tscn index 71a71b2..f139cf3 100644 --- a/gmtk_2024/levels/level_3.tscn +++ b/gmtk_2024/levels/level_3.tscn @@ -1,28 +1,30 @@ -[gd_scene load_steps=6 format=4 uid="uid://badb2xvsbtm5j"] +[gd_scene load_steps=7 format=4 uid="uid://badb2xvsbtm5j"] [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_eq270"] [ext_resource type="PackedScene" uid="uid://d0q0sfati8wk0" path="res://objects/ResizableBlock.tscn" id="2_fn1kh"] -[ext_resource type="PackedScene" uid="uid://vtwswrkfkgas" path="res://objects/EnemyMover.tscn" id="3_onw61"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_c4pjs"] +[ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="4_jr6tv"] +[ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="5_1h3gw"] [ext_resource type="PackedScene" uid="uid://dg4x0lmww373x" path="res://levels/Level_2_Rooms/level_2_room_3.tscn" id="5_6b3nj"] [node name="LevelBase" instance=ExtResource("1_eq270")] [node name="Player" parent="." index="0"] -position = Vector2(-274, 115) +position = Vector2(-261, 46) [node name="Layer0" parent="." index="5"] -tile_map_data = PackedByteArray("AAD2//v/AAABAAEAAAD2//z/AAABAAEAAAD2//3/AAADAAAAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAADAAIAAAD2/wEAAAADAAAAAAD2/wIAAAADAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAFAAIAAAAJAAIAAAABAAEAAAAJAAMAAAABAAEAAAAJAAQAAAABAAEAAAD3//v/AAABAAEAAAD4//v/AAABAAEAAAD5//v/AAABAAEAAAD6//v/AAABAAEAAAD7//v/AAABAAEAAAD8//v/AAABAAEAAAD9//v/AAABAAEAAAD+//v/AAABAAEAAAD///v/AAABAAEAAAAAAPv/AAABAAEAAAABAPv/AAABAAEAAAACAPv/AAABAAEAAAADAPv/AAABAAEAAAAEAPv/AAABAAEAAAAFAPv/AAADAAAAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAAAAAD4/wQAAAABAAAAAAD5/wQAAAACAAAAAAD7/wQAAAAIAAAAAAD9/wQAAAAIAAAAAAD//wQAAAAIAAAAAAABAAQAAAAIAAAAAAADAAQAAAAAAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAAFAAIAAAAHAAQAAAABAAEAAAAIAAQAAAABAAEAAAD3/wEAAAAEAAAAAAD4/wEAAAAEAAAAAAD5/wEAAAAEAAAAAAD6/wEAAAAEAAAAAAD7/wEAAAAEAAAAAAD8/wEAAAAEAAAAAAD9/wEAAAAEAAAAAAD+/wEAAAAEAAAAAAD//wEAAAAEAAAAAAAAAAEAAAAEAAAAAAABAAEAAAAEAAAAAAACAAEAAAAEAAAAAAADAAEAAAACAAIAAAAGAAMAAAAAAAAAAAAHAAMAAAAFAAIAAAAIAAMAAAABAAEAAAAIAAIAAAAFAAIAAAAHAAIAAAAAAAAAAAAIAAEAAAAAAAAAAAADAAAAAAAGAAAAAAACAAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAABAAAAAAD//wAAAAABAAAAAAD+/wAAAAABAAAAAAD9/wAAAAABAAAAAAD8/wAAAAABAAAAAAD7/wAAAAABAAAAAAD6/wAAAAABAAAAAAD5/wAAAAABAAAAAAD4/wAAAAABAAAAAAD3/wAAAAABAAAAAAAEAAAAAAAIAAAAAwAFAP3/AAAIAAEAAAAFAPz/AAAHAAEAAGD3//3/AAABAAIAAAD4//3/AAABAAIAAAD4//z/AAABAAEAAAD3//z/AAABAAEAAAD5//z/AAABAAEAAAD6//z/AAABAAEAAAD7//z/AAABAAEAAAD8//z/AAABAAEAAAD9//z/AAABAAEAAAD+//z/AAABAAEAAAD///z/AAABAAEAAAAAAPz/AAABAAEAAAABAPz/AAADAAAAAAACAPz/AAABAAIAAAADAPz/AAABAAIAAAAEAPz/AAABAAIAAAABAP3/AAACAAIAAAAAAP3/AAABAAIAAAD///3/AAABAAIAAAD+//3/AAABAAIAAAD9//3/AAADAAAAAAD8//3/AAABAAEAAAD7//3/AAABAAEAAAD6//3/AAABAAEAAAD5//3/AAAFAAAAAAD9//7/AAACAAIAAAD8//7/AAABAAIAAAD7//7/AAABAAIAAAD6//7/AAABAAIAAAD5//7/AAAAAAIAAAAFAP7/AAAIAAAAADA=") +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAADAAIAAAD2////AAADAAAAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAADAAIAAAD2/wMAAAABAAEAAAD2/wQAAAABAAEAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAFAAIAAAAJAAMAAAABAAEAAAAJAAQAAAABAAEAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAEAAAD4/wQAAAABAAEAAAD5/wQAAAADAAIAAAD6/wQAAAABAAAAAAD7/wQAAAABAAAAAAD8/wQAAAABAAAAAAD9/wQAAAABAAAAAAD+/wQAAAABAAAAAAD//wQAAAABAAAAAAAAAAQAAAABAAAAAAABAAQAAAABAAAAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAAFAAIAAAAHAAQAAAABAAEAAAAIAAQAAAABAAEAAAD3/wIAAAABAAAAAAD4/wIAAAABAAAAAAD5/wIAAAACAAAAAAD5/wMAAAACAAEAAAD3/wMAAAABAAEAAAD4/wMAAAABAAEAAAAGAAMAAAAAAAEAAAAGAAIAAAAAAAAAAAAHAAIAAAABAAAAAAAHAAMAAAABAAEAAAAIAAIAAAABAAAAAAAIAAMAAAABAAEAAAAFAP//AAACAAIAAAAEAP//AAABAAIAAAADAP//AAABAAIAAAACAP//AAABAAIAAAAAAP//AAABAAIAAAABAP//AAABAAIAAAAFAP7/AAAGAAEAAGAFAP3/AAAIAAAAAAD/////AAABAAIAAAD+////AAABAAIAAAD9////AAABAAIAAAD8////AAABAAIAAAD7////AAABAAIAAAD6////AAABAAIAAAD5////AAABAAIAAAD4////AAABAAIAAAAEAP7/AAABAAAAAAADAP7/AAABAAAAAAACAP7/AAABAAAAAAABAP7/AAABAAAAAAAAAP7/AAABAAAAAAD///7/AAABAAAAAAD+//7/AAABAAAAAAD3////AAABAAIAAAD9//7/AAABAAAAAAD8//7/AAABAAAAAAD7//7/AAABAAAAAAD6//7/AAABAAAAAAD5//7/AAABAAAAAAD4//7/AAABAAAAAAD3//7/AAABAAAAAAA=") -[node name="Block" parent="." index="7" instance=ExtResource("2_fn1kh")] -position = Vector2(243, -91) -scale = Vector2(0.5, 0.5) - -[node name="EnemyMover" parent="." index="8" instance=ExtResource("3_onw61")] -position = Vector2(-7, 97) -scale = Vector2(2, 2) -direction = -1 - -[node name="Goal" parent="." index="9" instance=ExtResource("4_c4pjs")] -position = Vector2(-260, -28) +[node name="Goal" parent="." index="7" instance=ExtResource("4_c4pjs")] +position = Vector2(-257, -95) next = ExtResource("5_6b3nj") + +[node name="BoxPushable1" parent="." index="8" instance=ExtResource("4_jr6tv")] +position = Vector2(-75, 112) + +[node name="AnimatableBody2D" parent="." index="9" instance=ExtResource("5_1h3gw")] +position = Vector2(-163, 96) + +[node name="AnimatableBody2D2" parent="." index="10" instance=ExtResource("2_fn1kh")] +position = Vector2(259, 34) +scale = Vector2(0.5, 0.5) diff --git a/gmtk_2024/objects/BoxPushable_1.tscn b/gmtk_2024/objects/BoxPushable_1.tscn index 0339c41..b87d6da 100644 --- a/gmtk_2024/objects/BoxPushable_1.tscn +++ b/gmtk_2024/objects/BoxPushable_1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://d17jpcgayfg6i"] -[ext_resource type="Texture2D" uid="uid://buqgl7x10et1f" path="res://temp_assets/img.png" id="1_ocrks"] [ext_resource type="Script" path="res://scripts/pushable.gd" id="1_tf1fy"] +[ext_resource type="Texture2D" uid="uid://ca3ky53gvjj8" path="res://textures/movable-block-small.png" id="2_pp2mc"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_legx4"] size = Vector2(34, 32) @@ -15,4 +15,4 @@ script = ExtResource("1_tf1fy") shape = SubResource("RectangleShape2D_legx4") [node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("1_ocrks") +texture = ExtResource("2_pp2mc") diff --git a/gmtk_2024/objects/box_pushable_2.tscn b/gmtk_2024/objects/box_pushable_2.tscn index b6c3f36..da9d3fa 100644 --- a/gmtk_2024/objects/box_pushable_2.tscn +++ b/gmtk_2024/objects/box_pushable_2.tscn @@ -1,6 +1,13 @@ -[gd_scene load_steps=2 format=3 uid="uid://biaxahxft1xo0"] +[gd_scene load_steps=3 format=3 uid="uid://biaxahxft1xo0"] [ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="1_pnjdf"] +[ext_resource type="Texture2D" uid="uid://bgn21wm3f32ch" path="res://textures/movable-block-big.png" id="2_kff60"] [node name="BoxPushable1" instance=ExtResource("1_pnjdf")] scale = Vector2(2, 2) + +[node name="CollisionShape2D" parent="." index="0"] +position = Vector2(0, 0.5) + +[node name="Sprite2D" parent="." index="1"] +texture = ExtResource("2_kff60") diff --git a/gmtk_2024/textures/movable-block-big.png b/gmtk_2024/textures/movable-block-big.png index adeb5351a287354ed04a621d43dbb20e6d9edea4..cef96591a80e30c15a0652621b966b67af89a4a6 100644 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP;j58 zi(^Q{;pCJ9j8k^r{BIl}c<1l0$%3;jgbyw7%U{@C9J&MOvOyaBUi9@TNk_k>WVGtCXcF*GXz#Om@rRwUJLXI NgQu&X%Q~loCIIe_WW@jg literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WChBZdAc};RK&fVy^xD3P{bv?`(TF9!6czS%KML~sO>*uFXSWU=;PMxDad|! zLq+YI*vJ`{sd3RVGam2Sv3J#kn*|>ZY@95U|9#Q~Z zkG=GL!s5@M*)7}f=fbyV*W0=MzUDkjo>SB@=K-fe>PF^&dw)JHX$iL7eOYw5d9L+A zVTV&m>?zg@NJ@$=|<*?&wDPu`Q7lMO0bOKAfZR&Iw=kM1*hM8+@#iP;OgfSqSj#xVKsp9Np4?GEuN z041iCup8X`&gi=lY}wKOqHbViHMR4fx!(3Wp?1sWG1#RO><|0Bkg6-+At2r$vUJtF rHGAf{rQ6ws14EQAHNrE^*Ox&H$mRfI5V#aP8AN%y`njxgN@xNAif*R9 diff --git a/gmtk_2024/textures/movable-block-big.png~ b/gmtk_2024/textures/movable-block-big.png~ new file mode 100644 index 0000000000000000000000000000000000000000..adeb5351a287354ed04a621d43dbb20e6d9edea4 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WChBZdAc};RK&fVy^xD3P{bv?`(TF9!6czS%KML~sO>*uFXSWU=;PMxDad|! zLq+YI*vJ`{sd3RVGam2Sv3J#kn*|>ZY@95U|9#Q~Z zkG=GL!s5@M*)7}f=fbyV*W0=MzUDkjo>SB@=K-fe>PF^&dw)JHX$iL7eOYw5d9L+A zVTV&m>?zg@NJ@$=|<*?&wDPu`Q7lMO0bOKAfZR&Iw=kM1*hM8+@#iP;OgfSqSj#xVKsp9Np4?GEuN z041iCup8X`&gi=lY}wKOqHbViHMR4fx!(3Wp?1sWG1#RO><|0Bkg6-+At2r$vUJtF rHGAf{rQ6ws14EQAHNrE^*Ox&H$mRfI5V#aP8AN%y`njxgN@xNAif*R9 literal 0 HcmV?d00001 diff --git a/gmtk_2024/textures/movable-block-small.png b/gmtk_2024/textures/movable-block-small.png index 01b55580d19f8351d5b258ea55289c626c33bf50..38fcd0b90236597797cef836fb1b987c2206d24f 100644 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP;j58 zi(^Q{;pCJ9j8i18{4)*^ypz1+Xov5d&cp^rWxe^+jkg3`UF6p$wMNmf!l@x-{&#~b zi$8cvNS);BY~*Jws+Bt;(5tksFHtj6(eQ!d0jD)iF?Q{YGc0^$H!2$baAvsceqer<_*> zo43mx2wfzo#oy-d>7n7jJi{50CYw5*G9ULW>W{vhK1(^ZkkKRZ(%uixwih1BoHZw@{j$R|7JmlK zZrO&K%hjKs-+26GrmsxFD#hX^^@b@&`F?zV7QXS=OXKT19++IX%{h-DNX&Y{EylI8 z&#x$Jl6Ba@utaCE?19cxYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKG_In3 diff --git a/gmtk_2024/textures/movable-block-small.png~ b/gmtk_2024/textures/movable-block-small.png~ new file mode 100644 index 0000000000000000000000000000000000000000..01b55580d19f8351d5b258ea55289c626c33bf50 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WChCUdb&7jJi{50CYw5*G9ULW>W{vhK1(^ZkkKRZ(%uixwih1BoHZw@{j$R|7JmlK zZrO&K%hjKs-+26GrmsxFD#hX^^@b@&`F?zV7QXS=OXKT19++IX%{h-DNX&Y{EylI8 z&#x$Jl6Ba@utaCE?19cxYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKG_In3 literal 0 HcmV?d00001 From efd5738f709643effb86343393237c20bc4c6a77 Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Mon, 19 Aug 2024 18:33:47 +0200 Subject: [PATCH 3/5] crash fix --- .../levels/Level_3_Rooms/level_3_room_2.tscn | 13 +++++-- .../levels/Level_3_Rooms/level_3_room_3.tscn | 39 +++++++++++++++++++ gmtk_2024/objects/BoxPushable_1.tscn | 2 +- gmtk_2024/objects/PressurePlate.tscn | 4 +- gmtk_2024/scripts/PressurePlate.gd | 2 +- gmtk_2024/scripts/player_movement.gd | 2 +- 6 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn index 731bd45..a3d4950 100644 --- a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=4 uid="uid://bafs3yuts8e3v"] +[gd_scene load_steps=5 format=4 uid="uid://bafs3yuts8e3v"] [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_t601r"] [ext_resource type="PackedScene" uid="uid://biaxahxft1xo0" path="res://objects/box_pushable_2.tscn" id="2_12bbn"] [ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="3_rf2v0"] +[ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_3ywhr"] [node name="LevelBase" instance=ExtResource("1_t601r")] @@ -10,10 +11,14 @@ position = Vector2(-15, -88) [node name="Layer0" parent="." index="5"] -tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD5/wQAAAABAAAAAAD6/wQAAAAFAAIAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAADAAIAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD5//7/AAABAAEAAAD6//7/AAABAAEAAAD7//7/AAABAAEAAAD8//7/AAABAAEAAAD9//7/AAABAAEAAAD+//7/AAABAAEAAAD///7/AAABAAEAAAAGAP7/AAABAAEAAAAHAP7/AAABAAEAAAAIAP7/AAABAAEAAAD5////AAABAAEAAAD6////AAABAAEAAAD7////AAABAAEAAAD8////AAABAAEAAAD9////AAABAAEAAAD+////AAABAAEAAAD/////AAABAAEAAAAAAP//AAABAAEAAAABAP//AAABAAEAAAACAP//AAABAAEAAAAGAP//AAABAAEAAAAHAP//AAABAAEAAAAIAP//AAABAAEAAAD5/wAAAAABAAEAAAD5/wEAAAABAAEAAAD5/wIAAAABAAEAAAD5/wMAAAABAAEAAAA=") +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAFAAIAAAAJAP//AAAFAAAAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAACAAIAAAAIAPv/AAAAAAIAAAD5/wQAAAAGAAAAAGD6/wQAAAABAAAAAAD7/wQAAAABAAAAAAD8/wQAAAACAAAAAAACAAQAAAAAAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD5//7/AAAAAAAAAAD6//7/AAABAAAAAAD7//7/AAABAAAAAAD8//7/AAABAAAAAAD9//7/AAABAAAAAAD+//7/AAABAAAAAAD///7/AAABAAAAAAAGAP7/AAAAAAAAAAAHAP7/AAABAAAAAAAIAP7/AAABAAAAAAD5////AAAHAAAAAGD6////AAABAAIAAAD7////AAABAAIAAAD8////AAABAAIAAAD9////AAABAAIAAAD+////AAABAAIAAAD/////AAABAAIAAAAAAP//AAABAAIAAAABAP//AAABAAIAAAACAP//AAACAAIAAAAGAP//AAAAAAIAAAAHAP//AAABAAIAAAAIAP//AAABAAIAAAD5/wAAAAAIAAEAAAD5/wEAAAAIAAEAAAD5/wIAAAAIAAEAAAD5/wMAAAAIAAEAAAAAAP7/AAABAAAAAAABAP7/AAABAAAAAAACAP7/AAACAAAAAAD8/wUAAAACAAEAAAD8/wYAAAABAAEAAAD9/wYAAAABAAEAAAD+/wYAAAABAAEAAAD//wYAAAABAAEAAAAAAAYAAAABAAEAAAABAAYAAAABAAEAAAACAAYAAAABAAEAAAADAAYAAAABAAEAAAACAAUAAAAAAAEAAAADAAUAAAABAAEAAAD///r/AAABAAEAAAAAAPr/AAABAAIAAAABAPr/AAABAAIAAAACAPr/AAABAAIAAAADAPr/AAABAAIAAAAEAPr/AAABAAIAAAAFAPr/AAABAAIAAAAGAPr/AAABAAIAAAAHAPr/AAABAAIAAAAIAPr/AAABAAIAAAD2/wQAAAACAAEAAAABAPn/AAABAAIAAAACAPn/AAABAAIAAAADAPn/AAABAAIAAAAEAPn/AAABAAIAAAAFAPn/AAABAAIAAAAGAPn/AAABAAIAAAAHAPn/AAABAAIAAAAIAPn/AAABAAIAAAAJAPn/AAABAAIAAAAJAPr/AAABAAIAAAA=") [node name="BoxPushable1" parent="." index="7" instance=ExtResource("2_12bbn")] -position = Vector2(64, -96) +position = Vector2(49, -96) +collision_mask = 21 [node name="AnimatableBody2D" parent="." index="8" instance=ExtResource("3_rf2v0")] -position = Vector2(-255, -96) +position = Vector2(-255, -31) + +[node name="Goal" parent="." index="9" instance=ExtResource("4_3ywhr")] +position = Vector2(-160, 95) diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn new file mode 100644 index 0000000..5ba1e50 --- /dev/null +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn @@ -0,0 +1,39 @@ +[gd_scene load_steps=7 format=4 uid="uid://cf4tsn1bvj0qr"] + +[ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_d4hqf"] +[ext_resource type="PackedScene" uid="uid://c6g2f7tm7iasr" path="res://objects/PressurePlate.tscn" id="2_wmdce"] +[ext_resource type="PackedScene" uid="uid://c168bkledwyya" path="res://objects/Laser.tscn" id="3_nvnxj"] +[ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_djcls"] +[ext_resource type="PackedScene" uid="uid://biaxahxft1xo0" path="res://objects/box_pushable_2.tscn" id="5_j3ms1"] +[ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="6_6wljf"] + +[node name="LevelBase" instance=ExtResource("1_d4hqf")] + +[node name="Player" parent="." index="0"] +position = Vector2(-259, -107) + +[node name="Layer0" parent="." index="5"] +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAAAAAD4/wQAAAABAAAAAAD5/wQAAAABAAAAAAD6/wQAAAAFAAIAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAADAAIAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD3/wEAAAABAAEAAAD4/wEAAAABAAEAAAD5/wEAAAABAAEAAAD6/wEAAAABAAEAAAD7/wEAAAABAAEAAAD8/wEAAAABAAEAAAA=") + +[node name="PressurePlate" parent="." index="7" instance=ExtResource("2_wmdce")] +position = Vector2(-205, 112) + +[node name="Laser" parent="." index="8" instance=ExtResource("3_nvnxj")] +position = Vector2(-239, 79) + +[node name="Goal" parent="." index="9" instance=ExtResource("4_djcls")] +position = Vector2(-274, 114) + +[node name="Laser2" parent="." index="10" instance=ExtResource("3_nvnxj")] +position = Vector2(-111, 79) + +[node name="PressurePlate2" parent="." index="11" instance=ExtResource("2_wmdce")] +position = Vector2(237, 112) +laser_path = NodePath("../Laser2") + +[node name="BoxPushable1" parent="." index="12" instance=ExtResource("5_j3ms1")] +position = Vector2(50, 94) +collision_mask = 21 + +[node name="AnimatableBody2D" parent="." index="13" instance=ExtResource("6_6wljf")] +position = Vector2(-125, -9) diff --git a/gmtk_2024/objects/BoxPushable_1.tscn b/gmtk_2024/objects/BoxPushable_1.tscn index b87d6da..ef5623c 100644 --- a/gmtk_2024/objects/BoxPushable_1.tscn +++ b/gmtk_2024/objects/BoxPushable_1.tscn @@ -8,7 +8,7 @@ size = Vector2(34, 32) [node name="BoxPushable1" type="CharacterBody2D"] collision_layer = 16 -collision_mask = 21 +collision_mask = 53 script = ExtResource("1_tf1fy") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/gmtk_2024/objects/PressurePlate.tscn b/gmtk_2024/objects/PressurePlate.tscn index 9ba6190..7ed0c36 100644 --- a/gmtk_2024/objects/PressurePlate.tscn +++ b/gmtk_2024/objects/PressurePlate.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://c6g2f7tm7iasr"] [ext_resource type="Script" path="res://scripts/PressurePlate.gd" id="1_7ar3x"] -[ext_resource type="Texture2D" uid="uid://cwf57p0osmc0w" path="res://textures/PressurePlate.png" id="1_st48m"] +[ext_resource type="Texture2D" uid="uid://bpfvkxqajd1en" path="res://textures/PressurePlate.png" id="1_st48m"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_c6ukx"] size = Vector2(24, 2) @@ -65,7 +65,7 @@ script = ExtResource("1_7ar3x") [node name="Area2D" type="Area2D" parent="."] collision_layer = 32 -collision_mask = 5 +collision_mask = 21 [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] position = Vector2(0, 11) diff --git a/gmtk_2024/scripts/PressurePlate.gd b/gmtk_2024/scripts/PressurePlate.gd index c9d1e54..9f905e8 100644 --- a/gmtk_2024/scripts/PressurePlate.gd +++ b/gmtk_2024/scripts/PressurePlate.gd @@ -29,7 +29,7 @@ func activate_plate(): print("wird aktiviert") if not is_activated: is_activated = true - if laser: + if laser and weakref(laser).get_ref(): laser.queue_free() # TODO: fix error when called again diff --git a/gmtk_2024/scripts/player_movement.gd b/gmtk_2024/scripts/player_movement.gd index 0b68c27..a669bc1 100644 --- a/gmtk_2024/scripts/player_movement.gd +++ b/gmtk_2024/scripts/player_movement.gd @@ -98,7 +98,7 @@ func _physics_process(delta): var box = get_slide_collision(i).get_collider() as Box if scale.x == 2: if box and velocity.y >= 0: - box.velocity.x = velocity.x*0.8 + box.velocity.x = velocity.x*1.2 else: if box and velocity.y >= 0 and box.scale.x < 2: box.velocity.x = velocity.x*0.8 From fabd26780a4c1c5e5abdc863543131456cc1c3e5 Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Mon, 19 Aug 2024 19:23:19 +0200 Subject: [PATCH 4/5] stuff --- .../levels/Level_3_Rooms/level_3_room_2.tscn | 2 +- .../levels/Level_3_Rooms/level_3_room_3.tscn | 30 ++----------------- gmtk_2024/menu/level_menu/level_select.tscn | 18 ----------- 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn index a3d4950..03c17e8 100644 --- a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn @@ -11,7 +11,7 @@ position = Vector2(-15, -88) [node name="Layer0" parent="." index="5"] -tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAFAAIAAAAJAP//AAAFAAAAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAACAAIAAAAIAPv/AAAAAAIAAAD5/wQAAAAGAAAAAGD6/wQAAAABAAAAAAD7/wQAAAABAAAAAAD8/wQAAAACAAAAAAACAAQAAAAAAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD5//7/AAAAAAAAAAD6//7/AAABAAAAAAD7//7/AAABAAAAAAD8//7/AAABAAAAAAD9//7/AAABAAAAAAD+//7/AAABAAAAAAD///7/AAABAAAAAAAGAP7/AAAAAAAAAAAHAP7/AAABAAAAAAAIAP7/AAABAAAAAAD5////AAAHAAAAAGD6////AAABAAIAAAD7////AAABAAIAAAD8////AAABAAIAAAD9////AAABAAIAAAD+////AAABAAIAAAD/////AAABAAIAAAAAAP//AAABAAIAAAABAP//AAABAAIAAAACAP//AAACAAIAAAAGAP//AAAAAAIAAAAHAP//AAABAAIAAAAIAP//AAABAAIAAAD5/wAAAAAIAAEAAAD5/wEAAAAIAAEAAAD5/wIAAAAIAAEAAAD5/wMAAAAIAAEAAAAAAP7/AAABAAAAAAABAP7/AAABAAAAAAACAP7/AAACAAAAAAD8/wUAAAACAAEAAAD8/wYAAAABAAEAAAD9/wYAAAABAAEAAAD+/wYAAAABAAEAAAD//wYAAAABAAEAAAAAAAYAAAABAAEAAAABAAYAAAABAAEAAAACAAYAAAABAAEAAAADAAYAAAABAAEAAAACAAUAAAAAAAEAAAADAAUAAAABAAEAAAD///r/AAABAAEAAAAAAPr/AAABAAIAAAABAPr/AAABAAIAAAACAPr/AAABAAIAAAADAPr/AAABAAIAAAAEAPr/AAABAAIAAAAFAPr/AAABAAIAAAAGAPr/AAABAAIAAAAHAPr/AAABAAIAAAAIAPr/AAABAAIAAAD2/wQAAAACAAEAAAABAPn/AAABAAIAAAACAPn/AAABAAIAAAADAPn/AAABAAIAAAAEAPn/AAABAAIAAAAFAPn/AAABAAIAAAAGAPn/AAABAAIAAAAHAPn/AAABAAIAAAAIAPn/AAABAAIAAAAJAPn/AAABAAIAAAAJAPr/AAABAAIAAAA=") +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAACAAEAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAFAAIAAAAJAP//AAAFAAAAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAACAAIAAAAIAPv/AAAAAAIAAAD5/wQAAAAGAAAAAGD6/wQAAAABAAAAAAD7/wQAAAABAAAAAAD8/wQAAAACAAAAAAACAAQAAAAAAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD5//7/AAAAAAAAAAD6//7/AAABAAAAAAD7//7/AAABAAAAAAD8//7/AAABAAAAAAD9//7/AAABAAAAAAD+//7/AAABAAAAAAD///7/AAABAAAAAAAGAP7/AAAAAAAAAAAHAP7/AAABAAAAAAAIAP7/AAABAAAAAAD5////AAAHAAAAAGD6////AAABAAIAAAD7////AAABAAIAAAD8////AAABAAIAAAD9////AAABAAIAAAD+////AAABAAIAAAD/////AAABAAIAAAAAAP//AAABAAIAAAABAP//AAABAAIAAAACAP//AAACAAIAAAAGAP//AAAAAAIAAAAHAP//AAABAAIAAAAIAP//AAABAAIAAAD5/wAAAAAIAAEAAAD5/wEAAAAIAAEAAAD5/wIAAAAIAAEAAAD5/wMAAAAIAAEAAAAAAP7/AAABAAAAAAABAP7/AAABAAAAAAACAP7/AAACAAAAAAD8/wUAAAACAAEAAAD8/wYAAAABAAEAAAD9/wYAAAABAAEAAAD+/wYAAAABAAEAAAD//wYAAAABAAEAAAAAAAYAAAABAAEAAAABAAYAAAABAAEAAAACAAYAAAABAAEAAAADAAYAAAABAAEAAAACAAUAAAAAAAEAAAADAAUAAAABAAEAAAD///r/AAABAAEAAAAAAPr/AAABAAIAAAABAPr/AAABAAIAAAACAPr/AAABAAIAAAADAPr/AAABAAIAAAAEAPr/AAABAAIAAAAFAPr/AAABAAIAAAAGAPr/AAABAAIAAAAHAPr/AAABAAIAAAAIAPr/AAABAAIAAAABAPn/AAABAAIAAAACAPn/AAABAAIAAAADAPn/AAABAAIAAAAEAPn/AAABAAIAAAAFAPn/AAABAAIAAAAGAPn/AAABAAIAAAAHAPn/AAABAAIAAAAIAPn/AAABAAIAAAAJAPn/AAABAAIAAAAJAPr/AAABAAIAAAA=") [node name="BoxPushable1" parent="." index="7" instance=ExtResource("2_12bbn")] position = Vector2(49, -96) diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn index 5ba1e50..bea2ba5 100644 --- a/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn @@ -1,11 +1,7 @@ -[gd_scene load_steps=7 format=4 uid="uid://cf4tsn1bvj0qr"] +[gd_scene load_steps=3 format=4 uid="uid://dncy4ik2v5axn"] [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_d4hqf"] -[ext_resource type="PackedScene" uid="uid://c6g2f7tm7iasr" path="res://objects/PressurePlate.tscn" id="2_wmdce"] -[ext_resource type="PackedScene" uid="uid://c168bkledwyya" path="res://objects/Laser.tscn" id="3_nvnxj"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_djcls"] -[ext_resource type="PackedScene" uid="uid://biaxahxft1xo0" path="res://objects/box_pushable_2.tscn" id="5_j3ms1"] -[ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="6_6wljf"] [node name="LevelBase" instance=ExtResource("1_d4hqf")] @@ -13,27 +9,7 @@ position = Vector2(-259, -107) [node name="Layer0" parent="." index="5"] -tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAAAAAD4/wQAAAABAAAAAAD5/wQAAAABAAAAAAD6/wQAAAAFAAIAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAADAAIAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD3/wEAAAABAAEAAAD4/wEAAAABAAEAAAD5/wEAAAABAAEAAAD6/wEAAAABAAEAAAD7/wEAAAABAAEAAAD8/wEAAAABAAEAAAA=") +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAAAAAD4/wQAAAABAAAAAAD5/wQAAAABAAAAAAD6/wQAAAAFAAIAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAADAAIAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD3/wEAAAABAAEAAAD4/wEAAAABAAEAAAD5/wEAAAABAAEAAAD6/wEAAAABAAEAAAD7/wEAAAABAAEAAAD8/wEAAAABAAEAAAACAP//AAABAAEAAAADAP//AAABAAEAAAAEAP//AAABAAEAAAAFAP//AAABAAEAAAABAP//AAABAAEAAAAAAP//AAABAAEAAAAAAAAAAAABAAEAAAAAAAEAAAABAAEAAAAAAAIAAAABAAEAAAAAAAMAAAABAAEAAAA=") -[node name="PressurePlate" parent="." index="7" instance=ExtResource("2_wmdce")] -position = Vector2(-205, 112) - -[node name="Laser" parent="." index="8" instance=ExtResource("3_nvnxj")] -position = Vector2(-239, 79) - -[node name="Goal" parent="." index="9" instance=ExtResource("4_djcls")] +[node name="Goal" parent="." index="7" instance=ExtResource("4_djcls")] position = Vector2(-274, 114) - -[node name="Laser2" parent="." index="10" instance=ExtResource("3_nvnxj")] -position = Vector2(-111, 79) - -[node name="PressurePlate2" parent="." index="11" instance=ExtResource("2_wmdce")] -position = Vector2(237, 112) -laser_path = NodePath("../Laser2") - -[node name="BoxPushable1" parent="." index="12" instance=ExtResource("5_j3ms1")] -position = Vector2(50, 94) -collision_mask = 21 - -[node name="AnimatableBody2D" parent="." index="13" instance=ExtResource("6_6wljf")] -position = Vector2(-125, -9) diff --git a/gmtk_2024/menu/level_menu/level_select.tscn b/gmtk_2024/menu/level_menu/level_select.tscn index 96141c2..cb8d0c8 100644 --- a/gmtk_2024/menu/level_menu/level_select.tscn +++ b/gmtk_2024/menu/level_menu/level_select.tscn @@ -90,22 +90,4 @@ disabled = false level_num = 3 locked = false -[node name="LevelButton4" parent="Background/ClipControl/GridContainer" instance=ExtResource("4_0d7hu")] -layout_mode = 2 -disabled = false -level_num = 4 -locked = false - -[node name="LevelButton5" parent="Background/ClipControl/GridContainer" instance=ExtResource("4_0d7hu")] -layout_mode = 2 -disabled = false -level_num = 5 -locked = false - -[node name="LevelButton6" parent="Background/ClipControl/GridContainer" instance=ExtResource("4_0d7hu")] -layout_mode = 2 -disabled = false -level_num = 6 -locked = false - [connection signal="pressed" from="Background/QuitButton" to="." method="_on_quit_button_pressed"] From 8da6de78e88b140232e741c77412c7d11c84bf47 Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Mon, 19 Aug 2024 19:57:42 +0200 Subject: [PATCH 5/5] a --- .../levels/Level_3_Rooms/level_3_room_3.tscn | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn index bea2ba5..567262e 100644 --- a/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_3.tscn @@ -1,15 +1,22 @@ -[gd_scene load_steps=3 format=4 uid="uid://dncy4ik2v5axn"] +[gd_scene load_steps=4 format=4 uid="uid://dncy4ik2v5axn"] [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_d4hqf"] +[ext_resource type="PackedScene" uid="uid://vtwswrkfkgas" path="res://objects/EnemyMover.tscn" id="3_4yoc7"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_djcls"] [node name="LevelBase" instance=ExtResource("1_d4hqf")] [node name="Player" parent="." index="0"] -position = Vector2(-259, -107) +position = Vector2(-278, 79) [node name="Layer0" parent="." index="5"] -tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAACAAEAAAD2/wQAAAADAAIAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAAAAEAAAAJAP//AAAAAAEAAAAJAAAAAAAAAAEAAAAJAAEAAAAAAAEAAAAJAAIAAAAAAAEAAAAJAAMAAAAAAAEAAAAJAAQAAAAFAAIAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAAAAAD4/wQAAAABAAAAAAD5/wQAAAABAAAAAAD6/wQAAAAFAAIAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAADAAIAAAACAAQAAAABAAAAAAADAAQAAAABAAAAAAAEAAQAAAABAAAAAAAFAAQAAAABAAAAAAAGAAQAAAABAAAAAAAHAAQAAAABAAAAAAAIAAQAAAABAAAAAAD3/wEAAAABAAEAAAD4/wEAAAABAAEAAAD5/wEAAAABAAEAAAD6/wEAAAABAAEAAAD7/wEAAAABAAEAAAD8/wEAAAABAAEAAAACAP//AAABAAEAAAADAP//AAABAAEAAAAEAP//AAABAAEAAAAFAP//AAABAAEAAAABAP//AAABAAEAAAAAAP//AAABAAEAAAAAAAAAAAABAAEAAAAAAAEAAAABAAEAAAAAAAIAAAABAAEAAAAAAAMAAAABAAEAAAA=") +tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAEAAAD2//7/AAACAAEAAAD2////AAACAAEAAAD2/wAAAAACAAEAAAD2/wEAAAACAAEAAAD2/wIAAAACAAEAAAD2/wMAAAADAAIAAAD2/wQAAAABAAEAAAAJAPv/AAAFAAAAAAAJAPz/AAAAAAEAAAAJAP3/AAAAAAEAAAAJAP7/AAAFAAIAAAAJAP//AAABAAEAAAAJAAAAAAABAAEAAAAJAAEAAAABAAEAAAAJAAIAAAABAAEAAAAJAAMAAAABAAEAAAAJAAQAAAABAAEAAAD3//v/AAABAAIAAAD4//v/AAABAAIAAAD5//v/AAABAAIAAAD6//v/AAABAAIAAAD7//v/AAABAAIAAAD8//v/AAABAAIAAAD9//v/AAABAAIAAAD+//v/AAABAAIAAAD///v/AAABAAIAAAAAAPv/AAABAAIAAAABAPv/AAABAAIAAAACAPv/AAABAAIAAAADAPv/AAABAAIAAAAEAPv/AAABAAIAAAAFAPv/AAABAAIAAAAGAPv/AAABAAIAAAAHAPv/AAABAAIAAAAIAPv/AAABAAIAAAD3/wQAAAABAAEAAAD4/wQAAAABAAEAAAD5/wQAAAABAAEAAAD6/wQAAAABAAEAAAD7/wQAAAABAAEAAAD8/wQAAAABAAEAAAD9/wQAAAABAAEAAAD+/wQAAAABAAEAAAD//wQAAAABAAEAAAAAAAQAAAABAAEAAAABAAQAAAABAAEAAAACAAQAAAABAAEAAAADAAQAAAABAAEAAAAEAAQAAAABAAEAAAAFAAQAAAABAAEAAAAGAAQAAAABAAEAAAAHAAQAAAABAAEAAAAIAAQAAAABAAEAAAD3/wMAAAABAAAAAAD4/wMAAAAFAAIAAAD4/wIAAAAAAAAAAAD5/wMAAAABAAEAAAD5/wIAAAABAAEAAAD5/wEAAAAAAAAAAAD6/wIAAAABAAEAAAD6/wMAAAABAAEAAAD6/wEAAAABAAAAAAD7/wEAAAAFAAIAAAD7/wIAAAABAAEAAAD7/wMAAAABAAEAAAD8/wMAAAABAAEAAAD8/wIAAAABAAEAAAD8/wEAAAABAAEAAAD8/wAAAAABAAAAAAD7/wAAAAAAAAAAAAD9/wEAAAABAAEAAAD9/wIAAAABAAEAAAD9/wMAAAABAAEAAAD+/wEAAAABAAEAAAD+/wAAAAABAAEAAAD9/wAAAAAFAAIAAAD9////AAAAAAAAAAD+////AAABAAAAAAD+/wIAAAABAAEAAAD+/wMAAAABAAEAAAD//wMAAAABAAEAAAD//wIAAAABAAEAAAD//wEAAAABAAEAAAD//wAAAAABAAEAAAD/////AAAFAAIAAAAAAP7/AAABAAAAAAAAAP//AAABAAEAAAAAAAAAAAABAAEAAAAAAAEAAAABAAEAAAAAAAIAAAABAAEAAAAAAAMAAAABAAEAAAABAAMAAAABAAEAAAABAP7/AAABAAAAAAACAP7/AAABAAAAAAADAP7/AAABAAAAAAAEAP7/AAABAAAAAAAFAP7/AAABAAAAAAAGAP7/AAABAAAAAAAHAP7/AAABAAAAAAAIAP7/AAABAAAAAAAIAP//AAABAAEAAAAHAP//AAABAAEAAAAGAP//AAABAAEAAAAFAP//AAABAAEAAAAEAP//AAABAAEAAAADAP//AAABAAEAAAACAP//AAABAAEAAAABAP//AAABAAEAAAABAAAAAAABAAEAAAACAAAAAAABAAEAAAADAAAAAAABAAEAAAAEAAAAAAABAAEAAAAFAAAAAAABAAEAAAAGAAAAAAABAAEAAAAHAAAAAAABAAEAAAAGAAEAAAABAAEAAAAFAAIAAAABAAEAAAAEAAIAAAABAAEAAAADAAIAAAABAAEAAAACAAIAAAABAAEAAAAGAAIAAAABAAEAAAAHAAIAAAABAAEAAAAIAAEAAAABAAEAAAAHAAEAAAABAAEAAAAFAAEAAAABAAEAAAAEAAEAAAABAAEAAAADAAEAAAABAAEAAAACAAEAAAABAAEAAAABAAEAAAABAAEAAAABAAIAAAABAAEAAAAGAAMAAAABAAEAAAAFAAMAAAABAAEAAAAEAAMAAAABAAEAAAAHAAMAAAABAAEAAAAIAAIAAAABAAEAAAAIAAAAAAABAAEAAAADAAMAAAABAAEAAAACAAMAAAABAAEAAAAIAAMAAAABAAEAAAD///7/AAAAAAAAAAA=") [node name="Goal" parent="." index="7" instance=ExtResource("4_djcls")] -position = Vector2(-274, 114) +position = Vector2(267, -103) + +[node name="EnemyMover" parent="." index="8" instance=ExtResource("3_4yoc7")] +position = Vector2(36, -84) + +[node name="EnemyMover2" parent="." index="9" instance=ExtResource("3_4yoc7")] +position = Vector2(-58, -52)