Commit Graph

3365 Commits

Author SHA1 Message Date
Slayer95
174abedf22 Fix Octoberfest set builder
Pokémon could lack Trick if they would have gotten it as their third movement from randomSet. This is now properly dealt with. (Note that no OF-pokémon gets Present from randomSet.)
2013-10-08 01:18:00 -05:00
Guangcong Luo
6a18279c0e Merge pull request #370 from bumbadadabum/master
Added new aliases
2013-10-07 08:46:47 -07:00
Bär Halberkamp
ad26d0afb3 Merge branch 'master' of https://github.com/Zarel/Pokemon-Showdown 2013-10-07 17:17:56 +02:00
Bär Halberkamp
98d468bcf9 Added new aliases 2013-10-07 17:16:27 +02:00
Juanma Serrano
cb0c1fd6ef Update Seasonal: Make scary costume Trick special
It makes more sense that a scary costume attack is Special.
2013-10-07 13:46:49 +02:00
V4Victini
5aa2458847 Fix Technician 2013-10-06 16:08:23 -04:00
V4Victini
8628066f0f Chain Burn
...reluctantly
2013-10-06 14:43:29 -04:00
V4Victini
7f880e1170 Chain Heatproof 2013-10-06 14:42:08 -04:00
V4Victini
5353430e43 Chain Analytic and Sand Force 2013-10-06 14:38:50 -04:00
V4Victini
01201d9a70 Fix typo in Sheer Force 2013-10-06 14:15:03 -04:00
Guangcong Luo
ba61111b13 Merge pull request #368 from V4Victini/damage
Many Damage Fixes
2013-10-05 16:45:00 -07:00
V4Victini
9635ea7d56 Chain base power modifiers in proper order
8: User Ability
7: Target Ability
6:  User Item
5: Target Item
4: Move Modifers
3: Other User Modifiers (Helping Hand, Charge)
2: Other Target Modifiers
1: Field Modifiers (Water Sport, Mud Sport)
2013-10-05 19:12:10 -04:00
V4Victini
8a119fefeb Chain base power modifiers
onBasePower events now affect the base power modifier as opposed to the
base power directly. Also some moves had their base power changes moved
from basePowerCallback to onBasePower. These moves affect the modifier
and not the base power.

Note: The effects of weather and burn are still incorrectly applied as
base power modifiers
2013-10-05 18:56:32 -04:00
V4Victini
fb4dd5e385 Merge remote-tracking branch 'upstream/master' into damage 2013-10-05 15:55:26 -04:00
Guangcong Luo
f6dfdf659a Merge pull request #367 from Slayer95/patch-1
Fix room auth's not being saved
2013-10-05 10:02:45 -07:00
Slayer95
beda4c7a3d Fix room auth's not being saved 2013-10-05 11:17:51 -05:00
V4Victini
bed7316a14 Chain stat modifiers in the proper order
10: Figure out a way to apply these directly to the stat later
...
6: Target Ability
5: User Ability
4: Target's Ally Abilities
3: User's Ally Abilities
2: Target's Item
1: User's Item

To be honest it's mostly for posterity's sake as well as to match the
soon-to-be-corrected base power modifiers. At the moment all stat
modifiers are either *1.5 or *2 which have the same result no matter
which order you chain them in. However a mod or ability/item in the
future could add a value that isn't as clean.
2013-10-05 01:14:11 -04:00
V4Victini
61bb6f218e Fix crits breaking multi-hit moves
If one hit crit the rest would negate the atk penalties/def boosts as
well

Also I moved some stuff around to decrease redundancy
2013-10-04 22:58:46 -04:00
Guangcong Luo
fcc9dd27a8 Merge pull request #366 from V4Victini/trace
Fix Trace Bug
2013-10-04 17:32:17 -07:00
V4Victini
1755aab059 Reset isStarted flag for forced switches
i.e Dragon Tail, Circle Throw
These would only set isActive to false, which caused Trace to behave
improperly
2013-10-04 18:47:30 -04:00
V4Victini
c89670e9e6 Fix Trace Message
Say that Trace has copied the ability before having the copied ability
take effect
2013-10-04 18:45:37 -04:00
Guangcong Luo
f0f70ef98b Admin and Leader are now global-only
It is no longer possible to promote someone to Room Admin or Room
Leader.
2013-10-04 15:08:30 -07:00
Guangcong Luo
8116262c4f Don't show roompromote message if no change happened
Because there's no auth necessary to change a user from deauthed to
deauthed, regular users could make the message appear.
2013-10-04 15:05:54 -07:00
Guangcong Luo
2be71bf52c NU is having a suspect test 2013-10-03 23:22:14 -07:00
Guangcong Luo
6077147f61 Suppress a bug with IP not showing up
For some reason, IP doesn't show up when mods use /whois on themselves.

