From 7fa056fe983b3fc1112825927df6e1bc8f9acdeb Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 22 Jun 2020 01:19:53 +0300
Subject: [PATCH] v1.4.32

---
 modules/burgs-and-states.js | 12 +++++++-----
 modules/ui/options.js       |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index b3083ac6..1fb2d9b5 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -599,14 +599,15 @@
 
   // generate historical conflicts of each state
   const generateCampaigns = function() {
-    const wars = {"War":4, "Conflict":2, "Campaign":4, "Invasion":2, "Rebellion":2, "Conquest":2, "Intervention":1, "Expedition":1, "Crusade":1};
+    const wars = {"War":6, "Conflict":2, "Campaign":4, "Invasion":2, "Rebellion":2, "Conquest":2, "Intervention":1, "Expedition":1, "Crusade":1};
 
     pack.states.forEach(s => {
       if (!s.i || s.removed) return;
       const n = s.neighbors.length ? s.neighbors : [0];
       s.campaigns = n.map(i => {
         const name = i && P(.8) ? pack.states[i].name : Names.getCultureShort(s.culture);
-        const start = gauss(options.year-100, 150, 1, options.year-6), end = start + gauss(4, 5, 1, options.year - start - 1);
+        const start = gauss(options.year-100, 150, 1, options.year-6);
+        const end = start + gauss(4, 5, 1, options.year - start - 1);
         return {name:getAdjective(name) + " " + rw(wars), start, end};
       }).sort((a, b) => a.start - b.start);
     });
@@ -689,9 +690,10 @@
 
       // start a war
       const war = [`${an}-${trimVowels(dn)}ian War`,`${an} declared a war on its rival ${dn}`];
-      const start = options.year - gauss(2, 2, 0, 5);
-      states[attacker].campaigns.push({name: `${trimVowels(dn)}ian War`, start, end:options.year});
-      states[defender].campaigns.push({name: `${trimVowels(an)}ian War`, start, end:options.year});
+      const end = options.year;
+      const start = end - gauss(2, 2, 0, 5);
+      states[attacker].campaigns.push({name: `${trimVowels(dn)}ian War`, start, end});
+      states[defender].campaigns.push({name: `${trimVowels(an)}ian War`, start, end});
 
       // attacker vassals join the war
       ad.forEach((r, d) => {if (r === "Suzerain") {
diff --git a/modules/ui/options.js b/modules/ui/options.js
index f5f2d4b9..581800c0 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -399,7 +399,7 @@ function randomizeCultureSet() {
 function generateEra() {
   if (!stored("year")) yearInput.value = rand(100, 2000); // current year
   if (!stored("era")) eraInput.value = Names.getBaseShort(P(.7) ? 1 : rand(nameBases.length)) + " Era";
-  options.year = yearInput.value;
+  options.year = +yearInput.value;
   options.era = eraInput.value;
   options.eraShort = options.era.split(" ").map(w => w[0].toUpperCase()).join(""); // short name for era
 }