diff --git a/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Misc/Glass.png b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Misc/Glass.png new file mode 100644 index 00000000..b51a80e9 Binary files /dev/null and b/GeneralMods/Revitalize/Content/Graphics/Items/Resources/Misc/Glass.png differ diff --git a/GeneralMods/Revitalize/Framework/Crafting/VanillaRecipeBook.cs b/GeneralMods/Revitalize/Framework/Crafting/VanillaRecipeBook.cs index 97fde867..ee24e917 100644 --- a/GeneralMods/Revitalize/Framework/Crafting/VanillaRecipeBook.cs +++ b/GeneralMods/Revitalize/Framework/Crafting/VanillaRecipeBook.cs @@ -160,6 +160,13 @@ namespace Revitalize.Framework.Crafting this.recipesByObjectName["Furnace"].Add("Silver Ingot", furnace_electrumIngot); + VanillaRecipe furnace_glass = new VanillaRecipe(new Dictionary() + { + {new StardewValley.Object((int)Enums.SDVObject.Coal,5),1}, + {ModCore.ObjectManager.resources.getResource("Sand"),5} + + }, new KeyValuePair(ModCore.ObjectManager.resources.getResource("Glass"),1), TimeUtilities.GetMinutesFromTime(0, 1, 0), new StatCost(), false); + this.recipesByObjectName["Furnace"].Add("Sand", furnace_glass); } /// diff --git a/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs b/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs index eed1164b..5cecd49b 100644 --- a/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs +++ b/GeneralMods/Revitalize/Framework/Objects/ResourceManager.cs @@ -311,6 +311,9 @@ namespace Revitalize.Framework.Objects { CustomObject sand=new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Misc.Sand", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Misc", "Sand"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Sand", "Omegasis.Revitalize.Items.Resources.Misc.Sand", "Sand which is made from tiny rocks and can be used for smelting. Also unfun to have inside of swimwear.", "Resource", Color.Brown, -300, 0, false, 2, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Misc", "Sand"), new AnimationManager(), Color.White, true, null, null)); this.resources.Add("Sand", sand); + + CustomObject glass_normal = new CustomObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Items.Resources.Misc.Glass", TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Misc", "Glass"), typeof(CustomObject), Color.White, true), new BasicItemInformation("Glass", "Omegasis.Revitalize.Items.Resources.Misc.Glass", "Glass smelted from sand. Used in decorations and glass objects.", "Resource", Color.Brown, -300, 0, false, 20, false, false, TextureManager.GetTexture(ModCore.Manifest, "Items.Resources.Misc", "Glass"), new AnimationManager(), Color.White, true, null, null)); + this.resources.Add("Glass", glass_normal); } /// diff --git a/GeneralMods/Revitalize/ModCore.cs b/GeneralMods/Revitalize/ModCore.cs index f2caff2f..73cba1dc 100644 --- a/GeneralMods/Revitalize/ModCore.cs +++ b/GeneralMods/Revitalize/ModCore.cs @@ -554,13 +554,14 @@ namespace Revitalize //PickaxeExtended pick = new PickaxeExtended(new BasicItemInformation("My First Pickaxe", "Omegasis.Revitalize.Items.Tools.MyFirstPickaxe", "A testing pickaxe. Does it work?", "Tool", Color.SlateGray, 0, 0, false, 500, false, false, TextureManager.GetTexture(Manifest, "Tools", "Pickaxe"), new AnimationManager(TextureManager.GetExtendedTexture(Manifest, "Tools", "Pickaxe"), new Animation(0, 0, 16, 16)), Color.White, true, null, null),2,TextureManager.GetExtendedTexture(Manifest,"Tools","TestingPickaxeWorking")); Game1.player.addItemsByMenuIfNecessary(new List() { - new StardewValley.Object((int)Enums.SDVObject.Wood,100), + new StardewValley.Object((int)Enums.SDVObject.Coal,100), ModCore.ObjectManager.GetItem("SteelIngot", 20), ModCore.ObjectManager.GetItem("TrashCan",1), - ModCore.ObjectManager.GetItem("SandBox",1), + ModCore.ObjectManager.resources.getResource("Sand",5), ModCore.ObjectManager.GetItem("Anvil",1), ModCore.ObjectManager.GetItem("SolarPanelTier1",1), - ModCore.ObjectManager.GetItem("SolarArrayTier1",1) + ModCore.ObjectManager.GetItem("SolarArrayTier1",1), + new StardewValley.Object(Vector2.Zero,(int)Enums.SDVBigCraftable.Furnace,false) }); } diff --git a/GeneralMods/Revitalize/Revitalize.csproj b/GeneralMods/Revitalize/Revitalize.csproj index 79641934..f27d4f03 100644 --- a/GeneralMods/Revitalize/Revitalize.csproj +++ b/GeneralMods/Revitalize/Revitalize.csproj @@ -204,6 +204,9 @@ + + PreserveNewest + PreserveNewest