Merge pull request #508 from CactusPuppy/season-12

season 12
ItsDeltin · Oct 12, 2024 · 864ee1c · 864ee1c
2 parents ba5f3d7 + 9093dcc
commit 864ee1c
Show file tree

Hide file tree

Showing 7 changed files with 209 additions and 3 deletions.
diff --git a/Deltinteger/Deltinteger/Decompiler/TextToElement/EventInfo.cs b/Deltinteger/Deltinteger/Decompiler/TextToElement/EventInfo.cs
@@ -43,6 +43,7 @@ public class EventInfo
             ("Echo", PlayerSelector.Echo),
             ("Genji", PlayerSelector.Genji),
             ("Hanzo", PlayerSelector.Hanzo),
+            ("Juno", PlayerSelector.Juno),
             ("Junker Queen", PlayerSelector.JunkerQueen),
             ("Junkrat", PlayerSelector.Junkrat),
             ("Kiriko", PlayerSelector.Kiriko),

diff --git a/Deltinteger/Deltinteger/Elements.json b/Deltinteger/Deltinteger/Elements.json
@@ -6686,6 +6686,7 @@
         "Illari",
         "Mauga",
         "Venture",
+        "Juno",
       ]
     },
     "Hero": [
@@ -6706,6 +6707,7 @@
       "Illari",
       "Junker Queen",
       "Junkrat",
+      "Juno",
       "Kiriko",
       "Lifeweaver",
       {
@@ -7625,6 +7627,10 @@
         "name": "Temple of Anubis",
         "alias": "Temple_of_Anubis"
       },
+      {
+        "name": "Throne of Anubis",
+        "alias": "Throne_of_Anubis"
+      },
       {
         "name": "Volskaya Industries",
         "alias": "Volskaya_Industries"

diff --git a/Deltinteger/Deltinteger/Elements/Enums.cs b/Deltinteger/Deltinteger/Elements/Enums.cs
@@ -73,6 +73,7 @@ public enum PlayerSelector
         Illari,
         Mauga,
         Venture,
+        Juno,
     }
 
     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()
                     .AddSecondaryFire().AddRange("Solar Energy Maximum", 0, 500).AddRange("Solar Energy Recharge Rate", 0, 500)
                     .AddAbility("Outburst")
                     .AddAbility("Healing Pylon"),
+                new HeroSettingCollection("Juno")
+                    .AddHealer().AddProjectile(false)
+                    .AddUlt("Orbital Ray")
+                    .AddAbility("Glide Boost").AddRange("Glide Boost Duration Scalar", 10, 500)
+                    .AddAbility("Hyper Ring")
+                    .AddAbility("Martian Overboots", false)
+                    .AddAbility("Pulsar Torpedoes"),
                 new HeroSettingCollection("Junker Queen").AddUlt("Rampage", false).AddAbility("Commanding Shout").AddAbility("Carnage").AddAbility("Jagged Blade", hasKnockback: true).AddRange("Jagged Blade Delay Before Automatic Recall", 40, 400).AddProjectile(true),
                 new HeroSettingCollection("Junkrat").AddUlt("Rip-Tire", hasDuration: true).AddProjectile(true).AddAbility("Concussion Mine", hasKnockback: true).AddAbility("Steel Trap").AddRange("Frag Launcher Knockback Scalar", 0, 400),
                 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),

diff --git a/Deltinteger/Deltinteger/LobbySettings.json b/Deltinteger/Deltinteger/LobbySettings.json
@@ -345,6 +345,38 @@
                         }
                     ]
                 },
+                {
+                    "name": "Juno",
+                    "template": "base_hero",
+                    "$ult": "Orbital Ray",
+                    "$healer": true,
+                    "$projectile": true,
+                    "content": [
+                        {
+                            "name": "Glide Boost",
+                            "template": "ability"
+                        },
+                        {
+                            "name": "Glide Boost Duration Scalar",
+                            "type": "range_percentage",
+                            "min": 10,
+                            "max": 500
+                        },
+                        {
+                            "name": "Hyper Ring",
+                            "template": "ability"
+                        },
+                        {
+                            "name": "Martian Overboots",
+                            "template": "ability",
+                            "$no_cooldown": true
+                        },
+                        {
+                            "name": "Pulsar Torpedoes",
+                            "template": "ability"
+                        }
+                    ]
+                },
                 {
                     "name": "Junker Queen",
                     "template": "base_hero",

diff --git a/Deltinteger/Deltinteger/Maps.json b/Deltinteger/Deltinteger/Maps.json
@@ -719,7 +719,8 @@
   {
     "Name": "Hanaoka",
     "GameModes": [
-      "Clash"
+      "Clash",
+      "Skirmish"
     ]
   },
   {
@@ -728,5 +729,12 @@
       "Push",
       "Skirmish"
     ]
+  },
+  {
+    "Name": "Throne of Anubis",
+    "GameModes": [
+      "Clash",
+      "Skirmish"
+    ]
   }
 ]
