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

Resolve #19, resolve #24, resolve #26, resolve #28

This commit is contained in:
Deukhoofd 2016-02-27 05:04:29 +01:00
parent 03cf52e9e9
commit 81ecf91734
3 changed files with 70 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/data.js
View File

File diff suppressed because one or more lines are too long

7
server/bw/data/moves.coffee
View File

@ -912,7 +912,12 @@ makeRevengeMove 'Avalanche'
extendMove 'Acrobatics', ->
@basePower = (battle, user, target) ->
if !user.hasItem() then 2 * @power else @power
if !user.hasItem()
2 * @power
else if user.hasItem("Flying Gem")
2 * @power
else
@power
extendMove 'Acupressure', ->
@use = (battle, user, target) ->

134
server/in/data/data_formes.json
View File

@ -946,7 +946,7 @@
"Delta Gardevoir": {
"default": {
"abilities": [
"Lightning Rod",
"Lightningrod",
"Clear Body"
],
"unreleasedHidden": true,
@ -21706,22 +21706,29 @@
"isBattleOnly": false,
"learnset": {
"level-up": {
"Bide": 17,
"Bulldoze": 21,
"Dragon Claw": 55,
"Dragon Tail": 45,
"DragonBreath": 35,
"Earth Power": 39,
"Faint Attack": 7,
"Hyper Beam": 49,
"Mud-Slap": 13,
"Rock Slide": 25,
"Sand Tomb": 10,
"Sand-Attack": 4,
"Sandstorm": 44,
"Screech": 34,
"Boomburst": 1,
"Drakon Voice": 1,
"Ancient Roar": 1,
"Sand-Attack": 1,
"SonicBoom": 1,
"Supersonic": 29
"Faint Attack": 1,
"Bide": 1,
"Mud-Slap": 5,
"Bulldoze": 8,
"Sand Tomb": 12,
"Rock Slide": 15,
"Supersonic": 19,
"Screech": 22,
"Earth Power": 26,
"Dragon Tail": 29,
"Earthquake": 33,
"DragonBreath": 35,
"Sandstorm": 36,
"Uproar": 40,
"Hyper Beam": 43,
"Dragon Claw": 45,
"Dragon Rush": 47,
"Bug Buzz": 50
},
"machine": {
"Aerial Ace": 0,
@ -42841,17 +42848,18 @@
"isBattleOnly": false,
"learnset": {
"level-up": {
"Extrasensory": 49,
"Faint Attack": 31,
"Fake Out": 19,
"Growth": 7,
"Harden": 3,
"Nature Power": 13,
"Pound": 1,
"Razor Leaf": 1,
"Razor Wind": 37,
"Swagger": 43,
"Torment": 25
"Harden": 3,
"Growth": 6,
"Nature Power": 9,
"Fake Out": 12,
"Razor Leaf": 14,
"Torment": 16,
"Razor Wind": 20,
"Faint Attack": 24,
"Leaf Blade": 28,
"Swagger": 32,
"Extrasensory": 36
},
"machine": {
"Attract": 0,
@ -53526,6 +53534,7 @@
"learnset": {
"level-up": {
"Faint Attack": 1,
"Hurricane": 32,
"Leaf Storm": 49,
"Leaf Tornado": 19,
"Nasty Plot": 1,
@ -53533,56 +53542,39 @@
"Whirlwind": 1
},
"machine": {
"Hidden Power": 0,
"Sunny Day": 0,
"Hyper Beam": 0,
"Protect": 0,
"Frustration": 0,
"Return": 0,
"Rock Tomb": 0,
"Aerial Ace": 0,
"Attract": 0,
"Brick Break": 0,
"Confide": 0,
"Cut": 0,
"Dark Pulse": 0,
"Dig": 0,
"Double Team": 0,
"Embargo": 0,
"Energy Ball": 0,
"Explosion": 0,
"Facade": 0,
"False Swipe": 0,
"Flash": 0,
"Fling": 0,
"Focus Blast": 0,
"Frustration": 0,
"Giga Impact": 0,
"Grass Knot": 0,
"Hidden Power": 0,
"Hyper Beam": 0,
"Low Sweep": 0,
"Nature Power": 0,
"Payback": 0,
"Power-Up Punch": 0,
"Protect": 0,
"Psych Up": 0,
"Rest": 0,
"Retaliate": 0,
"Return": 0,
"Rock Slide": 0,
"Rock Smash": 0,
"Rock Tomb": 0,
"Round": 0,
"Shadow Ball": 0,
"Zombie Strike": 0,
"Sleep Talk": 0,
"Snarl": 0,
"SolarBeam": 0,
"Strength": 0,
"Energy Ball": 0,
"Fling": 0,
"New Moon": 0,
"Substitute": 0,
"Sunny Day": 0,
"Swagger": 0,
"Swords Dance": 0,
"Thief": 0,
"Torment": 0,
"Toxic": 0,
"X-Scissor": 0,
"New Moon": 0
"Silver Wind": 0,
"Round": 0
},
"egg": {
"Amnesia": 0,
"Beat Up": 0,
"Bullet Seed": 0,
"Defog": 0,
"Foul Play": 0,
"Grassy Terrain": 0,
"Leech Seed": 0,
"Nasty Plot": 0,
"Power Swap": 0,
"Quick Attack": 0,
"Razor Wind": 0,
"Take Down": 0,
"Worry Seed": 0
}
},
"stats": {
"attack": 100,