小太
f26be3c370
Modified the merge to the new bracing style
2012-04-16 13:58:40 +10:00
小太
eda760297c
Merge remote-tracking branch 'upstream/master' into fixes2
...
Conflicts:
movedex.js
statuses.js
2012-04-16 13:51:20 +10:00
小太
aee9a0b41a
Remove a bit of whitespace from the previous commit
2012-04-16 13:39:54 +10:00
小太
f9a9d5543b
Fix a few bad replaces
2012-04-16 13:37:47 +10:00
小太
8f8d387f56
Four spaces -> Single tab
2012-04-16 12:55:40 +10:00
小太
dfca43114d
Move braces to the same line as their control statements
2012-04-16 12:54:03 +10:00
小太
64d876f1ca
Begone, trailing whitespace!
...
Also converted all line endings to UNIX format
2012-04-16 12:03:15 +10:00
Bill Meltsner
5414c94a59
Implement Beat Up.
2012-04-15 16:34:20 -04:00
Bill Meltsner
2f41682c52
Fix Disable's activation message, and prevent it from being Baton Passed.
2012-04-15 16:31:21 -04:00
Bill Meltsner
95935e0966
Move weather-related move accuracy modification to the moves from the weather.
2012-04-15 16:29:31 -04:00
Bill Meltsner
0f5a94b5b5
Confusion does get passed by Baton Pass.
2012-04-15 15:51:01 -04:00
Bill Meltsner
6749c295f2
Merge pull request #25 from TheImmortal/patch-1
...
Toxic Status Residual Order
2012-04-15 12:20:13 -07:00
TheImmortal
d3044500d0
Toxic Status Residual Order
2012-04-15 23:13:31 +04:00
Bill Meltsner
5e1620a0f9
Implement Hidden Power properly.
...
When a Pokemon is created (i.e. when a battle begins), its Hidden Power type and base power are calculated from its IVs. The base "Hidden Power" move will use those.
"Hidden Power [Type]", however, still bypasses the system entirely.
2012-04-14 17:37:09 -04:00
Bill Meltsner
aef47e2950
Fix HP Electric's IVs (they were HP Steel's by mistake).
2012-04-14 17:37:09 -04:00
Guangcong Luo
a5b42abd0a
Merge pull request #23 from TheImmortal/patch-1
...
Zen Mode Implementation
2012-04-14 14:24:50 -07:00
Guangcong Luo
06838e71e3
Better way to limit moves in sets
2012-04-14 17:13:56 -04:00
Bill Meltsner
319b38c4b3
Torment has no duration, it turns out. Surprise!
2012-04-14 15:42:40 -04:00
Guangcong Luo
8a3ccfbd4b
The last of data validation
...
All of the data received from the client is now validated, with the assumption that it only has JSON code (as far as I know; I may have forgotten something)
2012-04-14 14:55:04 -04:00
TheImmortal
628a651e59
Zen Mode Implementation
2012-04-14 21:31:20 +04:00
Guangcong Luo
c732321895
Some validation for hacked team data.
2012-04-14 13:04:23 -04:00
Guangcong Luo
2a12da42af
Even more validation
2012-04-14 12:59:32 -04:00
Bill Meltsner
1c3f8aa88f
Fix Sleep Clause message.
2012-04-14 02:37:37 -04:00
Guangcong Luo
82035632d7
More client packet validation
2012-04-13 21:52:10 -04:00
Bill Meltsner
de35dfb3bc
Actually, just move Psycho Shift's mechanics to onHit entirely.
2012-04-13 19:55:39 -04:00
Bill Meltsner
424d869bbb
Fix Psycho Shift bypassing Substitute.
2012-04-13 19:49:18 -04:00
Bill Meltsner
b635529e2d
Fix some seriously messed up team validation.
2012-04-13 19:36:38 -04:00
Guangcong Luo
12e559c330
Whoops - suppress commands from battles, too
2012-04-13 19:32:25 -04:00
Guangcong Luo
5ed22e1315
Fix Rapid Spin messages to use name instead of ID
2012-04-13 19:32:25 -04:00
Bill Meltsner
efb37c8092
Fix Leech Seed draining health when the unseeded Pokemon gets KOed by a residual effect.
2012-04-13 17:14:11 -04:00
Bill Meltsner
15f60bc908
Move Weather Ball's weather-related effects to the move and out of the weather as well.
2012-04-13 17:00:13 -04:00
Bill Meltsner
544398c15f
Move the weather-based modification of Moonlight/Morning Sun/Synthesis to the respective moves from the weather statuses themselves.
2012-04-13 16:41:35 -04:00
Guangcong Luo
3130152e6d
Merge pull request #22 from TheImmortal/patch-1
...
Lagging Tail Implementation
2012-04-13 13:33:54 -07:00
TheImmortal
2e21514e89
Lagging Tail Implementation
2012-04-13 23:42:35 +04:00
Guangcong Luo
eefd3152f8
Bit more documentation for chat-commands.js
2012-04-13 04:12:22 -04:00
Guangcong Luo
0018800c0c
My apologies to server runners, but chat-commands has been changed.
...
Namely, the meaning of return true and return false have been changed, to better match other event handlers
You can now return a string from parseCommand to have the user say that message. Used mainly to automatically escape messages, but could also be used for a profanity filter or something.
I also commented it a bit more.
2012-04-13 03:57:51 -04:00
Bill Meltsner
1f1c536903
Update Residual Priorities to use the new Order/SubOrder semantics.
2012-04-12 23:05:46 -04:00
Bill Meltsner
3bbb7ca360
Nature Power(Wifi) has no reason for existence.
...
Killed with extreme prejudice.
2012-04-12 22:11:05 -04:00
Guangcong Luo
3c89873627
Order now works differently: Instead of being a negative priority, it trumps priority, and no order always goes last
2012-04-12 19:57:03 -04:00
Guangcong Luo
a0ae724502
Moderators can no longer voice/devoice
2012-04-12 19:57:02 -04:00
Guangcong Luo
9d696fae20
Merge pull request #21 from TheImmortal/patch-1
...
Fix for Overcoat
2012-04-12 14:46:47 -07:00
TheImmortal
bb46994134
Fix for Overcoat
2012-04-13 00:56:08 +04:00
Bill Meltsner
d188eb4dca
Update Giratina-O to Giratina-Origin in the random team generator.
...
Now you can't get Giratina-O with Leftovers in random battles.
2012-04-12 14:45:41 -04:00
Guangcong Luo
9c16243ab0
Fix White Herb restoring each update
2012-04-12 13:17:22 -04:00
Guangcong Luo
78e57ec0c1
Fix Ice Body for new IDs
2012-04-12 02:41:30 -04:00
Guangcong Luo
f1d9d6d9d1
Prevent pokemon from having more than 4 moves outside of Debug Mode
2012-04-12 02:09:42 -04:00
Guangcong Luo
607b384099
Don't really need a debug message for ladder update
2012-04-12 00:09:37 -04:00
Guangcong Luo
e8caf3fac4
Parts of the new Pokecheck damage formula
2012-04-12 00:09:01 -04:00
Guangcong Luo
6919fb0faf
Fix ID regression
2012-04-11 23:20:09 -04:00
Guangcong Luo
e4039c09fa
Replace some erroneous 'move:'s
2012-04-11 23:18:38 -04:00
