parent
8432f416bc
commit
35623093b3
File diff suppressed because one or more lines are too long
|
@ -493,6 +493,7 @@ extendMove 'Camouflage', ->
|
||||||
# Camouflage changes type based on terrain
|
# Camouflage changes type based on terrain
|
||||||
# In Wi-Fi battles, the terrain always results in Ground type.
|
# In Wi-Fi battles, the terrain always results in Ground type.
|
||||||
target.types = [ "Ground" ]
|
target.types = [ "Ground" ]
|
||||||
|
battle.message "#{user.name} transformed into a Ground type!"
|
||||||
|
|
||||||
extendMove 'Captivate', ->
|
extendMove 'Captivate', ->
|
||||||
oldUse = @use
|
oldUse = @use
|
||||||
|
@ -534,6 +535,7 @@ extendMove 'Conversion', ->
|
||||||
if !type?
|
if !type?
|
||||||
@fail(battle, user)
|
@fail(battle, user)
|
||||||
return false
|
return false
|
||||||
|
battle.message "#{user.name} transformed into #{type} Type!"
|
||||||
target.types = [ type ]
|
target.types = [ type ]
|
||||||
|
|
||||||
extendMove 'Conversion 2', ->
|
extendMove 'Conversion 2', ->
|
||||||
|
@ -547,7 +549,9 @@ extendMove 'Conversion 2', ->
|
||||||
possibles = []
|
possibles = []
|
||||||
for type, value of util.Type
|
for type, value of util.Type
|
||||||
possibles.push(type) if util.typeEffectiveness(moveType, [ type ]) < 1
|
possibles.push(type) if util.typeEffectiveness(moveType, [ type ]) < 1
|
||||||
user.types = [ battle.rng.choice(possibles, "conversion 2") ]
|
newType = battle.rng.choice(possibles, "conversion 2")
|
||||||
|
battle.message "#{user.name} transformed into #{newType} Type!"
|
||||||
|
user.types = [ newType ]
|
||||||
|
|
||||||
makeThiefMove 'Covet'
|
makeThiefMove 'Covet'
|
||||||
|
|
||||||
|
@ -1308,34 +1312,37 @@ extendMove 'Magnet Rise', ->
|
||||||
return false
|
return false
|
||||||
|
|
||||||
extendMove 'Magnitude', ->
|
extendMove 'Magnitude', ->
|
||||||
|
lastUse = {turn: 0, user: null}
|
||||||
@basePower = (battle, user, target) ->
|
@basePower = (battle, user, target) ->
|
||||||
rand = battle.rng.randInt(0, 99, "magnitude")
|
if !(battle.turn == lastUse.turn && user == lastUse.user)
|
||||||
magnitude = 0
|
rand = battle.rng.randInt(0, 99, "magnitude")
|
||||||
power = 0
|
magnitude = 0
|
||||||
if rand < 5
|
power = 0
|
||||||
power = 10
|
if rand < 5
|
||||||
magnitude = 4
|
power = 10
|
||||||
else if rand < 15
|
magnitude = 4
|
||||||
power = 30
|
else if rand < 15
|
||||||
magnitude = 5
|
power = 30
|
||||||
else if rand < 35
|
magnitude = 5
|
||||||
power = 50
|
else if rand < 35
|
||||||
magnitude = 6
|
power = 50
|
||||||
else if rand < 65
|
magnitude = 6
|
||||||
power = 70
|
else if rand < 65
|
||||||
magnitude = 7
|
power = 70
|
||||||
else if rand < 85
|
magnitude = 7
|
||||||
power = 90
|
else if rand < 85
|
||||||
magnitude = 8
|
power = 90
|
||||||
else if rand < 95
|
magnitude = 8
|
||||||
power = 110
|
else if rand < 95
|
||||||
magnitude = 9
|
power = 110
|
||||||
else
|
magnitude = 9
|
||||||
power = 150
|
else
|
||||||
magnitude = 10
|
power = 150
|
||||||
|
magnitude = 10
|
||||||
battle.message "Magnitude #{magnitude}!"
|
lastUse.turn = battle.turn
|
||||||
power
|
lastUse.user = user
|
||||||
|
battle.message "Magnitude #{magnitude}!"
|
||||||
|
power
|
||||||
|
|
||||||
extendMove 'Me First', ->
|
extendMove 'Me First', ->
|
||||||
bannedMoves = {
|
bannedMoves = {
|
||||||
|
|
|
@ -19,8 +19,8 @@ eval(coffee.compile(require('fs').readFileSync(path, 'utf8'), bare: true))
|
||||||
[ species, forme ] = pokemon.item.mega
|
[ species, forme ] = pokemon.item.mega
|
||||||
pokemon.changeForme(forme)
|
pokemon.changeForme(forme)
|
||||||
|
|
||||||
pokemon.team.megaEvolve() if forme is "mega"
|
pokemon.team.megaEvolve() if /mega/.test(forme)
|
||||||
pokemon.team.primalEvolve() if forme is "primal"
|
pokemon.team.primalEvolve() if /primal/.test(forme)
|
||||||
|
|
||||||
ability = @FormeData[species][forme]["abilities"][0]
|
ability = @FormeData[species][forme]["abilities"][0]
|
||||||
ability = Ability[ability.replace(/\s+/g, '')]
|
ability = Ability[ability.replace(/\s+/g, '')]
|
||||||
|
|
|
@ -44879,7 +44879,7 @@
|
||||||
"Curse": 28,
|
"Curse": 28,
|
||||||
"Destiny Bond": 39,
|
"Destiny Bond": 39,
|
||||||
"Faint Attack": 19,
|
"Faint Attack": 19,
|
||||||
"Forest's Curse": 35,
|
"Forests Curse": 35,
|
||||||
"Growth": 8,
|
"Growth": 8,
|
||||||
"Horn Leech": 54,
|
"Horn Leech": 54,
|
||||||
"Ingrain": 13,
|
"Ingrain": 13,
|
||||||
|
@ -61963,7 +61963,7 @@
|
||||||
"Curse": 28,
|
"Curse": 28,
|
||||||
"Destiny Bond": 39,
|
"Destiny Bond": 39,
|
||||||
"Faint Attack": 19,
|
"Faint Attack": 19,
|
||||||
"Forest's Curse": 35,
|
"Forests Curse": 35,
|
||||||
"Growth": 8,
|
"Growth": 8,
|
||||||
"Horn Leech": 62,
|
"Horn Leech": 62,
|
||||||
"Ingrain": 13,
|
"Ingrain": 13,
|
||||||
|
|
|
@ -4407,7 +4407,7 @@
|
||||||
"target": "selected-pokemon",
|
"target": "selected-pokemon",
|
||||||
"type": "Normal"
|
"type": "Normal"
|
||||||
},
|
},
|
||||||
"Forest's Curse": {
|
"Forests Curse": {
|
||||||
"accuracy": 100,
|
"accuracy": 100,
|
||||||
"ailmentChance": 0,
|
"ailmentChance": 0,
|
||||||
"ailmentId": "none",
|
"ailmentId": "none",
|
||||||
|
|
|
@ -141,3 +141,18 @@ extendMove 'Wildfire', ->
|
||||||
if !(p.isFainted()) && weakness >= 2
|
if !(p.isFainted()) && weakness >= 2
|
||||||
p.attach(Status.Burn)
|
p.attach(Status.Burn)
|
||||||
|
|
||||||
|
extendMove "Forests Curse", ->
|
||||||
|
@afterSuccessfulHit = (battle, user, target) ->
|
||||||
|
if target.hasType("Grass")
|
||||||
|
@fail(battle, user)
|
||||||
|
return false
|
||||||
|
battle.message "Grass type was added to #{target.name}"
|
||||||
|
target.types.push "Grass"
|
||||||
|
|
||||||
|
extendMove "Trick-or-Treat", ->
|
||||||
|
@afterSuccessfulHit = (battle, user, target) ->
|
||||||
|
if target.hasType("Ghost")
|
||||||
|
@fail(battle, user)
|
||||||
|
return false
|
||||||
|
battle.message "Ghost type was added to #{target.name}"
|
||||||
|
target.types.push "Ghost"
|
||||||
|
|
|
@ -60664,7 +60664,7 @@
|
||||||
"Curse": 28,
|
"Curse": 28,
|
||||||
"Destiny Bond": 39,
|
"Destiny Bond": 39,
|
||||||
"Faint Attack": 19,
|
"Faint Attack": 19,
|
||||||
"Forest's Curse": 35,
|
"Forests Curse": 35,
|
||||||
"Growth": 8,
|
"Growth": 8,
|
||||||
"Horn Leech": 54,
|
"Horn Leech": 54,
|
||||||
"Ingrain": 13,
|
"Ingrain": 13,
|
||||||
|
@ -60749,7 +60749,7 @@
|
||||||
"Curse": 28,
|
"Curse": 28,
|
||||||
"Destiny Bond": 39,
|
"Destiny Bond": 39,
|
||||||
"Faint Attack": 19,
|
"Faint Attack": 19,
|
||||||
"Forest's Curse": 35,
|
"Forests Curse": 35,
|
||||||
"Growth": 8,
|
"Growth": 8,
|
||||||
"Horn Leech": 62,
|
"Horn Leech": 62,
|
||||||
"Ingrain": 13,
|
"Ingrain": 13,
|
||||||
|
|
|
@ -95,3 +95,4 @@ extendMove 'Venom Drench', ->
|
||||||
return false
|
return false
|
||||||
|
|
||||||
target.boost(attack: -1, specialAttack: -1, speed: -1)
|
target.boost(attack: -1, specialAttack: -1, speed: -1)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue