Merge pull request #431 from Kline-/fix-BN8

Move resetting stocks, gang, and corp to the end of the funcs.
This commit is contained in:
danielyxie 2018-08-10 00:07:54 -05:00 committed by GitHub
commit c726ff1738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

54
src/Prestige.js Normal file → Executable file

@ -109,17 +109,6 @@ function prestigeAugmentation() {
//Messages
initMessages();
//Reset Stock market
if (Player.hasWseAccount) {
initStockMarket();
initSymbolToStockMap();
}
setStockMarketContentCreated(false);
var stockMarketList = document.getElementById("stock-market-list");
while(stockMarketList.firstChild) {
stockMarketList.removeChild(stockMarketList.firstChild);
}
//Gang, in BitNode 2
if (Player.bitNodeN == 2 && Player.inGang()) {
var faction = Factions[Player.gang.facName];
@ -139,6 +128,17 @@ function prestigeAugmentation() {
Player.hasWseAccount = true;
Player.hasTixApiAccess = true;
}
//Reset Stock market
if (Player.hasWseAccount) {
initStockMarket();
initSymbolToStockMap();
}
setStockMarketContentCreated(false);
var stockMarketList = document.getElementById("stock-market-list");
while(stockMarketList.firstChild) {
stockMarketList.removeChild(stockMarketList.firstChild);
}
var mainMenu = document.getElementById("mainmenu-container");
mainMenu.style.visibility = "visible";
@ -241,22 +241,6 @@ function prestigeSourceFile() {
//Reinitialize Bit Node flags
initSingularitySFFlags();
//Reset Stock market, gang, and corporation
if (Player.hasWseAccount) {
initStockMarket();
initSymbolToStockMap();
}
setStockMarketContentCreated(false);
var stockMarketList = document.getElementById("stock-market-list");
while(stockMarketList.firstChild) {
stockMarketList.removeChild(stockMarketList.firstChild);
}
Player.gang = null;
deleteGangDisplayContent();
Player.corporation = null;
Player.bladeburner = null;
//BitNode 3: Corporatocracy
if (Player.bitNodeN === 3) {
Player.money = new Decimal(150e9);
@ -316,6 +300,22 @@ function prestigeSourceFile() {
Player.hasTixApiAccess = true;
}
//Reset Stock market, gang, and corporation
if (Player.hasWseAccount) {
initStockMarket();
initSymbolToStockMap();
}
setStockMarketContentCreated(false);
var stockMarketList = document.getElementById("stock-market-list");
while(stockMarketList.firstChild) {
stockMarketList.removeChild(stockMarketList.firstChild);
}
Player.gang = null;
deleteGangDisplayContent();
Player.corporation = null;
Player.bladeburner = null;
//Gain int exp
Player.gainIntelligenceExp(5);
}