Merge pull request #115 from danielyxie/dev

scp and donate for rep bug fixes
This commit is contained in:
danielyxie 2017-08-31 12:19:46 -05:00 committed by GitHub
commit 83bec596d9
6 changed files with 690 additions and 676 deletions

1349
dist/bundle.js vendored

File diff suppressed because it is too large Load Diff

@ -11,7 +11,7 @@ import {factionInvitationBoxCreate} from "../utils/FactionInvitation
import {clearEventListeners} from "../utils/HelperFunctions.js"; import {clearEventListeners} from "../utils/HelperFunctions.js";
import {Reviver, Generic_toJSON, import {Reviver, Generic_toJSON,
Generic_fromJSON} from "../utils/JSONReviver.js"; Generic_fromJSON} from "../utils/JSONReviver.js";
import {formatNumber} from "../utils/StringHelperFunctions.js"; import {formatNumber, isPositiveNumber} from "../utils/StringHelperFunctions.js";
import {yesNoBoxCreate, yesNoBoxGetYesButton, import {yesNoBoxCreate, yesNoBoxGetYesButton,
yesNoBoxGetNoButton, yesNoBoxClose} from "../utils/YesNoBox.js"; yesNoBoxGetNoButton, yesNoBoxClose} from "../utils/YesNoBox.js";

@ -5,6 +5,7 @@ import {Companies, Company, CompanyPosition,
import {CONSTANTS} from "./Constants.js"; import {CONSTANTS} from "./Constants.js";
import {Programs} from "./CreateProgram.js"; import {Programs} from "./CreateProgram.js";
import {parseDarkwebItemPrice, DarkWebItems} from "./DarkWeb.js"; import {parseDarkwebItemPrice, DarkWebItems} from "./DarkWeb.js";
import {Engine} from "./engine.js";
import {Factions, Faction, joinFaction, import {Factions, Faction, joinFaction,
factionExists, purchaseAugmentation} from "./Faction.js"; factionExists, purchaseAugmentation} from "./Faction.js";
import {getCostOfNextHacknetNode, import {getCostOfNextHacknetNode,

@ -20,7 +20,8 @@ import {SpecialServerIps, SpecialServerIpsMap,
prestigeSpecialServerIps, prestigeSpecialServerIps,
SpecialServerNames} from "./SpecialServerIps.js"; SpecialServerNames} from "./SpecialServerIps.js";
import {initStockMarket, initSymbolToStockMap, import {initStockMarket, initSymbolToStockMap,
stockMarketContentCreated} from "./StockMarket.js"; stockMarketContentCreated,
setStockMarketContentCreated} from "./StockMarket.js";
import {Terminal, postNetburnerText} from "./Terminal.js"; import {Terminal, postNetburnerText} from "./Terminal.js";
import Decimal from '../utils/decimal.js'; import Decimal from '../utils/decimal.js';
@ -99,7 +100,7 @@ function prestigeAugmentation() {
if (Player.hasWseAccount) { if (Player.hasWseAccount) {
initStockMarket(); initStockMarket();
initSymbolToStockMap(); initSymbolToStockMap();
stockMarketContentCreated = false; setStockMarketContentCreated(false);
var stockMarketList = document.getElementById("stock-market-list"); var stockMarketList = document.getElementById("stock-market-list");
while(stockMarketList.firstChild) { while(stockMarketList.firstChild) {
stockMarketList.removeChild(stockMarketList.firstChild); stockMarketList.removeChild(stockMarketList.firstChild);

@ -349,6 +349,10 @@ function updateStockPrices() {
} }
} }
function setStockMarketContentCreated(b) {
stockMarketContentCreated = b;
}
var stockMarketContentCreated = false; var stockMarketContentCreated = false;
function displayStockMarketContent() { function displayStockMarketContent() {
if (Player.hasWseAccount == null) {Player.hasWseAccount = false;} if (Player.hasWseAccount == null) {Player.hasWseAccount = false;}
@ -607,4 +611,5 @@ function updateStockPlayerPosition(stock) {
export {StockMarket, StockSymbols, SymbolToStockMap, initStockSymbols, export {StockMarket, StockSymbols, SymbolToStockMap, initStockSymbols,
initStockMarket, initSymbolToStockMap, stockMarketCycle, buyStock, initStockMarket, initSymbolToStockMap, stockMarketCycle, buyStock,
sellStock, updateStockPrices, displayStockMarketContent, sellStock, updateStockPrices, displayStockMarketContent,
updateStockTicker, updateStockPlayerPosition, loadStockMarket}; updateStockTicker, updateStockPlayerPosition, loadStockMarket,
setStockMarketContentCreated};

@ -17,7 +17,7 @@ import {killWorkerScript, addWorkerScript} from "./NetscriptWorker.js";
import {Player} from "./Player.js"; import {Player} from "./Player.js";
import {hackWorldDaemon} from "./RedPill.js"; import {hackWorldDaemon} from "./RedPill.js";
import {findRunningScript, RunningScript, import {findRunningScript, RunningScript,
AllServersMap} from "./Script.js"; AllServersMap, Script} from "./Script.js";
import {AllServers, GetServerByHostname, import {AllServers, GetServerByHostname,
getServer, Server} from "./Server.js"; getServer, Server} from "./Server.js";
import {SpecialServerIps, import {SpecialServerIps,