Browse Source

[ETC] [2.0.3.8] cleanup

Zariteis 4 years ago
parent
commit
022591e00c

+ 1 - 1
CombatChipChest/ItemUtil.cs

@@ -19,7 +19,7 @@ namespace CombatChipChest
         mainTexture = textureTile
       };
 
-      ItemInfo itemInfo = new ItemInfo(ItemType.GENERIC, name, "", textureItem, -1, default, null, null, null, null);
+      ItemInfo itemInfo = new ItemInfo(ItemType.GENERIC, name, "", textureItem);
       itemInfo.Register(name);
       var tile = new TileInfo(TileType.INTERACTIVE, textureTile, gameObject, itemInfo);
       tile.Register(name);

+ 22 - 0
LoopPortal/LoopPortal.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoopPortal", "LoopPortal.csproj", "{91AB81DE-EAEE-47D1-93DD-541179208219}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.ActiveCfg = Release|x86
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {03D8AD64-3AB7-4751-822A-25896D1C4667}
+	EndGlobalSection
+EndGlobal

+ 22 - 0
QuickStack/QuickStack.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickStack", "QuickStack.csproj", "{91AB81DE-EAEE-47D1-93DD-541179208219}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.ActiveCfg = Release|x86
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F3B707AF-8F1E-426C-8906-042A15A61065}
+	EndGlobalSection
+EndGlobal

+ 22 - 0
ScrapYard/ScrapYard.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScrapYard", "ScrapYard.csproj", "{91AB81DE-EAEE-47D1-93DD-541179208219}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.ActiveCfg = Release|x86
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {108575EB-1B8F-4B26-A5E4-9DD62C4B9AC6}
+	EndGlobalSection
+EndGlobal

+ 31 - 28
ScrapYardLite/ScrapYard.cs

@@ -105,39 +105,42 @@ namespace ScrapYard
         yield return new WaitForSeconds(0.25f);
       }
       yield return new WaitForSeconds(0.75f);
-      try
+      if (Network.isServer)
       {
+        try
         {
-          var stand = (GameObject)Network.Instantiate((GameObject)Resources.Load("prop/ScrapYard/stand"), new Vector3(-250f + 4 * -5.5f, -5.99f - 2 + 0.5f, 0.19f), Quaternion.identity, 0);
-          stand.GetComponent<ScrapYardShopStandScript>().GetComponent<ScrapYardShopStandScript>().StartCallSet(ItemRegistry.GetItemIDByRegistryName("ScrapYard:Scrap Trophy"), 9999, 1, 57);
-        }
-        List<ShopPlatformEntry> blocks = new List<ShopPlatformEntry>();
-        List<ShopPlatformEntry> objects = new List<ShopPlatformEntry>();
-        foreach (var p in ShopPlatform.GetShopPlatforms())
-          if (p == ShopPlatform.DefaultBlocks || p == ShopPlatform.DefaultWalls)
-            foreach (var e in p.Entries)
-              blocks.Add(e);
-          else
-            foreach (var e in p.Entries)
-              objects.Add(e);
-        for (int i = 0; i < System.Math.Min(objects.Count, 3); i++)
-        {
-          var entry = objects[i];
-          var stand = (GameObject)Network.Instantiate((GameObject)Resources.Load("prop/ScrapYard/stand"), new Vector3(-250f + 4 * i, -5.99f - 2 + 0.5f, 0.19f), Quaternion.identity, 0);
-          stand.GetComponent<ScrapYardShopStandScript>().StartCallSet(entry.ItemID, entry.Price, entry.Quantity, entry.CurrencyItemID);
+          {
+            var stand = (GameObject)Network.Instantiate((GameObject)Resources.Load("prop/ScrapYard/stand"), new Vector3(-250f + 4 * -5.5f, -5.99f - 2 + 0.5f, 0.19f), Quaternion.identity, 0);
+            stand.GetComponent<ScrapYardShopStandScript>().GetComponent<ScrapYardShopStandScript>().StartCallSet(ItemRegistry.GetItemIDByRegistryName("ScrapYard:Scrap Trophy"), 9999, 1, 57);
+          }
+          List<ShopPlatformEntry> blocks = new List<ShopPlatformEntry>();
+          List<ShopPlatformEntry> objects = new List<ShopPlatformEntry>();
+          foreach (var p in ShopPlatform.GetShopPlatforms())
+            if (p == ShopPlatform.DefaultBlocks || p == ShopPlatform.DefaultWalls)
+              foreach (var e in p.Entries)
+                blocks.Add(e);
+            else
+              foreach (var e in p.Entries)
+                objects.Add(e);
+          for (int i = 0; i < System.Math.Min(objects.Count, 3); i++)
+          {
+            var entry = objects[i];
+            var stand = (GameObject)Network.Instantiate((GameObject)Resources.Load("prop/ScrapYard/stand"), new Vector3(-250f + 4 * i, -5.99f - 2 + 0.5f, 0.19f), Quaternion.identity, 0);
+            stand.GetComponent<ScrapYardShopStandScript>().StartCallSet(entry.ItemID, entry.Price, entry.Quantity, entry.CurrencyItemID);
+          }
+          for (int i = 0; i < System.Math.Min(blocks.Count, 5); i++)
+          {
+            var entry = blocks[i];
+            var stand = (GameObject)Network.Instantiate((GameObject)Resources.Load("prop/ScrapYard/stand"), new Vector3(-250f + 4 * 7 + 4 * i, -5.99f + 6 + 0.5f, 0.19f), Quaternion.identity, 0);
+            stand.GetComponent<ScrapYardShopStandScript>().StartCallSet(entry.ItemID, entry.Price, entry.Quantity, entry.CurrencyItemID);
+          }
+          if (objects.Count > 3 || blocks.Count > 5)
+            Core.logger.LogWarning("There are more stands than can be added to your ship. U should use the non Lite version of Scrap Yard");
         }
-        for (int i = 0; i < System.Math.Min(blocks.Count, 5); i++)
+        catch (System.Exception e)
         {
-          var entry = blocks[i];
-          var stand = (GameObject)Network.Instantiate((GameObject)Resources.Load("prop/ScrapYard/stand"), new Vector3(-250f + 4 * 7 + 4 * i, -5.99f + 6 + 0.5f, 0.19f), Quaternion.identity, 0);
-          stand.GetComponent<ScrapYardShopStandScript>().StartCallSet(entry.ItemID, entry.Price, entry.Quantity, entry.CurrencyItemID);
+          Core.logger.LogError(e);
         }
-        if (objects.Count > 3 || blocks.Count > 5)
-          Core.logger.LogWarning("There are more stands than can be added to your ship. U should use the non Lite version of Scrap Yard");
-      }
-      catch (System.Exception e)
-      {
-        Core.logger.LogError(e);
       }
       yield break;
     }

+ 22 - 0
ScrapYardLite/ScrapYard.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScrapYard", "ScrapYard.csproj", "{91AB81DE-EAEE-47D1-93DD-541179208219}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.ActiveCfg = Release|x86
+		{91AB81DE-EAEE-47D1-93DD-541179208219}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {06D26FBA-C7BF-4C30-8D5F-9E23B2390F12}
+	EndGlobalSection
+EndGlobal