StardewValley
/
Stardew_Valley_Mods
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally added in the alloy furnace. I think all machines should serialize now.

This commit is contained in:
JoshuaNavarro 2019-09-22 11:12:07 -07:00
parent 4eda84e57d
commit caa7653b32
15 changed files with 404 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
GeneralMods/Revitalize/Content/Graphics/Objects/Machines/AlloyFurnace.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 718 B

BIN
GeneralMods/Revitalize/Content/Graphics/Objects/Machines/MiningDrillMachine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 829 B

After

Width:  |  Height:  |  Size: 845 B

48
GeneralMods/Revitalize/Framework/Crafting/CraftingRecipeBook.cs
View File

@ -477,6 +477,54 @@ namespace Revitalize.Framework.Crafting
CraftingRecipesByGroup.Add("Anvil", AnvilRecipes);
}
//~~~~~~~~~~~~~~~~~~~~~~~//
// Alloy Furnace Recipes //
//~~~~~~~~~~~~~~~~~~~~~~~//
CraftingRecipeBook AlloyFurnaceRecipes = new CraftingRecipeBook("AlloyFurnace");
AlloyFurnaceRecipes.addInCraftingTab("Default", new AnimatedButton(new StardustCore.Animations.AnimatedSprite("Default Tab", new Vector2(100 + 48, 100 + (24 * 4)), new AnimationManager(TextureManager.GetExtendedTexture(ModCore.Manifest, "Menus", "MenuTabHorizontal"), new Animation(0, 0, 24, 24)), Color.White), new Rectangle(0, 0, 24, 24), 2f), true);
AlloyFurnaceRecipes.addCraftingRecipe("BrassIngot", new UnlockableCraftingRecipe("Default", new Recipe(new List<CraftingRecipeComponent>() {
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.CopperBar,1),1),
new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("AluminumIngot"),1),
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.Coal,5),1)
},new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("BrassIngot"), 1),null, TimeUtilities.GetMinutesFromTime(0, 3, 0)), true));
AlloyFurnaceRecipes.addCraftingRecipe("BronzeIngot", new UnlockableCraftingRecipe("Default", new Recipe(new List<CraftingRecipeComponent>() {
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.CopperBar,1),1),
new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("TinIngot"),1),
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.Coal,5),1)
}, new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("BronzeIngot"), 1), null, TimeUtilities.GetMinutesFromTime(0, 4, 0)), true));
AlloyFurnaceRecipes.addCraftingRecipe("SteelIngot", new UnlockableCraftingRecipe("Default", new Recipe(new List<CraftingRecipeComponent>() {
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.IronBar,1),1),
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.Coal,5),1)
}, new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("SteelIngot"), 1), null, TimeUtilities.GetMinutesFromTime(0, 6, 0)), true));
AlloyFurnaceRecipes.addCraftingRecipe("ElectrumIngot", new UnlockableCraftingRecipe("Default", new Recipe(new List<CraftingRecipeComponent>() {
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.GoldBar,1),1),
new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("SilverIngot"),1),
new CraftingRecipeComponent(new StardewValley.Object((int)Enums.SDVObject.Coal,5),1)
}, new CraftingRecipeComponent(ModCore.ObjectManager.GetItem("ElectrumIngot"), 1), null, TimeUtilities.GetMinutesFromTime(0, 4, 0)), true));
if (CraftingRecipesByGroup.ContainsKey(AlloyFurnaceRecipes.craftingGroup))
{
foreach (KeyValuePair<string, UnlockableCraftingRecipe> recipe in AlloyFurnaceRecipes.craftingRecipes)
{
if (CraftingRecipesByGroup[AlloyFurnaceRecipes.craftingGroup].craftingRecipes.ContainsKey(recipe.Key))
{
}
else
{
CraftingRecipesByGroup[AlloyFurnaceRecipes.craftingGroup].craftingRecipes.Add(recipe.Key, recipe.Value); //Add in new recipes automatically without having to delete the old crafting recipe book.
}
}
}
else
{
CraftingRecipesByGroup.Add("AlloyFurnace", AlloyFurnaceRecipes);
}
}
#endregion

3
GeneralMods/Revitalize/Framework/Crafting/VanillaRecipeBook.cs
View File

