Commit Graph

23714 Commits

Author SHA1 Message Date
Guangcong Luo
6b0139956c Fix unregistered server error crash 2014-03-30 19:49:56 -04:00
Guangcong Luo
c363b0bcac Merge pull request #774 from Slayer95/master
Update some descriptions
2014-03-30 19:17:37 -04:00
Slayer95
544804fe72 Shorten Iron Ball's description 2014-03-30 18:01:58 -05:00
Slayer95
3be767238a Update some descriptions 2014-03-30 15:51:20 -05:00
Guangcong Luo
f5af644733 Merge pull request #766 from Relados/patch-34
Add format aliases
2014-03-30 15:37:35 -04:00
Slayer95
838e44d861 Add Spiky Shield to moves non-callable by Assist 2014-03-30 13:28:36 -05:00
Slayer95
c1c92a0f4c Fix style issues in viable moves
Some moves were listed as something else than IDs
2014-03-30 13:23:46 -05:00
Slayer95
8a8b5cc09b Fix syntax errors in #772 2014-03-30 13:16:50 -05:00
Guangcong Luo
2c68626680 Merge pull request #772 from Audiosurfer/patch-1
dubs randbats update
2014-03-30 14:07:56 -04:00
Guangcong Luo
83a788ece1 Detect unregistered server errors 2014-03-30 13:56:18 -04:00
The Immortal
fb958ad85e Implement Gen 4 Beat Up 2014-03-29 23:51:02 +04:00
Audiosurfer
ab8831d20b dubs update 1.45
went up to magby
2014-03-29 13:39:57 -05:00
V4Victini
19b15150c8 Always Mega Evolve before Pursuit 2014-03-28 16:39:29 -04:00
The Immortal
7a27653950 Diamond Storm hits all adjacent Pokemon 2014-03-28 18:24:29 +04:00
Guangcong Luo
566fb42db2 Merge pull request #769 from Chaarizard/patch-1
Make /updateserver support windows
2014-03-28 09:52:13 -04:00
Chaarizard
d9fbd246f7 Make /updateserver support windows
nothing more to say :|
2014-03-28 17:58:16 +05:30
The Immortal
7274fdcf46 Add Kalos Pokedex rule to 2014 April Friendly 2014-03-28 13:03:55 +04:00
V4Victini
93ad70d7dd Remove Pokeball from team data 2014-03-28 00:54:56 -04:00
Slayer95
9540ab62af Fix crash in April Friendly 2014-03-27 22:40:58 -05:00
Guangcong Luo
f5d10cd85e Fix crash in unlock 2014-03-27 19:17:35 -04:00
The Immortal
0868655e46 Add 2014 April Friendly ladder 2014-03-27 22:15:14 +04:00
Relados
7ee9c74c73 Remove conflict with existing alias 2014-03-27 10:51:11 -05:00
Guangcong Luo
8713bf54b2 UU changes: Zygarde/Torn-T -> BL, Weavile -> UU 2014-03-27 10:26:43 -04:00
Relados
6c54d49dd2 Add format aliases
Basic aliases for the common metagames.  Also added an alias for the regular Deoxys forme.
2014-03-27 07:20:30 -05:00
Guangcong Luo
bea3f8ef44 Merge pull request #764 from Relados/patch-33
Prevent multiple recovery moves
2014-03-26 20:42:27 -05:00
Relados
4069035014 Prevent multiple recovery moves 2014-03-26 20:31:51 -05:00
Guangcong Luo
d72b3bcf36 Merge pull request #763 from Relados/patch-32
Allow aliases for formats
2014-03-26 19:34:12 -05:00
Relados
7c537c8249 Allow aliases for formats
This will make it easier for tournament hosts to create tournaments for formats with extensive names
2014-03-26 19:31:41 -05:00
V4Victini
adbed9d633 Add pokeball field to sets 2014-03-26 15:48:27 -04:00
Guangcong Luo
0cb34fc521 Merge pull request #762 from Relados/patch-31
Allow Knock Off on setup pokemon
2014-03-26 11:38:41 -05:00
Relados
c59ca53b2a Allow Knock Off on setup pokemon
With new Knock Off mechanics, sets like Swords Dance Knock Off Weavile is useful
2014-03-26 09:43:30 -05:00
The Immortal
d320d5634d Correct Plusle/Minun event error 2014-03-26 13:06:18 +04:00
Guangcong Luo
fcf33b4268 Merge pull request #761 from Relados/patch-30
Prevent Moxie on Pokemon without physical moves
2014-03-25 18:56:01 -05:00
Relados
4ab16d4293 Prevent Moxie on Pokemon without physical moves
It's literally useless - even Unnerve is more useful in that case.
2014-03-25 18:54:42 -05:00
Guangcong Luo
20c8174e98 Merge pull request #760 from Tempoanon/patch-5
NEXT: Vivillon gets Gossamer Wing
2014-03-25 18:47:18 -05:00
Tempoanon
38b3e9fd35 NEXT: Vivillon gets Gossamer Wing
Vivillon can now gain the benefits of Gossamer Wing by equipping a Stick.
2014-03-25 16:46:01 -07:00
Guangcong Luo
716dcf574b Merge pull request #759 from Tempoanon/patch-4
NEXT: Vivillon gets QD
2014-03-25 18:35:37 -05:00
Tempoanon
c1e1e3036d NEXT: Vivillon gets QD
Vivillon can now equip a stick to use quiver dance and gain +1 spa.
2014-03-25 16:31:41 -07:00
Guangcong Luo
02d07a230a Merge pull request #755 from Relados/patch-29
Make Gourgeist have proper probability to show up
2014-03-25 17:07:06 -05:00
Relados
c0c756ae16 Make Gourgeist have proper probability to show up 2014-03-25 17:06:02 -05:00
Guangcong Luo
56fce1587d Merge pull request #754 from Relados/patch-28
Prevent high bulk pokemon from having Focus Sash
2014-03-25 12:03:00 -05:00
Relados
0844a7ccb6 Prevent high bulk pokemon from having Focus Sash
I chose 300 as a sum of Defense, Special Defense and HP that would designate a high bulk Pokemon, due to being just below Dusknoir's sum of the three and I was getting Focus Sash Dusknoir, which is rather subpar.  The number could be changed if there's any better way to designate bulk.
2014-03-25 11:40:34 -05:00
V4Victini
d65812aa21 Pokemon cannot Mega Evolve while locked into a move 2014-03-25 11:18:21 -04:00
V4Victini
5307898115 Merge pull request #753 from kotarou3/tournaments
Better implementation of 056d6847c0
2014-03-24 21:35:31 -04:00
小太
89eb6cf5e5 Better implementation of 056d6847c0 2014-03-25 12:32:24 +11:00
Slayer95
056d6847c0 Don't list tournaments in private rooms 2014-03-24 19:30:36 -05:00
Slayer95
3327d3731d Fix Symbiosis not activating on berry consumption 2014-03-23 22:38:11 -05:00
Guangcong Luo
d4467c4636 Don't accept messages with too many lines 2014-03-23 05:08:26 -04:00
Guangcong Luo
dd51ac8244 Drop invalid messages in the socket process 2014-03-23 05:08:26 -04:00
Guangcong Luo
4d45d11ea2 Merge pull request #736 from kotarou3/tournaments-frontend
Tournaments frontend
2014-03-23 00:11:03 -05:00