diff --git a/app/assets/css/app.css b/app/assets/css/app.css
index 594c881..ecb49a7 100644
--- a/app/assets/css/app.css
+++ b/app/assets/css/app.css
@@ -310,3 +310,5 @@ body, html, .content {
a.destBtn {
color: #eee; }
+
+.hide { display:none; }
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 0c88348..fb21e16 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -67,7 +67,7 @@
$(".inventory .refresh").click(function() {
console.log("Refresh");
- wssend(global.active + "List");
+ wssend(global.active[0].toUpperCase() + global.active.substring(1) + "List");
});
$(".inventory .close").click(function() {
@@ -103,8 +103,8 @@
ga("send", "event", "transfer", name);
wssend({
Command: "TransferPokemon",
- PokemonId: transfer.attr("id"),
- Data: transfer.attr("id")
+ PokemonId: id,
+ Data: id
});
global.map.pokemonList.splice(idx, 1);
parent.parent().fadeOut();
@@ -123,8 +123,8 @@
ga("send", "event", "evolve", name);
wssend({
Command: "EvolvePokemon",
- PokemonId: evolve.attr("id"),
- Data: evolve.attr("id")
+ PokemonId: id,
+ Data: id
});
global.map.pokemonList.splice(idx, 1);
parent.parent().fadeOut();
@@ -143,7 +143,7 @@
parent.find(".transferAction").toggleClass("hide");
wssend({
Command: "FavoritePokemon",
- PokemonId: evolve.attr("id"),
+ PokemonId: id,
Favorite: selected.favorite
});
});
diff --git a/app/scripts/inventory.js b/app/scripts/inventory.js
index f6e34f4..0ea6800 100644
--- a/app/scripts/inventory.js
+++ b/app/scripts/inventory.js
@@ -40,7 +40,7 @@
749:33, 752:33.5, 755:34, 758:34.5, 761:35, 764:35.5, 767:36, 770:36.5, 773:37,
776: 37.5, 778:38, 781:38.5, 784:39, 790:40};
service.getPokemonLevel = function(pokemon) {
- var p = (pokemon.combat_power_multiplier + pokemon.additional_cp_multiplier)*1000;
+ var p = (pokemon.CpMultiplier + pokemon.AdditionalCpMultiplier)*1000;
return lvlMap[p|0];
}
diff --git a/app/scripts/map.js b/app/scripts/map.js
index f226fbc..69e78b7 100644
--- a/app/scripts/map.js
+++ b/app/scripts/map.js
@@ -310,7 +310,6 @@ Map.prototype.displayPokemonList = function(all, sortBy, eggs) {
${elt.name} lvl ${elt.lvl}
CP: ${elt.cp} IV: ${elt.iv}%
- ATK: ${elt.stats.atk} DEF: ${elt.stats.def} STA: ${elt.stats.sta}
Candy: ${elt.candy}/${elt.candyToEvolve}
`);
diff --git a/app/scripts/socket.js b/app/scripts/socket.js
index 0ff534b..0d9e8a3 100644
--- a/app/scripts/socket.js
+++ b/app/scripts/socket.js
@@ -108,7 +108,8 @@ function listenToWebSocket() {
realname: inventory.getPokemonName(p.Item1.PokemonId, "en"),
candy: p.Item3,
candyToEvolve: pkmInfo ? pkmInfo.CandyToEvolve : 0,
- favorite: p.Item1.Favorite != 0
+ favorite: p.Item1.Favorite != 0,
+ lvl: inventory.getPokemonLevel(p.Item1),
}
});
global.map.displayPokemonList(pkm);
@@ -168,7 +169,9 @@ function listenToWebSocket() {
// nothing
} else if (command.indexOf("EggIncubatorStatusEvent") >= 0) {
// nothing
- } else if (command.indexOf("iconAnchor") >= 0) {
+ } else if (command.indexOf("HumanWalkingEvent") >= 0) {
+ // nothing
+ } else if (command.indexOf("UnaccurateLocation") >= 0) {
// nothing
} else if (command.indexOf("ErrorEvent") >= 0) {
console.log(msg.Message);