Commit Graph

3058 Commits

Author SHA1 Message Date
Rhythms
8ec0b193a4 Battle Factory: EV Fix
not really necessary, but "more proper"
2015-05-11 19:10:33 -06:00
Marty-D
a570a29eac Fix Foresight and Miracle Eye interaction 2015-05-11 11:41:52 -04:00
Ivo Julca
9978eac254 Battle Factory: update for recent tier shifts 2015-05-11 05:09:46 -05:00
Juanma Serrano
f9375a77a6 Merge pull request #1870 from Slayer95/battle-factory
Implement Battle Factory
2015-05-11 09:54:34 +02:00
Ivo Julca
3817311d9c Implement Battle Factory 2015-05-11 01:03:25 -05:00
Marty-D
f9bc7594ce Gen II: Stalling moves fail behind a substitute 2015-05-09 12:30:55 -04:00
The Immortal
a18c581176 Ban Kingdra from RU 2015-05-09 01:27:48 +04:00
Kevin Lau
c9c54ada16 Random Battle: Reject Toxic Spikes where Spikes is rejected
Prevents things like Shell Smash + Toxic Spikes.
2015-05-08 00:34:58 -07:00
Marty-D
af280660bb Gen II: Fix Dig and Fly
- Fissure can hit Dig and Whirlwind can hit Fly
- Use BasePower instead of ModifyDamage for doubled power moves
- Also correct current-gen Fly to modify damage instead of base power
2015-05-07 11:09:35 -04:00
Guangcong Luo
383af9eea1 Merge pull request #1858 from ascriptmaster/move-fixes-2
Fix Rage Powder's interaction with Safety Goggles
2015-05-05 05:39:29 +00:00
Guangcong Luo
4f708b1240 Merge pull request #1849 from ascriptmaster/move-fixes
Refactor disabling moves, other miscellaneous bug fixes
2015-05-05 05:36:06 +00:00
Kevin Lau
d287e86b46 Do not consume healing berry if healing is blocked
Fixes behavior between healing berries and Berry Juice with Heal Block.
2015-05-04 21:17:08 -07:00
Kevin Lau
0ec4ff912a Battle Engine Refactor: Add a DisableMove event
The intention for this event is to remove the move disabling code away
from ModifyPokemon and to an event that can be run a fewer number of
times. Since the disabledMoves index is used to gray-out moves that cannot
be used, and not for any other purpose, there is no need for the related
code to be run at the ModifyPokemon timing, instead working better as a
once per turn event.
2015-05-04 21:17:00 -07:00
Kevin Lau
8f33492d8b Fix Gravity's interaction with Fly and Bounce
Without removing the 'twoturnmove' volatile, it was forcing Pokemon to
re-select Fly if Gravity was used while the Pokemon was in midair.
2015-05-04 21:16:56 -07:00
The Immortal
6ab9c05837 Move Gallade to RU 2015-05-05 05:28:18 +04:00
Juanma Serrano
1a2882eb09 Remove March-April Seasonal, Super Staff Bros. 2015-05-04 17:35:21 +02:00
Marty-D
1209954765 Fix Sheer Force properly 2015-05-04 10:45:44 -04:00
Juanma Serrano
299213040d Fix Sheer Force
This adds the intended fix of bdd99e84d3 and fixes the problem that made all Sheer Force mons to ignore the AfterMoveSecondary event.
2015-05-04 12:15:09 +02:00
Kevin Lau
23a8ebd8eb Fix Rage Powder's interaction with Safety Goggles
Safety Goggles was causing Rage Powder to fail.
2015-05-04 00:22:01 -07:00
Guangcong Luo
2d3bfb1af7 Merge pull request #1855 from Rhythms88/air-lock-cloud-nine-fix
Fix Air Lock and Cloud Nine
2015-05-04 02:58:59 +00:00
Rhythms
a7b846f6e0 Fix Air Lock and Cloud Nine
Moved them from AnyModifyPokemon to AnySwitchIn based on information in
the <a href="https://github.com/Zarel/Pokemon-Showdown/issues/1789">Air
Lock and Cloud Nine Difficulties issue</a> from @gamut-was-taken
2015-05-03 17:03:31 -06:00
Marty-D
6356f1ab33 Fix Rock Head against substitutes 2015-05-03 13:26:20 -04:00
Marty-D
bdd99e84d3 Fix Sheer Force
- Sheer Force may not be user's Ability by the time `AfterMoveSecondary`
effects are checked
- Sheer Force boosted moves called by other moves now ignore
`AfterMoveSecondary` effects properly
2015-05-03 11:40:39 -04:00
The Immortal
bea648d979 Add tier changes 2015-05-03 09:35:05 +04:00
Marty-D
a92e38547f Fix Rock Head
- Since Mummy exists, it is entirely possible not to have Rock Head by
the time recoil happens
2015-05-02 15:05:42 -04:00
The Immortal
0000f4dfab Random Battle: Prevent Choice with Speed Boost
Fixes #1848
2015-05-02 13:35:51 +04:00
Marty-D
d80f788f97 Fix Must recharge tag appearing when unneeded 2015-05-01 16:49:33 -04:00
Guangcong Luo
73f1a71044 Merge pull request #1845 from xfix/remove-learnsets-g6
Remove learnsets-g6.js
2015-05-01 17:09:55 +00:00
Konrad Borowski
90a84f558c Remove learnsets-g6.js
This file is not needed in the server repository, and is automatically
generated in client repository by githooks/update script.
2015-05-01 11:16:06 +02:00
Konrad Borowski
686c5a2f04 Remove Endure Move Tutor from Gen6
Fixes #1840.
2015-05-01 11:10:07 +02:00
Joimer
5c9b7ed707 Remove unused team makers 2015-05-01 05:08:33 +02:00
Marty-D
c51bb399fe Fix Sturdy's OHKO immunity 2015-04-30 14:29:58 -04:00
Marty-D
c53d022e4b Fix OHKO moves
- Fix Gen 1/Stadium's accuracy and immunity order
- Fix OHKO moves ignoring Phantom Force
- Add OHKO messages
2015-04-30 13:06:45 -04:00
Guangcong Luo
f8032a9a19 Merge pull request #1830 from ascriptmaster/move-fixes
Standard Weather always fails to activate when Primal Weather is active
2015-04-30 07:10:09 +00:00
Marty-D
d2a66b597f Fix Shaymin Sky reversion on freeze
freezing a Shaymin-S transformed into something else -> no change; no
change when it comes back in frozen
freezing a Shaymin-S transformed into Shaymin-S -> reverts to Shaymin
freezing a Shaymin transformed into Shaymin-S -> reverts to Shaymin
freezing a Ditto transformed into Shaymin-S -> no change
freezing a Shaymin-S holding Aspear or Lum -> reverts to Shaymin, then
defrosts
2015-04-29 23:31:20 -04:00
Slayer95
5788bf82b7 Merge pull request #1839 from Rhythms88/seasonal
Super Staff Bros.: Change Astyanax into Asty
2015-04-29 17:14:38 -05:00
Marty-D
1974360fa8 Fix Feint properly
- Multiple protection effects could be active for the same target
2015-04-29 18:13:09 -04:00
Rhythms
fb9cc056b2 Super Staff Bros.: Change Astyanax into Asty 2015-04-29 16:12:56 -06:00
Marty-D
9d0f83ba76 Fix Feint
- All forms of protection can be broken by allies in Gen 6
2015-04-29 17:28:46 -04:00
The Immortal
b270788e0d Merge pull request #1837 from SolarisFox/patch-4
add weakcoasta to randbats
2015-04-29 16:08:54 +08:00
SolarisFox
5f95a7cc3b add weakcoasta to randbats 2015-04-29 00:43:32 -07:00
The Immortal
8e6d7fd4c9 Merge pull request #1838 from Rhythms88/seasonal
Super Staff Bros.: Remove @Goddess Briyella.
2015-04-29 15:38:15 +08:00
Rhythms
0a57a27595 Super Staff Bros.: Remove @Goddess Briyella 2015-04-29 00:28:23 -06:00
Marty-D
de5faddf3f Add Sticky Hold message 2015-04-28 20:47:50 -04:00
Marty-D
4570f3b6df Add Lock-On/Mind Reader message 2015-04-28 19:56:55 -04:00
Juanma Serrano
d44bfb3e92 Merge pull request #1823 from Rhythms88/master
Seasonal: Rank Changes
2015-04-27 08:45:03 +02:00
Kevin Lau
a99b5d5c51 Standard Weather always fails to activate when Primal Weather is active
Old implementation allowed Pokemon to use a standard weather move like
Rain Dance successfully against a primal weather like Harsh Sun if a
Pokemon with Cloud Nine or Air Lock was active.
2015-04-26 18:19:06 -07:00
Ivo Julca
54c8c8a0ad Hackmons: fix decisions being overriden when Struggle is in the first slot 2015-04-26 17:36:36 -05:00
Ivo Julca
00f6c0faf7 Style fixes 2015-04-26 00:26:13 -05:00
Guangcong Luo
e71a287775 Properly show message when status is blocked by Sub 2015-04-25 22:05:42 -05:00