DustType calls and GetMod fixes

IAmBatby · Jul 12, 2017 · 5f61742 · 5f61742
1 parent 10df777
commit 5f61742
Show file tree

Hide file tree

Showing 49 changed files with 183 additions and 107 deletions.
diff --git a/DungeonGenn/DungeonWorld.cs b/DungeonGenn/DungeonWorld.cs
@@ -273,7 +273,9 @@ public static bool HitChance(int chance)
 		public void GenerateOcean()
 		{
 			/*maxDistBeetweenRooms/=2;
-    for(int i=0; i<floorNum; i++)				for(int j=0; j<roomNum; j++)				{
+    for(int i=0; i<floorNum; i++)
+				for(int j=0; j<roomNum; j++)
+				{
             if(i<=1)
             {
                 room[i,j]=new Room();
@@ -293,11 +295,13 @@ public void GenerateOcean()
                     room[i,j].GenerateUnder(room[i, j-1], minW/2, maxW/2, minH, maxH, maxDistBeetweenRooms/2);
                     graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;
                 }
-            }					else GenerateSparseRoom(i,j);
+            }
+					else GenerateSparseRoom(i,j);
             room[i,j].isFlooded=true;
             if(i!=0)room[i,j].isAroundSand=true;
             if(HitChance(80))room[i,j].wallState=0;
-        }			AfterGenerate();*/
+        }
+			AfterGenerate();*/
 		}
 		private void AfterGenerate()
 		{
@@ -392,15 +396,94 @@ public void GenerateSproutRoom(int i, int traitId)
 		}
 		public void GenerateTraitRichRoom(int i, int traitId)
 		{
-			/*room[i,j] = new Room();			bool TouchesRoom=false;			int debugI=0;
+			/*room[i,j] = new Room();
+			bool TouchesRoom=false;
+			int debugI=0;
 			if(HitChance(trait[traitId].destroyedChance)) room[i,j].isDestroyed = true;
-			if(HitChance(25)) room[i,j].wallState = 0;			do			{
-			    TouchesRoom=false;				debugI++;
-				if(j==0 || j==roomNum-1) room[i,j].isDestroyed = true;				//pirmas aukstas				if(i==0)				{					//jei nevienas nesukurtas					if(j==0)					{						room[i,j].GenerateRoom(trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH);					}					//iprastas kambariu kurimas					else					{						if(HitChance(steepness))						{							if(HitChance(50)) room[i,j].GenerateUnder(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
-							else room[i,j].GenerateOnTopOf(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);						}						else						{							room[i,j].GenerateRightTo(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms*2, 5, 25);						}						graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;					}				}				//kiti aukstai				else				{					//jei ne pirmo auksto pirmas kambarys					if(j==0)					{						findLowestIdInFloor(i-1);
+			if(HitChance(25)) room[i,j].wallState = 0;
+			do
+			{
+			    TouchesRoom=false;
+				debugI++;
+				if(j==0 || j==roomNum-1) room[i,j].isDestroyed = true;
+				//pirmas aukstas
+				if(i==0)
+				{
+					//jei nevienas nesukurtas
+					if(j==0)
+					{
+						room[i,j].GenerateRoom(trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH);
+					}
+					//iprastas kambariu kurimas
+					else
+					{
+						if(HitChance(steepness))
+						{
+							if(HitChance(50)) room[i,j].GenerateUnder(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
+							else room[i,j].GenerateOnTopOf(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
+						}
+						else
+						{
+							room[i,j].GenerateRightTo(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms*2, 5, 25);
+						}
+						graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;
+					}
+				}
+				//kiti aukstai
+				else
+				{
+					//jei ne pirmo auksto pirmas kambarys
+					if(j==0)
+					{
+						findLowestIdInFloor(i-1);
 						//replaced from findLowestIdInFloor;
-						lowestId=WorldGen.genRand.Next(roomNum);						room[i,j].GenerateUnder(room[i-1, lowestId], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);						graph[GetRoomFullId(i, j), GetRoomFullId(i-1, lowestId)]=true;						pickedCenter=WorldGen.genRand.Next(roomNum);					}					//iprastas kambariu kurimas					else					{						if(HitChance(steepness))						{							if(HitChance(50)) room[i,j].GenerateUnder(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
-							else room[i,j].GenerateOnTopOf(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);							graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;						}						else						{							if(j<pickedCenter)							{								room[i,j].GenerateRightTo(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms, 5, 25);								graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;							}							else if(j==pickedCenter)                            {                                room[i,j].GenerateLeftTo(room[i, 0], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms, 5, 25);                                graph[GetRoomFullId(i, j), GetRoomFullId(i, 0)]=true;                            }                            else                            {                                room[i,j].GenerateLeftTo(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms, 5, 25);                                graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;							}						}					}				}				//tikrinama ar kambariia lieciasi				for(int m=0; m<=i; m++)				{					for(int n=0; n<j; n++)						if(room[i,j].TouchesRoom(room[m,n]))						{							TouchesRoom=true;							break;						}					if (TouchesRoom) break;				}			}			while(TouchesRoom && debugI<10);*/
+						lowestId=WorldGen.genRand.Next(roomNum);
+						room[i,j].GenerateUnder(room[i-1, lowestId], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
+						graph[GetRoomFullId(i, j), GetRoomFullId(i-1, lowestId)]=true;
+						pickedCenter=WorldGen.genRand.Next(roomNum);
+					}
+					//iprastas kambariu kurimas
+					else
+					{
+						if(HitChance(steepness))
+						{
+							if(HitChance(50)) room[i,j].GenerateUnder(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
+							else room[i,j].GenerateOnTopOf(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms);
+							graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;
+						}
+						else
+						{
+							if(j<pickedCenter)
+							{
+								room[i,j].GenerateRightTo(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms, 5, 25);
+								graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;
+							}
+							else if(j==pickedCenter)
+                            {
+                                room[i,j].GenerateLeftTo(room[i, 0], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms, 5, 25);
+                                graph[GetRoomFullId(i, j), GetRoomFullId(i, 0)]=true;
+                            }
+                            else
+                            {
+                                room[i,j].GenerateLeftTo(room[i, j-1], trait[traitId].minW, trait[traitId].maxW, trait[traitId].minH, trait[traitId].maxH, trait[traitId].maxDistBeetweenRooms, 5, 25);
+                                graph[GetRoomFullId(i, j), GetRoomFullId(i, j-1)]=true;
+							}
+						}
+					}
+				}
+				//tikrinama ar kambariia lieciasi
+				for(int m=0; m<=i; m++)
+				{
+					for(int n=0; n<j; n++)
+						if(room[i,j].TouchesRoom(room[m,n]))
+						{
+							TouchesRoom=true;
+							break;
+						}
+					if (TouchesRoom) break;
+				}
+			}
+			while(TouchesRoom && debugI<10);*/
 		}
 		//}
 		//{CORRIDOR BUILDING METHODS
@@ -633,7 +716,8 @@ public void Analize()
 				if (prec > 45 && prec < 50)
 				{
 					room[i].isDestroyed = true;
-					/*for(int m=0; m<floorNum; m++)                        for(int n=0; n<roomNum; n++)
+					/*for(int m=0; m<floorNum; m++)
+                        for(int n=0; n<roomNum; n++)
                         {
                             if(m==i && n==j) continue;
                             bool destroy = room[i,j].IsNear(room[m,n], 5);
@@ -1368,7 +1452,7 @@ public void FillWithFurniture(int offsetX, int offsetY)
 						case 0:
 							break;
 						case 1:
-							if (HitChance(120)) WorldGen.PlaceTile(putX, putY, (ushort)ModLoader.GetMod("Tremor").TileType("RuinAltar")); break;
+							if (HitChance(120)) WorldGen.PlaceTile(putX, putY, (ushort)Tremor.instance.TileType("RuinAltar")); break;
 					}
 				}
 			}
@@ -1396,7 +1480,7 @@ public void FillWithChests(int offsetX, int offsetY)
 			if (FirstAI)
 			{
 				FirstAI = false;
-				if (HitChance(40)) WorldGen.PlaceChest(putX, putY, (ushort)ModLoader.GetMod("Tremor").TileType("RuinChest"), false, 2);
+				if (HitChance(40)) WorldGen.PlaceChest(putX, putY, (ushort)Tremor.instance.TileType("RuinChest"), false, 2);
 			}
 		}
 	}
@@ -1515,7 +1599,7 @@ static public void Begin()
 						break;
 					}
 				}
-				int[] itemsToPlaceInGlassChestsSecondary = { ModLoader.GetMod("Tremor").ItemType("IceKey"), 73 };
+				int[] itemsToPlaceInGlassChestsSecondary = { Tremor.instance.ItemType("IceKey"), 73 };
 				int itemsToPlaceInGlassChestsSecondaryChoice = 0;
 				if (isInDungeon)
 				{

diff --git a/Ice/Dungeon/DungeonBlock.cs b/Ice/Dungeon/DungeonBlock.cs
@@ -10,10 +10,10 @@ public override void SetDefaults()
 		{
 			Main.tileSolid[Type] = true;
 			Main.tileMergeDirt[Type] = true;
-			Main.tileMerge[Type][mod.TileType("IceBlock")] = true;
-			Main.tileMerge[Type][mod.TileType("VeryVeryIce")] = true;
+			Main.tileMerge[Type][mod.TileType<IceBlock>()] = true;
+			Main.tileMerge[Type][mod.TileType<Ice.Tree.VeryVeryIce>()] = true;
 			Main.tileMerge[Type][147] = true;
-			dustType = mod.DustType("IceDust");
+			dustType = mod.DustType<IceDust>();
 			drop = mod.ItemType("DungeonBlockItem");
 			AddMapEntry(new Color(70, 156, 213));
 		}

diff --git a/Ice/IceColl1.cs b/Ice/IceColl1.cs
@@ -43,7 +43,7 @@ public override void SetDefaults()
 			{
 				mod.TileType("IceBlock")
 			};
-			dustType = mod.DustType("IceDust");
+			dustType = mod.DustType<IceDust>();
 			soundType = 21;
 			soundStyle = 2;
 			TileObjectData.newTile.WaterDeath = false;

diff --git a/Ice/IceColl2.cs b/Ice/IceColl2.cs
@@ -42,7 +42,7 @@ public override void SetDefaults()
 			{
 				mod.TileType("IceBlock")
 			};
-			dustType = mod.DustType("IceDust");
+			dustType = mod.DustType<IceDust>();
 			soundType = 21;
 			soundStyle = 2;
 			TileObjectData.newTile.WaterDeath = false;

diff --git a/Ice/Tree/TremorSapling.cs b/Ice/Tree/TremorSapling.cs
@@ -33,7 +33,7 @@ public override void SetDefaults()
 			TileObjectData.addTile(Type);
 			sapling = true;
 			AddMapEntry(new Color(200, 200, 200));
-			dustType = mod.DustType("TreeCrash");
+			// TODO: TreeCrash does not exist dustType = mod.DustType<TreeCrash>();
 			adjTiles = new int[] { TileID.Saplings };
 		}
 

diff --git a/Ice/Tree/TremorTree.cs b/Ice/Tree/TremorTree.cs
@@ -5,12 +5,14 @@ namespace Tremor.Ice.Tree
 {
 	public class TremorTree : ModTree
 	{
-		private Mod mod => ModLoader.GetMod("Tremor");
+		private Mod mod => Tremor.instance;
 
+		/* TODO: TreeCrash does not exist
 		public override int CreateDust()
 		{
-			return mod.DustType("TreeCrash");
+			return mod.DustType<TreeCrash>();
 		}
+		*/
 
 		public override int GrowthFXGore()
 		{

diff --git a/Invasion/AncientWatch.cs b/Invasion/AncientWatch.cs
@@ -30,7 +30,6 @@ public override void SetStaticDefaults()
 
 		public override bool CanUseItem(Player player)
 		{
-			Mod mod = ModLoader.GetMod("Tremor");
 			CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
 			if (InvasionWorld.CyberWrath)
 				return false;
@@ -39,7 +38,6 @@ public override bool CanUseItem(Player player)
 
 		public override bool UseItem(Player player)
 		{
-			Mod mod = ModLoader.GetMod("Tremor");
 			CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
 			Main.NewText("Paradox Cohort is striking from nowhere!", 39, 86, 134);
 			Main.PlaySound(mod.GetSoundSlot(SoundType.Music, "Sounds/Music/Wrath1"), (int)player.position.X, (int)player.position.Y, 0);

diff --git a/Invasion/CyberLaser.cs b/Invasion/CyberLaser.cs
@@ -45,7 +45,7 @@ public override void AI()
 				}
 				for (int num91 = 0; num91 < num90; num91++)
 				{
-					int num92 = Dust.NewDust(new Vector2(projectile.position.X, projectile.position.Y + 2f), projectile.width, projectile.height, mod.DustType("CyberDust"), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.1f, 100, default(Color), 0.4f);
+					int num92 = Dust.NewDust(new Vector2(projectile.position.X, projectile.position.Y + 2f), projectile.width, projectile.height, mod.DustType<CyberDust>(), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.1f, 100, default(Color), 0.4f);
 					Main.dust[num92].noGravity = true;
 					Dust expr_46AC_cp_0 = Main.dust[num92];
 					expr_46AC_cp_0.velocity.X = expr_46AC_cp_0.velocity.X * 0.3f;

diff --git a/Invasion/CyberLaserBat.cs b/Invasion/CyberLaserBat.cs
@@ -31,8 +31,8 @@ public override void PostAI()
 			projectile.rotation = -((float)Math.Atan2(rotX, rotY)) - 1.57f;
 			if (Main.netMode != 2)
 			{
-				int dustID = Dust.NewDust(projectile.position, projectile.width, projectile.height, mod.DustType("CyberDust"), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, Color.White, 0.6f);
-				int dustID2 = Dust.NewDust(projectile.position, projectile.width, projectile.height, mod.DustType("CyberDust"), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, Color.White, 0.8f);
+				int dustID = Dust.NewDust(projectile.position, projectile.width, projectile.height, mod.DustType<CyberDust>(), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, Color.White, 0.6f);
+				int dustID2 = Dust.NewDust(projectile.position, projectile.width, projectile.height, mod.DustType<CyberDust>(), projectile.velocity.X * 0.2f, projectile.velocity.Y * 0.2f, 100, Color.White, 0.8f);
 			}
 		}
 	}

diff --git a/Invasion/CyberWrathInvasion.cs b/Invasion/CyberWrathInvasion.cs
@@ -19,7 +19,7 @@ public override void UpdateDead()
 		public static readonly PlayerLayer MiscEffects = new PlayerLayer("Tremor", "MiscEffects", PlayerLayer.MiscEffectsFront, delegate (PlayerDrawInfo drawInfo)
 		{
 			Player drawPlayer = drawInfo.drawPlayer;
-			Mod mod = ModLoader.GetMod("Tremor");
+			Mod mod = Tremor.instance;
 			CyberWrathInvasion modPlayer = drawPlayer.GetModPlayer<CyberWrathInvasion>(mod);
 
 			Texture2D CyberWrathI = mod.GetTexture("Invasion/System/System1");

diff --git a/Invasion/InvisibleSoul.cs b/Invasion/InvisibleSoul.cs
@@ -32,7 +32,6 @@ public override void SetDefaults()
 
 		public override float SpawnChance(NPCSpawnInfo spawnInfo)
 		{
-			Mod mod = ModLoader.GetMod("Tremor");
 			CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
 			float spawn = 20f;
 			if (InvasionWorld.CyberWrath)
@@ -59,7 +58,7 @@ public override void HitEffect(int hitDirection, double damage)
 			{
 				for (int k = 0; k < 10; k++)
 				{
-					Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType("CyberDust"), 2.5f * hitDirection, -2.5f, 0, default(Color), 0.7f);
+					Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 2.5f * hitDirection, -2.5f, 0, default(Color), 0.7f);
 				}
 
 				CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
@@ -72,7 +71,7 @@ public override void HitEffect(int hitDirection, double damage)
 
 			for (int k = 0; k < damage / npc.lifeMax * 50.0; k++)
 			{
-				Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType("CyberDust"), hitDirection, -1f, 0, default(Color), 0.7f);
+				Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), hitDirection, -1f, 0, default(Color), 0.7f);
 			}
 		}
 
@@ -116,7 +115,7 @@ public override void AI()
 
 			if (Main.rand.Next(2) == 0)
 			{
-				int num706 = Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType("CyberDust"), 0f, 0f, 200, npc.color, 0.5f);
+				int num706 = Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 0f, 0f, 200, npc.color, 0.5f);
 				Main.dust[num706].velocity *= 0.6f;
 			}
 			if (FirstState)

diff --git a/Invasion/MiniSoul.cs b/Invasion/MiniSoul.cs
@@ -58,7 +58,7 @@ public override void HitEffect(int hitDirection, double damage)
 			{
 				for (int k = 0; k < 10; k++)
 				{
-					Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType("CyberDust"), 2.5f * hitDirection, -2.5f, 0, default(Color), 0.7f);
+					Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 2.5f * hitDirection, -2.5f, 0, default(Color), 0.7f);
 				}
 
 				CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
@@ -71,7 +71,7 @@ public override void HitEffect(int hitDirection, double damage)
 
 			for (int k = 0; k < damage / npc.lifeMax * 50.0; k++)
 			{
-				Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType("CyberDust"), hitDirection, -1f, 0, default(Color), 0.7f);
+				Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), hitDirection, -1f, 0, default(Color), 0.7f);
 			}
 		}
 	}