diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 4841228205837417ec6111f586f2730f943f84e9..2897ebcb939b9c5eed59c8f67480f6110ce4e498 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4850,4 +4850,6 @@ Pregmod 0.10.3.0 192 -anon's leadership slave skills -fixes - \ No newline at end of file + + 193 + -fixes \ No newline at end of file diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 5ce945be2d01fb1bf392d87c1f20054789845db7..b052129dc7832913802c4a2ba56f6fad0554f83e 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2593,6 +2593,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr <br>''MilkAnon'' for his contributions to FCTV and the FC world in general. <br>''valen102938'' for dealing with vector art, both creating new art and utilising unused art. <br>''anon'' for making slaves seed their own fields. +<br>''Ansopedi'' for slave career skills. <br>''Bane70'' optimized huge swaths of code with notable professionalism. <br>''Circle Tritagonist'' provided several new collars and outfits. <br>''Qotsafan'' submitted bugfixes. diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index 040e82f8c03c8a4c29fc90a54b7d3b4ba1f3fd1c..80d851e700ce1fb4e307b866752e5a32eed351a2 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -1,6 +1,6 @@ :: SA rules [nobr] -<<swich $slaves[$i].assignment>> +<<switch $slaves[$i].assignment>> <<default>> <<if $slaves[$i].fuckdoll == 0>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 305b8d7da88f49065e242f314bf49cecbfd997e0..913a1604259e37019ead4009ac983b7d7321de15 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -3598,7 +3598,7 @@ Your brand design is ''$brandDesign.'' <<if _combinedRule.growth.butt != "no default setting">> <<if $args[0].butt < _combinedRule.growth.butt>> <<set _priority = {drug: "butt injections", weight: (_combinedRule.growth.butt-$args[0].butt)/_combinedRule.growth.butt}, _priorities.push(_priority)>> - <<elseif ($args[0].butt > _combinedRule.growth.butt+.5) && $args[0].weight < 100 && ($arcologies[0].FSSlimnessEnthusiastResearch == 1)>> + <<elseif (Math.trunc($args[0].butt) > _combinedRule.growth.butt) && $args[0].weight < 100 && ($arcologies[0].FSSlimnessEnthusiastResearch == 1)>> <<set _priority = {drug: "butt redistributors", weight: (1+(($args[0].butt-$args[0].buttImplant-_combinedRule.growth.butt)/_combinedRule.growth.butt))}, _priorities.push(_priority)>> <</if>> <</if>> @@ -3729,7 +3729,7 @@ Your brand design is ''$brandDesign.'' <</if>> <</if>> <<if _combinedRule.growth.butt != "no default setting">> - <<if $args[0].butt-$args[0].buttImplant > _combinedRule.growth.butt && $args[0].weight < 100>> + <<if Math.trunc($args[0].butt-$args[0].buttImplant) > _combinedRule.growth.butt && $args[0].weight < 100>> <<if $args[0].drugs != "butt redistributors">> <<set $args[0].drugs = "butt redistributors">> <br>$args[0].slaveName has been put on $args[0].drugs.