Merge pull request #469 from CactusPuppy/season-8

feat: add Mauga
ItsDeltin · Dec 5, 2023 · 8575937 · 8575937
2 parents 8fb2fd4 + b81a035
commit 8575937
Show file tree

Hide file tree

Showing 5 changed files with 178 additions and 2 deletions.
diff --git a/Deltinteger/Deltinteger/Decompiler/TextToElement/EventInfo.cs b/Deltinteger/Deltinteger/Decompiler/TextToElement/EventInfo.cs
@@ -37,6 +37,7 @@ public class EventInfo
             ("Lifeweaver", PlayerSelector.Lifeweaver),
             ("Illari", PlayerSelector.Illari),
             ("Lúcio", PlayerSelector.Lucio),
+            ("Mauga", PlayerSelector.Mauga),
             ("McCree", PlayerSelector.Cassidy),
             ("Mei", PlayerSelector.Mei),
             ("Mercy", PlayerSelector.Mercy),

diff --git a/Deltinteger/Deltinteger/Elements.json b/Deltinteger/Deltinteger/Elements.json
@@ -6646,7 +6646,8 @@
         "Kiriko",
         "Ramattra",
         "Lifeweaver",
-        "Illari"
+        "Illari",
+        "Mauga",
       ]
     },
     "Hero": [
@@ -6673,6 +6674,7 @@
         "name": "Lúcio",
         "alias": "Lucio"
       },
+      "Mauga",
       "Mei",
       "Mercy",
       "Moira",

diff --git a/Deltinteger/Deltinteger/Elements/Enums.cs b/Deltinteger/Deltinteger/Elements/Enums.cs
@@ -79,7 +79,8 @@ public enum PlayerSelector
         Kiriko,
         Ramattra,
         Lifeweaver,
-        Illari
+        Illari,
+        Mauga,
     }
 
     public enum Team

diff --git a/Deltinteger/Deltinteger/Lobby/Heroes.cs b/Deltinteger/Deltinteger/Lobby/Heroes.cs
@@ -219,6 +219,13 @@ public static void Init()
                 new HeroSettingCollection("Kiriko").AddUlt("Kitsune Rush", hasDuration: true).AddProjectile(false).AddSecondaryFire().AddHealer().AddAbility("Swift Step").AddRange("Swift Step Distance Scalar", 20, 300).AddAbility("Protection Suzu", hasKnockback: true),
                 new HeroSettingCollection("Lifeweaver").AddUlt("Tree of Life").AddRange("Tree of Life Health", 50, 300).AddProjectile(true).AddHealer().AddAbility("Rejuvenating Dash").AddRange("Rejuvenating Dash Healing", 0, 500).AddAbility("Petal Platform").AddRange("Petal Platform Health", 25, 500).AddAbility("Life Grip").AddRange("Life Grip and Healing Blossom Range", 20, 200).AddSelectRef("Weapons Enabled Lifeweaver", "Weapons Enabled", "All", "Healing Blossom Only", "Thorn Volley Only"),
                 new HeroSettingCollection("Lúcio").AddUlt("Sound Barrier").AddHealer().AddProjectile(false).AddAbility("Amp It Up").AddAbility("Crossfade", hasCooldown: false).AddAbility("Soundwave", hasKnockback: true),
+                new HeroSettingCollection("Mauga")
+                    .AddProjectile(false)
+                    .AddUlt("Cage Fight")
+                    .AddAbility("Incendiary Chaingun", false).AddRange("Incendiary Chaingun Ignite Damage").AddRange("Incendiary Chaingun Ignite Duration").AddRange("Incendiary Chaingun Ignite Rate")
+                    .AddAbility("Volatile Chaingun", false)
+                    .AddAbility("Cardiac Overdrive").AddRange("Cardiac Overdrive Healing", 0, 400)
+                    .AddAbility("Overrun").AddRange("Overrun Knockback", 0, 300),
                 new HeroSettingCollection("Mei").AddUlt("Blizzard").AddProjectile(true).AddSecondaryFire().AddHealer().AddAbility("Cryo-Freeze").AddAbility("Ice Wall").AddRange("Blizzard Freeze Minimum", 0, 100, 50).AddRange("Blizzard Freeze Rate Scalar").AddSwitch("Freeze Stacking", false).AddRange("Weapon Freeze Duration Scalar", 20).AddRange("Weapon Freeze Minimum", 0, 100, 30).AddRange("Weapon Freeze Rate Scalar"),
                 new HeroSettingCollection("Mercy").AddUlt("Valkyrie").AddProjectile(false).AddSecondaryFire().AddHealer().AddAbility("Guardian Angel").AddAbility("Sympathetic Recovery", hasCooldown: false).AddAbility("Resurrect").AddSelectRef("Weapons Enabled Mercy", "Weapons Enabled", "All", "Caduceus Staff Only", "Caduceus Blaster Only"),
                 new HeroSettingCollection("Moira").AddUlt("Coalescence", hasDuration: true).AddProjectile(false).AddSecondaryFire().RemoveAmmunition().AddHealer().AddAbility("Fade").AddAbility("Biotic Orb").AddRange("Biotic Orb Max Damage Scalar", 10).AddRange("Biotic Orb Max Healing Scalar", 10).AddRange("Biotic Energy Maximum", 20).AddRange("Biotic Energy Recharge Rate"),

diff --git a/overwatch-script-to-workshop/json-schemas/LobbySettingValidation.json b/overwatch-script-to-workshop/json-schemas/LobbySettingValidation.json
@@ -1931,6 +1931,77 @@
       "type": "number",
       "maximum": 500.0
     },
+    "Ultimate Ability (Cage Fight)": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Ultimate Generation (Cage Fight)": {
+      "default": 100.0,
+      "type": "number",
+      "minimum": 10.0,
+      "maximum": 500.0
+    },
+    "Ultimate Generation - Passive (Cage Fight)": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Ultimate Generation - Combat (Cage Fight)": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Incendiary Chaingun": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Incendiary Chaingun Ignite Damage": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Incendiary Chaingun Ignite Duration": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Incendiary Chaingun Ignite Rate": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Volatile Chaingun": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Cardiac Overdrive": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Cardiac Overdrive Cooldown Time": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Cardiac Overdrive Healing": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 400.0
+    },
+    "Overrun": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Overrun Cooldown Time": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Overrun Knockback": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 300.0
+    },
     "Ultimate Ability (Blizzard)": {
       "default": true,
       "type": "boolean"
@@ -3027,6 +3098,7 @@
           "Kiriko",
           "Lifeweaver",
           "Lúcio",
+          "Mauga",
           "Mei",
           "Mercy",
           "Moira",
@@ -4607,6 +4679,99 @@
           },
           "additionalProperties": false
         },
+        "Mauga": {
+          "description": "'Mauga' hero settings.",
+          "properties": {
+            "Quick Melee": {
+              "$ref": "#/definitions/Quick Melee"
+            },
+            "Spawn With Ultimate Ready": {
+              "$ref": "#/definitions/Spawn With Ultimate Ready"
+            },
+            "Health": {
+              "$ref": "#/definitions/Health"
+            },
+            "Damage Dealt": {
+              "$ref": "#/definitions/Damage Dealt"
+            },
+            "Damage Received": {
+              "$ref": "#/definitions/Damage Received"
+            },
+            "Healing Received": {
+              "$ref": "#/definitions/Healing Received"
+            },
+            "Jump Vertical Speed": {
+              "$ref": "#/definitions/Jump Vertical Speed"
+            },
+            "Movement Gravity": {
+              "$ref": "#/definitions/Movement Gravity"
+            },
+            "Movement Speed": {
+              "$ref": "#/definitions/Movement Speed"
+            },
+            "Receive Headshots Only": {
+              "$ref": "#/definitions/Receive Headshots Only"
+            },
+            "Primary Fire": {
+              "$ref": "#/definitions/Primary Fire"
+            },
+            "Ammunition Clip Size Scalar": {
+              "$ref": "#/definitions/Ammunition Clip Size Scalar"
+            },
+            "No Ammunition Requirement": {
+              "$ref": "#/definitions/No Ammunition Requirement"
+            },
+            "Projectile Speed": {
+              "$ref": "#/definitions/Projectile Speed"
+            },
+            "Ultimate Ability (Cage Fight)": {
+              "$ref": "#/definitions/Ultimate Ability (Cage Fight)"
+            },
+            "Ultimate Generation (Cage Fight)": {
+              "$ref": "#/definitions/Ultimate Generation (Cage Fight)"
+            },
+            "Ultimate Generation - Passive (Cage Fight)": {
+              "$ref": "#/definitions/Ultimate Generation - Passive (Cage Fight)"
+            },
+            "Ultimate Generation - Combat (Cage Fight)": {
+              "$ref": "#/definitions/Ultimate Generation - Combat (Cage Fight)"
+            },
+            "Incendiary Chaingun": {
+              "$ref": "#/definitions/Incendiary Chaingun"
+            },
+            "Incendiary Chaingun Ignite Damage": {
+              "$ref": "#/definitions/Incendiary Chaingun Ignite Damage"
+            },
+            "Incendiary Chaingun Ignite Duration": {
+              "$ref": "#/definitions/Incendiary Chaingun Ignite Duration"
+            },
+            "Incendiary Chaingun Ignite Rate": {
+              "$ref": "#/definitions/Incendiary Chaingun Ignite Rate"
+            },
+            "Volatile Chaingun": {
+              "$ref": "#/definitions/Volatile Chaingun"
+            },
+            "Cardiac Overdrive": {
+              "$ref": "#/definitions/Cardiac Overdrive"
+            },
+            "Cardiac Overdrive Cooldown Time": {
+              "$ref": "#/definitions/Cardiac Overdrive Cooldown Time"
+            },
+            "Cardiac Overdrive Healing": {
+              "$ref": "#/definitions/Cardiac Overdrive Healing"
+            },
+            "Overrun": {
+              "$ref": "#/definitions/Overrun"
+            },
+            "Overrun Cooldown Time": {
+              "$ref": "#/definitions/Overrun Cooldown Time"
+            },
+            "Overrun Knockback": {
+              "$ref": "#/definitions/Overrun Knockback"
+            }
+          },
+          "additionalProperties": false
+        },
         "Mei": {
           "description": "'Mei' hero settings.",
           "properties": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,8 @@ public enum PlayerSelector @@
             Kiriko,
             Ramattra,
             Lifeweaver,
-            Illari
+            Illari,
+            Mauga,
         }
         public enum Team
@@ Expand Down @@