Commit Graph

23714 Commits

Author SHA1 Message Date
The Immortal
1b61d6938b Prevent warning users not in the room 2014-10-07 23:42:47 +04:00
Guangcong Luo
f495203040 Merge pull request #1245 from Redew/update-away
Added a message to /away if already away
2014-10-07 12:38:45 -07:00
Guangcong Luo
2b293111e1 Merge pull request #1244 from Relados/patch-11
Prevent Life Orb with HP reliant attacking moves
2014-10-07 12:37:12 -07:00
The Immortal
b3d6730eeb Fix Shell Bell healing twice with Metronome 2014-10-07 14:04:15 +04:00
CJ
37608e39bc Added a message to /away if already away
If the user is already /away and they try to use /away, it will now alert them that they are already blocking all battle requests.
2014-10-07 01:24:20 -05:00
Relados
cee46bb34c Prevent Life Orb with HP reliant attacking moves
Pokemon that have Eruption or Water Spout should not generate with Life Orb in random battles.
2014-10-07 00:24:40 -04:00
Guangcong Luo
6e9b6b88e3 Merge pull request #1242 from sirDonovan/popup
Improve user punishment popups
2014-10-06 20:03:08 -07:00
sirDonovan
e8cc064c53 Improve user punishment popups 2014-10-06 20:23:13 -05:00
Ivo Julca
c25e205db1 NEXT: Remove Diancie`s formats-data entry 2014-10-05 15:46:33 -05:00
Guangcong Luo
f467a8dbcc Merge pull request #1241 from QxC4eva/master
Remove extra data
2014-10-05 01:17:53 -07:00
QxC4eva
f8e32da2ae Remove isUnreleased from Diancie 2014-10-05 14:44:08 +10:00
The Immortal
6147cebcd6 Ban Keldeo in Almost Any Ability 2014-10-05 00:45:47 +04:00
QxC4eva
bcdaab0a97 Remove arceusunknown 2014-10-04 22:11:40 +10:00
Guangcong Luo
ae2a2b2122 Merge pull request #1240 from QxC4eva/master
Gen 4: Fix typo on Slaking event ability
2014-10-04 00:07:56 -07:00
QxC4eva
4bf0bb801a Fix typo on gen4 Slaking event ability 2014-10-04 16:58:53 +10:00
Ivo Julca
64f22e4fd4 Fix Mega check in b078d698 2014-10-03 13:36:28 -05:00
Ivo Julca
12bafc7036 Merge pull request #1223 from Audiosurfer/master
Conflicts:
	data/scripts.js
2014-10-03 13:31:34 -05:00
The Immortal
4886595f53 Fix Throwback mod 2014-10-03 11:00:33 +04:00
Ivo Julca
1902ce33d5 Fix typo in Berserk Gene´s implementation 2014-10-03 01:24:37 -05:00
Audiosurfer
b078d698fe changes to random doubles item generation
- added charti & occa for 4x weaknesses
- made yache only for 4x weaknesses
- made it so you cant have fake out & sheer force (9-21-14)
- changed it so shuca berry and chople berry won't be added to
immunities
- unburden mons only have normal gem if they have fake out as opposed to
any normal attacking move
- made life orb more common over expert belt

fixed error in shuca generation

typoed, but fixed it so now it should only give shuca berry to pokemon
without a ground immunity

fixed broken indentation

fixed issues pointed out by slayer95

should have fixed the indentation and edited the  immunity check
2014-10-02 17:27:32 -05:00
Guangcong Luo
1903ba3207 Fix style errors in pull request #1221 2014-10-02 14:39:57 -07:00
sirDonovan
ebf245eaaf Implement /rangelock 2014-10-02 14:39:57 -07:00
The Immortal
c09498b58f Give Belly Drum Pokemon Sitrus Berry in Random Battle 2014-10-03 01:09:18 +04:00
The Immortal
4a896c6113 Add new OM Mashup 2014-10-02 14:04:41 +04:00
The Immortal
713180c6c9 Add Pumpkaboo-Super event 2014-10-02 13:22:34 +04:00
The Immortal
9d432de855 Merge pull request #1237 from ascriptmaster/master
Fix Sky Drop to miss against Phantom Force
2014-10-02 15:37:41 +08:00
ascriptmaster
f8b0e529ac Fix Sky Drop to miss against Phantom Force
Added Phantom Force to the list of moves that Sky Drop will miss against.
2014-10-02 00:26:58 -07:00
Guangcong Luo
2b5770b0fd Merge pull request #1236 from ascriptmaster/master
Entrainment use proper tags in messages
2014-10-01 23:28:43 -07:00
ascriptmaster
52463f78f6 Documented -ability, -endability in protocol-doc.md 2014-10-01 23:19:47 -07:00
ascriptmaster
4272e1a21e Entrainment now uses [from] in its messages
When a Pokemon uses Entrainment, the correct battle message should be
"POKEMON acquired ABILITY!", which only displays in the client if the
[from] tag is included in the message.
2014-10-01 23:17:58 -07:00
The Immortal
84fedef174 Prevent Fake Out with setup in Random Battle 2014-10-01 20:05:44 +04:00
The Immortal
250c2e6af2 Prevent Spacial Rend with Draco Meteor in Random Battle 2014-10-01 18:54:44 +04:00
The Immortal
5a97734158 Remove OM Mashup 2014-10-01 13:46:34 +04:00
The Immortal
3c1e68e18d Update OMotM 2014-10-01 13:29:33 +04:00
Guangcong Luo
1abb45cd18 Use -ability for Cloud Nine and Air Lock messages 2014-10-01 05:27:15 -04:00
Guangcong Luo
8004a1d25a Fix crash with vanity groups in /roompromote 2014-09-30 17:28:25 -04:00
Guangcong Luo
dde363ca28 Fix style errors in recent pull requests 2014-09-30 17:00:43 -04:00
Guangcong Luo
92e22f2e73 Merge pull request #1048 from SolarisFox/patch-1
Add recovery paramater to /dexsearch
2014-09-30 13:42:45 -07:00
Guangcong Luo
2f93240bfb Merge pull request #1231 from Pikachuun/master
Future Moves Bug Fix (Issue 567)
2014-09-30 13:37:52 -07:00
Guangcong Luo
80f8ff8dcd Merge pull request #1217 from kotarou3/style
Add some extra style checks to jshint and fix them in the files
2014-09-30 13:29:08 -07:00
The Immortal
72b36653dc Prevent Rest / Sleep Talk with speed boosting moves in Random Battle 2014-09-30 22:20:23 +04:00
Pikachuun
a7e9079726 Future moves bug fix
Future moves fail to activate if the opponent has Wonder Guard, and
deals damage if it activated beforehand to a Wonder Guard Pokemon that
is not weak to them. This commit fixes both of those issues. However,
future moves still hit through wonder guard in generation 5, so that
is untouched.
2014-09-30 08:32:32 -04:00
小太
fe37f3b6a7 Apply jscs to the data files as well 2014-09-30 18:34:16 +10:00
Guangcong Luo
6da178ca6f Make ResourceMonitor slightly less sensitive 2014-09-29 20:21:11 -04:00
V4Victini
242bca78a9 Add Halloween Party banlist, Remove Fairy Face-Off
"removing would be better though to drive home the "seasonal" nature of these formats."
2014-09-29 18:28:01 -04:00
V4Victini
6bdb355e3b Add Halloween Party, Hide Fairy Face-Off
Halloween Party ladder is up to practice for the upcoming Wifi Competition. Fairy Face-Off is removed from ladder and moved to Other Metagames. If it fails to meet activity standards (probably will) we will drop it entirely.
2014-09-29 16:41:00 -04:00
小太
5027be79fb Add jscs as a style checker, and add some extra jshint options 2014-09-29 18:38:01 +10:00
Guangcong Luo
6938413a34 Show error message for unrecognized PM command 2014-09-29 00:19:58 -04:00
Guangcong Luo
06cf25e377 Only allow certain commands in PM
This fixes the issue where arbitrary /data commands were allowed to be
sent by PM.
2014-09-28 23:58:39 -04:00
Guangcong Luo
c2143d0cc6 Refactor identifying rooms
This introduces Rooms.search(), which is used whenever a command
wants a room, and allows a room to be identified by ID, title, or
alias.
2014-09-28 23:53:01 -04:00