diff --git a/overwatch-script-to-workshop/json-schemas/LobbySettingValidation.json b/overwatch-script-to-workshop/json-schemas/LobbySettingValidation.json
@@ -470,7 +470,8 @@
       "items": {
         "type": "string",
         "enum": [
-          "Hanaoka"
+          "Hanaoka",
+          "Throne of Anubis"
         ]
       }
     },
@@ -792,7 +793,9 @@
           "New Junk City",
           "Suravasa",
           "Samoa",
-          "Runasapi"
+          "Hanaoka",
+          "Runasapi",
+          "Throne of Anubis"
         ]
       }
     },
@@ -1670,6 +1673,63 @@
       "type": "number",
       "maximum": 500.0
     },
+    "Ultimate Ability (Orbital Ray)": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Ultimate Generation (Orbital Ray)": {
+      "default": 100.0,
+      "type": "number",
+      "minimum": 10.0,
+      "maximum": 500.0
+    },
+    "Ultimate Generation - Passive (Orbital Ray)": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Ultimate Generation - Combat (Orbital Ray)": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Glide Boost": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Glide Boost Cooldown Time": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Glide Boost Duration Scalar": {
+      "default": 100.0,
+      "type": "number",
+      "minimum": 10.0,
+      "maximum": 500.0
+    },
+    "Hyper Ring": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Hyper Ring Cooldown Time": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Martian Overboots": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Pulsar Torpedoes": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Pulsar Torpedoes Cooldown Time": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
     "Ultimate Ability (Rampage)": {
       "default": true,
       "type": "boolean"
@@ -3185,6 +3245,7 @@
           "Genji",
           "Hanzo",
           "Illari",
+          "Juno",
           "Junker Queen",
           "Junkrat",
           "Kiriko",
@@ -3533,6 +3594,9 @@
             "Projectile Speed": {
               "$ref": "#/definitions/Projectile Speed"
             },
+            "Projectile Gravity": {
+              "$ref": "#/definitions/Projectile Gravity"
+            },
             "Healing Dealt": {
               "$ref": "#/definitions/Healing Dealt"
             },
@@ -4328,6 +4392,93 @@
           },
           "additionalProperties": false
         },
+        "Juno": {
+          "description": "'Juno' 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"
+            },
+            "Healing Dealt": {
+              "$ref": "#/definitions/Healing Dealt"
+            },
+            "Projectile Speed": {
+              "$ref": "#/definitions/Projectile Speed"
+            },
+            "Ultimate Ability (Orbital Ray)": {
+              "$ref": "#/definitions/Ultimate Ability (Orbital Ray)"
+            },
+            "Ultimate Generation (Orbital Ray)": {
+              "$ref": "#/definitions/Ultimate Generation (Orbital Ray)"
+            },
+            "Ultimate Generation - Passive (Orbital Ray)": {
+              "$ref": "#/definitions/Ultimate Generation - Passive (Orbital Ray)"
+            },
+            "Ultimate Generation - Combat (Orbital Ray)": {
+              "$ref": "#/definitions/Ultimate Generation - Combat (Orbital Ray)"
+            },
+            "Glide Boost": {
+              "$ref": "#/definitions/Glide Boost"
+            },
+            "Glide Boost Cooldown Time": {
+              "$ref": "#/definitions/Glide Boost Cooldown Time"
+            },
+            "Glide Boost Duration Scalar": {
+              "$ref": "#/definitions/Glide Boost Duration Scalar"
+            },
+            "Hyper Ring": {
+              "$ref": "#/definitions/Hyper Ring"
+            },
+            "Hyper Ring Cooldown Time": {
+              "$ref": "#/definitions/Hyper Ring Cooldown Time"
+            },
+            "Martian Overboots": {
+              "$ref": "#/definitions/Martian Overboots"
+            },
+            "Pulsar Torpedoes": {
+              "$ref": "#/definitions/Pulsar Torpedoes"
+            },
+            "Pulsar Torpedoes Cooldown Time": {
+              "$ref": "#/definitions/Pulsar Torpedoes Cooldown Time"
+            }
+          },
+          "additionalProperties": false
+        },
         "Junker Queen": {
           "description": "'Junker Queen' hero settings.",
           "properties": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ public enum PlayerSelector @@
             Illari,
             Mauga,
             Venture,
+            Juno,
         }
         public enum Team
@@ Expand Down @@