From ae3474a1da3953c440548757556c898aeb926d3c Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 27 Jun 2017 23:53:54 -0400 Subject: [PATCH] Setting up sacrifices. --- src/societies/aztec/slaveSacrifice.tw | 8 ++++++- src/uncategorized/slaveInteract.tw | 6 ++--- src/utility/assayWidgets.tw | 33 ++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw index 7e03c4fb2fa..32598f2ed4d 100644 --- a/src/societies/aztec/slaveSacrifice.tw +++ b/src/societies/aztec/slaveSacrifice.tw @@ -1,10 +1,12 @@ -:: Aztec Slave Sacrifice +:: Aztec Slave Sacrifice [nobr] <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Main", $showEncyclopedia = 1, $encyclopedia = "Aztec Revivalism">> <<SlavePronouns $activeSlave>> <<set _activeSlaveRepSacrifice = repGainSacrifice()>> +<<if $sacrificeType = "life">> + $pronounCap dies screaming as $possessive still beating heart is ripped out of $possessive body. <<if _activeSlaveRepSacrifice <= 0>>Nobody cares.<<elseif _activeSlaveRepSacrifice < 10>>The few spectators are suitably impressed.<<elseif _activeSlaveRepSacrifice < 100>>The small crowd appreciates your devotion to the Aztec culture.<<else>>The crowd cheers to the bloody spectacle.<</if>><<if $slaves.length > 0>> On the other hand, your remaining <<if $slaves.length == 1>>slave is<<else>>slaves are<</if>> suitably @@.gold;horrified@@.<</if>> <<set $rep = Math.min(20000, $rep + _activeSlaveRepSacrifice)>> @@ -15,3 +17,7 @@ $pronounCap dies screaming as $possessive still beating heart is ripped out of $ <<set $slavesSacrificedThisWeek = ($slavesSacrificedThisWeek || 0) + 1>> <<include "Remove activeSlave">> + +<</if>> + +<<set $sacrificeType = 0>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index cf1d0a3e8fd..3a7dfae995a 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -311,9 +311,9 @@ | <<link "Fuck its rear hole">><<replace "#miniscene">><<FFuckdollAnal>><br><</replace>><</link>> <</if>> <</if>> -<<set _activeSlaveRepSacrifice = repGainSacrifice()>> -<<if _activeSlaveRepSacrifice > 0>> - | [[Sacrifice her on the altar|Aztec Slave Sacrifice]] //This will kill her and gain you _activeSlaveRepSacrifice reputation// +<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist != "unset" && $activeSlave.breedingMark == 0>> + <<set _activeSlaveRepSacrifice = repGainSacrifice()>> + | [[Sacrifice her on the altar|Aztec Slave Sacrifice][$sacrificeType = "life"]] //This will kill her and gain you _activeSlaveRepSacrifice reputation// <</if>> /* pregmod start */ diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 7f2f25d7550..250d90db665 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -887,21 +887,42 @@ <</if>> <</if>> -<<if ($args[0].physicalAge < 13)>> +<<if ($args[0].physicalAge < 11)>> + <<set $beauty += 2>> +<<elseif ($args[0].physicalAge < 13)>> <<elseif $args[0].underArmHStyle == "neat">> <<elseif $args[0].underArmHStyle == "hairless">> - <<set $beauty += 1>> + <<set $beauty += 2>> +<<elseif $args[0].underArmHStyle == "bald">> + <<set $beauty += 2>> <<elseif ($args[0].underArmHStyle == "waxed")>> - <<set $beauty += 1>> + <<set $beauty += 2>> <<elseif $args[0].underArmHStyle == "shaved">> - <<set $beauty += 1>> + <<set $beauty += 2>> <<elseif $args[0].underArmHStyle == "bushy">> - <<set $beauty -= 1>> + <<set $beauty -= 2>> +<</if>> + +<<if ($args[0].physicalAge < 11)>> + <<set $beauty += 2>> +<<elseif ($args[0].physicalAge < 13)>> +<<elseif $args[0].pubicHStyle == "neat">> +<<elseif $args[0].pubicHStyle == "in a strip">> +<<elseif $args[0].pubicHStyle == "hairless">> + <<set $beauty += 2>> +<<elseif $args[0].pubicHStyle == "bald">> + <<set $beauty += 2>> +<<elseif ($args[0].pubicHStyle == "waxed")>> + <<set $beauty += 2>> +<<elseif $args[0].pubicHStyle == "bushy">> + <<set $beauty -= 4>> +<<elseif $args[0].pubicHStyle == "bushy in the front and neat in the rear">> + <<set $beauty -= 2>> <</if>> <<if $args[0].amp == 0>> <<elseif $args[0].amp == 1>> - <<set $beauty -= 3>> + <<set $beauty -= 10>> <<elseif $args[0].amp == -3>> <<elseif $args[0].amp == -5>> <<else>> -- GitLab