Typo fix & add drag encumberance setting

CHANGELOG.md

@@ -15,6 +15,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   - (this is needed so the spell does not make a noise or visual effect when cast)
 - Reduced the amount of false-positives with collision detection so the boat shouldn't get grounded in water as often
 - Increased height boat needs to be to be considered on land so it can be dragged in the water while water-walking
+- Added a new setting option: "Toggle Drag Encumberance"
+  - Enables/disables adding the Rowboat to the player's inventory (200 lb) when initiating dragging
 
 ## 0.1.1
 

Docs/Manual.xml

@@ -180,7 +180,6 @@ CollisionDetectZThreshold (10) - Height threshold for collision<br>
 ColliderOffset (300) - Distance forward from center for detection<br>
 ColliderOffsetReverse (350) - Distance backward from center for detection<br>
 ColliderMoveFreq (0.05) - How often to move collider<br>
-CollisionPosThreshold (1.0) - Ignore detection if this far off position<br>
 OverboardDistance (300) - Distance before "overboard" triggers<br>
 <br>
 Miscellaneous Enchantments:<br>

Docs/ModDesc.txt

@@ -167,7 +167,7 @@ CollisionDetectZThreshold (10) - Height threshold for collision
 ColliderOffset (300) - Distance forward from center for detection
 ColliderOffsetReverse (350) - Distance backward from center for detection
 ColliderMoveFreq (0.05) - How often to move collider
-CollisionPosThreshold (1.0) - Ignore detection if this far off position
+ColliderPosThreshold (1.0) - Ignore detection if this far off position
 OverboardDistance (300) - Distance before "overboard" triggers
 
 [b]Miscellaneous Enchantments:[/b]

ResultScripts/RYBQuestStage5InitDragging.psc

@@ -23,3 +23,4 @@ set RYB.DragTargetPitchMovingSmoothingFactor to 0.03
 set RYB.DragTargetPitchStoppedSmoothingFactor to 0.02
 set RYB.DragUphillZAdjustmentFactor to 6
 set RYB.DragDownhillZAdjustmentFactor to 4.5
+set RYB.DragEncumberanceEnabled to 1

Scripts/RYBMenuScript.psc

@@ -93,7 +93,7 @@ begin GameMode
         elseif (Choice == 6)
             set ChoosingInit to 0
             set ChoosingSettings to 1
-            MessageBox "Settings", "Toggle Rocking", "Toggle Player Weight", "Cancel"
+            MessageBox "Settings", "Toggle Drag Encumberance", "Toggle Rocking", "Toggle Player Weight", "Cancel"
             set Choice to GetButtonPressed
         elseif (Choice == 7)
             set ChoosingInit to 0
@@ -185,7 +185,7 @@ begin GameMode
         elseif (Choice == 4)
             set ChoosingOnLand to 0
             set ChoosingSettings to 1
-            MessageBox "Settings", "Toggle Rocking", "Toggle Player Weight", "Cancel"
+            MessageBox "Settings", "Toggle Drag Encumberance", "Toggle Rocking", "Toggle Player Weight", "Cancel"
             set Choice to GetButtonPressed
         elseif (Choice == 5)
             set ChoosingOnLand to 0
@@ -216,20 +216,33 @@ begin GameMode
         set Choice to GetButtonPressed
         if (Choice == 0)
             set ChoosingSettings to 0
-            if (RYB.RockingEnabled == 0)
+            if (RYB.DragEncumberanceEnabled == 0)
-                set RYB.RockingEnabled to 1
+                set RYB.DragEncumberanceEnabled to 1
+                Message "Drag encumberance enabled. You will be encumbered by the weight of the boat when dragging it."
             else
-                set RYB.RockingEnabled to 0
+                set RYB.DragEncumberanceEnabled to 0
+                Message "Drag encumberance disabled. You will not be encumbered by the weight of the boat when dragging it."
             endif
         elseif (Choice == 1)
             set ChoosingSettings to 0
-            if (RYB.PlayerWeightEnabled == 0)
+            if (RYB.RockingEnabled == 0)
-                set RYB.PlayerWeightEnabled to 1
+                set RYB.RockingEnabled to 1
+                Message "Rocking enabled. The boat will experience wave rocking motion when nearby and not grounded."
             else
-                set RYB.PlayerWeightEnabled to 0
+                set RYB.RockingEnabled to 0
+                Message "Rocking disabled. The boat will not experience wave rocking motion."
             endif
         elseif (Choice == 2)
             set ChoosingSettings to 0
+            if (RYB.PlayerWeightEnabled == 0)
+                set RYB.PlayerWeightEnabled to 1
+                Message "Player weight enabled. The boat rocking will react to the player's position on the boat."
+            else
+                set RYB.PlayerWeightEnabled to 0
+                Message "Player weight disabled. The boat rocking will not react to the player's position."
+            endif
+        elseif (Choice == 3)
+            set ChoosingSettings to 0
         endif
     endif
 end

Scripts/RYBQuestScript.psc

@@ -129,6 +129,7 @@ float DragTargetPitchMovingSmoothingFactor ; Additional smoothing factor on pitc
 float DragTargetPitchStoppedSmoothingFactor ; Additional smoothing factor on pitch applied while stopped (default: 0.02)
 float DragUphillZAdjustmentFactor ; How much to adjust Z based on angle when going uphill (default: 6.0)
 float DragDownhillZAdjustmentFactor ; How much to adjust Z based on angle when going downhill (default: 4.5)
+short DragEncumberanceEnabled ; 0 = disabled, 1 = enabled (default: 1)
 ; Boat drag angle calculation variables
 float dX
 float dY
@@ -313,6 +314,7 @@ begin GameMode
         set ModVersion to 0.2
         set ColliderPosThreshold to 1.0
         set LandZThreshold to 40.0
+        set DragEncumberanceEnabled to 1
     endif
 
     if (Resetting == -1)
@@ -437,7 +439,9 @@ begin GameMode
         if (Dragging == 0)
             set Dragging to 1
             set DragTargetPitchAngle to 0 ; smooth reset to 0 pitch
-            Player.AddItem RYBBoatToken 1
+            if (DragEncumberanceEnabled == 1)
+                Player.AddItem RYBBoatToken 1
+            endif
             set fQuestDelayTime to HighUpdateRate ; High update rate while dragging
             Seat.SetDestroyed 1
             BoatMarker.Disable

UE4SSScripts/FixRowboatDuplication.lua

@@ -270,7 +270,7 @@ NotifyOnNewObject("/Script/Engine.Actor", function(object)
     local className = string.match(objectName, "^([^%s]+)")
     local objectType = objectClassToTypes[className]
     if objectType then
-        log(string.upper(objectType) .. "Detected spawned object: " .. objectName)
+        log(string.upper(objectType) .. " Detected spawned object: " .. objectName)
         detectAndDeleteDuplicateObject(object, objectType)
     end
 end)