From ea11e29ce32729124864cb03dd2a9880a0575443 Mon Sep 17 00:00:00 2001 From: Victor Turgeon Date: Sun, 15 Jan 2023 12:27:19 -0500 Subject: [PATCH] ZE PEWPENING --- Levels/level.tscn | 2 +- PickableItems/basic_item.tscn | 2 +- PickableItems/pickable_shoes.tscn | 4 +- Projectiles/basic_projectile.gd | 18 ++++++-- Projectiles/basic_projectile.tscn | 70 +++++++++++++++++++++++++++--- Projectiles/sand.tscn | 68 +++++++++++++++++++++++++++-- Projectiles/shirt_projectile.tscn | 38 ++++++++++++++++ Sprites/ShirtGUn.png | Bin 0 -> 774 bytes Sprites/ShirtGUn.png.import | 34 +++++++++++++++ Sprites/bullet_Shirt_1.png | Bin 0 -> 550 bytes Sprites/bullet_Shirt_1.png.import | 34 +++++++++++++++ Sprites/bullet_Shirt_2.png | Bin 0 -> 656 bytes Sprites/bullet_Shirt_2.png.import | 34 +++++++++++++++ Sprites/bullet_Shirt_3.png | Bin 0 -> 559 bytes Sprites/bullet_Shirt_3.png.import | 34 +++++++++++++++ Sprites/sablier.png | Bin 0 -> 692 bytes Sprites/sablier.png.import | 34 +++++++++++++++ Sprites/sand_sprite.png | Bin 0 -> 2008 bytes Sprites/sand_sprite.png.import | 34 +++++++++++++++ Sprites/smolshirt.png | Bin 0 -> 1866 bytes Sprites/smolshirt.png.import | 34 +++++++++++++++ TileSets/tiles.tres | 2 +- Weapons/hourglass.tscn | 11 ++--- Weapons/t_shirt_cannon.tscn | 14 +++--- test_level001.tscn | 2 +- 25 files changed, 441 insertions(+), 28 deletions(-) create mode 100644 Projectiles/shirt_projectile.tscn create mode 100644 Sprites/ShirtGUn.png create mode 100644 Sprites/ShirtGUn.png.import create mode 100644 Sprites/bullet_Shirt_1.png create mode 100644 Sprites/bullet_Shirt_1.png.import create mode 100644 Sprites/bullet_Shirt_2.png create mode 100644 Sprites/bullet_Shirt_2.png.import create mode 100644 Sprites/bullet_Shirt_3.png create mode 100644 Sprites/bullet_Shirt_3.png.import create mode 100644 Sprites/sablier.png create mode 100644 Sprites/sablier.png.import create mode 100644 Sprites/sand_sprite.png create mode 100644 Sprites/sand_sprite.png.import create mode 100644 Sprites/smolshirt.png create mode 100644 Sprites/smolshirt.png.import diff --git a/Levels/level.tscn b/Levels/level.tscn index bd8896a..5098138 100644 --- a/Levels/level.tscn +++ b/Levels/level.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://b8rvp5g0vj8q1"] -[ext_resource type="TileSet" uid="uid://go8leybejifd" path="res://TileSets/tiles.tres" id="1_8igly"] +[ext_resource type="TileSet" uid="uid://bi3tupdxmgcim" path="res://TileSets/tiles.tres" id="1_8igly"] [ext_resource type="PackedScene" uid="uid://xev8p1td1icx" path="res://Player/player.tscn" id="2_raadk"] [node name="Level" type="Node2D"] diff --git a/PickableItems/basic_item.tscn b/PickableItems/basic_item.tscn index 677f8b9..4c183ed 100644 --- a/PickableItems/basic_item.tscn +++ b/PickableItems/basic_item.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://PickableItems/basic_item.gd" id="1_txlye"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_0nj5p"] -size = Vector2(29, 50) +size = Vector2(20, 17) [node name="basic_item" type="Area2D"] script = ExtResource("1_txlye") diff --git a/PickableItems/pickable_shoes.tscn b/PickableItems/pickable_shoes.tscn index 9ae99ab..ea8ee44 100644 --- a/PickableItems/pickable_shoes.tscn +++ b/PickableItems/pickable_shoes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3] +[gd_scene load_steps=4 format=3 uid="uid://degce2jvx3sli"] [ext_resource type="PackedScene" uid="uid://ci6xls3xseci2" path="res://PickableItems/basic_item.tscn" id="1_c3jw1"] [ext_resource type="PackedScene" uid="uid://bc4mkctxjnugk" path="res://Weapons/hourglass.tscn" id="2_f6mwn"] @@ -9,7 +9,7 @@ Type = "weapon" Item = ExtResource("2_f6mwn") [node name="CollisionShape2D" parent="." index="0"] -position = Vector2(-0.5, -1) +position = Vector2(-1, -0.5) [node name="Sprite2D" parent="." index="1"] position = Vector2(18, 22) diff --git a/Projectiles/basic_projectile.gd b/Projectiles/basic_projectile.gd index cd5d6f4..a5044de 100644 --- a/Projectiles/basic_projectile.gd +++ b/Projectiles/basic_projectile.gd @@ -5,11 +5,22 @@ extends Area2D @export var LIFETIME = 1.0; @export var HANG_TIME = 0.0; @export var FRICTION = 0.0; +@export var SIZE_MOD = 0.0; +@onready var sprite = $Sprite2D; + +var rng = RandomNumberGenerator.new(); var is_hanging = false; var velocity = Vector2.ZERO; var time = 0.0; +func _ready(): + var size_mod = rng.randf() * SIZE_MOD; + sprite.scale.x -= size_mod; + sprite.scale.y -= size_mod; + + + func _process(delta): if is_hanging : @@ -37,7 +48,8 @@ func end_of_life(): is_hanging = true; func explode(): + velocity = Vector2.ZERO; + sprite.play("explosion"); + +func _on_sprite_2d_animation_finished(): queue_free(); - - - diff --git a/Projectiles/basic_projectile.tscn b/Projectiles/basic_projectile.tscn index 4c06d0f..51b2b2d 100644 --- a/Projectiles/basic_projectile.tscn +++ b/Projectiles/basic_projectile.tscn @@ -1,7 +1,64 @@ -[gd_scene load_steps=4 format=3 uid="uid://cpo8qy3y0fuui"] +[gd_scene load_steps=12 format=3 uid="uid://cpo8qy3y0fuui"] [ext_resource type="Script" path="res://Projectiles/basic_projectile.gd" id="1_l2kyf"] -[ext_resource type="Texture2D" uid="uid://gqotbni355f" path="res://Sprites/placeholder_projectile.png" id="1_o7jy1"] +[ext_resource type="Texture2D" uid="uid://2xd84hbj47vd" path="res://Sprites/sand_sprite.png" id="2_1c2lh"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_oqhi1"] +atlas = ExtResource("2_1c2lh") +region = Rect2(0, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hwcsx"] +atlas = ExtResource("2_1c2lh") +region = Rect2(64, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2kbmk"] +atlas = ExtResource("2_1c2lh") +region = Rect2(128, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_p1d4t"] +atlas = ExtResource("2_1c2lh") +region = Rect2(192, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_os7n2"] +atlas = ExtResource("2_1c2lh") +region = Rect2(256, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ppc06"] +atlas = ExtResource("2_1c2lh") +region = Rect2(320, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7gy0c"] +atlas = ExtResource("2_1c2lh") +region = Rect2(384, 0, 64, 64) + +[sub_resource type="SpriteFrames" id="SpriteFrames_5b7u4"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_oqhi1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_hwcsx") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2kbmk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_p1d4t") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_os7n2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ppc06") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7gy0c") +}], +"loop": true, +"name": &"explosion", +"speed": 60.0 +}] [sub_resource type="RectangleShape2D" id="RectangleShape2D_pp7ve"] size = Vector2(4, 4) @@ -9,11 +66,14 @@ size = Vector2(4, 4) [node name="basic_projectile" type="Area2D"] script = ExtResource("1_l2kyf") -[node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(10, 10) -texture = ExtResource("1_o7jy1") +[node name="Sprite2D" type="AnimatedSprite2D" parent="."] +position = Vector2(12, 11) +scale = Vector2(0.531558, 0.531558) +frames = SubResource("SpriteFrames_5b7u4") +animation = &"explosion" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("RectangleShape2D_pp7ve") [connection signal="body_entered" from="." to="." method="_on_body_entered"] +[connection signal="animation_finished" from="Sprite2D" to="." method="_on_sprite_2d_animation_finished"] diff --git a/Projectiles/sand.tscn b/Projectiles/sand.tscn index 00cefee..0d00132 100644 --- a/Projectiles/sand.tscn +++ b/Projectiles/sand.tscn @@ -1,13 +1,75 @@ -[gd_scene load_steps=2 format=3 uid="uid://bedh0enwukdbf"] +[gd_scene load_steps=11 format=3 uid="uid://bedh0enwukdbf"] [ext_resource type="PackedScene" uid="uid://cpo8qy3y0fuui" path="res://Projectiles/basic_projectile.tscn" id="1_mqpki"] +[ext_resource type="Texture2D" uid="uid://2xd84hbj47vd" path="res://Sprites/sand_sprite.png" id="2_gbmp0"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_hmv27"] +atlas = ExtResource("2_gbmp0") +region = Rect2(0, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3crfb"] +atlas = ExtResource("2_gbmp0") +region = Rect2(64, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jn4yo"] +atlas = ExtResource("2_gbmp0") +region = Rect2(128, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_besyq"] +atlas = ExtResource("2_gbmp0") +region = Rect2(192, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gefy0"] +atlas = ExtResource("2_gbmp0") +region = Rect2(256, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_x03j6"] +atlas = ExtResource("2_gbmp0") +region = Rect2(320, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qh7me"] +atlas = ExtResource("2_gbmp0") +region = Rect2(384, 0, 64, 64) + +[sub_resource type="SpriteFrames" id="SpriteFrames_frbfh"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_hmv27") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3crfb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jn4yo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_besyq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gefy0") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_x03j6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qh7me") +}], +"loop": true, +"name": &"explosion", +"speed": 24.0 +}] [node name="basic_projectile" instance=ExtResource("1_mqpki")] -DAMAGE = 1 +DAMAGE = 2 SPEED = 1000 LIFETIME = 0.1 HANG_TIME = 0.3 FRICTION = 0.92 +SIZE_MOD = 0.15 [node name="Sprite2D" parent="." index="0"] -scale = Vector2(2.43502, 2.43502) +position = Vector2(-14, -13) +rotation = -3.14159 +scale = Vector2(0.612389, 0.612389) +frames = SubResource("SpriteFrames_frbfh") diff --git a/Projectiles/shirt_projectile.tscn b/Projectiles/shirt_projectile.tscn new file mode 100644 index 0000000..3e3dae2 --- /dev/null +++ b/Projectiles/shirt_projectile.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=7 format=3 uid="uid://chf2kww8i3xsd"] + +[ext_resource type="PackedScene" uid="uid://cpo8qy3y0fuui" path="res://Projectiles/basic_projectile.tscn" id="1_g01wn"] +[ext_resource type="Texture2D" uid="uid://cdrdrffc2b8al" path="res://Sprites/bullet_Shirt_1.png" id="2_quwts"] +[ext_resource type="Texture2D" uid="uid://ded2ewso7kejt" path="res://Sprites/bullet_Shirt_2.png" id="3_wboqr"] +[ext_resource type="Texture2D" uid="uid://c378cpgsik5a1" path="res://Sprites/bullet_Shirt_3.png" id="4_rm1tq"] +[ext_resource type="Texture2D" uid="uid://bnbsl6mg0b8oc" path="res://Sprites/smolshirt.png" id="5_3gdki"] + +[sub_resource type="SpriteFrames" id="SpriteFrames_se0yf"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("2_quwts") +}, { +"duration": 1.0, +"texture": ExtResource("4_rm1tq") +}, { +"duration": 1.0, +"texture": ExtResource("3_wboqr") +}, { +"duration": 2.0, +"texture": ExtResource("5_3gdki") +}], +"loop": true, +"name": &"explosion", +"speed": 5.0 +}] + +[node name="basic_projectile" instance=ExtResource("1_g01wn")] +DAMAGE = 34 + +[node name="Sprite2D" parent="." index="0"] +position = Vector2(47, 51) +scale = Vector2(2, 2) +frames = SubResource("SpriteFrames_se0yf") + +[node name="CollisionShape2D" parent="." index="1"] +position = Vector2(1, 0) diff --git a/Sprites/ShirtGUn.png b/Sprites/ShirtGUn.png new file mode 100644 index 0000000000000000000000000000000000000000..fa6dfe66b61fdbe1e364752c122cc8468bc8b25e GIT binary patch literal 774 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U|Qzs;uum9 z_jcMwZ|Opjz0LvO*@MLqNrQ`i_!!_s+12zm5+uUmdex*^Z?FR&yq`@HOhm zsx~`2WExGmqm*R8ce81Rs=$gS=TpCDTCcl0>%ME;qs8yHtL*%9Z} z{fAggdy54i;s@}PdYj)Ibvxdc!%j~zXO0gRI%N>sUxqH^k z^UqDS4*5&!M2Id6$~wOC;jVRtVhlU;Wg}{nnd%-z%&KI!e*Rw3DBDT#b5h~w!)bdf zZ?(K!nc3l@EYN*)LD0&KwI&li8h)N(S#w?Tpvgpr6YpeJw^nlN#?}Pgum5UgzOMRu zT$Fv{|Act$S2s?ZtpEMkfnjTuZ>{_`-bWuTrkqaQ#UfI^yMbRvhJ$hLKkx@)#41NUqWS1%@xhnq5VITI3v7kYRy zD8`7bRb|x4Q4-PQRA@Q9XsZgDmVDape;~hH^^>D}qeL$-`SPVkc&7RKGH3zW96$^L Rmx3pQC{I^Emvv4FO#nOdMKb^Z literal 0 HcmV?d00001 diff --git a/Sprites/ShirtGUn.png.import b/Sprites/ShirtGUn.png.import new file mode 100644 index 0000000..250d4e0 --- /dev/null +++ b/Sprites/ShirtGUn.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dmst0pqka10fq" +path="res://.godot/imported/ShirtGUn.png-60f4f5c4b1b5e41c310cb1c6771c3422.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/ShirtGUn.png" +dest_files=["res://.godot/imported/ShirtGUn.png-60f4f5c4b1b5e41c310cb1c6771c3422.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/bullet_Shirt_1.png b/Sprites/bullet_Shirt_1.png new file mode 100644 index 0000000000000000000000000000000000000000..becec43602569775271b0244151144f248597869 GIT binary patch literal 550 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zk9oQ{hE&A8 zovP@~5-8I8UTn3J@R0=_%Ung~(8t&KmUX=8|=SzPF(Ezo4=oL>qT$g zx_9lh;CCCox$|+QUAF!nctE>7;^w}S>c`u2HD+$mIlacVJXJmZ__d!E8&kGKc5V8y zIs5wDy^nr>OPVX^WO?A?&+LgCmcMsqXUIQaZf3eUhWUd*L0Db+>_cTsvKVSA;u#M- ze4M6Rd!L(aNoLfa>$!<$3t0rt?cm=(aZXfm&V?$*57r0j%NY(%d%^Ih^xt9C2v&i! zf(6X0UY5rMm* zoSUwnX86W(@n0%~*Mz-sY#Y=&zUeauG`;z1)L`qlrCzc@C}sV0#y6ac{+=e+=z7LT q_t}oyzh}k+qn9r=!ZXd+mq822<^W<4xD-4YM0vXUxvXU^4J@aSW-5 zdpk|vgSk-T`2DV=O9cldO}Lx|_AE1NRy(cJ)Fk23o+!cMTYRuFQ6l9*69?C{NFJrM zT)z!E83Mdn5i>kD%-JLVr*HS|o!=hpdlS2}_wT!pe?R~Ho2U8ellIl8|1`}S_C8MU zZ(e!*^_C|x7k&L(XUX$Uz8YF;_~lI2!;@=dJ--KDJAL`aFVm0}iW}!W-+A=aX=drF z-+vbFyf2g5_Iu@@P$NbQXG!5ho{4vC#7)lMw`{n3JazNAb)Hs<3mJA)nw=AuzBk_@ z+gRT8$l2)6z2Eb#^7FQ_PJJTqhhc}W*Fm2UPo>}GFZVd1@*zKyN?&$qYlZPa(A zP7-s|V7P5_e`oD6%L-TK7gzq(r@Jj;-mvKAo})KQV~Zu+I5}oLzyIbQf7^^N-y&E0 zANX^t)$;7kJ*G#VUG~%W?aOQF+P%mA%Xi!Q4!KF+4!Brw+}_6U{^^~!TMR9XcRSo% zS);S{X;f#$TGRduWpgIpC^x%&A#2~PuTvk%=C0rJ;z7xQ{j;xStIi0IU0%%o%D?*v z<0?jvC0!=LoDNyuPOF6!CTd;sQDs=E%emI8!DW?)@l=K-+f=q_F$%3zIvc_?;nt)J yt61o%;kEph^j(f~pVa&TCM3Sp2+uTMUj{88n*)eJ;8O5p5asFW=d#Wzp$P!0&mp1! literal 0 HcmV?d00001 diff --git a/Sprites/bullet_Shirt_2.png.import b/Sprites/bullet_Shirt_2.png.import new file mode 100644 index 0000000..71b98ef --- /dev/null +++ b/Sprites/bullet_Shirt_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ded2ewso7kejt" +path="res://.godot/imported/bullet_Shirt_2.png-bf0dd142b145fae231a410d7b84c40cc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/bullet_Shirt_2.png" +dest_files=["res://.godot/imported/bullet_Shirt_2.png-bf0dd142b145fae231a410d7b84c40cc.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/bullet_Shirt_3.png b/Sprites/bullet_Shirt_3.png new file mode 100644 index 0000000000000000000000000000000000000000..ff9fe25e880e11cfc540c5155c8dbab2b334a4f4 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z&wIK!hE&A8 zowi@!IZ)>4epz20S%Jij89_p^0&9ehB&Z!q5a5SFbS`G)E=ua=Y7 zIu|yd{qdxF_H`TkRVQy&RlU2kZ%k&Fd4>7VDn& z?#zv&=N#_NbZd$-K6CnIO3LD?8s^{K85`FBd9YM=-~0CeJO=w1KWwwTQT5wRwUVj9 z-ijrPL9R~YcG_|F+hGwJ?SE$Xe|~uVs(&6c`;+$)+guD3^6dB|SIf13d9Kp1_RY?< zclmCAInrTkQ*ZJmjDz7=`scv>{~;VRL-vX_?A>S`tyvPOH+}P^+v$&)KU^?AeLXPf z>&`Eou~WnAa~ZcaZ>Zw1V&H$i_SY+I-Kb@|w^lvcJm;7F`WN==58mB;U8C}maZLHv zeZK#GuP7ANnr{Db(XUm`RYD9cQkQ#p60(F(DlrRW`4}5Dtn^js=5bhIc=iOtGP8*~ zMhpv&nJ6>QxaG3x1Z@@jT$cX8x?ix;(N@$+1{lwLsS%!OzP=1vKsE;ugTSTW$so$p L)z4*}Q$iB}8~5qR literal 0 HcmV?d00001 diff --git a/Sprites/bullet_Shirt_3.png.import b/Sprites/bullet_Shirt_3.png.import new file mode 100644 index 0000000..db0e5b4 --- /dev/null +++ b/Sprites/bullet_Shirt_3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c378cpgsik5a1" +path="res://.godot/imported/bullet_Shirt_3.png-47f5b8dfb0e912e5458b2eb05f01f306.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/bullet_Shirt_3.png" +dest_files=["res://.godot/imported/bullet_Shirt_3.png-47f5b8dfb0e912e5458b2eb05f01f306.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/sablier.png b/Sprites/sablier.png new file mode 100644 index 0000000000000000000000000000000000000000..b52be7a4f8c3f0c5d241558af05d036d9d2585b5 GIT binary patch literal 692 zcmV;l0!#ggP)t z1mN{-Q>6L=pr(8QBr^eYP~0A@H*~SP)ewBWlub0@XJP-LB5%qB6%haxGV(2>L?>gX zw`pvH09d^K{QkAj`NLa7`gvcO`i>evUl1~YlmLAG{B}w#01kueLt;M>M$=KK;3u}04N9$0A?HlV5EOk0N7bjn(H#pjJ`Yo+Fa5A zCrkj}Aa13$(ZZ9HJjD00=?L1i>NtQ35bRpa3|Uj}`z40R!M+K576c1PH*> z{BQs~%1(_rJ%qrV?}r*2uY;?-HB(KFJxFbohCj|UJOkj!~)<%yuLK1AV>k=W!?lqMxQE=!S`eU zk^tD4Hx)=R2pK?%0Jsoh2QZC|lEeU7Th-xKS!_GI%~n~)R`~G$3z#-bj|?FAX6Z?9 zm!JHB38y17KF4N~I5U(1qy#`s{NQA6xh35G0XIt4F?-4f#{d8T4rN$LW=%~1DgXcg a2mk;800000(o>TF0000-p&90eBSr>{NCqzzR&afKA+$7F#LSnRJZ7E0RTW1 z?~V%q02mvRF-n`E?~PAo|A7`*On@5}sOiw30szGec${isVr6$eR^9dMy#q#C(KWBny>MhFW(ebHMyv~JWRp{$6C+Y zo=-EM^cwLR{Q#BvlDT2jEI3Tiv&|c(rY8ln_}y zbWA#YQrzzvoV@k}ji*-4*WNgkyR@R$qY;SKLcu;DHOk%Dvrlz@j6Z3!_H}QFN9hD# zbo=;QL~EZnt@+VaL1_%t$CgFB%Td?& zTo{r#tNO*)9utO0l2qot35=XZg%wm5K@^uUk*<7QPq*EhY_vA|NO9f$Or$eE+D+`V zX7$}uox{7f%>VFASmAvsY&0xLGn+d<86nVy(xTYR3G11yAuWSZg{PSv+G?W3yv6-z zBVwZrtrKc=^N1RG_Qq)h3L#xAKsOd_ZoI6j`e^ENdz1GrwL%A5|z;tp)m>a7RB zMONAJ+GN#J;-EWcJTvBbZD%^IFOD)KO*U?nrRGbg5Oa=5PiR*b)RAf2MPIzSW>WVr zqTU#?R{=xiiSciIBX%24_`)jjPZlq>*=dF~3=V|6us#1*uJHd*Sfj@4eJN4!5y@x0 zp2ihEez3%GkSq1J`dVt}$w>ptj2cI&p)re+p||h&`Azm{qtIDWTU-?VyWoLNF5k&be=QyIrmY zt#HbH^_Hd_l@H9+8vd6@i8Tnym9`W2^9Xl**87WuenWKZ4x|YYBS9k}7cOgnMMOnt zmvgx-L-np_dD+cOTFz>wdM|DBIQcOMUsjG-R|-m6{Xur^aj*4$m-I_8$#c=bYY}pE-VH-^uw^*f|VvV@AieEUYH;Ts|y+;%p;;pme8-)n>F6G_9(Tw&M^qwSA>ZZj zXb00yPV9-^o;Ub7SsUqthpQZvIKkA~b8oXUd)u>iJTR@=C$&aIM_Vs`f6}1$&;n+5 zlf@1{O}@WCz}f9a>>ZhXuRUa6u(YCBFuq70Yq5+wh$X=FM^wyiu*SkKw^KAxus*Oe z6o~;~AlZB@A3V^&wnIcem(HrfKn)Z0-qj;E7st7hzEjV8R&A{Q5n|)K;kv=3k*}PZ z2v>M)#XokVmh%E^JQOnR3%9KT{u%ipPC=^Z72Gp3O84MbYVSSoJL;_I}^z0}hM~W47O^ zce|jL_>=P97tQJpy$tY+z{6B_L|d3q{Yv-M!`Z-EkZC&9G<%KMd~GK&-e=;9E1piR z$;Cn(YD83EM!QT9wWX>ab#hi$!3DXVD%a~;j^(cne0g^_=*6pt{+gt>^RosrqKT;3 zrLaL!Bu9#;{~BpJ&42>%l`eNs!37*0boZ6j=cEo zN-ua6Ng-f2lqQfm1qQAA-Ggk*H*9cdwiXF@18*Yl?ov1!Lo@d|RVs@O8bTAtwXf)Mn#^p>7z1C7Dc%Z+bj)cun%$qU7d^oIRV*F$Xyh_H_ozR%|poIL;hQ2S)%r*(qNwciz%GjdLT5A g)xuBU$==?886+z~uk88o^DWteKk9?4!ICch3-6Va+5i9m literal 0 HcmV?d00001 diff --git a/Sprites/sand_sprite.png.import b/Sprites/sand_sprite.png.import new file mode 100644 index 0000000..6540de1 --- /dev/null +++ b/Sprites/sand_sprite.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2xd84hbj47vd" +path="res://.godot/imported/sand_sprite.png-fde3a989e3bb623f8225339dea8009ed.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/sand_sprite.png" +dest_files=["res://.godot/imported/sand_sprite.png-fde3a989e3bb623f8225339dea8009ed.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/smolshirt.png b/Sprites/smolshirt.png new file mode 100644 index 0000000000000000000000000000000000000000..29da4e8b458c706306fa28d10d92d9a1ce93436b GIT binary patch literal 1866 zcmV-Q2etT#P)*0)`+y>=3(-b9X_rX`osBvo^5C;?GaRfq;fsw%+)52!Rxm5?d{ z4?GYg1VVrsQKUXJ;vrH>)ik6SasiUGk{dU+lX#uAv-YmnyE}WC>zP3_u|u6KyH1hp zH9J3Pw4>RX(f|A%`kkMF<^nK?0z)S-3>_5BfTAdf#SB8- zThY`1JZ=sB8CO3%@rEK7f4odOzA#Lc2iqb&Up}}0#W#0u?B9u|)^4zR787GvplK9X z-V3)s1hJGwDL;wU&VD?;`&H1a1KvOg!EkKv)XhsoC(7VzG{6__edhf313%c}TN8q+ zyD*i^VofN9O^-zo^gBT0Eb{3Qw1vCTyX`yZ=|2pj$uJB94yPARPctH&8}_CWpD40a zx&**jW^GHNVhYfV{7_117-|+0-HBpJhM}vU ze**|nz>pk-nQJ)p``4caaIt=5{|C0hwKXk~zT@GwUjoayEa3|_(KMhc5+)KNXo>-- z768RXE}Au=n7s>z4R=aH#k0ELduF1S5SkVOF{A!QEh z(%)<7;G8~`g%qUn9ArgDtbZ5p^>_wWOl1`wQWjY|@J4K4A7r_VJEMPvSegY*KWqR+ zv!GetI;hVXWLQx`qd6RdkePt25@?PHHa+>3@2`}|YCNdyt4CgXZ5z!xA!L(C+&B-9 zKV(Mreav)VI3I-UET+dl#q{`f$g&2Sao)d2*HpBx+m4CP&Ot6^!SgOSI8R$$D1LxN zMKHSliPwUmm?N8)kee9=&2n)0+N_2L)~M6a2#cE+euKT+?qXeE5`@UOa=jO+%sw=F{NrEY_$#A$;T!GfS}WnP7>6BOb3o}TE?#w^B@(mlE#{NRB!}S(gmLNYud~Dd zI`vH$M!as6&$B236j^*9!23ggf9qsEHvXa06AUkWXO8Cd2c3)6{kOV7vMnpr*)% zC(v$>w>IgF*rB{Q6v}{DPVY5Ku5FVRODzmC~OSsqlKe ziZ`j$2rV#_o*MdNe)jg!U~3Ny7~nV_G*w0_t>W0R9t49Ny1Lv*CM5`hhFtz$G%P?- zG{1aOz8KXEKp~s>C_fuN+7#-Ap=(g7R$Tl?0tfcD;jNQ#%K$KGI;ztnw}x}a(b zJcv26UY{G?J5FG5+u!$_B2BV(fK{moO(}zAd5EP9 z#L^r*E*`Tp6G)}f2zNdHJb?CkHlW%pVD|9`4PA%V&7)jM!5}L9O;MDEwAB-^4kv`U z1e~5Aq;ei5VFr_Nr7&vzE$?b+E`JZ-95NvFgG6G+3Aa2P{y{0HdjWqoV7?G4|Ot=tM>#JBj%4 zS==4}=XHkV*l6!FF*72}en2N0?u?w5lJP6I%!0_U4y!>j(`Z>0JtEa=wcq0p4Fy`) z`^}XgO*>G?O1*jG=(=F_xRgd4V_4nH!r*l;9OlQwXw0Wv9YnSv9YnS zv9YnSv9Ymfcp9FDr{QUM8lHxy;c0jpo`$F4X?OtO-vxNrot_pU(*OVf07*qoM6N<$ Ef=W_-{Qv*} literal 0 HcmV?d00001 diff --git a/Sprites/smolshirt.png.import b/Sprites/smolshirt.png.import new file mode 100644 index 0000000..2df5243 --- /dev/null +++ b/Sprites/smolshirt.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bnbsl6mg0b8oc" +path="res://.godot/imported/smolshirt.png-a800fccb0958b2f02103b97eabc4eebd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/smolshirt.png" +dest_files=["res://.godot/imported/smolshirt.png-a800fccb0958b2f02103b97eabc4eebd.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/TileSets/tiles.tres b/TileSets/tiles.tres index c0a0dad..3ff0324 100644 --- a/TileSets/tiles.tres +++ b/TileSets/tiles.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://go8leybejifd"] +[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://bi3tupdxmgcim"] [ext_resource type="Texture2D" uid="uid://d3y4rna66nylu" path="res://TileSets/Tiles Set GameJam.png" id="1_kka1l"] diff --git a/Weapons/hourglass.tscn b/Weapons/hourglass.tscn index 074f8cb..60b5766 100644 --- a/Weapons/hourglass.tscn +++ b/Weapons/hourglass.tscn @@ -1,21 +1,22 @@ [gd_scene load_steps=4 format=3 uid="uid://bc4mkctxjnugk"] [ext_resource type="PackedScene" uid="uid://cmtuq84761y0i" path="res://Weapons/basic_weapon.tscn" id="1_yfysf"] -[ext_resource type="Texture2D" uid="uid://dvwb4dx0p0ypw" path="res://Sprites/shoes.png" id="2_oyiyx"] [ext_resource type="PackedScene" uid="uid://bedh0enwukdbf" path="res://Projectiles/sand.tscn" id="2_qhdqv"] +[ext_resource type="Texture2D" uid="uid://byjdk7itcmvms" path="res://Sprites/sablier.png" id="3_w8m6s"] [node name="hourglass" instance=ExtResource("1_yfysf")] position = Vector2(65, -1) PROJECTILE = ExtResource("2_qhdqv") -PROJECTILE_AMOUNT = 200 +PROJECTILE_AMOUNT = 100 COOLDOWN = 1.0 SPREAD = 0.5 RANGE_MOD = 100 [node name="Sprite2D" parent="." index="0"] -position = Vector2(32, 38) -scale = Vector2(1.71875, 1.71875) -texture = ExtResource("2_oyiyx") +position = Vector2(5, 3.8147e-06) +rotation = 1.5708 +scale = Vector2(0.684518, 0.684518) +texture = ExtResource("3_w8m6s") [node name="RayCast2D" parent="." index="1"] position = Vector2(-14, 0) diff --git a/Weapons/t_shirt_cannon.tscn b/Weapons/t_shirt_cannon.tscn index b4dccb4..396f410 100644 --- a/Weapons/t_shirt_cannon.tscn +++ b/Weapons/t_shirt_cannon.tscn @@ -1,18 +1,20 @@ -[gd_scene load_steps=3 format=3 uid="uid://clusfc1udsrt3"] +[gd_scene load_steps=4 format=3 uid="uid://clusfc1udsrt3"] [ext_resource type="PackedScene" uid="uid://cmtuq84761y0i" path="res://Weapons/basic_weapon.tscn" id="1_fyfpr"] -[ext_resource type="Texture2D" uid="uid://cjrh8t1n0m2e4" path="res://Sprites/t_shirt.png" id="2_xni8e"] +[ext_resource type="PackedScene" uid="uid://chf2kww8i3xsd" path="res://Projectiles/shirt_projectile.tscn" id="2_c33s8"] +[ext_resource type="Texture2D" uid="uid://dmst0pqka10fq" path="res://Sprites/ShirtGUn.png" id="2_gu2t5"] [node name="t_shirt_cannon" instance=ExtResource("1_fyfpr")] position = Vector2(65, 0) +PROJECTILE = ExtResource("2_c33s8") COOLDOWN = 0.8 SPREAD = 0.1 [node name="Sprite2D" parent="." index="0"] -position = Vector2(15, 2.38419e-07) -rotation = 1.64532 -scale = Vector2(0.929632, 0.929632) -texture = ExtResource("2_xni8e") +position = Vector2(0, -34) +rotation = 3.14434 +scale = Vector2(1.30878, 1.30878) +texture = ExtResource("2_gu2t5") [node name="RayCast2D" parent="." index="1"] position = Vector2(2, 0) diff --git a/test_level001.tscn b/test_level001.tscn index f38a41a..174934d 100644 --- a/test_level001.tscn +++ b/test_level001.tscn @@ -4,7 +4,7 @@ [ext_resource type="Texture2D" uid="uid://d3y4rna66nylu" path="res://TileSets/Tiles Set GameJam.png" id="2_xwre6"] [ext_resource type="PackedScene" uid="uid://c661br4lh30r8" path="res://Enemies/basic_enemy.tscn" id="3_e1d3p"] [ext_resource type="PackedScene" uid="uid://bbg5x0apue0ei" path="res://PickableItems/pickable_t_shirt.tscn" id="4_5egyc"] -[ext_resource type="PackedScene" path="res://PickableItems/pickable_shoes.tscn" id="5_4b36u"] +[ext_resource type="PackedScene" uid="uid://degce2jvx3sli" path="res://PickableItems/pickable_shoes.tscn" id="5_4b36u"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_aemot"] resource_name = "Test"