From 0bf7b3ad16fafd0317a36093fa3fcb08c827f91b Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 5 Oct 2018 22:22:56 -0400 Subject: [PATCH] fixes --- src/cheats/mod_EditSlaveCheat.tw | 5 ++++- src/cheats/mod_editSlaveCheatNew.tw | 4 +++- src/npc/startingGirls/startingGirls.tw | 4 +++- src/uncategorized/pRivalryHostage.tw | 4 ++-- src/uncategorized/saLongTermEffects.tw | 2 +- src/uncategorized/saTakeClasses.tw | 4 ++-- src/utility/slaveCreationWidgets.tw | 3 ++- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index 1dc50e380eb..d9da6d38372 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -1113,7 +1113,9 @@ Unskilled. <br> ''Education (0 to 30):'' -<<if $tempSlave.intelligenceImplant >= 15>> +<<if $tempSlave.intelligenceImplant >= 30>> + @@.deepskyblue;Well educated.@@ +<<elseif $tempSlave.intelligenceImplant >= 15>> @@.deepskyblue;Educated.@@ <<else>> @@.yellow;Uneducated@@. @@ -1122,6 +1124,7 @@ Unskilled. <br> <<radiobutton "$tempSlave.intelligenceImplant" 0>> Uneducated <<radiobutton "$tempSlave.intelligenceImplant" 15>> Educated +<<radiobutton "$tempSlave.intelligenceImplant" 30>> Well Educated <br><br> diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index a3b7645ce7b..4b8828269a3 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -2875,7 +2875,9 @@ <<radiobutton "$tempSlave.intelligence" 100>> Brilliant <br> ''Education (0 to 30):'' - <<if $tempSlave.intelligenceImplant >= 15>> + <<if $tempSlave.intelligenceImplant >= 30>> + @@.deepskyblue;Well Educated.@@ + <<elseif $tempSlave.intelligenceImplant >= 15>> @@.deepskyblue;Educated.@@ <<else>> @@.yellow;Uneducated@@. diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index c45288e7978..78e510a1c3e 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -1186,10 +1186,12 @@ Her nationality is $activeSlave.nationality. <br>''Education:'' <span id="intelligenceImplant"> -<<if $activeSlave.intelligenceImplant >= 10>>@@.deepskyblue;Educated.@@ +<<if $activeSlave.intelligenceImplant >= 30>>@@.deepskyblue;Well educated.@@ +<<elseif $activeSlave.intelligenceImplant >= 15>>@@.deepskyblue;Educated.@@ <<else>>Uneducated. <</if>> </span> +<<link "Wll educated">><<set $activeSlave.intelligenceImplant = 30>><<replace "#intelligenceImplant">>@@.deepskyblue;Well educated.@@<</replace>><<StartingGirlsCost>><</link>> | <<link "Educated">><<set $activeSlave.intelligenceImplant = 15>><<replace "#intelligenceImplant">>@@.deepskyblue;Educated.@@<</replace>><<StartingGirlsCost>><</link>> | <<link "Uneducated">><<set $activeSlave.intelligenceImplant = 0>><<replace "#intelligenceImplant">>Uneducated.<</replace>><<StartingGirlsCost>><</link>> diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index 1f0f6367582..f62d2dd1faa 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -45,7 +45,7 @@ Only a few days into your inter-arcology war, you receive a video message from y <<set $activeSlave.actualAge = random(18,24)>> <</if>> <<set $activeSlave.face = 100>> - <<set $activeSlave.intelligence = radom(51,95)>> + <<set $activeSlave.intelligence = random(51,95)>> <<set $activeSlave.intelligenceImplant = 0>> <<set $activeSlave.oralSkill = 100>> <<set $activeSlave.entertainSkill = 100>> @@ -182,7 +182,7 @@ Only a few days into your inter-arcology war, you receive a video message from y <<set $activeSlave.actualAge = random(18,24)>> <</if>> <<set $activeSlave.face = 100>> - <<set $activeSlave.intelligence = radom(51,95)>> + <<set $activeSlave.intelligence = random(51,95)>> <<set $activeSlave.intelligenceImplant = 0>> <<set $activeSlave.oralSkill = 100>> <<set $activeSlave.entertainSkill = 100>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 3829289cc75..2ae357c246d 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -7963,7 +7963,7 @@ <<elseif $slaves[$i].speechRules == "language lessons">> <<set _minweeks = 10 - Math.trunc(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)>> <<else>> - <<set _minweeks = 20 - Math.trunc(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10))>> + <<set _minweeks = 20 - Math.trunc(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)>> <</if>> <<if $slaves[$i].voice == 0 || $slaves[$i].lips > 95>> /* can't speak, but slowly picks up language */ <<set _minweeks += 30>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 27609459bcf..c735e753cba 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -191,14 +191,14 @@ <<else>> in furthering $his education. <</if>> - <<set $slaves[$i].intelligenceImplant += 0.5*_learning>> + <<set $slaves[$i].intelligenceImplant += 1*_learning>> <<if ($slaves[$i].intelligenceImplant >= 30)>> <<set $slaves[$i].intelligenceImplant = 30>> $He has completed $his advanced education, and for most purposes $he has become @@.deepskyblue;more intelligent.@@ <</if>> <<elseif ($slaves[$i].intelligenceImplant < 15) && ($slaves[$i].assignment == "take classes")>> $He makes some progress towards a basic education. - <<set $slaves[$i].intelligenceImplant += 0.5*_learning>> + <<set $slaves[$i].intelligenceImplant += 1*_learning>> <<if ($slaves[$i].intelligenceImplant >= 15)>> <<set $slaves[$i].intelligenceImplant = 15>> $He has completed a course of slave education, and for most purposes $he has become @@.deepskyblue;more intelligent.@@ diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index ba0e6bb6335..53c550bf7a4 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -560,7 +560,8 @@ <</replace>> <<replace "#intelligenceImplant">> - <<if $activeSlave.intelligenceImplant >= 15>>@@.deepskyblue;Educated.@@ + <<if $activeSlave.intelligenceImplant >= 30>>@@.deepskyblue;Well educated.@@ + <<elseif $activeSlave.intelligenceImplant >= 15>>@@.deepskyblue;Educated.@@ <<else>>Uneducated. <</if>> <</replace>> -- GitLab