Commit Graph

2288 Commits

Author SHA1 Message Date
The Immortal
8f8c480931 Prevent unobtainable shiny Pokemon 2014-10-08 01:43:24 +04:00
The Immortal
bf2c64525b Properly fix Shell Bell healing twice 2014-10-07 23:49:44 +04: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
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
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
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
The Immortal
c09498b58f Give Belly Drum Pokemon Sitrus Berry in Random Battle 2014-10-03 01:09:18 +04:00
The Immortal
713180c6c9 Add Pumpkaboo-Super event 2014-10-02 13:22:34 +04: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
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
Guangcong Luo
1abb45cd18 Use -ability for Cloud Nine and Air Lock messages 2014-10-01 05:27:15 -04:00
Guangcong Luo
dde363ca28 Fix style errors in recent pull requests 2014-09-30 17:00:43 -04: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
小太
5027be79fb Add jscs as a style checker, and add some extra jshint options 2014-09-29 18:38:01 +10:00
Ivo Julca
668c749714 Support 64x modifiers for Stealth Rock damage 2014-09-27 19:26:40 -05:00
The Immortal
eb1abfd267 Update UU bans 2014-09-28 01:59:33 +04:00
The Immortal
53c4d953eb Modify Lopunny in Random Battle
Added the possibility of Klutz + Assault Vest + Switcheroo to
perma-taunt an opposing Pokemon.
2014-09-27 01:37:32 +04:00
The Immortal
4ab1090017 Update Random Battle
- Fix #1226
- Remove HP Electric from Empoleon
- Prevent Drain Punch with Superpower
2014-09-26 00:46:51 +04:00
The Immortal
60139f3e0d Modify Groudon's Random Battle moves 2014-09-19 21:18:05 +04:00
The Immortal
8ca3da8f0a Prevent Flare Blitz with Sacred Fire in Random Battle 2014-09-19 20:25:00 +04:00
The Immortal
bfe12d4ae6 Modify Bastiodon's Random Battle moves 2014-09-18 22:18:11 +04:00
The Immortal
6b5fc8fdff Ban Genesect forms in Monotype 2014-09-18 17:27:54 +04:00
The Immortal
7d94e668f9 Update UU bans 2014-09-17 11:50:29 +04:00
The Immortal
df7b75bc9d Merge pull request #1214 from Audiosurfer/patch-1
slight random doubles set tweak
2014-09-17 15:10:29 +08:00
Relados
33b15dc383 Prevent Sacred Fire with Will-o-Wisp in randoms
Like Lava Plume, having Will-o-Wisp with Sacred Fire is redundant and the Pokemon would be better off with another move.
2014-09-16 23:12:56 -04:00
Audiosurfer
ebff2ff106 slight random doubles set tweak
edited out some moves in meowstic's pool that should've have been there
2014-09-16 19:06:32 -05:00
The Immortal
67dd902bc5 More Random Battle changes 2014-09-16 02:02:43 +04:00
The Immortal
bbeee481a1 Allow Volt Switch with another Electric move in Random Battle
This should solve the three moves bug on certain Pokemon.
2014-09-16 00:52:43 +04:00
The Immortal
cac0a835f4 Modify Mega Pinsir's Random Battle moves 2014-09-16 00:40:19 +04:00
The Immortal
610c5d21f5 Modify Arceus' Random Battle moves 2014-09-15 23:37:40 +04:00
The Immortal
265378088e Update Random Battle set generator
- Fixed repeated cases in moves
- Prevent Thunder Wave with setup
2014-09-15 23:32:19 +04:00
The Immortal
9bf54a127a Change Choice Scarf range in Random Battle 2014-09-15 23:04:41 +04:00
Guangcong Luo
d7787e3406 Merge pull request #1210 from NaniMan/patch-2
Monotype ban
2014-09-15 13:40:19 -05:00
The Immortal
cacd3603a0 Event Gengar is shiny 2014-09-15 01:48:53 +04:00
The Immortal
1cc87ec3ac Add event Gengar 2014-09-15 01:44:13 +04:00
NaniMan
d210533735 Monotype ban
Genesect is banned from Steel teams.
2014-09-14 22:53:26 +10:00
The Immortal
61f9c0debb Change Sharpedo's Random Battle moves 2014-09-12 17:54:19 +04:00
The Immortal
bdb07db860 Change Tropius' Random Battle moves 2014-09-12 17:14:19 +04:00
The Immortal
f32d331e8a Prevent Expert Belt with Fake Out / Return in Random Battle 2014-09-12 17:01:17 +04:00
The Immortal
313d144139 Prevent Defog with setup in Random Battle 2014-09-12 16:37:37 +04:00
The Immortal
f9a2407b8b Reject Gluttony in Random Battle
Every Pokemon that has Gluttony has a better alternative
2014-09-12 13:17:43 +04:00