fixes

src/SecExp/attackReport.tw

@@ -73,10 +73,63 @@
 		<<set $PCvictories++>>
 	<</if>>
 <</if>>
+<<set _day = $day + random(0,7)>>
+<<set _month = $month>>
+<<set _year = $year>>
+<<switch _month>>
+<<case "January">>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "February">>
+<</if>>
+<<case "February">>
+<<if _day > 28>>
+	<<set _day -= 28, _month = "March">>
+<</if>>
+<<case "March">>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "April">>
+<</if>>
+<<case "April">>
+<<if _day > 30>>
+	<<set _day -= 30, _month = "May">>
+<</if>>
+<<case "May">>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "June">>
+<</if>>
+<<case "June">>
+<<if _day > 30>>
+	<<set _day -= 30, _month = "July">>
+<</if>>
+<<case "July">>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "August">>
+<</if>>
+<<case "August">>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "September">>
+<</if>>
+<<case "September">>
+<<if _day > 30>>
+	<<set _day -= 30, _month = "October">>
+<</if>>
+<<case "October">>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "November">>
+<</if>>
+<<case "November">>
+<<if _day > 30>>
+	<<set _day -= 30, _month = "December">>
+<</if>>
+<<default>>
+<<if _day > 31>>
+	<<set _day -= 31, _month = "January", _year += 1>>
+<</if>>
+<</switch>>
 <hr>
 
 <<if $attackType == "raiders">>
-	Today, the <<print $day + random(0,7)>> of $month $year, our arcology was attacked by a band of wild raiders, $attackTroops men strong. Our defense forces clashed with them 
+	Today, the _day of _month _year, our arcology was attacked by a band of wild raiders, $attackTroops men strong. Our defense forces clashed with them 
 	<<if $battleTerrain == "urban">>
 		in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
 		<<elseif $battleTerrain == "rural">>
@@ -139,7 +192,7 @@
 		You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
 	<</if>>
 <<elseif $attackType == "free city">>
-	Today, the <<print $day + random(0,7)>> of $month, $year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, $attackTroops men strong. Our defense forces clashed with them 
+	Today, the <<print _day + random(0,7)>> of _month, _year, our arcology was attacked by a contingent of mercenaries hired by a competing free city, $attackTroops men strong. Our defense forces clashed with them 
 	<<if $battleTerrain == "urban">>
 		in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
 	<<elseif $battleTerrain == "rural">>
@@ -202,7 +255,7 @@
 		You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
 	<</if>>
 <<elseif $attackType == "freedom fighters">>
-	Today, the <<print $day + random(0,7)>> of $month, $year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, $attackTroops men strong. Our defense forces clashed with them 
+	Today, the <<print _day + random(0,7)>> of _month, _year, our arcology was attacked by a group of freedom fighters bent on the destruction of the institution of slavery, $attackTroops men strong. Our defense forces clashed with them 
 	<<if $battleTerrain == "urban">>
 		in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
 	<<elseif $battleTerrain == "rural">>
@@ -265,7 +318,7 @@
 		You decided in favor of a financial approach rather than open hostilities. Your troops remain inside the arcology's walls.
 	<</if>>
 <<elseif $attackType == "old world">>
-	Today, the <<print $day + random(0,7)>> of $month, $year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, $attackTroops men strong. Our defense forces clashed with them 
+	Today, the <<print _day + random(0,7)>> of _month, _year, our arcology was attacked by an old world nation boasting a misplaced sense of superiority, $attackTroops men strong. Our defense forces clashed with them 
 	<<if $battleTerrain == "urban">>
 		in the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>,
 	<<elseif $battleTerrain == "rural">>

src/SecExp/edicts.tw

@@ -79,7 +79,7 @@
 <</if>>
 
 <<if $hasFoughtOnce == 1>>
-<br><br>Defense Force:__
+<br><br>__Defense Force:__
 	<<if $slavesOfficers == 1>>
 		<br>''Slave Officers:'' your trusted slaves are allowed to lead the defense forces of the arcology.
 		[[Repeal|edicts][$slavesOfficers = 0, $edictsAuthUpkeep -= 10]]

src/SecExp/unitsBattleReport.tw

@@ -131,7 +131,7 @@
 					catastrofic casualties
 				<</if>>
 				<<if $militiaUnits[_j].medics == 1>>
-					, however <<print math.trunc(_loss * $militiaUnits[_j].medics * 0.25)>> men were saved by the medics attached to this unit.
+					, however <<print Math.trunc(_loss * $militiaUnits[_j].medics * 0.25)>> men were saved by the medics attached to this unit.
 				<<else>>
 					.
 				<</if>>
@@ -175,7 +175,7 @@
 					catastrofic casualties
 				<</if>>
 				<<if $slaveUnits[_j].medics == 1>>
-					, however <<print math.trunc(_loss * $slaveUnits[_j].medics * 0.25)>> men were saved by the medics attached to this unit.
+					, however <<print Math.trunc(_loss * $slaveUnits[_j].medics * 0.25)>> men were saved by the medics attached to this unit.
 				<<else>>
 					.
 				<</if>>
@@ -220,7 +220,7 @@
 				<</if>>
 				<<if $mercUnits[_j].medics == 1>>
 					, however 
-					<<print math.trunc(_loss * $mercUnits[_j].medics * 0.25)>> men were saved by the medics attached to this unit.
+					<<print Math.trunc(_loss * $mercUnits[_j].medics * 0.25)>> men were saved by the medics attached to this unit.
 				<<else>>
 					.
 				<</if>>

src/js/economyJS.tw

@@ -63,12 +63,12 @@ window.getCost = function(array) {
 	
 	//security expansion
 	if(State.variables.secExp == 1) {
-		costs += State.variables.edictsUpkeep;
-		
+		if(State.variables.edictsUpkeep > 0) {
+			costs += State.variables.edictsUpkeep;
+		}
 		if(State.variables.SFSupportUpkeep > 0) {
 			costs += State.variables.SFSupportUpkeep;
 		}
-		
 		if(State.variables.propHub > 0) {
 			costs += State.variables.propHubUpkeep;
 		}
@@ -100,6 +100,7 @@ window.getCost = function(array) {
 			}
 		}
 	}
+	
 	//general arcology costs
 	costs += (State.variables.girls * (250 + (economy * 500)));