Merge pull request #142 from jxd136/dev

pve random map

Author: lch24

installer/installer/obj/Debug/net8.0/installer.AssemblyInfo.cs

@@ -1,9 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,10 +14,10 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("installer")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c45bb8e13b76746336935f8cd9b0bc50b79bc248")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9975d7fe18494dfb1950561b9ebccad7474d5abb")]
 [assembly: System.Reflection.AssemblyProductAttribute("installer")]
 [assembly: System.Reflection.AssemblyTitleAttribute("installer")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 
-// 由 MSBuild WriteCodeFragment 类生成。
+// Generated by the MSBuild WriteCodeFragment class.
 

installer/installer/obj/Debug/net8.0/installer.AssemblyInfoInputs.cache

@@ -1 +1 @@
-3256efc9846987f184fb499adb263f14ab3097c0d329a7d864f61695b23efe58
+c3af66b43b8a1b29357a2c572a02d15ecd0b150fc941e7c014a74a53c266031c

installer/installer/obj/Release/net8.0/installer.AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("installer")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0bc8713776a0e3f1d094a76c98ea1fec06d072a9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9975d7fe18494dfb1950561b9ebccad7474d5abb")]
 [assembly: System.Reflection.AssemblyProductAttribute("installer")]
 [assembly: System.Reflection.AssemblyTitleAttribute("installer")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

installer/installer/obj/Release/net8.0/installer.AssemblyInfoInputs.cache

@@ -1 +1 @@
-0f72e785a82af3eff46b34938542673f7ceb7e6906b570cdf9a2ee3cd05097d2
+2cbfb3f547f3b4da97d3588b24a0474ce1e6ee500a8975e0541763e5ba7b8d52

logic/Gaming/Teams.cs

@@ -102,7 +102,7 @@ private void InitTeams(int numOfTeam)
             for (int i = 0; i < numOfTeam; i++)
             {
                 long teamId = i + 1;
-                var (cx, cy) = corners[selected[i]];
+                var (cx, cy) = corners[i];
                 XY pos = GameData.GetCellCenterPos(cx, cy);
                 var fac = new Factory(pos);
                 fac.TeamID.SetROri(teamId);

logic/pve/GameLogic/config.py

@@ -55,7 +55,7 @@ class GameConfig:
     num_markets: int = 3
     num_resource_points: int = 2
     num_compute_centers: int = 2
-    random_map: bool = False
+    random_map: bool = True
 
     # Time
     time_step: float = 0.25          # seconds per tick

logic/pve/GameLogic/game_env.py

@@ -174,6 +174,9 @@ def __init__(
         self._step: int = 0
         self._techs_owned: set = set()
 
+    def set_random_map(self, enabled: bool = True) -> None:
+        self.cfg.random_map = enabled
+
     # ── Gym interface ──────────────────────────────────────────────────────────
 
     def reset(self, seed: Optional[int] = None, options: Optional[dict] = None):

playback/playback/obj/Debug/net8.0/playback.AssemblyInfo.cs

@@ -13,7 +13,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("playback")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c45bb8e13b76746336935f8cd9b0bc50b79bc248")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f46ff29ab749da6584fb79e062bfddd7d28ce71a")]
 [assembly: System.Reflection.AssemblyProductAttribute("playback")]
 [assembly: System.Reflection.AssemblyTitleAttribute("playback")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

playback/playback/obj/Debug/net8.0/playback.AssemblyInfoInputs.cache

@@ -1 +1 @@
-1a15cb085514f33de77e6575e55634b4cb02032e4b9c38fa629df37b73883cc0
+ef3dc55b726e625285bfc519f933052a06aaedad207f674aba8d1304468a6998

playback/playback/obj/Release/net8.0/playback.AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("playback")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0bc8713776a0e3f1d094a76c98ea1fec06d072a9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f46ff29ab749da6584fb79e062bfddd7d28ce71a")]
 [assembly: System.Reflection.AssemblyProductAttribute("playback")]
 [assembly: System.Reflection.AssemblyTitleAttribute("playback")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]