Merge pull request #28 from ZioPao/main

back merge from main to dev

README.md

@@ -7,7 +7,7 @@
   <img src='https://img.shields.io/badge/Steam-000000?style=for-the-badge&logo=steam&logoColor=white' />        
 </a>
 </p>
-# You're bitten. You have two choices.
+You're bitten. You have two choices.
 Wait until you succumb to the virus or take matters into your hands. Cut off that infected part and live to die another day.
 
 This version of **The Only Cure** has been rebuilt from scratch to support future additions and to feel as close as possible as a vanilla mechanic.
@@ -16,7 +16,6 @@ This version of **The Only Cure** has been rebuilt from scratch to support futur
 
 Supports **Single Player** and **Multiplayer**!
 
-
 # Setup
 Use it with the following mods for the intended experience:
 - [Fancy Handwork](https://steamcommunity.com/sharedfiles/filedetails/?id=2904920097)
@@ -50,6 +49,9 @@ The main difference between the twos is that your actions will take longer with
 
 When you equip a prosthetic limb, you will slowly gain familiarity with it, making actions more speedy in due time.
 
+## Admin tools
+If something strange happened, an admin can reset TOC mechanics on any player by right clicking on them and select _"Reset Amputations"_. They could also do the opposite by clicking on _"Force Amputation"_ for each amputable limb.
+
 # Credits
 |  |  |
 | ------------- | ------------- |

dev_stuff/CheckList.txt

@@ -1,19 +0,0 @@
-
-1) Can cut every limb in SP
-2) Does cutting a limb cure infection 
-3) If I get bit in the hand, will cutting the forearm cure the infection?
-4) Both forearm bit, cut everyone, infection cured?
-5) Can I operate myself?
-6) Can I equip a prost?
-7) Can i unequip a prost?
-
-
-
-MP TEST
-1) Everything up there but in mp env
-
-
-
-
---------------------------
-- traits are kinda broken, cant reset them 

dev_stuff/steam_desc.txt

@@ -1,11 +1,12 @@
 [img]https://raw.githubusercontent.com/ZioPao/The-Only-Cure/551125bb50cb65608ad89ca81ef0daccb3b02c4c/dev_stuff/logos/title.png[/img]
 
-[h1]You're bitten. You only have two choices.[/h1]
-Wait until you succumb to the virus or take matters into your own hands.
 
-By that we mean, cut that thing off before it kills you!
+[h1]You're bitten. You have two choices.[/h1]
+Wait until you succumb to the virus or take matters into your hands. Cut off that infected part and live to die another day.
 
-This version of [b]The Only Cure[/b] has been rebuilt from scratch to support future additions.
+This version of [b]The Only Cure[/b] has been rebuilt from scratch to support future additions and to feel as close as possible as a vanilla mechanic.
+
+[b]The older version will be delisted shortly and it will not be supported anymore.[/b]
 
 Supports [b]Single Player[/b] and [b]Multiplayer[/b]!
 
@@ -16,20 +17,25 @@ Use it with the following mods for the intended experience:
 [*] [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2934621024]Brutal Handwork[/url]
 [/list]
 
+[hr][/hr]
+
 [h1]Quick guide[/h1]
 [h2]Amputation[/h2]
 Get a [i]Saw[/i] or a [i]Garden Saw[/i], right click on it, and choose which limb to amputate. You can also drag n' drop your Saw item directly into the afflicted area to start cutting it off.
 
-If you have a tourniquet, place it on the correct side to dampen the amount of damage you will take after you're done amputating the limb.
+If you have some [i]bandages[/i] and\or [i]stitches[/i] in your inventory you will automatically use them, multiplying the chances of your survival.
+If you have a [i]tourniquet[/i], place it on the correct side to dampen the amount of damage you will take after you're done amputating the limb.
 
-Keep in mind that if you amputate your upper arm, you won't be able to equip any prosthesis.
+Keep in mind that if you amputate your [b]upper arm[/b], you won't be able to equip any prosthesis.
+
+After you've amputated a limb, you will gain [b]skill points[/b] for the amputated side, making timed actions faster in due time.
 
 [h2]Cicatrization[/h2]
 You can check the cicatrization status of an amputated limb from your [b]Health Panel[/b]
 From time to time, you should clean your wounds with a bandage to help the cicatrization process.
 If your limb isn't completely cicatrized, you can still equip prosthetic limbs, but that can trigger random bleedings from that area.
 
-[h2]Prosthesis[/h2]
+[h2]Prosthetics[/h2]
 If you're missing a hand, you won't be able to do a lot of things, such as equipping two-handed weapons. With prosthetics limbs, you can fix that.
 There are two prosthesis type that can be crafted\found in medical areas:
 [list]
@@ -38,14 +44,19 @@ There are two prosthesis type that can be crafted\found in medical areas:
 [/list]
 
 The main difference between the twos is that your actions will take longer with the Hook Prosthesis.
+When you equip a prosthetic limb, you will slowly gain skill points in the [b]Prosthesis Familiarity[/b] perk, making actions more speedy in due time.
+
+[h2]Admin tools[/h2]
+If something strange happened, an admin can reset TOC mechanics on any player by right clicking on them and select [i]"Reset Amputations"[/i]. They could also do the opposite by clicking on [i]"Force Amputation"[/i] for each amputable limb.
+
+[hr][/hr]
+
+[h1]Issues and bugs?[/h1]
+Got any issues or found some pesky bugs? Report them on GitHub!
 
-[h1]Issues[/h1]
-Got any issues? Report them on GitHub!
 [url=https://github.com/ZioPao/The-Only-Cure][img]https://img.shields.io/badge/GitHub-100000?style=for-the-badge&logo=github&logoColor=white[/img][/url]
 
-
 [h1]Credits[/h1]
-
 [table]
   [tr]
     [th]Pao[/th]
@@ -65,13 +76,9 @@ Got any issues? Report them on GitHub!
   [/tr]
 [/table]
 
-[hr]
+[hr][/hr]
 
 [h1]Want to support me?[/h1]
 [url=https://ko-fi.com/M4M7IERNW][img]https://storage.ko-fi.com/cdn/kofi3.png[/img][/url]
 
-[hr]
+[hr][/hr]
-
-
-Workshop ID: 3236152598
-Mod ID: TheOnlyCure

media/lua/client/TOC/Controllers/LimitActionsController.lua

@@ -268,7 +268,7 @@ end
 local function CheckLimbFeasibility(limbName)
     local dcInst = DataController.GetInstance()
     local isFeasible = not dcInst:getIsCut(limbName) or dcInst:getIsProstEquipped(limbName)
-    TOC_DEBUG.print("isFeasible="..tostring(isFeasible))
+    --TOC_DEBUG.print("isFeasible="..tostring(isFeasible))
     return isFeasible
 end
 

media/lua/client/TOC/Controllers/TourniquetController.lua

@@ -71,11 +71,13 @@ function TourniquetController.WrapClothingAction(obj, wrappedFunc)
         group:setMultiItem(TourniquetController.bodyLoc, false)
     end
 
-    wrappedFunc(obj)
+    local ogValue = wrappedFunc(obj)
 
     if isTourniquet then
         group:setMultiItem(TourniquetController.bodyLoc, true)
     end
+
+    return ogValue      -- Needed for isValid
 end
 
 
@@ -98,12 +100,12 @@ end
 
 local og_ISWearClothing_isValid = ISWearClothing.isValid
 function ISWearClothing:isValid()
-    TourniquetController.WrapClothingAction(self, og_ISWearClothing_isValid)
+    return TourniquetController.WrapClothingAction(self, og_ISWearClothing_isValid)
 end
 
 local og_ISUnequipAction_perform = ISUnequipAction.perform
 function ISUnequipAction:perform()
-    TourniquetController.WrapClothingAction(self, og_ISUnequipAction_perform)
+   return TourniquetController.WrapClothingAction(self, og_ISUnequipAction_perform)
 end
 
 

mod.info

@@ -4,5 +4,5 @@ description=Bitten? Not a problem!
 id=TheOnlyCure
 icon=icon.png
 url=https://github.com/ZioPao/The-Only-Cure
-modversion=2.0
+modversion=2.0.1
 pzversion=41.65