diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 7922455f728f939ff2a98d39bbc462e841b6c19a..04313e8e820fb679b355e5701548d8e1fec9fdf4 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -328,7 +328,7 @@
<<if $slaves[_i].health >= -60>>
<<set $slaves[_i].health -= 30>>
<<else>>
- <<set $slaves[_i].health -= Math.abs(90 - $slaves[_i].health)>>
+ <<set $slaves[_i].health = -90>>
<</if>>
<</if>>
<</if>>
@@ -451,7 +451,7 @@
<<if $slaves[_i].health >= -60>>
<<set $slaves[_i].health -= 30>>
<<else>>
- <<set $slaves[_i].health -= Math.abs(90 - $slaves[_i].health)>>
+ <<set $slaves[_i].health = -90>>
<</if>>
<</if>>
<</if>>
diff --git a/src/SecExp/proclamations.tw b/src/SecExp/proclamations.tw
index c4bd9ba2199df0351169053fc0c9a92d4da9c455..491172fbd437144092782825abf17ace315e0d29 100644
--- a/src/SecExp/proclamations.tw
+++ b/src/SecExp/proclamations.tw
@@ -5,20 +5,32 @@
You can dedicate the week to issue a proclamation, a powerful tool that will have an immediate noticeable effect on the arcology.
You will use <<print $proclamationCurrency>> to enact it<<if $proclamationType != "none">> and will be about $proclamationType.<<else>>.<</if>>
<br>
-<<link "Use authority">>
- <<set $proclamationCurrency = "authority">>
- <<goto "proclamations">>
-<</link>>
+<<if $authority >= 2000>>
+ <<link "Use authority">>
+ <<set $proclamationCurrency = "authority">>
+ <<goto "proclamations">>
+ <</link>>
+<<else>>
+ //Requires at least 2000 authority//
+<</if>>
|
-<<link "Use reputation">>
- <<set $proclamationCurrency = "reputation">>
- <<goto "proclamations">>
-<</link>>
+<<if $rep >= 4000>>
+ <<link "Use reputation">>
+ <<set $proclamationCurrency = "reputation">>
+ <<goto "proclamations">>
+ <</link>>
+<<else>>
+ //Requires at least 4000 reputation//
+<</if>>
|
-<<link "Use cash">>
- <<set $proclamationCurrency = "cash">>
- <<goto "proclamations">>
-<</link>>
+<<if $cash >= 8000>>
+ <<link "Use cash">>
+ <<set $proclamationCurrency = "cash">>
+ <<goto "proclamations">>
+ <</link>>
+<<else>>
+ //Requires at least ¤8000 in cash//
+<</if>>
<br>
<br>
<<link "Issue a proclamation about security">>
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index aece01250a03a63e5a5513bcf57d8d42710f1eff..abf06acd3807538563825402992f1c31020c0242 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -28,7 +28,7 @@
You take a look at the bound toy.
<<if $activeSlave.mother == $slaverapistx.ID>>
- <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.sexualQuirk == "perverted")>>
<<if ($activeSlave.energy > 60)>>
$activeSlave.slaveName is looking up at her mother, fully naked, her pussy visible and captivating. Her breathing is fast and her nipples hard.
<<else>>
@@ -38,7 +38,7 @@ You take a look at the bound toy.
$activeSlave.slaveName looks with horror at her mother, knowing what will soon happen.
<</if>>
<<elseif $slaverapistx.mother == $activeSlave.ID>>
- <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.sexualQuirk == "perverted")>>
<<if ($activeSlave.energy > 60)>>
$activeSlave.slaveName is looking up at her daughter, fully naked, her pussy visible and captivating. Her breathing is fast and her nipples hard.
<<else>>
@@ -48,7 +48,7 @@ You take a look at the bound toy.
$activeSlave.slaveName looks with horror at her daughter, knowing what will soon happen.
<</if>>
<<elseif (areSisters($activeSlave, $slaverapistx) > 0)>>
- <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.sexualQuirk == "perverted")>>
<<if ($activeSlave.energy > 60)>>
$activeSlave.slaveName seems paralyzed with fear, but her nipples are already hard and her face flushed. Secretly, she may want this.
<<else>>
@@ -58,7 +58,7 @@ You take a look at the bound toy.
$activeSlave.slaveName looks with horror at her sister, knowing what will soon happen.
<</if>>
- <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.sexualQuirk == "perverted")>>
<<if ($slaverapistx.energy > 60)>>
$slaverapistx.slaveName is looking down at her sister's bound and helpless form with a look of hunger.
<<else>>
@@ -117,7 +117,7 @@ You take a look at the bound toy.
<<if $activeSlave.mother == $slaverapistx.ID>>
- <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.sexualQuirk == "perverted")>>
<<if ($slaverapistx.attrXX > 60)>>
$slaverapistx.slaveName, on the other hand, is well aware that she is about to rape her own daughter, and seems quite eager.
<<else>>
@@ -127,7 +127,7 @@ You take a look at the bound toy.
$slaverapistx.slaveName, on the other hand, is well aware that she is about to rape her own daughter and is understandably disturbed.
<</if>>
<<elseif $slaverapistx.mother == $activeSlave.ID>>
- <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.sexualQuirk == "perverted")>>
<<if ($slaverapistx.attrXX > 60)>>
$slaverapistx.slaveName, on the other hand, is well aware that she is about to rape her own mother, and seems quite eager.
<<else>>
diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw
index b654b0a5eb7a7aa5b6bd519911e74aaf76799fde..086c634bcda36dd503fceb11d1b20d0c6b5d4467 100644
--- a/src/pregmod/fSlaveSlaveVagConsummate.tw
+++ b/src/pregmod/fSlaveSlaveVagConsummate.tw
@@ -29,7 +29,7 @@ You take a look at the slave you selected.
<<if $activeSlave.mother == $slaverapistx.ID>>
- <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.sexualQuirk == "perverted")>>
<<if ($slaverapistx.energy > 60)>>
$slaverapistx.slaveName is well aware that she is about to rape her own daughter, but despite that seems eager to do it.
<<else>>
@@ -41,7 +41,7 @@ You take a look at the slave you selected.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
- <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.sexualQuirk == "perverted")>>
<<if ($slaverapistx.energy > 60)>>
$slaverapistx.slaveName is well aware that she is about to rape her own mother, but despite that seems eager to do it.
<<else>>
@@ -53,7 +53,7 @@ You take a look at the slave you selected.
<</if>>
<<if (areSisters($activeSlave, $slaverapistx) > 0)>>
- <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.sexualQuirk == "perverted")>>
<<if ($slaverapistx.energy > 60)>>
$slaverapistx.slaveName is looking down at her sister's helpless form and inviting pussy with a look of hunger.
<<else>>
@@ -110,7 +110,7 @@ You take a look at the slave you selected.
Next, you see to $activeSlave.slaveName.
<<if $activeSlave.mother == $slaverapistx.ID>>
- <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.sexualQuirk == "perverted")>>
<<if ($activeSlave.energy > 60)>>
$activeSlave.slaveName is looking up at her mother, fully naked, her <<if $slaverapistx.dick > 0>>_dicksize penis<<elseif ($slaverapistx.clit >= 4)>>massive clit<<else>>strap-on<</if>> standing firm despite her rapid breathing. She is flushed and her pussy moist.
<<else>>
@@ -122,7 +122,7 @@ Next, you see to $activeSlave.slaveName.
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
- <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.sexualQuirk == "perverted")>>
<<if ($activeSlave.energy > 60)>>
$activeSlave.slaveName is looking up at her daughter, fully naked, her <<if $slaverapistx.dick > 0>>_dicksize penis<<elseif ($slaverapistx.clit >= 4)>>massive clit<<else>>strap-on<</if>> standing firm despite her rapid breathing. She is flused and her pussy moist.
<<else>>
@@ -134,7 +134,7 @@ Next, you see to $activeSlave.slaveName.
<</if>>
<<if (areSisters($activeSlave, $slaverapistx) > 0)>>
- <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.sexualQuirk == "perverted")>>
<<if ($activeSlave.energy > 60)>>
$activeSlave.slaveName seems paralyzed with fear, but her nipples are already hard and her face flushed. Her eyes are fixed on the <<if $slaverapistx.dick > 0>>_dicksize dick<<elseif ($slaverapistx.clit >= 4)>>massive clit<<else>>strap-on<</if>> above her.
<<else>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index d47e1f15c2ccce10230cbb03bfab0eb1847ebada..293bb1cb2e311a41e12802359db1dd1a33fec50a 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -252,11 +252,11 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
extremely weak.
<</if>>
Her breasts are projected to be
- <<if $tanks[$i].boobs >= 799>>
+ <<if $tanks[$i].boobs <= 799>>
of normal size,
- <<elseif $tanks[$i].boobs >= 1799>>
+ <<elseif $tanks[$i].boobs <= 1799>>
of generous size,
- <<elseif $tanks[$i].boobs >= 3249>>
+ <<elseif $tanks[$i].boobs <= 3249>>
of incredible size,
<<else>>
of humongous size,
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index aed7452c82e18e173d321574a7684de3528e5e5f..2d731419acb1be9cf1b26ae8a38ebb44d0f0de1c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5911,11 +5911,11 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<set $penetrativeTotal++>>
<<if canImpreg($activeSlave, $slaves[_RESS])>>
<<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>>
- <<KnockMeUp 5 2 $slaves[_RESS].ID>>
+ <<KnockMeUp $activeSlave 5 2 $slaves[_RESS].ID>>
<<elseif canDoVaginal($activeSlave)>>
- <<KnockMeUp 5 0 $slaves[_RESS].ID>>
+ <<KnockMeUp $activeSlave 5 0 $slaves[_RESS].ID>>
<<elseif canDoAnal($activeSlave)>>
- <<KnockMeUp 5 1 $slaves[_RESS].ID>>
+ <<KnockMeUp $activeSlave 5 1 $slaves[_RESS].ID>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index b897ab2ca895bd7685310264ee44752639e3b3f1..139079ad2f3bf9f5adad729582ec66e24b314757 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1503,7 +1503,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<</if>>
<<set _rets = $slaves.findIndex(function(s) { return s.ID == $subSlave.ID; })>>
- <<set $slaves[_rets].analCount++, $slaves[$i].oralCount++, $slaves[$i].trust -= 4, $slaves[$i].devotion += 4>>
+ <<set $slaves[_rets].analCount++, $slaves[_rets].oralCount++, $slaves[_rets].trust -= 4, $slaves[_rets].devotion += 4>>
<<set $analTotal++, $oralTotal++>>
<<if canPenetrate($activeSlave) && canImpreg($slaves[_rets], $activeSlave)>>
<<KnockMeUp $slaves[_rets] 20 1 $activeSlave.ID 1>>
@@ -1677,7 +1677,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<KnockMeUp $slaves[_rets] 5 1 -1 1>>
<</if>>
<</if>>
- <<set $slaves[$i].analCount++, $slaves[$i].penetrativeCount++, $slaves[$i].devotion += 4>>
+ <<set $slaves[_rets].analCount++, $slaves[_rets].penetrativeCount++, $slaves[_rets].devotion += 4>>
<<set $analTotal++, $penetrativeTotal++>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 49881501665f5a84e016393fabb53e9074bc3d6a..bd6d476aad6b3b3efdf2aaa017f744db761ce2a9 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -386,7 +386,7 @@
<<elseif $proclamationCurrency == "reputation">>
<<set $rep = Math.clamp($rep - 4000,0,20000)>>
<<else>>
- <<set $cash = Math.clamp($cash - 8000,0,20000)>>
+ <<set $cash -= 8000>>
<</if>>
<<elseif $proclamationType == "crime">>
force the arrest of many suspected citizens. Their personal power allowed them to avoid justice for a long time, but this day is their end. @@.green;Your crime greatly decreased@@.
@@ -396,7 +396,7 @@
<<elseif $proclamationCurrency == "reputation">>
<<set $rep = Math.clamp($rep - 4000,0,20000)>>
<<else>>
- <<set $cash = Math.clamp($cash - 8000,0,20000)>>
+ <<set $cash -= 8000>>
<</if>>
<</if>>
<<set $proclamationsCooldown = 4, $personalAttention = "business">>