Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-21 14:59:50 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
23,714 Commits 99 Branches 6 Tags 661 MiB
c531046555
Commit Graph

23714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joimer
386e472b6b Merge branch 'master' of http://github.com/Zarel/Pokemon-Showdown 2013-07-03 23:45:39 +02:00
Joimer
718fdc7dcf Add July Jirachi event 
Jirachi gets two new Japan events in July and August. The July one gives it Meteor Mash, which must be a viable move.
 2013-07-03 23:43:25 +02:00
Guangcong Luo
79c355e898 Merge pull request #263 from Joimer/room-redir 
Add redirect command
 2013-07-03 01:46:26 -07:00
Joim
cb47b17aa1 Redirect can't redirect to an empty room 
Redirect is not intended to act as a kick, so if no room name is given it will fail and communicate it.
 2013-07-03 10:43:25 +02:00
Joimer
6bd99a86b4 Add redirect command 
Add a new version of redirect of redir command, which will kick the target user from the room and make it join another room.
 2013-07-03 10:33:06 +02:00
Guangcong Luo
04b9003a71 New command !roomhelp 
Shows commands for unofficial room management.
 2013-07-03 01:17:02 -07:00
Guangcong Luo
aad143482e Make last room show up in room list 2013-07-03 01:16:42 -07:00
Guangcong Luo
e490ee3ea8 Command cooldown is now per-room 2013-07-03 01:16:32 -07:00
Guangcong Luo
785113099d Support showing room lists 2013-07-03 00:32:21 -07:00
Guangcong Luo
4ff26ea064 Support for per-room authority 
- if room.auth exists, the room will have its own authority instead
  of global authority
- # is room owner, % is room moderator, admins are still there, and
  every other auth becomes voice
- % can mute/unmute/announce
- # can additionally roommod/deroommod/declare/modchat
- modchat is now per-room
 2013-07-02 20:38:58 -07:00
Antar1011
fd98233e50 July tier update 
Now LC OU: Dratini, Elekid, Onix, Slowpoke
Now LC UU: Munchlax, Tentacool
 2013-07-02 10:31:04 -04:00
Antar1011
7700a34a3e July tier update 
Joining PU: Zebstrika, Torterra, Munchlax, Articuno, Marowak
Leaving PU (for NU): Basculin, Gigalith, Camerupt, Golbat
 2013-07-02 08:42:56 -04:00
Antar1011
12794c373c July tier update 
Mandibuzz is now NU.
 2013-07-02 08:36:49 -04:00
Joimer
0e5bb0adfb Change OM of the Month to Stabmons 
Add new Other Meta of the Month, Stabmons, which will be the featured OM now.
 2013-07-02 11:14:23 +02:00
Joim
2471df78c5 Fix Imprison + Torment not allowing Struggle 
If Smeargle uses Imprison, Torment, and Transform against an opponent, it won't be able to use Struggle twice in a row and it will run no moves every two turns. Check for Struggle in Torment to fix that.
 2013-07-02 11:01:40 +02:00
Guangcong Luo
f1f3b6db98 Improved rooms support 
- Rooms now stay in existence through restarts
- Room data is stored in config/chatrooms.json
- By default, there's a staff room autojoined by staff and joinable
  only by staff
 2013-07-01 22:26:22 -07:00
Guangcong Luo
c3ded1cef8 Fix memory leak when merging users 2013-07-01 20:27:52 -07:00
Guangcong Luo
10a69642f7 Fix crash in old Substitute system 2013-07-01 19:54:06 -07:00
Guangcong Luo
f02eb27b18 Unlink locked users' links 2013-06-30 20:39:50 -07:00
Bill Meltsner
84f6173c11 Items cleanup 
- Fix Micle Berry (and Custap Berry, in Gen 4) to properly trigger with Gluttony
 - Make Micle Berry's volatile references consistent with the rest of the codebase
 - Properly alphabetize Moon Ball
 2013-06-30 13:57:09 -07:00
Guangcong Luo
0d46789e6b Merge pull request #261 from Jay2645/master 
Minor adjustments to random set logic, minor cleanup of code from previous commit
 2013-06-30 13:52:39 -07:00
Jay2645
c46ea5da3a Circle Throw is treated like Dragon Tail 2013-06-29 23:57:39 -07:00
Jay2645
2098ea8c7f Random Battle Choice Scarf fix 2013-06-29 23:15:40 -07:00
Jay2645
129be4e91a Fixed case where a Pokemon could get Baton Pass without having anything to pass. Also added check for recoil moves before adding Focus Sash and allowed Choice Band/Choice Specs to be considered if you have Trick or Switcheroo and 3 attacking moves of the same category. 2013-06-29 22:08:59 -07:00
Guangcong Luo
a037bdfcb4 Merge pull request #260 from Jay2645/master 
Added check to make sure Random Battle movesets have a STAB move before being added.
 2013-06-29 14:38:59 -07:00
