Skip to content

Commit

Permalink
Merge pull request #1099 from scibuff/beta
Browse files Browse the repository at this point in the history
Fixed kits from the last pull
  • Loading branch information
Gindi4711 authored May 27, 2020
2 parents 1d6698f + 5e4fb3e commit 2d5e59a
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions js/web/_main/js/_main.js
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,16 @@ const FoEproxy = (function () {
MainParser.setGoodsData(data.responseData);
});

// Required by the kits
FoEproxy.addHandler('InventoryService', 'getItems', (data, postData) => {
MainParser.UpdateInventory(data.responseData);
});

// Required by the kits
FoEproxy.addHandler('InventoryService', 'getInventory', (data, postData) => {
MainParser.UpdateInventory(data.responseData.inventoryItems);
});

// --------------------------------------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------
// Es wurde das LG eines Mitspielers angeklickt, bzw davor die Übersicht
Expand All @@ -715,7 +725,7 @@ const FoEproxy = (function () {
let LastKostenrechnerOpenTime = 0;
FoEproxy.addHandler('GreatBuildingsService', 'getOtherPlayerOverview', (data, postData) => {
MainParser.UpdatePlayerDict(data.responseData, 'LGOverview');

if (data.responseData[0].player.player_id === ExtPlayerID || !Settings.GetSetting('PreScanLGList')) {
return;
}
Expand Down Expand Up @@ -881,7 +891,7 @@ const FoEproxy = (function () {
FoEproxy.addHandler('OtherPlayerService', 'visitPlayer', (data, postData) => {
let OtherPlayer = data.responseData.other_player;
let IsPlunderable = (OtherPlayer.is_neighbor && !OtherPlayer.is_friend && !OtherPlayer.is_guild_member);

if (Settings.GetSetting('ShowAllPlayerAttDeff') || IsPlunderable && Settings.GetSetting('ShowNeighborsGoods')) {
Reader.OtherPlayersBuildings(data.responseData, IsPlunderable);
}
Expand Down Expand Up @@ -1906,13 +1916,13 @@ let MainParser = {
*
* @param Items
*/
// UpdateInventory: (Items) => {
// MainParser.Inventory = {};
// for (let i = 0; i < Items.length; i++) {
// let ID = Items[i]['id'];
// MainParser.Inventory[ID] = Items[i];
// }
// },
UpdateInventory: (Items) => {
MainParser.Inventory = {};
for (let i = 0; i < Items.length; i++) {
let ID = Items[i]['id'];
MainParser.Inventory[ID] = Items[i];
}
},


/**
Expand Down

0 comments on commit 2d5e59a

Please sign in to comment.