Deukhoofd
/
BattleSim
mirror of https://gitlab.com/Deukhoofd/BattleSim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added more flavour text for Primal Weather

This commit is contained in:
Deukhoofd 2016-02-20 16:34:49 +01:00
parent ed924b9957
commit e48b6408fb
6 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/js/app.js
View File

@ -226,9 +226,18 @@
FIRE_ROCK_HURT: "$p is hurt by molten rocks!",
FIRE_ROCK_END: "The molten rocks disappeared from around $ts!",
ILLUSION_BROKE: "The foes $p broke it's illusion!",
WEATHER_FAIL: "But the weather was suppressed!",
HARSHSUN_MOVEFAIL: "But the Harsh Sun caused the move to fail!",
HEAVYRAIN_MOVEFAIL: "But the Harsh Sun caused the move to fail!"
WEATHER_FAIL_RAIN: "There is no relief from this heavy rain!",
WEATHER_FAIL_SUN: "The extremely harsh sunlight was not lessened at all!",
HARSHSUN_MOVEFAIL: "The Water-type attack evaporated in the harsh sunlight!",
HEAVYRAIN_MOVEFAIL: "The Fire-type attack fizzled out in the heavy rain!",
HARSHSUN_START: "The sunlight turned extremely harsh!",
HEAVYRAIN_START: "A heavy rain began to fall!",
HARSHSUN_END: "The sunlight turned extremely harsh!",
HEAVYRAIN_END: "A heavy rain began to fall!",
DELTASTREAM_START: "A mysterious air current is protecting Flying-type Pok<6F>mon!",
WEATHER_FAIL_AIR: "The mysterious air current blows on regardless!",
DELTASTREAM_END: "The mysterious air current has dissipated!",
DELTASTREAM_MOVEFAIL: "The mysterious air current weakened the attack!"
}
}
};

15
public/js/replays.js
View File

@ -226,9 +226,18 @@
FIRE_ROCK_HURT: "$p is hurt by molten rocks!",
FIRE_ROCK_END: "The molten rocks disappeared from around $ts!",
ILLUSION_BROKE: "The foes $p broke it's illusion!",
WEATHER_FAIL: "But the weather was suppressed!",
HARSHSUN_MOVEFAIL: "But the Harsh Sun caused the move to fail!",
HEAVYRAIN_MOVEFAIL: "But the Harsh Sun caused the move to fail!"
WEATHER_FAIL_RAIN: "There is no relief from this heavy rain!",
WEATHER_FAIL_SUN: "The extremely harsh sunlight was not lessened at all!",
HARSHSUN_MOVEFAIL: "The Water-type attack evaporated in the harsh sunlight!",
HEAVYRAIN_MOVEFAIL: "The Fire-type attack fizzled out in the heavy rain!",
HARSHSUN_START: "The sunlight turned extremely harsh!",
HEAVYRAIN_START: "A heavy rain began to fall!",
HARSHSUN_END: "The sunlight turned extremely harsh!",
HEAVYRAIN_END: "A heavy rain began to fall!",
DELTASTREAM_START: "A mysterious air current is protecting Flying-type Pok<6F>mon!",
WEATHER_FAIL_AIR: "The mysterious air current blows on regardless!",
DELTASTREAM_END: "The mysterious air current has dissipated!",
DELTASTREAM_MOVEFAIL: "The mysterious air current weakened the attack!"
}
}
};

7
server/bw/battle.coffee
View File

@ -324,7 +324,7 @@ class @Battle extends Room
console.log(weatherName)
console.log(@weakWeather)
if weatherName in @weakWeather and @weather in @strongWeather
@cannedText(WEATHER_FAIL)
@cannedText("WEATHER_FAIL")
return
cannedText = switch weatherName
when Weather.SUN then "SUN_START"
@ -333,6 +333,8 @@ class @Battle extends Room
when Weather.HAIL then "HAIL_START"
when Weather.MOON then "MOON_START"
when Weather.DELTASTREAM then "DELTASTREAM_START"
when Weather.HARSHSUN then "HARSHSUN_START"
when Weather.HEAVYRAIN then "HEAVYRAIN_START"
else
switch @weather
when Weather.SUN then "SUN_END"
@ -341,6 +343,9 @@ class @Battle extends Room
when Weather.HAIL then "HAIL_END"
when Weather.MOON then "MOON_END"
when Weather.DELTASTREAM then "DELTASTREAM_END"
when Weather.HARSHSUN then "HARSHSUN_END"
when Weather.HEAVYRAIN then "HEAVYRAIN_END"
@cannedText(cannedText) if cannedText
@weather = weatherName
@weatherDuration = turns

1
server/bw/move.coffee
View File

@ -310,6 +310,7 @@ class @Move
typeeffect = util.typeEffectiveness(type, targettype)
if targettype == "Flying" and typeeffect > 1
typeeffect = 1
battle.cannedText('DELTASTREAM_MOVEFAIL')
neweffect * typeeffect
effect = neweffect
if target.hasAbility("Ethereal Shroud")

4
server/in/battle.coffee
View File

@ -19,8 +19,8 @@ eval(coffee.compile(require('fs').readFileSync(path, 'utf8'), bare: true))
[ species, forme ] = pokemon.item.mega
pokemon.changeForme(forme)
pokemon.getTeam().megaEvolve() if forme is "mega"
pokemon.getTeam().primalEvolve() if forme is "primal"
pokemon.team.megaEvolve() if forme is "mega"
pokemon.team.primalEvolve() if forme is "primal"
ability = @FormeData[species][forme]["abilities"][0]
ability = Ability[ability.replace(/\s+/g, '')]

16
shared/canned_text.coffee
View File

@ -161,9 +161,19 @@ CannedText =
FIRE_ROCK_HURT: "$p is hurt by molten rocks!"
FIRE_ROCK_END: "The molten rocks disappeared from around $ts!"
ILLUSION_BROKE: "The foes $p broke it's illusion!"
WEATHER_FAIL: "But the weather was suppressed!"
HARSHSUN_MOVEFAIL: "But the Harsh Sun caused the move to fail!"
HEAVYRAIN_MOVEFAIL: "But the Harsh Sun caused the move to fail!"
WEATHER_FAIL_RAIN: "There is no relief from this heavy rain!"
WEATHER_FAIL_SUN: "The extremely harsh sunlight was not lessened at all!"
HARSHSUN_MOVEFAIL: "The Water-type attack evaporated in the harsh sunlight!"
HEAVYRAIN_MOVEFAIL: "The Fire-type attack fizzled out in the heavy rain!"
HARSHSUN_START: "The sunlight turned extremely harsh!"
HEAVYRAIN_START: "A heavy rain began to fall!"
HARSHSUN_END: "The sunlight turned extremely harsh!"
HEAVYRAIN_END: "A heavy rain began to fall!"
DELTASTREAM_START: "A mysterious air current is protecting Flying-type Pokémon!"
WEATHER_FAIL_AIR: "The mysterious air current blows on regardless!"
DELTASTREAM_END: "The mysterious air current has dissipated!"
DELTASTREAM_MOVEFAIL: "The mysterious air current weakened the attack!"
cannedMap = {}
cannedMapReverse = {}