menu 9-patch rect

Assets/Sprites/UI/menu-rect.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dcy8iheoqxnjn"
+path="res://.godot/imported/menu-rect.png-79beaf7027685d7d59324c771b7addc3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/UI/menu-rect.png"
+dest_files=["res://.godot/imported/menu-rect.png-79beaf7027685d7d59324c771b7addc3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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

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"),

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<ColorRect>("Balloon");
+    balloon = GetNode<NinePatchRect>("Balloon");
     margin = GetNode<MarginContainer>("Balloon/Margin");
     characterLabel = GetNode<RichTextLabel>("Balloon/Margin/VBox/CharacterLabel");
     dialogueLabel = GetNode<RichTextLabel>("Balloon/Margin/VBox/DialogueLabel");
     responsesMenu = GetNode<VBoxContainer>("Balloon/Margin/VBox/Responses");
     responseTemplate = GetNode<RichTextLabel>("Balloon/Margin/VBox/ResponseTemplate");
-    GD.Print("responses menu is " + responsesMenu);
-    GD.Print("lulw");
 
     responseTemplate.Hide();
     balloon.Hide();

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="."]
+[node name="Balloon" type="NinePatchRect" parent="."]
-color = Color(0.117647, 0.113725, 0.223529, 0.313726)
+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_shadow_color = Color(0.105882, 0.0470588, 0.117647, 1)
-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/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."

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"]
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_7pr7c"]
-size = Vector2(32, 32)
+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")

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;
 

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)

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