From e0adb758cf0c45a70f25259920feaa10fb199dbd Mon Sep 17 00:00:00 2001 From: danielyxie Date: Fri, 1 Sep 2017 15:40:51 -0500 Subject: [PATCH 1/4] Fix Gang UI bug --- src/Gang.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Gang.js b/src/Gang.js index 67066023d..60d72956a 100644 --- a/src/Gang.js +++ b/src/Gang.js @@ -1028,7 +1028,7 @@ function updateGangContent() { "fact that your wanted level is too high. Consider assigning a few members to the 'Vigilante Justice' or 'Ethical Hacking' " + "tasks to lower your wanted level.

" + "Installing Augmentations does NOT reset your progress with your Gang. Furthermore, after installing Augmentations, you will " + - "automatically be a member of whatever Faction you created your gain with.

" + + "automatically be a member of whatever Faction you created your gang with.

" + "

Respect: Represents the amount of respect " + "your gang has from other gangs and criminal organizations. Your respect affects the amount of money " + "your gang members will earn, and also determines how much reputation you are earning with your gang's " + @@ -1139,6 +1139,7 @@ function createGangMemberDisplayElement(memberObj) { taskDiv.setAttribute("class", "gang-member-info-div"); var taskSelector = document.createElement("select"); taskSelector.style.color = "white"; + taskSelector.style.backgroundColor = "black"; taskSelector.setAttribute("id", name + "gang-member-task-selector"); var tasks = null; if (Player.gang.isHackingGang) { From 57ce0b3d535dd5e8450b4512f86e9154989c59ed Mon Sep 17 00:00:00 2001 From: danielyxie Date: Fri, 1 Sep 2017 15:42:28 -0500 Subject: [PATCH 2/4] Added new bundle with bug fix --- dist/bundle.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/bundle.js b/dist/bundle.js index e6cdfabad..cbae2878e 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -33511,7 +33511,7 @@ function updateGangContent() { "fact that your wanted level is too high. Consider assigning a few members to the 'Vigilante Justice' or 'Ethical Hacking' " + "tasks to lower your wanted level.

" + "Installing Augmentations does NOT reset your progress with your Gang. Furthermore, after installing Augmentations, you will " + - "automatically be a member of whatever Faction you created your gain with.

" + + "automatically be a member of whatever Faction you created your gang with.

" + "

Respect: Represents the amount of respect " + "your gang has from other gangs and criminal organizations. Your respect affects the amount of money " + "your gang members will earn, and also determines how much reputation you are earning with your gang's " + @@ -33622,6 +33622,7 @@ function createGangMemberDisplayElement(memberObj) { taskDiv.setAttribute("class", "gang-member-info-div"); var taskSelector = document.createElement("select"); taskSelector.style.color = "white"; + taskSelector.style.backgroundColor = "black"; taskSelector.setAttribute("id", name + "gang-member-task-selector"); var tasks = null; if (__WEBPACK_IMPORTED_MODULE_4__Player_js__["a" /* Player */].gang.isHackingGang) { From eac664a3d07a1ed14c8bcee93849e9018ebc5463 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Fri, 1 Sep 2017 16:23:57 -0500 Subject: [PATCH 3/4] Fixed background color on Infiltration selector --- css/popupboxes.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/popupboxes.css b/css/popupboxes.css index d84c84fd1..b3c3b953f 100644 --- a/css/popupboxes.css +++ b/css/popupboxes.css @@ -118,6 +118,10 @@ margin: 8px; } +#infiltration-faction-select { + background-color:black; +} + /* Generic Yes No Box */ #yes-no-text-input-box-input { color: white; From 7b01360b3eea0c8638a12a45c0560f58e6cd99c4 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Sat, 2 Sep 2017 15:05:42 -0500 Subject: [PATCH 4/4] Fixed bug with gang territory and power --- dist/bundle.js | 39 +++++++++++++++++++++++++++++++++++++-- src/Gang.js | 36 +++++++++++++++++++++++++++++++++++- src/Player.js | 3 ++- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index cbae2878e..d3741b508 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -447,6 +447,7 @@ PlayerObject.prototype.prestigeSourceFile = function() { //Gang this.gang = null; + Object(__WEBPACK_IMPORTED_MODULE_8__Gang_js__["e" /* resetGangs */])(); //Reset Stock market this.hasWseAccount = false; @@ -4217,7 +4218,7 @@ let Engine = { if (Engine.Counters.updateDisplaysLong <= 0) { 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; } @@ -32457,9 +32458,10 @@ Environment.prototype = { "use strict"; /* 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__, "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__, "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_1__engine_js__ = __webpack_require__(4); /* 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) { AllGangs = JSON.parse(saveString, __WEBPACK_IMPORTED_MODULE_6__utils_JSONReviver_js__["c" /* Reviver */]); } diff --git a/src/Gang.js b/src/Gang.js index eb6ea0916..c342ca88d 100644 --- a/src/Gang.js +++ b/src/Gang.js @@ -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) { 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}; diff --git a/src/Player.js b/src/Player.js index 8293d7d28..674e5f0a6 100644 --- a/src/Player.js +++ b/src/Player.js @@ -9,7 +9,7 @@ import {Programs} from "./CreateProgram.js"; import {determineCrimeSuccess} from "./Crimes.js"; import {Engine} from "./engine.js"; import {Factions, Faction} from "./Faction.js"; -import {Gang} from "./Gang.js"; +import {Gang, resetGangs} from "./Gang.js"; import {Locations} from "./Location.js"; import {AllServers, Server, AddToAllServers} from "./Server.js"; import {SpecialServerIps, SpecialServerNames} from "./SpecialServerIps.js"; @@ -360,6 +360,7 @@ PlayerObject.prototype.prestigeSourceFile = function() { //Gang this.gang = null; + resetGangs(); //Reset Stock market this.hasWseAccount = false;