Jay2645
7584a01634 Removed unnecessary code, removed unreliable check, cleaned up section of code. 2013-06-29 13:15:08 -07:00
Jay2645
5a3515846f Removed two lines from an older commit that were no longer being used. 2013-06-29 11:27:57 -07:00
Jay2645
a4965e4062 Updated Random Battle set generation with more comments and system to try and find STAB moves. 2013-06-29 02:58:18 -07:00
Jay2645
41f7a99c4a Added check to make sure sets have a STAB move (if possible) before being added. 2013-06-28 15:39:58 -07:00
Guangcong Luo
0e6130300e Merge pull request #259 from Joimer/patch-27 
Update /help command
 2013-06-28 09:27:56 -07:00
Joim
dd31149b5d Update /help command 
Add help for 'modnote' command and update permissions required on some commands.
 2013-06-28 12:12:58 +02:00
Marty-D
65050444bf Gen IV: Stopgap fix for Life Orb. 2013-06-27 22:21:41 -04:00
Guangcong Luo
7fe78f0e1e Merge pull request #258 from Joimer/patch-25 
Add ModifyDamage event for final modifiers like Life Orb
 2013-06-27 14:49:16 -07:00
Guangcong Luo
bc6d458aa8 Merge pull request #251 from Joimer/patch-22 
Add note command
 2013-06-27 14:47:34 -07:00
Joim
b22269422a Fix Life Orb 
Life Orb uses now BattlePokemon.prototype.modify which does the correct calculator for damage modifiers and in the correct order thanks to the ModifyDamage event.
 2013-06-27 23:46:31 +02:00
Joim
0098202e05 Add final modifier after min damage check 
In-game, final modifiers like Life Orb are calculated after the minimum damage is calculated instead of calculating it earlier on base power.

This event run will call all onModifyDamage events on said modifiers to thus correctly modify the damage using BattlePokemon.prototype.modify
 2013-06-27 23:45:23 +02:00
Joim
19f6ebccb0 Revamp note command, now modnote 
Make it clear that it's a private user. Mod notes are no longer restricted to an user, all mods can add a note for anything.
 2013-06-27 21:54:59 +02:00
Marty-D
40bb42f92d Correct Transformed PP and max PP. 2013-06-27 12:48:14 -04:00
Marty-D
e4c61c7716 Gen IV: Fix Toxic Spikes. 2013-06-26 17:15:31 -04:00
Guangcong Luo
16b9ccb7d1 Merge pull request #257 from V4Victini/patch-1 
Sandshrew shouldn't learn Vital Throw
 2013-06-25 18:57:09 -07:00
V4Victini
79befc7880 Sandshrew does not learn Vital Throw 
OT: JEREMY Sandshrew have the following moveset: Scratch, Defense Curl, Sand Attack, and Poison Sting.
 2013-06-25 22:50:01 -03:00
V4Victini
04850adf96 Sandshrew does not learn Vital Throw 
OT: JEREMY Sandshrew have the following moveset: Scratch, Defense Curl, Sand Attack, and Poison Sting.
 2013-06-25 22:43:48 -03:00
Guangcong Luo
053e118e04 Merge pull request #256 from Jay2645/master 
Corrected a typo in the comments for Basculin.
 2013-06-25 18:18:30 -07:00
Jay2645
789b10672e Corrected another typo in comments for Basculin. 2013-06-25 18:17:15 -07:00
Jay2645
a2ec73e549 Corrected typo in comments for Basculin. 2013-06-25 18:13:46 -07:00
Guangcong Luo
93d22073a8 Refactor randbat team generator 
The main difference here is that the evolution family restriction
has been replaced with a 'limit one of each type combo' restriction.

Every other change is just refactoring.
 2013-06-25 17:47:00 -07:00
Guangcong Luo
cd47fccf6d Revise random battle changes for PS coding style 2013-06-25 17:09:08 -07:00
Guangcong Luo
494279d07e Merge pull request #255 from Jay2645/master 
Modified Random Battle code to prevent unfair teams.
 2013-06-25 16:57:48 -07:00
Jay2645
e4399f3d19 Fixed formatting in Random Battle changes. 2013-06-25 16:52:25 -07:00
Jay2645
0d1b47344a Modified Random Battle code to prevent unfair teams. 2013-06-25 15:40:05 -07:00