Skip to content

Commit

Permalink
Set edits
Browse files Browse the repository at this point in the history
  • Loading branch information
jake-white committed Jun 7, 2017
1 parent 3815c44 commit e5419e0
Show file tree
Hide file tree
Showing 3 changed files with 531 additions and 471 deletions.
6 changes: 3 additions & 3 deletions script_res/damage.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,10 @@ function getDamageResult(attacker, defender, move, field) {
}


var isAttackerAura = (attacker.ability === (move.type + " Aura"))
var isAttackerAura = (attacker.ability === (move.type + " Aura"));
var isDefenderAura = defAbility === (move.type + " Aura");
var auraActive = ($("input:checkbox[id='" + move.type.toLowerCase() + "-aura']:checked").val() != undefined)
var auraBreak = ($("input:checkbox[id='aura-break']:checked").val() != undefined)
var auraActive = ($("input:checkbox[id='" + move.type.toLowerCase() + "-aura']:checked").val() != undefined);
var auraBreak = ($("input:checkbox[id='aura-break']:checked").val() != undefined);
if (auraActive) {
if (auraBreak) {
bpMods.push(0x0C00);
Expand Down
23 changes: 0 additions & 23 deletions script_res/setdex_smogon.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
var SETDEX_SMOGON={
"Pelipper": {
"Smogon Duck": {
"level": 50,
"evs": {
"hp": 4,
"at": 0,
"df": 0,
"sa": 252,
"sd": 0,
"sp": 252
},
"nature": "Modest",
"ability": "Drizzle",
"item": "",
"moves": [
"Scald",
"Hurricane",
"Ice Beam",
"Hydro Pump"
]
}
},

"Milotic": {
"Smogon Milotic": {
"level": 50,
Expand Down
Loading

0 comments on commit e5419e0

Please sign in to comment.