Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-02 15:53:11 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #269 from ascriptmaster/move-anim

Browse Source 
Graphics Update Round 2
This commit is contained in:
Guangcong Luo
2014-11-17 01:55:59 +08:00
parent 6be7593b36 a43d9845ca
commit f9aeca4785
6 changed files with 1988 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@
/index.php
/index.html
.DS_Store
Thumbs.db

2065
data/graphics.js
View File

File diff suppressed because it is too large Load Diff

BIN
fx/bone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

BIN
fx/mudwisp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
fx/rock.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

7
js/battle.js
View File

@@ -1469,10 +1469,10 @@ var Side = (function () {
curelem = this.battle.spriteElemsFront[this.n].children().last();
curelem.css(this.battle.pos({
display: 'block',
x: this.x,
y: this.y-15,
x: this.x + 15,
y: this.y - 35,
z: this.z,
opacity: 0.5,
opacity: 0.4,
scale: 0.7
}, BattleEffects.web));
elem = curelem;
@@ -3529,6 +3529,7 @@ var Battle = (function () {
var target = this.getPokemon(args[2]);
if (target) {
actions += "" + target.getName() + " avoided the attack!";
this.resultAnim(target, 'Missed', 'neutral', animDelay);
} else {
actions += "" + user.getName() + "'s attack missed!";
}