Resolve #21
This commit is contained in:
parent
9d2b1d0c32
commit
1fc7b2ecbf
|
@ -609,7 +609,7 @@
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
var EventPokemon, INT_TO_GENERATION, checkMove, getGenerationFromInt, getMinimumGeneration, loopLearnsets, mustLearnMove, self, switchableFormes, unportableGenerations, unsketchableMoves, _, _ref,
|
var EventPokemon, INT_TO_GENERATION, checkMove, eeveelutions, getGenerationFromInt, getMinimumGeneration, loopLearnsets, mustLearnMove, self, switchableFormes, unportableGenerations, unsketchableMoves, _, _ref,
|
||||||
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
|
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
|
||||||
|
|
||||||
self = (typeof module !== "undefined" && module !== null ? module.exports : void 0) || window;
|
self = (typeof module !== "undefined" && module !== null ? module.exports : void 0) || window;
|
||||||
|
@ -661,9 +661,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
loopLearnsets = function(Generations, pokemon, forGeneration, iterator) {
|
loopLearnsets = function(Generations, pokemon, forGeneration, iterator) {
|
||||||
var FormeData, SpeciesData, ability, finalForme, forme, formeName, generation, hasHiddenAbility, learnset, minimumGeneration, species, theFormes, thePokemon, _i, _j, _k, _len, _len1, _ref1;
|
var FormeData, SpeciesData, ability, finalForme, forme, formeName, generation, hasHiddenAbility, learnset, minimumGeneration, origspecies, species, theFormes, thePokemon, _i, _j, _k, _len, _len1, _ref1;
|
||||||
minimumGeneration = getMinimumGeneration(forGeneration);
|
minimumGeneration = getMinimumGeneration(forGeneration);
|
||||||
species = pokemon.species, forme = pokemon.forme, ability = pokemon.ability;
|
species = pokemon.species, forme = pokemon.forme, ability = pokemon.ability;
|
||||||
|
origspecies = species;
|
||||||
formeName = forme || "default";
|
formeName = forme || "default";
|
||||||
thePokemon = [];
|
thePokemon = [];
|
||||||
theFormes = [formeName];
|
theFormes = [formeName];
|
||||||
|
@ -719,8 +720,10 @@
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
eeveelutions = ['Vaporeon', 'Jolteon', 'Flareon', 'Espeon', 'Umbreon', 'Leafeon', 'Glaceon', 'Sylveon'];
|
||||||
|
|
||||||
self.learnableMoves = function(Generations, pokemon, forGeneration) {
|
self.learnableMoves = function(Generations, pokemon, forGeneration) {
|
||||||
var learnable;
|
var ele, index, learnable, remindex, _i, _len, _ref1;
|
||||||
learnable = [];
|
learnable = [];
|
||||||
loopLearnsets(Generations, pokemon, forGeneration, function(learnset, pokemonSpecies, formeName) {
|
loopLearnsets(Generations, pokemon, forGeneration, function(learnset, pokemonSpecies, formeName) {
|
||||||
var event, events, method, moveName, moves, _i, _len, _ref1, _results;
|
var event, events, method, moveName, moves, _i, _len, _ref1, _results;
|
||||||
|
@ -757,6 +760,17 @@
|
||||||
return _results;
|
return _results;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if ((_ref1 = pokemon.species, __indexOf.call(eeveelutions, _ref1) >= 0) && forGeneration === 7) {
|
||||||
|
remindex = -1;
|
||||||
|
for (index = _i = 0, _len = learnable.length; _i < _len; index = ++_i) {
|
||||||
|
ele = learnable[index];
|
||||||
|
if (__indexOf.call(ele, "Hydro Pump") >= 0 && __indexOf.call(ele, "Flare Blitz") >= 0 && __indexOf.call(ele, "Psychic") >= 0 && pokemon.species !== 'Eevee') {
|
||||||
|
remindex = index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
learnable.splice(remindex, 1);
|
||||||
|
console.log(learnable);
|
||||||
|
}
|
||||||
return _.chain(learnable).flatten().sort().unique().value();
|
return _.chain(learnable).flatten().sort().unique().value();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -609,7 +609,7 @@
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
var EventPokemon, INT_TO_GENERATION, checkMove, getGenerationFromInt, getMinimumGeneration, loopLearnsets, mustLearnMove, self, switchableFormes, unportableGenerations, unsketchableMoves, _, _ref,
|
var EventPokemon, INT_TO_GENERATION, checkMove, eeveelutions, getGenerationFromInt, getMinimumGeneration, loopLearnsets, mustLearnMove, self, switchableFormes, unportableGenerations, unsketchableMoves, _, _ref,
|
||||||
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
|
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
|
||||||
|
|
||||||
self = (typeof module !== "undefined" && module !== null ? module.exports : void 0) || window;
|
self = (typeof module !== "undefined" && module !== null ? module.exports : void 0) || window;
|
||||||
|
@ -661,9 +661,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
loopLearnsets = function(Generations, pokemon, forGeneration, iterator) {
|
loopLearnsets = function(Generations, pokemon, forGeneration, iterator) {
|
||||||
var FormeData, SpeciesData, ability, finalForme, forme, formeName, generation, hasHiddenAbility, learnset, minimumGeneration, species, theFormes, thePokemon, _i, _j, _k, _len, _len1, _ref1;
|
var FormeData, SpeciesData, ability, finalForme, forme, formeName, generation, hasHiddenAbility, learnset, minimumGeneration, origspecies, species, theFormes, thePokemon, _i, _j, _k, _len, _len1, _ref1;
|
||||||
minimumGeneration = getMinimumGeneration(forGeneration);
|
minimumGeneration = getMinimumGeneration(forGeneration);
|
||||||
species = pokemon.species, forme = pokemon.forme, ability = pokemon.ability;
|
species = pokemon.species, forme = pokemon.forme, ability = pokemon.ability;
|
||||||
|
origspecies = species;
|
||||||
formeName = forme || "default";
|
formeName = forme || "default";
|
||||||
thePokemon = [];
|
thePokemon = [];
|
||||||
theFormes = [formeName];
|
theFormes = [formeName];
|
||||||
|
@ -719,8 +720,10 @@
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
eeveelutions = ['Vaporeon', 'Jolteon', 'Flareon', 'Espeon', 'Umbreon', 'Leafeon', 'Glaceon', 'Sylveon'];
|
||||||
|
|
||||||
self.learnableMoves = function(Generations, pokemon, forGeneration) {
|
self.learnableMoves = function(Generations, pokemon, forGeneration) {
|
||||||
var learnable;
|
var ele, index, learnable, remindex, _i, _len, _ref1;
|
||||||
learnable = [];
|
learnable = [];
|
||||||
loopLearnsets(Generations, pokemon, forGeneration, function(learnset, pokemonSpecies, formeName) {
|
loopLearnsets(Generations, pokemon, forGeneration, function(learnset, pokemonSpecies, formeName) {
|
||||||
var event, events, method, moveName, moves, _i, _len, _ref1, _results;
|
var event, events, method, moveName, moves, _i, _len, _ref1, _results;
|
||||||
|
@ -757,6 +760,17 @@
|
||||||
return _results;
|
return _results;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if ((_ref1 = pokemon.species, __indexOf.call(eeveelutions, _ref1) >= 0) && forGeneration === 7) {
|
||||||
|
remindex = -1;
|
||||||
|
for (index = _i = 0, _len = learnable.length; _i < _len; index = ++_i) {
|
||||||
|
ele = learnable[index];
|
||||||
|
if (__indexOf.call(ele, "Hydro Pump") >= 0 && __indexOf.call(ele, "Flare Blitz") >= 0 && __indexOf.call(ele, "Psychic") >= 0 && pokemon.species !== 'Eevee') {
|
||||||
|
remindex = index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
learnable.splice(remindex, 1);
|
||||||
|
console.log(learnable);
|
||||||
|
}
|
||||||
return _.chain(learnable).flatten().sort().unique().value();
|
return _.chain(learnable).flatten().sort().unique().value();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,7 @@ getGenerationFromInt = (generationInteger) ->
|
||||||
loopLearnsets = (Generations, pokemon, forGeneration, iterator) ->
|
loopLearnsets = (Generations, pokemon, forGeneration, iterator) ->
|
||||||
minimumGeneration = getMinimumGeneration(forGeneration)
|
minimumGeneration = getMinimumGeneration(forGeneration)
|
||||||
{species, forme, ability} = pokemon
|
{species, forme, ability} = pokemon
|
||||||
|
origspecies = species
|
||||||
formeName = forme || "default"
|
formeName = forme || "default"
|
||||||
# Find pre-evolutions and formes
|
# Find pre-evolutions and formes
|
||||||
thePokemon = []
|
thePokemon = []
|
||||||
|
@ -100,6 +101,17 @@ loopLearnsets = (Generations, pokemon, forGeneration, iterator) ->
|
||||||
return true if iterator(learnset, species, formeName, generation) == true
|
return true if iterator(learnset, species, formeName, generation) == true
|
||||||
return false
|
return false
|
||||||
|
|
||||||
|
eeveelutions = [
|
||||||
|
'Vaporeon'
|
||||||
|
'Jolteon'
|
||||||
|
'Flareon'
|
||||||
|
'Espeon'
|
||||||
|
'Umbreon'
|
||||||
|
'Leafeon'
|
||||||
|
'Glaceon'
|
||||||
|
'Sylveon'
|
||||||
|
]
|
||||||
|
|
||||||
# Returns an array of moves that this Pokemon can learn for a given generation.
|
# Returns an array of moves that this Pokemon can learn for a given generation.
|
||||||
self.learnableMoves = (Generations, pokemon, forGeneration) ->
|
self.learnableMoves = (Generations, pokemon, forGeneration) ->
|
||||||
learnable = []
|
learnable = []
|
||||||
|
@ -121,6 +133,13 @@ self.learnableMoves = (Generations, pokemon, forGeneration) ->
|
||||||
for moveName of Generations[getGenerationFromInt(forGeneration)].MoveData
|
for moveName of Generations[getGenerationFromInt(forGeneration)].MoveData
|
||||||
if moveName not in unsketchableMoves
|
if moveName not in unsketchableMoves
|
||||||
learnable.push(moveName)
|
learnable.push(moveName)
|
||||||
|
if pokemon.species in eeveelutions and forGeneration is 7
|
||||||
|
remindex = -1
|
||||||
|
for ele, index in learnable
|
||||||
|
if "Hydro Pump" in ele and "Flare Blitz" in ele and "Psychic" in ele and pokemon.species != 'Eevee'
|
||||||
|
remindex = index
|
||||||
|
learnable.splice(remindex, 1)
|
||||||
|
console.log(learnable)
|
||||||
|
|
||||||
_.chain(learnable).flatten().sort().unique().value()
|
_.chain(learnable).flatten().sort().unique().value()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue