Merge branch 'master' of github.com:ubclaunchpad/ubcsim2 into showcase

ubclaunchpad · Jul 23, 2020 · 3b1e61f · 3b1e61f
2 parents baa9522 + 32055ea
commit 3b1e61f
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 27 deletions.
diff --git a/.static/thumbnail.png b/.static/thumbnail.png
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# :thought_balloon: UBC Simulator 2
+![UBC Simulator 2](./.static/thumbnail.png)
 
 [![Build Status](https://travis-ci.com/ubclaunchpad/ubcsim2.svg?branch=master)](https://travis-ci.com/ubclaunchpad/ubcsim2)
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "description": "A 'choose your own adventure' style browser game where the player attempts to survive a year as a student at UBC.",
-  "homepage": "https://ubclaunchpad.github.io/ubcsim2",
+  "homepage": "https://ubcsim2.ubclaunchpad.com",
   "main": "index.js",
   "scripts": {
     "lint": "tslint --project tsconfig.json",

diff --git a/public/CNAME b/public/CNAME
@@ -0,0 +1 @@
+ubcsim2.ubclaunchpad.com
diff --git a/public/index.css b/public/index.css
@@ -20,6 +20,7 @@ p {
   text-align: center;
   padding: 0;
   margin: 0;
+  flex-direction: column;
 }
 
 #game-container {

diff --git a/public/index.html b/public/index.html
@@ -13,6 +13,9 @@
 
   <!-- Import Font -->
   <link href="https://fonts.googleapis.com/css?family=VT323&display=swap" rel="stylesheet">
+
+  <!-- Fathom - website analytics https://app.usefathom.com/share/dymzbwsl/ubcsim2.ubclaunchpad.com -->
+  <script src="https://chinchilla.ubclaunchpad.com/script.js" site="DYMZBWSL" excluded-domains="localhost" defer></script>
 </head>
 
 <body>

diff --git a/src/App.tsx b/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;
@@ -223,6 +223,11 @@ export default class App extends React.Component<IProps, IState> {
                         </div>
                     </section>
                 </div>
+                <div style={{ marginTop: "32px" }}>
+                    <p>
+                        A <a href="https://ubclaunchpad.com" target="_blank" rel="noopener noreferrer">UBC Launch Pad</a> project.
+                    </p>
+                </div>
             </div>
         );
     }

diff --git a/src/events.json b/src/events.json
@@ -80,7 +80,7 @@
 		"choices": [
 			"LoremIpsum"
 		],
-		"hasBottomBoxBorder": false,
+		"hasBottomBoxBorder": true,
 		"hasInnerFill": true,
 		"gamePlayMode": "Comics"
 	},
@@ -90,7 +90,7 @@
 		"choices": [
 			"DarnIt"
 		],
-		"hasBottomBoxBorder": false,
+		"hasBottomBoxBorder": true,
 		"hasInnerFill": true,
 		"gamePlayMode": "Comics"
 	},
@@ -100,7 +100,7 @@
 		"choices": [
 			"BlockPartyCancelled"
 		],
-		"hasBottomBoxBorder": false,
+		"hasBottomBoxBorder": true,
 		"hasInnerFill": true,
 		"gamePlayMode": "Comics"
 	},
@@ -149,7 +149,7 @@
 	},
 	"StormTheWallEvent": {
 		"prompt": "Wanna Storm the Wall bro?",
-		"imgPath": "StormTheWallEvent/stormTheWall",
+		"imgPath": "StormTheWallEvent/stormTheWall.png",
 		"choices": [
 			"ScaleWall",
 			"CantReachTopShelf"
@@ -220,4 +220,4 @@
 		"hasInnerFill": true,
 		"gamePlayMode": "GameOver"
 	}
-}
+}
diff --git a/src/game-config.json b/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"]
 		]
 	}
-}
+}
diff --git a/src/minigames.json b/src/minigames.json
@@ -1,20 +1,17 @@
 {
-    "EssayWrite":
-    {
+    "EssayWrite": {
         "build": "essay_write",
         "winStatChanges": [0, 1, 0],
         "loseStatChanges": [0, -1, 0],
         "prompt": "Click to write your essay!"
     },
-    "SquirrelJump":
-    {
+    "SquirrelJump": {
         "build": "squirrel_jump",
         "winStatChanges": [10, 0.5, 0],
         "loseStatChanges": [-20, -0.5, 0],
-        "prompt": "Jump over all the squirrels!"
+        "prompt": "Click to jump over all the squirrels!"
     },
-    "ToiletPaperCatch":
-    {
+    "ToiletPaperCatch": {
         "build": "toilet_paper_catch",
         "winStatChanges": [10, 0, 10],
         "loseStatChanges": [-10, -0, -10],

diff --git a/src/trackers/EventTracker.ts b/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);