From 95c39ea42fbf5ad4261000d8040d9a57ffcedbc5 Mon Sep 17 00:00:00 2001 From: SchuhBaum Date: Thu, 12 Oct 2023 23:30:12 +0200 Subject: [PATCH] v2.4.6 --- ReadMe.md | 7 ++++--- SimplifiedMoveset/modinfo.json | 2 +- SimplifiedMoveset/workshopdata.json | 2 +- SourceCode/MainMod.cs | 4 ++-- SourceCode/PlayerMod.cs | 19 +++++++++++++++---- SourceCode/SimplifiedMoveset.csproj | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index cc9d51c..18a357b 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,5 +1,5 @@ ## SimplifiedMoveset -###### Version: 2.4.5 +###### Version: 2.4.6 This is a mod for Rain World v1.9. @@ -11,7 +11,7 @@ https://www.youtube.com/watch?v=Jp6UyUgoWB0 ### Installation 0. Update Rain World to version 1.9 if needed. -1. Download the file `SimplifiedMoveset.zip` from [Releases](https://github.com/SchuhBaum/SimplifiedMoveset/releases/tag/v2.4.5). +1. Download the file `SimplifiedMoveset.zip` from [Releases](https://github.com/SchuhBaum/SimplifiedMoveset/releases/tag/v2.4.6). 2. Extract its content in the folder `[Steam]\SteamApps\common\Rain World\RainWorld_Data\StreamingAssets\mods`. 3. Start the game as normal. In the main menu select `Remix` and enable the mod. @@ -26,7 +26,7 @@ There are two licenses available - MIT and Unlicense. You can choose which one y ### Changelog #### (Rain World v1.9) -v2.4.5: +v2.4.6: - (belly slide) Reduced the duration of the normal belly slide back to vanilla. The overall distance is unintentionally increased otherwise (like +20%). Not sure why since the speed is decreased and the same as the long belly slide. From what I tested the distance is as in vanilla now. I might need to double check later since this seems somewhat odd. - (belly slide) Reduced the speed and increased the duration of the belly slide for Gourmand. This way it matches better with his rocket jump. - (gourmand) Added this option. Enabled by default. Exhaust only when throwing spears. Stun creatures with rocket jumps. Slides, rocket jumps and rolls only stun and deal no damage. @@ -35,6 +35,7 @@ v2.4.5: - (tube worm) Restored that wall jumps are priotized over using tube worms. - (wall jump) Restored that inputs are buffered for 6 frames when pressing jump early. - (beam climb) Added some cases where you can drop down (by holding/pressing down and/or pressing jump). Prevent beam hopping when holding down. Otherwise you might trigger it accidentally. +- (beam climb) Fixed a case where you would switch from standing on beam to hanging from beam prematurely. v2.4.0: - (crawl) Forgot to add an option check for the last change. diff --git a/SimplifiedMoveset/modinfo.json b/SimplifiedMoveset/modinfo.json index 0d93105..80af91b 100644 --- a/SimplifiedMoveset/modinfo.json +++ b/SimplifiedMoveset/modinfo.json @@ -1,7 +1,7 @@ { "id": "SimplifiedMoveset", "name": "SimplifiedMoveset", - "version": "2.4.5", + "version": "2.4.6", "authors": "SchuhBaum", "description": "Various movement changes. The main idea is to remove or simplify timings, making it easier to perform advanced moves consistently.", "requirements": [], diff --git a/SimplifiedMoveset/workshopdata.json b/SimplifiedMoveset/workshopdata.json index a7dca74..20fe077 100644 --- a/SimplifiedMoveset/workshopdata.json +++ b/SimplifiedMoveset/workshopdata.json @@ -2,7 +2,7 @@ "Title": "SimplifiedMoveset", "Description": "Various movement changes. The main idea is to remove or simplify timings, making it easier to perform advanced moves consistently.", "ID": "SimplifiedMoveset", - "Version": "2.4.5", + "Version": "2.4.6", "TargetGameVersion": "", "Requirements": "", "RequirementNames": "", diff --git a/SourceCode/MainMod.cs b/SourceCode/MainMod.cs index 6e27dbf..2a75e69 100644 --- a/SourceCode/MainMod.cs +++ b/SourceCode/MainMod.cs @@ -11,7 +11,7 @@ namespace SimplifiedMoveset; -[BepInPlugin("SimplifiedMoveset", "SimplifiedMoveset", "2.4.5")] +[BepInPlugin("SimplifiedMoveset", "SimplifiedMoveset", "2.4.6")] public class MainMod : BaseUnityPlugin { // // meta data @@ -19,7 +19,7 @@ public class MainMod : BaseUnityPlugin { public static readonly string mod_id = "SimplifiedMoveset"; public static readonly string author = "SchuhBaum"; - public static readonly string version = "2.4.5"; + public static readonly string version = "2.4.6"; // // options diff --git a/SourceCode/PlayerMod.cs b/SourceCode/PlayerMod.cs index 2f6feae..abeea5e 100644 --- a/SourceCode/PlayerMod.cs +++ b/SourceCode/PlayerMod.cs @@ -943,6 +943,14 @@ public static void UpdateAnimation_StandOnBeam(Player player, Player_Attached_Fi if (player.input[0].y == -1) { player.canJump = 0; if (player.IsJumpPressed()) { + if (player.input[1].y == -1) { + // useful after switching beams; consistent with how hanging from beam works when + // holding up and pressing jump; + PrepareGetUpOnBeamAnimation(player, -1, attached_fields); + player.animationFrame = 0; + return; + } + // // same behavior as in UpdateAnimation_HangFromBeam(); copy&paste; // @@ -957,10 +965,13 @@ public static void UpdateAnimation_StandOnBeam(Player player, Player_Attached_Fi } // move down even when just holding down without pressing it; makes sense since - // you can't transition to this animation without beam climbing; - PrepareGetUpOnBeamAnimation(player, -1, attached_fields); - player.animationFrame = 0; - return; + // you can't transition to this animation without beam climbing; nevermind this + // does not work too well when switching beams => revert; + if (player.input[1].y == 0) { + PrepareGetUpOnBeamAnimation(player, -1, attached_fields); + player.animationFrame = 0; + return; + } } // grab nearby horizontal beams diff --git a/SourceCode/SimplifiedMoveset.csproj b/SourceCode/SimplifiedMoveset.csproj index 5889458..2e980fc 100644 --- a/SourceCode/SimplifiedMoveset.csproj +++ b/SourceCode/SimplifiedMoveset.csproj @@ -4,7 +4,7 @@ net48 enable 10.0 - 2.4.5 + 2.4.6