@ -168,8 +168,7 @@ namespace Revitalize.Framework.Crafting
}, new KeyValuePair<Item, int>(ModCore.ObjectManager.resources.getResource("Glass"),1), TimeUtilities.GetMinutesFromTime(0, 1, 0), new StatCost(), false);
this.recipesByObjectName["Furnace"].Add("Sand", furnace_glass);
///Sand recipes here....
///
///Sand recipes here.
VanillaRecipe furnace_bauxiteSand = new VanillaRecipe(new Dictionary<Item, int>()
{
{new StardewValley.Object((int)Enums.SDVObject.Coal,5),1},

2
GeneralMods/Revitalize/Framework/Menus/CraftingInformationPage.cs
View File

@ -114,7 +114,7 @@ namespace Revitalize.Framework.Menus
}
else
{
this.machine.MinutesUntilReady = this.infoButton.recipe.timeToCraft;
this.machine.containerObject.MinutesUntilReady = this.infoButton.recipe.timeToCraft;
}
}

262
GeneralMods/Revitalize/Framework/Objects/Machines/AlloyFurnace.cs Normal file
View File

@ -0,0 +1,262 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Newtonsoft.Json;
using PyTK.CustomElementHandler;
using Revitalize.Framework.Objects.InformationFiles;
using Revitalize.Framework.Utilities;
using StardewValley;
namespace Revitalize.Framework.Objects.Machines
{
public class AlloyFurnace:Machine
{
public AlloyFurnace() { }
public AlloyFurnace(CustomObjectData PyTKData, BasicItemInformation info, List<ResourceInformation> ProducedResources = null, int EnergyRequiredPer10Minutes = 0, int TimeToProduce = 0, bool UpdatesContainer = false, string CraftingBook = "") : base(PyTKData, info)
{
this.producedResources = ProducedResources ?? new List<ResourceInformation>();
this.energyRequiredPer10Minutes = EnergyRequiredPer10Minutes;
this.timeToProduce = TimeToProduce;
this.updatesContainerObjectForProduction = UpdatesContainer;
this.MinutesUntilReady = TimeToProduce;
this.craftingRecipeBook = CraftingBook;
this.createStatusBubble();
}
public AlloyFurnace(CustomObjectData PyTKData, BasicItemInformation info, Vector2 TileLocation, List<ResourceInformation> ProducedResources = null, int EnergyRequiredPer10Minutes = 0, int TimeToProduce = 0, bool UpdatesContainer = false, string CraftingBook = "", MultiTiledObject obj = null) : base(PyTKData, info, TileLocation)
{
this.containerObject = obj;
this.producedResources = ProducedResources ?? new List<ResourceInformation>();
this.energyRequiredPer10Minutes = EnergyRequiredPer10Minutes;
this.timeToProduce = TimeToProduce;
this.updatesContainerObjectForProduction = UpdatesContainer;
this.MinutesUntilReady = TimeToProduce;
this.craftingRecipeBook = CraftingBook;
this.createStatusBubble();
}
public AlloyFurnace(CustomObjectData PyTKData, BasicItemInformation info, Vector2 TileLocation, Vector2 offsetKey, List<ResourceInformation> ProducedResources = null, int EnergyRequiredPer10Minutes = 0, int TimeToProduce = 0, bool UpdatesContainer = false, string CraftingBook = "", MultiTiledObject obj = null) : base(PyTKData, info, TileLocation)
{
this.offsetKey = offsetKey;
this.containerObject = obj;
this.producedResources = ProducedResources ?? new List<ResourceInformation>();
this.energyRequiredPer10Minutes = EnergyRequiredPer10Minutes;
this.timeToProduce = TimeToProduce;
this.updatesContainerObjectForProduction = UpdatesContainer;
this.MinutesUntilReady = TimeToProduce;
this.craftingRecipeBook = CraftingBook;
this.createStatusBubble();
}
public override void updateWhenCurrentLocation(GameTime time, GameLocation environment)
{
base.updateWhenCurrentLocation(time, environment);
this.animationManager.prepareForNextUpdateTick();
}
public override bool minutesElapsed(int minutes, GameLocation environment)
{
this.updateInfo();
//ModCore.log(this.info.animationManager.currentAnimationName);
if (this.updatesContainerObjectForProduction)
{
//ModCore.log("Update container object for production!");
//this.MinutesUntilReady -= minutes;
int remaining = minutes;
//ModCore.log("Minutes elapsed: " + remaining);
List<MultiTiledObject> energySources = new List<MultiTiledObject>();
if (this.ConsumesEnergy || this.GetEnergyManager().energyInteractionType == Enums.EnergyInteractionType.Storage)
{
//ModCore.log("This machine drains energy: " + this.info.name);
energySources = this.EnergyGraphSearchSources(); //Only grab the network once.
}
if (this.containerObject.MinutesUntilReady > 0)
{
this.containerObject.MinutesUntilReady = Math.Max(0, this.containerObject.MinutesUntilReady - minutes);
if (this.GetInventoryManager().hasItemsInBuffer && this.containerObject.MinutesUntilReady == 0)
{
this.GetInventoryManager().dumpBufferToItems();
}
this.animationManager.playAnimation("Working");
}
else
{
this.animationManager.playDefaultAnimation();
}
return false;
}
else
{
if (this.GetEnergyManager().energyInteractionType == Enums.EnergyInteractionType.Produces)
{
this.storeEnergyToNetwork();
}
return false;
}
//return base.minutesElapsed(minutes, environment);
}
public override bool rightClicked(Farmer who)
{
if (this.location == null)
this.location = Game1.player.currentLocation;
if (Game1.menuUp || Game1.currentMinigame != null) return false;
//ModCore.playerInfo.sittingInfo.sit(this, Vector2.Zero);
this.createMachineMenu();
return true;
}
public override Item getOne()
{
AlloyFurnace component = new AlloyFurnace(this.data, this.info.Copy(), this.producedResources, this.energyRequiredPer10Minutes, this.timeToProduce, this.updatesContainerObjectForProduction, this.craftingRecipeBook);
component.containerObject = this.containerObject;
component.offsetKey = this.offsetKey;
return component;
return component;
}
public override ICustomObject recreate(Dictionary<string, string> additionalSaveData, object replacement)
{
Vector2 offsetKey = new Vector2(Convert.ToInt32(additionalSaveData["offsetKeyX"]), Convert.ToInt32(additionalSaveData["offsetKeyY"]));
string GUID = additionalSaveData["GUID"];
AlloyFurnace self = Revitalize.ModCore.Serializer.DeserializeGUID<AlloyFurnace>(additionalSaveData["GUID"]);
if (ModCore.IsNullOrDefault<Machine>(self)) return null;
try
{
if (!Revitalize.ModCore.ObjectGroups.ContainsKey(additionalSaveData["ParentGUID"]))
{
MultiTiledObject obj = (MultiTiledObject)Revitalize.ModCore.Serializer.DeserializeGUID<MultiTiledObject>(additionalSaveData["ParentGUID"]);
self.containerObject = obj;
self.containerObject.removeComponent(offsetKey);
self.containerObject.addComponent(offsetKey, self);
Revitalize.ModCore.ObjectGroups.Add(additionalSaveData["ParentGUID"], obj);
}
else
{
self.containerObject = Revitalize.ModCore.ObjectGroups[additionalSaveData["ParentGUID"]];
self.containerObject.removeComponent(offsetKey);
self.containerObject.addComponent(offsetKey, self);
}
}
catch (Exception err)
{
ModCore.log(err);
}
return self;
}
public override void rebuild(Dictionary<string, string> additionalSaveData, object replacement)
{
base.rebuild(additionalSaveData, replacement);
}
public override void draw(SpriteBatch spriteBatch, int x, int y, float alpha = 1f)
{
this.updateInfo();
if (this.info == null)
{
Revitalize.ModCore.log("info is null");
if (this.syncObject == null) Revitalize.ModCore.log("DEAD SYNC");
}
if (this.animationManager == null) Revitalize.ModCore.log("Animation Manager Null");
if (this.displayTexture == null) Revitalize.ModCore.log("Display texture is null");
if (this.animationManager == null)
{
if (this.animationManager.getExtendedTexture() == null)
ModCore.ModMonitor.Log("Tex Extended is null???");
spriteBatch.Draw(this.displayTexture, Game1.GlobalToLocal(Game1.viewport, new Vector2((float)(x * Game1.tileSize), y * Game1.tileSize)), new Rectangle?(this.animationManager.currentAnimation.sourceRectangle), this.info.DrawColor * alpha, 0f, Vector2.Zero, (float)Game1.pixelZoom, this.Flipped ? SpriteEffects.FlipHorizontally : SpriteEffects.None, Math.Max(0f, (float)(y * Game1.tileSize) / 10000f));
// Log.AsyncG("ANIMATION IS NULL?!?!?!?!");
}
else
{
//Log.AsyncC("Animation Manager is working!");
float addedDepth = 0;
if (Revitalize.ModCore.playerInfo.sittingInfo.SittingObject == this.containerObject && this.info.facingDirection == Enums.Direction.Up)
{
addedDepth += (this.containerObject.Height - 1) - ((int)(this.offsetKey.Y));
if (this.info.ignoreBoundingBox) addedDepth += 1.5f;
}
else if (this.info.ignoreBoundingBox)
{
addedDepth += 1.0f;
}
this.animationManager.draw(spriteBatch, this.displayTexture, Game1.GlobalToLocal(Game1.viewport, new Vector2((float)(x * Game1.tileSize), y * Game1.tileSize)), new Rectangle?(this.animationManager.currentAnimation.sourceRectangle), this.info.DrawColor * alpha, 0f, Vector2.Zero, (float)Game1.pixelZoom, this.Flipped ? SpriteEffects.FlipHorizontally : SpriteEffects.None, Math.Max(0f, (float)((y + addedDepth) * Game1.tileSize) / 10000f) + .00001f);
this.drawStatusBubble(spriteBatch, x, y, alpha);
try
{
if (this.animationManager.canTickAnimation())
{
this.animationManager.tickAnimation();
}
// Log.AsyncC("Tick animation");
}
catch (Exception err)
{
ModCore.ModMonitor.Log(err.ToString());
}
}
// spriteBatch.Draw(Game1.mouseCursors, Game1.GlobalToLocal(Game1.viewport, new Vector2((float)((double)tileLocation.X * (double)Game1.tileSize + (((double)tileLocation.X * 11.0 + (double)tileLocation.Y * 7.0) % 10.0 - 5.0)) + (float)(Game1.tileSize / 2), (float)((double)tileLocation.Y * (double)Game1.tileSize + (((double)tileLocation.Y * 11.0 + (double)tileLocation.X * 7.0) % 10.0 - 5.0)) + (float)(Game1.tileSize / 2))), new Rectangle?(new Rectangle((int)((double)tileLocation.X * 51.0 + (double)tileLocation.Y * 77.0) % 3 * 16, 128 + this.whichForageCrop * 16, 16, 16)), Color.White, 0.0f, new Vector2(8f, 8f), (float)Game1.pixelZoom, SpriteEffects.None, (float)(((double)tileLocation.Y * (double)Game1.tileSize + (double)(Game1.tileSize / 2) + (((double)tileLocation.Y * 11.0 + (double)tileLocation.X * 7.0) % 10.0 - 5.0)) / 10000.0));
}
public override void updateInfo()
{
return;
if (this.info == null || this.containerObject == null)
{
this.ItemInfo = this.text;
//ModCore.log("Updated item info!");
return;
}
if (this.requiresUpdate())
{
//this.ItemInfo = this.text;
this.text = this.ItemInfo;
this.info.cleanAfterUpdate();
//this.containerObject.updateInfo();
//ModCore.log("Force an update for machine: " + this.info.name);
MultiplayerUtilities.RequestUpdateSync(this.guid);
}
}
public override Dictionary<string, string> getAdditionalSaveData()
{
Dictionary<string, string> saveData = base.getAdditionalSaveData();
Revitalize.ModCore.Serializer.SerializeGUID(this.containerObject.childrenGuids[this.offsetKey].ToString(), this);
this.containerObject.getAdditionalSaveData();
return saveData;
}
}
}

