Merge pull request #155 from danielyxie/dev

Fix bug when checking for null

dist/bundle.js

@@ -36029,18 +36029,18 @@ function updateStockOrderList(stock) {
     if (__WEBPACK_IMPORTED_MODULE_1__engine_js__["Engine"].currentPage !== __WEBPACK_IMPORTED_MODULE_1__engine_js__["Engine"].Page.StockMarket) {return;}
     var tickerId = "stock-market-ticker-" + stock.symbol;
     var orderList = document.getElementById(tickerId + "-order-list");
-    if (orderList === null) {
+    if (orderList == null) {
         console.log("ERROR: Could not find order list for " + stock.symbol);
         return;
     }
 
     var orderBook = StockMarket["Orders"];
-    if (orderBook === null) {
+    if (orderBook == null) {
         console.log("ERROR: Could not find order book in stock market");
         return;
     }
     var stockOrders = orderBook[stock.symbol];
-    if (stockOrders === null) {
+    if (stockOrders == null) {
         console.log("ERROR: Could not find orders for: " + stock.symbol);
         return;
     }

src/CompanyManagement.js

@@ -1,6 +1,6 @@
 /*
 Products
-    For certain industries, players can created their own custom products
+    For certain industries, players can creat their own custom products
     Essentially, these are just things you give a certain name to.
 
     Products have certain properties that affect how well they sell. These properties
@@ -139,18 +139,39 @@ Industries:
         Telecommunications -
 
     Employees:
-        Has morale and energy that must be managed to maintain productivity
+        Has morale, happiness, and energy that must be managed to maintain productivity
         Stats:
-            Intelligence, Charisma, Experience, Creativity, Efficiency
+            Age, Intelligence, Charisma, Experience, Creativity, Efficiency
 
         Assigned to different positions. The productivity at each position is determined by
         stats. I.e. each employe should be assigned to positions based on stats to optimize production
 
-    Position
+    Employee Position
         Operations -
         Engineer -
         Business -
         Accounting -
         Management -
         Research and Development -
+
+    Company stats
+        A Company has an inventory of products and materials
+
+        Financial stats (All numbers are in per second):
+            Revenue - Total income generated
+            Expenses - Total Expenses
+            Profit - Revenue minus Expenses
+            Private Valuation: Investor valuation of your company before you go public. Affects how much money they invest
+            Market Cap: Once you go public, it is the total number of shares times stock price
+            Earnings Per Share(EPS): Net Income (Profit) / Number of Oustanding Shares
+            Price to Earnings: P/E Ratio = Price per Share / EPS
+
+        Awareness:
+        Warehouse Space: How many materials it can stock
+
+        Office Space - Increases max employees
+                     - However if # employees is near the max, then employee happiness decreases
+
+
+    Investors
 */

src/StockMarket.js

@@ -1076,18 +1076,18 @@ function updateStockOrderList(stock) {
     if (Engine.currentPage !== Engine.Page.StockMarket) {return;}
     var tickerId = "stock-market-ticker-" + stock.symbol;
     var orderList = document.getElementById(tickerId + "-order-list");
-    if (orderList === null) {
+    if (orderList == null) {
         console.log("ERROR: Could not find order list for " + stock.symbol);
         return;
     }
 
     var orderBook = StockMarket["Orders"];
-    if (orderBook === null) {
+    if (orderBook == null) {
         console.log("ERROR: Could not find order book in stock market");
         return;
     }
     var stockOrders = orderBook[stock.symbol];
-    if (stockOrders === null) {
+    if (stockOrders == null) {
         console.log("ERROR: Could not find orders for: " + stock.symbol);
         return;
     }