From 90ed68514e7092d0c1c34b203f2f21763f52d98e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 21 Aug 2018 22:06:01 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 +++-
src/events/gameover.tw | 2 +-
src/events/intro/economyIntro.tw | 2 +-
src/interaction/cyberConfig.tw | 8 +++---
src/pregmod/beastFucked.tw | 10 +++----
src/pregmod/criminalMarkets.tw | 3 +--
src/uncategorized/BackwardsCompatibility.tw | 28 ++++++++++++++++++++
7 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 46d233b8734..a7249ed1955 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,9 +4,12 @@
8/21/2018
+ 9
+ -fixes
+
8
-slightly adjusted pregnancy breast growth rates
- -laranx impland for cybermod voice control
+ -larynx implant for cybermod voice control
-expanded vocal surgery to allow deepening
-porn feed control added to the RA
-fixes
diff --git a/src/events/gameover.tw b/src/events/gameover.tw
index 37bee288a05..30ed2fd55bb 100644
--- a/src/events/gameover.tw
+++ b/src/events/gameover.tw
@@ -79,7 +79,7 @@
<<elseif $gameover == "Idiot Ball 2 The Dumbassening" || $gameover == "Idiot Ball 3 Totally Not Idiot Ball 2 Again">>
<<set $ui = "start">>
- As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tased by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all <<if $gameover == "Idiot Ball 2 The Dumbassening">>non-<<print $arcologies[0].FSSupremacistRace>><<else>><<print $arcologies[0].FSSubjugationistRace>><</if>>s slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere.
+ As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tased by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.origRace ass by decreeing all <<if $gameover == "Idiot Ball 2 The Dumbassening">>non-<<print $arcologies[0].FSSupremacistRace>><<else>><<print $arcologies[0].FSSubjugationistRace>><</if>><<if $PC.origRace != "mixed race">>s<<else>> individuals<</if>> slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere.
<br><br>
''GAME OVER''
diff --git a/src/events/intro/economyIntro.tw b/src/events/intro/economyIntro.tw
index 10680c78024..b086eefb637 100644
--- a/src/events/intro/economyIntro.tw
+++ b/src/events/intro/economyIntro.tw
@@ -1,6 +1,6 @@
:: Economy Intro [nobr]
-<<if $PC.career == "arcology owner">>
+<<if $PC.career == "arcology owner" || $saveImported == 1>>
<<goto "Takeover Target">>
<<else>>
It is the year 2037, and the past 21 years have not been kind. The world is starting to fall apart. The climate is deteriorating, resources are being exhausted, and there are more people to feed every year. Technology is advancing, but not fast enough to save everyone. @@.orange;Exactly how bad is the situation?@@
diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw
index 2a46ae93496..54de4363e56 100644
--- a/src/interaction/cyberConfig.tw
+++ b/src/interaction/cyberConfig.tw
@@ -188,13 +188,13 @@
<</if>>
<<case 6>>
<<set $temp = 0, $nextButton = "Continue", $nextLink = "cyberConfig">>
- <<if $activeSlave.hears == 0>>
+ <<if $activeSlave.voice == 0>>
$He tries testing out $his new voice, only to discover $he's been made mute.
- <<elseif $activeSlave.hears == 1>>
+ <<elseif $activeSlave.voice == 1>>
$He tests out the <<if canHear($activeSlave)>>sound<<else>>feeling<</if>> of $his new, deep voice.
- <<elseif $activeSlave.hears == 2>>
+ <<elseif $activeSlave.voice == 2>>
$He tests out the <<if canHear($activeSlave)>>sound<<else>>feeling<</if>> of $his new, normal voice.
- <<elseif $activeSlave.hears == 3>>
+ <<elseif $activeSlave.voice == 3>>
$He tests out the <<if canHear($activeSlave)>>sound<<else>>feeling<</if>> of $his new, high voice.
<</if>>
<</switch>>
\ No newline at end of file
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index 5928329842d..15a064a1b41 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -119,7 +119,7 @@
You <<if ($activeSlave.clothes != "no clothing")>>take off $his $activeSlave.clothes and <</if>>place $him on the ground with a cushion under $his hips, $his ass in the air,
<</if>>
-before calling in the _animal.species. The _animal.species slowly saunters up to the <<if ($activeSlave.devotion <= 20)>>bound <</if>>slave and takes it position <<if canWalk($activeSlave)>>behind <<else>>above <</if>>$him. You can see its _animal.dickSize penis slowly come to attention as its animalistic brain realizes that it's standing <<if canWalk($activeSlave)>>behind <<else>>above <</if>>a warm hole that needs to be filled with seed.
+before calling in the _animal.species. The _animal.species slowly saunters up to the <<if ($activeSlave.devotion <= 20)>>bound <</if>>slave and takes its position <<if canWalk($activeSlave)>>behind <<else>>above <</if>>$him. You can see its _animal.dickSize penis slowly come to attention as its animalistic brain realizes that it's standing <<if canWalk($activeSlave)>>behind <<else>>above <</if>>a warm hole that needs to be filled with seed.
<<if (_animal.species == "dog")>>
<<if canWalk($activeSlave)>>
@@ -357,15 +357,15 @@ before calling in the _animal.species. The _animal.species slowly saunters up to
<<if canWalk($activeSlave)>>
<<if ($activeSlave.vagina == 3)>>
- _animal.speciesCap cum drips out of $his fucked-out hole.
+ capFirstChar(_animal.species) cum drips out of $his fucked-out hole.
<<elseif ($activeSlave.vagina == 2)>>
- _animal.speciesCap cum drips out of $his stretched vagina.
+ capFirstChar(_animal.species) cum drips out of $his stretched vagina.
<<elseif ($activeSlave.vagina == 1)>>
$His still-tight vagina keeps the _animal.species's load inside $him.
<<elseif ($activeSlave.vagina < 0)>>
- _animal.speciesCap cum drips out of $his girly ass.
+ capFirstChar(_animal.species) cum drips out of $his girly ass.
<<else>>
- _animal.speciesCap cum slides right out of $his gaping hole.
+ capFirstChar(_animal.species) cum slides right out of $his gaping hole.
<</if>>
$He uses <<if $activeSlave.vagina > 0>>a quick douche to clean $his <<if $activeSlave.vagina < 2>>tight<<elseif $activeSlave.vagina > 3>>loose<</if>> pussy<<else>>an enema to clean $his <<if $activeSlave.anus < 2>>tight<<elseif $activeSlave.anus < 3>>used<<else>>gaping<</if>> butthole<</if>>,
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index ad3e4d01def..32f1c8c31ff 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -46,9 +46,8 @@ You board the transport to
<br><br>
<<slaveCost $activeSlave>>
-<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += $slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1)>><</if>>
+<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
It will cost <<print cashFormat($slaveCost)>> to enslave her.
<<if $cash >= $slaveCost>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index cc0f89c246e..a86ac6341ad 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1910,6 +1910,34 @@ Setting missing global variables:
<<set $Role = "">>
<</if>>
+/* Cybermod*/
+<<if ndef $cyberMod>>
+ <<set $cyberMod = 0>>
+<<elseif $cyberMod == 1>>
+ <<if ndef $stockpile>>
+ <<set $stockpile = {
+ basicPLimbInterface: 0,
+ advPLimbInterface: 0,
+ basicPLimb: 0,
+ advSexPLimb: 0,
+ advGracePLimb: 0,
+ advCombatPLimb: 0,
+ cyberneticPLimb: 0,
+ ocularImplant: 0,
+ cochlearImplant: 0,
+ electrolarynx: 0,
+ erectileImplant: 0
+ } >>
+ <<else>>
+ <<if ndef $stockpile.cochlearImplant>>
+ <<set $stockpile.cochlearImplant = 0>>
+ <</if>>
+ <<if ndef $stockpile.electrolarynx>>
+ <<set $stockpile.electrolarynx = 0>>
+ <</if>>
+ <</if>>
+<</if>>
+
<<if ndef $trinkets>>
<<set $trinkets = []>>
--
GitLab