Deukhoofd/BattleSim
1
0
Fork 0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-27 18:00:03 +00:00
Code Issues Releases Wiki Activity

Added more flavour text for Primal Weather

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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, '')]