Finished except for temp icons

cornerloan · LifeHckr · commit 8026e742ed0e · 2025-06-20T17:41:45.000-07:00
I don't have it set up for every BattleEffectTrigger, so as we use more triggers we need to edit GetTriggerIcon() in EnemyDescriptions.cs
diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv
@@ -225,4 +225,3 @@ BOSSBLOOD_NOTE_DESCRIPTION,Blood heals based on timing,血液根据时机恢复
 SPIDER_NOTE_DESCRIPTION,Player gets poisoned based on timing,玩家根据时机中毒
 LWS_NOTE_DESCRIPTION,Deals damage plus half the number of loops,造成伤害并额外附加一半的循环次数
 MUSHROOM_NOTE_DESCRIPTION,Player gets poisoned based on timing,玩家根据时机中毒
-
diff --git a/Scenes/BattleDirector/Assets/BattleEndSymbol.png b/Scenes/BattleDirector/Assets/BattleEndSymbol.png
diff --git a/Scenes/BattleDirector/Assets/BattleEndSymbol.png.import b/Scenes/BattleDirector/Assets/BattleEndSymbol.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bmw2tkpmv22ew"
+path="res://.godot/imported/BattleEndSymbol.png-5c282cbc73fc3f3efd9a51295ca4bc9d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/BattleDirector/Assets/BattleEndSymbol.png"
+dest_files=["res://.godot/imported/BattleEndSymbol.png-5c282cbc73fc3f3efd9a51295ca4bc9d.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
diff --git a/Scenes/BattleDirector/Assets/BattleStartSymbol.png b/Scenes/BattleDirector/Assets/BattleStartSymbol.png
diff --git a/Scenes/BattleDirector/Assets/BattleStartSymbol.png.import b/Scenes/BattleDirector/Assets/BattleStartSymbol.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c5r2idc5x21ro"
+path="res://.godot/imported/BattleStartSymbol.png-a8cb230df43bb6721a2442dfafc1c8b6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/BattleDirector/Assets/BattleStartSymbol.png"
+dest_files=["res://.godot/imported/BattleStartSymbol.png-a8cb230df43bb6721a2442dfafc1c8b6.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
diff --git a/Scenes/BattleDirector/Assets/DamageInstanceSymbol.png b/Scenes/BattleDirector/Assets/DamageInstanceSymbol.png
diff --git a/Scenes/BattleDirector/Assets/DamageInstanceSymbol.png.import b/Scenes/BattleDirector/Assets/DamageInstanceSymbol.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dosjbiqlrb3cr"
+path="res://.godot/imported/DamageInstanceSymbol.png-9cd27c768e2ba03d6c47f5ac093aa1d8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/BattleDirector/Assets/DamageInstanceSymbol.png"
+dest_files=["res://.godot/imported/DamageInstanceSymbol.png-9cd27c768e2ba03d6c47f5ac093aa1d8.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
diff --git a/Scenes/BattleDirector/Assets/LoopSymbol.png b/Scenes/BattleDirector/Assets/LoopSymbol.png
diff --git a/Scenes/BattleDirector/Assets/LoopSymbol.png.import b/Scenes/BattleDirector/Assets/LoopSymbol.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://r7oc2aa06s24"
+path="res://.godot/imported/LoopSymbol.png-4d5a564a81d7d7d2248da6ec1ceb0061.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/BattleDirector/Assets/LoopSymbol.png"
+dest_files=["res://.godot/imported/LoopSymbol.png-4d5a564a81d7d7d2248da6ec1ceb0061.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
diff --git a/Scenes/BattleDirector/BattleScene.tscn b/Scenes/BattleDirector/BattleScene.tscn
@@ -102,10 +102,10 @@ offset_bottom = 360.0
 texture = ExtResource("7_klvil")
 
 [node name="StartButton" type="Button" parent="."]
-offset_left = 241.0
-offset_top = 230.0
-offset_right = 443.0
-offset_bottom = 267.0
+offset_left = 185.0
+offset_top = 200.0
+offset_right = 445.0
+offset_bottom = 248.0
 theme = ExtResource("8_62qim")
 text = "BATTLE_ROOM_BEGIN_BUTTON"
 
@@ -147,7 +147,7 @@ text = "5"
 
 [node name="EnemyDescriptions" parent="." instance=ExtResource("11_gbbxr")]
 z_index = 1
-offset_left = 559.0
-offset_top = 177.0
-offset_right = 559.0
-offset_bottom = 177.0
+offset_left = 170.0
+offset_top = 248.0
+offset_right = 170.0
+offset_bottom = 248.0
diff --git a/Scenes/BattleDirector/EnemyDescriptions.tscn b/Scenes/BattleDirector/EnemyDescriptions.tscn
@@ -14,13 +14,13 @@ script = ExtResource("1_r3tcc")
 DescriptionsContainer = NodePath("VBoxContainer")
 
 [node name="UiCenterFrame" type="Sprite2D" parent="."]
-scale = Vector2(0.84375, 3.5)
+scale = Vector2(3.02083, 1.88462)
 texture = ExtResource("2_mg2uj")
 centered = false
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 0
-offset_left = 8.0
-offset_top = 15.0
-offset_right = 75.0
-offset_bottom = 168.0
+offset_left = 15.0
+offset_top = 6.0
+offset_right = 275.0
+offset_bottom = 91.0
diff --git a/Scenes/BattleDirector/Scripts/BattleDirector.cs b/Scenes/BattleDirector/Scripts/BattleDirector.cs
@@ -142,6 +142,7 @@ public override void _Ready()
         {
             FocusedButton.QueueFree();
             FocusedButton = null;
+            Descriptions.QueueFree();
             StartCountdown();
         };
 
diff --git a/Scenes/BattleDirector/Scripts/EnemyDescriptions.cs b/Scenes/BattleDirector/Scripts/EnemyDescriptions.cs
@@ -1,40 +1,72 @@
 using System;
 using System.Collections.Generic;
+using FunkEngine;
 using Godot;
 
-public partial class EnemyDescriptions : Node
+public partial class EnemyDescriptions : Control
 {
-    public List<string> Descriptions = new List<string>();
-
     [Export]
     private VBoxContainer DescriptionsContainer;
 
+    private const string _loopIconPath = "res://Scenes/BattleDirector/Assets/LoopSymbol.png";
+    private const string _damageInstanceIconPath =
+        "res://Scenes/BattleDirector/Assets/DamageInstanceSymbol.png";
+    private const string _battleStartIconPath =
+        "res://Scenes/BattleDirector/Assets/BattleStartSymbol.png";
+    private const string _battleEndIconPath =
+        "res://Scenes/BattleDirector/Assets/BattleEndSymbol.png";
+
+    private bool _isVisible = false;
+
     public void Setup(EnemyPuppet enemy)
     {
         if (enemy.InitialNote != (0, 0))
-            Descriptions.Add(Scribe.NoteDictionary[enemy.InitialNote.NoteId].Description);
+        {
+            string desc = Scribe.NoteDictionary[enemy.InitialNote.NoteId].Description;
+            AddDescriptionRow(Scribe.NoteDictionary[enemy.InitialNote.NoteId].Texture, desc);
+            _isVisible = true;
+        }
 
         foreach (var effect in enemy.GetBattleEvents())
         {
             if (effect.Description != null)
-                Descriptions.Add(effect.Description);
+            {
+                Texture2D icon = GetTriggerIcon(effect.GetTrigger());
+                AddDescriptionRow(icon, effect.Description);
+                _isVisible = true;
+            }
         }
 
-        foreach (var description in Descriptions)
-        {
-            HBoxContainer hbox = new HBoxContainer();
+        Visible = _isVisible;
+    }
 
-            Sprite2D icon = new Sprite2D();
-            icon.Texture = Scribe.NoteDictionary[enemy.InitialNote.NoteId].Texture;
+    private void AddDescriptionRow(Texture2D iconTexture, string text)
+    {
+        HBoxContainer hbox = new HBoxContainer();
 
-            Label desc = new Label();
-            desc.Text = description;
-            desc.SizeFlagsHorizontal = Control.SizeFlags.ExpandFill;
-            desc.AutowrapMode = TextServer.AutowrapMode.WordSmart;
+        TextureRect icon = new TextureRect();
+        icon.Texture = iconTexture;
 
-            hbox.AddChild(icon);
-            hbox.AddChild(desc);
-            DescriptionsContainer.AddChild(hbox);
-        }
+        Label desc = new Label();
+        desc.Text = text;
+        desc.SizeFlagsHorizontal = Control.SizeFlags.ExpandFill;
+        desc.AutowrapMode = TextServer.AutowrapMode.WordSmart;
+
+        hbox.AddChild(icon);
+        hbox.AddChild(desc);
+        DescriptionsContainer.AddChild(hbox);
+    }
+
+    private Texture2D GetTriggerIcon(BattleEffectTrigger trigger)
+    {
+        //TODO: add more as we get more enemy effect triggers
+        return trigger switch
+        {
+            BattleEffectTrigger.OnLoop => GD.Load<Texture2D>(_loopIconPath),
+            BattleEffectTrigger.OnDamageInstance => GD.Load<Texture2D>(_damageInstanceIconPath),
+            BattleEffectTrigger.OnBattleStart => GD.Load<Texture2D>(_battleStartIconPath),
+            BattleEffectTrigger.OnBattleEnd => GD.Load<Texture2D>(_battleEndIconPath),
+            _ => null,
+        };
     }
 }
diff --git a/Scenes/Puppets/Enemies/Effigy/P_Effigy.cs b/Scenes/Puppets/Enemies/Effigy/P_Effigy.cs
@@ -40,7 +40,7 @@ public override void _Ready()
                 {
                     e.BD.DealDamage(Targetting.Player, e.BD.Player.GetCurrentHealth() - 1, null);
                 },
-                "EFFECT_EFFECT2"
+                "EFFIGY_EFFECT2"
             ),
             new EnemyEffect(
                 this,
