Merge branch 'master' into 186-webui-notifications

crpg2 · Nov 6, 2024 · 65db791 · 65db791
2 parents 612262b + 0daa857
commit 65db791
Show file tree

Hide file tree

Showing 33 changed files with 5,598 additions and 99 deletions.
diff --git a/src/Application/Common/Services/IGameModeService.cs b/src/Application/Common/Services/IGameModeService.cs
@@ -18,6 +18,7 @@ internal class GameModeService : IGameModeService
         { GameModeAlias.D, GameMode.CRPGSkirmish },
         { GameModeAlias.F, GameMode.CRPGTeamDeathmatch },
         { GameModeAlias.Z, GameMode.CRPGUnknownGameMode },
+        { GameModeAlias.G, GameMode.CRPGCaptain },
     };
     public GameMode GameModeByInstanceAlias(GameModeAlias alias)
     {

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -11,7 +11,7 @@
         <InvariantGlobalization>true</InvariantGlobalization>
 
         <!-- Use Bannerlord version + cRPG version for the revision number -->
-        <Version>1.2.11.108</Version>
+        <Version>1.2.11.109</Version>
         <!-- Flag to enable to add revision id to the assembly version -->
         <SourceControlInformationFeatureSupported>true</SourceControlInformationFeatureSupported>
         <IncludeSourceRevisionInInformationalVersion>true</IncludeSourceRevisionInInformationalVersion>

diff --git a/src/Domain/Entities/GameServers/GameMode.cs b/src/Domain/Entities/GameServers/GameMode.cs
@@ -7,9 +7,10 @@ public enum GameMode
     CRPGDTV,
     CRPGDuel,
     CRPGSiege,
-    CRPGSkirmish,
     CRPGTeamDeathmatch,
+    CRPGSkirmish,
     CRPGUnknownGameMode,
+    CRPGCaptain,
 }
 
 public enum GameModeAlias
@@ -21,4 +22,5 @@ public enum GameModeAlias
     E,
     F,
     Z,
+    G,
 }
diff --git a/src/Module.Editor/SubModule.xml b/src/Module.Editor/SubModule.xml
@@ -2,7 +2,7 @@
 <Module>
   <Name value="cRPG Editor"/>
   <Id value="cRPG Editor"/>
-  <Version value="v1.2.11.108"/>
+  <Version value="v1.2.11.109"/>
   <ModuleCategory value="Singleplayer"/>
   <DependedModules>
     <DependedModule Id="Native" DependentVersion="v1.2.11" Optional="false"/>

diff --git a/src/Module.Server/Common/CrpgServerConfiguration.cs b/src/Module.Server/Common/CrpgServerConfiguration.cs
@@ -30,6 +30,8 @@ public static void Init()
     public static int RewardTick { get; private set; } = 60;
     public static bool TeamBalanceOnce { get; private set; }
     public static bool FrozenBots { get; private set; } = false;
+    public static int ControlledBotsCount { get; private set; } = 0;
+    public static int BaseNakedEquipmentValue { get; private set; } = 10000;
     public static Tuple<TimeSpan, TimeSpan, TimeZoneInfo>? HappyHours { get; private set; }
 
     [UsedImplicitly]
@@ -64,6 +66,33 @@ private static void SetServerExperienceMultiplier(string? multiplierStr)
         Debug.Print($"Set server multiplier to {multiplier}");
     }
 
+    [UsedImplicitly]
+    [ConsoleCommandMethod("crpg_base_naked_equipment_value", "Sets the equipment value of a naked character. used to combat dagger builds in captain.")]
+    private static void SetBaseNakedEquipmentValue(string? baseNakedEquipmentValueStr)
+    {
+        if (baseNakedEquipmentValueStr == null || !int.TryParse(baseNakedEquipmentValueStr, out int baseNakedEquipmentValue))
+        {
+            Debug.Print($"Invalid Controlled Bots Count: {baseNakedEquipmentValueStr}");
+            return;
+        }
+
+        ControlledBotsCount = baseNakedEquipmentValue;
+        Debug.Print($"Sets baseNakedEquipmentValue to {baseNakedEquipmentValue}");
+    }
+
+    [ConsoleCommandMethod("crpg_controlled_bots_count", "Sets ControlledBotsCount in captain  and battle.")]
+    private static void SetControlledBotsCount(string? botsCountStr)
+    {
+        if (botsCountStr == null || !int.TryParse(botsCountStr, out int botsCount))
+        {
+            Debug.Print($"Invalid Controlled Bots Count: {botsCountStr}");
+            return;
+        }
+
+        ControlledBotsCount = botsCount;
+        Debug.Print($"Sets ControlledBotsCount to {botsCount}");
+    }
+
     [UsedImplicitly]
     [ConsoleCommandMethod("crpg_reward_tick", "Sets the reward tick duration in seconds for Conquest/Siege/Team Deatmatch.")]
     private static void SetRewardTick(string? rewardTickStr)