From 7209fec308c3e5245559e1213295fc1397e00422 Mon Sep 17 00:00:00 2001 From: JoshuaNavarro Date: Thu, 19 Sep 2019 17:03:29 -0700 Subject: [PATCH] Added in dust variations of ore which can be used to double ore when smelted. --- .../Items/Resources/Ore/BauxiteSand.png | Bin 0 -> 254 bytes .../Items/Resources/Ore/CopperSand.png | Bin 0 -> 236 bytes .../Graphics/Items/Resources/Ore/GoldSand.png | Bin 0 -> 244 bytes .../Items/Resources/Ore/IridiumSand.png | Bin 0 -> 270 bytes .../Graphics/Items/Resources/Ore/IronSand.png | Bin 0 -> 243 bytes .../Graphics/Items/Resources/Ore/LeadSand.png | Bin 0 -> 263 bytes .../Items/Resources/Ore/SilverSand.png | Bin 0 -> 235 bytes .../Graphics/Items/Resources/Ore/TinSand.png | Bin 0 -> 233 bytes .../Items/Resources/Ore/TitaniumSand.png | Bin 0 -> 260 bytes .../Framework/Objects/ResourceManager.cs | 22 +++++++++++++- GeneralMods/Revitalize/Revitalize.csproj | 27 ++++++++++++++++++ 11 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/BauxiteSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/CopperSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/GoldSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/IridiumSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/IronSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/LeadSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/SilverSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/TinSand.png create mode 100644 GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/TitaniumSand.png diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/BauxiteSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/BauxiteSand.png new file mode 100644 index 0000000000000000000000000000000000000000..04fee32d388929d3b0389195ea40b3eb20b7ef6d GIT binary patch literal 254 zcmVPx#xJg7oR5*?8Q6Un;AQ0TdCK+a!h}!5F3^Km9{Gl(a?0FcTSP1;g|W$G}JA>2#Y8N|_F=3VSn z6U_9(J4%rl_z9Hs003>)!xXy&e$q&WU{p)d#I7@SLG%r6*3gT$(hAO;Uk@ccq_U98 zLYp-ZrLu|m!cM8XPY|EC>)8p;TwKfXswTOQ%Zh)&1`2dqa5W&z&;S4c07*qoM6N<$ Ef)C4Uc>n+a literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/CopperSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/CopperSand.png new file mode 100644 index 0000000000000000000000000000000000000000..66681d5798c90d03ee4b48491fac0d3bafde025a GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|mU+53hFJ6_ zCrGgN>`<9=RN|lV=kNOttrJ_V;8Waa+hYGvA4~AM>niI ioXxRI#_#MD28JstA=cMg|5*WD%;4$j=d#Wzp$Pz(c3jW^ literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/GoldSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/GoldSand.png new file mode 100644 index 0000000000000000000000000000000000000000..1ea7bf368586b0b43a1fdc8fa3a44583c975ee56 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)_J-(hFJ6_ zCrGgN>`>{OdgHJAv*@ofhgONLR`A)J+N{hB1cyJi{k7mtJoJ?5G@Cmc+qEPXY4!sK z3`bw?uP!|Ou(&bxks?cbgLVK^CI&9SZF@T!?Y3=D;i=_ht>Ub7YGat2RVKbLh*2~7aJAYs4& literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/IridiumSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/IridiumSand.png new file mode 100644 index 0000000000000000000000000000000000000000..0f2c472a744395c7cd8719291cf360bcc6c31fd5 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|PI$UFhFJ6_ zCrGgN>`>wPvHPF$XZ;$T!>guo&VTkfc#q_@XKsn60_z!hfFQegv4q%@jDt6KFtjnA zFuVEG?x<$_b=GA(b_L%Sp1cH9A@E+Hgz-#USBxDS5VZB3od00mj`GR!tF;Yc7&gDW zkdnE>(I7m5o7*iV*jKXV!K@38$DjBY?0j(Yw1kAjf4JI&HqPan2W>7Gy1BVPMcqEX*|1e{vP* OCk9VfKbLh*2~7Yu^KL%? literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/IronSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/IronSand.png new file mode 100644 index 0000000000000000000000000000000000000000..296b1bda36b593280f6e34442ad1bb9a0efff5f3 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)_S@)hFJ6_ zCrGgN>`>up;{LDvS%1yjYE=N`p8xM@B7re{&j7$2hY=kwnx~df;d0jzYtoT_ucaLby4}qU&8x-_@+f!PPH}$dWON% L)z4*}Q$iB}gfeKa literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/SilverSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/SilverSand.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ed13852bffe6be0bc894347ade75bfab08b4dc GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|mU_B4hFJ8z zop@02hysUeeUQ_d!&?+$1Ny$+VBNOBc-!N7DJ6@aZMgn)5!3(AZVmM^tC@_i|C4o^ z@y&0tua64@gJ9&WIoeE0O~roiS64`Ud0}`gHP^d9a`AWbu7eAFcdTV)STZMGQ;sEf zQn6oenTY%QD#^u*-g{VPuf2cjFVdQ&MBb@0Fj_qCjbBd literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/TitaniumSand.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Ore/TitaniumSand.png new file mode 100644 index 0000000000000000000000000000000000000000..3136a626ca313860a5bf86a28602f42732945a08 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|_IbKEhFJ6_ zCrGgN>`>AAl=V;fv$fjRgwXC#fn_%@-<{nE1c|@Tt+n7yJoJ>wzdXO~e!M_V48viD zl;xX0J(za*HIsODOK(d|V-mv|wi##D`R6FV;NlTKkn`(rYvaK?2RjyMM@;Y)O`6`~ zt#JFyDdxi7oy~%0Cj95&nGlh<>cr}w{M~ZJ?8Q&l~Y-yUh#5unB4#PiQ%8+BY9?9?P*KkwpcSulab+cQ~K%1>H7tNK4I{5^>bP0 Hl+XkKv0-XI literal 0 HcmV?d00001 diff --git a/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs b/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs index 5cecd49b..33d24cfa 100644 --- a/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs +++ b/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs @@ -260,7 +260,7 @@ namespace Revitalize.Framework.Objects /// private void loadInOreItems() { - Ore tinOre = new Ore(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.TinOre", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TinOre"), typeof(Ore), Color.White, true), new BasicItemInformation("Tin Ore", "Omegasis.Revitalize.Items.Resources.Ore.TinOre", "Tin ore that can be smelted into tin ingots for further use.", "Ore", Color.Silver, -300, 0, false, 7, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TinOre"), new AnimationManager(), Color.White, true, null, null), 1); + Ore tinOre = new Ore(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.TinOre", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TinOre"), typeof(Ore), Color.White, true), new BasicItemInformation("Tin Ore", "Omegasis.Revitalize.Items.Resources.Ore.TinOre", "Tin ore that can be smelted into tin ingots for further use.", "Ore", Color.Silver, -300, 0, false, 7,false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TinOre"), new AnimationManager(), Color.White, true, null, null), 1); this.ores.Add("Tin", tinOre); Ore bauxiteOre = new Ore(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.Bauxite", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "BauxiteOre"), typeof(Ore), Color.White, true), new BasicItemInformation("Bauxite Ore", "Omegasis.Revitalize.Items.Resources.Ore.BauxiteOre", "Bauxite ore that can be smelted into aluminum ingots for further use.", "Ore", Color.Silver, -300, 0, false, 11, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "BauxiteOre"), new AnimationManager(), Color.White, true, null, null), 1); @@ -305,6 +305,26 @@ namespace Revitalize.Framework.Objects CustomObject steelIngot = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.SteelIngot", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "SteelIngot"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Steel Ingot", "Omegasis.Revitalize.Items.Resources.Ore.SteelIngot", "A steel ingot that was made by processing iron again with more coal. It can be used for crafting purposes especially for making new machines.", "Ore", Color.Silver, -300, 0, false, 180, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "SteelIngot"), new AnimationManager(), Color.White, true, null, null), 1); ModCore.ObjectManager.AddItem("SteelIngot", steelIngot); + + CustomObject bauxiteSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.BauxiteSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "BauxiteSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Bauxite Sand", "Omegasis.Revitalize.Items.Resources.Ore.BauxiteSand", "Bauxite ore which has been crushed into sand. Smelt it to get aluminum ingots.", "Ore", Color.Silver, -300, 0, false, 11, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "BauxiteSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject copperSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.CopperSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "CopperSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Copper Sand", "Omegasis.Revitalize.Items.Resources.Ore.CopperSand", "Copper ore which has been crushed into sand. Smelt it to get copper bars.", "Ore", Color.Silver, -300, 0, false, 5, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "CopperSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject goldSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.GoldSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "GoldSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Gold Sand", "Omegasis.Revitalize.Items.Resources.Ore.GoldSand", "Gold ore which has been crushed into sand. Smelt it to get gold bars.", "Ore", Color.Silver, -300, 0, false, 25, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "GoldSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject ironSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.IronSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "IronSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Iron Sand", "Omegasis.Revitalize.Items.Resources.Ore.IronSand", "Iron ore which has been crushed into sand. Smelt it to get iron bars.", "Ore", Color.Silver, -300, 0, false, 10, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "IronSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject iridiumSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.IridiumSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "IriduiumSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Iridium Sand", "Omegasis.Revitalize.Items.Resources.Ore.IridiumSand", "Iridium ore which has been crushed into sand. Smelt it to get iridium bars.", "Ore", Color.Silver, -300, 0, false, 100, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "IridiumSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject leadSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.LeadSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "LeadSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Lead Sand", "Omegasis.Revitalize.Items.Resources.Ore.LeadSand", "Lead ore which has been crushed into sand. Smelt it to get lead ingots.", "Ore", Color.Silver, -300, 0, false, 15, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "LeadSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject silverSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.SilverSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "SilverSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Silver Sand", "Omegasis.Revitalize.Items.Resources.Ore.SilverSand", "Silver ore which has been crushed into sand. Smelt it to get silver ingots.", "Ore", Color.Silver, -300, 0, false, 20, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "SilverSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject tinSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.TinSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TinSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Tin Sand", "Omegasis.Revitalize.Items.Resources.Ore.TinSand", "Tin ore which has been crushed into sand. Smelt it to get tin ingots.", "Ore", Color.Silver, -300, 0, false, 7, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TinSand"), new AnimationManager(), Color.White, true, null, null), 1); + CustomObject titaniumSand = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Ore.TitaniumSand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TitniumSand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Copper Sand", "Omegasis.Revitalize.Items.Resources.Ore.TitaniumSand", "Titanium ore which has been crushed into sand. Smelt it to get titanium bars.", "Ore", Color.Silver, -300, 0, false, 35, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Ore", "TitaniumSand"), new AnimationManager(), Color.White, true, null, null), 1); + + this.resources.Add("BauxiteSand", bauxiteSand); + this.resources.Add("CopperSand", copperSand); + this.resources.Add("GoldSand", goldSand); + this.resources.Add("IronSand", ironSand); + this.resources.Add("IridiumSand", iridiumSand); + this.resources.Add("LeadSand", leadSand); + this.resources.Add("SilverSand", silverSand); + this.resources.Add("TinSand", tinSand); + this.resources.Add("TitaniumSand", titaniumSand); } private void loadInResourceItems() diff --git a/GeneralMods/Revitalize/Revitalize.csproj b/GeneralMods/Revitalize/Revitalize.csproj index e1c10b8e..a55ab562 100644 --- a/GeneralMods/Revitalize/Revitalize.csproj +++ b/GeneralMods/Revitalize/Revitalize.csproj @@ -227,21 +227,39 @@ PreserveNewest + + PreserveNewest + PreserveNewest PreserveNewest + + PreserveNewest + PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest PreserveNewest + + PreserveNewest + PreserveNewest @@ -251,6 +269,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -260,12 +281,18 @@ PreserveNewest + + PreserveNewest + PreserveNewest PreserveNewest + + PreserveNewest + PreserveNewest