diff --git a/GeneralMods/HappyBirthday/Framework/BirthdayEvents.cs b/GeneralMods/HappyBirthday/Framework/BirthdayEvents.cs index 1637a1de..b09086b1 100644 --- a/GeneralMods/HappyBirthday/Framework/BirthdayEvents.cs +++ b/GeneralMods/HappyBirthday/Framework/BirthdayEvents.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Omegasis.HappyBirthday.Framework.Events; -using Omegasis.HappyBirthday.Framework.Events.Preconditions; -using Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific; -using Omegasis.HappyBirthday.Framework.Events.SpecialPreconditions; +using Omegasis.HappyBirthday.Framework.EventPreconditions; +using StardustCore.Events; +using StardustCore.Events.Preconditions; +using StardustCore.Events.Preconditions.TimeSpecific; using StardewValley; namespace Omegasis.HappyBirthday.Framework @@ -20,10 +20,13 @@ namespace Omegasis.HappyBirthday.Framework conditions.Add(new FarmerBirthdayPrecondition()); conditions.Add(new LocationPrecondition(Game1.getLocationFromName("CommunityCenter"))); conditions.Add(new TimePrecondition(600, 2600)); - EventHelper e = new EventHelper("CommunityCenterBirthday",19950, conditions, new EventStartData(EventStartData.MusicToPlayType.Continue, 32, 22, new EventStartData.FarmerData(32, 22, EventHelper.FacingDirection.Up),new List())); + EventHelper e = new EventHelper("CommunityCenterBirthday",19950, conditions, new EventStartData(EventStartData.MusicToPlayType.Continue, 32, 16, new EventStartData.FarmerData(32, 22, EventHelper.FacingDirection.Up),new List())); e.globalFadeIn(); e.moveFarmerUp(6, EventHelper.FacingDirection.Up, false); + e.ViewportLerpTileOffset(new Microsoft.Xna.Framework.Point(0,-6),60*6); + e.addObjectToPlayersInventory(64, 22,true); e.showMessage("Community center birthday here."); + e.end(); return e; diff --git a/GeneralMods/HappyBirthday/Framework/Events/SpecialPreconditions/FarmerBirthdayPrecondition.cs b/GeneralMods/HappyBirthday/Framework/EventPreconditions/FarmerBirthdayPrecondition.cs similarity index 78% rename from GeneralMods/HappyBirthday/Framework/Events/SpecialPreconditions/FarmerBirthdayPrecondition.cs rename to GeneralMods/HappyBirthday/Framework/EventPreconditions/FarmerBirthdayPrecondition.cs index 165db6c8..6600ebcf 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/SpecialPreconditions/FarmerBirthdayPrecondition.cs +++ b/GeneralMods/HappyBirthday/Framework/EventPreconditions/FarmerBirthdayPrecondition.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Omegasis.HappyBirthday.Framework.Events.Preconditions; +using StardustCore.Events.Preconditions; -namespace Omegasis.HappyBirthday.Framework.Events.SpecialPreconditions +namespace Omegasis.HappyBirthday.Framework.EventPreconditions { public class FarmerBirthdayPrecondition:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/SpecialPreconditions/SpouseBirthdayPrecondition.cs b/GeneralMods/HappyBirthday/Framework/EventPreconditions/SpouseBirthdayPrecondition.cs similarity index 84% rename from GeneralMods/HappyBirthday/Framework/Events/SpecialPreconditions/SpouseBirthdayPrecondition.cs rename to GeneralMods/HappyBirthday/Framework/EventPreconditions/SpouseBirthdayPrecondition.cs index c167090c..4c817f1a 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/SpecialPreconditions/SpouseBirthdayPrecondition.cs +++ b/GeneralMods/HappyBirthday/Framework/EventPreconditions/SpouseBirthdayPrecondition.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Omegasis.HappyBirthday.Framework.Events.Preconditions; +using StardustCore.Events.Preconditions; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.SpecialPreconditions +namespace Omegasis.HappyBirthday.Framework.EventPreconditions { public class SpouseBirthdayPrecondition:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/EventManager.cs b/GeneralMods/HappyBirthday/Framework/Events/EventManager.cs deleted file mode 100644 index fe26e0de..00000000 --- a/GeneralMods/HappyBirthday/Framework/Events/EventManager.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using StardewValley; - -namespace Omegasis.HappyBirthday.Framework.Events -{ - public class EventManager - { - - - public Dictionary events; - - - public EventManager() - { - this.events = new Dictionary(); - } - - public void addEvent(EventHelper Event) - { - this.events.Add(Event.eventName, Event); - } - - public EventHelper getEvent(string Name) - { - if (this.events.ContainsKey(Name)) - { - return this.events[Name]; - } - else - { - return null; - } - } - - - public void clearEventFromFarmer(string EventName) - { - - this.events.TryGetValue(EventName, out EventHelper e); - if (e == null) return; - Game1.player.eventsSeen.Remove(e.getEventID()); - } - } -} diff --git a/GeneralMods/HappyBirthday/HappyBirthday.cs b/GeneralMods/HappyBirthday/HappyBirthday.cs index e68ad0bc..c7416f3e 100644 --- a/GeneralMods/HappyBirthday/HappyBirthday.cs +++ b/GeneralMods/HappyBirthday/HappyBirthday.cs @@ -5,7 +5,7 @@ using System.Linq; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Omegasis.HappyBirthday.Framework; -using Omegasis.HappyBirthday.Framework.Events; +using StardustCore.Events; using StardewModdingAPI; using StardewModdingAPI.Events; using StardewValley; @@ -101,7 +101,7 @@ namespace Omegasis.HappyBirthday this.othersBirthdays = new Dictionary(); this.eventManager = new EventManager(); - + this.eventManager.addCustomEventLogic("AddObjectToPlayersInventory", ExtraEventActions.addObjectToPlayerInventory); } private void Player_Warped(object sender, WarpedEventArgs e) @@ -575,8 +575,19 @@ namespace Omegasis.HappyBirthday private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) { - if (!Context.IsWorldReady || Game1.eventUp || Game1.isFestival()) + if (!Context.IsWorldReady || Game1.isFestival()) + { return; + } + + if (Game1.eventUp) + { + if (this.eventManager != null) + { + this.eventManager.update(); + } + return; + } if (!this.HasChosenBirthday && Game1.activeClickableMenu == null && Game1.player.Name.ToLower() != "unnamed farmhand") { diff --git a/GeneralMods/HappyBirthday/HappyBirthday.csproj b/GeneralMods/HappyBirthday/HappyBirthday.csproj index e9fbded4..e707d909 100644 --- a/GeneralMods/HappyBirthday/HappyBirthday.csproj +++ b/GeneralMods/HappyBirthday/HappyBirthday.csproj @@ -73,6 +73,9 @@ + + $(GamePath)\Mods\StardustCore\StardustCore.dll + @@ -83,48 +86,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/GeneralMods/HappyBirthday/manifest.json b/GeneralMods/HappyBirthday/manifest.json index 6cbbae33..10511db4 100644 --- a/GeneralMods/HappyBirthday/manifest.json +++ b/GeneralMods/HappyBirthday/manifest.json @@ -6,5 +6,8 @@ "UniqueID": "Omegasis.HappyBirthday", "EntryDll": "HappyBirthday.dll", "MinimumApiVersion": "2.10.1", - "UpdateKeys": [ "Nexus:520" ] + "UpdateKeys": [ "Nexus:520" ], + "Dependencies": [ + { "UniqueID": "Omegasis.StardustCore" }, + ] } diff --git a/GeneralMods/StardewMods.sln b/GeneralMods/StardewMods.sln index 7fc00954..172c70e2 100644 --- a/GeneralMods/StardewMods.sln +++ b/GeneralMods/StardewMods.sln @@ -16,6 +16,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fall28SnowDay", "Fall28SnowDay\Fall28SnowDay.csproj", "{1DBB583D-4A4F-4A46-8CC5-42017C93D292}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HappyBirthday", "HappyBirthday\HappyBirthday.csproj", "{A7A4B67B-3CD7-421F-A4A7-2D656F0AB4D9}" + ProjectSection(ProjectDependencies) = postProject + {0756D36A-95C8-480D-8EA6-4584C03010C6} = {0756D36A-95C8-480D-8EA6-4584C03010C6} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoreRain", "MoreRain\MoreRain.csproj", "{45721A43-630A-461F-9A50-E47D3D1926D0}" EndProject diff --git a/GeneralMods/StardustCore/Events/EventExtensions.cs b/GeneralMods/StardustCore/Events/EventExtensions.cs new file mode 100644 index 00000000..1d5825cc --- /dev/null +++ b/GeneralMods/StardustCore/Events/EventExtensions.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StardustCore.Events +{ + /// + /// Used to parse additional + /// + public static class EventExtensions + { + /// + /// Gets the current command string with all of it's data. + /// + /// + /// + public static string currentCommandString(this StardewValley.Event CurrentEvent) + { + if (CurrentEvent.currentCommand >= CurrentEvent.eventCommands.Length) return ""; + return CurrentEvent.eventCommands.ElementAt(CurrentEvent.currentCommand); + } + + /// + /// Gets the name of the current command string. + /// + /// + /// + public static string currentCommandStringName(this StardewValley.Event CurrentEvent) + { + if (CurrentEvent.currentCommand >= CurrentEvent.eventCommands.Length) return ""; + return CurrentEvent.eventCommands.ElementAt(CurrentEvent.currentCommand).Split(' ')[0]; + } + + } +} diff --git a/GeneralMods/HappyBirthday/Framework/Events/EventHelper.cs b/GeneralMods/StardustCore/Events/EventHelper.cs similarity index 98% rename from GeneralMods/HappyBirthday/Framework/Events/EventHelper.cs rename to GeneralMods/StardustCore/Events/EventHelper.cs index 1a36f5bd..aae99ac9 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/EventHelper.cs +++ b/GeneralMods/StardustCore/Events/EventHelper.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Text; using Microsoft.Xna.Framework; -using Omegasis.HappyBirthday.Framework.Events.Preconditions; -using Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific; +using StardustCore.Events.Preconditions; +using StardustCore.Events.Preconditions.TimeSpecific; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events +namespace StardustCore.Events { /// ///TODO: Figure out forked dialogue @@ -115,7 +115,7 @@ namespace Omegasis.HappyBirthday.Framework.Events /// Adds in the data to the event data.Aka what happens during the event. /// /// - protected virtual void add(string Data) + public virtual void add(string Data) { if (this.eventData.Length > 0) @@ -129,7 +129,7 @@ namespace Omegasis.HappyBirthday.Framework.Events /// Adds in the data to the event data. Aka what happens during the event. /// /// - protected virtual void add(StringBuilder Builder) + public virtual void add(StringBuilder Builder) { this.add(Builder.ToString()); } @@ -178,7 +178,10 @@ namespace Omegasis.HappyBirthday.Framework.Events string s = this.nexusUserId.ToString(); return s.Substring(0, 4); } - + /// + /// Gets the id for the event. + /// + /// public virtual int getEventID() { return Convert.ToInt32(this.getUniqueEventStartID() + this.eventID.ToString()); @@ -205,12 +208,19 @@ namespace Omegasis.HappyBirthday.Framework.Events if (Convert.ToInt32(IDToCheck) > 2147483647 || Convert.ToInt32(IDToCheck) < 0) return false; else return true; } - + /// + /// Gets the string representation for the event's data. + /// + /// public virtual string getEventString() { return this.eventData.ToString(); } - + /// + /// Creates the Stardew Valley event from the given event data. + /// + /// + /// protected virtual StardewValley.Event getEvent(Farmer PlayerActor = null) { return new StardewValley.Event(this.getEventString(), Convert.ToInt32(this.getEventID()), PlayerActor); @@ -1665,18 +1675,21 @@ namespace Omegasis.HappyBirthday.Framework.Events /// /// Pan the the camera in the direction (and with the velocity) defined by x/y for the given duration in milliseconds. Example: "viewport move 2 -1 5000" moves the camera 2 pixels right and 1 pixel up for 5 seconds. /// - /// - /// - /// - public virtual void panViewport(int XPosition, int YPosition, int Milliseconds) + /// + /// + /// + public virtual void panViewport(int xPixelAmount, int yPixelAmount, int MillisecondDuration) { StringBuilder b = new StringBuilder(); b.Append("viewport move "); - b.Append(XPosition); + b.Append(xPixelAmount); b.Append(" "); - b.Append(YPosition); + b.Append(yPixelAmount); + b.Append(" "); + b.Append(MillisecondDuration); this.add(b); } + /// /// Instantly reposition the camera to center on the given X, Y tile position. TODO: explain other parameters. /// diff --git a/GeneralMods/StardustCore/Events/EventHelperExtensions.cs b/GeneralMods/StardustCore/Events/EventHelperExtensions.cs new file mode 100644 index 00000000..8cc04f30 --- /dev/null +++ b/GeneralMods/StardustCore/Events/EventHelperExtensions.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Xna.Framework; +using StardewValley; + +namespace StardustCore.Events +{ + public static class EventHelperExtensions + { + /// + /// Creates the event string to add the object to the player's inventory. + /// + /// + public static void addObjectToPlayersInventory(this EventHelper EventHelper,int ParentSheetIndex, int Amount=1, bool MakeActiveObject=false) + { + StringBuilder b = new StringBuilder(); + b.Append("Omegasis.EventFramework.AddObjectToPlayersInventory "); + b.Append(ParentSheetIndex); + b.Append(" "); + b.Append(Amount); + b.Append(" "); + b.Append(MakeActiveObject); + EventHelper.add(b); + } + + public static void ViewportLerp(this EventHelper EventHelper, Point NewPosition, double Speed) + { + StringBuilder b = new StringBuilder(); + b.Append("Omegasis.EventFramework.ViewportLerp "); + b.Append(NewPosition.X); + b.Append(" "); + b.Append(NewPosition.Y); + b.Append(" "); + b.Append(Speed); + EventHelper.add(b); + + } + + public static void ViewportLerpTile(this EventHelper EventHelper, Point NewTilePosition, double Speed) + { + StringBuilder b = new StringBuilder(); + b.Append("Omegasis.EventFramework.ViewportLerp "); + b.Append(NewTilePosition.X*Game1.tileSize); + b.Append(" "); + b.Append(NewTilePosition.Y*Game1.tileSize); + b.Append(" "); + b.Append(Speed); + EventHelper.add(b); + + } + + /// + /// Lerps the camera an offset tile amount. + /// + /// + /// + /// How many frames (aka update ticks) it takes to finish. Aka 60~=1 second + public static void ViewportLerpTileOffset(this EventHelper EventHelper, Point NewTilePositionOffset, int Frames=60) + { + StringBuilder b = new StringBuilder(); + b.Append("Omegasis.EventFramework.ViewportLerp "); + b.Append((NewTilePositionOffset.X * Game1.tileSize)); + b.Append(" "); + b.Append((NewTilePositionOffset.Y * Game1.tileSize)); + b.Append(" "); + b.Append(Frames); + EventHelper.add(b); + + } + + + } +} diff --git a/GeneralMods/StardustCore/Events/EventManager.cs b/GeneralMods/StardustCore/Events/EventManager.cs new file mode 100644 index 00000000..3109d340 --- /dev/null +++ b/GeneralMods/StardustCore/Events/EventManager.cs @@ -0,0 +1,140 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using StardewValley; + +namespace StardustCore.Events +{ + public class EventManager + { + /// + /// The list of events that this event manager is holding. + /// + public Dictionary events; + + /// + /// Event logic that occurs when the specialized command appears. + /// + public Dictionary> customEventLogic; + + + public bool eventStarted; + + public EventManager() + { + this.events = new Dictionary(); + this.customEventLogic = new Dictionary>(); + + + this.customEventLogic.Add("Omegasis.EventFramework.AddObjectToPlayersInventory", ExtraEventActions.addObjectToPlayerInventory); + this.customEventLogic.Add("Omegasis.EventFramework.ViewportLerp", ExtraEventActions.ViewportLerp); + } + + /// + /// Adds an event to the dictionary of events. + /// + /// + public void addEvent(EventHelper Event) + { + this.events.Add(Event.eventName, Event); + } + + /// + /// Adds in custom code that happens when the game's current event sees the given command name. + /// + /// + /// + public void addCustomEventLogic(string CommandName,Action Function) + { + this.customEventLogic.Add(CommandName, Function); + } + + /// + /// Hooked into the game's update tick. + /// + public virtual void update() + { + if (Game1.CurrentEvent == null) return; + string commandName = this.getGameCurrentEventCommandStringName(); + //HappyBirthday.ModMonitor.Log("Current event command name is: " + commandName, StardewModdingAPI.LogLevel.Info); + if (string.IsNullOrEmpty(commandName)) return; + if (this.customEventLogic.ContainsKey(commandName)){ + this.customEventLogic[commandName].Invoke(this.getGameCurrentEventCommandString()); + } + } + + /// + /// Gets the event from this list of events. + /// + /// + /// + public EventHelper getEvent(string Name) + { + if (this.events.ContainsKey(Name)) + { + return this.events[Name]; + } + else + { + return null; + } + } + /// + /// Starts the event with the given id if possible. + /// + /// + public virtual void startEventAtLocationIfPossible(string EventName) + { + if (this.events.ContainsKey(EventName)) + { + this.events[EventName].startEventAtLocationifPossible(); + } + } + + /// + /// Clears the event from the farmer. + /// + /// + public void clearEventFromFarmer(string EventName) + { + + this.events.TryGetValue(EventName, out EventHelper e); + if (e == null) return; + Game1.player.eventsSeen.Remove(e.getEventID()); + } + + /// + /// Gets the current command and all of it's data. + /// + /// + public virtual string getGameCurrentEventCommandString() + { + if (Game1.CurrentEvent != null) + { + return Game1.CurrentEvent.currentCommandString(); + } + else + { + return ""; + } + } + + /// + /// Gets the name of the action for the current command in the string of event commands. + /// + /// + public virtual string getGameCurrentEventCommandStringName() + { + if (Game1.CurrentEvent != null) + { + return Game1.CurrentEvent.currentCommandStringName(); + } + else + { + return ""; + } + } + } +} diff --git a/GeneralMods/HappyBirthday/Framework/Events/EventStartData.cs b/GeneralMods/StardustCore/Events/EventStartData.cs similarity index 91% rename from GeneralMods/HappyBirthday/Framework/Events/EventStartData.cs rename to GeneralMods/StardustCore/Events/EventStartData.cs index 285e73b2..3434291a 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/EventStartData.cs +++ b/GeneralMods/StardustCore/Events/EventStartData.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.Xna.Framework; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events +namespace StardustCore.Events { public class EventStartData { @@ -57,6 +57,12 @@ namespace Omegasis.HappyBirthday.Framework.Events { } + /// + ///Constructor. + /// + /// + /// + /// public FarmerData(int XTile, int YTile, EventHelper.FacingDirection Direction) { this.xPosition = XTile; @@ -64,6 +70,10 @@ namespace Omegasis.HappyBirthday.Framework.Events this.direction = Direction; } + /// + /// Gets a string representation of the farmer's starting data. + /// + /// public override string ToString() { StringBuilder b = new StringBuilder(); @@ -84,6 +94,9 @@ namespace Omegasis.HappyBirthday.Framework.Events /// private StringBuilder builder; + /// + /// A special variable to determined if to continue the music that is already playing or to turn off the music. + /// public enum MusicToPlayType { None, diff --git a/GeneralMods/StardustCore/Events/ExtraEventActions.cs b/GeneralMods/StardustCore/Events/ExtraEventActions.cs new file mode 100644 index 00000000..b9a5983b --- /dev/null +++ b/GeneralMods/StardustCore/Events/ExtraEventActions.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Xna.Framework; +using StardewValley; + +namespace StardustCore.Events +{ + /// + /// Contains functions that are used to parse event data and do additional things. + /// + public class ExtraEventActions + { + + private static Point OldViewportPosition; + private static bool StartedLerp; + private static int CurrentViewportLerpAmount; + + /// + /// Adds the item from Game1.ObjectInformation to the player's inventory from the given event string. + /// + /// + public static void addObjectToPlayerInventory(string EventData) + { + string[] splits = EventData.Split(' '); + string name = splits[0]; + int parentSheetIndex =Convert.ToInt32(splits[1]); + int amount = Convert.ToInt32(splits[2]); + bool makeActiveObject = Convert.ToBoolean(splits[3]); + StardewValley.Object obj = new StardewValley.Object(parentSheetIndex, amount); + Game1.player.addItemToInventoryBool(obj,makeActiveObject); + Game1.CurrentEvent.CurrentCommand++; + } + + public static void ViewportLerp(string EventData) + { + string[] splits = EventData.Split(' '); + string name = splits[0]; + + int xEndPosition =Convert.ToInt32(splits[1]); + int yEndPosition = Convert.ToInt32(splits[2]); + int frames = Convert.ToInt32(splits[3]); + + if (StartedLerp==false) + { + OldViewportPosition = new Point(Game1.viewport.Location.X,Game1.viewport.Location.Y); + StartedLerp = true; + } + + ++CurrentViewportLerpAmount; + if (CurrentViewportLerpAmount >= frames) + { + Vector2 currentLerp2 = Vector2.Lerp(new Vector2(OldViewportPosition.X, OldViewportPosition.Y), new Vector2(OldViewportPosition.X+xEndPosition, OldViewportPosition.Y+yEndPosition), (float)((float)CurrentViewportLerpAmount/(float)frames)); + Game1.viewport.Location = new xTile.Dimensions.Location((int)currentLerp2.X, (int)currentLerp2.Y); + + OldViewportPosition = new Point(0, 0); + CurrentViewportLerpAmount = 0; + StartedLerp = false; + ++Game1.CurrentEvent.CurrentCommand; //I've been told ++ is more efficient than ++; + return; + } + Vector2 currentLerp = Vector2.Lerp(new Vector2(OldViewportPosition.X, OldViewportPosition.Y), new Vector2(OldViewportPosition.X + xEndPosition, OldViewportPosition.Y + yEndPosition), (float)((float)CurrentViewportLerpAmount/(float)frames)); + Game1.viewport.Location = new xTile.Dimensions.Location((int)currentLerp.X, (int)currentLerp.Y); + } + } +} diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/EventPrecondition.cs b/GeneralMods/StardustCore/Events/Preconditions/EventPrecondition.cs similarity index 80% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/EventPrecondition.cs rename to GeneralMods/StardustCore/Events/Preconditions/EventPrecondition.cs index 27c8c70d..6092c68a 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/EventPrecondition.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/EventPrecondition.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions +namespace StardustCore.Events.Preconditions { public class EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/LocationPrecondition.cs b/GeneralMods/StardustCore/Events/Preconditions/LocationPrecondition.cs similarity index 94% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/LocationPrecondition.cs rename to GeneralMods/StardustCore/Events/Preconditions/LocationPrecondition.cs index 2ee9b42d..7b770293 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/LocationPrecondition.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/LocationPrecondition.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions +namespace StardustCore.Events.Preconditions { public class LocationPrecondition:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/ChanceToOccur.cs b/GeneralMods/StardustCore/Events/Preconditions/MISC/ChanceToOccur.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/ChanceToOccur.cs rename to GeneralMods/StardustCore/Events/Preconditions/MISC/ChanceToOccur.cs index cdb7a0c5..28b81e21 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/ChanceToOccur.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/MISC/ChanceToOccur.cs @@ -5,11 +5,10 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.MISC +namespace StardustCore.Events.Preconditions.MISC { public class ChanceToOccur:EventPrecondition { - public float chance; public ChanceToOccur() diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/EventNotInProgress.cs b/GeneralMods/StardustCore/Events/Preconditions/MISC/EventNotInProgress.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/EventNotInProgress.cs rename to GeneralMods/StardustCore/Events/Preconditions/MISC/EventNotInProgress.cs index a306481f..3c5392eb 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/EventNotInProgress.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/MISC/EventNotInProgress.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.MISC +namespace StardustCore.Events.Preconditions.MISC { public class EventNotInProgress:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/JojaWarehouseCompleted.cs b/GeneralMods/StardustCore/Events/Preconditions/MISC/JojaWarehouseCompleted.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/JojaWarehouseCompleted.cs rename to GeneralMods/StardustCore/Events/Preconditions/MISC/JojaWarehouseCompleted.cs index e658a79c..29d67cba 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/MISC/JojaWarehouseCompleted.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/MISC/JojaWarehouseCompleted.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.MISC +namespace StardustCore.Events.Preconditions.MISC { public class JojaWarehouseCompleted:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/DatingNPC.cs b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/DatingNPC.cs similarity index 92% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/DatingNPC.cs rename to GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/DatingNPC.cs index 8a63cdc0..2525437a 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/DatingNPC.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/DatingNPC.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.NPCSpecific +namespace StardustCore.Events.Preconditions.NPCSpecific { public class DatingNPC:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/FriendshipPointsRequired.cs b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/FriendshipPointsRequired.cs similarity index 94% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/FriendshipPointsRequired.cs rename to GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/FriendshipPointsRequired.cs index 9f906338..c457ed9a 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/FriendshipPointsRequired.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/FriendshipPointsRequired.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.NPCSpecific +namespace StardustCore.Events.Preconditions.NPCSpecific { public class FriendshipPointsRequired:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/HeartsRequired.cs b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/HeartsRequired.cs similarity index 94% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/HeartsRequired.cs rename to GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/HeartsRequired.cs index a6b0a0b6..f97c1849 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/HeartsRequired.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/HeartsRequired.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.NPCSpecific +namespace StardustCore.Events.Preconditions.NPCSpecific { public class HeartsRequired:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NPCInThisLocation.cs b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NPCInThisLocation.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NPCInThisLocation.cs rename to GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NPCInThisLocation.cs index b3180d3b..016446e9 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NPCInThisLocation.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NPCInThisLocation.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.NPCSpecific +namespace StardustCore.Events.Preconditions.NPCSpecific { public class NPCInThisLocation:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NotInvisible.cs b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NotInvisible.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NotInvisible.cs rename to GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NotInvisible.cs index 5d351186..1f59f6fb 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NotInvisible.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NotInvisible.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.NPCSpecific +namespace StardustCore.Events.Preconditions.NPCSpecific { public class NotInvisible:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NotMarriedTo.cs b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NotMarriedTo.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NotMarriedTo.cs rename to GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NotMarriedTo.cs index 545995b9..efcdbaae 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/NPCSpecific/NotMarriedTo.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/NPCSpecific/NotMarriedTo.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.NPCSpecific +namespace StardustCore.Events.Preconditions.NPCSpecific { public class NotMarriedTo : EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/AnsweredDialogueOptions.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/AnsweredDialogueOptions.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/AnsweredDialogueOptions.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/AnsweredDialogueOptions.cs index 46d406c0..a18f592e 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/AnsweredDialogueOptions.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/AnsweredDialogueOptions.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class AnsweredDialogueOptions:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/CurrentMoney.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/CurrentMoney.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/CurrentMoney.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/CurrentMoney.cs index 4e85192e..705dd94c 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/CurrentMoney.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/CurrentMoney.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class CurrentMoney:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/DaysPlayedFor.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/DaysPlayedFor.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/DaysPlayedFor.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/DaysPlayedFor.cs index 7fc666ae..e901d23d 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/DaysPlayedFor.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/DaysPlayedFor.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class DaysPlayedFor:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/EmptyInventorySlots.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/EmptyInventorySlots.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/EmptyInventorySlots.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/EmptyInventorySlots.cs index 92fade3c..7e18c0d7 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/EmptyInventorySlots.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/EmptyInventorySlots.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class EmptyInventorySlots:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/Gender.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/Gender.cs similarity index 94% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/Gender.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/Gender.cs index 9e36e44c..b8cb3c7c 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/Gender.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/Gender.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class Gender:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasItem.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasItem.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasItem.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasItem.cs index 0f065207..a6ac95cf 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasItem.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasItem.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class HasItem:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasNotRecievedLetter.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasNotRecievedLetter.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasNotRecievedLetter.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasNotRecievedLetter.cs index 013b9679..b2dbc666 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasNotRecievedLetter.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasNotRecievedLetter.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class HasNotRecievedLetter:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasRecievedLetter.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasRecievedLetter.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasRecievedLetter.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasRecievedLetter.cs index 7f8fdb1d..708294ae 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/HasRecievedLetter.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/HasRecievedLetter.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class HasRecievedLetter:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/MineBottomHit.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/MineBottomHit.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/MineBottomHit.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/MineBottomHit.cs index c1ae5fb1..213e624d 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/MineBottomHit.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/MineBottomHit.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class MineBottomHit:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/PetPreference.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/PetPreference.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/PetPreference.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/PetPreference.cs index 475d6b9e..4afa675c 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/PetPreference.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/PetPreference.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class PetPreference:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/PlayerOnThisTile.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/PlayerOnThisTile.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/PlayerOnThisTile.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/PlayerOnThisTile.cs index 1da78969..13fb834e 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/PlayerOnThisTile.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/PlayerOnThisTile.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.Xna.Framework; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class PlayerOnThisTile:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/SeenEvents.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/SeenEvents.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/SeenEvents.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/SeenEvents.cs index 22be7440..c9102f60 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/SeenEvents.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/SeenEvents.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class SeenEvents : EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/SeenSecretNote.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/SeenSecretNote.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/SeenSecretNote.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/SeenSecretNote.cs index 76303066..161274fd 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/SeenSecretNote.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/SeenSecretNote.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class SeenSecretNote:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/ShippedItems.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/ShippedItems.cs similarity index 96% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/ShippedItems.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/ShippedItems.cs index 8061494c..854b23e4 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/ShippedItems.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/ShippedItems.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class ShippedItems:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/TotalMoneyEarned.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/TotalMoneyEarned.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/TotalMoneyEarned.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/TotalMoneyEarned.cs index ed4cf6b5..205fd1a2 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/TotalMoneyEarned.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/TotalMoneyEarned.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class TotalMoneyEarned:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/UnseenEvents.cs b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/UnseenEvents.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/UnseenEvents.cs rename to GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/UnseenEvents.cs index 8556c5ab..ca7157d7 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/PlayerSpecific/UnseenEvents.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/PlayerSpecific/UnseenEvents.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.PlayerSpecific +namespace StardustCore.Events.Preconditions.PlayerSpecific { public class UnseenEvents:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/DayOfTheMonth.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/DayOfTheMonth.cs similarity index 94% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/DayOfTheMonth.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/DayOfTheMonth.cs index 125dcb02..fba40011 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/DayOfTheMonth.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/DayOfTheMonth.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { /// /// Event occurs on this day of the month. Range 1-28 diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/EventDayExclusionPrecondition.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/EventDayExclusionPrecondition.cs similarity index 97% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/EventDayExclusionPrecondition.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/EventDayExclusionPrecondition.cs index 57cacec5..9fc9f41e 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/EventDayExclusionPrecondition.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/EventDayExclusionPrecondition.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { public class EventDayExclusionPrecondition:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/NotAFestivalDay.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/NotAFestivalDay.cs similarity index 90% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/NotAFestivalDay.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/NotAFestivalDay.cs index 8d92cc20..0fed366e 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/NotAFestivalDay.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/NotAFestivalDay.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { /// /// Precondition that ensures that this event can't happen on a festival day. diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/SeasonExclusion.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/SeasonExclusion.cs similarity index 97% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/SeasonExclusion.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/SeasonExclusion.cs index fbb28637..1bfd8ca6 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/SeasonExclusion.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/SeasonExclusion.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { public class SeasonExclusion:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/TimePrecondition.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/TimePrecondition.cs similarity index 93% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/TimePrecondition.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/TimePrecondition.cs index 3a5a5480..875d4d70 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/TimePrecondition.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/TimePrecondition.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { /// /// The event will only happen between the given times. diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/WeatherPrecondition.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/WeatherPrecondition.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/WeatherPrecondition.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/WeatherPrecondition.cs index 76c26e4f..87cd9793 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/WeatherPrecondition.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/WeatherPrecondition.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { public class WeatherPrecondition:EventPrecondition { diff --git a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/YearPrecondition.cs b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/YearPrecondition.cs similarity index 95% rename from GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/YearPrecondition.cs rename to GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/YearPrecondition.cs index fb5a9a3f..59771a70 100644 --- a/GeneralMods/HappyBirthday/Framework/Events/Preconditions/TimeSpecific/YearPrecondition.cs +++ b/GeneralMods/StardustCore/Events/Preconditions/TimeSpecific/YearPrecondition.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using StardewValley; -namespace Omegasis.HappyBirthday.Framework.Events.Preconditions.TimeSpecific +namespace StardustCore.Events.Preconditions.TimeSpecific { /// /// The event must occur on this year or after it. diff --git a/GeneralMods/StardustCore/StardustCore.csproj b/GeneralMods/StardustCore/StardustCore.csproj index fc202b8a..34aa5a8c 100644 --- a/GeneralMods/StardustCore/StardustCore.csproj +++ b/GeneralMods/StardustCore/StardustCore.csproj @@ -86,6 +86,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +