Merge branch 'master' into #138-ui-bugs

src/App.tsx

@@ -37,7 +37,7 @@ const emptyMinigame: IMinigame = {
 };
 
 export default class App extends React.Component<IProps, IState> {
-    static readonly maxWeeks: number = 5;
+    static readonly maxWeeks: number = 9;
     private choiceManager: ChoicesManager;
     private eventManager: EventsManager;
     private minigameManager: MinigamesManager;

src/game-config.json

@@ -3,16 +3,17 @@
 		"pool": [
 			"CuteGirlEvent",
 			"SquirrelEvent",
-			"MidtermEvent"
+			"MidtermEvent",
+			"BlockPartyEvent",
+			"CoronaEvent"
 		],
 		"followUp": [
-			"LandingEvent", "PickFacultyEvent"
+			"LandingEvent", "PickFacultyEvent", "ImagineDayEvent"
 		],
 		"seasonal": [
-			["ImagineDayEvent"],
+			[],
 			["DayOfTheLongBoatEvent", "BoomerGregorEvent", "FratPartyEvent"],
-			["StormTheWallEvent", "CryMidtermPaperEvent"],
-			["BlockPartyEvent", "CoronaEvent"]
+			["StormTheWallEvent", "CryMidtermPaperEvent"]
 		]
 	}
-}
+}

src/trackers/EventTracker.ts

@@ -31,19 +31,17 @@ export default class EventTracker {
         if (this.queue.length > 0)
             return this.queue.shift() as IEvent;
 
-        // const r = Math.random() * 100;
-        // 0 to 11
-        const month = (Math.floor(week / 4)) % 4;
-        if (this.pool.length > 0 &&
-            (this.seasonal[month].length === 0)) {
+        const r = Math.random() * 100;
+        const month = (Math.floor(week / 4)) % 3;       // 0 to 11
+        if (this.pool.length > 0 && (r > this.SEASONAL_CHANCE || this.seasonal[month].length === 0)) {
             // If we roll a normal pool or if there are no seasonal events then
             // use the normal pool (given that there are still things in the
             // normal pool)
             let event = this.pool[Math.floor(Math.random() * this.pool.length)];
             const index = this.pool.indexOf(event);
             this.pool.splice(index, 1);
             return event;
-        } else if (this.seasonal[month].length > 0) {
+        } else if (r <= this.SEASONAL_CHANCE || this.seasonal[month].length > 0) {
             // Else we use the seasonal events pool
             let event = this.seasonal[month][Math.floor(Math.random() * this.seasonal[month].length)];
             const index = this.seasonal[month].indexOf(event);