From 34e2593579b2222e9ce1cb358ad9840392dfbeac Mon Sep 17 00:00:00 2001 From: Enty <36716-Enty@users.noreply.gitgud.io> Date: Fri, 9 Dec 2022 03:15:12 -0500 Subject: [PATCH 1/2] updated mod stats to show in new JoJo foldout --- game/base-system/overlays/statistics.twee | 46 ++++++++++++++--------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/game/base-system/overlays/statistics.twee b/game/base-system/overlays/statistics.twee index 176bcf6c15..c9a57499db 100644 --- a/game/base-system/overlays/statistics.twee +++ b/game/base-system/overlays/statistics.twee @@ -1,6 +1,35 @@ :: Statistics [widget] <<widget "statistics">> +/*alter */ +<<foldout false "_jojoFoldout">> + <span class="gold">JoJo</span> + Fights entered: $fightjob + <br> + Hamon affinity: <<if $hamon.build lte 0>>None<<elseif $hamon.build lt 10>>Too low<<elseif $hamon.build lt 20>>Stage 1<<elseif $hamon.build lt 30>>Stage 2<<elseif $hamon.build lt 40>>Stage 3<<elseif $hamon.build lt 40>>Stage 3<<elseif $hamon.build lt 50>>Stage 4<<elseif $hamon.build lt 60>>Stage 5<<else>>Last stage<</if>> + <br> + Hamon prowess: <<print Math.trunc($hamon.active)>>/6 + <br> + Mask put on: <<if $vampire.build lte 0>>No<<else>>Yes<</if>> + <br> + Vampire manifestation: <<print Math.trunc($vampire.active)>>/1 + <br> + Fighting spirit: <<if $stand.build lt 1>>None<<elseif $stand.build lt 10>>Low<<else>>High<</if>> + <br> + Stand manifestation: <<print Math.trunc($stand.active)>>/2 + <br> + <<if $arakimode is true>> + People killed: $killstat + <ul> + <li>In Town: $corpses.town.all</li> + <li>In the Forest: $corpses.forest.all</li> + <li>In the Plains: $corpses.plains.all</li> + <li>In the sea: $corpses.sea.all</li> + </ul> + <</if>> + <br> +<</foldout>> + <<foldout false "_virginitiesFoldout">> <span class="gold">Virginities</span> <<if $player.vaginaExist>> @@ -93,9 +122,6 @@ Wild plants picked: $wild_plant_stat <br> Aphrodisiacs sold: $stat_aphrodisiacs_sold - /*alter*/ - <br> - Fights entered: $fightjob <br><br> <</foldout>> @@ -669,20 +695,6 @@ Fallen manifestation: <<print ($fallenangel is undefined ? 0 : Math.trunc($fallenangel))>> <br><br> - /*alter9 active for build??*/ - Hamon affinity: <<if $hamon.build lte 0>>None<<elseif $hamon.build lt 10>>Too low<<elseif $hamon.build lt 20>>Stage 1<<elseif $hamon.build lt 30>>Stage 2<<elseif $hamon.build lt 40>>Stage 3<<elseif $hamon.build lt 40>>Stage 3<<elseif $hamon.build lt 50>>Stage 4<<elseif $hamon.build lt 60>>Stage 5<<else>>Last stage<</if>> - <br> - Hamon prowess: <<print Math.trunc($hamon.active)>>/6 - <br> - Mask put on: <<if $vampire.build lte 0>>No<<else>>Yes<</if>> - <br> - Vampire manifestation: <<print Math.trunc($vampire.active)>>/1 - <br> - Fighting spirit: <<if $stand.build lt 1>>None<<elseif $stand.build lt 10>>Low<<else>>High<</if>> - <br> - Stand manifestation: <<print Math.trunc($stand.active)>>/2 - <br> - <br> <</foldout>> <<foldout false "_violenceFoldout">> -- GitLab From 98ab441bfb7d95dc5392bf7d7d892d815eb4cadf Mon Sep 17 00:00:00 2001 From: Enty <36716-Enty@users.noreply.gitgud.io> Date: Fri, 9 Dec 2022 03:32:59 -0500 Subject: [PATCH 2/2] fixed bug that forced prison each time --- game/overworld-town/loc-police/arrest.twee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/overworld-town/loc-police/arrest.twee b/game/overworld-town/loc-police/arrest.twee index e81d4af611..5fcd639e81 100644 --- a/game/overworld-town/loc-police/arrest.twee +++ b/game/overworld-town/loc-police/arrest.twee @@ -290,7 +290,7 @@ After an hour, a <<generatePolice 1>><<person1>><<person>> in a police uniform a <br><br> /*alter*/ -<<if corpsesTotal() gte corpsesLost()>> +<<if corpsesTotal() gt corpsesLost()>> <<set $caught_for_killing to true>> <<if $crime gte 5000>> Once seated, the <<person2>><<person>> continues. "You are seriously dangerous. <span class="red">There is no other option besides prison for you.</span> I sentence you to <span class="red"><<print Math.trunc($crime / 100)>></span> days." <<He>> stamps a document in front of <<him>>. "Get this wretch out of my sight." -- GitLab