Deukhoofd/BattleSim
1
0 Fork 0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2026-10-31 06:01:40 +00:00
Code Issues Releases Wiki Activity

Gotta git gud

Browse Source
This commit is contained in:
Deukhoofd committed 2016-02-20 00:54:42 +01:00
1 parent 19558607f3
commit 1114909caf
32 files changed
+401 -121
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

public/Sprites/back-s/542-mega.png → public/Sprites/back-s/542-armor.png
View File
File renamed without changes.
public/Sprites/back/208-mega.png → public/Sprites/back/208-mega-i.png
View File
File renamed without changes.
public/Sprites/back/542_1.png → public/Sprites/back/542-armor.png
View File
File renamed without changes.
public/Sprites/front-s/542-mega.png → public/Sprites/front-s/542-armor.png
View File
File renamed without changes.
public/Sprites/front/542-mega.png → public/Sprites/front/542-armor.png
View File
File renamed without changes.
public/js/app.js
+24 -12
View File
@@ -754,7 +754,7 @@
looper = loopLearnsets.bind(null, Generations, pokemon, generation);
pokemonSpecies = pokemon.species;
pokemonForme = pokemon.forme || "default";
pokemonLevel = pokemon.level || 100;
pokemonLevel = pokemon.level || generation.maxLevel;
FormeData = Generations[getGenerationFromInt(generation)].FormeData;
forme = FormeData[pokemonSpecies][pokemonForme];
if (generation === 4) {
@@ -877,7 +877,7 @@
checkMove = function(looper, pokemon, move) {
var checksOut, level;
level = pokemon.level;
level || (level = 100);
level || (level = 120);
checksOut = looper(function(learnset) {
var _ref1, _ref2, _ref3, _ref4;
if (((_ref1 = learnset["level-up"]) != null ? _ref1[move] : void 0) <= level || ((_ref2 = learnset["machine"]) != null ? _ref2[move] : void 0) <= level || ((_ref3 = learnset["tutor"]) != null ? _ref3[move] : void 0) <= level) {
@@ -993,7 +993,8 @@
}).call(this);
(function() {
var Tiers, actualtiers, conditions, self, _, _base, _ref;
var Tiers, actualtiers, conditions, self, _, _base, _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; };
self = (typeof window !== "undefined" && window !== null ? (_base = window.PokeBattle).Tier != null ? _base.Tier : _base.Tier = {} : this);
@@ -1093,6 +1094,9 @@
forme = megaForme;
}
}
if (species === "Rayquaza" && (pokemon.moves != null) && __indexOf.call(pokemon.moves, "Dragon Ascent") >= 0) {
forme = "mega";
}
tier = (speciesData != null ? (_ref2 = speciesData[forme]) != null ? _ref2.tier[0] : void 0 : void 0) || 'Unsorted';
tierdata = actualtiers[tier];
if (typeof tierdata === 'undefined') {
@@ -1523,7 +1527,7 @@
this.set('ability', this.getAbilities()[0]);
}
if (!attributes.level) {
this.set('level', 100);
this.set('level', this.getGeneration.maxLevel);
}
if (isNaN(attributes.happiness)) {
this.set('happiness', 100);
@@ -1738,7 +1742,7 @@
if (base === 1) {
return 1;
}
level = this.get('level') || 100;
level = this.get('level') || this.getGeneration.maxLevel;
iv = this.iv(key);
ev = Math.floor(this.ev(key) / 4);
return total = key === 'hp' ? Math.floor((2 * base + iv + ev) * (level / 100) + level + 10) : Math.floor(((2 * base + iv + ev) * (level / 100) + 5) * this.natureBoost(key));
@@ -5717,9 +5721,17 @@
};
PokemonEditView.prototype.changeItem = function(e) {
var $list;
var $list, ItemData, item, itemdata;
$list = $(e.currentTarget);
return this.pokemon.set("item", $list.val());
item = $list.val();
ItemData = this.generation.ItemData;
itemdata = ItemData[item];
this.pokemon.set("item", item);
if (typeof itemdata.itemForme !== 'undefined' && itemdata.itemForme[0] === this.pokemon.get('species')) {
return this.pokemon.set('forme', itemdata.itemForme[1]);
} else if (typeof this.pokemon.getForme().isItemBased !== 'undefined' && this.pokemon.getForme().isItemBased) {
return this.pokemon.set('forme', 'default');
}
};
PokemonEditView.prototype.changeGender = function(e) {
@@ -5732,8 +5744,8 @@
var $input, value;
$input = $(e.currentTarget);
value = parseInt($input.val(), 10);
if (isNaN(value) || value > 120) {
value = 1120;
if (isNaN(value) || value > this.generation.maxLevel) {
value = this.generation.maxLevel;
}
if (value < 1) {
value = 1;
@@ -10279,7 +10291,7 @@
}
}
} else if (line.match(/^Level:\s+(.*)$/i)) {
pokemon.level = Number(RegExp.$1) || 100;
pokemon.level = Number(RegExp.$1) || 120;
} else if (line.match(/^Happiness:\s+(.*)$/i)) {
pokemon.happiness = Number(RegExp.$1) || 0;
} else if (line.match(/^Shiny: Yes$/i)) {
@@ -10394,7 +10406,7 @@
if (pokemon.nature) {
s.push("" + pokemon.nature + " nature");
}
if (pokemon.level && pokemon.level !== 100) {
if (pokemon.level && pokemon.level !== 120) {
s.push("Level: " + pokemon.level);
}
if (pokemon.shiny) {
@@ -11273,7 +11285,7 @@
createChallengeButton({
eventName: "findBattleunranked",
button: $mainButtons.find('.find_battle_non_ranked'),
clauses: [Conditions.SLEEP_CLAUSE, Conditions.EVASION_CLAUSE, Conditions.SPECIES_CLAUSE, Conditions.OHKO_CLAUSE, Conditions.PRANKSTER_SWAGGER_CLAUSE, Conditions.UNRELEASED_BAN, Conditions.TIMED_BATTLE]
clauses: [Conditions.SLEEP_CLAUSE, Conditions.EVASION_CLAUSE, Conditions.SPECIES_CLAUSE, Conditions.OHKO_CLAUSE, Conditions.PRANKSTER_SWAGGER_CLAUSE, Conditions.TIMED_BATTLE]
});
createChallengePaneNew({
populate: $mainButtons.find('.find_battle_select_team')
public/js/data.js
+1 -1
View File
@@ -1,3 +1,3 @@
var Generations = {"RB":{"SpeciesData":{"Abomasnow":{"eggGroups":["monster","grass"],"evolvedFrom":"Snover","genderRatio":4,"generation":4,"id":460},"Abra":{"eggGroups":["human-like"],"evolvesInto":["Kadabra"],"genderRatio":2,"generation":1,"id":63},"Absol":{"eggGroups":["field"],"genderRatio":4,"generation":3,"id":359},"Accelgor":{"eggGroups":["bug"],"evolvedFrom":"Shelmet","genderRatio":4,"generation":5,"id":617},"Aerodactyl":{"eggGroups":["flying"],"genderRatio":1,"generation":1,"id":142},"Aggron":{"eggGroups":["monster"],"evolvedFrom":"Lairon","genderRatio":4,"generation":3,"id":306},"Aipom":{"eggGroups":["field"],"evolvesInto":["Ambipom"],"genderRatio":4,"generation":2,"id":190},"Alakazam":{"eggGroups":["human-like"],"evolvedFrom":"Kadabra","genderRatio":2,"generation":1,"id":65},"Alomomola":{"eggGroups":["water1","water2"],"genderRatio":4,"generation":5,"id":594},"Altaria":{"eggGroups":["flying","dragon"],"evolvedFrom":"Swablu","genderRatio":4,"generation":3,"id":334},"Ambipom":{"eggGroups":["field"],"evolvedFrom":"Aipom","genderRatio":4,"generation":4,"id":424},"Amoonguss":{"eggGroups":["grass"],"evolvedFrom":"Foongus","genderRatio":4,"generation":5,"id":591},"Ampharos":{"eggGroups":["monster","field"],"evolvedFrom":"Flaaffy","genderRatio":4,"generation":2,"id":181},"Anorith":{"eggGroups":["water3"],"evolvesInto":["Armaldo"],"genderRatio":1,"generation":3,"id":347},"Arbok":{"eggGroups":["field","dragon"],"evolvedFrom":"Ekans","genderRatio":4,"generation":1,"id":24},"Arcanine":{"eggGroups":["field"],"evolvedFrom":"Growlithe","genderRatio":2,"generation":1,"id":59},"Arceus":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":493},"Archen":{"eggGroups":["flying","water3"],"evolvesInto":["Archeops"],"genderRatio":1,"generation":5,"id":566},"Archeops":{"eggGroups":["flying","water3"],"evolvedFrom":"Archen","genderRatio":1,"generation":5,"id":567},"Ariados":{"eggGroups":["bug"],"evolvedFrom":"Spinarak","genderRatio":4,"generation":2,"id":168},"Armaldo":{"eggGroups":["water3"],"evolvedFrom":"Anorith","genderRatio":1,"generation":3,"id":348},"Aron":{"eggGroups":["monster"],"evolvesInto":["Lairon"],"genderRatio":4,"generation":3,"id":304},"Articuno":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":1,"id":144},"Audino":{"eggGroups":["fairy"],"genderRatio":4,"generation":5,"id":531},"Axew":{"eggGroups":["monster","dragon"],"evolvesInto":["Fraxure"],"genderRatio":4,"generation":5,"id":610},"Azelf":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":482},"Azumarill":{"eggGroups":["water1","fairy"],"evolvedFrom":"Marill","genderRatio":4,"generation":2,"id":184},"Azurill":{"eggGroups":["undiscovered"],"evolvesInto":["Marill"],"genderRatio":6,"generation":3,"id":298},"Bagon":{"eggGroups":["dragon"],"evolvesInto":["Shelgon"],"genderRatio":4,"generation":3,"id":371},"Baltoy":{"eggGroups":["mineral"],"evolvesInto":["Claydol"],"genderRatio":-1,"generation":3,"id":343},"Banette":{"eggGroups":["amorphous"],"evolvedFrom":"Shuppet","genderRatio":4,"generation":3,"id":354},"Barboach":{"eggGroups":["water2"],"evolvesInto":["Whiscash"],"genderRatio":4,"generation":3,"id":339},"Basculin":{"eggGroups":["water2"],"genderRatio":4,"generation":5,"id":550},"Bastiodon":{"eggGroups":["monster"],"evolvedFrom":"Shieldon","genderRatio":1,"generation":4,"id":411},"Bayleef":{"eggGroups":["monster","grass"],"evolvedFrom":"Chikorita","evolvesInto":["Meganium"],"genderRatio":1,"generation":2,"id":153},"Beartic":{"eggGroups":["field"],"evolvedFrom":"Cubchoo","genderRatio":4,"generation":5,"id":614},"Beautifly":{"eggGroups":["bug"],"evolvedFrom":"Silcoon","genderRatio":4,"generation":3,"id":267},"Beedrill":{"eggGroups":["bug"],"evolvedFrom":"Kakuna","genderRatio":4,"generation":1,"id":15},"Beheeyem":{"eggGroups":["human-like"],"evolvedFrom":"Elgyem","genderRatio":4,"generation":5,"id":606},"Beldum":{"eggGroups":["mineral"],"evolvesInto":["Metang"],"genderRatio":-1,"generation":3,"id":374},"Bellossom":{"eggGroups":["grass"],"evolvedFrom":"Gloom","genderRatio":4,"generation":2,"id":182},"Bellsprout":{"eggGroups":["grass"],"evolvesInto":["Weepinbell"],"genderRatio":4,"generation":1,"id":69},"Bibarel":{"eggGroups":["water1","field"],"evolvedFrom":"Bidoof","genderRatio":4,"generation":4,"id":400},"Bidoof":{"eggGroups":["water1","field"],"evolvesInto":["Bibarel"],"genderRatio":4,"generation":4,"id":399},"Bisharp":{"eggGroups":["human-like"],"evolvedFrom":"Pawniard","genderRatio":4,"generation":5,"id":625},"Blastoise":{"eggGroups":["monster","water1"],"evolvedFrom":"Wartortle","genderRatio":1,"generation":1,"id":9},"Blaziken":{"eggGroups":["field"],"evolvedFrom":"Combusken","genderRatio":1,"generation":3,"id":257},"Blissey":{"eggGroups":["fairy"],"evolvedFrom":"Chansey","genderRatio":8,"generation":2,"id":242},"Blitzle":{"eggGroups":["field"],"evolvesInto":["Zebstrika"],"genderRatio":4,"generation":5,"id":522},"Boldore":{"eggGroups":["mineral"],"evolvedFrom":"Roggenrola","evolvesInto":["Gigalith"],"genderRatioLine truncated
var Generations = {"RB":{"SpeciesData":{"Abomasnow":{"eggGroups":["monster","grass"],"evolvedFrom":"Snover","genderRatio":4,"generation":4,"id":460},"Abra":{"eggGroups":["human-like"],"evolvesInto":["Kadabra"],"genderRatio":2,"generation":1,"id":63},"Absol":{"eggGroups":["field"],"genderRatio":4,"generation":3,"id":359},"Accelgor":{"eggGroups":["bug"],"evolvedFrom":"Shelmet","genderRatio":4,"generation":5,"id":617},"Aerodactyl":{"eggGroups":["flying"],"genderRatio":1,"generation":1,"id":142},"Aggron":{"eggGroups":["monster"],"evolvedFrom":"Lairon","genderRatio":4,"generation":3,"id":306},"Aipom":{"eggGroups":["field"],"evolvesInto":["Ambipom"],"genderRatio":4,"generation":2,"id":190},"Alakazam":{"eggGroups":["human-like"],"evolvedFrom":"Kadabra","genderRatio":2,"generation":1,"id":65},"Alomomola":{"eggGroups":["water1","water2"],"genderRatio":4,"generation":5,"id":594},"Altaria":{"eggGroups":["flying","dragon"],"evolvedFrom":"Swablu","genderRatio":4,"generation":3,"id":334},"Ambipom":{"eggGroups":["field"],"evolvedFrom":"Aipom","genderRatio":4,"generation":4,"id":424},"Amoonguss":{"eggGroups":["grass"],"evolvedFrom":"Foongus","genderRatio":4,"generation":5,"id":591},"Ampharos":{"eggGroups":["monster","field"],"evolvedFrom":"Flaaffy","genderRatio":4,"generation":2,"id":181},"Anorith":{"eggGroups":["water3"],"evolvesInto":["Armaldo"],"genderRatio":1,"generation":3,"id":347},"Arbok":{"eggGroups":["field","dragon"],"evolvedFrom":"Ekans","genderRatio":4,"generation":1,"id":24},"Arcanine":{"eggGroups":["field"],"evolvedFrom":"Growlithe","genderRatio":2,"generation":1,"id":59},"Arceus":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":493},"Archen":{"eggGroups":["flying","water3"],"evolvesInto":["Archeops"],"genderRatio":1,"generation":5,"id":566},"Archeops":{"eggGroups":["flying","water3"],"evolvedFrom":"Archen","genderRatio":1,"generation":5,"id":567},"Ariados":{"eggGroups":["bug"],"evolvedFrom":"Spinarak","genderRatio":4,"generation":2,"id":168},"Armaldo":{"eggGroups":["water3"],"evolvedFrom":"Anorith","genderRatio":1,"generation":3,"id":348},"Aron":{"eggGroups":["monster"],"evolvesInto":["Lairon"],"genderRatio":4,"generation":3,"id":304},"Articuno":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":1,"id":144},"Audino":{"eggGroups":["fairy"],"genderRatio":4,"generation":5,"id":531},"Axew":{"eggGroups":["monster","dragon"],"evolvesInto":["Fraxure"],"genderRatio":4,"generation":5,"id":610},"Azelf":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":482},"Azumarill":{"eggGroups":["water1","fairy"],"evolvedFrom":"Marill","genderRatio":4,"generation":2,"id":184},"Azurill":{"eggGroups":["undiscovered"],"evolvesInto":["Marill"],"genderRatio":6,"generation":3,"id":298},"Bagon":{"eggGroups":["dragon"],"evolvesInto":["Shelgon"],"genderRatio":4,"generation":3,"id":371},"Baltoy":{"eggGroups":["mineral"],"evolvesInto":["Claydol"],"genderRatio":-1,"generation":3,"id":343},"Banette":{"eggGroups":["amorphous"],"evolvedFrom":"Shuppet","genderRatio":4,"generation":3,"id":354},"Barboach":{"eggGroups":["water2"],"evolvesInto":["Whiscash"],"genderRatio":4,"generation":3,"id":339},"Basculin":{"eggGroups":["water2"],"genderRatio":4,"generation":5,"id":550},"Bastiodon":{"eggGroups":["monster"],"evolvedFrom":"Shieldon","genderRatio":1,"generation":4,"id":411},"Bayleef":{"eggGroups":["monster","grass"],"evolvedFrom":"Chikorita","evolvesInto":["Meganium"],"genderRatio":1,"generation":2,"id":153},"Beartic":{"eggGroups":["field"],"evolvedFrom":"Cubchoo","genderRatio":4,"generation":5,"id":614},"Beautifly":{"eggGroups":["bug"],"evolvedFrom":"Silcoon","genderRatio":4,"generation":3,"id":267},"Beedrill":{"eggGroups":["bug"],"evolvedFrom":"Kakuna","genderRatio":4,"generation":1,"id":15},"Beheeyem":{"eggGroups":["human-like"],"evolvedFrom":"Elgyem","genderRatio":4,"generation":5,"id":606},"Beldum":{"eggGroups":["mineral"],"evolvesInto":["Metang"],"genderRatio":-1,"generation":3,"id":374},"Bellossom":{"eggGroups":["grass"],"evolvedFrom":"Gloom","genderRatio":4,"generation":2,"id":182},"Bellsprout":{"eggGroups":["grass"],"evolvesInto":["Weepinbell"],"genderRatio":4,"generation":1,"id":69},"Bibarel":{"eggGroups":["water1","field"],"evolvedFrom":"Bidoof","genderRatio":4,"generation":4,"id":400},"Bidoof":{"eggGroups":["water1","field"],"evolvesInto":["Bibarel"],"genderRatio":4,"generation":4,"id":399},"Bisharp":{"eggGroups":["human-like"],"evolvedFrom":"Pawniard","genderRatio":4,"generation":5,"id":625},"Blastoise":{"eggGroups":["monster","water1"],"evolvedFrom":"Wartortle","genderRatio":1,"generation":1,"id":9},"Blaziken":{"eggGroups":["field"],"evolvedFrom":"Combusken","genderRatio":1,"generation":3,"id":257},"Blissey":{"eggGroups":["fairy"],"evolvedFrom":"Chansey","genderRatio":8,"generation":2,"id":242},"Blitzle":{"eggGroups":["field"],"evolvesInto":["Zebstrika"],"genderRatio":4,"generation":5,"id":522},"Boldore":{"eggGroups":["mineral"],"evolvedFrom":"Roggenrola","evolvesInto":["Gigalith"],"genderRatioLine truncated
EventPokemon = {"Absol":[{"generation":3,"level":5,"moves":["Scratch","Leer","Wish"],"forme":"default"},{"generation":3,"level":5,"moves":["Scratch","Leer","Spite"],"forme":"default"},{"generation":3,"level":35,"moves":["Razor Wind","Bite","Swords Dance","Spite"],"forme":"default"},{"generation":3,"level":70,"moves":["Double Team","Slash","Future Sight","Perish Song"],"forme":"default"}],"Aerodactyl":[{"generation":5,"level":15,"gender":"M","isDW":false,"abilities":["Pressure"],"moves":["Steel Wing","Ice Fang","Fire Fang","Thunder Fang"],"pokeball":"Cherish Ball","forme":"default"}],"Aggron":[{"generation":3,"level":100,"moves":["Iron Tail","Protect","Metal Sound","Double-Edge"],"forme":"default"},{"generation":3,"level":50,"moves":["Take Down","Iron Tail","Protect","Metal Sound"],"forme":"default"}],"Aipom":[{"generation":3,"level":10,"gender":"M","moves":["Scratch","Tail Whip","Sand-Attack"],"forme":"default"}],"Alakazam":[{"generation":3,"level":70,"moves":["Future Sight","Calm Mind","Psychic","Trick"],"forme":"default"}],"Altaria":[{"generation":3,"level":45,"moves":["Take Down","DragonBreath","Dragon Dance","Refresh"],"forme":"default"},{"generation":3,"level":36,"moves":["Heal Bell","DragonBreath","SolarBeam","Aerial Ace"],"forme":"default"},{"generation":5,"level":35,"gender":"M","isDW":true,"moves":["Take Down","Natural Gift","DragonBreath","False Swipe"],"forme":"default"}],"Anorith":[{"generation":5,"level":15,"gender":"M","isDW":false,"moves":["Harden","Mud Sport","Water Gun","Cross Poison"],"pokeball":"Cherish Ball","forme":"default"}],"Arbok":[{"generation":3,"level":33,"moves":["Refresh","Sludge Bomb","Glare","Bite"],"forme":"default"}],"Arceus":[{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"}Line truncated
HelpDescriptions = {"1":{"rating":" <i>Also /ranking, /rank. </i>Gets a single username's rating on this server. Usage: /rating username","battles":"Finds all the battles a username is playing in on this server. Usage: /battles username"},"3":{"mute":"Default length is 10 minutes, up to a maximum of two days. To specify different lengths, use 1m2h3d4w (minute, hour, day, week). Usage: /mute username, length, reason","unmute":"Unmutes a username. Usage: /unmute username","ban":"Default length is one hour, up to a maximum of one day. To specify different lengths, use 1m2h3d (minute, hour, day). Usage: /ban username, length, reason","unban":"Unbans a username. Usage: /unban username","ip":"Finds the current ips under use by a user","wall":" <i>Also /announce. </i>Announces something to the entire server. Usage: /wall message","whois":"Finds all alts associated with a username, or the main username of an alt"},"4":{"lockdown":"Prevents new battles from starting. Usage: /lockdown [on|off]","voice":" <i>Also /driver. </i>Voices a username permanently. Usage: /voice username","mod":"Mods a username permanently. Usage: /mod username","topic":"Changes the topic message. Usage: /topic message"},"5":{"admin":"Admins a username permanently. Usage: /admin username","deauth":"Deauthes a username permanently. Usage: /deauth username","eval":"Evaluates a script in the context of the server."}};
public/js/replays.js
+11 -7
View File
@@ -754,7 +754,7 @@
looper = loopLearnsets.bind(null, Generations, pokemon, generation);
pokemonSpecies = pokemon.species;
pokemonForme = pokemon.forme || "default";
pokemonLevel = pokemon.level || 100;
pokemonLevel = pokemon.level || generation.maxLevel;
FormeData = Generations[getGenerationFromInt(generation)].FormeData;
forme = FormeData[pokemonSpecies][pokemonForme];
if (generation === 4) {
@@ -877,7 +877,7 @@
checkMove = function(looper, pokemon, move) {
var checksOut, level;
level = pokemon.level;
level || (level = 100);
level || (level = 120);
checksOut = looper(function(learnset) {
var _ref1, _ref2, _ref3, _ref4;
if (((_ref1 = learnset["level-up"]) != null ? _ref1[move] : void 0) <= level || ((_ref2 = learnset["machine"]) != null ? _ref2[move] : void 0) <= level || ((_ref3 = learnset["tutor"]) != null ? _ref3[move] : void 0) <= level) {
@@ -993,7 +993,8 @@
}).call(this);
(function() {
var Tiers, actualtiers, conditions, self, _, _base, _ref;
var Tiers, actualtiers, conditions, self, _, _base, _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; };
self = (typeof window !== "undefined" && window !== null ? (_base = window.PokeBattle).Tier != null ? _base.Tier : _base.Tier = {} : this);
@@ -1093,6 +1094,9 @@
forme = megaForme;
}
}
if (species === "Rayquaza" && (pokemon.moves != null) && __indexOf.call(pokemon.moves, "Dragon Ascent") >= 0) {
forme = "mega";
}
tier = (speciesData != null ? (_ref2 = speciesData[forme]) != null ? _ref2.tier[0] : void 0 : void 0) || 'Unsorted';
tierdata = actualtiers[tier];
if (typeof tierdata === 'undefined') {
@@ -1523,7 +1527,7 @@
this.set('ability', this.getAbilities()[0]);
}
if (!attributes.level) {
this.set('level', 100);
this.set('level', this.getGeneration.maxLevel);
}
if (isNaN(attributes.happiness)) {
this.set('happiness', 100);
@@ -1738,7 +1742,7 @@
if (base === 1) {
return 1;
}
level = this.get('level') || 100;
level = this.get('level') || this.getGeneration.maxLevel;
iv = this.iv(key);
ev = Math.floor(this.ev(key) / 4);
return total = key === 'hp' ? Math.floor((2 * base + iv + ev) * (level / 100) + level + 10) : Math.floor(((2 * base + iv + ev) * (level / 100) + 5) * this.natureBoost(key));
@@ -8011,7 +8015,7 @@
}
}
} else if (line.match(/^Level:\s+(.*)$/i)) {
pokemon.level = Number(RegExp.$1) || 100;
pokemon.level = Number(RegExp.$1) || 120;
} else if (line.match(/^Happiness:\s+(.*)$/i)) {
pokemon.happiness = Number(RegExp.$1) || 0;
} else if (line.match(/^Shiny: Yes$/i)) {
@@ -8126,7 +8130,7 @@
if (pokemon.nature) {
s.push("" + pokemon.nature + " nature");
}
if (pokemon.level && pokemon.level !== 100) {
if (pokemon.level && pokemon.level !== 120) {
s.push("Level: " + pokemon.level);
}
if (pokemon.shiny) {
public/js/templates.js
+3 -7
View File
@@ -281,11 +281,7 @@ else if ( pokemon.get('gender') === 'M')
{
buf.push("<span class=\"gender gender_male\"> &#9794;</span>");
}
if ( pokemon.get('level') != 120)
{
buf.push("<span class=\"pokemon-level\"><span class=\"pokemon-level-text\"> Lv.</span>" + (jade.escape(null == (jade.interp = pokemon.get('level')) ? "" : jade.interp)) + "</span>");
}
buf.push("</span><div class=\"hp-text\">" + (jade.escape((jade.interp = percent) == null ? '' : jade.interp)) + "%</div><div" + (jade.attrs({ 'style':(greenStyle), "class": [('hp')] }, {"style":true})) + "></div><div class=\"hp-gradient\"></div><div class=\"pokemon-effects\"></div></div>");;return buf.join("");
buf.push("<span class=\"pokemon-level\"><span class=\"pokemon-level-text\"> Lv.</span>" + (jade.escape(null == (jade.interp = pokemon.get('level')) ? "" : jade.interp)) + "</span></span><div class=\"hp-text\">" + (jade.escape((jade.interp = percent) == null ? '' : jade.interp)) + "%</div><div" + (jade.attrs({ 'style':(greenStyle), "class": [('hp')] }, {"style":true})) + "></div><div class=\"hp-gradient\"></div><div class=\"pokemon-effects\"></div></div>");;return buf.join("");
};
this["JST"]["battle_team_preview"] = function anonymous(locals
@@ -347,7 +343,7 @@ else if ( pokemon.get('gender') === 'M')
{
buf.push("<div class=\"gender gender_male\">&#9794;</div>");
}
if ( pokemon.get('level') != 100)
if ( pokemon.get('level') != 120)
{
buf.push("<div class=\"level\">Lv." + (jade.escape((jade.interp = pokemon.get('level')) == null ? '' : jade.interp)) + "</div>");
}
@@ -624,7 +620,7 @@ buf.push("<p><strong>Description:</strong> " + (jade.escape((jade.interp = move.
this["JST"]["navigation"] = function anonymous(locals
/**/) {
var buf = [];
buf.push("<p class=\"logo\"></p><h2>Chat</h2><ul class=\"nav nav_rooms\"><li class=\"nav_item fake_link\">Lobby</li></ul><h2>Other links</h2><ul class=\"nav\"><li class=\"nav_item fake_link nav_teambuilder\">Teambuilder</li><li class=\"nav_item fake_link nav_battle_list\">Battle List</li><a href=\"/replays\" target=\"_blank\" class=\"nav_item\">Your Replays</a><a href=\"/leaderboard/\" target=\"_blank\" class=\"nav_item\">Leaderboard</a><a href=\"//bitbucket.org/PInsurgence/battle-simulator/issues?status=new&amp;status=open\" target=\"_blank\" class=\"nav_item\">Bug Reports</a><a href=\"//91.121.152.74/c/battle-simulator/feature-requests\" target=\"_blank\" class=\"nav_item\">Feature Requests</a></ul><ul class=\"nav nav_battles hidden\"></ul><h2 class=\"header_messages hidden\">Messages</h2><ul class=\"nav nav_messages hidden\"></ul>");;return buf.join("");
buf.push("<p class=\"logo\"></p><h2>Chat</h2><ul class=\"nav nav_rooms\"><li class=\"nav_item fake_link\">Lobby</li></ul><h2>Other links</h2><ul class=\"nav\"><li class=\"nav_item fake_link nav_teambuilder\">Teambuilder</li><li class=\"nav_item fake_link nav_battle_list\">Battle List</li><a href=\"/replays\" target=\"_blank\" class=\"nav_item\">Your Replays</a><a href=\"/leaderboard/\" target=\"_blank\" class=\"nav_item\">Leaderboard</a><a href=\"//bitbucket.org/PInsurgence/battle-simulator/issues?status=new&amp;status=open\" target=\"_blank\" class=\"nav_item\">Bug Reports</a><a href=\"//forums.p-insurgence.com/c/battle-simulator/feature-requests\" target=\"_blank\" class=\"nav_item\">Feature Requests</a></ul><ul class=\"nav nav_battles hidden\"></ul><h2 class=\"header_messages hidden\">Messages</h2><ul class=\"nav nav_messages hidden\"></ul>");;return buf.join("");
};
this["JST"]["new_battle"] = function anonymous(locals