From 0aa90ea4b310875966dc52e9a0a155132ae945ca Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Wed, 2 Aug 2023 20:01:11 -0700 Subject: [PATCH] menu 9-patch rect --- Assets/Sprites/UI/menu-rect.ase | Bin 0 -> 2019 bytes Assets/Sprites/UI/menu-rect.png | Bin 0 -> 916 bytes Assets/Sprites/UI/menu-rect.png.import | 34 +++++++++++++++++++++++ Assets/Sprites/UI/swirl-01.ase | Bin 0 -> 905 bytes Assets/Sprites/UI/swirl-02.ase | Bin 0 -> 905 bytes Characters/Player.tscn | 36 ++++++++++++------------- Dialogue/Balloon.cs | 6 ++--- Dialogue/balloon.tscn | 17 +++++++----- Entities/ArenaEntrance.tscn | 7 ++--- Entities/UnwantedFrequency.cs | 1 + Scenes/Maps/Arena.tscn | 4 +-- project-todo.org | 8 ++++++ 12 files changed, 80 insertions(+), 33 deletions(-) create mode 100644 Assets/Sprites/UI/menu-rect.ase create mode 100644 Assets/Sprites/UI/menu-rect.png create mode 100644 Assets/Sprites/UI/menu-rect.png.import create mode 100644 Assets/Sprites/UI/swirl-01.ase create mode 100644 Assets/Sprites/UI/swirl-02.ase diff --git a/Assets/Sprites/UI/menu-rect.ase b/Assets/Sprites/UI/menu-rect.ase new file mode 100644 index 0000000000000000000000000000000000000000..e94e69d13c6cfe89b898884dfe5a7882aef95cdf GIT binary patch literal 2019 zcmc(fdrVVj7>5rQ?50RX6vZMfi$o<_E{am*qTKO6*DL`)Ao{`t-ElcfR-gJ?}Z~ zr4mGUu>lc=7n3j`2x2SVe;(d{p8h9i5vZ>jHhy2V3|p{ZzN_l>*P1$l_=sWx(#)oU zbOr--SmF!@Me@Md1A9O#iYe$aaXPrtf}E3Q!vf1(T)?W305F{!4CZW)15fNt2dht? z2Jgva;EVQl@U=<>T23$o?dW7(&$;B995%ToZ{>V2p1T;_o8%3Cb37cZl#zQlwPFfb z9!dvqq}YIMN6G3#wH%W2WKh*ZR*Z@B1;yE$!K2bBu>3|ESlyNZ%KP%cr^6NCBu`6l zO3*BDL9!j_mFo`jC2PQ(+GvmnBv)p}?+005lGl1xT>_Ka>Oskq8gLrj4`kQ|fh@N$ z(4DgrTrCiTyuxCTZfpfEm`-N&ndbp=>`23VHj#Tip4bRVi`2SSlr$vo9I|O>4myLj zpeJYux`9@p4`>290R3yy%~=cKmR7hTh@}KOELy+^G_CjhFxq-TN&Z!ULRK z_^id?W5Sv+tc~YoUQTyiZCzWvDXJ=C;rnF%1YFF-~vi zEMfw79uc-|4~VM#=^2D=DVkq1jIb%YyEp2s-SIm+fxoERlE2+m+K*M9Fg5wsq~9Bgtz9yC}wIbI%>hbBt5@ z#mAQ_dYeZT+KTQuEPlzW4(BuX1nD|$V*30??%6e8jhG32<&5x~;iKBr`~=gH&rHP1 zhHKxt`l+4I-4%r-UG%=lA1;qDsd2h#+AyPUvM{d6=Xv|?67?>{WohX84DPI^R{r=h zwTq>h`b<`H?vZoit%=dSn;KsG+PsV&D;Is|s2kYiQuW*98=g%|Y%hw(Dk`qqx_M;r zeU5EBER?#gyqdrovT~%?ab@c4o)gDr)?Lzu9BCYjX|4};?p5B7+E-sVJRnnE>R;y_ z+1;j#SaGVcw5!zTg>g#Mt)&@V7OJMAr14b?`%fjC8!QH?y^R2Ql#8FK#}epC0a literal 0 HcmV?d00001 diff --git a/Assets/Sprites/UI/menu-rect.png b/Assets/Sprites/UI/menu-rect.png new file mode 100644 index 0000000000000000000000000000000000000000..93794eecea224fa094d275ccea6bdfa3b5b064ef GIT binary patch literal 916 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V2<{5aSW-L^LFmp!rKM{Zr5jB zSr9Ve;!({;V=aet(UqII9`LNbuz}fhqKt|YcY>qN+Y9m%_3zan6V1vHX1GyCY)4xsEU2 z^iEpRw5dslRgSGfF7*Zfv+}ixy^1}5l`5MiZ+kfDx!(~n!LWvT57*0ANBVD{9`&jH zU&^`#lNN+|gsio%bUO28P zxlklp!{cwaSv|4#S9byTFP*J5dR5{s|7@*G81Bn*F$i-?{0c74*Zi-(=1&o8!$JlF z5r#IV0|5*YTnx^P2^tJMgGF#n*qO;sB1ES~9AMSvIb@YIf8h-O(A0eM>ybyo1*b?@ye-;$>G;3dwW#9OJKg`$y6Mt&FY2mAmfewGV%?vpzd9^& z?#s(s^KO*RpU|IPcju=_t$4~+5C62r&?#~Mb8jt6ceu6OR538-B(JBL*y?_-ta7=t zqD#VkcFtLQVl~U^xG1a2)|Tse;a?l?ZECnB;dS!*(leLubb6>{9IBBt@7$19kZ@~~ z$tqphBX`#3c~4Ob+H(JVPxY@kPyOClpLNZ5F3r7jTyy^QQ)j~h6<18t6ipH+*5|uOEi4e?kLofUoXfU-X`(R#74N~W4h#wS*(+izwO$jpu zNkuXvLBXpHMT9Am;EmVK34(OdO;QQ-qAr}ztEkX@2hMZO*!KS4-}5_XP%Fglj7I21 zgiwV>2vNs*eiWVG{+GK*=KtN-olW(yg(UTKYT>^#Lqc5C#=uzpRj3$^Ff%6?+8Z3O z`LzqCXsbsz_v7GVl>#@qQej|JPXE1Tlk_`b z@SB|2)N%*9-#me%bB%CuqZ_US`k?>&7~I=mf|soZ7-vt08BQ}Sd|LqPXCK3%wP#Q~ zk}Ioiub^o}{@3bTfX=`=oc*y1iUiVag`DK literal 0 HcmV?d00001 diff --git a/Assets/Sprites/UI/swirl-02.ase b/Assets/Sprites/UI/swirl-02.ase new file mode 100644 index 0000000000000000000000000000000000000000..816e8c78f08fb4fc3534e382b8793fe061851a59 GIT binary patch literal 905 zcmcJOT}V@59EV@sLQ_kciHx&$&ds1CHw04~q_NqTvt(V26r9eFitqy^af$fB$PuxE z#844GE(Y$_k%*un7~Xgne$1<|@FpP#>!NPf^CBvE-+}Y&9Cr5p-{12)d!rNLTR24+ zM5fS0iV&ii^Yo}Vz5Fj%=b8UEu0NSN&lZf@@l@y8nMonibr)fF&Sj{mDl9B1g`THA z*g8B2&ALm_o|y+-M)}Npixtk>?Qps70UYqwz))u!oERE_E3>n3CmMync6Z^QL;{*J z^w6frxsI!HP4`W?rq6X9c6f{7P)`M%8gGP4QMrfdN&{S|SKxZD1;$3@^utxRsbB-{joJT_wzH%RqjDG-vh0;8ep0GC4AT(guclzRI<#lAWvqzbFCb@ zZPM`I6S?Q{?hP23`JLQiq+Y%`vNXz}8ET;u3ZV_Epa)8z0rcY@@mNPWzLAY-G~*b- z*hMW~k&01t;u4WqL?Ql=hdH$23}M(p6`qiUA@tw|F<3zfK9GS4G~fUMq$fJL2~A?+ zl9iyOBqI3;M>1lmGL^>5d2$d}q=_outClXU@G&>%w4?8msYjm_!=K1M+0>w!`xd=% x)i^Sf`z5P!?f#8`DViP$f2{d2ym@=f*=ice54M{v``^D-hl(;%h3lX>@DF_z5xxKb literal 0 HcmV?d00001 diff --git a/Characters/Player.tscn b/Characters/Player.tscn index e2a9c1e..8fb4bed 100644 --- a/Characters/Player.tscn +++ b/Characters/Player.tscn @@ -73,6 +73,24 @@ tracks/2/keys = { "values": [0] } +[sub_resource type="Animation" id="Animation_xt1sg"] +resource_name = "emote" +length = 2.12501 +loop_mode = 1 +step = 0.125 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("%Sprites/Node2D/Character:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1, 1.125, 1.25, 1.375, 1.5, 1.625, 1.75, 1.875, 2), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 1, +"values": [18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34] +} + [sub_resource type="Animation" id="Animation_mg66i"] resource_name = "idle" length = 0.5 @@ -157,24 +175,6 @@ tracks/0/keys = { "values": [10, 0] } -[sub_resource type="Animation" id="Animation_xt1sg"] -resource_name = "emote" -length = 2.12501 -loop_mode = 1 -step = 0.125 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("%Sprites/Node2D/Character:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1, 1.125, 1.25, 1.375, 1.5, 1.625, 1.75, 1.875, 2), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_0tohi"] _data = { "RESET": SubResource("Animation_imqdv"), diff --git a/Dialogue/Balloon.cs b/Dialogue/Balloon.cs index c1f057c..1299e49 100644 --- a/Dialogue/Balloon.cs +++ b/Dialogue/Balloon.cs @@ -12,7 +12,7 @@ public partial class Balloon : CanvasLayer Color VISIBLE = new Color(1f, 1f, 1f, 1f); Color INVISIBLE = new Color(1f, 1f, 1f, 0f); - ColorRect balloon; + NinePatchRect balloon; MarginContainer margin; RichTextLabel characterLabel; RichTextLabel dialogueLabel; @@ -46,14 +46,12 @@ public partial class Balloon : CanvasLayer public override void _Ready() { - balloon = GetNode("Balloon"); + balloon = GetNode("Balloon"); margin = GetNode("Balloon/Margin"); characterLabel = GetNode("Balloon/Margin/VBox/CharacterLabel"); dialogueLabel = GetNode("Balloon/Margin/VBox/DialogueLabel"); responsesMenu = GetNode("Balloon/Margin/VBox/Responses"); responseTemplate = GetNode("Balloon/Margin/VBox/ResponseTemplate"); - GD.Print("responses menu is " + responsesMenu); - GD.Print("lulw"); responseTemplate.Hide(); balloon.Hide(); diff --git a/Dialogue/balloon.tscn b/Dialogue/balloon.tscn index 39c9509..ade5426 100644 --- a/Dialogue/balloon.tscn +++ b/Dialogue/balloon.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://73jm5qjy52vq"] +[gd_scene load_steps=8 format=3 uid="uid://73jm5qjy52vq"] [ext_resource type="Script" path="res://Dialogue/Balloon.cs" id="1_obwi7"] [ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_a8ve6"] +[ext_resource type="Texture2D" uid="uid://dcy8iheoqxnjn" path="res://Assets/Sprites/UI/menu-rect.png" id="2_i5a6k"] [ext_resource type="Theme" uid="uid://cksjbu3vrup5" path="res://UI/Themes/supalidl.tres" id="2_kowbc"] [ext_resource type="FontFile" uid="uid://bo3obq6sos7lu" path="res://Assets/Fonts/compass-pro.ttf" id="4_8e5aq"] @@ -23,8 +24,12 @@ draw_center = false layer = 100 script = ExtResource("1_obwi7") -[node name="Balloon" type="ColorRect" parent="."] -color = Color(0.117647, 0.113725, 0.223529, 0.313726) +[node name="Balloon" type="NinePatchRect" parent="."] +texture = ExtResource("2_i5a6k") +patch_margin_left = 32 +patch_margin_top = 32 +patch_margin_right = 32 +patch_margin_bottom = 32 [node name="Margin" type="MarginContainer" parent="Balloon"] layout_mode = 0 @@ -45,8 +50,8 @@ theme_override_constants/separation = 10 [node name="CharacterLabel" type="RichTextLabel" parent="Balloon/Margin/VBox"] layout_mode = 2 mouse_filter = 1 -theme_override_colors/font_shadow_color = Color(0.0352941, 0.0392157, 0.0784314, 1) -theme_override_colors/font_outline_color = Color(0.117647, 0.113725, 0.223529, 1) +theme_override_colors/font_shadow_color = Color(0.105882, 0.0470588, 0.117647, 1) +theme_override_colors/font_outline_color = Color(0.270588, 0.160784, 0.247059, 1) theme_override_constants/shadow_offset_x = 2 theme_override_constants/shadow_offset_y = 3 theme_override_constants/outline_size = 8 @@ -57,7 +62,7 @@ scroll_active = false [node name="DialogueLabel" parent="Balloon/Margin/VBox" instance=ExtResource("2_a8ve6")] layout_mode = 2 -theme_override_colors/font_outline_color = Color(0.117647, 0.113725, 0.223529, 1) +theme_override_colors/font_outline_color = Color(0.270588, 0.160784, 0.247059, 1) theme_override_constants/outline_size = 4 theme_override_fonts/normal_font = ExtResource("4_8e5aq") text = "I bought a whole bunch of shungite." diff --git a/Entities/ArenaEntrance.tscn b/Entities/ArenaEntrance.tscn index 2164bdb..0e2f553 100644 --- a/Entities/ArenaEntrance.tscn +++ b/Entities/ArenaEntrance.tscn @@ -4,8 +4,8 @@ [ext_resource type="PackedScene" uid="uid://dldnp8eunxj3q" path="res://BoundingBoxes/InteractionTrigger.tscn" id="2_87s4g"] [ext_resource type="Script" path="res://BoundingBoxes/ConnectorBox.cs" id="3_4rsih"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_m4g2i"] -size = Vector2(32, 32) +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_7pr7c"] +height = 50.0 [sub_resource type="RectangleShape2D" id="RectangleShape2D_djn8q"] @@ -19,7 +19,8 @@ hframes = 2 [node name="InteractionTrigger" parent="." instance=ExtResource("2_87s4g")] [node name="CollisionShape2D" parent="InteractionTrigger" index="0"] -shape = SubResource("RectangleShape2D_m4g2i") +rotation = 1.5708 +shape = SubResource("CapsuleShape2D_7pr7c") [node name="Area2D" type="Area2D" parent="." node_paths=PackedStringArray("InteractionTrigger", "Collision")] script = ExtResource("3_4rsih") diff --git a/Entities/UnwantedFrequency.cs b/Entities/UnwantedFrequency.cs index 53e00ee..cb9bb48 100644 --- a/Entities/UnwantedFrequency.cs +++ b/Entities/UnwantedFrequency.cs @@ -16,6 +16,7 @@ public partial class UnwantedFrequency : Projectile, Utils.ITarget public GpuParticles2D DeathParticles { get; set; } public GpuParticles2D SpawnParticles { get; set; } public Timer DeferDeathTimer { get; set; } + public SceneTreeTimer DeferNeutralTeamTimer { get; set; } private double _currentLifetime = 0; diff --git a/Scenes/Maps/Arena.tscn b/Scenes/Maps/Arena.tscn index a585ca2..42120e3 100644 --- a/Scenes/Maps/Arena.tscn +++ b/Scenes/Maps/Arena.tscn @@ -11,7 +11,7 @@ [ext_resource type="PackedScene" uid="uid://dldnp8eunxj3q" path="res://BoundingBoxes/InteractionTrigger.tscn" id="9_3401j"] [ext_resource type="Script" path="res://BoundingBoxes/ConnectorBox.cs" id="9_fg062"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_rp1a6"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_iqdtp"] resource_local_to_scene = true shader = ExtResource("5_h8k5p") shader_parameter/color = Quaternion(1, 1, 1, 1) @@ -111,7 +111,7 @@ visible = false position = Vector2(120, -112) [node name="Doc" parent="Entities" index="0" instance=ExtResource("4_ej0f3")] -material = SubResource("ShaderMaterial_rp1a6") +material = SubResource("ShaderMaterial_iqdtp") [node name="PointLight2D" type="PointLight2D" parent="Entities" index="1"] position = Vector2(168, -42) diff --git a/project-todo.org b/project-todo.org index 1188275..4e6d18e 100644 --- a/project-todo.org +++ b/project-todo.org @@ -25,7 +25,15 @@ CLOSED: [2023-07-24 Mon] CLOSED: [2023-07-25 Tue] * TODO Short arena entrance +CLOSED: [2023-08-02 Wed] * DONE Video demonstration CLOSED: [2023-07-25 Tue] +* TODO Combo Attacks ("Level system") + +** TODO Healing + +** TODO Alt attack + +** TODO Max level