14
GeneralMods/Revitalize/Framework/Objects/Machines/ChargingStation.cs
View File

@ -137,6 +137,20 @@ namespace Revitalize.Framework.Objects.Machines
return (ICustomObject)self;
}
public override void rebuild(Dictionary<string, string> additionalSaveData, object replacement)
{
base.rebuild(additionalSaveData, replacement);
}
public override Dictionary<string, string> getAdditionalSaveData()
{
Dictionary<string, string> saveData = base.getAdditionalSaveData();
Revitalize.ModCore.Serializer.SerializeGUID(this.containerObject.childrenGuids[this.offsetKey].ToString(), this);
this.containerObject.getAdditionalSaveData();
return saveData;
}
public override void draw(SpriteBatch spriteBatch, int x, int y, float alpha = 1f)
{
this.updateInfo();

16
GeneralMods/Revitalize/Framework/Objects/Machines/EnergyGeneration/SolarPanel.cs
View File

@ -78,6 +78,22 @@ namespace Revitalize.Framework.Objects.Machines.EnergyGeneration
return (ICustomObject)self;
}
public override void rebuild(Dictionary<string, string> additionalSaveData, object replacement)
{
base.rebuild(additionalSaveData, replacement);
}
public override Dictionary<string, string> getAdditionalSaveData()
{
Dictionary<string, string> saveData = base.getAdditionalSaveData();
Revitalize.ModCore.Serializer.SerializeGUID(this.containerObject.childrenGuids[this.offsetKey].ToString(), this);
this.containerObject.getAdditionalSaveData();
return saveData;
}
public override void produceEnergy()
{
if (this.GetEnergyManager().canReceieveEnergy)

6
GeneralMods/Revitalize/Framework/Objects/Machines/Machine.cs
View File

@ -306,9 +306,9 @@ namespace Revitalize.Framework.Objects.Machines
this.storeEnergyToNetwork();
}
}
if (this.MinutesUntilReady > 0)
if (this.containerObject.MinutesUntilReady > 0)
{
this.MinutesUntilReady = Math.Max(0, this.MinutesUntilReady - minutes);
this.containerObject.MinutesUntilReady = Math.Max(0, this.MinutesUntilReady - minutes);
if (this.GetInventoryManager().hasItemsInBuffer && this.MinutesUntilReady == 0)
{
@ -362,7 +362,7 @@ namespace Revitalize.Framework.Objects.Machines
if (string.IsNullOrEmpty(this.craftingRecipeBook) == false)
{
CraftingMenuV1 craftingMenu = CraftingRecipeBook.CraftingRecipesByGroup[this.craftingRecipeBook].getCraftingMenuForMachine(100, 100, 400, 700, ref this.GetInventoryManager().items, ref this.GetInventoryManager().items, this);
CraftingMenuV1 craftingMenu = CraftingRecipeBook.CraftingRecipesByGroup[this.craftingRecipeBook].getCraftingMenuForMachine(100, 100, 400, 700, ref this.GetInventoryManager().items, ref this.GetInventoryManager().bufferItems, this);
machineMenu.addInMenuTab("Crafting", new AnimatedButton(new StardustCore.Animations.AnimatedSprite("Crafting Tab", new Vector2(), new AnimationManager(TextureManager.GetExtendedTexture(ModCore.Manifest, "Menus", "MenuTab"), new Animation(0, 0, 24, 24)), Color.White), new Rectangle(0, 0, 24, 24), 2f), craftingMenu, false);
}

14
GeneralMods/Revitalize/Framework/Objects/Machines/Wire.cs
View File

@ -87,6 +87,20 @@ namespace Revitalize.Framework.Objects.Machines
return (ICustomObject)self;
}
public override void rebuild(Dictionary<string, string> additionalSaveData, object replacement)
{
base.rebuild(additionalSaveData, replacement);
}
public override Dictionary<string, string> getAdditionalSaveData()
{
Dictionary<string, string> saveData = base.getAdditionalSaveData();
Revitalize.ModCore.Serializer.SerializeGUID(this.containerObject.childrenGuids[this.offsetKey].ToString(), this);
this.containerObject.getAdditionalSaveData();
return saveData;
}
public override void draw(SpriteBatch spriteBatch, int x, int y, float alpha = 1f)
{
this.updateInfo();

4
GeneralMods/Revitalize/Framework/Objects/Machines/WireMultiTiledObject.cs
View File

@ -97,6 +97,10 @@ namespace Revitalize.Framework.Objects.Machines
return saveData;
}
public override void rebuild(Dictionary<string, string> additionalSaveData, object replacement)
{
base.rebuild(additionalSaveData, replacement);
}
public override void draw(SpriteBatch spriteBatch, int x, int y, float alpha = 1)
{

35
GeneralMods/Revitalize/Framework/Objects/ObjectManager.cs
View File

@ -296,6 +296,41 @@ namespace Revitalize.Framework.Objects
miningDrillMachine_0_1.animationManager.playAnimation("Mining");
this.AddItem("MiningDrillMachineV1",miningDrillMachine);
MultiTiledObject alloyFurnace = new MultiTiledObject(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Objects.Machines.AlloyFurnace", TextureManager.GetTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), typeof(MultiTiledObject), Color.White, true), new BasicItemInformation("Alloy Furnace", "Omegasis.Revitalize.Objects.Machines.AlloyFurnace", "Smelts bars into ingots. Works twice as fast as a traditional furnace.", "Machine", Color.SteelBlue, -300, 0, false, 250, true, true, TextureManager.GetTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), new AnimationManager(TextureManager.GetExtendedTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), new Animation(0, 0, 16, 16)), Color.White, false, new InventoryManager(6, 3, 6), null,null));
AlloyFurnace alloyFurnace_0_0 = new AlloyFurnace(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Objects.Machines.AlloyFurnace", TextureManager.GetTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), typeof(AlloyFurnace), Color.White, true), new BasicItemInformation("Alloy Furnace", "Omegasis.Revitalize.Objects.Machines.AlloyFurnace", "Smelts bars into ingots. Works twice as fast as a traditional furnace.", "Machine", Color.SteelBlue, -300, 0, false, 250, true, true, TextureManager.GetTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), new AnimationManager(TextureManager.GetExtendedTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), new Animation(0, 0, 16, 16), new Dictionary<string, List<Animation>>()
{
{"Default",new List<Animation>()
{
new Animation(0,0,16,16)
}
},
{"Working",new List<Animation>()
{
new Animation(0,32,16,16,30),
new Animation(16,32,16,16,30)
}
}
},"Default"), Color.White, true, new InventoryManager(6, 3, 6), null, null), null, 0, 0, true, "AlloyFurnace");
AlloyFurnace alloyFurnace_0_1 = new AlloyFurnace(PyTKHelper.CreateOBJData("Omegasis.Revitalize.Objects.Machines.AlloyFurnace", TextureManager.GetTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), typeof(Machine), Color.White, true), new BasicItemInformation("Alloy Furnace", "Omegasis.Revitalize.Objects.Machines.AlloyFurnace", "Smelts bars into ingots. Works twice as fast as a traditional furnace.", "Machine", Color.SteelBlue, -300, 0, false, 250, true, true, TextureManager.GetTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), new AnimationManager(TextureManager.GetExtendedTexture(ModCore.Manifest, "Machines", "AlloyFurnace"), new Animation(0, 16, 16, 16), new Dictionary<string, List<Animation>>()
{
{"Default",new List<Animation>()
{
new Animation(0,16,16,16)
}
},
{"Working",new List<Animation>()
{
new Animation(0,48,16,16,30),
new Animation(16,48,16,16,30)
}
}
}, "Default"), Color.White, false, new InventoryManager(6, 3, 6), null, null), null, 0, 0, false, "AlloyFurnace");
alloyFurnace.addComponent(new Vector2(0, 0), alloyFurnace_0_0);
alloyFurnace.addComponent(new Vector2(0, 1), alloyFurnace_0_1);
this.AddItem("AlloyFurnace", alloyFurnace);
}
private void loadInWires()

4
GeneralMods/Revitalize/Framework/Utilities/Serialization/Serialization.cs
View File

@ -145,7 +145,7 @@ namespace Revitalize.Framework.Utilities
/// </summary>
public void restoreModObjects()
{
ModCore.log("Restore all mod objects!");
//ModCore.log("Restore all mod objects!");
//Replace all items in the world.
List<CustomObject> objsToRestore = new List<CustomObject>();
foreach (var v in ModCore.ObjectGroups)
@ -164,7 +164,7 @@ namespace Revitalize.Framework.Utilities
//Replace all held items or items in inventories.
foreach (GameLocation loc in LocationUtilities.GetAllLocations())
{
ModCore.log("Looking at location: " + loc);
//ModCore.log("Looking at location: " + loc);
foreach (StardewValley.Object c in loc.Objects.Values)
{
if (c is Chest)

4
GeneralMods/Revitalize/ModCore.cs
View File

@ -574,7 +574,9 @@ namespace Revitalize
new StardewValley.Object((int)Enums.SDVObject.CopperOre,10),
ModCore.ObjectManager.GetTool("MiningDrillV1"),
ModCore.ObjectManager.GetTool("ChainsawV1"),
ModCore.ObjectManager.GetItem("MiningDrillMachineV1")
ModCore.ObjectManager.GetItem("MiningDrillMachineV1"),
ModCore.ObjectManager.GetItem("AlloyFurnace"),
new StardewValley.Object((int)Enums.SDVObject.IronBar,100),
});
}

1
GeneralMods/Revitalize/Revitalize.csproj
View File

@ -162,6 +162,7 @@
<Compile Include="Framework\Objects\Items\Tools\MiningDrill.cs" />
<Compile Include="Framework\Objects\Items\Tools\PickaxeExtended.cs" />
<Compile Include="Framework\Objects\Items\Tools\WateringCanExtended.cs" />
<Compile Include="Framework\Objects\Machines\AlloyFurnace.cs" />
<Compile Include="Framework\Objects\Machines\ChargingStation.cs" />
<Compile Include="Framework\Objects\Machines\EnergyGeneration\SolarPanel.cs" />
<Compile Include="Framework\Objects\Machines\Grinder.cs" />