From ec082a06e5bbcb76afe3ba79106e49e61ac776d9 Mon Sep 17 00:00:00 2001 From: Just Dzhi Date: Sat, 30 Sep 2023 21:28:15 +0400 Subject: [PATCH 1/2] UI BG in Game Scene --- src/scenes/game/Game.tscn | 10 ++++- src/scenes/game/sprites/ui_background.png | Bin 0 -> 3018 bytes .../game/sprites/ui_background.png.import | 35 ++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 src/scenes/game/sprites/ui_background.png create mode 100644 src/scenes/game/sprites/ui_background.png.import diff --git a/src/scenes/game/Game.tscn b/src/scenes/game/Game.tscn index d5c89aa..29d6fa7 100644 --- a/src/scenes/game/Game.tscn +++ b/src/scenes/game/Game.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 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] [ext_resource path="res://src/scenes/game/spell_holder.gd" type="Script" id=3] [ext_resource path="res://res/fonts/silkscreen/Silkscreen-Regular.ttf" type="DynamicFontData" id=4] [ext_resource path="res://src/models/player/Player.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/scenes/game/sprites/ui_background.png" type="Texture" id=6] [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 10, 60 ) @@ -57,6 +58,13 @@ position = Vector2( 46, 42 ) margin_right = 40.0 margin_bottom = 40.0 +[node name="UIBackground" type="TextureRect" parent="UI"] +margin_top = 120.0 +margin_right = 320.0 +margin_bottom = 180.0 +texture = ExtResource( 6 ) +expand = true + [node name="SpellHolder" type="Control" parent="UI"] margin_left = 120.0 margin_top = 145.0 diff --git a/src/scenes/game/sprites/ui_background.png b/src/scenes/game/sprites/ui_background.png new file mode 100644 index 0000000000000000000000000000000000000000..91e3c5b8747a80a5cca845c48ae6d01de8a3684a GIT binary patch literal 3018 zcmcguO^@3|7|y~4ihAOL;9|L#MRelvXFR59yWMQrm6~O>jnpD>U@|jKtaUub_HL3D zLZ~3cA6qrv0iasNTU}a?$^QKt*eiVA`J{PYg;}FJtstjc^0xsXDA$x_`TKwSP?!*TF0l}I9D#_vEsK?%Gs`7xvYEyci~v z3z4k|E2SBQqeEnQR}V8e(P)~+5u-|l#zn&GhTP~{E2OsE#T!ZEB8yfuuo|UFLHifu zZB^XWn#%uPBtxBuRU0r~>=4y^uVV7Ps!e&)1nYXiRW%4lPXHaV>6x$A-KzNVpLR*5 znnqB;K+K8 Date: Sat, 30 Sep 2023 21:32:19 +0400 Subject: [PATCH 2/2] stupid revert --- src/global.gd | 11 +----- src/models/player/Player.tscn | 15 ++------- src/models/player/player.gd | 4 +-- src/scenes/game/Game.tscn | 24 ++++---------- src/scenes/game/sprites/health/0.png | Bin 8939 -> 0 bytes src/scenes/game/sprites/health/0.png.import | 35 -------------------- src/scenes/game/sprites/health/1.png | Bin 1892 -> 0 bytes src/scenes/game/sprites/health/1.png.import | 35 -------------------- src/scenes/game/sprites/health/2.png | Bin 1929 -> 0 bytes src/scenes/game/sprites/health/2.png.import | 35 -------------------- src/scenes/game/sprites/health/3.png | Bin 1933 -> 0 bytes src/scenes/game/sprites/health/3.png.import | 35 -------------------- src/scenes/menu/menu.gd | 2 +- 13 files changed, 14 insertions(+), 182 deletions(-) delete mode 100644 src/scenes/game/sprites/health/0.png delete mode 100644 src/scenes/game/sprites/health/0.png.import delete mode 100644 src/scenes/game/sprites/health/1.png delete mode 100644 src/scenes/game/sprites/health/1.png.import delete mode 100644 src/scenes/game/sprites/health/2.png delete mode 100644 src/scenes/game/sprites/health/2.png.import delete mode 100644 src/scenes/game/sprites/health/3.png delete mode 100644 src/scenes/game/sprites/health/3.png.import diff --git a/src/global.gd b/src/global.gd index d0c1555..f676b7b 100644 --- a/src/global.gd +++ b/src/global.gd @@ -1,12 +1,3 @@ extends Node -var GAME_SCENE = preload("res://src/scenes/game/Game.tscn") - -var playing = true -var health = 0 - -func add_health(amount): - health = clamp(health + amount, 0, 3) - emit_signal("health_update") - if health == 0: - pass # TODO endgame +var game_scene = preload("res://src/scenes/game/Game.tscn") diff --git a/src/models/player/Player.tscn b/src/models/player/Player.tscn index be57bcd..6ae7ba3 100644 --- a/src/models/player/Player.tscn +++ b/src/models/player/Player.tscn @@ -1,12 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://src/models/player/sprite.png" type="Texture" id=1] [ext_resource path="res://src/models/player/player.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 4.5, 6 ) - -[sub_resource type="RectangleShape2D" id=2] extents = Vector2( 7, 11 ) [node name="Player" type="KinematicBody2D"] @@ -16,12 +13,6 @@ script = ExtResource( 2 ) texture = ExtResource( 1 ) centered = false -[node name="WallCollider" type="CollisionShape2D" parent="."] -position = Vector2( 12.5, 17 ) -shape = SubResource( 1 ) - -[node name="EnemyCollider" type="Area2D" parent="."] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="EnemyCollider"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 12, 12 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) diff --git a/src/models/player/player.gd b/src/models/player/player.gd index b990357..0fc2b9e 100644 --- a/src/models/player/player.gd +++ b/src/models/player/player.gd @@ -7,6 +7,6 @@ func get_input(): var input_direction = Input.get_vector("left", "right", "up", "down") velocity = input_direction * speed -func _physics_process(_delta): +func _physics_process(delta): get_input() - velocity = move_and_slide(velocity) + move_and_slide(velocity) diff --git a/src/scenes/game/Game.tscn b/src/scenes/game/Game.tscn index 89e0d4a..bf599ed 100644 --- a/src/scenes/game/Game.tscn +++ b/src/scenes/game/Game.tscn @@ -1,11 +1,18 @@ +<<<<<<< HEAD [gd_scene load_steps=10 format=2] +======= +[gd_scene load_steps=9 format=2] +>>>>>>> parent of f3dd6ee (Change Player Hitbox) [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] [ext_resource path="res://src/scenes/game/spell_holder.gd" type="Script" id=3] [ext_resource path="res://res/fonts/silkscreen/Silkscreen-Regular.ttf" type="DynamicFontData" id=4] [ext_resource path="res://src/models/player/Player.tscn" type="PackedScene" id=5] +<<<<<<< HEAD [ext_resource path="res://src/scenes/game/sprites/ui_background.png" type="Texture" id=6] +======= +>>>>>>> parent of f3dd6ee (Change Player Hitbox) [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 10, 60 ) @@ -17,14 +24,6 @@ extents = Vector2( 140, 10.25 ) size = 8 font_data = ExtResource( 4 ) -[sub_resource type="SpriteFrames" id=4] -animations = [ { -"frames": [ ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 6 ) ], -"loop": true, -"name": "default", -"speed": 5.0 -} ] - [node name="Game" type="Node"] [node name="View" type="Node2D" parent="."] @@ -87,12 +86,3 @@ margin_right = 79.0 margin_bottom = 7.0 custom_fonts/font = SubResource( 1 ) text = "spell modifiers" - -[node name="Health" type="Control" parent="UI"] -margin_right = 40.0 -margin_bottom = 40.0 - -[node name="AnimatedSprite" type="AnimatedSprite" parent="UI/Health"] -position = Vector2( 70, 145 ) -frames = SubResource( 4 ) -centered = false diff --git a/src/scenes/game/sprites/health/0.png b/src/scenes/game/sprites/health/0.png deleted file mode 100644 index cea72d76e7eec9e1f5749a6da3ee15b68fa1d322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8939 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 Z0N|+yaM->4Y{gy&80nkpUDI(6{V%S{Mq~g0 diff --git a/src/scenes/game/sprites/health/0.png.import b/src/scenes/game/sprites/health/0.png.import deleted file mode 100644 index 07dc339..0000000 --- a/src/scenes/game/sprites/health/0.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/0.png-02c85cf70c99d3d8411f3ce28c6dff74.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://src/scenes/game/sprites/health/0.png" -dest_files=[ "res://.import/0.png-02c85cf70c99d3d8411f3ce28c6dff74.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=true -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=true -svg/scale=1.0 diff --git a/src/scenes/game/sprites/health/1.png b/src/scenes/game/sprites/health/1.png deleted file mode 100644 index f3a9542db306b99fe95e44b63956f9742deb2d50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1892 zcmcIlUuYaf9Nu8uXhA4wi&zn&4}!KOLal$AQn4TynrBh)&x;RAA(dJbA>i!&Yn3+U#e=(@ z-TUVIee?akojEo-^3?YBhub-h+nydyjj`*lXuNeZ`~7@=#|P}P%^RKwIIiRV=-bA< z_4Y#?w|TYv-U-2NCCLy0AdB;r(s~0Z|yn~a%Q7r>9 z-XJMB!*f14JU5a>bJNJgLjOL#uVOKR5(yz+DHYwosw9OPuf@jEV@cp^kZ?LF3`7O_ z@ysYcNPWT^F-1fG0NyZTa!%KvVfOM0P!tL1lB|ldVa0Vzj`NL=z{>g9w#HHi8pYUM zQYeI>XGv1IT#l9181?g#Y?`J76iHD;h7g0Q8^Vg{23<{t6bX>;c%egGK4OG9Iuj-Z zCbhnXlGmbjgN9GcF{uJQNsfVNO-*1Xvp%#`YN3O0XqHuJ=)EIxkga+|8Y2On@evuC zC2rW&EanwxNP_~si?-I^|4@igtDraI7i;!lB#|O1G46n2<(fXv8uSSash_2^*zDA3 zvm&pkF^%s&>bRJegFTU=#srdrAxR3XYpMuLQ3Y8ASU|TFy$7fk0Ci}F1p&hlZVXJZ zV^=o<&19^!8-&nBB%MkMOjOKqu%&4VuygT*Xn-h1IF7`G3ZZCg&@^pLGqA1Kbg}s< zie@4wqWSgQVu~0?%T3GF5=hqLx=2i-GRk;d%&7@OG<4GjP?r^1)|zb3_zrt@VDWa= zNEK#`AdYQY*N6x-3`J}*9#bbs1cYdcX2=9nlKGfG2>87*g0FoHa2AqAOjd`y>8KI zDyS1l>sPF4y={AJPG);;E8PLhw(sex?bwU6Hz*l`7H z-8BECbp89w%j#Osk2mg}`|ZG{&(1#Ze$UTSy>jnQZ(h71-CRq&{>_myt6MI#UrnQD zPwd`u?Iw5i_ig9?e5u;~72Vspc;?!n(R-f%dLcWxaN*teUO3+NN4|T0x3jdj<5>QS zPbSYlwmg)&-X)&=>%|lH&edIuCr^Dj{_4bJ9!#w)99cX4;nK>%`}+HT1wBt(>O1}2 sGE&dCt@OXr(fQybPk;MM=i`^!mforEIsU`q&gdLW4~?YG?Vo!2Z?|G-761SM diff --git a/src/scenes/game/sprites/health/1.png.import b/src/scenes/game/sprites/health/1.png.import deleted file mode 100644 index ec3fc65..0000000 --- a/src/scenes/game/sprites/health/1.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/1.png-047cc618dec88d280c194537c3a6f7ff.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://src/scenes/game/sprites/health/1.png" -dest_files=[ "res://.import/1.png-047cc618dec88d280c194537c3a6f7ff.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/health/2.png b/src/scenes/game/sprites/health/2.png deleted file mode 100644 index 7f6fb95ab53bd2e8d0301adbdcb502f1a94c2c81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1929 zcmcIlZD`zN9M3*@?1dKBIq;1UQyrEqmnX?3xrAnIcURl0X}k7d9q8DTCr|ET?~*i0 zd)G1%rYH`_6cj~dbJn+3oWgt=jxokW=03SEA~>qzrw*s6=onP=$-QmL*7b`AcX^Wg zJ-`3&`Tu@-o@a*#`&!oCxt5}+mVy542)W)Jk5?zi?`O}n&Xda;zkgRqQR_Cu-&NGB zuiZ{jiCs=^EE+Q&){s|9Ld!F8vQqL1nxZQnJRU==z5t zDMXR4aa_4vPL{=_7vwo!RaFiMoFK3S!G_ar1S_l?wl^5EI7ETtM~>&xF(Wj+$w+62 z)Y=+Kev{S>>wO{}<0{bS_#}we)BqaB^3YPLi4LRQDN?1b_qxPkZraD(2oAl;0O8&# z>_+X4Vt&Dkys+TiKwIvw` zpY_mW+=+O8Ew`432uHJ<8sO6sP$k4lKvr2*N-3<$D~MHb8Yptwl1&pe*oFd!ygIOW zEo-dGidFHJ301{pWq@Qh4O21;kzf)s*%p+vDA~Ng&{ykbyrLHvo<+JVGPH#>+Y3sN zjD5eKa{qz8=W-chpvta0|(l1Wv*(^4BB zV>+1qS1#+D^cP!a4?h0K!h8MEM_(?s>U)JPdoQ+9M>9XdlWUHj{hj-H^YNCtoS)RU7$z|H#8<$>l*WyFZ|)ht@{l71Z3x zjTF_k-_DPQqq$uMbjxvoTocEuWsg)-RNs!O2jDmkX%iQ0C&}FU;4(woD9P+oa(vE9 z;i8?L_VJ$Sp*)-(hdN?*Y^VFG1_3DJ5YW|f$q9^VlBwYuWE?%_7`j#xjwhM^h>#x5 z4bv&t$Fv$3S;+G|t?F^XOejFrx6vXmiX5Nd1c?LQrL$pr?tD#sTzgFSK2Uju3(APJ~H@ zNUg7-?6qK>py3m7jH?2V6XJZdregN#+&Z&<%?2J+!s{{)a*YTZG<(U#i)IAcsr1Ot1q|E7bIPM#{$^bp5>RmYSU! zZZguM6j$iY`)mifm0(Mxs4)SjL5PzK>6*myIxF#ckvDk7kkwvZGI+jTnj=9#AOy=R zc9CsOEvGb>GX|X?1P;W5=_Er$#cdlAZeZ%B3RoQ}hy|hySWPxHRuTXfRaufv#jNQf z^V2Szh@6P#*K>SqJ?q=#)d8hD zQ6p7|AYuhsx~OYxLK6~fA|WfRmLTcWuqx_;s)-U(8TvMF$}PEm&PBvsiJ=iREY~js zk{`Pa3YhbpLX>8LPF9h%1Jb&w#{01cA8d?DHeCyy0brE%Bm<)+W1_eI*uIN<%hOq( zUnyb&xvq4Jndv8Kj=C8%Y#0EAmLc1lVUkUtV*mwK(sY#-^(f+&X|c#cx}fk-OkDmj5V!yY>&;!WY3L;t=*p7w9X6ckfr+MG&uB`x0;+J-wdYv^V(~t^H*XY z(;a;~XX(Fo?VVr9-+19Uulw5T!WWO2TSl&SEzWeVm44W2X6G(;KYH!h`R;Gmy?6c8 zFH;x(yuONBK_C76z|q|!GZ!9D-A8RW{qq=H`Fw0Pw&s=D4*dws&W-bz=6g#MTT9|^ zUrj&Jv+>ecciU6%tla%mc4qP2^@kVUx;%RDquvv5RBwjV(3{4Sna&TN`7+r(zu}~{ zdEMl>KUQ}g%N_sj6XER_xf?I-ec+aPb>T$UrsJplAGh5+bf)v`*!}BK`}bEaW>CTY g^!JxjknR9$#(o`I%;@K{1JQvwm>Ei+8#r+IZ>sEY^#A|> diff --git a/src/scenes/game/sprites/health/3.png.import b/src/scenes/game/sprites/health/3.png.import deleted file mode 100644 index 5be0b8a..0000000 --- a/src/scenes/game/sprites/health/3.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/3.png-cf9102fa2f0f8d9abb6f2ada3be84162.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://src/scenes/game/sprites/health/3.png" -dest_files=[ "res://.import/3.png-cf9102fa2f0f8d9abb6f2ada3be84162.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/menu/menu.gd b/src/scenes/menu/menu.gd index 6ea9112..e2139dc 100644 --- a/src/scenes/menu/menu.gd +++ b/src/scenes/menu/menu.gd @@ -1,7 +1,7 @@ extends Node func game_start(): - get_tree().change_scene_to(Global.GAME_SCENE) + get_tree().change_scene_to(Global.game_scene) func game_exit(): get_tree().quit(0)