Fixed bug with gang territory and power

This commit is contained in:
danielyxie 2017-09-02 15:05:42 -05:00
parent b078555e8b
commit 7b01360b3e
3 changed files with 74 additions and 4 deletions

39
dist/bundle.js vendored

@ -447,6 +447,7 @@ PlayerObject.prototype.prestigeSourceFile = function() {
//Gang //Gang
this.gang = null; this.gang = null;
Object(__WEBPACK_IMPORTED_MODULE_8__Gang_js__["e" /* resetGangs */])();
//Reset Stock market //Reset Stock market
this.hasWseAccount = false; this.hasWseAccount = false;
@ -4217,7 +4218,7 @@ let Engine = {
if (Engine.Counters.updateDisplaysLong <= 0) { if (Engine.Counters.updateDisplaysLong <= 0) {
if (Engine.currentPage === Engine.Page.Gang) { if (Engine.currentPage === Engine.Page.Gang) {
Object(__WEBPACK_IMPORTED_MODULE_14__Gang_js__["e" /* updateGangContent */])(); Object(__WEBPACK_IMPORTED_MODULE_14__Gang_js__["f" /* updateGangContent */])();
} }
Engine.Counters.updateDisplaysLong = 15; Engine.Counters.updateDisplaysLong = 15;
} }
@ -32457,9 +32458,10 @@ Environment.prototype = {
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function($) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return Gang; }); /* WEBPACK VAR INJECTION */(function($) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return Gang; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return displayGangContent; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return displayGangContent; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return updateGangContent; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return updateGangContent; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return loadAllGangs; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return loadAllGangs; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AllGangs; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AllGangs; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return resetGangs; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Constants_js__ = __webpack_require__(3); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Constants_js__ = __webpack_require__(3);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__engine_js__ = __webpack_require__(4); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__engine_js__ = __webpack_require__(4);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Faction_js__ = __webpack_require__(10); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Faction_js__ = __webpack_require__(10);
@ -32550,6 +32552,39 @@ let AllGangs = {
}, },
} }
function resetGangs() {
AllGangs = {
"Slum Snakes" : {
power: 1,
territory: 1/7,
},
"Tetrads" : {
power: 1,
territory: 1/7,
},
"The Syndicate" : {
power: 1,
territory: 1/7,
},
"The Dark Army" : {
power: 1,
territory: 1/7,
},
"Speakers for the Dead" : {
power: 1,
territory: 1/7,
},
"NiteSec" : {
power: 1,
territory: 1/7,
},
"The Black Hand" : {
power: 1,
territory: 1/7,
},
}
}
function loadAllGangs(saveString) { function loadAllGangs(saveString) {
AllGangs = JSON.parse(saveString, __WEBPACK_IMPORTED_MODULE_6__utils_JSONReviver_js__["c" /* Reviver */]); AllGangs = JSON.parse(saveString, __WEBPACK_IMPORTED_MODULE_6__utils_JSONReviver_js__["c" /* Reviver */]);
} }

@ -81,6 +81,39 @@ let AllGangs = {
}, },
} }
function resetGangs() {
AllGangs = {
"Slum Snakes" : {
power: 1,
territory: 1/7,
},
"Tetrads" : {
power: 1,
territory: 1/7,
},
"The Syndicate" : {
power: 1,
territory: 1/7,
},
"The Dark Army" : {
power: 1,
territory: 1/7,
},
"Speakers for the Dead" : {
power: 1,
territory: 1/7,
},
"NiteSec" : {
power: 1,
territory: 1/7,
},
"The Black Hand" : {
power: 1,
territory: 1/7,
},
}
}
function loadAllGangs(saveString) { function loadAllGangs(saveString) {
AllGangs = JSON.parse(saveString, Reviver); AllGangs = JSON.parse(saveString, Reviver);
} }
@ -1262,4 +1295,5 @@ function setGangMemberTaskDescription(memberObj, taskName) {
} }
} }
export {Gang, displayGangContent, updateGangContent, loadAllGangs, AllGangs}; export {Gang, displayGangContent, updateGangContent, loadAllGangs, AllGangs,
resetGangs};

@ -9,7 +9,7 @@ import {Programs} from "./CreateProgram.js";
import {determineCrimeSuccess} from "./Crimes.js"; import {determineCrimeSuccess} from "./Crimes.js";
import {Engine} from "./engine.js"; import {Engine} from "./engine.js";
import {Factions, Faction} from "./Faction.js"; import {Factions, Faction} from "./Faction.js";
import {Gang} from "./Gang.js"; import {Gang, resetGangs} from "./Gang.js";
import {Locations} from "./Location.js"; import {Locations} from "./Location.js";
import {AllServers, Server, AddToAllServers} from "./Server.js"; import {AllServers, Server, AddToAllServers} from "./Server.js";
import {SpecialServerIps, SpecialServerNames} from "./SpecialServerIps.js"; import {SpecialServerIps, SpecialServerNames} from "./SpecialServerIps.js";
@ -360,6 +360,7 @@ PlayerObject.prototype.prestigeSourceFile = function() {
//Gang //Gang
this.gang = null; this.gang = null;
resetGangs();
//Reset Stock market //Reset Stock market
this.hasWseAccount = false; this.hasWseAccount = false;