Merge pull request #467 from CactusPuppy/master

ItsDeltin · Nov 15, 2023 · 32d784e · 32d784e
2 parents 6efc016 + f823a88
commit 32d784e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 12 deletions.
diff --git a/Deltinteger/Deltinteger/Lobby/Heroes.cs b/Deltinteger/Deltinteger/Lobby/Heroes.cs
@@ -227,7 +227,14 @@ public static void Init()
                 new HeroSettingCollection("Ramattra").AddUlt("Annihilation").AddProjectile(false).AddAbility("Void Barrier Omnic Form").AddAbility("Nemisis Form").AddAbility("Block Nemesis Form", hasCooldown: false).AddAbility("Ravenous Vortex"),
                 new HeroSettingCollection("Reaper").AddUlt("Death Blossom").AddHealer().AddAbility("Shadow Step").AddAbility("Wraith Form"),
                 new HeroSettingCollection("Reinhardt").AddUlt("Earthshatter").AddProjectile(false).RemoveAmmunition().AddAbility("Barrier Field", rechargeable: true, noMaximumTime: true).AddAbility("Charge", hasKnockback: true).AddAbility("Fire Strike").AddRange("Rocket Hammer Knockback Scalar", 0, 400),
-                new HeroSettingCollection("Roadhog").AddUlt("Whole Hog", hasKnockback: true).AddHealer().AddProjectile(false).AddSecondaryFire().AddAbility("Chain Hook").AddAbility("Take A Breather"),
+                new HeroSettingCollection("Roadhog")
+                    .AddUlt("Whole Hog", hasKnockback: true)
+                    .AddHealer()
+                    .AddProjectile(false)
+                    .AddSecondaryFire()
+                    .AddAbility("Take A Breather", hasCooldown: false, rechargeable: true)
+                    .AddAbility("Chain Hook")
+                    .AddAbility("Pig Pen"),
                 new HeroSettingCollection("Sigma").AddUlt("Gravitic Flux").RemoveAmmunition().AddProjectile(true).AddAbility("Accretion", hasKnockback: true).AddAbility("Experimental Barrier", rechargeable: true).AddAbility("Kinetic Grasp"),
                 new HeroSettingCollection("Soldier: 76").AddUlt("Tactical Visor", hasDuration: true).AddHealer().AddProjectile(false).AddAbility("Biotic Field").AddAbility("Helix Rockets", hasKnockback: true).AddAbility("Sprint", hasCooldown: false),
                 new HeroSettingCollection("Sojourn").AddUlt("Overclock", hasDuration: true).AddAbility("Disruptor Shot").AddProjectile(false).AddAbility("Power Slide").AddSecondaryFire().AddRange("Railgun Alt Fire Energy Charge Rate", 0, 500),

diff --git a/Deltinteger/Deltinteger/Program.cs b/Deltinteger/Deltinteger/Program.cs
@@ -17,7 +17,7 @@ namespace Deltin.Deltinteger
 {
     public class Program
     {
-        public const string VERSION = "v2.8.4";
+        public const string VERSION = "v2.8.5";
 
         public static readonly string ExeFolder = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
 

diff --git a/Deltinteger/Deltinteger/publish.ps1 b/Deltinteger/Deltinteger/publish.ps1
@@ -1,6 +1,6 @@
 $configuration = 'Release'
 $framework = 'net6.0'
-$ostw_version = 'v2.8.4'
+$ostw_version = 'v2.8.5'
 
 # Cross platform, no runtime included.
 '* Publishing self-contained'

diff --git a/overwatch-script-to-workshop/json-schemas/LobbySettingValidation.json b/overwatch-script-to-workshop/json-schemas/LobbySettingValidation.json
@@ -2413,6 +2413,21 @@
       "type": "number",
       "maximum": 500.0
     },
+    "Take A Breather": {
+      "default": true,
+      "type": "boolean"
+    },
+    "Take A Breather Recharge Rate": {
+      "default": 100.0,
+      "type": "number",
+      "maximum": 500.0
+    },
+    "Take A Breather Maximum Time": {
+      "default": 100.0,
+      "type": "number",
+      "minimum": 20.0,
+      "maximum": 500.0
+    },
     "Chain Hook": {
       "default": true,
       "type": "boolean"
@@ -2422,11 +2437,11 @@
       "type": "number",
       "maximum": 500.0
     },
-    "Take A Breather": {
+    "Pig Pen": {
       "default": true,
       "type": "boolean"
     },
-    "Take A Breather Cooldown Time": {
+    "Pig Pen Cooldown Time": {
       "default": 100.0,
       "type": "number",
       "maximum": 500.0
@@ -5342,17 +5357,26 @@
             "Secondary Fire": {
               "$ref": "#/definitions/Secondary Fire"
             },
+            "Take A Breather": {
+              "$ref": "#/definitions/Take A Breather"
+            },
+            "Take A Breather Recharge Rate": {
+              "$ref": "#/definitions/Take A Breather Recharge Rate"
+            },
+            "Take A Breather Maximum Time": {
+              "$ref": "#/definitions/Take A Breather Maximum Time"
+            },
             "Chain Hook": {
               "$ref": "#/definitions/Chain Hook"
             },
             "Chain Hook Cooldown Time": {
               "$ref": "#/definitions/Chain Hook Cooldown Time"
             },
-            "Take A Breather": {
-              "$ref": "#/definitions/Take A Breather"
+            "Pig Pen": {
+              "$ref": "#/definitions/Pig Pen"
             },
-            "Take A Breather Cooldown Time": {
-              "$ref": "#/definitions/Take A Breather Cooldown Time"
+            "Pig Pen Cooldown Time": {
+              "$ref": "#/definitions/Pig Pen Cooldown Time"
             }
           },
           "additionalProperties": false

diff --git a/overwatch-script-to-workshop/package-lock.json b/overwatch-script-to-workshop/package-lock.json
diff --git a/overwatch-script-to-workshop/package.json b/overwatch-script-to-workshop/package.json
@@ -2,7 +2,7 @@
   "name": "overwatch-script-to-workshop",
   "displayName": "Overwatch Script To Workshop",
   "description": "Autocomplete and syntax highlighting for Overwatch Script To Workshop",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "publisher": "Deltin",
   "engines": {
     "vscode": "^1.72.0"