Browse Source

[MonsterNests] [2.0.2.1] frozenWisp

Zariteis 4 years ago
parent
commit
84f61172a6

BIN
MonsterNests/Assets/frozenWisp.png


BIN
MonsterNests/Assets/molten.png


+ 2 - 5
MonsterNests/Core.cs

@@ -1,10 +1,5 @@
 using GadgetCore;
 using GadgetCore.API;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
 
 namespace MonsterNests
 {
@@ -18,6 +13,8 @@ namespace MonsterNests
     public static ObjectInfo objectSpikePlantCM;
     public static ObjectInfo objectAncientCrystal;
     public static ObjectInfo objectAncientCrystalCM;
+    public static ObjectInfo objectPlagueNest;
+    public static ObjectInfo objectFrozenWisp;
 
     public static GadgetLogger logger;
   }

+ 9 - 4
MonsterNests/MonsterNests.cs

@@ -46,15 +46,20 @@ namespace MonsterNests
       Texture2D textureGoldenShroom = GadgetCoreAPI.LoadTexture2D("goldenShroom.png");
       Texture2D textureAncientCrystal = GadgetCoreAPI.LoadTexture2D("ancientCrystal.png");
       Texture2D textureAncientCrystalCM = GadgetCoreAPI.LoadTexture2D("ancientCrystalCM.png");
+      Texture2D texturePlagueNest = GadgetCoreAPI.LoadTexture2D("plagueNest.png");
+      Texture2D textureFrozenWisp = GadgetCoreAPI.LoadTexture2D("frozenWisp.png");
+      Texture2D textureMolten = GadgetCoreAPI.LoadTexture2D("frozenWisp.png");
 
       Core.objectBugspotBig = new ObjectInfo(ObjectType.BUGSPOT, new Item(31, 1, 0, 0, 0, new int[3], new int[3]), 16, textureBugspotBig).Register("bugspotBig");
       Core.objectSpikePlant = new ObjectInfo(ObjectType.PLANT, new Item(11, 1, 0, 0, 0, new int[3], new int[3]), 16, textureSpikePlant).Register("spikePlant");
       Core.objectSpikePlantCM = new ObjectInfo(ObjectType.PLANT, new Item(11, 1, 0, 0, 0, new int[3], new int[3]), 16, textureSpikePlantCM).Register("spikePlantCM");
-      Core.objectSpiderEgg = new ObjectInfo(ObjectType.ORE, new Item(3, 1, 0, 0, 0, new int[3], new int[3]), 8, textureSpiderEgg).Register("spiderEgg");
-      Core.objectSpiderEggCM = new ObjectInfo(ObjectType.ORE, new Item(3, 1, 0, 0, 0, new int[3], new int[3]), 16, textureSpiderEggCM).Register("spiderEggCM");
+      Core.objectSpiderEgg = new ObjectInfo(ObjectType.ORE, new Item(2, 1, 0, 0, 0, new int[3], new int[3]), 16, textureSpiderEgg).Register("spiderEgg");
+      Core.objectSpiderEggCM = new ObjectInfo(ObjectType.ORE, new Item(2, 1, 0, 0, 0, new int[3], new int[3]), 16, textureSpiderEggCM).Register("spiderEggCM");
       Core.objectGoldenShroom = new ObjectInfo(ObjectType.PLANT, new Item(12, 1, 0, 0, 0, new int[3], new int[3]), 16, textureGoldenShroom).Register("goldenShroom");
-      Core.objectAncientCrystal = new ObjectInfo(ObjectType.ORE, new Item(23, 1, 0, 0, 0, new int[3], new int[3]), 16, textureAncientCrystal).Register("ancientCrystal");
-      Core.objectAncientCrystalCM = new ObjectInfo(ObjectType.ORE, new Item(23, 1, 0, 0, 0, new int[3], new int[3]), 16, textureAncientCrystalCM).Register("ancientCrystalCM");
+      Core.objectAncientCrystal = new ObjectInfo(ObjectType.ORE, new Item(57, 1, 0, 0, 0, new int[3], new int[3]), 106, textureAncientCrystal).Register("ancientCrystal");
+      Core.objectAncientCrystalCM = new ObjectInfo(ObjectType.ORE, new Item(57, 1, 0, 0, 0, new int[3], new int[3]), 106, textureAncientCrystalCM).Register("ancientCrystalCM");
+      Core.objectPlagueNest = new ObjectInfo(ObjectType.TREE, new Item(51, 1, 0, 0, 0, new int[3], new int[3]), 106, texturePlagueNest).Register("plagueNest");
+      Core.objectFrozenWisp = new ObjectInfo(ObjectType.ORE, new Item(3, 1, 0, 0, 0, new int[3], new int[3]), 16, textureFrozenWisp).Register("frozenWisp");
 
     }
   }

