diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index aa77ed62336233fa52c1dc17705c9f26fc6eb9c1..933f65597ee956b1e0cb12ec668d0cd0bc791802 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,7 +2,13 @@
0.10.7.0/1
-1/28/18
+1/29/18
+
+ 310
+ -crimeanon's fixes
+ -anon's continued tweaking
+ -fixed hostages sometimes showing up when they weren't supposed to be
+ -fixed various little typos and errors
309
-various small fixes
diff --git a/devNotes/sugarcube stuff/important for updating sugarcube.txt b/devNotes/sugarcube stuff/important for updating sugarcube.txt
index 1d48d20869a5de968b9965fc445054bc2984fa11..7453d74a1b3b8b849e72747bdda194e24b3bc4c0 100644
--- a/devNotes/sugarcube stuff/important for updating sugarcube.txt
+++ b/devNotes/sugarcube stuff/important for updating sugarcube.txt
@@ -1,3 +1,5 @@
search for /* look here for changes */ in the header backup.
-,[{key:"_serialize",value:function(e)
\ No newline at end of file
+,[{key:"_serialize",value:function(e)
+
+return Object.freeze(Object.defineProperties({},{init:{value:e},create:{value:t}}))}()),SimpleStore.adapters.
\ No newline at end of file
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index a0cc052844ab62ddea50bc5c5d121967bd9f391a..f4c4c620a8246049d91da36ca9466f11b5742c51 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -238,7 +238,7 @@
<<set $attackTroops = Math.trunc($attackTroops * random(4,6) * $majorBattleMult)>>
<<set $attackEquip = either(3,4)>>
<<else>>
- <<set set $attackTroops = Math.trunc($attackTroops * random(2,3) * $majorBattleMult)>>
+ <<set $attackTroops = Math.trunc($attackTroops * random(2,3) * $majorBattleMult)>>
<<set $attackEquip = either(2,3,4)>>
<</if>>
<<set $estimatedMen = Math.round($attackTroops * (1 + either(-1,1) * (random(3,4) - $recon) * 0.1))>>
diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 21098c61c8bcb5e1a26e9df7b951aecc3b79ee72..41e445f99956c4f4eaf46da0a23e485f8c763ae1 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -18,7 +18,7 @@
<<elseif $authority <= 18000>>
Your very high authority does not allow slaves to think too freely.<<set _slave += 5>>
<<else>>
- Your absolute authority does not allow slaves to have a single free thought.
+ Your absolute authority does not allow slaves to have a single free thought.<<set _slave += 1>>
<</if>>
<<if _CSratio <= 0.2>>
There are a lot more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 30>>
@@ -33,7 +33,7 @@
<<elseif _CSratio >= 1.2>>
There are less slaves than citizens, making some doubt they would be strong enough to defeat their masters.<<set _slave -= 5>>
<<else>>
- Citizen and slave population is sufficiently balanced not ot cause problems either way.
+ Citizen and slave population is sufficiently balanced not to cause problems either way.<<set _slave -= 1>>
<</if>>
<<if $security <= 10>>
The very low security of the arcology leaves free space for slaves to organize and agitate.<<set _slave += 30>>
@@ -44,7 +44,7 @@
<<elseif $security >= 90>>
The high security of the arcology does not allow free space for slaves to organize and agitate.<<set _slave -= 5>>
<<else>>
- The high security of the arcology does not allow free space for slaves to organize and agitate.
+ The high security of the arcology does not allow free space for slaves to organize and agitate.<<set _slave -= 1>>
<</if>>
<<if $arcologies[0].FSDegradationist != "unset">>
Many slaves are so disgusted by your degradationist society, that are willing to rise up against their masters to escape.<<set _slave += 30>>
@@ -76,7 +76,7 @@
<<elseif $authority <= 18000>>
Your very high authority does not allow your citizens to think too freely.<<set _citizen += 5>>
<<else>>
- Your absolute authority does not allow your citizens to have a single free thought.
+ Your absolute authority does not allow your citizens to have a single free thought.<<set _citizen += 1>>
<</if>>
<<if $crime >= 90>>
The very high crime level of the arcology breeds extreme discontent between your citizens.<<set _citizen += 30>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 8ef3bb5819e44eb80942514e67e002f862981c7e..eb08f2dd1523c4662e92f26f7ac7c513fd042b09 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -298,7 +298,7 @@ This week, rents from $arcologies[0].name came to
<<if $economy > 1>>
<<set $rents = ($week*100)+random(-100,100)>>
<<if $cash > 1000>>
- <<set $rents += Math.trunc($cash/10)>>
+ <<set $rents += Math.trunc($cash*0.02)>>
<</if>>
The @@.red;degenerating world economy@@ makes supplying and maintaining $arcologies[0].name extremely difficult. This week, bribes and other costs to keep it running came to @@.yellowgreen;<<print cashFormat($rents)>>.@@
<<set $cash -= $rents>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index ece8b9b62654798699bec47287a44ee50bd00a28..fb3d4a9e372311d1e31045c891313117b3a29d49 100755
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -127,7 +127,7 @@
<<elseif ($cash > 30000) && ($rep > 4000) && ($corpAnnounced == 0)>>
<<goto "P Corp Announcement">>
<<elseif ($rivalOwner > 0)>>
- <<if $hostageAnnounced == -1>>
+ <<if $hostageAnnounced == -1 && $rivalSet != 0>>
<<goto "P rivalry hostage">>
<<elseif ($rivalOwner-$rivalryPower+10)/$arcologies[0].prosperity < 0.5>>
<<goto "P rivalry victory">>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 51e9f1d9cc4c31ac5e39b6a0081d0d9879910c6f..c2675d74b5f59f9551f53912ef92d53505c7cb98 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -317,7 +317,7 @@
<<set $enduringRep *= .8>>
<</if>>
<</if>>
- <<set $seed += random(2000 * Math.log($cash), 3000 * Math.log($cash))>>
+ <<set $seed += Math.trunc(Math.min(3000 * Math.log($cash), $cash * 0.07))>>
This week, your illicit and legitimate business dealings earned you a combined total of @@.yellowgreen;<<print cashFormat($seed)>>@@.
<<set $cash += $seed>>
<<elseif ($cash > 1000) && ($personalAttention == "business")>>
@@ -328,14 +328,14 @@
<</if>>
<<if $PC.trading >= 100>>
You focus on business and leverage your @@.springgreen;venture capital experience@@ to make good money:
- <<set $seed += random(5000,10000)>>
+ <<set $seed += random(5000,10000) + Math.trunc(Math.min(4000 * Math.log($cash), $cash * 0.07))>>
<<elseif $PC.career == "arcology owner">>
You focus on business and leverage your @@.springgreen;Free Cities experience@@ to make good money:
- <<set $seed += random(5000,10000)>>
+ <<set $seed += random(5000,10000) + Math.trunc(Math.min(4000 * Math.log($cash), $cash * 0.07))>>
<<else>>
- You focus on business this week and make money:
+ You focus on business this week and make money
+ <<set $seed += Math.trunc(Math.min(3500 * Math.log($cash), $cash * 0.07))>>
<</if>>
- <<set $seed += random(4000 * Math.log($cash), 5000 * Math.log($cash))>>
@@.yellowgreen;<<print cashFormat($seed)>>.@@
<<set $cash += $seed>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
@@ -343,7 +343,7 @@
<<FSChange "RomanRevivalist" 2>>
<</if>>
<<elseif ($cash > 1000)>>
- <<set $seed = random(2000 * Math.log($cash), 3000 * Math.log($cash))>>
+ <<set $seed = Math.trunc(Math.min(3000 * Math.log($cash), $cash * 0.07))>>
This week, your business endeavors made you @@.yellowgreen;<<print cashFormat($seed)>>.@@
<<set $cash += $seed>>
<<else>>
@@ -640,18 +640,19 @@
<<set _upgradeCount += 1>>
<</if>>
<<set _dataGain = _upgradeCount * 200>>
- You are selling the data collected by your security department, making @@.yellowgreen;¤a discreet sum@@.
<<if !isInt(_dataGain)>>
<br>@@.red;Error, dataGain is NaN@@
+ <<else>>
+ You are selling the data collected by your security department, which earns a discreet sum of @@.yellowgreen;<<print cashformat(_dataGain)>>@@.
+ <<set $cash += _dataGain>>
+ Many of your citizens are not enthusiastic of this however, @@.red;damaging your authority@@.
+ <<set $authority -= 50>>
<</if>>
- <<set $cash += _dataGain>>
- Many of your citizens are not enthusiastic of this however, @@.red;damaging your authority@@.
- <<set $authority -= 50>>
<</if>>
<<if $marketInfiltration == 1>>
- Your secret service makes use of black markets and illegal streams of goods to make a profit, making you @@.yellowgreen;¤a discreet sum@@. This however allows @@.red;crime to flourish@@ in the underbelly of the arcology.
- <<set $cash += 1000 * random(4,8)>>
+ <<set $seed = random(7000,8000)>>
+ Your secret service makes use of black markets and illegal streams of goods to make a profit, making you @@.yellowgreen;<<print cashFormat($seed)>>@@. This however allows @@.red;crime to flourish@@ in the underbelly of the arcology.
<<set $crime += random(1,3)>>
<</if>>