Merge pull request #1 from Theadd/develop-pollution-tool

Theadd · web-flow · commit 4110b2bed781 · 2022-01-20T03:03:15.000+01:00
pollution in game overview + toolbar bg fix
diff --git a/GUITools.cs b/GUITools.cs
@@ -4,7 +4,7 @@
 
 namespace DevTools.Humankind.GUITools
 {
-    [BepInPlugin(PLUGIN_GUID, "GUITools", "1.2.0.0")]
+    [BepInPlugin(PLUGIN_GUID, "GUITools", "1.2.1.0")]
     [BepInDependency("Modding.Humankind.DevTools")]
     [BepInDependency("DevTools.Humankind.SharedAssets")]
     public class GUITools : BaseUnityPlugin 
diff --git a/MainTools.cs b/MainTools.cs
@@ -56,6 +56,8 @@ public static void Main()
             
             // Maps [ESC] key to: GodMode.Enabled = false 
             // HumankindDevTools.RegisterAction(new KeyboardShortcut(UnityEngine.KeyCode.Escape), "CancelGodMode", CancelGodMode);
+            
+            // ToggleGameOverviewWindow();
         }
 
         public static void ToggleHideToolbarWindow() => GlobalSettings.HideToolbarWindow.Value = !GlobalSettings.HideToolbarWindow.Value;
diff --git a/UI/MainToolbar.cs b/UI/MainToolbar.cs
@@ -13,7 +13,7 @@ public class MainToolbar : FloatingToolWindow
         public override bool ShouldRestoreLastWindowPosition => true;
         public override string WindowTitle { get; set; } = "TOOLBAR";
         public override Rect WindowRect { get; set; } = new Rect (30, 290, 170, 600);
-        private Color activeBackground = new Color(0.8f, 0.7f, 0.9f, 0.7f);
+        public static Color ActiveToolBackgroundTint { get; set; } = new Color(0.8f, 0.7f, 0.9f, 0.7f);
         
         #region FloatingToolWindow derived classes
 
@@ -67,18 +67,29 @@ public void RestoreVisibleWindows()
         
         }
 
+        public static Texture2D TintableWhiteTexture { get; set; } =
+            Utils.CreateSinglePixelTexture2D(new Color(1f, 1f, 1f, 0.8f));
+
         public GUIStyle TintableBackgroundStyle { get; set; } = new GUIStyle(UIController.DefaultSkin.FindStyle("PopupWindow.Row"))
         {
             padding = new RectOffset(0, 0, 0, 0),
             margin = new RectOffset(0, 0, 0, 0),
             border = new RectOffset(0, 0, 0, 0),
             overflow = new RectOffset(0, 0, 0, 0),
             normal = new GUIStyleState() {
-                background = Utils.CreateSinglePixelTexture2D(new Color(1f, 1f, 1f, 0.8f)),
+                background = TintableWhiteTexture,
                 textColor = Color.white
             },
             hover = new GUIStyleState() {
-                background =null,
+                background = TintableWhiteTexture,
+                textColor = Color.white
+            },
+            active = new GUIStyleState() {
+                background = TintableWhiteTexture,
+                textColor = Color.white
+            },
+            onNormal = new GUIStyleState() {
+                background = TintableWhiteTexture,
                 textColor = Color.white
             }
         };
@@ -88,11 +99,11 @@ public void RestoreVisibleWindows()
             margin = new RectOffset(0, 0, 0, 0),
         };
 
-        private Color bgTintColor = new Color32(205, 196, 174, 244);
+        public static Color BackgroundTintColor { get; set; } = new Color32(205, 196, 174, 244);
 
         public override void OnDrawUI()
         {
-            GUI.backgroundColor = bgTintColor;
+            GUI.backgroundColor = BackgroundTintColor;
             GUILayout.BeginHorizontal(TintableBackgroundStyle);
             
             GUI.backgroundColor = Color.black;
@@ -121,7 +132,7 @@ private void OnDrawCheatingTools()
                 GUILayout.Label("<color=#000000AA>C H E A T I N G</color>   T O O L S",
                     "PopupWindow.Sidebar.Heading");
 
-                GUI.backgroundColor = activeBackground;
+                GUI.backgroundColor = ActiveToolBackgroundTint;
                 if (GlobalSettings.MilitaryTool.Value)
                     if (DrawItem<MilitaryToolsWindow>(MilitaryTool, "Military"))
                         Open<MilitaryToolsWindow>(window => MilitaryTool = window);
@@ -153,7 +164,7 @@ private void OnDrawDeveloperTools()
                 GUILayout.Label("<color=#000000AA>D E V E L O P E R</color>   T O O L S",
                     "PopupWindow.Sidebar.Heading");
 
-                GUI.backgroundColor = activeBackground;
+                GUI.backgroundColor = ActiveToolBackgroundTint;
                 if (GlobalSettings.AutoTurnTool.Value)
                     if (DrawItem<AutoTurnToolWindow>(AutoTurnTool, "Auto Turn"))
                         Open<AutoTurnToolWindow>(window => AutoTurnTool = window);
@@ -189,7 +200,7 @@ private void OnDrawProfilingTools()
                 GUILayout.Label("<color=#000000AA>P R O F I L I N G</color>   T O O L S",
                     "PopupWindow.Sidebar.Heading");
                 
-                GUI.backgroundColor = activeBackground; 
+                GUI.backgroundColor = ActiveToolBackgroundTint; 
                 if (GlobalSettings.FramerateTool.Value)
                     if (DrawItem<FramerateToolWindow>(FramerateTool, "Framerate"))
                         Open<FramerateToolWindow>(window => FramerateTool = window);
@@ -217,7 +228,7 @@ private void OnDrawExperimentalTools()
             {
                 GUILayout.Label("E X P <color=#000000AA>E R I M E N T A L</color>", "PopupWindow.Sidebar.Heading");
 
-                GUI.backgroundColor = activeBackground;
+                GUI.backgroundColor = ActiveToolBackgroundTint;
                 if (GlobalSettings.AITool.Value)
                     if (DrawItem<AIToolWindow>(AITool, "AI Tools"))
                         Open<AIToolWindow>(window => AITool = window);
diff --git a/UI/Statistics/GameStatisticsGrid.cs b/UI/Statistics/GameStatisticsGrid.cs
@@ -35,12 +35,62 @@ public class GameStatisticsGrid : DrawableGrid<EmpireSnapshot>
         private int CurrentIndex;
         private int CurrentEmpireIndex;
 
-        public void Draw(GameStatsSnapshot snapshot)
+        public void SetSnapshot(GameStatsSnapshot snapshot)
         {
             CurrentSnapshot = snapshot;
             if (DisplayOrder == null || DisplayOrder.Length != snapshot.Empires.Length)
                 DisplayOrder = snapshot.Empires.Select((e, i) => i).ToArray();
+        }
+        
+        public void DrawCommonHeader()
+        {
+            Row(StaticRowStyle);
+            RowHeader(" ", CellSpan6);
+
+            RowHeader("TURN", CellSpan1);
+            DrawCell(CurrentSnapshot.Turn.ToString(), CellSpan1);
+            
+            RowHeader("ATMOSPHERE POLLUTION", CellSpan5);
+            DrawCell("<size=10>LEVEL " + CurrentSnapshot.AtmospherePollutionLevel + "</size>", CellSpan2);
+            DrawCell("" + 
+                     "<b>" + CurrentSnapshot.AtmospherePollutionStock + "</b>" + 
+                     (CurrentSnapshot.AtmospherePollutionNet >= 0 ? "  ( +" : "  ( ") + 
+                     CurrentSnapshot.AtmospherePollutionNet + " " + PerTurn + " )", 
+                CellSpan4);
+            CellButton("<size=10>-2K</size>", () =>
+            {
+                SandboxManager.PostOrder((Order)new EditorOrderAddOrRemoveAtmospherePollution()
+                {
+                    Delta = -2000
+                }, (int)Snapshots.GameSnapshot.PresentationData.LocalEmpireInfo.EmpireIndex);
+            }, CellSpan1);
+            CellButton("<size=10>-250</size>", () =>
+            {
+                SandboxManager.PostOrder((Order)new EditorOrderAddOrRemoveAtmospherePollution()
+                {
+                    Delta = -250
+                }, (int)Snapshots.GameSnapshot.PresentationData.LocalEmpireInfo.EmpireIndex);
+            }, CellSpan1);
+            CellButton("<size=10>+250</size>", () =>
+            {
+                SandboxManager.PostOrder((Order)new EditorOrderAddOrRemoveAtmospherePollution()
+                {
+                    Delta = 250
+                }, (int)Snapshots.GameSnapshot.PresentationData.LocalEmpireInfo.EmpireIndex);
+            }, CellSpan1);
+            CellButton("<size=10>+2K</size>", () =>
+            {
+                SandboxManager.PostOrder((Order)new EditorOrderAddOrRemoveAtmospherePollution()
+                {
+                    Delta = 2000
+                }, (int)Snapshots.GameSnapshot.PresentationData.LocalEmpireInfo.EmpireIndex);
+            }, CellSpan1);
+            
+            EndRow();
+        }
 
+        public void Draw()
+        {
             DrawRow(" ", StaticRowStyle, (empire, index, empireIndex) =>
             {
                 var headerText = empireIndex == CurrentSnapshot.LocalEmpireIndex ?
@@ -66,6 +116,10 @@ public void Draw(GameStatsSnapshot snapshot)
             DrawRow("CITIZENS, EMPIRE POPULATION", empire =>
                 DrawCell(empire.SettlementsPopulation, CellSpan2)
                 .DrawCell(empire.EmpirePopulation, CellSpan2));
+            DrawRow("POLLUTION", empire =>
+                DrawCell("" + empire.PollutionStock, CellSpan2)
+                .DrawCell((int.Parse(empire.PollutionNet) >= 0 ? "+" : "") + 
+                              empire.PollutionNet + " " + PerTurn, CellSpan2));
 
             DrawSection("<size=12><b>MILITARY STATS</b></size>");
             DrawRow("COMBAT STRENGTH", empire => DrawCell(empire.CombatStrength, CellSpan4));
@@ -117,18 +171,41 @@ public void Draw(GameStatsSnapshot snapshot)
                 GUI.enabled = (empireIndex != CurrentSnapshot.LocalEmpireIndex);
                 CellButton("<size=10>SWITCH EMPIRE</size>", (e, i, eIndex) => 
                 {
-                    Services.GetService<INetworkingService>()?.CreateMessageSender().SendLocalMessage(
-                        (LocalMessage) new SandboxControlMessage(
-                            (ISandboxControlInstruction) new ChangeLocalEmpireInstruction(eIndex)
-                        )
-                    );
-                    HumankindGame.Empires.Where(emp => emp.EmpireIndex == eIndex).Settlements().IsCapital().First().CenterToCamera();
+                    try
+                    {
+                        Services.GetService<INetworkingService>()?.CreateMessageSender().SendLocalMessage(
+                            (LocalMessage) new SandboxControlMessage(
+                                (ISandboxControlInstruction) new ChangeLocalEmpireInstruction(eIndex)
+                            )
+                        );
+                        HumankindGame.Empires.Where(emp => emp.EmpireIndex == eIndex).Settlements().IsCapital().First()
+                            .CenterToCamera();
+                    }
+                    catch (Exception)
+                    {
+                        HumankindGame.Empires.Where(emp => emp.EmpireIndex == eIndex).Armies().First().CenterToCamera();
+                    }
                 }, CellSpan4);
                 GUI.enabled = true;
             });
 
         }
 
+        public void CellButton(string text, Action action, params GUILayoutOption[] options)
+        {
+            var prevBgTint = GUI.backgroundColor;
+            // GUI.backgroundColor = CellButtonTintColor; 
+            GUI.backgroundColor = Color.white;
+            if (GUILayout.Button(text, CellButtonStyle, options))
+            {
+                action.Invoke();
+                HumankindGame.Update();
+                // CurrentSnapshot.Snapshot();
+                GameStatsWindow.ResetLoop();
+            }
+            GUI.backgroundColor = prevBgTint;
+        }
+        
         public GameStatisticsGrid DrawSection(string title)
         {
             return (GameStatisticsGrid)this
diff --git a/UI/Statistics/GameStatsSnapshot.cs b/UI/Statistics/GameStatsSnapshot.cs
@@ -7,6 +7,7 @@
 using Modding.Humankind.DevTools.DeveloperTools.UI;
 using UnityEngine;
 using Amplitude.Mercury;
+using Amplitude.Mercury.Interop;
 
 namespace DevTools.Humankind.GUITools.UI
 {
@@ -17,6 +18,9 @@ public class GameStatsSnapshot
         public int GameSpeedLevel { get; set; }
         public EmpireSnapshot[] Empires;
         public int LocalEmpireIndex { get; set; }
+        public int AtmospherePollutionLevel { get; set; }
+        public int AtmospherePollutionStock { get; set; }
+        public int AtmospherePollutionNet { get; set; }
 
         public GameStatsSnapshot()
         {
@@ -40,7 +44,11 @@ public GameStatsSnapshot Snapshot()
                     Empires[i].Snapshot(empires[i]);
                 }
             }
-            
+
+            var pollutionData = Snapshots.PollutionSnapshot.PresentationData;
+            AtmospherePollutionLevel = pollutionData.AtmospherePollutionLevel + 1;
+            AtmospherePollutionStock = (int) pollutionData.AtmospherePollutionStock;
+            AtmospherePollutionNet = (int) pollutionData.AtmospherePollutionNet;
 
             return this;
         }
@@ -148,12 +156,24 @@ private static string GetPlayerIdentifierUserName(HumankindEmpire empire)
         public string LuxuryResourcesAccessCount => Values[23];
         public string StrategicResourcesAccessCount => Values[24];
         public string TradeNodesCount => Values[25];
+        public string PollutionStock => Values[26];
+        public string PollutionNet => Values[27];
     }
 
     public static class EmpireSnapshotUtils
     {
         public static string[] MakeEmpireSnapshotValues(HumankindEmpire empire)
         {
+            EmpireInfo empireInfo;
+            try
+            {
+                empireInfo = Snapshots.GameSnapshot.PresentationData.EmpireInfo[empire.EmpireIndex];
+            }
+            catch (Exception)
+            {
+                empireInfo = new EmpireInfo();
+            }
+            
             return new[] {
                 $"{empire.EmpireIndex}",
                 $"{empire.PersonaName}",
@@ -183,6 +203,8 @@ public static string[] MakeEmpireSnapshotValues(HumankindEmpire empire)
                 $"{empire.LuxuryResourcesAccessCount}",
                 $"{empire.StrategicResourcesAccessCount}",
                 $"{empire.TradeNodesCount}",
+                $"{(int)empireInfo.PollutionStock}",
+                $"{(int)empireInfo.PollutionNet}",
             };
         }
     }
diff --git a/UI/Statistics/GameStatsWindow.cs b/UI/Statistics/GameStatsWindow.cs
@@ -23,6 +23,8 @@ public class GameStatsWindow : FloatingToolWindow
 
         public static bool IsVisibleFullscreen = false;
 
+        public static Vector2 ScrollViewPosition = Vector2.zero;
+
         private static int localEmpireIndex = 0;
         // Snapshot currently being displayed
         private static GameStatsSnapshot Snapshot;
@@ -45,6 +47,11 @@ public class GameStatsWindow : FloatingToolWindow
         private GUIStyle backButtonStyle = new GUIStyle(UIToolManager.DefaultSkin.toggle) {
             margin = new RectOffset(1, 1, 1, 1)
         };
+        
+        private GUIStyle CommonHeaderStyle = new GUIStyle(UIToolManager.DefaultSkin.toggle) {
+            margin = new RectOffset(1, 1, 1, 1),
+            alignment = TextAnchor.LowerRight
+        };
 
         private static bool initialized = false;
         private static bool isValidSnapshot = false;
@@ -158,32 +165,66 @@ public override void OnDrawUI()
                 return;
             }
 
-            GUILayout.BeginVertical(bgStyle, GUILayout.Width(Screen.width), GUILayout.Height(Screen.height));
-                DrawBackButton();
-
-                GUILayout.FlexibleSpace();
-
-                GUILayout.BeginHorizontal();
-
-                GUILayout.FlexibleSpace();
+            grid.SetSnapshot(Snapshot);
+            
+            BeginBackgroundScrollView();
+            {
+                GUILayout.BeginHorizontal(GUILayout.Width(Screen.width), GUILayout.Height(Screen.height));
+                {
+                    GUILayout.FlexibleSpace();
 
-                DrawWindowContent();
+                    GUILayout.BeginVertical();
+                    {
+                        GUILayout.Space(24f);
+                        DrawCommonContent();
+                        
+                        GUILayout.Space(72f);
+                        GUILayout.FlexibleSpace();
+                        
+                        DrawWindowContent();
+                        // GUILayout.Space(16f);
+                        // DrawWindowContent();
+                        
+                        GUILayout.FlexibleSpace();
+                        GUILayout.Space(72f);
 
-                GUILayout.FlexibleSpace();
+                    }
+                    GUILayout.EndVertical();
 
+                    GUILayout.FlexibleSpace();
+                }
                 GUILayout.EndHorizontal();
+            }
+            GUILayout.EndScrollView();
+            DrawBackButton();
+        }
 
-                GUILayout.FlexibleSpace();
+        private void BeginBackgroundScrollView()
+        {
+            ScrollViewPosition = GUILayout.BeginScrollView(
+                ScrollViewPosition, 
+                false, 
+                false, 
+                "horizontalscrollbar",
+                "verticalscrollbar",
+                bgStyle,
+                // "scrollview",
+                GUILayout.Height(Screen.height));
+        }
 
-            GUILayout.EndVertical();
+        private void DrawCommonContent()
+        {
+            GUILayout.BeginHorizontal();
+            grid.DrawCommonHeader();
+            GUILayout.EndHorizontal();
         }
 
         private void DrawWindowContent()
         {
             GUILayout.BeginVertical();
                 GUILayout.Space(4f);
 
-                grid.Draw(Snapshot);
+                grid.Draw();
 
                 GUILayout.Space(4f);
             GUILayout.EndVertical();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace DevTools.Humankind.GUITools`
`6`	`6`	`{`
`7`		`- [BepInPlugin(PLUGIN_GUID, "GUITools", "1.2.0.0")]`
	`7`	`+ [BepInPlugin(PLUGIN_GUID, "GUITools", "1.2.1.0")]`
`8`	`8`	`[BepInDependency("Modding.Humankind.DevTools")]`
`9`	`9`	`[BepInDependency("DevTools.Humankind.SharedAssets")]`
`10`	`10`	`public class GUITools : BaseUnityPlugin`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public static void Main()`
`56`	`56`
`57`	`57`	`// Maps [ESC] key to: GodMode.Enabled = false`
`58`	`58`	`// HumankindDevTools.RegisterAction(new KeyboardShortcut(UnityEngine.KeyCode.Escape), "CancelGodMode", CancelGodMode);`
	`59`	`+`
	`60`	`+ // ToggleGameOverviewWindow();`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`public static void ToggleHideToolbarWindow() => GlobalSettings.HideToolbarWindow.Value = !GlobalSettings.HideToolbarWindow.Value;`