From 2375389ae50199cb9d69b363ab0ad522f41b6100 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 19 Apr 2017 23:29:08 -0400 Subject: [PATCH] Fixes. --- src/npc/descriptions/fVagina.tw | 1 - src/uncategorized/BackwardsCompatibility.tw | 6 ++++++ src/uncategorized/saServeThePublic.tw | 2 +- src/uncategorized/saWhore.tw | 2 +- src/utility/artWidgets.tw | 6 +++--- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw index 48d9320d522..3c37d9f699c 100644 --- a/src/npc/descriptions/fVagina.tw +++ b/src/npc/descriptions/fVagina.tw @@ -390,4 +390,3 @@ You decide to fuck her <</if>> <</for>> <</if>> -<</nobr>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 75e47b99cda..2d7509ed5c4 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -32,6 +32,12 @@ <<if ndef $foodCost>> <<set $foodCost to 25>> <</if>> +<<if ndef $fixedNationality>> + <<set $fixedNationality = 0>> +<</if>> +<<if ndef $fixedRace>> + <<set $fixedRace = 0>> +<</if>> <<if ndef $RulesID>> <<set $RulesID to 3>> diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 0cf26a31a22..8d0aecd0774 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -263,7 +263,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau <<set $slaves[$i].health -= 7>> <<set $injury = 1>> <<elseif ($slaves[$i].vagina < 0)>> - <<slaveTitle $slaves[$i]>> + <<SlaveTitle $slaves[$i]>> <<if (($slaves[$i].analSkill + $slaves[$i].oralSkill) >= 200)>> She's such an expert public servant that she copes with the stress of being a $desc slut. <<elseif random(1,100) > 40+(10*($slaves[$i].analSkill + $slaves[$i].oralSkill))>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index c440863d5e1..30a1c66fcf9 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -251,7 +251,7 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da <<set $slaves[$i].health -= 7>> <<set $injury = 1>> <<elseif ($slaves[$i].vagina < 0)>> - <<slaveTitle $slaves[$i]>> + <<SlaveTitle $slaves[$i]>> <<if (($slaves[$i].analSkill + $slaves[$i].oralSkill) >= 200)>> She's such an expert whore that she copes with the stress of being a $desc prostitute. <<elseif random(1,100) > 40+(10*($slaves[$i].analSkill + $slaves[$i].oralSkill))>> diff --git a/src/utility/artWidgets.tw b/src/utility/artWidgets.tw index c994de732f0..2a1401590e6 100644 --- a/src/utility/artWidgets.tw +++ b/src/utility/artWidgets.tw @@ -60,7 +60,7 @@ $args[2]: icon UI Display for vector art, 1 for on. <<elseif $args[1] == 2>> <<print "<img src=" + _fileName + "style='float:right; border:3px hidden' width='300' height='300'/>">> <<elseif $args[1] == 1>> - <<if $seeSummaryImages != 0>><<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">><</if>> + <<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">> <<else>> <<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='120' height='120'/>">> <</if>> @@ -68,7 +68,7 @@ $args[2]: icon UI Display for vector art, 1 for on. <<elseif $imageChoice == 1>> /* VECTOR ART BY NOX */ <<if $args[1] != 0>> /* IMAGE DOES NOT HAVE TO BE TINY */ -<<if ($args[1] != 1) || ($seeSummaryImages != 0)>> /* IMAGE IS NOT PART OF A LIST, OR IMAGES ARE TO BE DISPLAYED IN LISTS */ +<<if $args[1] != 1>> /* IMAGE IS NOT PART OF A LIST, OR IMAGES ARE TO BE DISPLAYED IN LISTS */ /* 000-250-006 */ /* <div class="imageRef"> */ @@ -514,7 +514,7 @@ $args[2]: icon UI Display for vector art, 1 for on. <<elseif $args[1] == 2>> <<print "<img src=" + _fileName + "style='float:right; border:3px hidden' width='300' height='300'/>">> <<elseif $args[1] == 1>> - <<if $seeSummaryImages != 0>><<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">><</if>> + <<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">> <<else>> <<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='120' height='120'/>">> <</if>> -- GitLab