diff --git a/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj b/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj index 8303620d..eeae3c37 100644 --- a/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj +++ b/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj @@ -87,15 +87,15 @@ - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GeneralMods/AdvancedSaveBackup/packages.config b/GeneralMods/AdvancedSaveBackup/packages.config index d7988130..af793ad3 100644 --- a/GeneralMods/AdvancedSaveBackup/packages.config +++ b/GeneralMods/AdvancedSaveBackup/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GeneralMods/AutoSpeed/AutoSpeed.csproj b/GeneralMods/AutoSpeed/AutoSpeed.csproj index 61862471..23545179 100644 --- a/GeneralMods/AutoSpeed/AutoSpeed.csproj +++ b/GeneralMods/AutoSpeed/AutoSpeed.csproj @@ -85,15 +85,15 @@ - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GeneralMods/AutoSpeed/manifest.json b/GeneralMods/AutoSpeed/manifest.json index 6bb4ca77..5dd4808f 100644 --- a/GeneralMods/AutoSpeed/manifest.json +++ b/GeneralMods/AutoSpeed/manifest.json @@ -1,7 +1,7 @@ { "Name": "Auto Speed", "Author": "Alpha_Omegasis", - "Version": "1.5.0", + "Version": "1.6.0", "Description": "Got to go fast!", "UniqueID": "Omegasis.AutoSpeed", "EntryDll": "AutoSpeed.dll", diff --git a/GeneralMods/AutoSpeed/packages.config b/GeneralMods/AutoSpeed/packages.config index d7988130..af793ad3 100644 --- a/GeneralMods/AutoSpeed/packages.config +++ b/GeneralMods/AutoSpeed/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj index 84f69494..a3638df8 100644 --- a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj +++ b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj @@ -87,15 +87,15 @@ - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GeneralMods/BillboardAnywhere/manifest.json b/GeneralMods/BillboardAnywhere/manifest.json index ce7852f0..d8d45b95 100644 --- a/GeneralMods/BillboardAnywhere/manifest.json +++ b/GeneralMods/BillboardAnywhere/manifest.json @@ -1,7 +1,7 @@ { "Name": "Billboard Anywhere", "Author": "Alpha_Omegasis", - "Version": "1.5.0", + "Version": "1.6.0", "Description": "Lets you view the billboard from anywhere.", "UniqueID": "Omegasis.BillboardAnywhere", "EntryDll": "BillboardAnywhere.dll", diff --git a/GeneralMods/BillboardAnywhere/packages.config b/GeneralMods/BillboardAnywhere/packages.config index d7988130..af793ad3 100644 --- a/GeneralMods/BillboardAnywhere/packages.config +++ b/GeneralMods/BillboardAnywhere/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GeneralMods/BuildEndurance/BuildEndurance.cs b/GeneralMods/BuildEndurance/BuildEndurance.cs index edc64517..763e619a 100644 --- a/GeneralMods/BuildEndurance/BuildEndurance.cs +++ b/GeneralMods/BuildEndurance/BuildEndurance.cs @@ -99,7 +99,7 @@ namespace Omegasis.BuildEndurance } // give XP when exhausted - if (!this.WasExhausted && Game1.player.exhausted) + if (!this.WasExhausted && Game1.player.exhausted.Value) { this.PlayerData.CurrentExp += this.Config.ExpForExhaustion; this.WasExhausted = true; @@ -107,8 +107,9 @@ namespace Omegasis.BuildEndurance } // give XP when player stays up too late or collapses - if (!this.WasCollapsed && Game1.farmerShouldPassOut) + if (!this.WasCollapsed && shouldFarmerPassout()) { + this.PlayerData.CurrentExp += this.Config.ExpForCollapsing; this.WasCollapsed = true; //this.Monitor.Log("The player has collapsed!"); @@ -180,7 +181,7 @@ namespace Omegasis.BuildEndurance } } this.PlayerData.ClearModEffects = false; - this.PlayerData.NightlyStamina = Game1.player.maxStamina; + this.PlayerData.NightlyStamina = Game1.player.MaxStamina; // save data this.Helper.WriteJsonFile(this.DataFilePath, this.PlayerData); @@ -219,5 +220,15 @@ namespace Omegasis.BuildEndurance this.Monitor.Log($"Error migrating data from the legacy 'PlayerData' folder for the current player. Technical details:\n {ex}", LogLevel.Error); } } + + /// + /// Try and emulate the old Game1.shouldFarmerPassout logic. + /// + /// + public bool shouldFarmerPassout() + { + if (Game1.player.stamina <= 0 || Game1.player.health <= 0 || Game1.timeOfDay >= 2600) return true; + else return false; + } } } diff --git a/GeneralMods/BuildEndurance/BuildEndurance.csproj b/GeneralMods/BuildEndurance/BuildEndurance.csproj index 3b3d4da7..0fd10fa4 100644 --- a/GeneralMods/BuildEndurance/BuildEndurance.csproj +++ b/GeneralMods/BuildEndurance/BuildEndurance.csproj @@ -86,15 +86,15 @@ - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GeneralMods/BuildEndurance/manifest.json b/GeneralMods/BuildEndurance/manifest.json index a9cb9d66..6829e663 100644 --- a/GeneralMods/BuildEndurance/manifest.json +++ b/GeneralMods/BuildEndurance/manifest.json @@ -1,7 +1,7 @@ { "Name": "Build Endurance", "Author": "Alpha_Omegasis", - "Version": "1.5.0", + "Version": "1.6.0", "Description": "Increase your health as you play.", "UniqueID": "Omegasis.BuildEndurance", "EntryDll": "BuildEndurance.dll", diff --git a/GeneralMods/BuildEndurance/packages.config b/GeneralMods/BuildEndurance/packages.config index d7988130..af793ad3 100644 --- a/GeneralMods/BuildEndurance/packages.config +++ b/GeneralMods/BuildEndurance/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GeneralMods/BuildHealth/BuildHealth.cs b/GeneralMods/BuildHealth/BuildHealth.cs index b263fc01..1ba8210c 100644 --- a/GeneralMods/BuildHealth/BuildHealth.cs +++ b/GeneralMods/BuildHealth/BuildHealth.cs @@ -103,11 +103,10 @@ namespace Omegasis.BuildHealth this.LastHealth = player.health; // give XP when player stays up too late or collapses - if (!this.WasCollapsed && Game1.farmerShouldPassOut) + if (!this.WasCollapsed && shouldFarmerPassout()) { this.PlayerData.CurrentExp += this.Config.ExpForCollapsing; this.WasCollapsed = true; - this.Monitor.Log("The player has collapsed!"); } } @@ -210,5 +209,11 @@ namespace Omegasis.BuildHealth this.Monitor.Log($"Error migrating data from the legacy 'PlayerData' folder for the current player. Technical details:\n {ex}", LogLevel.Error); } } + + public bool shouldFarmerPassout() + { + if (Game1.player.stamina <= 0 || Game1.player.health <= 0 || Game1.timeOfDay >= 2600) return true; + else return false; + } } } diff --git a/GeneralMods/BuildHealth/BuildHealth.csproj b/GeneralMods/BuildHealth/BuildHealth.csproj index c6a2c774..d1627a93 100644 --- a/GeneralMods/BuildHealth/BuildHealth.csproj +++ b/GeneralMods/BuildHealth/BuildHealth.csproj @@ -86,15 +86,15 @@ - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GeneralMods/BuildHealth/manifest.json b/GeneralMods/BuildHealth/manifest.json index 2d8b65a3..dff2d592 100644 --- a/GeneralMods/BuildHealth/manifest.json +++ b/GeneralMods/BuildHealth/manifest.json @@ -1,7 +1,7 @@ { "Name": "Build Health", "Author": "Alpha_Omegasis", - "Version": "1.5.0", + "Version": "1.6.0", "Description": "Increase your health as you play.", "UniqueID": "Omegasis.BuildHealth", "EntryDll": "BuildHealth.dll", diff --git a/GeneralMods/BuildHealth/packages.config b/GeneralMods/BuildHealth/packages.config index d7988130..af793ad3 100644 --- a/GeneralMods/BuildHealth/packages.config +++ b/GeneralMods/BuildHealth/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj b/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj index aa476ed7..488853fb 100644 --- a/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj +++ b/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj @@ -88,15 +88,15 @@ - + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/GeneralMods/BuyBackCollectables/packages.config b/GeneralMods/BuyBackCollectables/packages.config index d7988130..af793ad3 100644 --- a/GeneralMods/BuyBackCollectables/packages.config +++ b/GeneralMods/BuyBackCollectables/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj b/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj index 4ae89c3a..20071e85 100644 --- a/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj +++ b/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj @@ -109,25 +109,25 @@ - - - - - - {0756D36A-95C8-480D-8EA6-4584C03010C6} StardustCore + + + + + + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + \ No newline at end of file diff --git a/Misc/WindowsGame2/WindowsGame2/WindowsGame2/WindowsGame2.csproj.Debug.cachefile b/Misc/WindowsGame2/WindowsGame2/WindowsGame2/WindowsGame2.csproj.Debug.cachefile new file mode 100644 index 00000000..d7d2bde1 --- /dev/null +++ b/Misc/WindowsGame2/WindowsGame2/WindowsGame2/WindowsGame2.csproj.Debug.cachefile @@ -0,0 +1,2 @@ +Content\NoEffect.xnb +Content\GreyScaleEffect.xnb diff --git a/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/GreyScaleEffect.fx b/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/GreyScaleEffect.fx new file mode 100644 index 00000000..6d3c4546 --- /dev/null +++ b/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/GreyScaleEffect.fx @@ -0,0 +1,65 @@ +sampler s0; + +float ambientRed; +float ambientGreen; +float ambientBlue; + +float addedRed; +float addedGreen; +float addedBlue; +float addedAlpha; + +float timeOfDay; + +float4x4 MatrixTransform; + +bool addLightGlow; + +float4 PixelShaderFunction(float2 coords: TEXCOORD0) : COLOR0 +{ + + float4 color = tex2D(s0, coords); //Get the default pixel color. + [flatten]if (timeOfDay < 2100) { + float r = color.r*(ambientRed / 255); + float g = color.g*(ambientGreen / 255); + float b = color.b*(ambientBlue / 255); + float a = color.a; + float Gray = (r * 0.3 + g * 0.59 + b * 0.11); //.3,.59,.11 + + color.rgb = Gray; + } + else { + float r = color.r*(ambientRed / 255); + float g = color.g*(ambientGreen / 255); + float b = color.b*(ambientBlue / 255); + float a = color.a; + float Gray = (r * 0.11 + g * 0.11 + b * 0.78); //.3,.59,.11 + + color.rgb = Gray; + //Used for night glow + [flatten]if (addLightGlow == true) { + color.r = color.r * 3; + color.g = color.g * 3; + color.b = color.b * 3; + color.a = color.a*0.25; + } + else { + + } + } + + color.r = color.r + addedRed; + color.g = color.g + addedGreen; + color.b = color.b + addedBlue; + color.a = color.a + addedAlpha; + return color; + +} + +technique Technique1 +{ + pass Pass1 + { + PixelShader = compile ps_2_0 PixelShaderFunction(); + } +} \ No newline at end of file diff --git a/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/NoEffect.fx b/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/NoEffect.fx new file mode 100644 index 00000000..73018c1f --- /dev/null +++ b/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/NoEffect.fx @@ -0,0 +1,14 @@ +sampler s0; +float4 PixelShaderFunction(float2 coords: TEXCOORD0) : COLOR0 +{ + float4 color = tex2D(s0, coords); //Get the default pixel color. + return color; +} + +technique Technique1 +{ + pass Pass1 + { + PixelShader = compile ps_2_0 PixelShaderFunction(); + } +} \ No newline at end of file diff --git a/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/WindowsGame2Content.contentproj b/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/WindowsGame2Content.contentproj new file mode 100644 index 00000000..f780c026 --- /dev/null +++ b/Misc/WindowsGame2/WindowsGame2/WindowsGame2Content/WindowsGame2Content.contentproj @@ -0,0 +1,53 @@ + + + {58C274AC-3DD6-4FC1-9E6B-9E2D8D885F08} + {96E2B04D-8817-42c6-938A-82C39BA4D311};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Debug + x86 + Library + Properties + v4.0 + v4.0 + bin\$(Platform)\$(Configuration) + Content + + + x86 + + + x86 + + + WindowsGame2Content + + + + + + + + + + + + NoEffect + EffectImporter + EffectProcessor + + + + + GreyScaleEffect + EffectImporter + EffectProcessor + + + + + \ No newline at end of file