From 47016e76f8c63adb5652104382e7e9e6ce831997 Mon Sep 17 00:00:00 2001 From: Victor Turgeon Date: Sun, 15 Jan 2023 15:28:35 -0500 Subject: [PATCH] c sbgfnhjlkdfbnhjlksgfdnhjkbkjbmnhfdsajlkbmkdfsvjh --- GameJam-Vanier.csproj | 2 +- GameJam-Vanier.csproj.old.4 | 7 +++ Levels/level.gd | 8 +++ Levels/level.tscn | 108 +++++++++++++++++++++++++++++++++++- Sprites/Cloud_1.png | Bin 0 -> 1015 bytes Sprites/Cloud_1.png.import | 34 ++++++++++++ Sprites/Cloud_2.png | Bin 0 -> 833 bytes Sprites/Cloud_2.png.import | 34 ++++++++++++ YouWin.tscn | 5 +- start.tscn | 2 +- 10 files changed, 196 insertions(+), 4 deletions(-) create mode 100644 GameJam-Vanier.csproj.old.4 create mode 100644 Sprites/Cloud_1.png create mode 100644 Sprites/Cloud_1.png.import create mode 100644 Sprites/Cloud_2.png create mode 100644 Sprites/Cloud_2.png.import diff --git a/GameJam-Vanier.csproj b/GameJam-Vanier.csproj index 4210b40..2762b39 100644 --- a/GameJam-Vanier.csproj +++ b/GameJam-Vanier.csproj @@ -1,4 +1,4 @@ - + net6.0 true diff --git a/GameJam-Vanier.csproj.old.4 b/GameJam-Vanier.csproj.old.4 new file mode 100644 index 0000000..4210b40 --- /dev/null +++ b/GameJam-Vanier.csproj.old.4 @@ -0,0 +1,7 @@ + + + net6.0 + true + GameJamVanier + + \ No newline at end of file diff --git a/Levels/level.gd b/Levels/level.gd index d1b0322..ce73aee 100644 --- a/Levels/level.gd +++ b/Levels/level.gd @@ -49,3 +49,11 @@ func _on_gym_enemy_05_is_killed(): doors.remove_child($Doors/BackDoor_Left); doors.remove_child($Doors/BackDoor_Right); + + +func _on_area_2d_body_entered(body): + if body.name == "Player": + win(); + +func win(): + get_tree().change_scene_to_file("res://YouWin.tscn"); diff --git a/Levels/level.tscn b/Levels/level.tscn index c3f1e7f..ec0a945 100644 --- a/Levels/level.tscn +++ b/Levels/level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://b8rvp5g0vj8q1"] +[gd_scene load_steps=16 format=3 uid="uid://b8rvp5g0vj8q1"] [ext_resource type="TileSet" uid="uid://bi3tupdxmgcim" path="res://TileSets/tiles.tres" id="1_8igly"] [ext_resource type="Script" path="res://Levels/level.gd" id="1_x3isi"] @@ -10,6 +10,8 @@ [ext_resource type="PackedScene" uid="uid://degce2jvx3sli" path="res://PickableItems/pickable_shoes.tscn" id="8_qnb3g"] [ext_resource type="PackedScene" uid="uid://2wpk5ocpyhbm" path="res://PickableItems/pickable_pants.tscn" id="9_8e12f"] [ext_resource type="PackedScene" uid="uid://p7aa6t787b3d" path="res://Enemies/urinal_mimic.tscn" id="10_8g8ng"] +[ext_resource type="Texture2D" uid="uid://dxvv3luyq6b5k" path="res://Sprites/Cloud_1.png" id="11_uhf1x"] +[ext_resource type="Texture2D" uid="uid://ih7pprd7ko1t" path="res://Sprites/Cloud_2.png" id="12_fsk5q"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_8jn25"] size = Vector2(85, 5534.75) @@ -17,6 +19,9 @@ size = Vector2(85, 5534.75) [sub_resource type="RectangleShape2D" id="RectangleShape2D_5xvim"] size = Vector2(4186, 55) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_u153x"] +size = Vector2(1359, 228) + [node name="Level" type="Node2D"] script = ExtResource("1_x3isi") @@ -235,6 +240,106 @@ position = Vector2(3658, 4777) [node name="End_Enemy14" parent="." instance=ExtResource("7_qt4sv")] position = Vector2(3658, 4777) +[node name="Area2D" type="Area2D" parent="."] +position = Vector2(2631, 5269) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +position = Vector2(416.5, -22) +shape = SubResource("RectangleShape2D_u153x") + +[node name="Sprite2D" type="Sprite2D" parent="Area2D"] +position = Vector2(-83, 151) +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D2" type="Sprite2D" parent="Area2D"] +position = Vector2(169, 143) +rotation = -0.208843 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D3" type="Sprite2D" parent="Area2D"] +position = Vector2(42, 48) +rotation = 0.0879637 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D4" type="Sprite2D" parent="Area2D"] +position = Vector2(285, 44) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D5" type="Sprite2D" parent="Area2D"] +position = Vector2(532, 65) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D6" type="Sprite2D" parent="Area2D"] +position = Vector2(823, 62) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D7" type="Sprite2D" parent="Area2D"] +position = Vector2(990, 157) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D8" type="Sprite2D" parent="Area2D"] +position = Vector2(745, 168) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D9" type="Sprite2D" parent="Area2D"] +position = Vector2(529, 158) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D10" type="Sprite2D" parent="Area2D"] +position = Vector2(345, 155) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D11" type="Sprite2D" parent="Area2D"] +position = Vector2(-100, 42) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D12" type="Sprite2D" parent="Area2D"] +position = Vector2(402, -12) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D13" type="Sprite2D" parent="Area2D"] +position = Vector2(678, 12) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D14" type="Sprite2D" parent="Area2D"] +position = Vector2(964, 26) +rotation = 0.0481666 +scale = Vector2(6.09021, 6.09021) +texture = ExtResource("11_uhf1x") + +[node name="Sprite2D15" type="Sprite2D" parent="Area2D"] +position = Vector2(188, 25) +scale = Vector2(5.03591, 5.03591) +texture = ExtResource("12_fsk5q") + +[node name="Sprite2D16" type="Sprite2D" parent="Area2D"] +position = Vector2(291, 216) +scale = Vector2(5.03591, 5.03591) +texture = ExtResource("12_fsk5q") + [connection signal="is_killed" from="Outside_Enemy" to="." method="_on_outside_enemy_is_killed"] [connection signal="picked" from="pickable_t_shirt" to="." method="_on_pickable_t_shirt_picked"] [connection signal="picked" from="shoes" to="." method="_on_shoes_picked"] @@ -244,3 +349,4 @@ position = Vector2(3658, 4777) [connection signal="is_killed" from="Mimic_02" to="." method="_on_mimic_02_is_killed"] [connection signal="picked" from="pants" to="." method="_on_pants_picked"] [connection signal="is_killed" from="Gym_Enemy05" to="." method="_on_gym_enemy_05_is_killed"] +[connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"] diff --git a/Sprites/Cloud_1.png b/Sprites/Cloud_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a79a1af4b7cece6d40116c61b3f48b8a10549f GIT binary patch literal 1015 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z&zd4 z#WAEJ?ro%F-y;J7pL-1gLO&VURb1>2^zM<&t5Jxt_|WL$)M1_ya&PU4$BH}NS{Qt? znC`gncv)!p^xJCZ|NWTk-%`@6yYe#T*_>Y<(=2)~WODxNUF!^gCv6Pqj?g=K z{KG6eN4El|SG(T5`(AA}|Gem>w`JL9n0Rekb--;pEX+4a|3cihX(&beK`qk9p@relsvZ;B=TmU|%B{HD3VaFh9S zCeH1*b+u0y841;}ztfey^!$*s=lsXDvlv)6WzJ%Yd{B1m=tEg!{^R90-{q{j#ChPk zX6OeWMlK7Z?51UVBIm0#{;u`-X&-n{r7c5<;Y0Vb%n;$j&qX(U{&`0`asPeq$=ZF% zk_wW+5{oz1!lq1Z#rqkNP#t{qNL|KMvfx*)-}N%Zzr3 z&foUhy#g!=*|I?mM^a)v1GqR`8@l6p1UtS5G;)e*{kY8Haivw_dfdZyreklIl0_Vx zrGpxBbM6;A`#0D%`pYLoFL+zcl)w~oCfxkOs#SCNDr^}U&ffcXm*vGb(7`sx1^j(oO%74T@^q@LIA87VUSV*8@j zUP+h#VB%xu=^EIh%uvp6lj+E*7_wltbmL@$=ydZd+6IoxFMFoSJ>HR5FZ26&p+x)v z{s^vJ@-MiHN;CJq%S~OH-`P=H_OVIm(yM!xpPgA&Y<(Eivj2@iwn9@{YTB{sJjF5= zmd_PG_FOF2WH{dZNwPXI>$dUqJ;Fy?W=Kq0oY{IyFSFy<4>ijV+%{8e?0%n$lfUiO zaOA$zu|2;S3n$5Y)JZcco)qbw${}!3q%a`J;mAo*M{h2gaegyBvicivX}a9BboFyt=akR{03~(8ng9R* literal 0 HcmV?d00001 diff --git a/Sprites/Cloud_1.png.import b/Sprites/Cloud_1.png.import new file mode 100644 index 0000000..ccb0e3c --- /dev/null +++ b/Sprites/Cloud_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dxvv3luyq6b5k" +path="res://.godot/imported/Cloud_1.png-66834769288115d7dfe5ea40cf8e25d0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Cloud_1.png" +dest_files=["res://.godot/imported/Cloud_1.png-66834769288115d7dfe5ea40cf8e25d0.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/Cloud_2.png b/Sprites/Cloud_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a0e398e32175c45b4469214f33ab14a4b99d1f GIT binary patch literal 833 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&!1U15 z#WAEJ?rns3-ys7YU;f4kC#I>+{w7es)@K#d5PM_81147|nWl-(u{&pO@x5J`rgJ9E zZppdN)#uAD9jf`Ue8$ZG%PQZ^`|#(OWqAARYp=KdpT6~)RC3TGl^oOBlQK*OmAj&6 zG{g&g+qfP1T4maPc%jj;m}Sd1yy?_raR`btdp?JmRldJ{qs+BI5 zU&WLVBJSxRdV13w-Zw>+(wftSgE$zzmao75x?4>)t>b{>U%T7OHwalY?v+VmnG*1r z<6Dj0?6+mv-+u31e|6uJhK8jlAI}qb{j(-5vu6s!{U;fp7+#d^u8cYUxG>;=Vo}hP z_dQdVX_`%Dlw!U;UVk?~sYdG(rk!5#-p4K7VMV(Ie7lCgGi&Y62ZY~MaB zo~3MdHAXeyTIt&W(;t>5r`tU^{41_-u6#UkSI6&w7TX1THzaWCSe|KkI#ER?v*3)c zE@zQM(%Sk1p35E5|LLnTcphM5_iM;Ba&z(f>dbWO@w*64pSQ0}G%LzptaI?6a_!cX z$*)2z=6-$1wom*)*OggwyBhjDtrQJ@KGQoeujU2AkKL*av&F?ZAD-mTZ?c@+FZh7< zp!VBKk@H^l+}XB#N0QlLa|!!*thJm+rP4A!D;k~Xo?8FeZN>MgVzQ|#x%k&+OUb@D zUiMJ(mc94lpS+89Bxx|lobl>h%{O6@h`3)VgZSp4N2{2ZXdG<~mOXHE&6FLl7&N^K zABM0O7;3AovvTMPim|v#MJ=Bn%YNW})8ZA7YTz=Tfq{W9HNrE^*Ox(yfq{X80Rk=s QPX;kOUHx3vIVCg!015SYrvLx| literal 0 HcmV?d00001 diff --git a/Sprites/Cloud_2.png.import b/Sprites/Cloud_2.png.import new file mode 100644 index 0000000..52a2030 --- /dev/null +++ b/Sprites/Cloud_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ih7pprd7ko1t" +path="res://.godot/imported/Cloud_2.png-add8295ffc8b564aa710fe7cc03e8275.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Cloud_2.png" +dest_files=["res://.godot/imported/Cloud_2.png-add8295ffc8b564aa710fe7cc03e8275.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/YouWin.tscn b/YouWin.tscn index 492c298..e391e38 100644 --- a/YouWin.tscn +++ b/YouWin.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://cwrom0u0cj2yi"] +[gd_scene load_steps=3 format=3 uid="uid://cgwf23texn2ur"] [ext_resource type="Script" path="res://YouWin.gd" id="1_ui55j"] [ext_resource type="Texture2D" uid="uid://dboun0ofe7h6f" path="res://Images/WIN_screen.png" id="2_b03md"] @@ -8,9 +8,12 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("1_ui55j") [node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 0 offset_right = 1901.0 offset_bottom = 1146.0 color = Color(0, 0, 0, 1) diff --git a/start.tscn b/start.tscn index 1e5e8fe..de1faed 100644 --- a/start.tscn +++ b/start.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://d25c4ey6gvduc"] +[gd_scene load_steps=4 format=3 uid="uid://c58wsmkklb7wq"] [ext_resource type="Texture2D" uid="uid://cg848qjc4fxi" path="res://Images/Main_menu.png" id="1_65g7h"] [ext_resource type="Script" path="res://start.gd" id="1_exncb"]