Fire trigger list containers;

Trigger support replacement description; Editor spawn from pool buttons; Always show cards setting;
makscee · Mar 19, 2024 · 93163b2 · 93163b2
1 parent bd5d7ff
commit 93163b2
Show file tree

Hide file tree

Showing 69 changed files with 937 additions and 529 deletions.
diff --git a/assets/ron/custom.battle.ron b/assets/ron/custom.battle.ron
@@ -1,54 +1,2 @@
 #![enable(implicit_some)]
-(
-    left: (
-        units: [
-            (
-                name: "Wizard",
-                hp: 3,
-                atk: 1,
-                houses: "Mages",
-                trigger: Fire(trigger: TurnEnd, target: RandomEnemy, effect: UseAbility("Magic Missile", 0)),
-            ),
-            (
-                name: "Wizard",
-                hp: 3,
-                atk: 1,
-                houses: "Mages",
-                trigger: Fire(trigger: TurnEnd, target: RandomEnemy, effect: UseAbility("Magic Missile", 0)),
-            ),
-            (
-                name: "Wizard",
-                hp: 3,
-                atk: 1,
-                houses: "Mages",
-                trigger: Fire(trigger: TurnEnd, target: RandomEnemy, effect: UseAbility("Magic Missile", 0)),
-            ),
-            (
-                name: "Wizard",
-                hp: 3,
-                atk: 1,
-                houses: "Mages",
-                trigger: Fire(trigger: TurnEnd, target: RandomEnemy, effect: UseAbility("Magic Missile", 0)),
-            ),
-        ],
-    ),
-    right: (
-        units: [
-            (name: "Priest", hp: 1, atk: 1, houses: "Holy"),
-            (
-                name: "Wizard",
-                hp: 3,
-                atk: 1,
-                houses: "Mages",
-                trigger: Fire(trigger: TurnEnd, target: RandomEnemy, effect: UseAbility("Magic Missile", 0)),
-            ),
-            (
-                name: "Wizard",
-                hp: 3,
-                atk: 1,
-                houses: "Mages",
-                trigger: Fire(trigger: TurnEnd, target: RandomEnemy, effect: UseAbility("Magic Missile", 0)),
-            ),
-        ],
-    ),
-)
+(left: (units: []), right: (units: []))
diff --git a/assets/ron/heroes/almsgiver.unit.ron b/assets/ron/heroes/almsgiver.unit.ron
@@ -3,7 +3,11 @@
     hp: 3,
     atk: 1,
     houses: "Holy",
-    trigger: Fire(trigger: AllySummon, target: Target, effect: UseAbility("Blessing", 0)),
+    trigger: Fire(
+        triggers: [(AllySummon, None)],
+        targets: [(Target, None)],
+        effects: [(UseAbility("Blessing", 0), None)],
+    ),
     representation: (
         material: Shape(
             shape: Circle(

diff --git a/assets/ron/heroes/bat.unit.ron b/assets/ron/heroes/bat.unit.ron
@@ -5,8 +5,12 @@
     stacks: 1,
     level: 1,
     houses: "Vampires",
-    description: "%trigger → use %effect on killer",
-    trigger: Fire(trigger: AllyDeath, target: TargetStateLast(LastAttacker), effect: UseAbility("Siphon", 2)),
+    description: "%trigger → %effect on %target",
+    trigger: Fire(
+        triggers: [(AllyDeath, None)],
+        targets: [(TargetStateLast(LastAttacker), Some("killer"))],
+        effects: [(UseAbility("Siphon", 2), None)],
+    ),
     representation: (
         material: Shape(
             shape: Circle(radius: Sum(Sum(Float(0.81), Mul(Index, Float(-0.17))), Mul(Beat, Float(0.05)))),
@@ -19,6 +23,7 @@
             ),
             alpha: Float(1.0),
         ),
+        children: [],
         mapping: {
             Offset: Vec2EE(
                 Zero,
@@ -27,4 +32,6 @@
         },
         count: 3,
     ),
+    state: (history: {}, birth: 0.0),
+    statuses: [],
 )
diff --git a/assets/ron/heroes/battlemage.unit.ron b/assets/ron/heroes/battlemage.unit.ron
@@ -5,11 +5,16 @@
     stacks: 1,
     level: 1,
     houses: "Mages",
-    description: "%trigger → %effectx3 on %target",
+    description: "%trigger → %effect",
     trigger: Fire(
-        trigger: AfterStrike,
-        target: RandomEnemy,
-        effect: Repeat(Int(3), WithTarget(RandomEnemy, UseAbility("Magic Missile", 0))),
+        triggers: [(AfterStrike, None)],
+        targets: [],
+        effects: [
+            (
+                Repeat(Int(3), WithTarget(RandomEnemy, UseAbility("Magic Missile", 0))),
+                Some("use [Magic Missile] ({Level}) on random enemy 3 times"),
+            ),
+        ],
     ),
     representation: (
         material: Shape(
@@ -18,6 +23,7 @@
             fill: Solid(color: OwnerState(Color)),
             alpha: Float(1.0),
         ),
+        children: [],
         mapping: {
             Offset: Mul(
                 UnitVec(Sum(Index, Mul(Sin(Sum(GameTime, Mul(Index, Float(10.0)))), PI2))),
@@ -26,4 +32,6 @@
         },
         count: 3,
     ),
+    state: (history: {}, birth: 0.0),
+    statuses: [],
 )
diff --git a/assets/ron/heroes/bolla.unit.ron b/assets/ron/heroes/bolla.unit.ron
@@ -1,12 +1,24 @@
-#![enable(implicit_some)]
 (
     name: "Bolla",
     hp: 1,
     atk: 1,
+    stacks: 1,
+    level: 1,
     houses: "Dragons",
-    trigger: Fire(trigger: TurnEnd, effect: UseAbility("Grow", 0)),
+    description: "%trigger → %effect on %target",
+    trigger: Fire(
+        triggers: [(TurnEnd, None)],
+        targets: [(Owner, Some("self"))],
+        effects: [(UseAbility("Grow", 0), None)],
+    ),
     representation: (
-        material: Shape(shape: Circle(radius: Float(0.5)), shape_type: Opaque, alpha: Float(0.2)),
+        material: Shape(
+            shape: Circle(radius: Float(0.5)),
+            shape_type: Opaque,
+            fill: Solid(color: OwnerState(Color)),
+            alpha: Float(0.2),
+        ),
+        children: [],
         mapping: {
             Offset: Mul(
                 UnitVec(

diff --git a/assets/ron/heroes/caster.unit.ron b/assets/ron/heroes/caster.unit.ron
@@ -5,11 +5,11 @@
     stacks: 1,
     level: 1,
     houses: "Mages",
-    description: "%trigger → %effect on killer",
+    description: "%trigger → %effect on %target",
     trigger: Fire(
-        trigger: AllyDeath,
-        target: TargetStateLast(LastAttacker),
-        effect: UseAbility("Magic Missile", 2),
+        triggers: [(AllyDeath, None)],
+        targets: [(TargetStateLast(LastAttacker), Some("killer"))],
+        effects: [(UseAbility("Magic Missile", 2), None)],
     ),
     representation: (
         material: Shape(
@@ -26,6 +26,8 @@
                     fill: Solid(color: OwnerState(Color)),
                     alpha: Float(1.0),
                 ),
+                children: [],
+                mapping: {},
                 count: 0,
             ),
         ],
@@ -37,4 +39,6 @@
         },
         count: 2,
     ),
+    state: (history: {}, birth: 0.0),
+    statuses: [],
 )
diff --git a/assets/ron/heroes/coach.unit.ron b/assets/ron/heroes/coach.unit.ron
@@ -6,7 +6,11 @@
     level: 1,
     houses: "Warriors",
     description: "%trigger → %effect on %target",
-    trigger: Fire(trigger: AllySummon, target: Target, effect: UseAbility("Strength", 0)),
+    trigger: Fire(
+        triggers: [(AllySummon, None)],
+        targets: [(Target, None)],
+        effects: [(UseAbility("Strength", 0), None)],
+    ),
     representation: (
         material: Shape(
             shape: Rectangle(

diff --git a/assets/ron/heroes/crusader.unit.ron b/assets/ron/heroes/crusader.unit.ron
@@ -5,20 +5,26 @@
     stacks: 1,
     level: 1,
     houses: "Holy",
-    description: "%trigger → gain {Level} [Blessing] per enemy",
+    description: "%trigger → %effect on %target",
     trigger: Fire(
-        trigger: BattleStart,
-        target: Owner,
-        effect: WithVar(
-            Faction,
-            OppositeFaction,
-            WithVar(Charges, UnitCount(Bool(true)), UseAbility("Blessing", 0)),
-        ),
+        triggers: [(BattleStart, None)],
+        targets: [(Owner, None)],
+        effects: [
+            (
+                WithVar(
+                    Faction,
+                    OppositeFaction,
+                    WithVar(Charges, UnitCount(Bool(true)), UseAbility("Blessing", 0)),
+                ),
+                Some("use [Blessing] ({Level}) per enemy"),
+            ),
+        ],
     ),
     representation: (
         material: Shape(
             shape: Rectangle(size: Vec2(0.5, 1.82)),
             shape_type: Line(thickness: Float(3.0)),
+            fill: Solid(color: OwnerState(Color)),
             alpha: Float(0.3),
         ),
         children: [],
@@ -31,4 +37,6 @@
         },
         count: 8,
     ),
+    state: (history: {}, birth: 0.0),
+    statuses: [],
 )
diff --git a/assets/ron/heroes/custodian.unit.ron b/assets/ron/heroes/custodian.unit.ron
@@ -6,7 +6,11 @@
     level: 1,
     houses: "Paladins",
     description: "%trigger → %effect on %target",
-    trigger: Fire(trigger: AllySummon, target: Target, effect: UseAbility("Shield", 0)),
+    trigger: Fire(
+        triggers: [(AllySummon, None)],
+        targets: [(Target, None)],
+        effects: [(UseAbility("Shield", 0), None)],
+    ),
     representation: (
         material: Shape(
             shape: Circle(

diff --git a/assets/ron/heroes/director.unit.ron b/assets/ron/heroes/director.unit.ron
@@ -6,7 +6,11 @@
     level: 1,
     houses: "Mages",
     description: "%trigger → %effect on %target",
-    trigger: Fire(trigger: AllySummon, target: RandomEnemy, effect: UseAbility("Magic Missile", 3)),
+    trigger: Fire(
+        triggers: [(AllySummon, None)],
+        targets: [(RandomEnemy, None)],
+        effects: [(UseAbility("Magic Missile", 3), None)],
+    ),
     representation: (
         material: Shape(
             shape: Circle(radius: Float(0.15)),

diff --git a/assets/ron/heroes/doppelganger.unit.ron b/assets/ron/heroes/doppelganger.unit.ron
@@ -4,7 +4,11 @@
     hp: 2,
     atk: 3,
     houses: "Shifters",
-    trigger: Fire(trigger: BattleStart, target: RandomAdjacentUnit, effect: UseAbility("Copy", 0)),
+    trigger: Fire(
+        triggers: [(BattleStart, None)],
+        targets: [(RandomAdjacentUnit, None)],
+        effects: [(UseAbility("Copy", 0), None)],
+    ),
     representation: (
         material: Shape(
             shape: Circle(radius: Float(0.72)),
@@ -13,7 +17,10 @@
         ),
         children: [],
         mapping: {
-            Offset: Mul(UnitVec(Mul(IntFloat(OwnerState(Index)), Mul(PI, Float(0.5)))), Mul(Beat, Float(0.5))),
+            Offset: Mul(
+                UnitVec(Mul(IntFloat(OwnerState(Index)), Mul(PI, Float(0.5)))),
+                Mul(Beat, Float(0.5)),
+            ),
         },
         count: 4,
     ),

diff --git a/assets/ron/heroes/enhancer.unit.ron b/assets/ron/heroes/enhancer.unit.ron
@@ -5,11 +5,11 @@
     stacks: 1,
     level: 1,
     houses: "Mages",
-    description: "%trigger → [Magic Missile] {+1} {DMG}",
+    description: "%trigger → %effect",
     trigger: Fire(
-        trigger: BattleStart,
-        target: Owner,
-        effect: AbilityStateAddVar("Magic Missile", Value, Int(1)),
+        triggers: [(BattleStart, None)],
+        targets: [],
+        effects: [(AbilityStateAddVar("Magic Missile", Damage, Context(Level)), None)],
     ),
     representation: (
         material: Shape(
@@ -27,4 +27,6 @@
         mapping: {T: Sin(Sum(GameTime, Index))},
         count: 4,
     ),
+    state: (history: {}, birth: 0.0),
+    statuses: [],
 )
diff --git a/assets/ron/heroes/equalizer.unit.ron b/assets/ron/heroes/equalizer.unit.ron
@@ -7,7 +7,11 @@
     level: 1,
     houses: "Alchemists",
     description: "%trigger → %effect on %target",
-    trigger: Fire(trigger: BattleStart, target: AllUnits, effect: UseAbility("Petrify", 0)),
+    trigger: Fire(
+        triggers: [(BattleStart, None)],
+        targets: [(AllUnits, None)],
+        effects: [(UseAbility("Petrify", 0), None)],
+    ),
     representation: (
         material: None,
         children: [

diff --git a/assets/ron/heroes/experimenter.unit.ron b/assets/ron/heroes/experimenter.unit.ron
@@ -5,11 +5,16 @@
     stacks: 1,
     level: 1,
     houses: "Death Knights",
-    description: "[Skeleton] apply [Plague] on damage dealt",
+    description: "%trigger → %effect",
     trigger: Fire(
-        trigger: BattleStart,
-        target: Owner,
-        effect: AbilityStateAddVar("Summon Skeleton", T, String("Plague on damage dealt")),
+        triggers: [(BattleStart, None)],
+        targets: [],
+        effects: [
+            (
+                AbilityStateAddVar("Summon Skeleton", T, String("Plague on damage dealt")),
+                Some("[Skeleton] applies [Plague] on attack"),
+            ),
+        ],
     ),
     representation: (
         material: Shape(
@@ -27,4 +32,6 @@
         mapping: {T: Sin(Sum(GameTime, Index))},
         count: 4,
     ),
+    state: (history: {}, birth: 0.0),
+    statuses: [],
 )
diff --git a/assets/ron/heroes/famin.unit.ron b/assets/ron/heroes/famin.unit.ron
@@ -6,7 +6,11 @@
     level: 1,
     houses: "Death Knights",
     description: "%trigger → %effect on %target",
-    trigger: Fire(trigger: Period(0, 4, TurnEnd), target: AllEnemyUnits, effect: UseAbility("Plague", 0)),
+    trigger: Fire(
+        triggers: [(Period(0, 4, TurnEnd), Some("Every 5 Turns"))],
+        targets: [(AllEnemyUnits, None)],
+        effects: [(UseAbility("Plague", 0), None)],
+    ),
     representation: (
         material: Shape(
             shape: Circle(radius: Float(0.12)),

diff --git a/assets/ron/heroes/fertilizer.unit.ron b/assets/ron/heroes/fertilizer.unit.ron
@@ -6,7 +6,11 @@
     level: 1,
     houses: "Druids",
     description: "%trigger → %effect on %target",
-    trigger: Fire(trigger: BattleStart, target: AllAllyUnits, effect: UseAbility("Thorns", 0)),
+    trigger: Fire(
+        triggers: [(BattleStart, None)],
+        targets: [(AllAllyUnits, None)],
+        effects: [(UseAbility("Thorns", 0), None)],
+    ),
     representation: (
         material: Shape(
             shape: Rectangle(size: Vec2E(Float(1.0))),