From 98b3202361da53188688136b0d94ed9383d7abc3 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Thu, 11 Sep 2025 04:42:59 +0200 Subject: [PATCH] Update FloatingTextManager colors and integrate floating text display in LeverComponent; replace enemy sprite in basic_enemy scene --- Autoloads/FloatingTextManager.cs | 6 ++--- objects/entities/basic_enemy.tscn | 6 ++--- scripts/components/LeverComponent.cs | 6 +++++ sprites/basic_enemy.png | Bin 0 -> 489 bytes sprites/basic_enemy.png.import | 34 +++++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 sprites/basic_enemy.png create mode 100644 sprites/basic_enemy.png.import diff --git a/Autoloads/FloatingTextManager.cs b/Autoloads/FloatingTextManager.cs index 43ed60f..5db0bb9 100644 --- a/Autoloads/FloatingTextManager.cs +++ b/Autoloads/FloatingTextManager.cs @@ -9,9 +9,9 @@ public partial class FloatingTextManager : Node [Export] public PackedScene FloatingTextScene { get; set; } [ExportGroup("Colors")] - [Export] public Color DamageColor { get; set; } = new Color("#ff4b4b"); // Red - [Export] public Color HealColor { get; set; } = new Color("#4bff65"); // Green - [Export] public Color CoinColor { get; set; } = new Color("#ffd700"); // Gold + [Export] public Color DamageColor { get; set; } = new Color("#b21030"); // Red + [Export] public Color HealColor { get; set; } = new Color("#71f341"); // Green + [Export] public Color CoinColor { get; set; } = new Color("#ebd320"); // Gold [Export] public Color MessageColor { get; set; } = new Color("#ffffff"); // White public void ShowDamage(float amount, Vector2 position) diff --git a/objects/entities/basic_enemy.tscn b/objects/entities/basic_enemy.tscn index dd39358..7e4dc71 100644 --- a/objects/entities/basic_enemy.tscn +++ b/objects/entities/basic_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=25 format=3 uid="uid://bockkmyn8il4c"] [ext_resource type="Shader" uid="uid://bs4xvm4qkurpr" path="res://shaders/hit_flash.tres" id="1_hh6y0"] -[ext_resource type="Texture2D" uid="uid://cu72810eyk4dx" path="res://sprites/enemy-robot.png" id="2_os2h8"] +[ext_resource type="Texture2D" uid="uid://duxx56wxmjoxd" path="res://sprites/basic_enemy.png" id="2_laaj3"] [ext_resource type="Script" uid="uid://dgb8bqcri7nsj" path="res://scripts/components/HealthComponent.cs" id="3_n6phc"] [ext_resource type="Script" uid="uid://2i7p7v135u7c" path="res://scripts/components/DamageComponent.cs" id="4_t0yic"] [ext_resource type="Script" uid="uid://d2hrr8fruho1d" path="res://scripts/components/SideToSideMovementComponent.cs" id="5_h333r"] @@ -68,7 +68,7 @@ shape = SubResource("RectangleShape2D_pwwji") [node name="Sprite2D" type="Sprite2D" parent="."] material = SubResource("ShaderMaterial_j18j0") -texture = ExtResource("2_os2h8") +texture = ExtResource("2_laaj3") [node name="right bullet spawn" type="Node2D" parent="Sprite2D"] position = Vector2(16, 7) @@ -149,7 +149,7 @@ FireFX = NodePath("../FireFX") [node name="IceEffectComponent" type="Node" parent="." node_paths=PackedStringArray("ComponentsToDisable", "StatusEffectComponent", "IceFx")] script = ExtResource("13_kga14") -ComponentsToDisable = [NodePath("../SideToSideMovement"), NodePath(""), NodePath("../DamageComponent")] +ComponentsToDisable = [NodePath("../SideToSideMovement"), null, NodePath("../DamageComponent")] StatusEffectComponent = NodePath("../StatusEffectComponent") IceFx = NodePath("../Ice FX") diff --git a/scripts/components/LeverComponent.cs b/scripts/components/LeverComponent.cs index db10217..67e7e70 100644 --- a/scripts/components/LeverComponent.cs +++ b/scripts/components/LeverComponent.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Godot; +using Mr.BrickAdventures.Autoloads; namespace Mr.BrickAdventures.scripts.components; @@ -14,9 +15,13 @@ public partial class LeverComponent : Node [Signal] public delegate void ActivatedEventHandler(); + + private FloatingTextManager _floatingTextManager; public override void _Ready() { + _floatingTextManager = GetNode("/root/FloatingTextManager"); + if (Area == null) { GD.PushError("LeverComponent: Area is not set."); @@ -46,6 +51,7 @@ public partial class LeverComponent : Node private async Task Activate() { EmitSignalActivated(); + _floatingTextManager?.ShowMessage("Activated!", ((Node2D)Owner).GlobalPosition); Sfx?.Play(); Sprite.Frame = StartAnimationIndex + 1; var timer = GetTree().CreateTimer(AnimationDuration); diff --git a/sprites/basic_enemy.png b/sprites/basic_enemy.png new file mode 100644 index 0000000000000000000000000000000000000000..d980fc991787e266460691748d785bc06e22dcb6 GIT binary patch literal 489 zcmVPx$qe(N@(iw|NZ}{I5AFkzk_S-m0FWrsUY9aFVG9aM zc*6A*Jb@G^BQR@w?c zWFSt9nRCv^afERk*>xK>A-v+%N)7D*pr$<( z0wzQdb-N*>NY-^xx4RJPunFPN