From 3ce3f57220740868162e12a8d629ddf0543130d3 Mon Sep 17 00:00:00 2001 From: JoshuaNavarro Date: Fri, 29 Nov 2019 14:22:20 -0800 Subject: [PATCH] Fixed calendar spelling, updated more rain, retired some mods, and updated more mods to be 1.4 compatible. Starded touching up StardewSymphony. --- .../BillboardAnywhere/Assets/Billboard.png | Bin 0 -> 916 bytes .../BillboardAnywhere/Assets/Quest.png | Bin 0 -> 3394 bytes .../BillboardAnywhere/BillboardAnywhere.cs | 246 +++++++++++++++++- .../BillboardAnywhere.csproj | 8 + .../BillboardAnywhere/Framework/ModConfig.cs | 18 +- GeneralMods/BillboardAnywhere/manifest.json | 4 +- GeneralMods/BuildEndurance/BuildEndurance.cs | 2 +- GeneralMods/BuildEndurance/manifest.json | 4 +- GeneralMods/BuildHealth/BuildHealth.cs | 2 +- GeneralMods/BuildHealth/manifest.json | 4 +- .../Framework/BuyBackMenu.cs | 18 +- GeneralMods/BuyBackCollectables/manifest.json | 4 +- GeneralMods/Fall28SnowDay/manifest.json | 2 +- GeneralMods/MoreRain/Framework/ModConfig.cs | 44 ++++ GeneralMods/MoreRain/MoreRain.cs | 144 +++++++--- GeneralMods/MoreRain/manifest.json | 2 +- .../CustomFurnitureFramework/Class1.cs | 0 .../CustomFurnitureFramework.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../CustomFurnitureFramework/packages.config | 0 .../CustomNPCFramework/Class1.cs | 0 .../CustomNPCFramework.csproj | 0 .../Framework/Enums/AnimationType.cs | 0 .../Framework/Enums/Direction.cs | 0 .../Framework/Enums/Genders.cs | 0 .../Framework/Enums/PartType.cs | 0 .../Framework/Enums/Seasons.cs | 0 .../Framework/Graphics/AssetInfo.cs | 0 .../Framework/Graphics/AssetManager.cs | 0 .../Framework/Graphics/AssetPool.cs | 0 .../Framework/Graphics/AssetSheet.cs | 0 .../Framework/Graphics/DirectionalTexture.cs | 0 .../Framework/Graphics/ExtendedAssetInfo.cs | 0 .../Graphics/TextureGroups/TextureGroup.cs | 0 .../ModularNPCS/AnimatedSpriteCollection.cs | 0 .../ModularNPCS/AnimatedSpriteExtended.cs | 0 .../CharacterAnimationBase.cs | 0 .../StandardCharacterAnimation.cs | 0 .../StandardColorCollection.cs | 0 .../ModularRenderers/AnimationKeys.cs | 0 .../ModularRenderers/BasicRenderer.cs | 0 .../Framework/ModularNPCS/Portrait.cs | 0 .../Framework/ModularNPCS/Sprite.cs | 0 .../CustomNPCFramework/Framework/NPCNames.cs | 0 .../Framework/NPCS/ExtendedNPC.cs | 0 .../Framework/NPCS/MerchantNPC.cs | 0 .../Framework/Utilities/NPCTracker.cs | 0 .../Bodies/FemaleBodyBase/FBodyBaseDown.png | Bin .../Bodies/FemaleBodyBase/FBodyBaseLeft.png | Bin .../FemaleBodyBase/FBodyBaseMovingDown.png | Bin .../FemaleBodyBase/FBodyBaseMovingLeft.png | Bin .../FemaleBodyBase/FBodyBaseMovingRight.png | Bin .../FemaleBodyBase/FBodyBaseMovingUp.png | Bin .../Bodies/FemaleBodyBase/FBodyBaseRight.png | Bin .../Bodies/FemaleBodyBase/FBodyBaseUp.png | Bin .../FemaleBodyBase/VanillaFemaleBodyBase.json | 0 .../Bottoms/Female/GreyPants/DownFacing.png | Bin .../Bottoms/Female/GreyPants/GreyPants.json | 0 .../Bottoms/Female/GreyPants/LeftFacing.png | Bin .../Bottoms/Female/GreyPants/RightFacing.png | Bin .../Bottoms/Female/GreyPants/UpFacing.png | Bin .../BrownEyes/BrownVanillaEyes.json | 0 .../Eyes/VanillaEyes/BrownEyes/EyesDown.png | Bin .../Eyes/VanillaEyes/BrownEyes/EyesLeft.png | Bin .../Eyes/VanillaEyes/BrownEyes/EyesRight.png | Bin .../Eyes/VanillaEyes/BrownEyes/EyesUp.png | Bin .../Hair/VanillaPigtails/DownHairStyle.png | Bin .../Hair/VanillaPigtails/LeftHairStyle.png | Bin .../VanillaPigtails/PigtailsHairStyle.json | 0 .../Hair/VanillaPigtails/RightHairStyle.png | Bin .../Hair/VanillaPigtails/UpHairStyle.png | Bin .../ModularNPCGraphics/Hair/notes.txt | 0 .../Female/VanillaPinkShirt/DownFacing.png | Bin .../Female/VanillaPinkShirt/LeftFacing.png | Bin .../Female/VanillaPinkShirt/RightFacing.png | Bin .../Female/VanillaPinkShirt/UpFacing.png | Bin .../VanillaPinkShirt/VanillaPinkShirt.json | 0 .../Shoes/VanillaBrownShoes/DownMoving.png | Bin .../Shoes/VanillaBrownShoes/DownStanding.png | Bin .../Shoes/VanillaBrownShoes/LeftMoving.png | Bin .../Shoes/VanillaBrownShoes/LeftStanding.png | Bin .../Shoes/VanillaBrownShoes/RightMoving.png | Bin .../Shoes/VanillaBrownShoes/RightStanding.png | Bin .../Shoes/VanillaBrownShoes/UpMoving.png | Bin .../Shoes/VanillaBrownShoes/UpStanding.png | Bin .../VanillaBrownShoes/VanillaBrownShoes.json | 0 .../Properties/AssemblyInfo.cs | 0 .../CustomNPCFramework/manifest.json | 0 .../CustomObjectFramework/App.config | 0 .../CustomObjectFramework.csproj | 0 .../CustomObjectFramework/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../DailyQuestAnywhere/DailyQuestAnywhere.cs | 0 .../DailyQuestAnywhere.csproj | 0 .../DailyQuestAnywhere/Framework/ModConfig.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../DailyQuestAnywhere/README.md | 0 .../DailyQuestAnywhere/manifest.json | 0 .../FarmersMarketStall/Class1.cs | 0 .../FarmersMarketStall.csproj | 0 .../MapEvents/ShopInteractionEvent.cs | 0 .../Framework/MarketStall.cs | 0 .../Framework/Menus/MarketStallMenu.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../FarmersMarketStall/manifest.json | 0 .../MapExampleRF1/Class1.cs | 0 .../MapExampleRF1/MapExampleRF1.csproj | 0 .../MapExampleRF1/Properties/AssemblyInfo.cs | 0 .../MapExampleRF1/manifest.json | 0 .../MapExampleRF1/packages.config | 0 .../ModdedUtilitiesNetworking/Class1.cs | 0 .../Framework/Clients/CustomGalaxyClient.cs | 0 .../Framework/Clients/CustomLidgrenClient.cs | 0 .../Framework/CustomMultiplayer.cs | 0 .../Framework/DataInfo.cs | 0 .../Framework/Delegates/DelegateInfo.cs | 0 .../Framework/Enums/MessageTypes.cs | 0 .../Framework/Extentions/GenericExtentions.cs | 0 .../MessagesExtentions.cs | 0 .../Framework/Extentions/XNAExtentions.cs | 0 .../Features/Stardew/MessageFeatures.cs | 0 .../Framework/Messages/OutgoingMessageBase.cs | 0 .../Framework/Network/NetBufferReadStream.cs | 0 .../Framework/Network/NetBufferWriteStream.cs | 0 .../Framework/Servers/CustomGameServer.cs | 0 .../Framework/Servers/CustomLidgrenServer.cs | 0 .../ModdedUtilitiesNetworking.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../ModdedUtilitiesNetworking/manifest.json | 0 .../ModdedUtilitiesNetworking/packages.config | 0 .../MuseumRearranger/Framework/ModConfig.cs | 0 .../Framework/NewMuseumMenu.cs | 0 .../MuseumRearranger/MuseumRearranger.cs | 0 .../MuseumRearranger/MuseumRearranger.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../MuseumRearranger/ReadMe.md | 0 .../MuseumRearranger/manifest.json | 0 .../NoMorePets/NoMorePets.cs | 0 .../NoMorePets/NoMorePets.csproj | 0 .../NoMorePets/Properties/AssemblyInfo.cs | 0 .../{ => OutDatedMods}/NoMorePets/README.md | 0 .../NoMorePets/manifest.json | 0 .../SundropMapEvents/Class1.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../SundropMapEvents/SundropMapEvents.csproj | 0 .../SundropMapEvents/manifest.json | 0 .../SimpleSoundManager/Framework/XACTSound.cs | 2 +- .../Framework/XactMusicPair.cs | 4 +- GeneralMods/SimpleSoundManager/manifest.json | 2 +- GeneralMods/StardewMods.sln | 46 +--- .../StardewSymphonyRemastered/Config.cs | 18 +- .../Framework/Menus/MusicManagerMenuV2.cs | 49 ++-- .../Framework/V2/MusicManagerV2.cs | 14 +- .../Framework/V2/SongSpecificsV2.cs | 12 +- .../StardewSymphony.cs | 7 +- .../StardewSymphonyRemastered.csproj | 8 +- .../assets/Locations/AbandonedJojaMart.png | Bin 0 -> 420 bytes .../assets/Locations/JojaMart.png | Bin 0 -> 330 bytes .../StardewSymphonyRemastered/manifest.json | 2 +- .../IlluminateFramework/Colors.cs | 2 +- GeneralMods/StardustCore/ModConfig.cs | 2 - .../ComponentsV2/Buttons/ItemDisplayButton.cs | 8 +- .../UIUtilities/TextureManager.cs | 27 +- GeneralMods/StardustCore/manifest.json | 6 +- GeneralMods/TimeFreeze/Framework/ModConfig.cs | 13 +- GeneralMods/TimeFreeze/TimeFreeze.cs | 63 +++-- GeneralMods/TimeFreeze/manifest.json | 6 +- 167 files changed, 601 insertions(+), 192 deletions(-) create mode 100644 GeneralMods/BillboardAnywhere/Assets/Billboard.png create mode 100644 GeneralMods/BillboardAnywhere/Assets/Quest.png rename GeneralMods/{ => OutDatedMods}/CustomFurnitureFramework/Class1.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomFurnitureFramework/CustomFurnitureFramework.csproj (100%) rename GeneralMods/{ => OutDatedMods}/CustomFurnitureFramework/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomFurnitureFramework/packages.config (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Class1.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/CustomNPCFramework.csproj (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Enums/AnimationType.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Enums/Direction.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Enums/Genders.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Enums/PartType.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Enums/Seasons.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/AssetInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/AssetManager.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/AssetPool.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/AssetSheet.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/ExtendedAssetInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Graphics/TextureGroups/TextureGroup.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteCollection.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/CharacterAnimationBase.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/StandardCharacterAnimation.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/ColorCollections/StandardColorCollection.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/AnimationKeys.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/BasicRenderer.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/Portrait.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/ModularNPCS/Sprite.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/NPCNames.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/NPCS/ExtendedNPC.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/NPCS/MerchantNPC.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Framework/Utilities/NPCTracker.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseDown.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseLeft.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingDown.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingLeft.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingRight.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingUp.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseRight.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseUp.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/VanillaFemaleBodyBase.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/DownFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/GreyPants.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/LeftFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/RightFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/UpFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/BrownVanillaEyes.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesDown.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesLeft.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesRight.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesUp.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/DownHairStyle.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/LeftHairStyle.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/PigtailsHairStyle.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/RightHairStyle.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/UpHairStyle.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Hair/notes.txt (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/DownFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/LeftFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/RightFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/UpFacing.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/VanillaPinkShirt.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownMoving.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownStanding.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftMoving.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftStanding.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightMoving.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightStanding.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpMoving.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpStanding.png (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/VanillaBrownShoes.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomNPCFramework/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/CustomObjectFramework/App.config (100%) rename GeneralMods/{ => OutDatedMods}/CustomObjectFramework/CustomObjectFramework.csproj (100%) rename GeneralMods/{ => OutDatedMods}/CustomObjectFramework/Program.cs (100%) rename GeneralMods/{ => OutDatedMods}/CustomObjectFramework/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/DailyQuestAnywhere/DailyQuestAnywhere.cs (100%) rename GeneralMods/{ => OutDatedMods}/DailyQuestAnywhere/DailyQuestAnywhere.csproj (100%) rename GeneralMods/{ => OutDatedMods}/DailyQuestAnywhere/Framework/ModConfig.cs (100%) rename GeneralMods/{ => OutDatedMods}/DailyQuestAnywhere/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/DailyQuestAnywhere/README.md (100%) rename GeneralMods/{ => OutDatedMods}/DailyQuestAnywhere/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/Class1.cs (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/FarmersMarketStall.csproj (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/Framework/MapEvents/ShopInteractionEvent.cs (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/Framework/MarketStall.cs (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/Framework/Menus/MarketStallMenu.cs (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/FarmersMarketStall/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/MapExampleRF1/Class1.cs (100%) rename GeneralMods/{ => OutDatedMods}/MapExampleRF1/MapExampleRF1.csproj (100%) rename GeneralMods/{ => OutDatedMods}/MapExampleRF1/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/MapExampleRF1/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/MapExampleRF1/packages.config (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Class1.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Clients/CustomGalaxyClient.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Clients/CustomLidgrenClient.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/CustomMultiplayer.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/DataInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Delegates/DelegateInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Enums/MessageTypes.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Extentions/GenericExtentions.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Extentions/StrardewValleyExtentions/MessagesExtentions.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Extentions/XNAExtentions.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Features/Stardew/MessageFeatures.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Messages/OutgoingMessageBase.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Network/NetBufferReadStream.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Network/NetBufferWriteStream.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Servers/CustomGameServer.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Framework/Servers/CustomLidgrenServer.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/ModdedUtilitiesNetworking.csproj (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/ModdedUtilitiesNetworking/packages.config (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/Framework/ModConfig.cs (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/Framework/NewMuseumMenu.cs (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/MuseumRearranger.cs (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/MuseumRearranger.csproj (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/ReadMe.md (100%) rename GeneralMods/{ => OutDatedMods}/MuseumRearranger/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/NoMorePets/NoMorePets.cs (100%) rename GeneralMods/{ => OutDatedMods}/NoMorePets/NoMorePets.csproj (100%) rename GeneralMods/{ => OutDatedMods}/NoMorePets/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/NoMorePets/README.md (100%) rename GeneralMods/{ => OutDatedMods}/NoMorePets/manifest.json (100%) rename GeneralMods/{ => OutDatedMods}/SundropMapEvents/Class1.cs (100%) rename GeneralMods/{ => OutDatedMods}/SundropMapEvents/Properties/AssemblyInfo.cs (100%) rename GeneralMods/{ => OutDatedMods}/SundropMapEvents/SundropMapEvents.csproj (100%) rename GeneralMods/{ => OutDatedMods}/SundropMapEvents/manifest.json (100%) create mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/Locations/AbandonedJojaMart.png create mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/Locations/JojaMart.png diff --git a/GeneralMods/BillboardAnywhere/Assets/Billboard.png b/GeneralMods/BillboardAnywhere/Assets/Billboard.png new file mode 100644 index 0000000000000000000000000000000000000000..d068aff19b1a128f0907821c8390b96f8420156c GIT binary patch literal 916 zcmV;F18e+=P)Px&PDw;TRA_DQAqLDb!m0X^W+0ikn=0+lUhus z=5qmej! zZ@09+U)=}9JxdfB?70oVhQcCC`;Eni0r)ZY%Jv_+bMQ>k`RV2<_aBK~H;U2VmQSiQ znh>R+iGz>d0clhv2Tzi5M7g1;!i4(s4VGAxBKg*~8@A(RS~ZPgG$cIE@8i=+J7ijw zdIm-;v5coGMNk#tl+RYxG>Xv>t4hPcrzv&#+p5%F|IKzB`KwkX71dKz?~#1E^Ak)} zN)cCWfj8{jZ0T@X$2d{vJ(kh^&F`Lb`YQ!OI~4&K}umdtKrx--)bD zaAtBGfSkhhw%6B^Yl(*z=4{)&`P!YsqK6c&3FLF z%a5G<%uZXYV4ZgtkmxZ&s)~{ORy@1}K&fXN0P~YSlaABq4FJYt9Et6fRCFGbYAoxQ zT4h{SDXB6%@yRw{?kTgxa^DK2ohYTNdlZ2E`+PuLDJn)W8nhb=buW@`?92oJRlehq zP_yE_*&L~smm4owVxhb(q8O=ODx!$yj}fmEr3jK&m17j6A>jm1$kbz;iBzeM(GNgk zRjTn{w6w12vc`g}OJd)kD$4V>U$yP0dX0)vjE2}=NnQD7iag1V(HGH-Cuw_8Os0t9 zL_w!|nt=FvMu%C)q=>dEWy@ov>co{}Pqx3W(kVstmVmDsfD)y@QH+L!y;8Plsf?^U zQdNS}$(s({iJ{Q&zA|P}C=|fWh0000Px>{7FPXRCt{2n|p9v)qTf5=f3x?)x(l3S(c3re#phd*e;B59MT5TFv%pDamPv8 zp&cNP0+}+Q`GZM3WtuR}bkb%L+9?fgLsJTwxT#6osS70#28;<#Fvei8@k_QP>*ZZ( zU-xp@_d34?pd}_Efc#CHeQSw{hyXMbQmb1< zMoNBzOGDw!0nwn@kO2?~`iFzLX6lNAWyVky?Yv{Mxhx$E1cP~*sf=9Q5@Y=`^F3#9 z-ayeoXmqamI;rOC7|NeOI1!TR1limGP0?<$3!h~p8h73IH6RZ_Nc3`s``!;~$16f0 z1V{uy5R^3xpsE5P#Ej@?ayAkWfT1f`hK4du!}Djqn2dCeM`7vf7{Vo6JWQhZW{zkU@U_Z)6@f}1Z+kOhENlp4k3pAswdJ*;H=Fojr97{B1W=xhGAIA+yrW#qZ{#pR`zcWZ&TZtb8 zxb45qvUq~S2M?kug08EUU`3;q`}RX8GpDGp@s<7Do5OUkyq=M4mZ8NTzwgA3_=}DA6|jOh0O%QQ3yo0+n*|p)r z4z}HM9{^h&hfmz|FnJ@%hLvsn@s}RFXj(hJ{|F!3_F1f0Y{qxQ}(+AvW`F%AxK8f zZ_VmqH0OrCtA@d@@7>K<{tyu~liEP)mkCmN+g^H8-Gs_zO3)bZ+BZKz|+D?~2A z*j_P6SOPDAYF#)1DdF6pAQn++OlSmI6I4)~H0h2kW5eMcT3M?Sa9j`9_d~6oYZL^M zKuY9zo9{48lak|wn&$_2UVxo_3(JUtZ*%%s4n-)GN;!NXIMZw32UdtyWrYer*OYqi zsIDsT{c>MDfzLN=xM>S7?tZGSpM19WCwOQKoZgMW7S@$>(EhOum>(l-&H02Ge=D**QRwE)Sh zd$w10r|&yVD8VW#4@+AUVZ|)R|4e;zRV!8o#mh3OxyHiACkp;~)OIJ*29ucTHkI6<(huMTk{9;;Y6h%dnQ*;e z$|AZjf;xf@B}Z(>3rl=r{L~j$MJE+gDV1`3|J#pn$9?a8r1M^(W6Z3bw2fkN#Ub8_+pcmsdOdT^3diL}zzbp*R1)lkzXJ+g&O^1-% zRGNqs6b(Vyf+Ia_ce-dukjc3u6EW6rx$&|vG#4mlhABChC*libn@qiYej{2p0wCQy zj2x)+*FzA%4I8e#EX>Rm#?JN=$jg)DsR-1UlG7sv06JUCeXcJV7%9|bpsJB6cywGA zR^|?`9Xv$7II|Pq=}-}<6^nEKlTXll>@>~kPD(|aNYo&oImX_HzeV7AxWz&Zfn)u( zee(_7jV3ZVd$(!tTXozfp$Mduq?;Nj6^fvM154-w0k zTvD@U<;p;+t&5|F-ni)T`M@A5oVtg^p}0v1f#-Ro+bq(p7Re@)AdnREC7L@IaohHX z#*@pF?fsB!TC-te&AjS0Kae~>)I@g0Hr`2ZMnFx>A99=WxdK+iL`q5jnL%Rl2$6_| zX&D5*Pa$8#am%NJ6REEE!3hW-*z#e1@`D`&eyyed%$@h5X=O3lp3kp#9zs_Yu3EL8 z+m>BR!c_U`-t9oysD%U?iCPTy50gwu5~)}vHupRaMNx^yA_PceAaUHXB;EJH5r}45 zL}D?bOplfAqFA-9;LgZ8OQN>VgE61 zT+>Y~Vi2iQ2L)40af0&7G)*I<8$8#;vCFyAsbOfn?9+UN?FMy2?2XHtAP5-D=K0Xd zCXA@bzwG`c%NI4X`MRZOYB-7v2~-GyH!jfXOth-0n8Kt~DBw*o>$9ncx)R|BLCxF% zo_PK++iqRY(|h0Hc;5&&U%#Bs-MS9j^(fgM@n~3}HGXI;9%VE$2255o3n3~x!*={o zn+q%d^v?fe|4Xl2HhQJZIfjSNRpwM(9sS80m*Th%U;N}owto0pK7P|`4xJdFF&V|E zljEpLFw60O5-V!e44jDPC#?GfRQ11kz2-7^cbIH%<_blyzEC<5tRX9NS^67_P3UPJ4}<>E}D&ev}8c-;0q*a6bI#v7LNm(^?XX7NP3K1t)*^ z?O)-RTQ;+A-vQRGh~s*a&wuVu`QYzt69H zym3B;&-C&6&;AKlw+in1gD>+>|GtCMM~>3cwxF_#yi$?T-jjUeuXbSfz0JP=c$^mw zW_aZ9{+yo8o2H%2SMK~Ow{B>r*mr=nT?$dFOs{C404 z(~fDipX2-cxZxUuhrjtCK`^;}^`>ra`{)+_`SG8k+XFPj6&5eh%XBVKMwE(a6^>Hz z2*f8B+JeUVJFrHF4xSxhL3?whTL?ic7DY{|9L?oxbmoGz!Ovg%1s`17h@qF?@`}ZA ze)iO3tZElXqTn5+u}$DhNX5&K%-bG9KrEv1yX#v*G;OEW(0RVZG?bd_rlFu#xi0NZ z;RPY(DW2Q)7*{tc2vKVrE(XW@MtF4B%LGz#&(_W8szPHbdVxqu2pq?ybzw`Tkk<2j zG9y`14M{X1kg|5N0>SmyB#nKcK(MjVqT9{o?#%%BxkN!7b{>;tf6`N$N z0e3_aBm|ygbJePCNS>*T6@c8bRH3Umb`hz83%}#{Lw>XxsfIK~$HOvoqzn+_uDh7{ zBjB||y$B(B{+L8Fp`qjknUh2L^U?kPi@^)aMNy#SN?Kx~K>(N#v0?rn4$UDThe mod configuration. private ModConfig Config; + /// + /// The texture for the calendar button. + /// + private Texture2D calendarTexture; + /// + /// The texture for the quest button. + /// + private Texture2D questTexture; + + /// + /// The button for the calendar menu. + /// + public ClickableTextureComponent billboardButton; + /// + /// The button for the quest menu. + /// + public ClickableTextureComponent questButton; /********* ** Public methods @@ -25,9 +46,24 @@ namespace Omegasis.BillboardAnywhere { this.Config = helper.ReadConfig(); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.ReloadConfig", "Reloads the config file for BillboardAnywhere to reposition the button for the inventory menu page.", this.reloadConfig); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetcalendarButtonX", "Sets the x position for the calendar button in the game menu.", this.setcalendarButtonX); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetcalendarButtonY", " Sets the y position for the calendar button in the game menu.", this.setcalendarButtonY); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetcalendarButtonPosition", " Sets the position for the calendar button in the game menu.", this.setcalendarButtonPosition); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetQuestButtonX", "Sets the x position for the quest button in the game menu.", this.setQuestButtonX); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetQuestButtonY", " Sets the y position for the quest button in the game menu.", this.setQuestButtonX); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetQuestButtonPosition", " Sets the position for the quest button in the game menu.", this.setQuestButtonPosition); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetcalendarButtonVisibility", " Sets the visibility for the billboard button in the game menu.", this.setcalendarButtonVisibility); + helper.ConsoleCommands.Add("Omegasis.BillboardAnywhere.SetQuestButtonVisibility", " Sets the visibility for the quest button in the game menu.", this.setQuestButtonVisibility); helper.Events.Input.ButtonPressed += this.OnButtonPressed; - } + helper.Events.Display.RenderedActiveMenu += this.RenderBillboardMenuButton; + helper.Events.Input.ButtonPressed += this.Input_ButtonPressed; + this.calendarTexture = helper.Content.Load(Path.Combine("Assets", "Billboard.png")); + this.questTexture= helper.Content.Load(Path.Combine("Assets", "Quest.png")); + this.billboardButton = new ClickableTextureComponent(new Rectangle((int)this.Config.CalendarOffsetFromMenu.X, (int)this.Config.CalendarOffsetFromMenu.Y, this.calendarTexture.Width, this.calendarTexture.Height), this.calendarTexture, new Rectangle(0, 0, this.calendarTexture.Width, this.calendarTexture.Height), 1f, false); + this.questButton = new ClickableTextureComponent(new Rectangle((int)this.Config.QuestOffsetFromMenu.X, (int)this.Config.QuestOffsetFromMenu.Y, this.questTexture.Width, this.questTexture.Height), this.questTexture, new Rectangle(0, 0, this.questTexture.Width, this.questTexture.Height), 1f, false); + } /********* ** Private methods @@ -38,8 +74,214 @@ namespace Omegasis.BillboardAnywhere public void OnButtonPressed(object sender, ButtonPressedEventArgs e) { // load menu if key pressed - if (Context.IsPlayerFree && e.Button == this.Config.KeyBinding) + if (Context.IsPlayerFree && e.Button == this.Config.CalendarKeyBinding) Game1.activeClickableMenu = new Billboard(); + if (Context.IsPlayerFree && e.Button == this.Config.QuestBoardKeyBinding) + { + Game1.RefreshQuestOfTheDay(); + Game1.activeClickableMenu = new Billboard(true); + } + } + + /// + /// Checks to see if the billboard button is clicked. + /// + /// + /// + private void Input_ButtonPressed(object sender, ButtonPressedEventArgs e) + { + if (Game1.activeClickableMenu == null) return; + if (e.Button == SButton.MouseLeft) + { + if (this.isInventoryPage()) + { + if (this.billboardButton.containsPoint(Game1.getMousePosition().X, Game1.getMousePosition().Y)) + { + if (this.Config.EnableInventoryCalendarButton == false) return; + Game1.activeClickableMenu = new Billboard(false); + } + if (this.questButton.containsPoint(Game1.getMousePosition().X, Game1.getMousePosition().Y)) + { + if (this.Config.EnableInventoryQuestButton == false) return; + Game1.activeClickableMenu = new Billboard(true); + } + } + } + } + + /// + /// Renders the billboard button to the menu. + /// + /// + /// + private void RenderBillboardMenuButton(object sender, RenderedActiveMenuEventArgs e) + { + if (this.isInventoryPage()) + { + this.billboardButton.bounds = new Rectangle(Game1.activeClickableMenu.xPositionOnScreen + (int)this.Config.CalendarOffsetFromMenu.X, Game1.activeClickableMenu.yPositionOnScreen + (int)this.Config.CalendarOffsetFromMenu.Y, this.calendarTexture.Width, this.calendarTexture.Height); + this.questButton.bounds = new Rectangle(Game1.activeClickableMenu.xPositionOnScreen + (int)this.Config.QuestOffsetFromMenu.X, Game1.activeClickableMenu.yPositionOnScreen + (int)this.Config.QuestOffsetFromMenu.Y, this.calendarTexture.Width, this.calendarTexture.Height); + if(this.Config.EnableInventoryQuestButton) this.questButton.draw(Game1.spriteBatch); + if (this.Config.EnableInventoryCalendarButton) this.billboardButton.draw(Game1.spriteBatch); + GameMenu activeMenu = (Game1.activeClickableMenu as GameMenu); + activeMenu.drawMouse(Game1.spriteBatch); + + if (this.billboardButton.containsPoint(Game1.getMousePosition().X, Game1.getMousePosition().Y)) + { + //My deepest appologies for not being able to personally translate more text. + if (Game1.content.GetCurrentLanguage() == LocalizedContentManager.LanguageCode.en) + { + if (this.Config.EnableInventoryCalendarButton == false) return; + IClickableMenu.drawHoverText(Game1.spriteBatch, "Open Billboard Menu", Game1.smallFont); + } + } + + if (this.questButton.containsPoint(Game1.getMousePosition().X, Game1.getMousePosition().Y)) + { + //My deepest appologies once again for not being able to personally translate more text. + if (Game1.content.GetCurrentLanguage() == LocalizedContentManager.LanguageCode.en) + { + if (this.Config.EnableInventoryQuestButton == false) return; + IClickableMenu.drawHoverText(Game1.spriteBatch, "Open Quest Menu", Game1.smallFont); + } + } + } + } + + /// + /// Checks to see if the current active menu is the game menu and the current page is the inventory page. + /// + /// + private bool isInventoryPage() + { + if (Game1.activeClickableMenu == null) return false; + if (Game1.activeClickableMenu is StardewValley.Menus.GameMenu) + { + GameMenu activeMenu = (Game1.activeClickableMenu as GameMenu); + IClickableMenu currentTab = activeMenu.GetCurrentPage(); + if (currentTab is InventoryPage) + { + return true; + } + } + return false; + } + + + /// + /// Reloads the mod's config and repositions the menu button as necessary. + /// + private void reloadConfig(string Name, string[] Params) + { + this.Config = this.Helper.ReadConfig(); + this.billboardButton = new ClickableTextureComponent(new Rectangle((int)this.Config.CalendarOffsetFromMenu.X, (int)this.Config.CalendarOffsetFromMenu.Y, this.calendarTexture.Width, this.calendarTexture.Height), this.calendarTexture, new Rectangle(0, 0, this.calendarTexture.Width, this.calendarTexture.Height), 1f, false); + this.questButton = new ClickableTextureComponent(new Rectangle((int)this.Config.QuestOffsetFromMenu.X, (int)this.Config.QuestOffsetFromMenu.Y, this.questTexture.Width, this.questTexture.Height), this.questTexture, new Rectangle(0, 0, this.questTexture.Width, this.questTexture.Height), 1f, false); + } + + /// + /// Reloads the mod's config and repositions the menu button as necessary. + /// + private void reloadConfig() + { + this.Config = this.Helper.ReadConfig(); + this.billboardButton = new ClickableTextureComponent(new Rectangle((int)this.Config.CalendarOffsetFromMenu.X, (int)this.Config.CalendarOffsetFromMenu.Y, this.calendarTexture.Width, this.calendarTexture.Height), this.calendarTexture, new Rectangle(0, 0, this.calendarTexture.Width, this.calendarTexture.Height), 1f, false); + this.questButton = new ClickableTextureComponent(new Rectangle((int)this.Config.QuestOffsetFromMenu.X, (int)this.Config.QuestOffsetFromMenu.Y, this.questTexture.Width, this.questTexture.Height), this.questTexture, new Rectangle(0, 0, this.questTexture.Width, this.questTexture.Height), 1f, false); + } + + /// + /// Sets the x position of the menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setcalendarButtonX(string Name, string[] Params) + { + this.Config.CalendarOffsetFromMenu = new Vector2(Convert.ToInt32(Params[0]), this.Config.CalendarOffsetFromMenu.Y); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + /// + /// Sets the y position of the menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setcalendarButtonY(string Name, string[] Params) + { + this.Config.CalendarOffsetFromMenu = new Vector2(this.Config.CalendarOffsetFromMenu.X, Convert.ToInt32(Params[0])); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + /// + /// Sets the position of the menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setcalendarButtonPosition(string Name, string[] Params) + { + this.Config.CalendarOffsetFromMenu = new Vector2(Convert.ToInt32(Params[0]), Convert.ToInt32(Params[1])); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + + /// + /// Sets the x position of the quest menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setQuestButtonX(string Name, string[] Params) + { + this.Config.QuestOffsetFromMenu = new Vector2(Convert.ToInt32(Params[0]), this.Config.QuestOffsetFromMenu.Y); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + /// + /// Sets the y position of the quest menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setQuestButtonY(string Name, string[] Params) + { + this.Config.QuestOffsetFromMenu = new Vector2(this.Config.QuestOffsetFromMenu.X, Convert.ToInt32(Params[0])); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + /// + /// Sets the position of the quest menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setQuestButtonPosition(string Name, string[] Params) + { + this.Config.QuestOffsetFromMenu = new Vector2(Convert.ToInt32(Params[0]), Convert.ToInt32(Params[1])); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + /// + /// Sets the visibility and functionality of the billboard menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setcalendarButtonVisibility(string Name, string[] Params) + { + this.Config.EnableInventoryCalendarButton = Convert.ToBoolean(Params[0]); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); + } + + /// + /// Sets the visibility and functionality of the quest menu button. + /// + /// The name of the command. + /// The parameters passed into the command. + private void setQuestButtonVisibility(string Name, string[] Params) + { + this.Config.EnableInventoryQuestButton = Convert.ToBoolean(Params[0]); + this.Helper.WriteConfig(this.Config); + this.reloadConfig(); } } } diff --git a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj index 36bff343..d608676f 100644 --- a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj +++ b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj @@ -86,6 +86,14 @@ + + + PreserveNewest + + + PreserveNewest + + \ No newline at end of file diff --git a/GeneralMods/BillboardAnywhere/Framework/ModConfig.cs b/GeneralMods/BillboardAnywhere/Framework/ModConfig.cs index 8f16e667..e33a349a 100644 --- a/GeneralMods/BillboardAnywhere/Framework/ModConfig.cs +++ b/GeneralMods/BillboardAnywhere/Framework/ModConfig.cs @@ -1,3 +1,4 @@ +using Microsoft.Xna.Framework; using StardewModdingAPI; namespace Omegasis.BillboardAnywhere.Framework @@ -6,6 +7,21 @@ namespace Omegasis.BillboardAnywhere.Framework internal class ModConfig { /// The key which shows the billboard menu. - public SButton KeyBinding { get; set; } = SButton.B; + public SButton CalendarKeyBinding { get; set; } = SButton.B; + /// The key which shows the quest menu. + public SButton QuestBoardKeyBinding { get; set; } = SButton.H; + /// The offset for the calendar button from the active menu + public Vector2 CalendarOffsetFromMenu { get; set; } = new Vector2(-100, 0); + /// The offset for the quest button from the active menu + public Vector2 QuestOffsetFromMenu { get; set; } = new Vector2(-200, 0); + + /// + /// If true the calendar button is enabled for the in-game menu. + /// + public bool EnableInventoryCalendarButton { get; set; } = true; + /// + /// If true the quest button is enabled for the in-game menu. + /// + public bool EnableInventoryQuestButton { get; set; } = true; } } diff --git a/GeneralMods/BillboardAnywhere/manifest.json b/GeneralMods/BillboardAnywhere/manifest.json index 8a6fea42..0f3c163f 100644 --- a/GeneralMods/BillboardAnywhere/manifest.json +++ b/GeneralMods/BillboardAnywhere/manifest.json @@ -1,10 +1,10 @@ { "Name": "Billboard Anywhere", "Author": "Alpha_Omegasis", - "Version": "1.8.0", + "Version": "1.10.1", "Description": "Lets you view the billboard from anywhere.", "UniqueID": "Omegasis.BillboardAnywhere", "EntryDll": "BillboardAnywhere.dll", - "MinimumApiVersion": "2.10.1", + "MinimumApiVersion": "3.0.0", "UpdateKeys": [ "Nexus:492" ] } diff --git a/GeneralMods/BuildEndurance/BuildEndurance.cs b/GeneralMods/BuildEndurance/BuildEndurance.cs index 4c8f5a6e..0f44bf65 100644 --- a/GeneralMods/BuildEndurance/BuildEndurance.cs +++ b/GeneralMods/BuildEndurance/BuildEndurance.cs @@ -158,7 +158,7 @@ namespace Omegasis.BuildEndurance if (this.PlayerData.CurrentLevel < this.Config.MaxLevel) { - while (this.PlayerData.CurrentExp >= this.PlayerData.ExpToNextLevel) + while (this.PlayerData.CurrentExp >= this.PlayerData.ExpToNextLevel && this.PlayerData.CurrentLevel= this.PlayerData.ExpToNextLevel) + while (this.PlayerData.CurrentExp >= this.PlayerData.ExpToNextLevel && this.PlayerData.CurrentLevel>()); this.SideTabs.Add(new ClickableTextureComponent("", new Rectangle(this.xPositionOnScreen - Game1.tileSize * 3 / 4, this.yPositionOnScreen + Game1.tileSize * 6, Game1.tileSize, Game1.tileSize), "", Game1.content.LoadString("Strings\\UI:Collections_Cooking"), Game1.mouseCursors, new Rectangle(688, 64, 16, 16), Game1.pixelZoom)); this.Collections.Add(BuyBackMenu.CookingTab, new List>()); - this.SideTabs.Add(new ClickableTextureComponent("", new Rectangle(this.xPositionOnScreen - Game1.tileSize * 3 / 4, this.yPositionOnScreen + Game1.tileSize * 7, Game1.tileSize, Game1.tileSize), "", Game1.content.LoadString("Strings\\UI:Collections_Achievements"), Game1.mouseCursors, new Rectangle(656, 80, 16, 16), Game1.pixelZoom)); - this.Collections.Add(BuyBackMenu.AchievementsTab, new List>()); + //this.SideTabs.Add(new ClickableTextureComponent("", new Rectangle(this.xPositionOnScreen - Game1.tileSize * 3 / 4, this.yPositionOnScreen + Game1.tileSize * 7, Game1.tileSize, Game1.tileSize), "", Game1.content.LoadString("Strings\\UI:Collections_Achievements"), Game1.mouseCursors, new Rectangle(656, 80, 16, 16), Game1.pixelZoom)); + //this.Collections.Add(BuyBackMenu.AchievementsTab, new List>()); this.BackButton = new ClickableTextureComponent(new Rectangle(this.xPositionOnScreen + Game1.tileSize * 3 / 4, this.yPositionOnScreen + this.height - 20 * Game1.pixelZoom, 12 * Game1.pixelZoom, 11 * Game1.pixelZoom), Game1.mouseCursors, new Rectangle(352, 495, 12, 11), Game1.pixelZoom); this.ForwardButton = new ClickableTextureComponent(new Rectangle(this.xPositionOnScreen + this.width - Game1.tileSize / 2 - 15 * Game1.pixelZoom, this.yPositionOnScreen + this.height - 20 * Game1.pixelZoom, 12 * Game1.pixelZoom, 11 * Game1.pixelZoom), Game1.mouseCursors, new Rectangle(365, 495, 12, 11), Game1.pixelZoom); int[] array = new int[this.SideTabs.Count]; @@ -155,8 +155,9 @@ namespace Omegasis.BuyBackCollectables.Framework this.Collections[selectedTab].Last().Add(new ClickableTextureComponent(entry.Key + " " + drawShadow, new Rectangle(x2, num5, Game1.tileSize, Game1.tileSize), null, "", Game1.objectSpriteSheet, Game1.getSourceRectForStandardTileSheet(Game1.objectSpriteSheet, entry.Key, 16, 16), Game1.pixelZoom, drawShadow)); array[selectedTab]++; } - if (this.Collections[5].Count == 0) - this.Collections[5].Add(new List()); + /* + //if (this.Collections[5].Count == 0) + //this.Collections[5].Add(new List()); foreach (KeyValuePair current2 in Game1.achievements) { bool flag = Game1.player.achievements.Contains(current2.Key); @@ -169,6 +170,7 @@ namespace Omegasis.BuyBackCollectables.Framework array[5]++; } } + */ } @@ -221,9 +223,9 @@ namespace Omegasis.BuyBackCollectables.Framework } foreach (ClickableTextureComponent current2 in this.Collections[this.CurrentTab][this.CurrentPage]) { - if (current2.containsPoint(x, y) && this.NewItem != null && Game1.player.money >= this.Value) + if (current2.containsPoint(x, y) && this.NewItem != null && Game1.player.Money >= this.Value) { - Game1.player.money -= this.Value; + Game1.player.Money -= this.Value; Game1.playSound("coin"); Game1.player.addItemByMenuIfNecessary(this.NewItem); } @@ -236,9 +238,9 @@ namespace Omegasis.BuyBackCollectables.Framework /// Whether to enable sound. public override void receiveRightClick(int x, int y, bool playSound = true) { - if (this.NewItem != null && Game1.player.money >= this.Value) + if (this.NewItem != null && Game1.player.Money >= this.Value) { - Game1.player.money -= this.Value; + Game1.player.Money -= this.Value; Game1.player.addItemByMenuIfNecessary(this.NewItem); Game1.playSound("coin"); } diff --git a/GeneralMods/BuyBackCollectables/manifest.json b/GeneralMods/BuyBackCollectables/manifest.json index 862d6a7a..3db24121 100644 --- a/GeneralMods/BuyBackCollectables/manifest.json +++ b/GeneralMods/BuyBackCollectables/manifest.json @@ -1,10 +1,10 @@ { "Name": "Buy Back Collectables", "Author": "Alpha_Omegasis", - "Version": "1.7.0", + "Version": "1.8.0", "Description": "Lets you buy back any obtained collectable.", "UniqueID": "Omegasis.BuyBackCollectables", "EntryDll": "BuyBackCollectables.dll", - "MinimumApiVersion": "2.10.1", + "MinimumApiVersion": "3.0.0", "UpdateKeys": [ "Nexus:507" ] } diff --git a/GeneralMods/Fall28SnowDay/manifest.json b/GeneralMods/Fall28SnowDay/manifest.json index 0d4bd6b8..dc0b8a6b 100644 --- a/GeneralMods/Fall28SnowDay/manifest.json +++ b/GeneralMods/Fall28SnowDay/manifest.json @@ -1,7 +1,7 @@ { "Name": "Fall 28 Snow Day", "Author": "Alpha_Omegasis", - "Version": "1.7.0", + "Version": "1.7.1", "Description": "Makes it snow on Fall 28, which makes a good explanation for all the snow on the next day.", "UniqueID": "Omegasis.Fall28SnowDay", "EntryDll": "Fall28SnowDay.dll", diff --git a/GeneralMods/MoreRain/Framework/ModConfig.cs b/GeneralMods/MoreRain/Framework/ModConfig.cs index 791216b4..35bff545 100644 --- a/GeneralMods/MoreRain/Framework/ModConfig.cs +++ b/GeneralMods/MoreRain/Framework/ModConfig.cs @@ -9,21 +9,65 @@ namespace Omegasis.MoreRain.Framework /// The chance out of 100 that it will storm tomorrow if it's spring. public int SpringThunderChance { get; set; } = 5; + /// + /// Changes the mod's logic to prioritize setting a thunderstorm before checking for just a normal rainy day. + /// False = The mod will try to set a normal rainy day first. + /// True = The mod will try to set a thunderstorm (stormy) day first. + /// Default:False + /// + public bool PrioritizeSpringStorms { get; set; } = false; + /// The chance out of 100 that it will rain tomorrow if it's summer. public int SummerRainChance { get; set; } = 5; /// The chance out of 100 that it will storm tomorrow if it's summer. public int SummerThunderChance { get; set; } = 10; + /// + /// Changes the mod's logic to prioritize setting a thunderstorm before checking for just a normal rainy day. + /// False = The mod will try to set a normal rainy day first. + /// True = The mod will try to set a thunderstorm (stormy) day first. + /// Default:True + /// + public bool PrioritizeSummerStorms { get; set; } = true; + /// The chance out of 100 that it will rain tomorrow if it's fall. public int FallRainChance { get; set; } = 15; /// The chance out of 100 that it will storm tomorrow if it's fall. public int FallThunderChance { get; set; } = 5; + + /// + /// Changes the mod's logic to prioritize setting a thunderstorm before checking for just a normal rainy day. + /// False = The mod will try to set a normal rainy day first. + /// True = The mod will try to set a thunderstorm (stormy) day first. + /// Default:False + /// + public bool PrioritizeFallStorms { get; set; } = false; + + /// + /// If set to true the mod will try to make it snow in fall just for fun. + /// + public bool SnowInFall { get; set; } = false; + + /// + /// The chance amouunt for it to snow in the fall. + /// + public int FallSnowChance { get; set; } = 5; + /// The chance out of 100 that it will snow tomorrow if it's winter. public int WinterSnowChance { get; set; } = 15; + /// + /// If set to true then the mod will check to set rainy days in the winter. Default: False + /// + public bool RainInWinter { get; set; } = false; + /// + /// The chance that it will rain on a winter day. Only checked if the RainInWinter config option is true. + /// + public int WinterRainChance { get; set; } = 10; + /// Whether to suppress verbose logging. public bool SuppressLog { get; set; } = true; } diff --git a/GeneralMods/MoreRain/MoreRain.cs b/GeneralMods/MoreRain/MoreRain.cs index 4194842a..afa27aab 100644 --- a/GeneralMods/MoreRain/MoreRain.cs +++ b/GeneralMods/MoreRain/MoreRain.cs @@ -75,55 +75,130 @@ namespace Omegasis.MoreRain { case "spring": // set rain - if (chance <= this.Config.SpringRainChance) + if (this.Config.PrioritizeSpringStorms) { - Game1.weatherForTomorrow = Game1.weather_rain; - this.VerboseLog("It will rain tomorrow."); - return; + if (chance <= this.Config.SpringThunderChance) + { + Game1.weatherForTomorrow = Game1.weather_lightning; + this.VerboseLog("It will be stormy tomorrow."); + return; + } + if (chance <= this.Config.SpringRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will rain tomorrow."); + return; + } } - - if (chance <= this.Config.SpringThunderChance) + else { - Game1.weatherForTomorrow = Game1.weather_lightning; - this.VerboseLog("It will be stormy tomorrow."); - return; + if (chance <= this.Config.SpringRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will rain tomorrow."); + return; + } + + if (chance <= this.Config.SpringThunderChance) + { + Game1.weatherForTomorrow = Game1.weather_lightning; + this.VerboseLog("It will be stormy tomorrow."); + return; + } } break; case "summer": // set rain - if (chance <= this.Config.SummerRainChance) + if (this.Config.PrioritizeSummerStorms) { - Game1.weatherForTomorrow = Game1.weather_rain; - this.VerboseLog("It will rain tomorrow."); - return; + if (chance <= this.Config.SummerThunderChance) + { + Game1.weatherForTomorrow = Game1.weather_lightning; + this.VerboseLog("It will be stormy tomorrow."); + return; + } + if (chance <= this.Config.SummerRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will rain tomorrow."); + return; + } + } + else + { + if (chance <= this.Config.SummerRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will rain tomorrow."); + return; + } + if (chance <= this.Config.SummerThunderChance) + { + Game1.weatherForTomorrow = Game1.weather_lightning; + this.VerboseLog("It will be stormy tomorrow."); + return; + } } - - if (chance <= this.Config.SummerThunderChance) - { - Game1.weatherForTomorrow = Game1.weather_lightning; - this.VerboseLog("It will be stormy tomorrow."); - return; - } break; case "fall": case "autumn": // set rain - if (chance <= this.Config.FallRainChance) + + if (this.Config.PrioritizeFallStorms) { - Game1.weatherForTomorrow = Game1.weather_rain; - this.VerboseLog("It will rain tomorrow."); - return; + if (chance <= this.Config.FallThunderChance) + { + Game1.weatherForTomorrow = Game1.weather_lightning; + this.VerboseLog("It will be stormy tomorrow."); + return; + } + + if (this.Config.SnowInFall) + { + if (chance <= this.Config.FallSnowChance) + { + Game1.weatherForTomorrow = Game1.weather_snow; + this.VerboseLog("It will snow tomorrow."); + } + } + + if (chance <= this.Config.FallRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will rain tomorrow."); + return; + } + + } + else + { + if (chance <= this.Config.FallRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will rain tomorrow."); + return; + } + + if (this.Config.SnowInFall) + { + if (chance <= this.Config.FallSnowChance) + { + Game1.weatherForTomorrow = Game1.weather_snow; + this.VerboseLog("It will snow tomorrow."); + } + } + + if (chance <= this.Config.FallThunderChance) + { + Game1.weatherForTomorrow = Game1.weather_lightning; + this.VerboseLog("It will be stormy tomorrow."); + return; + } } - if (chance <= this.Config.FallThunderChance) - { - Game1.weatherForTomorrow = Game1.weather_lightning; - this.VerboseLog("It will be stormy tomorrow."); - return; - } break; case "winter": @@ -133,10 +208,13 @@ namespace Omegasis.MoreRain Game1.weatherForTomorrow = Game1.weather_snow; this.VerboseLog("It will snow tomorrow."); } - else + if (this.Config.RainInWinter) { - //StardewValley.Game1.weatherForTomorrow = StardewValley.Game1.weather_sunny; - this.VerboseLog("It will not snow tomorrow."); + if (chance <= this.Config.WinterRainChance) + { + Game1.weatherForTomorrow = Game1.weather_rain; + this.VerboseLog("It will snow tomorrow."); + } } break; } diff --git a/GeneralMods/MoreRain/manifest.json b/GeneralMods/MoreRain/manifest.json index 55769136..f889c4ea 100644 --- a/GeneralMods/MoreRain/manifest.json +++ b/GeneralMods/MoreRain/manifest.json @@ -1,7 +1,7 @@ { "Name": "More Rain", "Author": "Alpha_Omegasis", - "Version": "1.8.0", + "Version": "1.9.0", "Description": "Change how much it rains in the game.", "UniqueID": "Omegasis.MoreRain", "EntryDll": "MoreRain.dll", diff --git a/GeneralMods/CustomFurnitureFramework/Class1.cs b/GeneralMods/OutDatedMods/CustomFurnitureFramework/Class1.cs similarity index 100% rename from GeneralMods/CustomFurnitureFramework/Class1.cs rename to GeneralMods/OutDatedMods/CustomFurnitureFramework/Class1.cs diff --git a/GeneralMods/CustomFurnitureFramework/CustomFurnitureFramework.csproj b/GeneralMods/OutDatedMods/CustomFurnitureFramework/CustomFurnitureFramework.csproj similarity index 100% rename from GeneralMods/CustomFurnitureFramework/CustomFurnitureFramework.csproj rename to GeneralMods/OutDatedMods/CustomFurnitureFramework/CustomFurnitureFramework.csproj diff --git a/GeneralMods/CustomFurnitureFramework/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/CustomFurnitureFramework/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/CustomFurnitureFramework/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/CustomFurnitureFramework/Properties/AssemblyInfo.cs diff --git a/GeneralMods/CustomFurnitureFramework/packages.config b/GeneralMods/OutDatedMods/CustomFurnitureFramework/packages.config similarity index 100% rename from GeneralMods/CustomFurnitureFramework/packages.config rename to GeneralMods/OutDatedMods/CustomFurnitureFramework/packages.config diff --git a/GeneralMods/CustomNPCFramework/Class1.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Class1.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Class1.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Class1.cs diff --git a/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj b/GeneralMods/OutDatedMods/CustomNPCFramework/CustomNPCFramework.csproj similarity index 100% rename from GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj rename to GeneralMods/OutDatedMods/CustomNPCFramework/CustomNPCFramework.csproj diff --git a/GeneralMods/CustomNPCFramework/Framework/Enums/AnimationType.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/AnimationType.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Enums/AnimationType.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/AnimationType.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Enums/Direction.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/Direction.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Enums/Direction.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/Direction.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Enums/Genders.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/Genders.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Enums/Genders.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/Genders.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Enums/PartType.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/PartType.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Enums/PartType.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/PartType.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Enums/Seasons.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/Seasons.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Enums/Seasons.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Enums/Seasons.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/AssetInfo.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetInfo.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/AssetInfo.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetInfo.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/AssetManager.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetManager.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/AssetManager.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetManager.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/AssetPool.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetPool.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/AssetPool.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetPool.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/AssetSheet.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetSheet.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/AssetSheet.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/AssetSheet.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/ExtendedAssetInfo.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/ExtendedAssetInfo.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/ExtendedAssetInfo.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/ExtendedAssetInfo.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/TextureGroups/TextureGroup.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/TextureGroups/TextureGroup.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Graphics/TextureGroups/TextureGroup.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Graphics/TextureGroups/TextureGroup.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteCollection.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteCollection.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteCollection.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteCollection.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/CharacterAnimationBase.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/CharacterAnimationBase.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/CharacterAnimationBase.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/CharacterAnimationBase.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/StandardCharacterAnimation.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/StandardCharacterAnimation.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/StandardCharacterAnimation.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/CharacterAnimationBases/StandardCharacterAnimation.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/ColorCollections/StandardColorCollection.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/ColorCollections/StandardColorCollection.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/ColorCollections/StandardColorCollection.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/ColorCollections/StandardColorCollection.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/AnimationKeys.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/AnimationKeys.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/AnimationKeys.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/AnimationKeys.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/BasicRenderer.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/BasicRenderer.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/BasicRenderer.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/ModularRenderers/BasicRenderer.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/Portrait.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/Portrait.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/Portrait.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/Portrait.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/Sprite.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/Sprite.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/ModularNPCS/Sprite.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/ModularNPCS/Sprite.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/NPCNames.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/NPCNames.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/NPCNames.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/NPCNames.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/NPCS/ExtendedNPC.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/NPCS/ExtendedNPC.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/NPCS/ExtendedNPC.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/NPCS/ExtendedNPC.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/NPCS/MerchantNPC.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/NPCS/MerchantNPC.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/NPCS/MerchantNPC.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/NPCS/MerchantNPC.cs diff --git a/GeneralMods/CustomNPCFramework/Framework/Utilities/NPCTracker.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Utilities/NPCTracker.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Framework/Utilities/NPCTracker.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Framework/Utilities/NPCTracker.cs diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseDown.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseDown.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseDown.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseDown.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseLeft.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseLeft.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseLeft.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseLeft.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingDown.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingDown.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingDown.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingDown.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingLeft.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingLeft.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingLeft.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingLeft.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingRight.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingRight.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingRight.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingRight.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingUp.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingUp.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingUp.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseMovingUp.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseRight.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseRight.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseRight.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseRight.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseUp.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseUp.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseUp.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/FBodyBaseUp.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/VanillaFemaleBodyBase.json b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/VanillaFemaleBodyBase.json similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/VanillaFemaleBodyBase.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bodies/FemaleBodyBase/VanillaFemaleBodyBase.json diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/DownFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/DownFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/DownFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/DownFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/GreyPants.json b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/GreyPants.json similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/GreyPants.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/GreyPants.json diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/LeftFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/LeftFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/LeftFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/LeftFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/RightFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/RightFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/RightFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/RightFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/UpFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/UpFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/UpFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Bottoms/Female/GreyPants/UpFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/BrownVanillaEyes.json b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/BrownVanillaEyes.json similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/BrownVanillaEyes.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/BrownVanillaEyes.json diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesDown.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesDown.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesDown.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesDown.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesLeft.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesLeft.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesLeft.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesLeft.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesRight.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesRight.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesRight.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesRight.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesUp.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesUp.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesUp.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Eyes/VanillaEyes/BrownEyes/EyesUp.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/DownHairStyle.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/DownHairStyle.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/DownHairStyle.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/DownHairStyle.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/LeftHairStyle.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/LeftHairStyle.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/LeftHairStyle.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/LeftHairStyle.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/PigtailsHairStyle.json b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/PigtailsHairStyle.json similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/PigtailsHairStyle.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/PigtailsHairStyle.json diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/RightHairStyle.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/RightHairStyle.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/RightHairStyle.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/RightHairStyle.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/UpHairStyle.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/UpHairStyle.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/UpHairStyle.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/VanillaPigtails/UpHairStyle.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/notes.txt b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/notes.txt similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Hair/notes.txt rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Hair/notes.txt diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/DownFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/DownFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/DownFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/DownFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/LeftFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/LeftFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/LeftFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/LeftFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/RightFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/RightFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/RightFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/RightFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/UpFacing.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/UpFacing.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/UpFacing.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/UpFacing.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/VanillaPinkShirt.json b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/VanillaPinkShirt.json similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/VanillaPinkShirt.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shirts/Female/VanillaPinkShirt/VanillaPinkShirt.json diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownMoving.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownMoving.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownMoving.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownMoving.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownStanding.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownStanding.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownStanding.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/DownStanding.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftMoving.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftMoving.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftMoving.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftMoving.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftStanding.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftStanding.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftStanding.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/LeftStanding.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightMoving.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightMoving.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightMoving.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightMoving.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightStanding.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightStanding.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightStanding.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/RightStanding.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpMoving.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpMoving.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpMoving.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpMoving.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpStanding.png b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpStanding.png similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpStanding.png rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/UpStanding.png diff --git a/GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/VanillaBrownShoes.json b/GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/VanillaBrownShoes.json similarity index 100% rename from GeneralMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/VanillaBrownShoes.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/ModularNPCGraphics/Shoes/VanillaBrownShoes/VanillaBrownShoes.json diff --git a/GeneralMods/CustomNPCFramework/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/CustomNPCFramework/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/CustomNPCFramework/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/CustomNPCFramework/Properties/AssemblyInfo.cs diff --git a/GeneralMods/CustomNPCFramework/manifest.json b/GeneralMods/OutDatedMods/CustomNPCFramework/manifest.json similarity index 100% rename from GeneralMods/CustomNPCFramework/manifest.json rename to GeneralMods/OutDatedMods/CustomNPCFramework/manifest.json diff --git a/GeneralMods/CustomObjectFramework/App.config b/GeneralMods/OutDatedMods/CustomObjectFramework/App.config similarity index 100% rename from GeneralMods/CustomObjectFramework/App.config rename to GeneralMods/OutDatedMods/CustomObjectFramework/App.config diff --git a/GeneralMods/CustomObjectFramework/CustomObjectFramework.csproj b/GeneralMods/OutDatedMods/CustomObjectFramework/CustomObjectFramework.csproj similarity index 100% rename from GeneralMods/CustomObjectFramework/CustomObjectFramework.csproj rename to GeneralMods/OutDatedMods/CustomObjectFramework/CustomObjectFramework.csproj diff --git a/GeneralMods/CustomObjectFramework/Program.cs b/GeneralMods/OutDatedMods/CustomObjectFramework/Program.cs similarity index 100% rename from GeneralMods/CustomObjectFramework/Program.cs rename to GeneralMods/OutDatedMods/CustomObjectFramework/Program.cs diff --git a/GeneralMods/CustomObjectFramework/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/CustomObjectFramework/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/CustomObjectFramework/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/CustomObjectFramework/Properties/AssemblyInfo.cs diff --git a/GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.cs b/GeneralMods/OutDatedMods/DailyQuestAnywhere/DailyQuestAnywhere.cs similarity index 100% rename from GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.cs rename to GeneralMods/OutDatedMods/DailyQuestAnywhere/DailyQuestAnywhere.cs diff --git a/GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj b/GeneralMods/OutDatedMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj similarity index 100% rename from GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj rename to GeneralMods/OutDatedMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj diff --git a/GeneralMods/DailyQuestAnywhere/Framework/ModConfig.cs b/GeneralMods/OutDatedMods/DailyQuestAnywhere/Framework/ModConfig.cs similarity index 100% rename from GeneralMods/DailyQuestAnywhere/Framework/ModConfig.cs rename to GeneralMods/OutDatedMods/DailyQuestAnywhere/Framework/ModConfig.cs diff --git a/GeneralMods/DailyQuestAnywhere/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/DailyQuestAnywhere/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/DailyQuestAnywhere/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/DailyQuestAnywhere/Properties/AssemblyInfo.cs diff --git a/GeneralMods/DailyQuestAnywhere/README.md b/GeneralMods/OutDatedMods/DailyQuestAnywhere/README.md similarity index 100% rename from GeneralMods/DailyQuestAnywhere/README.md rename to GeneralMods/OutDatedMods/DailyQuestAnywhere/README.md diff --git a/GeneralMods/DailyQuestAnywhere/manifest.json b/GeneralMods/OutDatedMods/DailyQuestAnywhere/manifest.json similarity index 100% rename from GeneralMods/DailyQuestAnywhere/manifest.json rename to GeneralMods/OutDatedMods/DailyQuestAnywhere/manifest.json diff --git a/GeneralMods/FarmersMarketStall/Class1.cs b/GeneralMods/OutDatedMods/FarmersMarketStall/Class1.cs similarity index 100% rename from GeneralMods/FarmersMarketStall/Class1.cs rename to GeneralMods/OutDatedMods/FarmersMarketStall/Class1.cs diff --git a/GeneralMods/FarmersMarketStall/FarmersMarketStall.csproj b/GeneralMods/OutDatedMods/FarmersMarketStall/FarmersMarketStall.csproj similarity index 100% rename from GeneralMods/FarmersMarketStall/FarmersMarketStall.csproj rename to GeneralMods/OutDatedMods/FarmersMarketStall/FarmersMarketStall.csproj diff --git a/GeneralMods/FarmersMarketStall/Framework/MapEvents/ShopInteractionEvent.cs b/GeneralMods/OutDatedMods/FarmersMarketStall/Framework/MapEvents/ShopInteractionEvent.cs similarity index 100% rename from GeneralMods/FarmersMarketStall/Framework/MapEvents/ShopInteractionEvent.cs rename to GeneralMods/OutDatedMods/FarmersMarketStall/Framework/MapEvents/ShopInteractionEvent.cs diff --git a/GeneralMods/FarmersMarketStall/Framework/MarketStall.cs b/GeneralMods/OutDatedMods/FarmersMarketStall/Framework/MarketStall.cs similarity index 100% rename from GeneralMods/FarmersMarketStall/Framework/MarketStall.cs rename to GeneralMods/OutDatedMods/FarmersMarketStall/Framework/MarketStall.cs diff --git a/GeneralMods/FarmersMarketStall/Framework/Menus/MarketStallMenu.cs b/GeneralMods/OutDatedMods/FarmersMarketStall/Framework/Menus/MarketStallMenu.cs similarity index 100% rename from GeneralMods/FarmersMarketStall/Framework/Menus/MarketStallMenu.cs rename to GeneralMods/OutDatedMods/FarmersMarketStall/Framework/Menus/MarketStallMenu.cs diff --git a/GeneralMods/FarmersMarketStall/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/FarmersMarketStall/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/FarmersMarketStall/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/FarmersMarketStall/Properties/AssemblyInfo.cs diff --git a/GeneralMods/FarmersMarketStall/manifest.json b/GeneralMods/OutDatedMods/FarmersMarketStall/manifest.json similarity index 100% rename from GeneralMods/FarmersMarketStall/manifest.json rename to GeneralMods/OutDatedMods/FarmersMarketStall/manifest.json diff --git a/GeneralMods/MapExampleRF1/Class1.cs b/GeneralMods/OutDatedMods/MapExampleRF1/Class1.cs similarity index 100% rename from GeneralMods/MapExampleRF1/Class1.cs rename to GeneralMods/OutDatedMods/MapExampleRF1/Class1.cs diff --git a/GeneralMods/MapExampleRF1/MapExampleRF1.csproj b/GeneralMods/OutDatedMods/MapExampleRF1/MapExampleRF1.csproj similarity index 100% rename from GeneralMods/MapExampleRF1/MapExampleRF1.csproj rename to GeneralMods/OutDatedMods/MapExampleRF1/MapExampleRF1.csproj diff --git a/GeneralMods/MapExampleRF1/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/MapExampleRF1/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/MapExampleRF1/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/MapExampleRF1/Properties/AssemblyInfo.cs diff --git a/GeneralMods/MapExampleRF1/manifest.json b/GeneralMods/OutDatedMods/MapExampleRF1/manifest.json similarity index 100% rename from GeneralMods/MapExampleRF1/manifest.json rename to GeneralMods/OutDatedMods/MapExampleRF1/manifest.json diff --git a/GeneralMods/MapExampleRF1/packages.config b/GeneralMods/OutDatedMods/MapExampleRF1/packages.config similarity index 100% rename from GeneralMods/MapExampleRF1/packages.config rename to GeneralMods/OutDatedMods/MapExampleRF1/packages.config diff --git a/GeneralMods/ModdedUtilitiesNetworking/Class1.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Class1.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Class1.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Class1.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Clients/CustomGalaxyClient.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Clients/CustomGalaxyClient.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Clients/CustomGalaxyClient.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Clients/CustomGalaxyClient.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Clients/CustomLidgrenClient.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Clients/CustomLidgrenClient.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Clients/CustomLidgrenClient.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Clients/CustomLidgrenClient.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/CustomMultiplayer.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/CustomMultiplayer.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/CustomMultiplayer.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/CustomMultiplayer.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/DataInfo.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/DataInfo.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/DataInfo.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/DataInfo.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Delegates/DelegateInfo.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Delegates/DelegateInfo.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Delegates/DelegateInfo.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Delegates/DelegateInfo.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Enums/MessageTypes.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Enums/MessageTypes.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Enums/MessageTypes.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Enums/MessageTypes.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Extentions/GenericExtentions.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Extentions/GenericExtentions.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Extentions/GenericExtentions.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Extentions/GenericExtentions.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Extentions/StrardewValleyExtentions/MessagesExtentions.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Extentions/StrardewValleyExtentions/MessagesExtentions.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Extentions/StrardewValleyExtentions/MessagesExtentions.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Extentions/StrardewValleyExtentions/MessagesExtentions.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Extentions/XNAExtentions.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Extentions/XNAExtentions.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Extentions/XNAExtentions.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Extentions/XNAExtentions.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Features/Stardew/MessageFeatures.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Features/Stardew/MessageFeatures.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Features/Stardew/MessageFeatures.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Features/Stardew/MessageFeatures.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Messages/OutgoingMessageBase.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Messages/OutgoingMessageBase.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Messages/OutgoingMessageBase.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Messages/OutgoingMessageBase.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferReadStream.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferReadStream.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferReadStream.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferReadStream.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferWriteStream.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferWriteStream.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferWriteStream.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Network/NetBufferWriteStream.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Servers/CustomGameServer.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Servers/CustomGameServer.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Servers/CustomGameServer.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Servers/CustomGameServer.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/Framework/Servers/CustomLidgrenServer.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Servers/CustomLidgrenServer.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Framework/Servers/CustomLidgrenServer.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Framework/Servers/CustomLidgrenServer.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/ModdedUtilitiesNetworking.csproj b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/ModdedUtilitiesNetworking.csproj similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/ModdedUtilitiesNetworking.csproj rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/ModdedUtilitiesNetworking.csproj diff --git a/GeneralMods/ModdedUtilitiesNetworking/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/Properties/AssemblyInfo.cs diff --git a/GeneralMods/ModdedUtilitiesNetworking/manifest.json b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/manifest.json similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/manifest.json rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/manifest.json diff --git a/GeneralMods/ModdedUtilitiesNetworking/packages.config b/GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/packages.config similarity index 100% rename from GeneralMods/ModdedUtilitiesNetworking/packages.config rename to GeneralMods/OutDatedMods/ModdedUtilitiesNetworking/packages.config diff --git a/GeneralMods/MuseumRearranger/Framework/ModConfig.cs b/GeneralMods/OutDatedMods/MuseumRearranger/Framework/ModConfig.cs similarity index 100% rename from GeneralMods/MuseumRearranger/Framework/ModConfig.cs rename to GeneralMods/OutDatedMods/MuseumRearranger/Framework/ModConfig.cs diff --git a/GeneralMods/MuseumRearranger/Framework/NewMuseumMenu.cs b/GeneralMods/OutDatedMods/MuseumRearranger/Framework/NewMuseumMenu.cs similarity index 100% rename from GeneralMods/MuseumRearranger/Framework/NewMuseumMenu.cs rename to GeneralMods/OutDatedMods/MuseumRearranger/Framework/NewMuseumMenu.cs diff --git a/GeneralMods/MuseumRearranger/MuseumRearranger.cs b/GeneralMods/OutDatedMods/MuseumRearranger/MuseumRearranger.cs similarity index 100% rename from GeneralMods/MuseumRearranger/MuseumRearranger.cs rename to GeneralMods/OutDatedMods/MuseumRearranger/MuseumRearranger.cs diff --git a/GeneralMods/MuseumRearranger/MuseumRearranger.csproj b/GeneralMods/OutDatedMods/MuseumRearranger/MuseumRearranger.csproj similarity index 100% rename from GeneralMods/MuseumRearranger/MuseumRearranger.csproj rename to GeneralMods/OutDatedMods/MuseumRearranger/MuseumRearranger.csproj diff --git a/GeneralMods/MuseumRearranger/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/MuseumRearranger/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/MuseumRearranger/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/MuseumRearranger/Properties/AssemblyInfo.cs diff --git a/GeneralMods/MuseumRearranger/ReadMe.md b/GeneralMods/OutDatedMods/MuseumRearranger/ReadMe.md similarity index 100% rename from GeneralMods/MuseumRearranger/ReadMe.md rename to GeneralMods/OutDatedMods/MuseumRearranger/ReadMe.md diff --git a/GeneralMods/MuseumRearranger/manifest.json b/GeneralMods/OutDatedMods/MuseumRearranger/manifest.json similarity index 100% rename from GeneralMods/MuseumRearranger/manifest.json rename to GeneralMods/OutDatedMods/MuseumRearranger/manifest.json diff --git a/GeneralMods/NoMorePets/NoMorePets.cs b/GeneralMods/OutDatedMods/NoMorePets/NoMorePets.cs similarity index 100% rename from GeneralMods/NoMorePets/NoMorePets.cs rename to GeneralMods/OutDatedMods/NoMorePets/NoMorePets.cs diff --git a/GeneralMods/NoMorePets/NoMorePets.csproj b/GeneralMods/OutDatedMods/NoMorePets/NoMorePets.csproj similarity index 100% rename from GeneralMods/NoMorePets/NoMorePets.csproj rename to GeneralMods/OutDatedMods/NoMorePets/NoMorePets.csproj diff --git a/GeneralMods/NoMorePets/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/NoMorePets/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/NoMorePets/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/NoMorePets/Properties/AssemblyInfo.cs diff --git a/GeneralMods/NoMorePets/README.md b/GeneralMods/OutDatedMods/NoMorePets/README.md similarity index 100% rename from GeneralMods/NoMorePets/README.md rename to GeneralMods/OutDatedMods/NoMorePets/README.md diff --git a/GeneralMods/NoMorePets/manifest.json b/GeneralMods/OutDatedMods/NoMorePets/manifest.json similarity index 100% rename from GeneralMods/NoMorePets/manifest.json rename to GeneralMods/OutDatedMods/NoMorePets/manifest.json diff --git a/GeneralMods/SundropMapEvents/Class1.cs b/GeneralMods/OutDatedMods/SundropMapEvents/Class1.cs similarity index 100% rename from GeneralMods/SundropMapEvents/Class1.cs rename to GeneralMods/OutDatedMods/SundropMapEvents/Class1.cs diff --git a/GeneralMods/SundropMapEvents/Properties/AssemblyInfo.cs b/GeneralMods/OutDatedMods/SundropMapEvents/Properties/AssemblyInfo.cs similarity index 100% rename from GeneralMods/SundropMapEvents/Properties/AssemblyInfo.cs rename to GeneralMods/OutDatedMods/SundropMapEvents/Properties/AssemblyInfo.cs diff --git a/GeneralMods/SundropMapEvents/SundropMapEvents.csproj b/GeneralMods/OutDatedMods/SundropMapEvents/SundropMapEvents.csproj similarity index 100% rename from GeneralMods/SundropMapEvents/SundropMapEvents.csproj rename to GeneralMods/OutDatedMods/SundropMapEvents/SundropMapEvents.csproj diff --git a/GeneralMods/SundropMapEvents/manifest.json b/GeneralMods/OutDatedMods/SundropMapEvents/manifest.json similarity index 100% rename from GeneralMods/SundropMapEvents/manifest.json rename to GeneralMods/OutDatedMods/SundropMapEvents/manifest.json diff --git a/GeneralMods/SimpleSoundManager/Framework/XACTSound.cs b/GeneralMods/SimpleSoundManager/Framework/XACTSound.cs index a9e6379e..60334621 100644 --- a/GeneralMods/SimpleSoundManager/Framework/XACTSound.cs +++ b/GeneralMods/SimpleSoundManager/Framework/XACTSound.cs @@ -10,7 +10,7 @@ namespace SimpleSoundManager.Framework public string soundName; readonly WaveBank vanillaWaveBank; readonly ISoundBank vanillaSoundBank; - readonly Cue song; + readonly ICue song; /// Make a new Sound Manager to play and manage sounds in a modded wave bank. /// The reference to the wave bank in the mod's asset folder. diff --git a/GeneralMods/SimpleSoundManager/Framework/XactMusicPair.cs b/GeneralMods/SimpleSoundManager/Framework/XactMusicPair.cs index 84129dc1..fafef9bd 100644 --- a/GeneralMods/SimpleSoundManager/Framework/XactMusicPair.cs +++ b/GeneralMods/SimpleSoundManager/Framework/XactMusicPair.cs @@ -19,8 +19,8 @@ namespace SimpleSoundManager wavBankPath = Path.Combine(helper.DirectoryPath, wavBankPath); soundBankPath = Path.Combine(helper.DirectoryPath, soundBankPath); - this.waveBank = new WaveBank(Game1.audioEngine, wavBankPath); - this.soundBank = new SoundBankWrapper(new SoundBank(Game1.audioEngine, soundBankPath)); + this.waveBank = new WaveBank(Game1.audioEngine.Engine, wavBankPath); + this.soundBank = new SoundBankWrapper(new SoundBank(Game1.audioEngine.Engine, soundBankPath)); } } } diff --git a/GeneralMods/SimpleSoundManager/manifest.json b/GeneralMods/SimpleSoundManager/manifest.json index b80f64b4..2ebb0d80 100644 --- a/GeneralMods/SimpleSoundManager/manifest.json +++ b/GeneralMods/SimpleSoundManager/manifest.json @@ -1,7 +1,7 @@ { "Name": "Simple Sound Manager", "Author": "Alpha_Omegasis", - "Version": "2.2.0", + "Version": "2.3.0", "Description": "A simple framework to play sounds from wave banks and wav files.", "UniqueID": "Omegasis.SimpleSoundManager", "EntryDll": "SimpleSoundManager.dll", diff --git a/GeneralMods/StardewMods.sln b/GeneralMods/StardewMods.sln index 0a8bcec3..c6cd0630 100644 --- a/GeneralMods/StardewMods.sln +++ b/GeneralMods/StardewMods.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoSpeed", "AutoSpeed\AutoSpeed.csproj", "{57E7D17E-C237-448B-A50F-CFB67F9BB146}" EndProject @@ -13,18 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildHealth", "BuildHealth\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuyBackCollectables", "BuyBackCollectables\BuyBackCollectables.csproj", "{A19025C4-E194-4CAD-B156-4AC00BDD2AA3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DailyQuestAnywhere", "DailyQuestAnywhere\DailyQuestAnywhere.csproj", "{AC4B84F5-31E4-4A55-B13F-A5189C552343}" -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}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoreRain", "MoreRain\MoreRain.csproj", "{45721A43-630A-461F-9A50-E47D3D1926D0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MuseumRearranger", "MuseumRearranger\MuseumRearranger.csproj", "{920D74FE-156F-4321-B461-5AC7ED7EF9C9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoMorePets", "NoMorePets\NoMorePets.csproj", "{2D41E7D7-B4B7-420F-ACAF-8F687E876008}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NightOwl", "NightOwl\NightOwl.csproj", "{C7E7043F-C823-4FDD-9F4E-7CC255751246}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAnywhere", "SaveAnywhere\SaveAnywhere.csproj", "{E17855AD-DBAF-49BD-B3E2-9899403252F6}" @@ -152,18 +146,6 @@ Global {A19025C4-E194-4CAD-B156-4AC00BDD2AA3}.x86|Any CPU.Build.0 = x86|Any CPU {A19025C4-E194-4CAD-B156-4AC00BDD2AA3}.x86|x86.ActiveCfg = x86|x86 {A19025C4-E194-4CAD-B156-4AC00BDD2AA3}.x86|x86.Build.0 = x86|x86 - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Debug|x86.ActiveCfg = Debug|x86 - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Debug|x86.Build.0 = Debug|x86 - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Release|Any CPU.Build.0 = Release|Any CPU - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Release|x86.ActiveCfg = Release|x86 - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.Release|x86.Build.0 = Release|x86 - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.x86|Any CPU.ActiveCfg = x86|Any CPU - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.x86|Any CPU.Build.0 = x86|Any CPU - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.x86|x86.ActiveCfg = x86|x86 - {AC4B84F5-31E4-4A55-B13F-A5189C552343}.x86|x86.Build.0 = x86|x86 {1DBB583D-4A4F-4A46-8CC5-42017C93D292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DBB583D-4A4F-4A46-8CC5-42017C93D292}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DBB583D-4A4F-4A46-8CC5-42017C93D292}.Debug|x86.ActiveCfg = Debug|x86 @@ -200,30 +182,6 @@ Global {45721A43-630A-461F-9A50-E47D3D1926D0}.x86|Any CPU.Build.0 = x86|Any CPU {45721A43-630A-461F-9A50-E47D3D1926D0}.x86|x86.ActiveCfg = x86|x86 {45721A43-630A-461F-9A50-E47D3D1926D0}.x86|x86.Build.0 = x86|x86 - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Debug|x86.ActiveCfg = Debug|x86 - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Debug|x86.Build.0 = Debug|x86 - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Release|Any CPU.Build.0 = Release|Any CPU - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Release|x86.ActiveCfg = Release|x86 - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.Release|x86.Build.0 = Release|x86 - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.x86|Any CPU.ActiveCfg = x86|Any CPU - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.x86|Any CPU.Build.0 = x86|Any CPU - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.x86|x86.ActiveCfg = x86|x86 - {920D74FE-156F-4321-B461-5AC7ED7EF9C9}.x86|x86.Build.0 = x86|x86 - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Debug|x86.ActiveCfg = Debug|x86 - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Debug|x86.Build.0 = Debug|x86 - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Release|Any CPU.Build.0 = Release|Any CPU - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Release|x86.ActiveCfg = Release|x86 - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.Release|x86.Build.0 = Release|x86 - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.x86|Any CPU.ActiveCfg = x86|Any CPU - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.x86|Any CPU.Build.0 = x86|Any CPU - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.x86|x86.ActiveCfg = x86|x86 - {2D41E7D7-B4B7-420F-ACAF-8F687E876008}.x86|x86.Build.0 = x86|x86 {C7E7043F-C823-4FDD-9F4E-7CC255751246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7E7043F-C823-4FDD-9F4E-7CC255751246}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7E7043F-C823-4FDD-9F4E-7CC255751246}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs index 022a16e9..fc5efe0a 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs @@ -6,8 +6,11 @@ namespace StardewSymphonyRemastered /// A class that handles all of the config files for this mod. public class Config { - /// Whether to show debug logs in the SMAPI console. - public bool EnableDebugLog { get; set; } = false; + + /// + /// If the current song hasn't finished playing just ignore a music swap until it finishes. + /// + public bool WaitForSongToFinishBeforeMusicSwap { get; set; } = true; /// The minimum delay between songs in milliseconds. public int MinimumDelayBetweenSongsInMilliseconds { get; set; } = 5000; @@ -21,11 +24,12 @@ namespace StardewSymphonyRemastered /// Whether to completely disable the Stardew Valley OST. public bool DisableStardewMusic { get; set; } = false; - public List LocationsToIgnoreWarpMusicChange { get; set; } = new List(); + /// Whether to show debug logs in the SMAPI console. + public bool EnableDebugLog { get; set; } = false; - public Config() - { - this.LocationsToIgnoreWarpMusicChange = new List(); - } + /// + /// Loctions that ignore the warp music change so that the music will continue to play from the previous location. + /// + public SortedDictionary LocationsToIgnoreWarpMusicChange { get; set; } = new SortedDictionary(); } } diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenuV2.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenuV2.cs index 552766ac..63fe34ca 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenuV2.cs +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenuV2.cs @@ -13,6 +13,7 @@ using StardewValley.Menus; using StardustCore.Animations; using StardustCore.UIUtilities; using StardustCore.UIUtilities.MenuComponents; +using StardustCore.UIUtilities.MenuComponents.ComponentsV1; using StardustCore.UIUtilities.MenuComponents.Delegates; using StardustCore.UIUtilities.MenuComponents.Delegates.Functionality; using StardustCore.UIUtilities.SpriteFonts; @@ -115,7 +116,7 @@ namespace StardewSymphonyRemastered.Framework.Menus /// The save button that saves the current options to the song. /// public Button saveButton; - + public Button lastPageButton; public Button nextPageButton; @@ -878,7 +879,7 @@ namespace StardewSymphonyRemastered.Framework.Menus } } - if(this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.ConditionalViewMode) { int amountToShow = 6; this.updateFancyButtons(); @@ -979,7 +980,7 @@ namespace StardewSymphonyRemastered.Framework.Menus Game1.playSound("shwip"); } - if(this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.ConditionalViewMode) { if ((this.conditionalViewPageIndex + 1) * 6 >= this.fancyButtons.Count) return; this.conditionalViewPageIndex++; @@ -1163,7 +1164,7 @@ namespace StardewSymphonyRemastered.Framework.Menus if (this.conditionalViewButton.containsPoint(x, y) && this.drawMode == DrawMode.DifferentSelectionTypesModePage) { - this.hoverText = "View all conditions for this song."+Environment.NewLine+"View all the possible conditions for when this song should play."; + this.hoverText = "View all conditions for this song." + Environment.NewLine + "View all the possible conditions for when this song should play."; hoverTextOver = true; } @@ -1185,7 +1186,7 @@ namespace StardewSymphonyRemastered.Framework.Menus } //Display song conditional as hover text - if(this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.ConditionalViewMode) { int amountToShow = 6; @@ -1221,9 +1222,9 @@ namespace StardewSymphonyRemastered.Framework.Menus { builder.Append(s); builder.Append(Environment.NewLine); - } + } builder.Append(Environment.NewLine); - this.hoverText =builder.ToString(); + this.hoverText = builder.ToString(); hoverTextOver = true; } } @@ -1796,11 +1797,21 @@ namespace StardewSymphonyRemastered.Framework.Menus catch { } } - //Allow 8 songs to be displayed per page. - Texture2DExtended texture = StardewSymphony.textureManager.getTexture("HouseIcon"); - float scale = 1.00f / (texture.getTexture().Width / 64f); - Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height); - this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, locName, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null))); + Texture2DExtended locTexture = StardewSymphony.textureManager.getTexture(locName,false); + if (locTexture != null) + { + float scale = 1.00f / (locTexture.getTexture().Width / 64f); + Rectangle srcRect = new Rectangle(0, 0, locTexture.getTexture().Width, locTexture.getTexture().Height); + this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), locTexture, locName, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null))); + } + else + { + //Allow 8 songs to be displayed per page. + Texture2DExtended texture = StardewSymphony.textureManager.getTexture("HouseIcon"); + float scale = 1.00f / (texture.getTexture().Width / 64f); + Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height); + this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, locName, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null))); + } } } @@ -1865,12 +1876,12 @@ namespace StardewSymphonyRemastered.Framework.Menus } } - if(this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.ConditionalViewMode) { this.fancyButtons.Clear(); //Vector4 placement = new Vector4((Game1.viewport.Width / 3), (Game1.viewport.Height / 4) + 128, this.width, this.height / 2); Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .9f); - Dictionary conditionals= this.CurrentMusicPack.SongInformation.songs[this.currentSelectedSong.name].songConditionals; + Dictionary conditionals = this.CurrentMusicPack.SongInformation.songs[this.currentSelectedSong.name].songConditionals; for (int i = 0; i < conditionals.Count; i++) { //Allow 8 songs to be displayed per page. @@ -1891,7 +1902,7 @@ namespace StardewSymphonyRemastered.Framework.Menus { int updateNumber = 20; - if (this.drawMode == DrawMode.AlbumFancySelection || this.drawMode == DrawMode.SongSelectionMode || this.drawMode == DrawMode.LocationSelection || this.drawMode == DrawMode.FestivalSelection || this.drawMode == DrawMode.TimeSelection || this.drawMode == DrawMode.ConditionalViewMode || this.drawMode == DrawMode.MenuSelection || this.drawMode == DrawMode.EventSelection || this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.AlbumFancySelection || this.drawMode == DrawMode.SongSelectionMode || this.drawMode == DrawMode.LocationSelection || this.drawMode == DrawMode.FestivalSelection || this.drawMode == DrawMode.TimeSelection || this.drawMode == DrawMode.ConditionalViewMode || this.drawMode == DrawMode.MenuSelection || this.drawMode == DrawMode.EventSelection || this.drawMode == DrawMode.ConditionalViewMode) { if (this.framesSinceLastUpdate == updateNumber) { @@ -2015,7 +2026,7 @@ namespace StardewSymphonyRemastered.Framework.Menus /// public void goBack() { - if (this.drawMode == DrawMode.DaySelection || this.drawMode == DrawMode.EventSelection || this.drawMode == DrawMode.FestivalSelection || this.drawMode == DrawMode.LocationSelection || this.drawMode == DrawMode.MenuSelection || this.drawMode == DrawMode.SeasonSelection || this.drawMode == DrawMode.TimeSelection || this.drawMode == DrawMode.WeatherSelection || this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.DaySelection || this.drawMode == DrawMode.EventSelection || this.drawMode == DrawMode.FestivalSelection || this.drawMode == DrawMode.LocationSelection || this.drawMode == DrawMode.MenuSelection || this.drawMode == DrawMode.SeasonSelection || this.drawMode == DrawMode.TimeSelection || this.drawMode == DrawMode.WeatherSelection || this.drawMode == DrawMode.ConditionalViewMode) { this.drawMode = DrawMode.DifferentSelectionTypesModePage; this.updateFancyButtons(); @@ -2313,7 +2324,7 @@ namespace StardewSymphonyRemastered.Framework.Menus b.DrawString(Game1.smallFont, "Page: " + (this.locationPageIndex + 1) + " of " + ((this.fancyButtons.Count / amountToShow) + ((this.fancyButtons.Count % amountToShow == 0 ? 0 : 1))), this.getFixedPositionFromMenu(pagePlacement), Color.White); } - if(this.drawMode == DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.ConditionalViewMode) { this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255))); this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255))); @@ -2389,7 +2400,7 @@ namespace StardewSymphonyRemastered.Framework.Menus if (this.currentlySelectedMenu != null) this.currentlySelectedMenu.draw(b); } - if(this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.ConditionalViewMode) { this.backButton.draw(b); } @@ -2402,7 +2413,7 @@ namespace StardewSymphonyRemastered.Framework.Menus this.conditionalViewButton.draw(b); } - if (this.drawMode == DrawMode.AlbumFancySelection || this.drawMode == DrawMode.EventSelection || this.drawMode == DrawMode.FestivalSelection || this.drawMode == DrawMode.LocationSelection || this.drawMode == DrawMode.MenuSelection || this.drawMode == DrawMode.SongSelectionMode || this.drawMode == DrawMode.TimeSelection || this.drawMode== DrawMode.ConditionalViewMode) + if (this.drawMode == DrawMode.AlbumFancySelection || this.drawMode == DrawMode.EventSelection || this.drawMode == DrawMode.FestivalSelection || this.drawMode == DrawMode.LocationSelection || this.drawMode == DrawMode.MenuSelection || this.drawMode == DrawMode.SongSelectionMode || this.drawMode == DrawMode.TimeSelection || this.drawMode == DrawMode.ConditionalViewMode) { this.lastPageButton.draw(b); this.nextPageButton.draw(b); diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/MusicManagerV2.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/MusicManagerV2.cs index 2c79b5b4..78ef0fea 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/MusicManagerV2.cs +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/MusicManagerV2.cs @@ -165,7 +165,15 @@ namespace StardewSymphonyRemastered.Framework.V2 public bool selectMusic(string songListKey, bool warpCheck = false) { - if (warpCheck == true && StardewSymphony.Config.LocationsToIgnoreWarpMusicChange.Contains(Game1.player.currentLocation.Name)) + if (this.CurrentMusicPack != null) + { + if (this.CurrentMusicPack.IsPlaying() && StardewSymphony.Config.WaitForSongToFinishBeforeMusicSwap) + { + StardewSymphony.ModMonitor.Log("Waiting for music to finish before playing another song."); + return false; + } + } + if (warpCheck == true && StardewSymphony.Config.LocationsToIgnoreWarpMusicChange.ContainsKey(Game1.player.currentLocation.Name)) { return false; } @@ -201,7 +209,7 @@ namespace StardewSymphonyRemastered.Framework.V2 { if (song.canBePlayed(songListKey)) { - foreach(SongConditionals con in song.songConditionals.Values) + foreach (SongConditionals con in song.songConditionals.Values) { if (con.isLocationSpecific() == false) { @@ -297,7 +305,7 @@ namespace StardewSymphonyRemastered.Framework.V2 //used to swap the music packs and stop the last playing song. this.SwapMusicPacks(musicPackPair.Key.Name); - string songName = musicPackPair.Value; + string songName = musicPackPair.Value; this.CurrentMusicPack.PlaySong(songName); return true; } diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/SongSpecificsV2.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/SongSpecificsV2.cs index 91b79f99..2593c53f 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/SongSpecificsV2.cs +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/V2/SongSpecificsV2.cs @@ -227,11 +227,21 @@ namespace StardewSymphonyRemastered.Framework.V2 foreach (var v in Game1.locations) { locations.Add(v.Name); + + if (StardewSymphony.Config.LocationsToIgnoreWarpMusicChange.ContainsKey(v.Name)==false) + { + StardewSymphony.Config.LocationsToIgnoreWarpMusicChange.Add(v.Name, false); + } + if (StardewSymphony.Config.EnableDebugLog) StardewSymphony.ModMonitor.Log("Adding in song triggers for location: " + v.Name); } - locations.Add("UndergroundMine Floors 1-39"); + StardewSymphony.ModHelper.WriteConfig(StardewSymphony.Config); + + locations.Add("UndergroundMine Floors 1-10"); + locations.Add("UndergroundMine Floors 11-29"); + locations.Add("UndergroundMine Floors 31-39"); locations.Add("UndergroundMine Floors 40-69"); locations.Add("UndergroundMine Floors 70-79"); locations.Add("UndergroundMine Floors 80-120"); diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs index d125e17d..1d9de134 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs @@ -1,3 +1,4 @@ +using System.IO; using Microsoft.Xna.Framework.Audio; using Microsoft.Xna.Framework.Graphics; using StardewModdingAPI; @@ -51,6 +52,8 @@ namespace StardewSymphonyRemastered helper.Events.Display.MenuChanged += this.OnMenuChanged; + + musicManager = new MusicManagerV2(); textureManager = new TextureManager("StardewSymphony"); @@ -170,7 +173,7 @@ namespace StardewSymphonyRemastered { Game1.currentSong.Stop(AudioStopOptions.Immediate); //stop the normal songs from playing over the new songs Game1.currentSong.Stop(AudioStopOptions.AsAuthored); - Game1.nextMusicTrack = ""; //same as above line + Game1.requestedMusicTrack = ""; //same as above line } } else @@ -213,6 +216,8 @@ namespace StardewSymphonyRemastered return new Texture2DExtended(this.Helper, this.ModManifest, $"assets/{name}"); } + textureManager.searchForTextures(this.Helper,this.ModManifest,Path.Combine("assets","Locations")); + textureManager.addTexture("SaveIcon", LoadTexture("SaveIcon.png")); textureManager.addTexture("LastPage", LoadTexture("lastPageButton.png")); textureManager.addTexture("NextPage", LoadTexture("nextPageButton.png")); diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj index 08c2e6e7..3eb331a5 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj @@ -233,6 +233,10 @@ Always + + + PreserveNewest + Always @@ -329,9 +333,7 @@ False - - - + \ No newline at end of file diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/Locations/AbandonedJojaMart.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/Locations/AbandonedJojaMart.png new file mode 100644 index 0000000000000000000000000000000000000000..dd5803487332e40d285f98639bd4c3e59e98aa4b GIT binary patch literal 420 zcmV;V0bBlwP)Px$UP(kjR9J;$U>F6XV59>^3=sj%{|p==aBfYECqv7U?IaoM9r%gijkZ05$kl@k zhTP$(`hUD(VEAwyZZ8XlZVnNKnU@bSFfcGMq(^l#Ffjaq^N9hQ>I~qP`!!u)c-+~J zqCZ{N4n;i^Ap=hyJ4dwT~;>6z==2ccQT?y1bcz;l*LNy#zym z6tMM9G=9sm0IE6w<_J;%W+FrficYBf`}=UK!zG6Y5DtO+`w#}hXhkRd4#Or-wgb=s z%%}JFp;`iCrJxdX5TAuMQdB|3C@0?~j!7a$veY#E`{PJ&v(*^rQB*c^xh z1an?sSc@ixJqli5$8G|$II_j)SrCWinrb>2;@Cq#R1;zuHW~(S#V?kSz-2jZ2fzR> z%kfx7iscLp_;LZVh1e{o62R>MT)rj&5b`|(0})L!ngFEsz$h36qW}PU5Qa3-Nj4<_ O0000Px$1W80eR9J;$U>F6XV59>^bOAxlg#YiE1mOJXsRj(0voDZs0lI#{e;*j$Uta*X zmjzwJdnN$}hT47zXWv-{28JsLJ~`mULKOY)n+s8-nF#4$w`vRdmJ^{LBMKO_3;r`$ z$53P`UT|~?1H;t`aC-@c0Ik7*I{+gQVt{00RQ}wvxYgm3!vhG1z}&M4gJE>CF@A?( zlPB8&=m6%^xo1%=fw6JPQ_TTX27}xI*n$uiw73!-x;%ksz@H0{4M4VxP--VZE#YiP z$TDmWBmt1029PaA&w?ZX!XbbQ;EG=oLxOwb%7 literal 0 HcmV?d00001 diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json index c60dc83a..fdc55b07 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json @@ -1,7 +1,7 @@ { "Name": "Stardew Symphony Remastered", "Author": "Alpha_Omegasis", - "Version": "3.0.1", + "Version": "3.1.0", "Description": "Adding more music to the game one beep at a time. Now with streaming!", "UniqueID": "Omegasis.StardewSymphonyRemastered", "EntryDll": "StardewSymphonyRemastered.dll", diff --git a/GeneralMods/StardustCore/IlluminateFramework/Colors.cs b/GeneralMods/StardustCore/IlluminateFramework/Colors.cs index e0bf28fb..18713cbc 100644 --- a/GeneralMods/StardustCore/IlluminateFramework/Colors.cs +++ b/GeneralMods/StardustCore/IlluminateFramework/Colors.cs @@ -599,7 +599,7 @@ namespace StardustCore.IlluminateFramework { if (colorRandomizer == null) { - colorRandomizer = new Random(Game1.player.money + Game1.tileSize + Game1.dayOfMonth + (int)Game1.stats.stepsTaken); + colorRandomizer = new Random(Game1.player.Money + Game1.tileSize + Game1.dayOfMonth + (int)Game1.stats.stepsTaken); } int r = colorRandomizer.Next(0, 255); int g = colorRandomizer.Next(0, 255); diff --git a/GeneralMods/StardustCore/ModConfig.cs b/GeneralMods/StardustCore/ModConfig.cs index 45f91f72..6d8bbadb 100644 --- a/GeneralMods/StardustCore/ModConfig.cs +++ b/GeneralMods/StardustCore/ModConfig.cs @@ -4,8 +4,6 @@ namespace StardustCore { public bool enableMultiplayerHack { get; set; } = false; public string modularMenuKey { get; set; } = "P"; - - public ModConfig() { } } } diff --git a/GeneralMods/StardustCore/UIUtilities/MenuComponents/ComponentsV2/Buttons/ItemDisplayButton.cs b/GeneralMods/StardustCore/UIUtilities/MenuComponents/ComponentsV2/Buttons/ItemDisplayButton.cs index 729e823f..ce05bdc9 100644 --- a/GeneralMods/StardustCore/UIUtilities/MenuComponents/ComponentsV2/Buttons/ItemDisplayButton.cs +++ b/GeneralMods/StardustCore/UIUtilities/MenuComponents/ComponentsV2/Buttons/ItemDisplayButton.cs @@ -124,7 +124,7 @@ namespace StardustCore.UIUtilities.MenuComponents.ComponentsV2.Buttons if(this.background!=null)this.background.draw(b, this.scale, Depth,Alpha); if (this.item != null) { - this.item.drawInMenu(b, this.position, 1f, Alpha, Depth, this.drawStackNumber, this.drawColor, DrawShadow); + this.item.drawInMenu(b, this.position, 1f, Alpha, Depth, StackDrawType.Draw, this.drawColor, DrawShadow); } } @@ -141,14 +141,14 @@ namespace StardustCore.UIUtilities.MenuComponents.ComponentsV2.Buttons if (this.background != null) this.background.draw(b,Position,this.scale, Depth, Alpha); if (this.item != null) { - this.item.drawInMenu(b, Position, 1f, Alpha, Depth, this.drawStackNumber, this.drawColor, DrawShadow); + this.item.drawInMenu(b, Position, 1f, Alpha, Depth, StackDrawType.Draw, this.drawColor, DrawShadow); } } public void draw(SpriteBatch b,float ItemScale ,float Depth, float Alpha, bool DrawShadow) { this.background.draw(b, this.scale, Depth, Alpha); - if (this.item != null) this.item.drawInMenu(b, this.position, ItemScale, Alpha, Depth, this.drawStackNumber, this.drawColor, DrawShadow); + if (this.item != null) this.item.drawInMenu(b, this.position, ItemScale, Alpha, Depth, StackDrawType.Draw, this.drawColor, DrawShadow); } /// @@ -161,7 +161,7 @@ namespace StardustCore.UIUtilities.MenuComponents.ComponentsV2.Buttons /// Should the shadow be drawn for the item? public void drawJustItem(SpriteBatch b,float Scale,float Depth, float Alpha, bool DrawShadow) { - if (this.item != null) this.item.drawInMenu(b, this.position, Scale, Alpha, Depth, this.drawStackNumber, this.drawColor, DrawShadow); + if (this.item != null) this.item.drawInMenu(b, this.position, Scale, Alpha, Depth, StackDrawType.Draw, this.drawColor, DrawShadow); } public bool receiveLeftClick(int x, int y) diff --git a/GeneralMods/StardustCore/UIUtilities/TextureManager.cs b/GeneralMods/StardustCore/UIUtilities/TextureManager.cs index 24c00499..713da76b 100644 --- a/GeneralMods/StardustCore/UIUtilities/TextureManager.cs +++ b/GeneralMods/StardustCore/UIUtilities/TextureManager.cs @@ -35,14 +35,31 @@ namespace StardustCore.UIUtilities } /// Returns a Texture2DExtended held by the manager. - public Texture2DExtended getTexture(string name) + public Texture2DExtended getTexture(string name,bool ThrowError=true) { - foreach (var v in this.textures) + if (this.textures.ContainsKey(name)) { - if (v.Key == name) - return v.Value.Copy(); + return this.textures[name].Copy(); } - throw new Exception("Error, texture name not found!!!"); + + if (ThrowError) + { + throw new Exception("Error, texture name not found!!!"); + } + else + { + return null; + } + } + + /// + /// Checks if the texture exists + /// + /// + /// + public bool containsTexture(string name) + { + return this.textures.ContainsKey(name); } diff --git a/GeneralMods/StardustCore/manifest.json b/GeneralMods/StardustCore/manifest.json index 901157d5..520808d0 100644 --- a/GeneralMods/StardustCore/manifest.json +++ b/GeneralMods/StardustCore/manifest.json @@ -1,10 +1,10 @@ { "Name": "StardustCore", "Author": "Alpha_Omegasis", - "Version": "2.2.1", + "Version": "2.2.2", "Description": "A core mod that allows for other mods of mine to be run.", "UniqueID": "Omegasis.StardustCore", "EntryDll": "StardustCore.dll", - "MinimumApiVersion": "2.10.1", - "UpdateKeys": [] + "MinimumApiVersion": "3.0.0", + "UpdateKeys": [ "Nexus:2341" ] } diff --git a/GeneralMods/TimeFreeze/Framework/ModConfig.cs b/GeneralMods/TimeFreeze/Framework/ModConfig.cs index f4d1c87e..760e4053 100644 --- a/GeneralMods/TimeFreeze/Framework/ModConfig.cs +++ b/GeneralMods/TimeFreeze/Framework/ModConfig.cs @@ -5,22 +5,13 @@ namespace Omegasis.TimeFreeze.Framework /// The mod configuration. internal class ModConfig { - public List LocationsToIgnoreTimeFreeze { get; set; } = new List(); + //public List LocationsToIgnoreTimeFreeze { get; set; } = new List(); - /// Whether time should be unfrozen while the player is swimming. - public bool PassTimeWhileSwimming { get; set; } = true; + public SortedDictionary freezeTimeInThisLocation { get; set; } = new SortedDictionary(); /// Whether time should be unfrozen while the player is swimming in the vanilla bathhouse. public bool PassTimeWhileSwimmingInBathhouse { get; set; } = true; - /// Whether time passes normally inside the mine. - public bool PassTimeWhileInsideMine { get; set; } = true; - - /// Whether time passes normally inside the skull cavern. - public bool PassTimeWhileInsideSkullCave { get; set; } = true; - - public bool PassTimeWhileInNightMarketSubmarine { get; set; } = true; - /// Checks if just one player meets the conditions to freeze time, and then freeze time. public bool freezeIfEvenOnePlayerMeetsTimeFreezeConditions { get; set; } = false; diff --git a/GeneralMods/TimeFreeze/TimeFreeze.cs b/GeneralMods/TimeFreeze/TimeFreeze.cs index aea713e1..c5225c04 100644 --- a/GeneralMods/TimeFreeze/TimeFreeze.cs +++ b/GeneralMods/TimeFreeze/TimeFreeze.cs @@ -24,8 +24,27 @@ namespace Omegasis.TimeFreeze public override void Entry(IModHelper helper) { this.Config = helper.ReadConfig(); - helper.Events.GameLoop.UpdateTicked += this.OnUpdateTicked; + helper.Events.GameLoop.SaveLoaded += this.GameLoop_SaveLoaded; + } + + private void GameLoop_SaveLoaded(object sender, SaveLoadedEventArgs e) + { + foreach (GameLocation loc in Game1.locations) + { + if (this.Config.freezeTimeInThisLocation.ContainsKey(loc.Name) == false) + { + if (loc.IsOutdoors) + { + this.Config.freezeTimeInThisLocation.Add(loc.Name, false); + } + else + { + this.Config.freezeTimeInThisLocation.Add(loc.Name, true); + } + } + } + this.Helper.WriteConfig(this.Config); } @@ -122,39 +141,35 @@ namespace Omegasis.TimeFreeze /// The location to check. private bool ShouldFreezeTime(Farmer player, GameLocation location) { - if (this.Config.LocationsToIgnoreTimeFreeze.Contains(location.Name)) return false; - - if (this.Config.PassTimeWhileInsideMine) + if (Game1.showingEndOfNightStuff) return false; + if (this.Config.freezeTimeInThisLocation.ContainsKey(location.Name)) { if (location.Name == "Mine" || location.Name.StartsWith("UndergroundMine")) - return false; - } + { + return this.Config.freezeTimeInThisLocation["Mine"]; + } - if (this.Config.PassTimeWhileInsideSkullCave) - { if (location.Name == "SkullCave" || location.Name.StartsWith("SkullCave")) - return false; - } - else - { - if (location.Name == "SkullCave" || location.Name.StartsWith("SkullCave")) - return true; + { + return this.Config.freezeTimeInThisLocation["SkullCave"]; + } + + if (player.swimming.Value) + { + if (this.Config.PassTimeWhileSwimmingInBathhouse && location is BathHousePool) + return false; + } + + return this.Config.freezeTimeInThisLocation[location.Name]; } - if (this.Config.PassTimeWhileInNightMarketSubmarine && location is Submarine) return false; //Pass time in the night market submarine. - + //If for some reason the location wasn't accounted for then just freeze time there by default. if (location.IsOutdoors) return false; - - if (player.swimming.Value) + else { - if (this.Config.PassTimeWhileSwimmingInBathhouse && location is BathHousePool) - return false; - if (this.Config.PassTimeWhileSwimming) - return false; + return true; } - - return true; } } } diff --git a/GeneralMods/TimeFreeze/manifest.json b/GeneralMods/TimeFreeze/manifest.json index 38608f8e..048d885b 100644 --- a/GeneralMods/TimeFreeze/manifest.json +++ b/GeneralMods/TimeFreeze/manifest.json @@ -1,10 +1,10 @@ { "Name": "Time Freeze", "Author": "Alpha_Omegasis", - "Version": "1.8.0", - "Description": "Emulates old Harvest Moon-style games where time is frozen inside.", + "Version": "1.9.0", + "Description": "Emulates old Harvest Moon aka (Story of Seasons) style games where time is frozen inside.", "UniqueID": "Omegasis.TimeFreeze", "EntryDll": "TimeFreeze.dll", - "MinimumApiVersion": "2.10.1", + "MinimumApiVersion": "3.0.0", "UpdateKeys": [ "Nexus:973" ] }