Fix conflicts

Cargo.toml

@@ -8,6 +8,8 @@ edition = "2018"
 default = ["opengl"]
 terminal = ["minigene/terminal"]
 opengl = ["minigene/opengl"]
+# Note: A rendering backend must still be specified if running headlessly
+headless = ["minigene/headless"]
 wasm = ["wasm-bindgen", "minigene/wasm", "console_error_panic_hook", "opengl"]
 
 [dependencies]

assets/effector_defs.yaml

@@ -60,6 +60,12 @@ defs:
    effects:
      - - GoldGainMultiplier
        - MultiplicativeMultiplier: 2.0
+  Stun:
+    key: Stun
+    duration: 2.0
+    effects:
+      - - ActionPointRefillRate
+        - MultiplicativeMultiplier: 0.0
   AdditionalAttack:
     key: AdditionalAttack
     duration: 0.0

assets/leader_defs.yaml

@@ -12,12 +12,6 @@ defs:
     skills:
       - AttackSpeedIncrease
       - SlowAOE
-  Generic3:
-    key: Generic3
-    name: "Leader3"
-    skills:
-      - DoubleDamage
-      - AOE
   TreePersonLeader:
     key: TreePersonLeader
     name: "TreePersonLeader"
@@ -42,6 +36,12 @@ defs:
     skills:
       - GreedyTouch
       - AirCorrosion
+  Erno:
+    key: Erno
+    name: "Erno"
+    skills:
+      - SpellSteal
+      - Telekinesis
   SoulsCollector:
     key: SoulsCollector
     name: "SoulsCollector"

assets/skill_defs.yaml

@@ -166,6 +166,32 @@ defs:
           MinValue: 1.0
     item_conditions: []
     stat_effectors: []
+  SpellSteal:
+    key: SpellSteal
+    name: SpellSteal
+    friendly_name: spell_steal
+    description: Gain access to an ability belonging to a leader in range until the caster dies. Only one ability may be stolen at a time.
+    cooldown: 0.0
+    passive: true
+    conditions:
+      - stat_key: LeadersAround
+        condition:
+          MinValue: 1.0
+    item_conditions: []
+    stat_effectors: []
+  Telekinesis:
+    key: Telekinesis
+    name: Telekinesis
+    friendly_name: telekinesis
+    description: Hurls the nearest opponent at the second nearest opponent, stunning in an AOE around the landing site.
+    cooldown: 12.0
+    passive: true
+    conditions:
+      - stat_key: EnemiesAround
+        condition:
+          MinValue: 2.0
+    item_conditions: []
+    stat_effectors: []
   StealSoul:
     key: StealSoul
     name: Steal Soul

assets/stat_defs.yaml

@@ -12,7 +12,7 @@ defs:
     key: Health
     name: health
     friendly_name: HP
-    default_value: 100.0
+    default_value: 1000.0
     min_value: ~
     max_value: ~
     icon_path: ~
@@ -24,6 +24,14 @@ defs:
     min_value: ~
     max_value: ~
     icon_path: ~
+  LeadersAround:
+    key: LeadersAround
+    name: leaders_around
+    friendly_name: Leaders Around
+    default_value: 0.0
+    min_value: ~
+    max_value: ~
+    icon_path: ~
   AttackSpeed:
     key: AttackSpeed
     name: attack_speed
@@ -76,7 +84,7 @@ defs:
     key: ActionPointRefillRate
     name: action_point_refill_rate
     friendly_name: Action Point Refill Rate
-    default_value: 100.0
+    default_value: 15.0
     min_value: 0
     max_value: ~
     icon_path: ~