Skip to content
Snippets Groups Projects
Commit b4bc30a3 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'KilSlaveTweaking' into 'pregmod-master' 

Killed Slave - Minor code cleaning [Ready for merge]

See merge request !2548
parents 13bb0fef 4bbcf0c7
No related branches found
No related tags found
1 merge request!2548Killed Slave - Minor code cleaning [Ready for merge]
Hide whitespace changes
Inline Side-by-side
src/pregmod/killedSlave.tw
+ 38
− 60
View file @ b4bc30a3
......@@ -5,57 +5,35 @@
<<set _qualifiedFS = []>>
<<set _qualifiedFS.push("RND")>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set _qualifiedFS.push("roman revivalist")>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
<<set _qualifiedFS.push("aztec revivalist")>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set _qualifiedFS.push("egyptian revivalist")>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
<<set _qualifiedFS.push("edo revivalist")>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
<<set _qualifiedFS.push("arabian revivalist")>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<<set _qualifiedFS.push("chinese revivalist")>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set _qualifiedFS.push("roman revivalist"), _weapon = gladius>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
<<set _qualifiedFS.push("aztec revivalist"), _weapon = Tecpatl>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
<<set _qualifiedFS.push("egyptian revivalist"), _weapon = kopesh>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
<<set _qualifiedFS.push("edo revivalist"), _weapon = katana>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
<<set _qualifiedFS.push("arabian revivalist"), _weapon = scimitar>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<<set _qualifiedFS.push("chinese revivalist"), _weapon = jian>>
<</if>>
You simply smile at $him and tell $him not to worry as you continue
You simply smile at $him and tell $him not to worry as you continue
<<switch _qualifiedFS>>
<<case "roman revivalist">>
sharpening your gladius.
<<case "aztec revivalist">>
sharpening your macuahuitl.
<<case "egyptian revivalist">>
sharpening your kopesh.
<<case "edo revivalist">>
sharpening your katana.
<<case "arabian revivalist">>
sharpening your scimitar.
<<case "chinese revivalist">>
sharpening your jian.
<<default>>
threading on a silencer.
<</switch>>
<<if _qualifiedFS > 0>>
sharpening your _weapon.
<<else>>
threading on a suppressor.
<</if>>
$activeSlave.slaveName gives an audible sigh of relief and begins to thank you profusely, though $his thanks are cut short as
$activeSlave.slaveName gives an audible sigh of relief and begins to thank you profusely, though $his thanks are cut short as the sound of
<<switch _qualifiedFS>>
<<case "roman revivalist">>
the sound of a sword tearing through flesh
<<case "aztec revivalist">>
the sound of a sword tearing through flesh
<<case "egyptian revivalist">>
the sound of a sword tearing through flesh
<<case "edo revivalist">>
the sound of a sword tearing through flesh
<<case "arabian revivalist">>
the sound of a sword tearing through flesh
<<case "chinese revivalist">>
the sound of a sword tearing through flesh
<<default>>
a silenced gunshot
<</switch>>
<<if _qualifiedFS > 0>>
a sharp edge slicing though flesh
<<else>>
a suppressed gunshot
<</if>>
rings through the room. You have another servant clean up the mess as you continue with what you were previously doing.
......@@ -63,42 +41,42 @@
<<if $familyTesting == 1>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $activeSlave.mother == $slaves[_ss].ID>>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her daughter.
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his daughter.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 30>>
<</if>>
<<if $activeSlave.father == $slaves[_ss].ID>>
$slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you have killed her daughter.
$slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you have killed $his daughter.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
<</if>>
<<if $activeSlave.ID == $slaves[_ss].father>>
$slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you have killed her father.
$slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you have killed $his father.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
<</if>>
<<if $activeSlave.ID == $slaves[_ss].mother>>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her mother.
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his mother.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 30>>
<</if>>
<<switch areSisters($activeSlave, $slaves[_ss])>>
<<case 1>>
$slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you have killed her twin.
$slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you have killed $his twin.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 30>>
<<case 2>>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her sister.
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his sister.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 30>>
<<case 3>>
$slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you have killed her half-sister.
$slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you have killed $his half-sister.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
......@@ -108,7 +86,7 @@
<<if $activeSlave.relation != 0>>
<<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her $activeSlave.relation.
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his $activeSlave.relation.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 30>>
......@@ -119,7 +97,7 @@
<<if $activeSlave.relationship > 0>>
<<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed her best source of comfort and companionship in a life of bondage.
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you have killed $his best source of comfort and companionship in a life of bondage.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
......@@ -140,7 +118,7 @@
<<if $activeSlave.rivalry != 0>>
<<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
$slaves[_ss].slaveName is @@.hotpink;pleased@@ that she won't have to see her rival any more.
$slaves[_ss].slaveName is @@.hotpink;pleased@@ that $he won't have to see $his rival any more.
<<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
......@@ -162,14 +140,14 @@
<<set $activeSlave.trust = -100>>
<<elseif $killChoice == 2>>
You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate -- if $he wants to live, $he'll have to beat $him in hand-to-hand combat in $pitName.
You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate -- if $he wants to live, $he'll have to beat $him in hand-to-hand combat in $pitName.
<<if $activeSlave.combatSkill == 0>>
The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
The fear on $his face is palpable, though $he nods slowly and agrees, not seeing another choice.
<<else>>
$He nods $his head and straightens up, as though preparing $himself for the fight for $his life.
<</if>>
//This scene is currently unfinished.//
/*TODO: Connect this to the Pit, have an end-of-week event between the Bodyguard and the slave*/
<</if>>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment