Finished event 2

cornerloan · LifeHckr · commit d4b994f7de98 · 2025-05-10T12:41:19.000-07:00
Now no longer costs money to play. All spin odds are equal chance to occur. Wheel colors are synced to events, in case we decide to add art to each segment.

4 positive events, 2 negative events
diff --git a/Classes/Events/Assets/Event2.png b/Classes/Events/Assets/Event2.png
diff --git a/Classes/Events/Assets/Event2.png.import b/Classes/Events/Assets/Event2.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cex5vg2ycajdi"
+path="res://.godot/imported/Event2.png-a647bc6675ac54fecafbb5f9d56de04d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Events/Assets/Event2.png"
+dest_files=["res://.godot/imported/Event2.png-a647bc6675ac54fecafbb5f9d56de04d.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/Classes/Events/EventDatabase.cs b/Classes/Events/EventDatabase.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Threading.Tasks;
 using Godot;
 
 /// <summary>
@@ -15,23 +15,23 @@ public partial class EventDatabase
             ["EVENT_EVENT1_OPTION1", "EVENT_EVENT1_OPTION2", "EVENT_EVENT1_OPTION3"],
             ["EVENT_EVENT1_OUTCOME1", "EVENT_EVENT1_OUTCOME2", "EVENT_EVENT1_OUTCOME3"],
             [
-                (self) =>
+                async (self, node) =>
                 {
                     int randIndex = StageProducer.GlobalRng.RandiRange(
                         0,
                         StageProducer.PlayerStats.CurNotes.Length
                     );
                     StageProducer.PlayerStats.RemoveNote(randIndex);
                 },
-                (self) =>
+                async (self, node) =>
                 {
                     int randIndex = StageProducer.GlobalRng.RandiRange(
                         0,
                         StageProducer.PlayerStats.CurRelics.Length
                     );
                     StageProducer.PlayerStats.RemoveRelic(randIndex);
                 },
-                (self) =>
+                async (self, node) =>
                 {
                     StageProducer.PlayerStats.Money /= 2;
                 },
@@ -49,36 +49,55 @@ public partial class EventDatabase
             ["EVENT_EVENT2_OPTION1", "EVENT_EVENT2_OPTION2"],
             ["", "EVENT_EVENT2_OUTCOME1"],
             [
-                (self) =>
+                async (self, node) =>
                 {
-                    StageProducer.PlayerStats.Money -= 20;
-                    // [do nothing, get money back, win money, get note, get relic, heal]
-                    int spinOutcome = (int)
-                        StageProducer.GlobalRng.RandWeighted([13, 8, 5, 5, 3, 3]); //TODO: adjust odds
+                    var spinner = node.GetNodeOrNull<Sprite2D>("EventSprite");
+                    int spinOutcome = (int)StageProducer.GlobalRng.RandWeighted([1, 1, 1, 1, 1, 1]);
+
+                    int outcomeCount = 6;
+                    float sectorAngle = 360f / outcomeCount;
+                    float targetAngle = spinOutcome * sectorAngle;
+                    float fullSpins = 6 * 360f;
+                    float finalRotation = spinner.RotationDegrees % 360f + fullSpins + targetAngle;
+
+                    var tween = node.GetTree().CreateTween();
+                    tween
+                        .TweenProperty(spinner, "rotation_degrees", finalRotation, 2.5f)
+                        .SetTrans(Tween.TransitionType.Cubic)
+                        .SetEase(Tween.EaseType.Out);
+
+                    var tcs = new TaskCompletionSource<bool>();
+                    tween.TweenCallback(Callable.From(() => tcs.SetResult(true)));
+                    await tcs.Task;
+
                     switch (spinOutcome)
                     {
-                        case 0: //do nothing AKA lose
-                            GD.Print("owned lol");
+                        case 0:
+                            GD.Print("lost half money");
+                            StageProducer.PlayerStats.Money /= 2;
                             self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME2";
                             break;
-                        case 1: // get money back
-                            GD.Print("refund");
+                        case 1:
+                            GD.Print("took damage");
                             self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME3";
-                            StageProducer.PlayerStats.Money += 20;
+                            StageProducer.PlayerStats.CurrentHealth = Math.Max(
+                                1,
+                                StageProducer.PlayerStats.CurrentHealth - 10
+                            );
                             break;
-                        case 2: // get triple money
-                            GD.Print("triple money");
+                        case 2:
+                            GD.Print("gain money");
                             self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME4";
-                            StageProducer.PlayerStats.Money += 60;
+                            StageProducer.PlayerStats.Money += 50;
                             break;
-                        case 3: // get random note
+                        case 3:
                             GD.Print("random note");
                             self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME5";
                             StageProducer.PlayerStats.AddNote(
                                 Scribe.GetRandomRewardNotes(1, StageProducer.CurRoom + 10)[0]
                             );
                             break;
-                        case 4: // get random relic
+                        case 4:
                             GD.Print("random relic");
                             self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME6";
                             StageProducer.PlayerStats.AddRelic(
@@ -98,32 +117,34 @@ public partial class EventDatabase
                             );
                             break;
                     }
+
+                    GD.Print($"new description {self.OutcomeDescriptions[0]}");
                 },
-                (self) => {
-                    //does nothing
+                async (self, node) => {
+                    // does nothing
                 },
             ],
-            GD.Load<Texture2D>("res://Classes/Events/Assets/TEMP.png"),
-            [() => StageProducer.PlayerStats.Money >= 20, () => true]
+            GD.Load<Texture2D>("res://Classes/Events/Assets/Event2.png"),
+            [() => true, () => true]
         ),
         new EventTemplate(
             2,
             "EVENT_EVENT3_DESC",
             ["EVENT_EVENT3_OPTION1", "EVENT_EVENT3_OPTION2", "EVENT_EVENT3_OPTION3"],
             ["EVENT_EVENT3_OUTCOME1", "EVENT_EVENT3_OUTCOME2", "EVENT_EVENT3_OUTCOME3"],
             [
-                (self) =>
+                async (self, node) =>
                 {
                     StageProducer.PlayerStats.CurrentHealth = Math.Min(
                         StageProducer.PlayerStats.CurrentHealth + 10,
                         StageProducer.PlayerStats.MaxHealth
                     );
                 },
-                (self) =>
+                async (self, node) =>
                 {
                     StageProducer.PlayerStats.MaxComboBar -= 5;
                 },
-                (self) =>
+                async (self, node) =>
                 {
                     StageProducer.PlayerStats.Money -= 30;
                     StageProducer.PlayerStats.AddNote(Scribe.NoteDictionary[3]);
diff --git a/Classes/Events/EventTemplate.cs b/Classes/Events/EventTemplate.cs
@@ -1,8 +1,8 @@
 using System;
-using FunkEngine;
+using System.Threading.Tasks;
 using Godot;
 
-public delegate void EventAction(EventTemplate self);
+public delegate Task EventAction(EventTemplate self, Node contextNode);
 public delegate bool EventCondition();
 
 public partial class EventTemplate
@@ -12,8 +12,6 @@ public partial class EventTemplate
     public string[] ButtonDescriptions;
     public string[] OutcomeDescriptions;
     public Texture2D Texture;
-
-    // Note: Actions are NOT exported since delegates cannot be serialized
     public EventAction[] OptionActions;
     public EventCondition[] OptionEnabledConditions;
 
diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv
@@ -135,16 +135,16 @@ EVENT_EVENT1_OPTION3,"Give them half your gold",(TODO)
 EVENT_EVENT1_OUTCOME1,"You got robbed of a random note.",(TODO)
 EVENT_EVENT1_OUTCOME2,"You got robbed of a random relic.",(TODO)
 EVENT_EVENT1_OUTCOME3,"You got robbed of half your gold.",(TODO)
-EVENT_EVENT2_DESC,"There is a slot machine.",(TODO)
-EVENT_EVENT2_OPTION1,"Pay 20g to spin",(TODO)
-EVENT_EVENT2_OPTION2,"Ignore the machine",(TODO)
-EVENT_EVENT2_OUTCOME1,"You saved your money and moved on.",(TODO)
-EVENT_EVENT2_OUTCOME2,"You lost your money.",(TODO)
-EVENT_EVENT2_OUTCOME3,"You refunded your money.",(TODO)
-EVENT_EVENT2_OUTCOME4,"You tripled your money.",(TODO)
-EVENT_EVENT2_OUTCOME5,"You gained a random note.",(TODO)
-EVENT_EVENT2_OUTCOME6,"You gained a random relic.",(TODO)
-EVENT_EVENT2_OUTCOME7,"You gained some health.",(TODO)
+EVENT_EVENT2_DESC,"There is a wheel with different outcomes.",(TODO)
+EVENT_EVENT2_OPTION1,"Spin the wheel",(TODO)
+EVENT_EVENT2_OPTION2,"Ignore the cool wheel",(TODO)
+EVENT_EVENT2_OUTCOME1,"You decided not to spin the wheel.",(TODO)
+EVENT_EVENT2_OUTCOME2,"You lost half your money.",(TODO)
+EVENT_EVENT2_OUTCOME3,"You took some damage.",(TODO)
+EVENT_EVENT2_OUTCOME4,"You won a lot of money!",(TODO)
+EVENT_EVENT2_OUTCOME5,"You gained a random note!",(TODO)
+EVENT_EVENT2_OUTCOME6,"You gained a random relic!",(TODO)
+EVENT_EVENT2_OUTCOME7,"You gained some health!",(TODO)
 EVENT_EVENT3_DESC,"There is a field medic on the side of the road.",(TODO)
 EVENT_EVENT3_OPTION1,"Receive a bit of healing",(TODO)
 EVENT_EVENT3_OPTION2,"Decrease max energy",(TODO)
diff --git a/Scenes/EventScene/EventScene.cs b/Scenes/EventScene/EventScene.cs
@@ -82,10 +82,15 @@ public void DisplayEvent()
             button.Disabled = !isEnabled;
 
             int capturedIndex = i;
-            button.Pressed += () =>
+            button.Pressed += async () =>
             {
                 GD.Print($"Selected option: {_eventReference.ButtonDescriptions[capturedIndex]}");
-                _eventReference.OptionActions[capturedIndex]?.Invoke(_eventReference);
+
+                var action = _eventReference.OptionActions[capturedIndex];
+                if (action != null)
+                {
+                    await action(_eventReference, this);
+                }
                 AnyButtonPressed(capturedIndex);
             };
 
