From 10e5ee3ef6f1fff14ee7733ef3f4da40dc1b28c9 Mon Sep 17 00:00:00 2001 From: Just Dzhi Date: Mon, 2 Oct 2023 18:55:26 +0400 Subject: [PATCH 1/5] fix hearts & more sounds --- src/models/enemies/bat/Bat.tscn | 11 +++++++++-- src/models/enemies/bat/bat.gd | 1 + src/models/enemies/ghost/Ghost.tscn | 15 ++++++++++++++- src/models/enemies/ghost/ghost.gd | 2 +- src/models/enemies/rat/Rat.tscn | 6 +++++- src/scenes/game/Game.tscn | 19 ++++++++++--------- src/scenes/game/game.gd | 3 +-- src/scripts/enemy_class.gd | 1 + 8 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/models/enemies/bat/Bat.tscn b/src/models/enemies/bat/Bat.tscn index d742495..22968bf 100644 --- a/src/models/enemies/bat/Bat.tscn +++ b/src/models/enemies/bat/Bat.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://src/models/enemies/bat/sprites/bat_spriteframes.tres" type="SpriteFrames" id=1] [ext_resource path="res://src/models/enemies/bat/bat.gd" type="Script" id=2] [ext_resource path="res://src/models/shadow/shadow.png" type="Texture" id=3] +[ext_resource path="res://res/sounds/bat/damaged.ogg" type="AudioStream" id=4] +[ext_resource path="res://res/sounds/bat/screem.wav" type="AudioStream" id=5] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 3 ) @@ -20,7 +22,6 @@ script = ExtResource( 2 ) use_parent_material = true frames = ExtResource( 1 ) animation = "idle" -frame = 3 playing = true centered = false @@ -38,3 +39,9 @@ shape = SubResource( 2 ) position = Vector2( 11, 21 ) z_index = -1 texture = ExtResource( 3 ) + +[node name="AudioDamage" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) + +[node name="AudioScreem" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) diff --git a/src/models/enemies/bat/bat.gd b/src/models/enemies/bat/bat.gd index 50a5387..20097d2 100644 --- a/src/models/enemies/bat/bat.gd +++ b/src/models/enemies/bat/bat.gd @@ -57,3 +57,4 @@ func _shoot(): get_parent().add_child(sonic_wave) sonic_wave.global_position.x = self.global_position.x + 8 sonic_wave.global_position.y = self.global_position.y + 8 + $AudioScreem.play() diff --git a/src/models/enemies/ghost/Ghost.tscn b/src/models/enemies/ghost/Ghost.tscn index a763fe5..3145aff 100644 --- a/src/models/enemies/ghost/Ghost.tscn +++ b/src/models/enemies/ghost/Ghost.tscn @@ -1,8 +1,11 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://src/models/enemies/ghost/sprites/ghost_spriteframes.tres" type="SpriteFrames" id=1] [ext_resource path="res://src/models/enemies/ghost/ghost.gd" type="Script" id=2] [ext_resource path="res://src/models/enemies/ghost/sprites/aiming/aiming_spriteframes.tres" type="SpriteFrames" id=3] +[ext_resource path="res://res/sounds/ghost/damaged.wav" type="AudioStream" id=4] +[ext_resource path="res://res/sounds/ghost/dash_charge.wav" type="AudioStream" id=5] +[ext_resource path="res://res/sounds/ghost/dash.wav" type="AudioStream" id=6] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 7, 9 ) @@ -25,6 +28,7 @@ flip_h = true use_parent_material = true frames = ExtResource( 1 ) animation = "idle" +frame = 1 playing = true centered = false @@ -33,3 +37,12 @@ centered = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] position = Vector2( 8.5, 13.5 ) shape = SubResource( 1 ) + +[node name="AudioDamage" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) + +[node name="AudioDashCharge" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) + +[node name="AudioDash" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 6 ) diff --git a/src/models/enemies/ghost/ghost.gd b/src/models/enemies/ghost/ghost.gd index dcdd6d6..1c9d17d 100644 --- a/src/models/enemies/ghost/ghost.gd +++ b/src/models/enemies/ghost/ghost.gd @@ -34,8 +34,8 @@ func _physics_process(delta): global_position = global_position.move_toward(dash_target, 10) if global_position == dash_target: dashing = false + $AudioDash.play() afterdash = true - if afterdash: afterdash_timer += delta if afterdash_timer >= 1: diff --git a/src/models/enemies/rat/Rat.tscn b/src/models/enemies/rat/Rat.tscn index acae655..a08cff9 100644 --- a/src/models/enemies/rat/Rat.tscn +++ b/src/models/enemies/rat/Rat.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/models/enemies/rat/sprites/rat_spriteframes.tres" type="SpriteFrames" id=1] [ext_resource path="res://src/models/enemies/rat/rat.gd" type="Script" id=2] [ext_resource path="res://src/models/shadow/shadow.png" type="Texture" id=3] +[ext_resource path="res://res/sounds/rat/damaged.wav" type="AudioStream" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 3.5 ) @@ -29,3 +30,6 @@ shape = SubResource( 1 ) position = Vector2( 11, 9 ) z_index = -1 texture = ExtResource( 3 ) + +[node name="AudioDamage" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) diff --git a/src/scenes/game/Game.tscn b/src/scenes/game/Game.tscn index f22fac6..ef0fe04 100644 --- a/src/scenes/game/Game.tscn +++ b/src/scenes/game/Game.tscn @@ -27,14 +27,14 @@ extents = Vector2( 140, 10.125 ) atlas = ExtResource( 6 ) region = Rect2( 155, 0, 31, 11 ) -[sub_resource type="AtlasTexture" id=8] -atlas = ExtResource( 6 ) -region = Rect2( 124, 0, 31, 11 ) - [sub_resource type="AtlasTexture" id=9] atlas = ExtResource( 6 ) region = Rect2( 93, 0, 31, 11 ) +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 6 ) +region = Rect2( 124, 0, 31, 11 ) + [sub_resource type="AtlasTexture" id=10] atlas = ExtResource( 6 ) region = Rect2( 62, 0, 31, 11 ) @@ -49,10 +49,10 @@ region = Rect2( 0, 0, 31, 11 ) [sub_resource type="SpriteFrames" id=4] animations = [ { -"frames": [ SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ], -"loop": true, -"name": "default", -"speed": 5.0 +"frames": [ SubResource( 7 ), SubResource( 9 ), SubResource( 8 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ], +"loop": false, +"name": "idle", +"speed": 0.0 } ] [sub_resource type="Animation" id=5] @@ -209,7 +209,7 @@ margin_bottom = 40.0 [node name="HealthSprite" type="AnimatedSprite" parent="UIWrapper/UI/Left/Health"] position = Vector2( 52, 156 ) frames = SubResource( 4 ) -frame = 5 +animation = "idle" centered = false [node name="PlayerIcon" type="Sprite" parent="UIWrapper/UI/Left"] @@ -252,6 +252,7 @@ margin_right = 40.0 margin_bottom = 40.0 [node name="Cards" type="Control" parent="UIWrapper/UI"] +visible = false margin_right = 320.0 margin_bottom = 120.0 diff --git a/src/scenes/game/game.gd b/src/scenes/game/game.gd index 85a6d01..7f211f4 100644 --- a/src/scenes/game/game.gd +++ b/src/scenes/game/game.gd @@ -13,7 +13,7 @@ var mob_threshold = [5, 7, 10, 7] func _ready(): Global.playing = true - Global.play_time = 55 + Global.play_time = .0 Global.health = 5 Global.add_health(0) @@ -33,7 +33,6 @@ func _physics_process(delta): randomize() card_placeholder.get_node("Card").frame = cards.pop_at(randi()%cards.size()) $UIWrapper/UI/Cards.visible = true - #TODO Pause $UIWrapper/UI/LevelProgressBar/ColorRect.rect_size.x = (Global.play_time - difficulty * 60) / 60.0 * 300 diff --git a/src/scripts/enemy_class.gd b/src/scripts/enemy_class.gd index ef6b37c..9b65828 100644 --- a/src/scripts/enemy_class.gd +++ b/src/scripts/enemy_class.gd @@ -19,6 +19,7 @@ var frozen = false func deal_damage(amount): hp -= amount + $AudioDamage.play() if hp <= 0: death() From 50db973705a6a2c147d2656cfca908af1e0459b0 Mon Sep 17 00:00:00 2001 From: Just Dzhi Date: Mon, 2 Oct 2023 19:06:00 +0400 Subject: [PATCH 2/5] menu --- res/themes/default.tres | 1 + src/scenes/menu/Menu.tscn | 36 +++++++----------- src/scenes/menu/background/main_menu.png | Bin 0 -> 9336 bytes .../menu/background/main_menu.png.import | 35 +++++++++++++++++ 4 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 src/scenes/menu/background/main_menu.png create mode 100644 src/scenes/menu/background/main_menu.png.import diff --git a/res/themes/default.tres b/res/themes/default.tres index f806a20..41f81a2 100644 --- a/res/themes/default.tres +++ b/res/themes/default.tres @@ -3,6 +3,7 @@ [ext_resource path="res://res/fonts/silkscreen/Silkscreen-Regular.ttf" type="DynamicFontData" id=1] [sub_resource type="DynamicFont" id=1] +size = 8 font_data = ExtResource( 1 ) [resource] diff --git a/src/scenes/menu/Menu.tscn b/src/scenes/menu/Menu.tscn index 8bab30d..917c8d3 100644 --- a/src/scenes/menu/Menu.tscn +++ b/src/scenes/menu/Menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://src/scenes/menu/menu.gd" type="Script" id=1] -[ext_resource path="res://src/scenes/menu/background/background.png" type="Texture" id=2] +[ext_resource path="res://src/scenes/menu/background/main_menu.png" type="Texture" id=2] [ext_resource path="res://res/themes/default.tres" type="Theme" id=3] [ext_resource path="res://src/scenes/menu/button/button_outline.png" type="Texture" id=4] [ext_resource path="res://res/sounds/menu/click.wav" type="AudioStream" id=5] @@ -35,17 +35,17 @@ margin_right = 160.0 margin_bottom = 90.0 [node name="PlayButton" type="Button" parent="UI"] -margin_left = 20.0 -margin_top = 40.0 -margin_right = 140.0 -margin_bottom = 80.0 +margin_left = 138.0 +margin_top = 45.0 +margin_right = 218.0 +margin_bottom = 72.0 theme = ExtResource( 3 ) text = "Play" flat = true [node name="Button_Outline" type="NinePatchRect" parent="UI/PlayButton"] -margin_right = 120.0 -margin_bottom = 40.0 +margin_right = 80.0 +margin_bottom = 27.0 rect_clip_content = true texture = ExtResource( 4 ) patch_margin_left = 2 @@ -60,17 +60,17 @@ stream = ExtResource( 5 ) stream = ExtResource( 6 ) [node name="ExitButton" type="Button" parent="UI"] -margin_left = 20.0 -margin_top = 100.0 -margin_right = 140.0 -margin_bottom = 140.0 +margin_left = 122.0 +margin_top = 90.0 +margin_right = 202.0 +margin_bottom = 117.0 theme = ExtResource( 3 ) text = "Exit" flat = true [node name="Button_Outline" type="NinePatchRect" parent="UI/ExitButton"] -margin_right = 120.0 -margin_bottom = 40.0 +margin_right = 80.0 +margin_bottom = 27.0 rect_clip_content = true texture = ExtResource( 4 ) patch_margin_left = 2 @@ -84,16 +84,6 @@ stream = ExtResource( 5 ) [node name="AudioHovering" type="AudioStreamPlayer" parent="UI/ExitButton"] stream = ExtResource( 6 ) -[node name="Label" type="Label" parent="UI"] -margin_left = 192.0 -margin_top = 56.0 -margin_right = 300.0 -margin_bottom = 125.0 -theme = ExtResource( 3 ) -text = "Manskage -iLunaiLuna -JustDzhi" - [connection signal="mouse_entered" from="UI/PlayButton" to="." method="_on_PlayButton_mouse_entered"] [connection signal="mouse_exited" from="UI/PlayButton" to="." method="_on_PlayButton_mouse_exited"] [connection signal="pressed" from="UI/PlayButton" to="." method="game_start"] diff --git a/src/scenes/menu/background/main_menu.png b/src/scenes/menu/background/main_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..d3b185e0ef6b7c10d2d8a89bbd9fab463282c2f2 GIT binary patch literal 9336 zcmcgw2|QG7+n1=wQi`I~P?R)gA7)BLLfQAFEMpcknB|$pT1hHWBqgCjk$uUMY*CVA zPg%;SkirxS$wR&~lzN{pZ_oR_-~0LfoH^&duIqm-_qE*ToHjMq6Bm^e6%Y^*->tQ8Pgd5&Uf%eFN##Nz2xH5`HN zLR9mnG5~G?ft|a(892N9JGibEykiXaL>Q_%)x1T|vpC6X!nzD%NpudyZG z*By@`DDK_`+Ubo20H{PZ4&+Vsps}#tnu@cySm2(&3{eElvasDX6}9*ZLAFMwpuKb^ z5u~mL2jihoC`cWn26I89aO#-tAUG5bhd|K~7y=Aa$0E^K7!vgDPZ3bZB#^M?I=bJK z0Z*EWWHy_Dg+RQ#ywto9YILS61ct$2AW%324hI7qV3rS!jq?W6Sew2h=nz?WCWXPK z&}kq(BF=@*VQVS^rq205Wz56USl{9VL=57MV?bbPP`*#Ij0F5VAA`g6m{m@|Lx>(k zDv`!!0lctzULZ_HM)T~ygr!pFxmoOeo`6N)eETIg%hHEIgqRaqbPf|w+~)~s-1OZr z7TcWoBQ$?Q9AKXpW{~M@I*UwSAPDp1e+UJeLRvr}pYji^L~qIhtbEEmD+9ZiNyM?~ zOiMc5<9qU$ezy$-N2sAdTWu&b0^N(H!gu_e08t0WCTc1IiG%<{F<=DL5{AUWVOS_q z6^g(@p>wQ8KyDInY}`-GFen%bw*;~drH+N8|ACoKppbli%SymwNpvO^2W%XLigP7G z7&O;eZAM1e{WKOEN5d2M>u4$hrm9gW1S|qYg2G&&D6k6=K>)+yNFo@AA(Fsw7Ze(f zfFY4kH1fN=4js?oClz0QuD}R%Jb*F38(6$L4uwa+WMWX;AhAV>j`GTF*Zvpf!zyLG~g+P5G$JJ#2L-K-5^Xh9Ka8s#%d)lHE@v zmjJWn@hqI@KQ|rkf+E48BoY{n!oa}uLeWT7tZ{;CH$A2!P9A;MCMP4#lSIfz$_&)S(=I@CY=hx zF&G{c{A_(eJZXe)6KcLBL2NqcM*~_gXapjY@>34{tYzK=(Ep*n-)7w3>xciVSpM6a z1mPbM=Gp+{uN`9US!XViy8OMF9lh9J^@6{fgTO4t0?mEC-T!Nic}_q5KW*^*teHN#ZHV&$GVohF(Z;#{Xe>YYW_gT(WCdmc&}{!g;G@hEeoD!|u*}J#fFAxA!kjEX z_?;{awvb{z<#*ChHH`&S^C`cRW-*8!9v~|Jv_Ju3wE)szxqgRAAmTh&AQXr|bp;WD z&fo)L5rG0FfPljW2=VQK1>*N$5ShYWK-bP9`3TR_=2;{OK*g~lJlEFx<* zJ~$vO3?|);2#jbCB8WxtC4yXhKyZ}O0+#-5@!$F4LU9EFhdv5^0YyLP|9?nK3Z9N9 z6BkN}dGhZpnrHlVRnC)thocJnd2@i5F5o~60&QiJi9fG<&{;$f3aa!|!q2fT5ZV6_ zRpqy3?L+5)fRiz83me4ZFg<~x3F4bfqqve63hh4?`CXW(I2y|xcz;;H-+A)ya3~%e z8gBNo0Mbtkzr%9lu-F7&GGzgzc`_eoc3{p;2*{5%{tq+c$MW}A5G^1V_~-6lO_*KZ zM<7(40EfYFP%w;yLxI&%NH`edLV$sZa3mTAM?+!2JI7&B;7yw@?__y=lNPvg=uPj6waHM4d-%y18+a&}9q|WWv(X#Zu^8Ts`{e`Yv z&`VnmK?FqzG8SAMDkgM>wwx^)TZVd<5JU^p6w(~sG`ebR)2QiaPIY{c=IZxU*8TvY zs{6;vgwG;LRE3koYSZGNHebycSqZ(~@bw|(OHXNqo?1=)_?k|d(9@ay;PWqC;{7_w zzQWf*`#tj`keW1tk$`Q8SBzsouy-ChoU&Eievy>-J*#K9&{%r%hc^`r)7>jBM-Y+= z%c@)QE-VhJq#-L`BT@niZra4-Ed5TW6qZHB=G&Fpt$Sn=U$7VyWW3zNlbw2{@_uYV z0Oz&9iKMnsQREWWq36!EhX)%!)$ktr*1Tz?WzZ#P#>uWqQHzfS8gF69XlY*#uZ;J_ z##Gq1wGpT}1!zrOiNHr%g052Npp{keqQ#dhibhn0>To)+6v535i3H~5CZ#3PO+`ZE z=bRKQB~}$b03o@>QfC%3>;j@YY8GL#3r2%B$w#@Nf=g7MUN>sN1f1zmy;#(0-qZJj za>n!GxC;mM<;A8v=#lXgUXr_P3ta};?`Vmj>Bg?{uKGP@+a0>Cd0SyUUAfja+?%{R;sE&BL}BR!u04%YkA_q2hEncZI2D$?cFSqom)Zl zEzeME%YalQtUwk)k2SzJwOz20s?Xz*@m-nu>qk<=6Md*G7 zd5J|Kmsr!6sigM~(Vmt)xAQTKByKO}>Xfcdk(^hdNalfbxfiPk$e-9B4^WScAZHxi z?nF4#O%1`CNmiKB^$tez<+9l(GEvzEgTdWv8+zLm7_CKD1`@$5%CD5=E*+*R$kjUD zSNbYZ*|lve2wXYf_9Q0f;Xo}pwgsicz}akZ@2~7_K4+P^#i%etXzcw%8oGgxOSsOw!uu4+iv%1M?ItTEVl%?s+>Z_2!dYN?GL6z$}^F{l5MU* zCO(blmGcjBvql5<-h(goFh2Na+3~)#4%uC$>qFNZd|n$y4}b^9C6Y6uDbkUHu4Vgl z0-LXP9;J(on?Dm=dKRdmsP^YWR_bY-L>*-bh@L;UX#a&l?bLGwJDli zT_Nqm<W7RT3XLxZ6%5`&e9&r4l1)TvQ3=iFf1edT6pGyFnuEepifH*_e83v-h|{ zgap)TGeg#IdAu91<)~*hT_&x}K_kDq(Ojyp^`gQ%&y`#s=a~tsFGnUHv$78PEw4Qd zm`N>78!k08c%QUQC`;j}f85>4BaF${(U-H}j?S3oEQ5GKU(I1z}GV^u?cX+J*_X`p7o> zkRo0AL~V7~c6hk=(9q0Nbg6WUqsnU^8;`YlNhz^UN(&zOQZI2T3yK#T5`~Og@LxYX zb&+!)XU5tUSjyFCEy)53cumrp?w;Lb(Kv%Qhd11;{HzcySsemBno1CKn%1m!=jGUx zY~Iw?wNdwmiSifm#IA8if5Zr7T}gTk)xD^85l1TVeBF~Y$p;}{D7J>jK2@YWJYL@D z0Rf{Ux%QK5(-mqcMrN6dZd#iXKhTxgMU2GiW!9Tg);&7nemA~V1^RHM>y&x>a*U^6 z+mX|ou#Bfu4DTb@YOLc}P46?w8!M%m&mMQYZh1YiD0$EvjAP{pjl7VN(c!M8;AMN; z7KQCRkzRb&G_s@jOGiskV7hXC$Iu%oYxRtW7n`-mcZRH5A13Xd5|UE-Y;q8zM?D%5 zhLNXEnNv-AHAWhpIUom1nCqoc*958~r{MeKhr}tIO%SO$V;UX-+dHDwr{C>t+PGgg%kZhE8zQZpt+Z^j3j1{X`tEpNz1w-m|MTIv2Jn!5d0;LFIb~XMAkgOW)%8t> zEXV9s2RFnkW%>+T%WnwVxB>?%-ZhbMlKFD&O0MQh|NWnbt_{UTX7j*Wy(0!V;XZ>M zPhYEk7=e@a`i`Q%z>ZuG({GvTs>nRrZQPc$q;O(Sx^9+d4dJyalF>|@W}Le?WYBE# zvA$^6gj`2$Nq|Wq`lw%Os*udBEqTI=dKF&BLd$CW~70)Yb=ILYV7xIFGw%SCVX;Udov+V(fyF>9VwN+;Rnr5*bXJd*f zzK7pJW*F?igDcCQdT+ek%zH*dd=z^DSVi`1x>1J{sYXS}6sqe2#a?nzZ8RILYom3< zr(jQ<^kUq~L0|$&QiC5pACHVDd8=JJLcD$Gli<+!co=CZU=WcmX^AP*FPyBAQED{V z-qt#L`}4$s?SrLWjh}t;1M4kcJhRpasB-LDXa7e&ZO6{zs2!MaW$BFW_(~Wgnk(hPP(k;boS$MYI%jskSD#3A^<~OLNZZQ|L9ZRN5 z2GUA7m{;57U**;Au4~8{JrOkxlFe04lE21jdPeB!DO{$Kd@;*pgVgzm#>7s^osMyP zxTN!$S9Vt(Ww@{8!u2##Kh$7eXEc+SzrWgFN zJ9tI?i-A{09Zxc?Ed+OLGi)`tKYTpMm!e0Li*rou^pWA5%y^iWc4gZqiSrXa4gsz& z%OHry(PEh!l@6r)Ifiqu-*&)kulhQUow4m8fD596X_kfWHh0__KVfxii+gICTKScX zq{H^M@>jb>`{d8)jJ_TY(8yNKu|s%;_q=&{#K<}N_X(dnX-}tt_=(1?s z0JM~#Le)yQc7w5HhMy9uwsY#Wb5G_xzuq9N>p8eXq|1zgK!z0eFu@WJk3c-@DjnrO)end=H{Y+o+2^vW4Buj1uJm^$B!u^1%yv41j((^IK>BP85W<0 zUD>}lUf}#@Q+X%a&AZ4M4-GMUz0Kq1;!Y4ZnftgVx9(d}XpxZlco?`YcV`VC_YVYbm{a`1Dn`;Ov zE&Uw~jZqagV!cFi3!*xCwXL#%!TFojVOODOZO2ErYoa%`Z}s~R?^O;o%~xWg2JS>J zk_gmLLGz>{2TG42dVWSOs_5oT^Mw;+;)HUm(l>^bdH*P3T*6u|cG6^&OkkYv-0w2_5pvuXZ(=1z0iT zo}0~JkKHzPri+whDlpDgyd|rs7!HG%2fSExkrr}UZ!eZDM~OUE7ioS~T9pLRdX=+> z=kk&s6RPYacfobYqR$c49vKT337`B0~^fhUbjCbf}roV zh8|kE>{sv86>cBj>NydNhLJPmmOcY_VUBiYbk*w~%h*TTY*bTD+Pw)&vU7z+^*K*H zbL|_QNN>z|)0c1Gf=y^GY;bAqml#5p36AhFIw!sy^zrF=ORtwIh$+o*9h2CY+%qKg zDaqQ=*-ZEn`s+YmWp=qu5_W3RkE0#iu&pMBTU;?%PykNcwC9y!yKPKte;~;_34X5J zz%Xbp*sUY!R#{A?9VcJP9%-7654EPMu@tzt%zkO|5|aYj)Kn&!muG0ixmNaQ^2@#M zR7g~PSH?bR+nBz_*KIEk-Y{Pkk)C?8ueS41L2Lgqc_U|pL%q}p+CUo-7iHwJG-H+O zX3uEd=x%Apn77vtxEN6^9%Zz0tjV#<7x5#NBG%a?`8aoMf_iIxWX0Og7!XSvfr+y*uaWKu+n2bZaaaI%u;;+v`Bo ziO_AYtgH{zUKcEO+s7M&$qFTu2(Ae?m5Oz0eJS1$v+w;&Z1Fwo;|J@_WT8;`YQYEa zc)*8^(M85d9qISWEaKdHoA+LF8#p(UdWTfb)VQbDeNQSsp~HIomrnwy2tnwAE2 zWNE+jb$1nGgWOJYmW5oo>d0{fr(|xlk&4@SF)Zsj7iEx3I4S z8M$rlC)+PjD@iO2nf9wqE0gA&j&iF{(~eXTU=5zWLh#O%r*F z!KKL$yFQt(z7xJT&&)5n;Be+$yv%$CXUNSgy|lP=_cp;lHTaAB_ZjPCX*(bPACBrk A+W-In literal 0 HcmV?d00001 diff --git a/src/scenes/menu/background/main_menu.png.import b/src/scenes/menu/background/main_menu.png.import new file mode 100644 index 0000000..c348d2c --- /dev/null +++ b/src/scenes/menu/background/main_menu.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/main_menu.png-de2bf9e679f8b63409cdc558ee8ea050.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/scenes/menu/background/main_menu.png" +dest_files=[ "res://.import/main_menu.png-de2bf9e679f8b63409cdc558ee8ea050.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 From 54a8ffd0a90925dd0233566319bb36845eb19bbe Mon Sep 17 00:00:00 2001 From: Just Dzhi Date: Mon, 2 Oct 2023 19:11:24 +0400 Subject: [PATCH 3/5] cast_time and damage --- src/scenes/game/Game.tscn | 20 ++++++++++- src/scenes/game/sprites/cast_time.png | Bin 0 -> 1804 bytes src/scenes/game/sprites/cast_time.png.import | 35 +++++++++++++++++++ src/scenes/game/sprites/damage.png | Bin 0 -> 1830 bytes src/scenes/game/sprites/damage.png.import | 35 +++++++++++++++++++ 5 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 src/scenes/game/sprites/cast_time.png create mode 100644 src/scenes/game/sprites/cast_time.png.import create mode 100644 src/scenes/game/sprites/damage.png create mode 100644 src/scenes/game/sprites/damage.png.import diff --git a/src/scenes/game/Game.tscn b/src/scenes/game/Game.tscn index ef0fe04..4671dcc 100644 --- a/src/scenes/game/Game.tscn +++ b/src/scenes/game/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=30 format=2] [ext_resource path="res://src/scenes/menu/background/background.png" type="Texture" id=1] [ext_resource path="res://src/scenes/game/sprites/background_houses.png" type="Texture" id=2] @@ -6,6 +6,8 @@ [ext_resource path="res://res/themes/8px.tres" type="Theme" id=4] [ext_resource path="res://src/models/player/Player.tscn" type="PackedScene" id=5] [ext_resource path="res://src/scenes/game/sprites/health/health.png" type="Texture" id=6] +[ext_resource path="res://src/scenes/game/sprites/cast_time.png" type="Texture" id=7] +[ext_resource path="res://src/scenes/game/sprites/damage.png" type="Texture" id=8] [ext_resource path="res://src/scenes/game/sprites/player_icon.png" type="Texture" id=10] [ext_resource path="res://src/scenes/game/game.gd" type="Script" id=11] [ext_resource path="res://src/scenes/game/sprites/ui_background.png" type="Texture" id=12] @@ -251,6 +253,22 @@ margin_bottom = 3.0 margin_right = 40.0 margin_bottom = 40.0 +[node name="CastTime" type="Control" parent="UIWrapper/UI/Right"] +margin_right = 40.0 +margin_bottom = 40.0 + +[node name="CastTime" type="Sprite" parent="UIWrapper/UI/Right/CastTime"] +position = Vector2( 256, 140 ) +texture = ExtResource( 7 ) + +[node name="Damage" type="Control" parent="UIWrapper/UI/Right"] +margin_right = 40.0 +margin_bottom = 40.0 + +[node name="Damage" type="Sprite" parent="UIWrapper/UI/Right/Damage"] +position = Vector2( 256, 160 ) +texture = ExtResource( 8 ) + [node name="Cards" type="Control" parent="UIWrapper/UI"] visible = false margin_right = 320.0 diff --git a/src/scenes/game/sprites/cast_time.png b/src/scenes/game/sprites/cast_time.png new file mode 100644 index 0000000000000000000000000000000000000000..dc4630597d8ab42923755055195858637a9f19b0 GIT binary patch literal 1804 zcmcIl&5ImG9GwISaV3iAAts1TuVOUTboKWKnS|My)g7^Sm)*ha;=xo`RnIg#-PLyY z?#%ARAPRa60mUyoh=Lvj@#sPEFNisL@|K(e3h@#IDb(fxmvAuth3Z!gYzSB%pE-f|63;?xCN&N)1}S4R(t5N@;Frc=#%5M+L6tu zyHRZTuXt3%b;3lz>!Ub@>RRp0xlu~!7B8fL_oAdB|MvY4vJ|m~eBSi2pSE~ETH4F_ z`rdMv?rl+*$>+{WXGR_X#JnKVC>|uaH)_aZTo10x$BHbCONyqEURvYw*4uB%{8(KG}VDBn#AGD1l{KSgNsoMus4L?V$&L=uSYq9KFS$sFQz2Akwn zpP*yPh@^^I$K{-+g}%RkX&le0^I~xaSSr2u1kSs=DOc8bF19nu7k7A4%umVEz9>ZA z7x&RNd;JfEjLrzt?QAe^52Fen@EEXjs8z@MQm>V9Qi!Z8#9->w>XcE^^tvgXIv*uW z4D;toMb!Y_CIxTE;2QXa5mvhz_Dt-l+G(tN7*9%l2m&JoIask^QMh}MQs4JFNnVhI z@=m)UgQ$8GF)uI!JG2cA*}Cf>%QQmd=#GkXYGJ}1Ra3)>E*Reybi3?CIewB`CMaOc zy6G7@4{bFtkz)lGau}ewc3>dgvQ(;Z(}BQ_X9;L4Sp=UB8QhIps$zgh0;~n0VWH3s zZDgy4g9u|TGEFN`LuS~-pt5v_waxVB7m6$Kr(rSz;&MVE(~fH+%{2&e!XQK}WUgvrYGYfU@D8G>f(ekaKjT>IUCZNiFs!-d z5Y|-)hnN`U%nh1fAv}%UAlVn(J#gApWgZPb$|Qo4|*3? metGKVpKAQ9_s8>}E!bD&Cmw(M+Xb!MuR4p%?Qa$?y!AH+kvlj5 literal 0 HcmV?d00001 diff --git a/src/scenes/game/sprites/cast_time.png.import b/src/scenes/game/sprites/cast_time.png.import new file mode 100644 index 0000000..99ca894 --- /dev/null +++ b/src/scenes/game/sprites/cast_time.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/cast_time.png-236467b38d086f7887f1b94b4c0e9f8d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/scenes/game/sprites/cast_time.png" +dest_files=[ "res://.import/cast_time.png-236467b38d086f7887f1b94b4c0e9f8d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/scenes/game/sprites/damage.png b/src/scenes/game/sprites/damage.png new file mode 100644 index 0000000000000000000000000000000000000000..d7dcacccbf93b46566f8ab4d280d444c0a4e2bce GIT binary patch literal 1830 zcmcIlJ#6Ge7&X!9xJ#5YG$=HduK^unkH_Bik8bbCWdm6WhbUR;LPf?i<6SGZ$JpNN zCgpY4oOCB71frp!LsSR~B%nfcNKjJIL4hbKK!VS^-n{^KA&uFwtoF9MdvITa>(Z6W@crcvYoEjIYQFtusVFPY)z>r1`yV{7D3{-j`v=uQ z@Vd`rs#7jQp-<8r(28>7)+DFwNK|Sl265KWe*5ApO^ta+yVDAAkZ+1%ynR}T{nMR3 zJ3V3^*KXZZZ%lk3NJT}}Nt$G(Kj~;wULVHw&xWQ>A=Obw+o%hw2f?noDGQ-GIzbF$ ztU8`ov`RL2y1aO&930+B$|Rjo!x+m;IAm7<;0Wqk@U8W06(Y=Ed@%tYkTqPtdmb z`yUE9TNKPkMKZOAGeaaI1@02C=2TzqZx(`9vgk{h%#+%kS5%3mx6~K!#2J_4@}*i) zGeLA|B{~|U26paC=jrxm>zSn@bJxd=1}{9aa8G-IOI?PwrM zk7Mpr>|x7{Y!pSFjR?0rwl|6xULBg8Wvx|lV01W%+RWyNMxld*2dXG_+KAdM z$BH5jnr%&eRCiM*vIryxcP&lj%#UP|Qs|#Jr2}E)*`V%bV24#~$0bB}(!3x0;_YUX z#Ok!^e9G!x?`W(JS#YiSIev_L7t=YT9S;SNo)i8IR?4Uv(?VOF5^k!OL~01 z^os@m6s0$|vLVd|0(MSAs~2O`Tg)sJ;lnq_0dZ8}&Oa&z8H7*aA# zijf)77IIoPL0-sBB#7NMNgJEgrL($8{NLGjNIgNBi7eN15b@yMaHB9n9JKbBru`F(wLIsW?o QdVP}hwsyLo+&;YfHz12XivR!s literal 0 HcmV?d00001 diff --git a/src/scenes/game/sprites/damage.png.import b/src/scenes/game/sprites/damage.png.import new file mode 100644 index 0000000..cf57789 --- /dev/null +++ b/src/scenes/game/sprites/damage.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/damage.png-add8d9c6f61d8b55c2333dfcd00b0797.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/scenes/game/sprites/damage.png" +dest_files=[ "res://.import/damage.png-add8d9c6f61d8b55c2333dfcd00b0797.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 From ad124afd4ea7bc82d67a3bd71529ab465d4b434d Mon Sep 17 00:00:00 2001 From: Just Dzhi Date: Mon, 2 Oct 2023 19:15:44 +0400 Subject: [PATCH 4/5] rect bg --- src/scenes/game/Game.tscn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/scenes/game/Game.tscn b/src/scenes/game/Game.tscn index 4671dcc..bc284ae 100644 --- a/src/scenes/game/Game.tscn +++ b/src/scenes/game/Game.tscn @@ -173,6 +173,11 @@ margin_top = 126.0 margin_right = 310.0 margin_bottom = 128.0 +[node name="ColorRectBackground" type="ColorRect" parent="UIWrapper/UI/LevelProgressBar"] +margin_right = 300.0 +margin_bottom = 2.0 +color = Color( 0.0862745, 0.141176, 0.2, 1 ) + [node name="ColorRect" type="ColorRect" parent="UIWrapper/UI/LevelProgressBar"] margin_right = 300.0 margin_bottom = 2.0 @@ -245,6 +250,11 @@ margin_right = 200.0 margin_bottom = 165.0 script = ExtResource( 16 ) +[node name="ColorRectBackground" type="ColorRect" parent="UIWrapper/UI/Center/SpellRechargeBar"] +margin_right = 80.0 +margin_bottom = 3.0 +color = Color( 0.0862745, 0.141176, 0.2, 1 ) + [node name="ColorRect" type="ColorRect" parent="UIWrapper/UI/Center/SpellRechargeBar"] margin_right = 80.0 margin_bottom = 3.0 From a49d9b140ea57b041035970ea5cddbc2e306cb9e Mon Sep 17 00:00:00 2001 From: Just Dzhi Date: Mon, 2 Oct 2023 19:38:13 +0400 Subject: [PATCH 5/5] fuck this small commit --- res/sounds/card_select/card_select.ogg | Bin 0 -> 5714 bytes res/sounds/card_select/card_select.ogg.import | 15 +++++++++++++++ src/music/Music.tscn | 1 + 3 files changed, 16 insertions(+) create mode 100644 res/sounds/card_select/card_select.ogg create mode 100644 res/sounds/card_select/card_select.ogg.import diff --git a/res/sounds/card_select/card_select.ogg b/res/sounds/card_select/card_select.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ec6c6f21f249dc10646349804a890f622de9a593 GIT binary patch literal 5714 zcmbVP3s}=fwx5LeD~1p-Xv8E2Nf20q!6g)22nmoF9tlAK#f5}7ROMwAs|^}31VkQz z3lUvj0fRt69x7YzqC7=J9x7C~iekanw$)ngZ?l2kVoH;Z9Ip_S& zoSBfs#4vycZ_CqFE1fEw!9J87YX9C0NpdE_LUURH_yrd5628+1fMzH5A67#~u-o~)&7ZMc24Sv@T z7W?{%y-@}$``E_T4NJU~Nme4kp*W+Kl^pEROfpgm7g#1&zS}6>)70IRx@VGZ zZ)_2108I#d0?B!J5z0hd})iv(m) zO%PCu=XK(*brP>nQ$t=l39a0xH*>?pLE*4uNAK7lKes=7ZvWxPs=S>S4@X|i+c}>X z{U$G#kpH%RfB60zr0P^Bp+M~hR^=kSp0cL?A*)_bp5KZFafnGsCS??QSp%;rA*DU} zRBzI`-Vd*xce-}oTqgnnqL1tb)F!K&{!dMatc?H9)hB7p5%@q`j;0ew)2Un$bu`1t zNN3?O0DbBsavIKH24pfvGreF9$l_d839i2qta|4J#O(n1Fo?tH#H-L6BInr*_Z^wu zbD2SN&=iP8{(Z^S;RPx}KAljRA~W7x600+d3@%HkGxjrI`4SXR)IB1pr_|qGXJOP| z)@t#mW-k|rPdQxDR-Mv$Fm2Ly5&DuoUOik}J*Cc^#AiUqh#|Qc?cAhYD`Y7pev7rP{ZX%c4Wu3&7*D}WFjdmxB{rTEsp(0xcP1aGJ z<|F{*SRIPrH99D-pt!M2={Qd7nsB@3gfy*#lb+8y2C;tT42WVUcZlK>JxgaY+gX9B znx5NHn=~pBpRQSnDCksDT#2uttu9FNt1`yv%`hr{>$q>IH!Rmp|EAt}K@{TbVV!n! z4%_S`OwTTbg5qR@Oe?5NE>O2zs!tnlf7bUO>-)$F$e_XsBZr$o{Y~TyFo=FI zn$9}~eY>Kg_cSzU7I*b;9RR>UiTO6&IU*D}-x9gs5;=#9z5jj0z|mXGpjjp~Yy|+e z@F=7YtL33(zQO$G+~g6GQJdkHbUC4XzVJyEdrTPW7-w$#$mi-!Mn3jiiL@Edo+x~w z$t?2y!^lMun|9e49((#g2!J7v!lUwDGV23hQLk@MdRfY-IbJ81d1uDHJzxiT_=9#g z$~mRWFT7x4LSf*~hFwSAgqC@rKq2*@9q*-A*`tHZAUs)F)>J^bu{r2Wf>IC`Uf1%L zR6D43@L31%w`>YwAdbMfkSv$

u-=0DO;&G7>+oBZ+9v0)@W`dU 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