From 6a1a1ece5af98b9e533153cb8db76700fd3d6924 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 1 Apr 2018 23:43:36 -0400 Subject: [PATCH] fixes, content and !1510 --- src/npc/fPCImpreg.tw | 6 +- src/uncategorized/RESS.tw | 1 + src/uncategorized/neighborInteract.tw | 67 +++++++++++++++++++-- src/uncategorized/neighborsDevelopment.tw | 71 +++++++++++++++++++++++ src/uncategorized/saDiet.tw | 2 +- 5 files changed, 138 insertions(+), 9 deletions(-) diff --git a/src/npc/fPCImpreg.tw b/src/npc/fPCImpreg.tw index 575c5499272..d535f36e62a 100644 --- a/src/npc/fPCImpreg.tw +++ b/src/npc/fPCImpreg.tw @@ -53,7 +53,7 @@ You call her over so you can <</if>> <<if ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.vagina == 0 || ($activeSlave.anus == 0 && $activeSlave.mpreg == 1))>> - She cries with joy and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>, knowing that her first time will always be special to her. She spends the rest of the day cherishing her stomach. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@ + She cries with joy and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her belly is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>, knowing that her first time will always be special to her. She spends the rest of the day cherishing her stomach. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@ <<if $activeSlave.mpreg == 1>> <<set $activeSlave.anus = 1>> <<else>> @@ -61,10 +61,10 @@ You call her over so you can <</if>> <<set $activeSlave.devotion += 15>> <<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>> - She cries with joy and presents her fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for breeding. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day considering her own stomach with pride. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ + She cries with joy and presents her fertile <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for breeding. She sobs with happiness when she feels your hot seed<<if $PC.balls == 3>> filling her until her belly is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day considering her own stomach with pride. This new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ <<set $activeSlave.devotion += 10>> <<elseif ($activeSlave.devotion > 20) && ($activeSlave.vagina == 0 || ($activeSlave.anus == 0 && $activeSlave.mpreg == 1))>> - She accepts your orders without comment and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She gasps in shock when she feels your hot seed<<if $PC.balls == 3>> filling her until her stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day struggling with roiling emotions. Since she is already well broken, this new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@ + She accepts your orders without comment and presents her virgin <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> for fertilization. She gasps in shock when she feels your hot seed<<if $PC.balls == 3>> filling her until her belly is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into her until she is stuffed with your cum<<elseif $PC.balls == 1>> pouring into her<</if>>. She spends the rest of the day struggling with roiling emotions. Since she is already well broken, this new connection with her <<WrittenMaster $activeSlave>> @@.hotpink;increases her devotion to you.@@ @@.lime;Her <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> has been broken in, and there's a good chance she's pregnant.@@ <<if $activeSlave.mpreg == 1>> <<set $activeSlave.anus = 1>> <<else>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index a58c59390d1..ed811db0a92 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -5797,6 +5797,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?" <<AnalVCheck>> <</if>> <</if>> + The amount of air you can pull through the snorkel just isn't enough to facility the throes of your lovemaking, so by the time you're done, she's so exhausted she can barely float to the edge of the pool. Fortunately her lovely tits make for quite the floatation device, so you gently guide her to the shallow end<<if $PC.dick || $activeSlave.balls>>, leaving a trail of cum in your wake<</if>>. <<set $activeSlave.trust += 4>> <</replace>> <</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>> diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw index 7dbc4de068f..cd950647774 100644 --- a/src/uncategorized/neighborInteract.tw +++ b/src/uncategorized/neighborInteract.tw @@ -65,6 +65,48 @@ <</for>> <</if>> +<<if $PC.hacking > 0>> + <br> + <<if $arcologies[0].CyberEconomicTarget == -1>> + You are not engaged in cyber warfare against a neighboring arcology. + <<else>> + <<for $i = 0; $i < $arcologies.length; $i++>> + <<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>> + You have targeted ''$arcologies[$i].name'' for cyber economic warfare. + <<break>> + <</if>> + <</for>> + <br> Its planned impacts will be + <<if $arcologies[0].CyberEconomic == 3>> + ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].CyberEconomic -= 1]] + <<elseif $arcologies[0].CyberEconomic == 2>> + ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberEconomic += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].CyberEconomic -= 1]] + <<else>> + ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberEconomic += 1]] + <</if>> + <</if>> + + <br> + <<if $arcologies[0].CyberReputationTarget == -1>> + You are not engaged in character assassination against a neighboring arcology. + <<else>> + <<for $i = 0; $i < $arcologies.length; $i++>> + <<if $arcologies[$i].direction == $arcologies[0].CyberReputationTarget>> + You have targeted the leadership of ''$arcologies[$i].name'' for character assassination. + <<break>> + <</if>> + <</for>> + <br> Its planned impacts will be + <<if $arcologies[0].CyberReputation == 3>> + ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].CyberReputation -= 1]] + <<elseif $arcologies[0].CyberReputation == 2>> + ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberReputation += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].CyberReputation -= 1]] + <<else>> + ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].CyberReputation += 1]] + <</if>> + <</if>> +<</if>> + <br> <<set $desc = []>> @@ -170,9 +212,16 @@ <</if>> <</for>> +<br> +[[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]] | +<<if $PC.hacking > 0>> + [[Target for cyber economic warfare|Neighbor Interact][$arcologies[0].CyberEconomicTarget = $activeArcology.direction]]| + [[Target their leadership for character assassination|Neighbor Interact][$arcologies[0].CyberReputationTarget = $activeArcology.direction]] +<</if>> + <br> [[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]] <<if $desc.length > 0>> - | [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]] + | [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]] <</if>> <br> You own ''$activeArcology.PCminority%'' of $activeArcology.name. <<set $seed = 500*Math.trunc($activeArcology.prosperity*(1+($activeArcology.demandFactor/100)))>> @@ -310,10 +359,18 @@ A 1% interest in $activeArcology.name is worth <<print cashFormat($seed)>> and w <</if>> <<if $arcologies[0].embargoTarget != -1>> - <br> - [[Cancel economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = -1]] + <br> + [[Cancel economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = -1]] <</if>> <<if $arcologies[0].influenceTarget != -1>> - <br> - [[Stop trying to influence neighboring arcologies|Neighbor Interact][$arcologies[0].influenceTarget = -1]] + <br> + [[Stop trying to influence neighboring arcologies|Neighbor Interact][$arcologies[0].influenceTarget = -1]] <</if>> +<<if $arcologies[0].CyberEconomicTarget != -1>> + <br> + [[Cancel cyber economic warfare|Neighbor Interact][$arcologies[0].CyberEconomicTarget = -1]] +<</if>> +<<if $arcologies[0].CyberReputationTarget != -1>> + <br> + [[Cancel character assassination|Neighbor Interact][$arcologies[0].CyberReputationTarget = -1]] +<</if>> \ No newline at end of file diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 5f3a3dcf3cd..6ec4ba9dd1a 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -490,6 +490,77 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol This week, you made @@.yellowgreen;<<print cashFormat($rents)>>@@ from your holdings in this arcology. <</if>> +/* CYBER ECONOMIC WARFARE */ +<<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>> + <<if $PC.hacking == -100>> + <<set _Catchtchance = 10>> + <<elseif $PC.hacking <= -75>> + <<set _Catchtchance = 30>> + <<elseif $PC.hacking <= -50>> + <<set _Catchtchance = 40>> + <<elseif $PC.hacking <= -25>> + <<set _Catchtchance = 45>> + <<elseif $PC.hacking == 0>> + <<set _Catchtchance = 50>> + <<elseif $PC.hacking <= 25>> + <<set _Catchtchance = 60>> + <<elseif $PC.hacking <= 50>> + <<set _Catchtchance = 70>> + <<elseif $PC.hacking <= 75>> + <<set _Catchtchance = 85>> + <<elseif $PC.hacking >= 100>> + <<set _Catchtchance = 100>> + <</if>> + <<set $arcologies[$i].prosperity -= $arcologies[0].CyberEconomic, _WarSpoils = 5000*$arcologies[0].CyberEconomic>> + <<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberEconomic)>> + <<set $arcologies[0].prosperity -= $arcologies[0].CyberEconomic*3, $rep -= random(100,200), _redHanded = 1>> + <<if $secExp == 1>> + <<set $authority -= random(100,500)*$arcologies[0].CyberEconomic, $crime += random(10,25)>> + <</if>> + <</if>> + You target $arcologies[$i].name for @@.yellow;digital economic warfare,@@ successfully raiding its coffers for @@.yellowgreen;<<print cashFormat(_WarSpoils)>>@@ this week. + <<if _redHanded == 1>> + A successful trace back to your arcology has has exposed your actions, @@.red;damaging your reputation@@ and @@.red;scaring away potential investors.@@ + <<if $secExp == 1>> + To add insult to injury, @@.red;your authority has been weakened@@ and your actions have painted your arcology as a @@.red;haven for crime.@@ + <</if>> + <</if>> +<<elseif $arcologies[$i].direction == $arcologies[0].CyberReputationTarget>> /* REPUTATION WARFARE */ + <<if $PC.hacking == -100>> + <<set _Catchtchance = 10>> + <<elseif $PC.hacking <= -75>> + <<set _Catchtchance = 30>> + <<elseif $PC.hacking <= -50>> + <<set _Catchtchance = 40>> + <<elseif $PC.hacking <= -25>> + <<set _Catchtchance = 45>> + <<elseif $PC.hacking == 0>> + <<set _Catchtchance = 50>> + <<elseif $PC.hacking <= 25>> + <<set _Catchtchance = 60>> + <<elseif $PC.hacking <= 50>> + <<set _Catchtchance = 70>> + <<elseif $PC.hacking <= 75>> + <<set _Catchtchance = 85>> + <<elseif $PC.hacking >= 100>> + <<set _Catchtchance = 100>> + <</if>> + <<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation, $activeArcology.ownership -= $arcologies[0].CyberReputation*2>> + <<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberReputation)>> + <<set $arcologies[$j].prosperity -= $arcologies[0].CyberReputation*3, $rep -= random(100,200), _redHanded = 1>> + <<if $secExp == 1>> + <<set $authority -= random(100,500)*$arcologies[0].CyberReputation, $crime += random(10,25)>> + <</if>> + <</if>> + You target $arcologies[$i].name's leadership for @@.yellow;character assassination@@ in an attempt to destabilize the arcology. + <<if _redHanded == 1>> + A successful trace back to your arcology has has exposed your actions, @@.red;damaging your reputation@@ and @@.red;scaring away potential investors.@@ + <<if $secExp == 1>> + To add insult to injury, @@.red;your authority has been weakened@@ and your actions have painted your arcology as a @@.red;haven for crime.@@ + <</if>> + <</if>> +<</if>> + /* AI ARCOLOGY RENAMING */ <<for $j = 0; $j < $arcologies.length; $j++>> <<if $arcologies[$i].direction != $arcologies[$j].direction>> diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index ab33a859163..3862759cc37 100644 --- a/src/uncategorized/saDiet.tw +++ b/src/uncategorized/saDiet.tw @@ -728,7 +728,7 @@ <<set $slaves[$i].energy++>> <</if>> <<elseif $slaves[$i].sexualFlaw == "breeder">> - Her diet is @@.lime;prepping her to carry multiple fetues,@@ and she feels it. She @@.hotpink;eagerly awaits to swell with children.@@ + Her diet is @@.lime;prepping her to carry multiple fetuses,@@ and she feels it. She @@.hotpink;eagerly awaits to swell with children.@@ <<set $slaves[$i].devotion += 2>> <<if $slaves[$i].attrXY < 70>> She certainly notices @@.green;how much more attractive men are.@@ -- GitLab