diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index 4a0c2204c7183da48ddf50b083b593ad431e795c..fde67a7c45b63c9fcac5cb571fc098633b96e3f3 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -17,7 +17,7 @@ <strong>Security</strong>: <<if $secHelots > 0>> - <<print $secHelots>> slaves work to improve the security of your arcology, + <<print commaNum($secHelots)>> slaves work to improve the security of your arcology, <<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>> while your mercenaries and security drones tirelessly patrol the streets to keep them safe. <<elseif $arcologyUpgrade.drones == 1>> diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw index 2ce389413ab2d04cd927a5044734bc17c1da0fa4..e9c0547e74ea7b6c6f82575d7150ba64ccb32304 100644 --- a/src/SpecialForce/Report.tw +++ b/src/SpecialForce/Report.tw @@ -1,147 +1,146 @@ :: SF_Report [nobr] -<<silently>><<= Count()>> -<<if $SFUnit.Troops > 2000>> <<set $SFUnit.Troops = random(1955,1999)>> <</if>> -<<if $SFUnit.Troops < 100>> <<set $SFUnit.Troops += Math.ceil(random(2,5))>> -<<elseif $SFUnit.Troops < 2000>> - <<if $SF.Target == "recruit">> - <<set $SFUnit.Troops += Math.ceil(random(-1*$SFUnit.Troops/100,0))>> - <<elseif $SF.Target == "raiding">> - <<set $SFUnit.Troops += Math.ceil(random(-3*$SFUnit.Troops/100,-4*$SFUnit.Troops/100))>> - <<else>> - <<set $SFUnit.Troops += Math.ceil(random(-2*$SFUnit.Troops/100,-3*$SFUnit.Troops/100))>> +<<silently>> <<= Count()>> + <<if $SFUnit.Troops > 2000>> <<set $SFUnit.Troops = random(1955,1999)>> <</if>> + <<if $SFUnit.Troops < 100>> <<set $SFUnit.Troops += Math.ceil(random(2,5))>> + <<elseif $SFUnit.Troops < 2000>> + <<if $SF.Target == "recruit">> + <<set $SFUnit.Troops += Math.ceil(random(-1*$SFUnit.Troops/100,0))>> + <<elseif $SF.Target == "raiding">> + <<set $SFUnit.Troops += Math.ceil(random(-3*$SFUnit.Troops/100,-4*$SFUnit.Troops/100))>> + <<else>> + <<set $SFUnit.Troops += Math.ceil(random(-2*$SFUnit.Troops/100,-3*$SFUnit.Troops/100))>> + <</if>> <</if>> -<</if>> -<<set _SFIncome = 75000,_actionMultiplier = 1,_troopMultiplier = 1,_unitMultiplier = 1,_depravityMultiplier = 1,_SFupkeep = 0,_FNGs = 10,_Trade = 0.025>> -<<if $SF.SpecOps > 0>> - <<if $SF.SpecOps === 1>> <<set $SFUC = Math.ceil($SFUnit.Troops*.1),$SFUnit.Troops-$SFUC>> - <<else>> <<set $SFUC = Math.ceil($SFUnit.Troops*.25),$SFUnit.Troops-$SFUC>> <</if>> -<</if>> -<<if $SFUnit.Troops > 200>> <<set _Trade += 0.05*(Math.ceil($SFUnit.Troops/100))>> - <<set _troopMultiplier = $SFUnit.Troops/200, _SFupkeep += $SFUnit.Troops*25>> - <<if $secExp > 0>> - <<set $authority += 25*(Math.ceil($SFUnit.Troops/200)),$authority = Math.clamp($authority, 0, 20000)>> + <<set _SFIncome = 75000,_actionMultiplier = 1,_troopMultiplier = 1,_unitMultiplier = 1,_depravityMultiplier = 1,_SFupkeep = 0,_FNGs = 10,_Trade = 0.025>> + <<if $SF.SpecOps > 0>> + <<if $SF.SpecOps === 1>> <<set $SFUC = Math.ceil($SFUnit.Troops*.1),$SFUnit.Troops-$SFUC>> + <<else>> <<set $SFUC = Math.ceil($SFUnit.Troops*.25),$SFUnit.Troops-$SFUC>> <</if>> + <</if>> + <<if $SFUnit.Troops > 200>> <<set _Trade += 0.05*(Math.ceil($SFUnit.Troops/100))>> + <<set _troopMultiplier = $SFUnit.Troops/200, _SFupkeep += $SFUnit.Troops*25>> + <<if $secExp > 0>> + <<set $authority += 25*(Math.ceil($SFUnit.Troops/200)),$authority = Math.clamp($authority, 0, 20000)>> + <</if>> <</if>> -<</if>> -<<if $SFUnit.Firebase > 0>> - <<set _FNGs += $SFUnit.Firebase,_Trade += 0.5*$SFUnit.Firebase,_unitMultiplier += 7.5*$SFUnit.Firebase+2*Math.pow($SFUnit.Firebase,2),_SFupkeep += 500*(10+$SFUnit.Firebase)>> -<</if>> -<<if $SFUnit.Armoury > 0>> - <<set _FNGs += (2*$SFUnit.Armoury),_Trade += 0.25*$SFUnit.Armoury,_unitMultiplier += 7.5*$SFUnit.Armoury+2*Math.pow($SFUnit.Armoury,2), _SFupkeep += 100*$SFUnit.Armoury>> -<</if>> -<<if $SFUnit.Drugs > 0>> - <<set _FNGs += $SFUnit.Drugs,_Trade += 0.25*$SFUnit.Drugs,_unitMultiplier += 7.5*$SFUnit.Drugs+2*Math.pow($SFUnit.Drugs,2),_SFupkeep += 300*$SFUnit.Drugs>> -<</if>> -<<if $SFUnit.Firebase >= 1>> - <<if $SFUnit.AV > 0>> - <<set _FNGs += $SFUnit.AV,_Trade += 0.25*$SFUnit.AV,_unitMultiplier += 7.5*$SFUnit.AV+2*Math.pow($SFUnit.AV,2),_SFupkeep += 1000*$SFUnit.AV>> + <<if $SFUnit.Firebase > 0>> + <<set _FNGs += $SFUnit.Firebase,_Trade += 0.5*$SFUnit.Firebase,_unitMultiplier += 7.5*$SFUnit.Firebase+2*Math.pow($SFUnit.Firebase,2),_SFupkeep += 500*(10+$SFUnit.Firebase)>> <</if>> - <<if $SFUnit.TV > 0>> - <<set _FNGs += $SFUnit.TV,_Trade += 0.25*$SFUnit.TV,_unitMultiplier += 7.5*$SFUnit.TV+2*Math.pow($SFUnit.TV,2), _SFupkeep += 800*$SFUnit.TV>> + <<if $SFUnit.Armoury > 0>> + <<set _FNGs += (2*$SFUnit.Armoury),_Trade += 0.25*$SFUnit.Armoury,_unitMultiplier += 7.5*$SFUnit.Armoury+2*Math.pow($SFUnit.Armoury,2), _SFupkeep += 100*$SFUnit.Armoury>> <</if>> - <<if $SFUnit.PGT > 0>> - <<set _Trade += 0.25*($SFUnit.PGT),_unitMultiplier += 15*$SFUnit.PGT+3*Math.pow($SFUnit.PGT,2),_SFupkeep += 5000+1000*$SFUnit.PGT>> + <<if $SFUnit.Drugs > 0>> + <<set _FNGs += $SFUnit.Drugs,_Trade += 0.25*$SFUnit.Drugs,_unitMultiplier += 7.5*$SFUnit.Drugs+2*Math.pow($SFUnit.Drugs,2),_SFupkeep += 300*$SFUnit.Drugs>> <</if>> -<</if>> -<<if $SFUnit.Firebase >= 2 && $SFUnit.Drones > 0>> - <<set _FNGs += $SFUnit.Drones,_Trade += 0.5*$SFUnit.Drones,_unitMultiplier += 7.5*$SFUnit.Drones+2*Math.pow($SFUnit.Drones,2),_SFupkeep += 500*$SFUnit.Drones>> -<</if>> - -<<if $SFUnit.Firebase >= 4>> - <<if $SFUnit.AA > 0>> - <<set _FNGs += $SFUnit.AA,_Trade += 0.25*$SFUnit.AA,_unitMultiplier += 7.5*$SFUnit.AA+2*Math.pow($SFUnit.AA,2),_SFupkeep += 1000*$SFUnit.AA>> + <<if $SFUnit.Firebase >= 1>> + <<if $SFUnit.AV > 0>> + <<set _FNGs += $SFUnit.AV,_Trade += 0.25*$SFUnit.AV,_unitMultiplier += 7.5*$SFUnit.AV+2*Math.pow($SFUnit.AV,2),_SFupkeep += 1000*$SFUnit.AV>> + <</if>> + <<if $SFUnit.TV > 0>> + <<set _FNGs += $SFUnit.TV,_Trade += 0.25*$SFUnit.TV,_unitMultiplier += 7.5*$SFUnit.TV+2*Math.pow($SFUnit.TV,2), _SFupkeep += 800*$SFUnit.TV>> + <</if>> + <<if $SFUnit.PGT > 0>> + <<set _Trade += 0.25*($SFUnit.PGT),_unitMultiplier += 15*$SFUnit.PGT+3*Math.pow($SFUnit.PGT,2),_SFupkeep += 5000+1000*$SFUnit.PGT>> + <</if>> <</if>> - <<if $SFUnit.TA > 0>> - <<set _FNGs += $SFUnit.TA,_Trade += 0.25*$SFUnit.TA,_unitMultiplier += 7.5*$SFUnit.TA+2*Math.pow($SFUnit.TA,2),_SFupkeep += 800*$SFUnit.TA>> + <<if $SFUnit.Firebase >= 2 && $SFUnit.Drones > 0>> + <<set _FNGs += $SFUnit.Drones,_Trade += 0.5*$SFUnit.Drones,_unitMultiplier += 7.5*$SFUnit.Drones+2*Math.pow($SFUnit.Drones,2),_SFupkeep += 500*$SFUnit.Drones>> <</if>> - <<if $SFUnit.SpacePlane > 0>> - <<set _FNGs += $SFUnit.SpacePlane,_Trade += 0.25*$SFUnit.SpacePlane,_unitMultiplier += 7.5*$SFUnit.SpacePlane+2*Math.pow($SFUnit.SpacePlane,2),_SFupkeep += 1000*$SFUnit.SpacePlane>> + + <<if $SFUnit.Firebase >= 4>> + <<if $SFUnit.AA > 0>> + <<set _FNGs += $SFUnit.AA,_Trade += 0.25*$SFUnit.AA,_unitMultiplier += 7.5*$SFUnit.AA+2*Math.pow($SFUnit.AA,2),_SFupkeep += 1000*$SFUnit.AA>> + <</if>> + <<if $SFUnit.TA > 0>> + <<set _FNGs += $SFUnit.TA,_Trade += 0.25*$SFUnit.TA,_unitMultiplier += 7.5*$SFUnit.TA+2*Math.pow($SFUnit.TA,2),_SFupkeep += 800*$SFUnit.TA>> + <</if>> + <<if $SFUnit.SpacePlane > 0>> + <<set _FNGs += $SFUnit.SpacePlane,_Trade += 0.25*$SFUnit.SpacePlane,_unitMultiplier += 7.5*$SFUnit.SpacePlane+2*Math.pow($SFUnit.SpacePlane,2),_SFupkeep += 1000*$SFUnit.SpacePlane>> + <</if>> + <<if $SFUnit.GunS > 0>> + <<set _FNGs += $SFUnit.GunS,_Trade += 0.25*$SFUnit.GunS,_unitMultiplier += 12*$SFUnit.GunS+3*Math.pow($SFUnit.GunS,2),_SFupkeep += 3000+700*$SFUnit.GunS>> + <</if>> + <<if $SFUnit.Satellite > 0>> + <<set _FNGs += $SFUnit.Satellite,_Trade += 0.25*$SFUnit.Satellite,_unitMultiplier += 15*$SFUnit.Satellite+5*Math.pow($SFUnit.Satellite,2)>> + <</if>> + <<if $SFUnit.GiantRobot > 0>> + <<set _FNGs += $SFUnit.GiantRobot,_Trade += 0.25*$SFUnit.GiantRobot,_unitMultiplier += 15*$SFUnit.GiantRobot+5*Math.pow($SFUnit.GiantRobot,2),_SFupkeep += 10000+1500*$SFUnit.GiantRobot>> + <</if>> + <<if $SFUnit.MissileSilo > 0>> + <<set _Trade += 0.25*$SFUnit.MissileSilo,_unitMultiplier += 15*$SFUnit.MissileSilo+5*Math.pow($SFUnit.MissileSilo,2),_SFupkeep += 1000*$SFUnit.MissileSilo>> + <</if>> <</if>> - <<if $SFUnit.GunS > 0>> - <<set _FNGs += $SFUnit.GunS,_Trade += 0.25*$SFUnit.GunS,_unitMultiplier += 12*$SFUnit.GunS+3*Math.pow($SFUnit.GunS,2),_SFupkeep += 3000+700*$SFUnit.GunS>> + + <<if $SFUnit.AircraftCarrier > 0>> + <<set _FNGs += $SFUnit.AircraftCarrier,_Trade += 0.25*$SFUnit.AircraftCarrier,_unitMultiplier += 9*$SFUnit.AircraftCarrier+3*Math.pow($SFUnit.AircraftCarrier,2),_SFupkeep += 800*$SFUnit.AircraftCarrier>> <</if>> - <<if $SFUnit.Satellite > 0>> - <<set _FNGs += $SFUnit.Satellite,_Trade += 0.25*$SFUnit.Satellite,_unitMultiplier += 15*$SFUnit.Satellite+5*Math.pow($SFUnit.Satellite,2)>> + <<if $SFUnit.Sub > 0>> + <<set _FNGs += $SFUnit.Sub,_Trade += 0.25*$SFUnit.Sub,_unitMultiplier += 7.5*$SFUnit.Sub+2*Math.pow($SFUnit.Sub,2),_SFupkeep += 900*$SFUnit.Sub>> <</if>> - <<if $SFUnit.GiantRobot > 0>> - <<set _FNGs += $SFUnit.GiantRobot,_Trade += 0.25*$SFUnit.GiantRobot,_unitMultiplier += 15*$SFUnit.GiantRobot+5*Math.pow($SFUnit.GiantRobot,2),_SFupkeep += 10000+1500*$SFUnit.GiantRobot>> + <<if $SFUnit.HAT > 0>> + <<set _Trade += 0.25*$SFUnit.HAT,_unitMultiplier += 7.5*$SFUnit.HAT+2*Math.pow($SFUnit.HAT,2),_SFupkeep += 700*$SFUnit.HAT>> <</if>> - <<if $SFUnit.MissileSilo > 0>> - <<set _Trade += 0.25*$SFUnit.MissileSilo,_unitMultiplier += 15*$SFUnit.MissileSilo+5*Math.pow($SFUnit.MissileSilo,2),_SFupkeep += 1000*$SFUnit.MissileSilo>> -<</if>> -<</if>> - -<<if $SFUnit.AircraftCarrier > 0>> - <<set _FNGs += $SFUnit.AircraftCarrier,_Trade += 0.25*$SFUnit.AircraftCarrier,_unitMultiplier += 9*$SFUnit.AircraftCarrier+3*Math.pow($SFUnit.AircraftCarrier,2),_SFupkeep += 800*$SFUnit.AircraftCarrier>> -<</if>> -<<if $SFUnit.Sub > 0>> - <<set _FNGs += $SFUnit.Sub,_Trade += 0.25*$SFUnit.Sub,_unitMultiplier += 7.5*$SFUnit.Sub+2*Math.pow($SFUnit.Sub,2),_SFupkeep += 900*$SFUnit.Sub>> -<</if>> -<<if $SFUnit.HAT > 0>> - <<set _Trade += 0.25*$SFUnit.HAT,_unitMultiplier += 7.5*$SFUnit.HAT+2*Math.pow($SFUnit.HAT,2),_SFupkeep += 700*$SFUnit.HAT>> -<</if>> -<<set _SFD = $SF.Depravity>> -<<switch $SFColonel.Core>> - <<case "kind">> - <<set _FNGs += 10,_Trade += 0.15,_SFD -= 0.15>> - <<case "cruel">> - <<set _Trade -= 0.15,_SFD += 0.15>> - <<case "brazen">> - <<set _FNGs += 15,_unitMultiplier += 0.5>> - <<case "jaded">> - <<set _Trade -= 0.05,_SFD += 0.05>> - <<case "shell shocked">> - <<set _Trade += 0.05,_SFD -= 0.05,_unitMultiplier -= 0.5>> -<</switch>> -<<if $SF.Target == "raiding">> <<set _SFD += 0.05,_actionMultiplier += 0.5>> -<<elseif $SF.Target == "secure">> <<set _SFD -= 0.05,_actionMultiplier += 0.2>> -<<else>><<set _SFD -= 0.1,_actionMultiplier -= 0.5>><</if>> -<<if $SF.ROE == "free">> <<set _actionMultiplier *= 0.8,_SFD += 0.05,_Trade += _Trade*.95>> -<<elseif $SF.ROE == "hold">> <<set _actionMultiplier *= 1.1,_SFD -= 0.05,_Trade += _Trade*1.05>> <</if>> -<<if $SF.Regs == "none">> <<set _actionMultiplier *= 0.8,_SFD += 0.05,_Trade += _Trade*.95>> -<<elseif $SF.Regs == "strict">> <<set _actionMultiplier *= 1.1,_SFD -= 0.05,_Trade += _Trade*1.05>> <</if>> -<<set _depravityMultiplier = 1+_SFD>> -<<if _SFD > -2>> -<<set _Trade *= 1+_SFD/2>><</if>> + <<set _SFD = $SF.Depravity>> + <<switch $SFColonel.Core>> + <<case "kind">> + <<set _FNGs += 10,_Trade += 0.15,_SFD -= 0.15>> + <<case "cruel">> + <<set _Trade -= 0.15,_SFD += 0.15>> + <<case "brazen">> + <<set _FNGs += 15,_unitMultiplier += 0.5>> + <<case "jaded">> + <<set _Trade -= 0.05,_SFD += 0.05>> + <<case "shell shocked">> + <<set _Trade += 0.05,_SFD -= 0.05,_unitMultiplier -= 0.5>> + <</switch>> + <<if $SF.Target == "raiding">> <<set _SFD += 0.05,_actionMultiplier += 0.5>> + <<elseif $SF.Target == "secure">> <<set _SFD -= 0.05,_actionMultiplier += 0.2>> + <<else>> <<set _SFD -= 0.1,_actionMultiplier -= 0.5>> <</if>> + <<if $SF.ROE == "free">> <<set _actionMultiplier *= 0.8,_SFD += 0.05,_Trade += _Trade*.95>> + <<elseif $SF.ROE == "hold">> <<set _actionMultiplier *= 1.1,_SFD -= 0.05,_Trade += _Trade*1.05>> <</if>> + <<if $SF.Regs == "none">> <<set _actionMultiplier *= 0.8,_SFD += 0.05,_Trade += _Trade*.95>> + <<elseif $SF.Regs == "strict">> <<set _actionMultiplier *= 1.1,_SFD -= 0.05,_Trade += _Trade*1.05>> <</if>> + <<set _depravityMultiplier = 1+_SFD>> + <<if _SFD > -2>> <<set _Trade *= 1+_SFD/2>> <</if>> -<<if $SF.Target == "recruit">> <<set _FNGs += Math.ceil((_FNGs)*.95)>> -<<else>> <<set _FNGs += Math.ceil((_FNGs)*.25)>> <</if>> -<<if $SF.Target == "secure">> <<set $rep += Math.ceil($rep*((_Trade/100)*.95))>> - <<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.95))>> -<<else>> <<set $rep += Math.ceil($rep*((_Trade/100)*.25))>> - <<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.25))>> -<</if>> -<<if $secExp > 0>> <<set $authority += $SF.Units*10,$authority = Math.clamp($authority, 0, 20000)>> <</if>> + <<if $SF.Target == "recruit">> <<set _FNGs += Math.ceil((_FNGs)*.95)>> + <<else>> <<set _FNGs += Math.ceil((_FNGs)*.25)>> <</if>> + <<if $SF.Target == "secure">> <<set $rep += Math.ceil($rep*((_Trade/100)*.95))>> + <<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.95))>> + <<else>> <<set $rep += Math.ceil($rep*((_Trade/100)*.25))>> + <<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.25))>> + <</if>> + <<if $secExp > 0>> <<set $authority += $SF.Units*10,$authority = Math.clamp($authority, 0, 20000)>> <</if>> -<<set _SFIncome = Math.ceil(_SFIncome*_troopMultiplier*_unitMultiplier*_actionMultiplier*_depravityMultiplier-_SFupkeep),$SFUnit.Troops += Math.round(_FNGs/2)>> -/*Remove below line if hard mode ever gets fixed*/ -<<if $economy < 100>><<set _SFIncome = Math.ceil(_SFIncome*(1+($week/10)))>><</if>> -<<if $SFUnit.Troops > 2000>> <<set $SFUnit.Troops = random(1955,1999)>> <</if>> -<<if $rep > 20000>> <<set $rep = 20000>> <</if>> -<<if $arcologies[0].prosperity > $AProsperityCap>> - <<set $arcologies[0].prosperity = $AProsperityCap>> <</if>> -<<if _SFIncome >= 100000>> - <<set _Profitable = 1,$SF.Subsidy = 0,$cash += _SFIncome>> -<<else>> <<set _Profitable = 0>> <</if>> + <<set _SFIncome = Math.ceil(_SFIncome*_troopMultiplier*_unitMultiplier*_actionMultiplier*_depravityMultiplier-_SFupkeep),$SFUnit.Troops += Math.round(_FNGs/2)>> + /*Remove below line if hard mode ever gets fixed*/ + <<if $economy < 100>> <<set _SFIncome = Math.ceil(_SFIncome*(1+($week/10)))>> <</if>> + <<if $SFUnit.Troops > 2000>> <<set $SFUnit.Troops = random(1955,1999)>> <</if>> + <<if $rep > 20000>> <<set $rep = 20000>> <</if>> + <<if $arcologies[0].prosperity > $AProsperityCap>> + <<set $arcologies[0].prosperity = $AProsperityCap>> <</if>> + <<if _SFIncome >= 100000>> + <<set _Profitable = 1,$SF.Subsidy = 0,$cash += _SFIncome>> + <<else>> <<set _Profitable = 0>> <</if>> -<<if $SFUnit.Drugs >= 8 || $SFUnit.Drugs >= 10>> <<set _Deaths = 0,_SurvivalChance = 50>> - <<if $SFUnit.Drugs >= 8>> <<set _SurvivalChance -= 5>> <<elseif $SFUnit.Drugs >= 10>> - <<set _SurvivalChance += 5>> <</if>> - <<if random(0,100) > _SurvivalChance>> - <<set _Deaths = random(0,(($SFUnit.Drugs*2)+4))>> <</if>> - <<if _Deaths > 0>> <<set $SFUnit.Troops -= _Deaths>> <</if>> -<</if>> + <<if $SFUnit.Drugs >= 8 || $SFUnit.Drugs >= 10>> <<set _Deaths = 0,_SurvivalChance = 50>> + <<if $SFUnit.Drugs >= 8>> <<set _SurvivalChance -= 5>> <<elseif $SFUnit.Drugs >= 10>> + <<set _SurvivalChance += 5>> <</if>> + <<if random(0,100) > _SurvivalChance>> + <<set _Deaths = random(0,(($SFUnit.Drugs*2)+4))>> <</if>> + <<if _Deaths > 0>> <<set $SFUnit.Troops -= _Deaths>> <</if>> + <</if>> <</silently>> <br><br>__Status and Activities of $SF.Lower __: <br>This week, $SF.Lower focused their <<print commaNum($SFUnit.Troops)>> troops on -<<if $SF.Target == "recruit">> -recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity. -<<elseif $SF.Target == "secure">> -securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits. -<<elseif $SF.Target == "raiding">> -locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits. +<<if $SF.Target === "recruit">> + recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity. +<<elseif $SF.Target === "secure">> + securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits. +<<else>> + locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits. <</if>> <<if $SF.SpecOps > 0>> <br>A <<if $SF.SpecOps <2>>small<<else>>large<</if>> portion of the force was assigned as <<if $SF.SpecOps <2>>part<<else>>full<</if>> time undercover officers.<</if>> @@ -154,9 +153,9 @@ locating and striking targets of opportunity, capturing both material loot and n These activities have, overall, @@.green;improved@@ your arcology's prosperity. The goods procured by the $SF.Lower this week, after accounting for the spoils retained by individual soldiers were <<if _Profitable>> -@@.green;more than sufficient@@ to cover expenses. Excess materiel and human assets totaling @@.yellowgreen;<<print cashFormat(_SFIncome)>>@@ (after liquidation) were transferred to your accounts. + @@.green;more than sufficient@@ to cover expenses. Excess materiel and human assets totaling @@.yellowgreen;<<print cashFormat(_SFIncome)>>@@ (after liquidation) were transferred to your accounts. <<else>> -@@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability. + @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability. <</if>> $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week, and your reputation has @@.green;increased@@ through the improvement of trade security. @@ -200,5 +199,5 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week <<set $mercFreeManpower += _NewMercs,$SFTradeShow.TotalMercs += _NewMercs>> <<set $SFTradeShow.Mercs += _NewMercs>> <</if>> <<set $SFTradeShow.History += 1>> -<</if>><<if $SF.SpecOps === 1 && !$SF.SpecOpsLock>> <<set $SF.SpecOps = 0>> <</if>> -<<set $SF.U = 0,$SF.WG = 0,$SFColonel.Talk = 0,$SFColonel.Fun = 0>> +<</if>> <<if $SF.SpecOps === 1 && !$SF.SpecOpsLock>> <<set $SF.SpecOps = 0>> <</if>> +<<set $SF.U = 0,$SF.WG = 0,$SFColonel.Talk = 0,$SFColonel.Fun = 0>> \ No newline at end of file diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 933061777e1e2b676ba9b627755ebbf12bf054c1..ece1c3d8e19c54b09d0edd9a5c8794fc6aefa32b 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -21,17 +21,17 @@ <<set $corpCash = Math.trunc($corpCash + $corpProfit)>> Your corporation was valued at @@.yellowgreen;<<print cashFormat($corpValue)>>@@ and made a profit of @@.yellowgreen;<<print cashFormat($corpProfit)>>@@ last week. <<set _addedSlaves = Math.ceil(Math.log($captureAssets+$entrapmentAssets))>> -<<if $mercenariesHelpCorp > 0 || ($SF.Units >= 10 && $SFSupportLevel >= 4)>> +<<if $mercenariesHelpCorp > 0 || ($SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4)>> <<if $mercenariesHelpCorp > 0>> The $mercenariesTitle <<set _addedSlaves += Math.ceil(_addedSlaves * (1.04*$mercenaries))>> /* increase by 12-20% ($mercenaries == 3 - 5) */ <</if>> - <<if $mercenariesHelpCorp > 0 && $SF.Units >= 10>> + <<if $mercenariesHelpCorp > 0 && $SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4>> and a - <<elseif $SF.Units >= 10>> + <<elseif $SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4>> A <</if>> - <<if $SF.Units >= 10>> + <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4>> small portion of $SF.Lower <<set _addedSlaves += Math.ceil(_addedSlaves * (1.04*($SF.Units/10)))>> <</if>> @@ -39,21 +39,23 @@ Your corporation was valued at @@.yellowgreen;<<print cashFormat($corpValue)>>@@ <<else>> It <</if>> +was a <<if _roll > 90>> - was an outstanding week for corporate enslavement; + n outstanding <<set _addedSlaves *= 5>> <<elseif _roll > 60>> - was a great week for enslavement; + great <<set _addedSlaves *= 4>> <<elseif _roll > 40>> - was a good week for enslavement; + good <<set _addedSlaves *= 3>> <<elseif _roll > 20>> - was a mediocre week for enslavement; + mediocre <<set _addedSlaves *= 2>> <<else>> - was a bad week for enslavement; + bad <</if>> +week for <<if _roll > 90>> corporate <</if>> enslavement; <<set $corpPeopleEnslaved += _addedSlaves, $slaveAssets += 500 * _addedSlaves>> in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> people. <<set _trainingWeight = 0.6, _surgicalWeight = 0.2, _drugWeight = 0.2>> @@ -64,15 +66,17 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p <<set _drugWeight = 0.1, _trainingWeight += 0.1>> <</if>> <<set _improvementAssetsTotal = ($trainingAssets * _trainingWeight) + ($surgicalAssets * _surgicalWeight) + ($drugAssets * _drugWeight)>> +The corporation <<if _improvementAssetsTotal > $slaveAssets * 0.6>> - The corporation has enough training and medical assets to rapidly improve its human holdings. + has enough training and medical assets to rapidly improve <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*800)>> <<elseif _improvementAssetsTotal > $slaveAssets * 0.4>> - The corporation uses its training and medical assets to improve its human holdings. + uses its training and medical assets to improve <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*400)>> <<else>> - The corporation has only enough training and medical assets to maintain the value of its human holdings. + has only enough training and medical assets to maintain the value of <</if>> +its human holdings. /* model weekly corporate expenses as random 1-3% reduction in all asset types (including cash) ... except slaves, whose value is tied to $slaveCostFactor (which the corporation does not affect) */ <<set $trainingAssets = Math.max(Math.ceil($trainingAssets * random(97,99)/100), 500), $surgicalAssets = Math.max(Math.ceil($surgicalAssets * random(97,99)/100), 500), $drugAssets = Math.max(Math.ceil($drugAssets * random(97,99)/100), 500), $generalAssets = Math.max(Math.ceil($generalAssets * random(97,99)/100), 500), $entrapmentAssets = Math.max(Math.ceil($entrapmentAssets * random(97,99)/100), 500), $captureAssets = Math.max(Math.ceil($captureAssets * random(97,99)/100), 500), $corpCash = Math.ceil($corpCash * random(97,99)/100)>> <<if $corpMarket>> @@ -91,37 +95,35 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p enhances the value of its slaves. <</if>> <</if>> -<<set _dividendPerShare = 0.2 * $corpProfit / _totalShares>> -<<if _dividendPerShare > 5>> -<<set _dividendPerShare = 5 * Math.floor(0.2 * Math.log(_dividendPerShare)/Math.log(1.25))>> - Since it is incredibly profitable, a massive dividend of @@.yellowgreen;<<print cashFormat(_dividendPerShare)>>@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*_dividendPerShare)>>@@. - <<set $cash += $personalShares*_dividendPerShare, $corpCash -= _totalShares*_dividendPerShare>> -<<elseif _dividendPerShare > 3>> - Since it is extremely profitable, a huge dividend of @@.yellowgreen;¤3@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*3)>>@@. - <<set $cash += $personalShares*3, $corpCash -= _totalShares*3>> -<<elseif _dividendPerShare > 2>> - Since it is highly profitable, a huge dividend of @@.yellowgreen;¤2@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*2)>>@@. - <<set $cash += $personalShares*2, $corpCash -= _totalShares*2>> -<<elseif _dividendPerShare > 1>> - Since it is very profitable, a large dividend of @@.yellowgreen;¤1@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares)>>@@. - <<set $cash += $personalShares, $corpCash -= _totalShares>> -<<elseif _dividendPerShare > 0.5>> - Since it is quite profitable, a moderate dividend of @@.yellowgreen;¤0.5@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.5)>>@@. - <<set $cash += Math.trunc($personalShares*0.5), $corpCash -= Math.trunc(_totalShares*0.5)>> -<<elseif _dividendPerShare > 0.3>> - Since it is acceptably profitable, a reasonable dividend of @@.yellowgreen;¤0.3@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.3)>>@@. - <<set $cash += Math.trunc($personalShares*0.3), $corpCash -= Math.trunc(_totalShares*0.3)>> -<<elseif _dividendPerShare > 0.2>> - Since it is moderately profitable, a modest dividend of @@.yellowgreen;¤0.2@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.2)>>@@. - <<set $cash += Math.trunc($personalShares*0.2), $corpCash -= (_totalShares*0.2)>> -<<elseif _dividendPerShare > 0.1>> - Since it is modestly profitable, a small dividend of @@.yellowgreen;¤0.1@@/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.1)>>@@. - <<set $cash += Math.trunc($personalShares*0.1), $corpCash -= Math.trunc(_totalShares*0.1)>> -<<elseif $corpProfit > 0>> - Since its profits per share are low, a meager dividend was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat(1+Math.ceil(($corpProfit*0.2*$personalShares)/_totalShares))>>@@. - <<set $cash += 1+Math.ceil(($corpProfit*0.2*$personalShares)/_totalShares), $corpCash -= Math.trunc($corpProfit*0.2)>> +<<set _dividendPerShare = 0.2 * $corpProfit / _totalShares, _multplier = 0>> +Since it is +<<if _dividendPerShare > 5>> <<set _multplier = _dividendPerShare>> + <<set _dividendPerShare = 5 * Math.floor(0.2 * Math.log(_dividendPerShare)/Math.log(1.25))>> + incredibly profitable, a massive dividend of @@.yellowgreen;<<print cashFormat(_dividendPerShare)>>@@ +<<elseif _dividendPerShare > 3>> <<set _multplier = 3>> + extremely profitable, a huge dividend of @@.yellowgreen;¤3@@ +<<elseif _dividendPerShare > 2>> <<set _multplier = 2>> + highly profitable, a huge dividend of @@.yellowgreen;¤2@@ +<<elseif _dividendPerShare > 1>> <<set _multplier = 1>> + very profitable, a large dividend of @@.yellowgreen;¤1@@ +<<elseif _dividendPerShare > 0.5>> <<set _multplier = 0.5>> + quite profitable, a moderate dividend of @@.yellowgreen;¤0.5@@ +<<elseif _dividendPerShare > 0.3>> <<set _multplier = 0.3>> + acceptably profitable, a reasonable dividend of @@.yellowgreen;¤0.3@@ +<<elseif _dividendPerShare > 0.2>> <<set _multplier = 0.2>> + moderately profitable, a modest dividend of @@.yellowgreen;¤0.2@@ +<<elseif _dividendPerShare > 0.1>> <<set _multplier = 0.1>> + modestly profitable, a small dividend of @@.yellowgreen;¤0.1@@ +<<elseif $corpProfit > 0>> <<set _multplier = 1+Math.ceil(($corpProfit*0.2*$personalShares)/_totalShares)>> + bearly profitable, a meager dividend <</if>> - +<<if _dividendPerShare >= 0.1>>/share<</if>> was paid out to stockholders; you received @@.yellowgreen;<<if _dividendPerShare >= 0.1>> <<print cashFormat($personalShares*_multplier)>> <<else>> <<print cashFormat(_multplier)>> <</if>>@@. +<<if _dividendPerShare >= 0.1>> + <<set $cash += Math.trunc($personalShares*_multplier), $corpCash -= Math.trunc($personalShares*_multplier)>> +<<else>> + <<set $cash += _multplier, $corpCash -= Math.trunc($corpProfit*0.2)>> +<</if>> + <<set _roll = random(1,100)>> <<if $sharePrice*_totalShares < $corpValue*0.5>> /* market value is less than 50% of value of assets */ @@ -150,21 +152,28 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p Shares in your corporation are trading at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice))>>@@: <<if $oldSharePrice == $sharePrice>> - no different from last week. + no different from <<elseif $oldSharePrice > $sharePrice>> - down @@.yellowgreen;<<print cashFormat(Math.ceil(($oldSharePrice-$sharePrice)*100)/100)>>@@ since last week. + down @@.yellowgreen;<<print cashFormat(Math.ceil(($oldSharePrice-$sharePrice)*100)/100)>>@@ <<else>> - up @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice - $oldSharePrice)*100)/100)>>@@ since last week. + up @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice - $oldSharePrice)*100)/100)>>@@ <</if>> +last week. <<set $oldSharePrice = Math.ceil($sharePrice)>> You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*$personalShares))>>@@ personally while, <<print commaNum($publicShares)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*$publicShares))>>@@ are publicly held. <<set _PrivateOwnershipPercentage = Math.trunc(($personalShares/_totalShares)*100)>> <<set _PublicOwnershipPercentage = Math.trunc(($publicShares/_totalShares)*100)>> -<span id="CorpAction"> -<br><br> +<<if $personalShares-20000 > $publicShares || $personalShares-20000 > $publicShares || $cash > $sharePrice*20000 || ($publicShares > 20000 && $cash >= $sharePrice*20000)>> + <<if ndef $customValue>> + <<set $customValue = 21000>> + <</if>> + <br><br>Custom amount:<<textbox "$customValue" $customValue "Corporation Developments">> <<print commaNum($customValue)>> +<</if>> + +<span id="CorpAction"> <br><br> <<if _PrivateOwnershipPercentage < 51>>//You cannot give up majority control.// <<else>> /* actions that reduce private ownership percentage */ @@ -224,6 +233,17 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</replace>> <</link>> <</if>> + <<if $personalShares-$customValue > $publicShares>> + | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> + <<set $personalShares -= $customValue>> + <<set $publicShares += $customValue>> + <<set $cash += Math.ceil(($sharePrice*$customValue)*$customValue/100)>> + <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>> + <<replace "#CorpAction">> + <br>You sold <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@, driving the share price down significantly. + <</replace>> + <</link>> + <</if>> <<else>> //You cannot give up majority control.// <</if>> @@ -278,6 +298,16 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</replace>> <</link>> <</if>> + <<if $personalShares-$customValue > $publicShares>> + | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> + <<set $publicShares += $customValue>> + <<set $corpCash += Math.ceil(($sharePrice*$customValue)*$customValue/100)>> + <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> + <<replace "#CorpAction">> + <br>The corporation issued <<print commaNum($customValue)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@ driving the share price down significantly. + <</replace>> + <</link>> + <</if>> <<else>> //You cannot give up majority control.// <</if>> @@ -341,6 +371,17 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</replace>> <</link>> <</if>> + <<if $cash > $sharePrice*$customValue>> + | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> + <<set $personalShares += $customValue>> + <<set $cash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>> + <<set $corpCash += Math.ceil(($sharePrice*20000)*$customValue/10)>> + <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> + <<replace "#CorpAction">> + <br>You purchased <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@, from the corporation driving the share price down significantly. + <</replace>> + <</link>> + <</if>> <<else>> //You are unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.// <</if>> @@ -396,6 +437,16 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</replace>> <</link>> <</if>> + <<if $publicShares > $customValue && $cash >= $sharePrice*$customValue>> + | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> <<set $personalShares += $customValue>> + <<set $publicShares -= $customValue>> + <<set $cash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>> + <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>> + <<replace "#CorpAction">> + <br>You bought <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@, driving the share price up significantly. + <</replace>> + <</link>> + <</if>> <<elseif $publicShares > 1000>> //You are unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.// <<else>> @@ -452,6 +503,16 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</replace>> <</link>> <</if>> + <<if $publicShares > $customValue && $corpCash >= $sharePrice*$customValue>> + | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> + <<set $publicShares -= $customValue>> + <<set $corpCash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>> + <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>> + <<replace "#CorpAction">> + <br>The corporation bought back <<print commaNum($customValue)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@, driving the share price up significantly. + <</replace>> + <</link>> + <</if>> <<elseif $publicShares > 1000>> //The corporation is unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.// <<else>> @@ -460,14 +521,12 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</if>> /* closes actions that reduce public ownership percentage */ </span> -<br><br> +<br><br><br> -<br> <span id="cashOnHand">@@.yellowgreen;<<print cashFormat($corpCash)>>@@</span> in cash on hand. -<span id="update"></span> +<span id="update"> </span> <br> -<br> <<if $generalAssetPrice > 10>> <<if random(1,100) > 50>> <<set $generalAssetPrice -= 1>> @@ -597,9 +656,8 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<print cashFormat($generalAssetPrice*500)>>ea. <</if>> <span id="controlsgeneral"><<CorpDevBuySell "general" "Numgeneral">></span><span id='generalAssetsPurchasing'></span> -<</if>> +<</if>> <br> -<br> <<set $slaveAssetPrice = Math.trunc(10*$slaveCostFactor)>> <<if $detailedCorpControls != 1>> @@ -707,9 +765,8 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<print cashFormat($slaveAssetPrice*500)>>ea <</if>> <span id="controlsslave"><<CorpDevBuySell "slave" "Numslave">></span><span id='slaveAssetsPurchasing'></span> -<</if>> +<</if>> <br> -<br> <<if $entrapmentAssetPrice > 10>> <<if random(1,100) > 50>> <<set $entrapmentAssetPrice -= 1>> @@ -839,9 +896,8 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<print cashFormat($entrapmentAssetPrice*500)>>ea <</if>> <span id="controlsentrapment"><<CorpDevBuySell "entrapment" "Numentrapment">></span><span id='entrapmentAssetsPurchasing'></span> -<</if>> +<</if>> <br> -<br> <<if $captureAssetPrice > 10>> <<if random(1,100) > 50>> <<set $captureAssetPrice -= 1>> @@ -971,9 +1027,8 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<print cashFormat($captureAssetPrice*500)>>ea <</if>> <span id="controlscapture"><<CorpDevBuySell "capture" "Numcapture">></span><span id='captureAssetsPurchasing'></span> -<</if>> +<</if>> <br> -<br> <<if $trainingAssetPrice > 10>> <<if random(1,100) > 50>> <<set $trainingAssetPrice -= 1>> @@ -1103,9 +1158,8 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<print cashFormat($trainingAssetPrice*500)>>ea <</if>> <span id="controlstraining"><<CorpDevBuySell "training" "Numtraining">></span><span id='trainingAssetsPurchasing'></span> -<</if>> +<</if>> <br> -<br> <<if $surgicalAssetPrice > 10>> <<if random(1,100) > 50>> <<set $surgicalAssetPrice -= 1>> @@ -1235,9 +1289,8 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<print cashFormat($surgicalAssetPrice*500)>>ea <</if>> <span id="controlssurgical"><<CorpDevBuySell "surgical" "Numsurgical">></span><span id='surgicalAssetsPurchasing'></span> -<</if>> +<</if>> <br> -<br> <<if $drugAssetPrice > 10>> <<if random(1,100) > 50>> <<set $drugAssetPrice -= 1>> @@ -1369,8 +1422,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <span id="controlsdrug"><<CorpDevBuySell "drug" "Numdrug">></span><span id='drugAssetsPurchasing'></span> <</if>> -<br> -<span id="direction"> +<br> <span id="direction"> <<if $generalAssets >= 2000>> <<if $generalUpgradeBreaking == "unselected">>