Merge pull request #482 from CactusPuppy/season-10

season 10

Deltinteger/Deltinteger/Elements.json

@@ -7457,6 +7457,7 @@
         "name": "Hanamura (Winter)",
         "alias": "Hanamura_Winter"
       },
+      "Hanaoka",
       "Havana",
       "Hollywood",
       {
@@ -7626,6 +7627,7 @@
     "GameMode": [
       "Assault",
       "Capture The Flag",
+      "Clash",
       "Control",
       "Deathmatch",
       "Elimination",

Deltinteger/Deltinteger/Lobby/Modes.cs

@@ -25,6 +25,8 @@ public class ModesRoot
 
         public ModeSettings Flashpoint { get; set; }
 
+        public ModeSettings Clash { get; set; }
+
         [JsonProperty("Capture The Flag")]
         public ModeSettings CaptureTheFlag { get; set; }
 
@@ -106,6 +108,9 @@ public ModeSettings SettingsFromModeCollection(ModeSettingCollection collection)
                 case "Flashpoint":
                     if (Flashpoint == null) Flashpoint = new ModeSettings();
                     return Flashpoint;
+                case "Clash":
+                    if (Clash == null) Clash = new ModeSettings();
+                    return Clash;
                 case "Hybrid":
                     if (Hybrid == null) Hybrid = new ModeSettings();
                     return Hybrid;
@@ -207,6 +212,7 @@ public class ModeSettingCollection : LobbySettingCollection<ModeSettingCollectio
             new SelectValue("Tank Role Passive Health Bonus", "1 Tank 2 Offense 2 Support", "Always Enabled", "Disabled")
         };
         private static readonly LobbySetting CaptureSpeed = new RangeValue(false, true, "Capture Speed Modifier", 10, 500);
+        private static readonly LobbySetting CaptureSpeedClash = new RangeValue(false, true, "Capture Speed Modifier", 10, 500, 45) { ReferenceName = "Capture Speed Modifier - Clash Defaults" };
         private static readonly LobbySetting PayloadSpeed = new RangeValue(false, true, "Payload Speed Modifier", 10, 500);
         private static readonly LobbySetting TS1WalkSpeed = new RangeValue(false, true, "TS-1 Walk Speed Modifier", 10, 500);
         private static readonly LobbySetting TS1PushSpeed = new RangeValue(false, true, "TS-1 Push Speed Modifier", 10, 500);
@@ -323,7 +329,7 @@ private RootSchema GetMapReference(string description)
         public static void Init()
         {
             var all = new ModeSettingCollection("All");
-            AllModeSettings = new ModeSettingCollection[] {
+            AllModeSettings = [
                 all,
                 new ModeSettingCollection("Assault", true).Competitive().AddCaptureSpeed(),
                 new ModeSettingCollection("Control", true).Competitive().AddCaptureSpeed().Add(LimitValidControlPoints).AddIntRange("Score To Win", false, 1, 3, 2, "Score To Win 1-3").Add(ScoringSpeedModifier),
@@ -334,6 +340,8 @@ public static void Init()
                     .AddSwitch("Control Point A", true).AddSwitch("Control Point B", true).AddSwitch("Control Point C", true).AddSwitch("Control Point D", true).AddSwitch("Control Point E", true)
                     .AddSelect("First Active Control Point", "A", "B", "C", "D", "E", "Random")
                     .AddIntRange("Score To Win", false, 1, 10, 3).Add(ScoringSpeedModifier),
+                new ModeSettingCollection("Clash", true).Competitive()
+                    .Add(CaptureSpeedClash),
                 new ModeSettingCollection("Capture The Flag", false).AddSwitch("Blitz Flag Locations", false).AddSwitch("Damage Interrupts Flag Interaction", false)
                     .AddSelect("Flag Carrier Abilities", "Restricted", "All", "None").AddRange("Flag Dropped Lock Time", 0, 10, 5).AddRange("Flag Pickup Time", 0, 5, 0).AddRange("Flag Return Time", 0, 5, 4)
                     .AddRange("Flag Score Respawn Time", 0, 20, 15).AddIntRange("Game Length (Minutes)", false, 5, 15, 8).AddRange("Respawn Speed Buff Duration", 0, 60, 0).Add(ScoreToWin_1to9)
@@ -347,7 +355,7 @@ public static void Init()
                 new ModeSettingCollection("Freezethaw Elimination", false).Elimination(),
                 new ModeSettingCollection("Bounty Hunter").Add(Enabled_DefaultOff).AddIntRange("Base Score For Killing A Bounty Target", false, 0, 100, 300).AddIntRange("Bounty Increase Per Kill As Bounty Target", false, 0, 1000, 0).AddIntRange("Bounty Target Count", false, 1, 1, 1).AddIntRange("Score Per Kill", false, 0, 1000, 100).AddIntRange("Score Per Kill As Bounty Target", false, 0, 1000, 300)
                     .Add(GameLengthInMinutes).Add(ScoreToWin_1to5000).Add(SelfInitiatedRespawn)
-            };
+            ];
 
             // Get re-occurring settings.
             var encountered = new HashSet<string>(); // Setting keys that were encountered.

Deltinteger/Deltinteger/LobbySettings.json

@@ -1016,6 +1016,7 @@
                     "name": "Venture",
                     "template": "base_hero",
                     "$ult": "Tectonic Shock",
+                    "$ult_duration": true,
                     "$projectile": true,
                     "content": [
                         {
@@ -1411,6 +1412,21 @@
                         }
                     ]
                 },
+                {
+                    "name": "Clash",
+                    "template": "base_mode",
+                    "$with_maps": "Clash",
+                    "$competitive": true,
+                    "content": [
+                        {
+                            "name": "Capture Speed Modifier",
+                            "type": "range_percentage",
+                            "min": 10,
+                            "max": 500,
+                            "default": 45
+                        }
+                    ]
+                },
                 {
                     "name": "Capture The Flag",
                     "template": "base_mode",
@@ -2271,4 +2287,4 @@
             "to": "lobby"
         }
     ]
-}
+}

Deltinteger/Deltinteger/Maps.json

@@ -715,5 +715,11 @@
       "Control",
       "Skirmish"
     ]
+  },
+  {
+    "Name": "Hanaoka",
+    "GameModes": [
+      "Clash"
+    ]
   }
 ]

Deltinteger/Deltinteger/Program.cs

@@ -21,7 +21,7 @@ namespace Deltin.Deltinteger
 {
     public class Program
     {
-        public const string VERSION = "v2.8.8";
+        public const string VERSION = "v3.0.0";
 
         public static readonly string ExeFolder = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
 

Deltinteger/Deltinteger/publish.ps1

@@ -1,6 +1,6 @@
 $configuration = 'Release'
 $framework = 'net8.0'
-$ostw_version = 'v2.8.8'
+$ostw_version = 'v3.0.0'
 
 # Cross platform, no runtime included.
 '* Publishing self-contained'

overwatch-script-to-workshop/.vscode/launch.json

@@ -26,4 +26,4 @@
 			"outFiles": ["${workspaceRoot}/build-grammar/out/build-grammar.js"]
 		}
     ]
-}
+}