From 87efa2313e4c088303c11f3a49fde467fe86ad8c Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Sun, 23 Sep 2018 22:59:26 -0400 Subject: [PATCH] Attempted economics fix --- src/uncategorized/neighborInteract.tw | 5 +++++ src/uncategorized/neighborsDevelopment.tw | 22 ++++++++++++++++++---- src/uncategorized/surgeryDegradation.tw | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw index 0e52bbd92de..39267d85ed6 100644 --- a/src/uncategorized/neighborInteract.tw +++ b/src/uncategorized/neighborInteract.tw @@ -24,6 +24,11 @@ <<set $cash += $transaction*(500*Math.trunc($arcologies[_nei].prosperity*(1+($arcologies[_nei].demandFactor/100))))>> <<set $arcologies[_nei].PCminority -= $transaction>> <<set $arcologies[_nei].demandFactor -= $transaction*2>> + <<if $arcologies[_nei].government != "your agent" && $arcologies[_nei].government != "your trustees" && $arcologies[_nei].rival != 1>> + <<if $arcologies[_nei].ownership + $arcologies[_nei].PCminority + $arcologies[_nei].minority < 10>> + <<set $arcologies[_nei].ownership += 10>> + <</if>> + <</if>> <</if>> <<set $sellArcologyDirection = 0>> <<set $transaction = 0>> diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 1a5d579619d..5445f6573bc 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -87,7 +87,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol A controlling interest has been taken by a single individual, leaving the arcology ruled like yours is. <<set $arcologies[$i].government = "an individual">> <<set $arcologies[$i].ownership = random(51,61), $arcologies[$i].minority = 100 - $arcologies[$i].ownership - random(1,19), $arcologies[$i].honeymoon += 10>> -<<elseif ($arcologies[$i].ownership != 0) && ($arcologies[$i].ownership < $arcologies[$i].PCminority) && ($arcologies[$i].direction != 0) && ($arcologies[$i].rival != 1)>> +<<elseif ($arcologies[$i].government != "your trustees") && ($arcologies[$i].government != "your agent") && ($arcologies[$i].ownership < $arcologies[$i].PCminority) && ($arcologies[$i].direction != 0) && ($arcologies[$i].rival != 1)>> undergoing a leadership struggle in which you are deeply concerned, since you now own more of it than its current leadership. <<if random(0,10) < $arcologies[$i].PCminority - $arcologies[$i].ownership>> @@.yellow;You successfully execute a hostile takeover and now control the arcology.@@ Trustees from among its leading citizens will exercise local control at your direction until you make other arrangements. @@ -124,7 +124,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <</if>> <</switch>> <<else>> - The arcology is paralyzed by dissention over how to respond. + The arcology is paralyzed by dissension over how to respond. <<set $arcologies[$i].prosperity -= 3>> <</if>> <<elseif ($arcologies[$i].ownership != 0) && (($arcologies[$i].ownership < $arcologies[$i].minority) || ($arcologies[$i].ownership < 10)) && ($arcologies[$i].direction != 0) && ($arcologies[$i].rival != 1)>> @@ -403,7 +403,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol about as prosperous as the rest of the Free City. <<else>> <<if ($arcologies[$i].honeymoon > 0)>> - far behind the rest of the Free City, making it a good investment and spurring its economic development. It remains in the @@.lightgreen;honeymoon period@@ after its recent change of government, suppressing dissention and further encouraging growth. + far behind the rest of the Free City, making it a good investment and spurring its economic development. It remains in the @@.lightgreen;honeymoon period@@ after its recent change of government, suppressing dissension and further encouraging growth. <<set $arcologies[$i].prosperity += 2>> <<if ($arcologies[$i].ownership != 0) && ($arcologies[$i].ownership < 40)>> <<set $arcologies[$i].ownership += 1>> @@ -542,7 +542,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <</if>> <<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation, $arcologies[$i].ownership -= $arcologies[0].CyberReputation>> <<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>> - <<set $arcologies[$i].ownership = Math.clamp($arcologies[$i].ownership, 0, 300)>> + <<set $arcologies[$i].ownership = Math.clamp($arcologies[$i].ownership, 0, 100)>> <<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberReputation)>> <<set $arcologies[0].prosperity -= $arcologies[0].CyberReputation*3, $rep -= random(100,200), _redHanded = 1>> <<if $secExp == 1>> @@ -2615,6 +2615,20 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<if $arcologies[$i].direction != 0>> <<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>> + <<set $arcologies[$i].ownership = Math.clamp($arcologies[$i].ownership, 0, 100)>> + <<set $arcologies[$i].PCminority = Math.clamp($arcologies[$i].PCminority, 0, 100)>> + <<set $arcologies[$i].minority = Math.clamp($arcologies[$i].minority, 0, 100)>> + <<set _owned = $arcologies[$i].ownership + $arcologies[$i].PCminority + $arcologies[$i].minority>> + <<if $arcologies[$i].government != "your agent" && $arcologies[$i].government != "your trustees" && $arcologies[$i].rival != 1>> + <<if _owned < 10>> + <<set $arcologies[$i].ownership += 10>> /* Someone needs to own something */ + <<elseif _owned > 100>> + <<set $arcologies[$i].minority = Math.clamp(100 - $arcologies[$i].ownership - $arcologies[$i].PCminority, 0, 100)>> + <<if $arcologies[$i].ownership + $arcologies[$i].PCminority > 100>> + <<set $arcologies[$i].ownership = 100 - $arcologies[$i].PCminority>> + <</if>> + <</if>> + <</if>> <</if>> <br> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index 04e0f3ff34b..6d31c0be5f7 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -957,7 +957,7 @@ As the remote surgery's long recovery cycle completes, <</if>> <<case "earFix">> - The inner ear surgery is brief, with @@.red;nothing more than minor health effects.@@ As soon as $he is allowed to open $his eyes and look around, $his gaze flicks from object to object with manic speed as $he indentifies each and and every newly clear sound. Hearing the world as it is without hearing aids is a gift that those who do not need it cannot properly understand. + The inner ear surgery is brief, with @@.red;nothing more than minor health effects.@@ As soon as $he is allowed to open $his eyes and look around, $his gaze flicks from object to object with manic speed as $he identifies each and every newly clear sound. Hearing the world as it is without hearing aids is a gift that those who do not need it cannot properly understand. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <<set $activeSlave.devotion += 5, $activeSlave.trust += 5>> <<if ($activeSlave.devotion > 50)>> -- GitLab