Merge separate local clone

ApacheThunder · Feb 3, 2017 · 89b12ee · 89b12ee
2 parents b1c070c + 7b39731
commit 89b12ee
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 21 deletions.
diff --git a/Assembly-CSharp.Base.mm/Assembly-CSharp.Base.mm.csproj b/Assembly-CSharp.Base.mm/Assembly-CSharp.Base.mm.csproj
@@ -142,7 +142,6 @@
     <Compile Include="src\Core\RuntimeAtlas.cs" />
     <Compile Include="src\Core\GunBehaviour.cs" />
     <Compile Include="src\Core\Platform.cs" />
-    <Compile Include="src\Patches\patch_PlatformInterface.cs" />
     <Compile Include="src\SGUI\SGUIRoot.cs" />
     <Compile Include="src\SGUI\SElement.cs" />
     <Compile Include="src\SGUI\ISGUIBackend.cs" />

diff --git a/Assembly-CSharp.Base.mm/src/Core/Extensions.cs b/Assembly-CSharp.Base.mm/src/Core/Extensions.cs
@@ -51,7 +51,6 @@ public static string RemovePrefix(this string str, string prefix) {
     public static string RemoveSuffix(this string str, string suffix) {
         return str.StartsWithInvariant(suffix) ? str.Substring(0, suffix.Length - suffix.Length) : str;
     }
-
     public static int IndexOfInvariant(this string s, string a) {
         return s.IndexOf(a, StringComparison.InvariantCulture);
     }

diff --git a/Assembly-CSharp.Base.mm/src/Core/Platform.cs b/Assembly-CSharp.Base.mm/src/Core/Platform.cs
@@ -3,7 +3,6 @@
 public static partial class ETGMod {
     // Platform-specifics
     public static class Platform {
-        public static bool EnableAchievements = false;
         public static bool DisableSteam = false;
     }
 }
diff --git a/Assembly-CSharp.Base.mm/src/ETGGUI/ETGModConsole.cs b/Assembly-CSharp.Base.mm/src/ETGGUI/ETGModConsole.cs
@@ -185,7 +185,8 @@ public override void Start() {
 
         Commands.GetGroup ("dump")
                 .AddGroup ("sprites",      (args) => SetBool(args, ref ETGMod.Assets.DumpSprites        ))
-                .AddUnit  ("packer",       (args) => ETGMod.Assets.Dump.DumpPacker());
+                .AddUnit  ("packer",       (args) => ETGMod.Assets.Dump.DumpPacker())
+                .AddUnit  ("synergies",    DumpSynergies);
 
         Commands.GetGroup ("dump").GetGroup ("sprites")
                 .AddUnit  ("metadata", (args) => SetBool (args, ref ETGMod.Assets.DumpSpritesMetadata));
@@ -198,7 +199,6 @@ public override void Start() {
                 .AddUnit  ("cut_input_focus_on_command", (args) => SetBool (args, ref _CutInputFocusOnCommand))
                 .AddUnit  ("enable_damage_indicators", (args) => SetBool (args, ref ETGModGUI.UseDamageIndicators))
                 .AddUnit  ("match_contains", (args) => SetBool (args, ref AutocompletionSettings.MatchContains))
-                .AddUnit  ("enable_achievements", (args) => SetBool (args, ref ETGMod.Platform.EnableAchievements))
                 .AddUnit  ("enable_stat_set", (args) => SetBool(args, ref StatSetEnabled))
                 .AddUnit  ("player", (args) => ETGMod.Player.PlayerReplacement = args.Length == 1 ? args[0] : null)
                 .AddUnit  ("player_coop", (args) => ETGMod.Player.CoopReplacement = args.Length == 1 ? args[0] : null);
@@ -781,5 +781,53 @@ void SwitchCharacter (string[] args) {
             }
         }
     }
+
+    void DumpSynergies(string[] args) {
+        if (!ArgCount(args, 0, 0)) return;
+        var db = GameManager.Instance.SynergyManager;
+        Console.WriteLine("synergies:");
+        foreach (var entry in db.synergies) {
+            Console.WriteLine("  - items_or: " + entry.ItemsOR.ToString().ToLowerInvariant());
+            Console.WriteLine("    guns_or: " + entry.GunsOR.ToString().ToLowerInvariant());
+            if (entry.statModifiers.Count == 0) {
+                Console.WriteLine("    stat_mods: [] ");
+            } else {
+                Console.WriteLine("    stat_mods:");
+                foreach (var mod in entry.statModifiers) {
+                    Console.WriteLine("      - stat: " + (int)mod.statToBoost);
+                    Console.WriteLine("        operation: " + (int)mod.modifyType);
+                    Console.WriteLine("        amount: " + mod.amount.ToStringInvariant());
+                }
+            }
+            if (entry.itemIDs.Count == 0) {
+                Console.WriteLine("    items: []");
+            } else {
+                Console.WriteLine("    items:");
+                foreach (var item in entry.itemIDs) {
+                    var pickupobject = PickupObjectDatabase.Instance.InternalGetById(item);
+                    Console.WriteLine("      - name: " + pickupobject.EncounterNameOrDisplayName ?? "null");
+                    Console.WriteLine("        id: " + item);
+                }
+            }
+            if (entry.gunIDs.Count == 0) {
+                Console.WriteLine("    guns: []");
+            } else {
+                Console.WriteLine("    guns:");
+                foreach (var item in entry.gunIDs) {
+                    var pickupobject = PickupObjectDatabase.Instance.InternalGetById(item);
+                    Console.WriteLine("      - name: " + pickupobject.EncounterNameOrDisplayName ?? "null");
+                    Console.WriteLine("        id: " + item);
+                }
+            }
+            if (entry.bonusSynergies.Count == 0) {
+                Console.WriteLine("    bonus: []");
+            } else {
+                Console.WriteLine("    bonus:");
+                foreach (var synergy in entry.bonusSynergies) {
+                    Console.WriteLine("      - " + (int)synergy);
+                }
+            }
+        }
+    }
 }
 
diff --git a/Assembly-CSharp.Base.mm/src/ETGGUI/ETGModLoaderMenu.cs b/Assembly-CSharp.Base.mm/src/ETGGUI/ETGModLoaderMenu.cs
@@ -197,7 +197,7 @@ private IEnumerator _KeepSinging() {
         int r = UnityEngine.Random.Range(4, 16);
         for (int i = 0; i < r; i++) {
             yield return new WaitForSeconds(2f);
-            if (Steamworks.SteamUserStats.GetStat("ITEMS_STOLEN", out pData)) {
+            if (Steamworks.SteamUserStats.GetStat("ITEMS_STOLEN", out pData) && SteamManager.Initialized && Steamworks.SteamAPI.IsSteamRunning()) {
                 yield break;
             }
         }

diff --git a/Assembly-CSharp.Base.mm/src/Patches/patch_PlatformInterface.cs b/Assembly-CSharp.Base.mm/src/Patches/patch_PlatformInterface.cs
diff --git a/libs/Assembly-CSharp.dll b/libs/Assembly-CSharp.dll