+ 3 - 0
MonsterNests/MonsterNests.csproj

@@ -164,6 +164,9 @@
     <None Update="Assets\First\one">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Assets\frozenWisp.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Assets\goldenShroom.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

+ 14 - 14
MonsterNests/Patches/Patch_Chunk_SpawnBiomeSlot.cs

@@ -23,8 +23,8 @@ namespace MonsterNests.Patches
       else
         transform = ___spawnSpot[i].transform;
 
-      int num = UnityEngine.Random.Range(0, 100);
-      if (num < 2)
+      int num = UnityEngine.Random.Range(0, 1000);
+      if (num < 5)
       {
         if (a == 0)
         {
@@ -35,26 +35,18 @@ namespace MonsterNests.Patches
         else if (a == 1)
         {
           if (GameScript.challengeLevel <= 0)
-          {
             ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectSpikePlant.Object, transform.position, Quaternion.identity, 0);
-          }
           else
-          {
             ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectSpikePlantCM.Object, transform.position, Quaternion.identity, 0);
-          }
           ___temp++;
           return false;
         }
         else if (a == 2)
         {
           if (GameScript.challengeLevel <= 0)
-          {
             ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectSpiderEgg.Object, transform.position, Quaternion.identity, 0);
-          }
           else
-          {
             ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectSpiderEggCM.Object, transform.position, Quaternion.identity, 0);
-          }
           ___temp++;
           return false;
         }
@@ -67,13 +59,21 @@ namespace MonsterNests.Patches
         else if (a == 4)
         {
           if (GameScript.challengeLevel <= 0)
-          {
             ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectAncientCrystal.Object, transform.position, Quaternion.identity, 0);
-          }
           else
-          {
             ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectAncientCrystalCM.Object, transform.position, Quaternion.identity, 0);
-          }
+          ___temp++;
+          return false;
+        }
+        else if (a == 5)
+        {
+          ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectPlagueNest.Object, transform.position, Quaternion.identity, 0);
+          ___temp++;
+          return false;
+        }
+        else if (a == 6)
+        {
+          ___networkStuff[___temp] = (GameObject)Network.Instantiate(Core.objectFrozenWisp.Object, transform.position, Quaternion.identity, 0);
           ___temp++;
           return false;
         }

+ 15 - 1
MonsterNests/Patches/Patch_ObjectScript_Die.cs

@@ -22,7 +22,7 @@ namespace MonsterNests.Patches
         GameScript.cadetValue += 34;
         __instance.StartCoroutine(Shake());
         if (Network.isServer)
-          __instance.StartCoroutine(SpawnMultiple(__instance.transform.position.x, __instance.transform.position.y, 10, 4, "e/wasp", 0.1f));
+          __instance.StartCoroutine(SpawnMultiple(__instance.transform.position.x, __instance.transform.position.y, 10, 6, "e/wasp", 0.1f));
       }
       else if (___id == Core.objectSpikePlant.GetID())
       {
@@ -59,6 +59,20 @@ namespace MonsterNests.Patches
         if (Network.isServer)
           Network.Instantiate(Resources.Load("e/golem"), new Vector3(__instance.transform.position.x, __instance.transform.position.y + 1.1f, 0f), Quaternion.identity, 0);
       }
+      else if (___id == Core.objectPlagueNest.GetID())
+      {
+        GameScript.cadetValue += 34;
+        __instance.StartCoroutine(Shake());
+        if (Network.isServer)
+          Network.Instantiate(Resources.Load("e/plaguebeast"), new Vector3(__instance.transform.position.x, __instance.transform.position.y + 1.1f, 0f), Quaternion.identity, 0);
+      }
+      else if (___id == Core.objectFrozenWisp.GetID())
+      {
+        GameScript.cadetValue += 34;
+        __instance.StartCoroutine(Shake());
+        if (Network.isServer)
+          __instance.StartCoroutine(SpawnMultiple(__instance.transform.position.x, __instance.transform.position.y, 5, 6, "e/wisp", 0.35f));
+      }
     }
 
     private static IEnumerator Shake()