I honestly don't understand the current permission system all that well,
so I'm just going to suppress the bug like this for now.
2013-10-03 23:21:51 -07:00
Guangcong Luo
c9df0a0b6b Prevent spoilers from being used in lobby 2013-10-03 23:17:31 -07:00
Joimer
7505b69c27 Merge branch 'master' of http://github.com/Zarel/Pokemon-Showdown 2013-10-01 12:12:12 +02:00
Joimer
febcdf2233 Add checkAbilities function to scripts
This function checks the selected abilities against default abilities.
It's used on Ability Exchange.
2013-10-01 12:11:51 +02:00
Guangcong Luo
c4fa7745da Improve promote on offline users 2013-10-01 03:03:34 -07:00
Joimer
72ab2ec5b3 Add new October Seasonal: Octoberfest 2013-10-01 11:57:04 +02:00
Joimer
e786e190fc Implement new Other Meta of the Month: Ability Exchange 2013-10-01 11:53:40 +02:00
Guangcong Luo
895d903ca6 Room auth overhaul
Room auth now match regular auth much better. There are now room voices,
room drivers, room mods, etc. They correspond to the global versions,
except with their powers restricted to the current room.

Roomdriver no longer gets /roomvoice; it's now roommod and higher.
2013-09-30 21:54:37 -07:00
Guangcong Luo
4205d0f2df Merge pull request #364 from nunuchu42/patch-1
Update aliases.js
2013-09-30 17:15:58 -07:00
nunuchu42
06c5cff65b Update aliases.js 2013-09-30 16:53:05 -07:00
Guangcong Luo
2e7caa0f53 Fix crash in Life Orb 2013-09-30 08:39:08 -07:00
Guangcong Luo
8f72a64a50 Expire battles for inactivity
Now battles will expire after 40 minutes of inactivity even if there
are people in the battle.

You can still keep the window open client-side after the expiration,
but you won't be able to talk in it anymore.
2013-09-30 08:26:25 -07:00
Guangcong Luo
b5fc8c7032 Fix three-move Jolteon 2013-09-28 22:02:23 -07:00
V4Victini
697ab493e5 Use RNG for getRandomSwitchable 2013-09-28 15:46:24 -04:00
Guangcong Luo
635733b079 Merge pull request #360 from V4Victini/metronome
Correct Metronome Implementation
2013-09-28 11:37:57 -07:00
V4Victini
f691e10532 Correct Metronome Implementation
Fixes an abusable bug with multi-hit moves
2013-09-28 13:34:17 -04:00
Guangcong Luo
0843e6de18 Merge pull request #359 from TalkTakesTime/master
Improve dice command and its help
2013-09-27 21:24:13 -07:00
V4Victini
c0abb9da63 Merge pull request #358 from V4Victini/patch-14
Chain Final Modifiers
2013-09-27 21:23:01 -07:00
TalkTakesTime
6d53da4eee Improve dice command and its help 2013-09-28 16:12:58 +12:00
V4Victini
1c2a9a76c0 Chain Final Modifiers 2013-09-27 23:30:55 -04:00
Guangcong Luo
ab8f463809 Fix UU not appearing in teambuilder 2013-09-26 23:14:49 -07:00
Guangcong Luo
40edbcb3c3 Fix overly-strict Zalgo filter
It was filtering out some legitimate Thai words.
2013-09-26 23:14:49 -07:00
The Immortal
fba88d85fc Allow Wormadam-Sandy/Trash to use DW ability 2013-09-26 14:07:55 -07:00
Guangcong Luo
ae78af96f2 Merge pull request #357 from TalkTakesTime/master
Allow mutes to remove links
2013-09-26 08:06:38 -07:00
TalkTakesTime
0eb1df50b0 Allow mutes to remove links 2013-09-26 21:20:26 +12:00
Guangcong Luo
d832644915 Merge pull request #355 from Quinella/timer
Made the room timers more "intuitive"
2013-09-25 08:09:15 -07:00