1
0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-28 02:00:04 +00:00

Resolved #13, Resolved #39, Added Forests Curse and Trick-or-Treat

This commit is contained in:
Deukhoofd
2016-02-27 00:51:40 +01:00
parent 8432f416bc
commit 35623093b3
8 changed files with 59 additions and 36 deletions

View File

@@ -493,6 +493,7 @@ extendMove 'Camouflage', ->
# Camouflage changes type based on terrain
# In Wi-Fi battles, the terrain always results in Ground type.
target.types = [ "Ground" ]
battle.message "#{user.name} transformed into a Ground type!"
extendMove 'Captivate', ->
oldUse = @use
@@ -534,6 +535,7 @@ extendMove 'Conversion', ->
if !type?
@fail(battle, user)
return false
battle.message "#{user.name} transformed into #{type} Type!"
target.types = [ type ]
extendMove 'Conversion 2', ->
@@ -547,7 +549,9 @@ extendMove 'Conversion 2', ->
possibles = []
for type, value of util.Type
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'
@@ -1308,34 +1312,37 @@ extendMove 'Magnet Rise', ->
return false
extendMove 'Magnitude', ->
lastUse = {turn: 0, user: null}
@basePower = (battle, user, target) ->
rand = battle.rng.randInt(0, 99, "magnitude")
magnitude = 0
power = 0
if rand < 5
power = 10
magnitude = 4
else if rand < 15
power = 30
magnitude = 5
else if rand < 35
power = 50
magnitude = 6
else if rand < 65
power = 70
magnitude = 7
else if rand < 85
power = 90
magnitude = 8
else if rand < 95
power = 110
magnitude = 9
else
power = 150
magnitude = 10
battle.message "Magnitude #{magnitude}!"
power
if !(battle.turn == lastUse.turn && user == lastUse.user)
rand = battle.rng.randInt(0, 99, "magnitude")
magnitude = 0
power = 0
if rand < 5
power = 10
magnitude = 4
else if rand < 15
power = 30
magnitude = 5
else if rand < 35
power = 50
magnitude = 6
else if rand < 65
power = 70
magnitude = 7
else if rand < 85
power = 90
magnitude = 8
else if rand < 95
power = 110
magnitude = 9
else
power = 150
magnitude = 10
lastUse.turn = battle.turn
lastUse.user = user
battle.message "Magnitude #{magnitude}!"
power
extendMove 'Me First', ->
bannedMoves = {