Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,209 Commits 66 Branches 0 Tags 560 MiB
Commit Graph

14209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lemongrass3110
800714abfe Reverted a lot of e8f4500 
Wasted 11 bytes of network traffic to keep the code clean.

Process:
1) A player tries to open a vending store and is now in the pre-vend state.
2) If all items in the cart are saved then he can proceed to opening the store.
3) If not a request to save the cart data is sent to the inter server.
4) If the acknowledgment packet from the inter server is received then check if the player is still online and in pre-vend state and open the vending dialog
 2016-10-13 23:53:34 +02:00
Cydh Ramdh
8f3599b0e3 Fixed VIP char selection window (#1598) 
* Char selection window went crazy when `VIP_ENABLE` is defined
* Fixed #628

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-10-12 06:26:30 +07:00
aleos89
6663df344b Corrected script command statusup2 documentation (fixes #1612) 
* Corrected the documentation referencing the wrong script command.
* Removed some trailing white spaces.
* Prettified some text.
Thanks to @lucasoli!
 2016-10-11 14:23:15 -04:00
Jittapan Pluemsumran
f51a1c74ba Removed additional clif_maptypeproperty2 calls 2016-10-11 08:45:03 +02:00
Lemongrass3110
940c473c88 Cleaned up map property sending functions 
Implemented ZC_MAPPROPERTY_R2 properly
 2016-10-11 08:45:03 +02:00
Lemongrass3110
ce9e623e47 Added a configuration for deletion restriction 
Additionally added the checks to char_delete_char_sql so it is triggered on deletion itself and from older packets(chclif_parse_delchar) too.
 2016-10-11 08:41:06 +02:00
Cem YILMAZ
5ea873b8b2 Added guild/party checks for character deletion process #1480 2016-10-11 08:41:06 +02:00
Cydh Ramdh
3e4d2b86c2 Merge pull request #1089 from Baalberith6/autotrade 
Fixing @at venders being stuck when map->char connection gets reset.
 2016-10-11 12:38:14 +07:00
Lemongrass3110
103ee947ff Follow up to f0dd764 
Fixed compile/merge errors from 5a56210
 2016-10-10 13:13:23 +02:00
Lemongrass3110
f0dd764095 Merge branch 'master' into cleanup/storages_optimization 
# Conflicts:
#	src/map/script.c
 2016-10-10 13:06:52 +02:00
Jittapan Pluemsumran
10946dd891 Removed README.txt 
README.md in its text form is already human-readable.
 2016-10-09 09:12:34 +07:00
Cydh Ramdh
19d620575a Fixed #1575, cart cannot be changed. 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-10-09 08:29:16 +07:00
Cydh Ramdh
cd0b2b2974 Follow up 9a52768f6fb35637edac233f85d7a857f852376e (#1595) 
* Fixed #1594, compile warning

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-10-08 06:01:00 +07:00
Cydh Ramdh
9a52768f6f Cleanup party withdraw (#1585) 
* Added enum for withdraw result in mmo.h.
* Added name of kicked player and changed `sd` init from `account_id` to `char_id`.
* Fixed party list window isn't updated when member kicked.
* Updated packet documentation.
* Thanks to @aleos89 @Lemongrass3110

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-10-06 10:58:05 +07:00
Jittapan Pluemsumran
01b1052570 Merge pull request #1589 from rathena/hotfix/issue1587 
Fixed random options being removed on card removal
 2016-10-03 21:50:08 +07:00
Lemongrass3110
5a5621073f Fixed random options being removed on cardremoval 
Fixes #1587
 2016-10-03 13:31:20 +02:00
Jittapan Pluemsumran
6510d414fa Merged warp and warpchar into a single function (#1584) 
* the warp command now allows you to warp other players
* the warpchar script command is still usable but not recommended
* removed warpchar documentation from script_commands.txt to let it fade from people's memory
 2016-10-02 23:25:03 +02:00
Atemo
6216bfbbfd Fixed Kafra length name follow up 7a011ecd3491adcd8ff82305d8e6fa9915c2a0d9 2016-10-01 22:14:14 +02:00
rAthenaAPI
963cfa5771 SQL synchronization 2016-10-01 16:54:54 +02:00
Jittapan Pluemsumran
7a011ecd34 Merge pull request #981 from rathena/woe_te-restrictions 
WoE:Training Edition implementation
* Added a new version of WoE, WoE:TE which forbids 3rd class and 2nd expanded class from joining.
  - 10 new WoE castles.
  - New zone for job_noenter_map.txt
  - Various items are restricted.
* New monsters for the guild dungeon.
 2016-10-01 21:54:44 +07:00
aleos89
42ce38c286 Renamed WoE:TE directory and files 
* Now matches WoE:FE and WoE:SE format
* Now reflects respective script commands.
 2016-10-01 10:17:21 -04:00
Lemongrass3110
3b09de10e9 Fixed random options with MAX_ITEM_RDM_OPT < 5 (#1580) 
* Fixed random options with MAX_ITEM_RDM_OPT < 5

Fixed a possible issue on 2015 clients with random options, if you define an amount less than 5, because the client expects that much.

* Fixed a copy-paste mistake

Follow up to 6a01375
Thanks to @secretdataz
 2016-09-30 22:26:37 +07:00
aleos89
01e5fbe0b7 Fixed an ambiguous if statement (fixes #1581) 
* Resolves a compile warning for a multi-line define.
 2016-09-30 10:16:16 -04:00
Atemo
14628e2d4d Corrected function name in the comment 2016-09-29 20:15:30 +02:00
aleos89
fed68141fa Cleaned up the WoE:TE NPC dialogues 2016-09-29 13:09:41 -04:00
Lemongrass3110
30647011e2 Small cleanups 2016-09-29 15:04:35 +02:00
Jittapan Pluemsumran
228f0c5e3b Export some more constant for multiple purposes 
- MAX_* for iteration purpose
- INT_MIN and INT_MAX for sanity check
- NAME_LENGTH / PASSWD_LENGTH for in-game account manipulation
 2016-09-29 18:28:24 +07:00
Lemongrass3110
2661b7a23d Added missing script changelog entries 2016-09-29 09:41:51 +02:00
Lemongrass3110
9e176ce8d1 Whitespace cleanup from merging 
Follow up to 644e294.
Sorry somehow tortoise git always screws up with those lines...
 2016-09-29 08:19:26 +02:00
Lemongrass3110
644e294699 Merge branch 'master' into woe_te-restrictions 
# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h
 2016-09-29 08:13:31 +02:00
Cydh Ramdh
6d31591258 Updated Monster Skills. Thanks to @aleos89 ! 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-09-29 08:23:39 +07:00
aleos89
f4f4367c52 Corrected Eleanor's Eternal Quick Combo behavior (fixes #1568) 
* Adjusted skill type to misc.
* Added missing damage calculation.
* Corrected the Equipment ATK reduction.
* Moved the Stun addition and Tinder Breaker removal to skill_additional_effect.
 2016-09-28 13:59:40 -04:00
aleos89
7be38fa70f Enabled Warlock for atcommand bodystyle 2016-09-28 12:43:39 -04:00
Lemongrass3110
8e3da7ffed Changed mob parsing order (#1573) 
Fixes #1572
 2016-09-27 19:28:05 +02:00
Lemongrass3110
0c07b660b9 Updated buyingstore list (#1570) 
* Updated renewal buyingstore list
* Updated some older/commented entries in renewal
* Updated pre-renewal buyingstore list
 2016-09-27 19:12:31 +02:00
Jittapan Pluemsumran
90539f48b3 Added English comments in nullpo.h (#1556) 
* Added English comments in nullpo.h
* Updated comment formatting
* Added _f functions for Visual Studio
 2016-09-23 16:34:55 +02:00
Cydh Ramdh
79b39e5a1d Exports constants 
* `SI_MERMAID_LONGING`
* `SI_MAGICAL_FEATHER`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-09-21 19:35:59 +07:00
Playtester
0e4d6a4f24 Monster Storm Gust and Sightrasher (fixes #1562) 
- Storm Gust and Sightrasher Level 10 when used by monsters will now deal the same damage as when used by a player
 2016-09-19 18:23:13 +02:00
rAthenaAPI
e820ef9090 SQL synchronization 2016-09-17 04:29:31 +02:00
Jittapan Pluemsumran
c1b455235b Merge pull request #1559 from Jeybla/FixQuadrille2 
[Fix] Quadrille [2] (16024) Jobmask
 2016-09-17 09:29:25 +07:00
Jey
9425f54904 [Fix] Quadrille [2] (16024) Jobmask 2016-09-17 04:17:20 +02:00
rAthenaAPI
5f20c0ce0c SQL synchronization 2016-09-16 04:48:05 +02:00
Cydh Ramdh
0fc59c7c8a Item DB Updates 
* Added missing job, upper, and gender values
* Added new items
* Added new packages (IG_Ink_Ball and IG_Something_Candy_Holder credits to Divine-Pride.net)

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-09-16 09:36:55 +07:00
Lemongrass3110
0c903a0771 Added AL_HEAL to power skill list 
Thanks to @Playtester
 2016-09-15 08:31:28 +02:00
Cydh Ramdh
7d72a70c5c Follow up 61a57668ed30b30b2eb43798e97d5f82e3610cde 
* Missing semicolon

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2016-09-15 09:38:19 +07:00
rAthenaAPI
328ef187a6 SQL synchronization 2016-09-14 08:19:18 +02:00
Lemongrass3110
61a57668ed Nightmare Glastheim (#1541) 
Originally released by @Ridley8819 on HerculesWS/Hercules@114767c

Additions:
Added drops for Baphomet and Chimera
Removed duplicated champion monsters

@aleos89 cleaned up NPC dialogue and some of the grammar.
 2016-09-14 08:19:14 +02:00
rAthenaAPI
2c0cf04ebe SQL synchronization 2016-09-14 07:38:40 +02:00
Jittapan Pluemsumran
633934bbac Merge pull request #1555 from zackdreaver/master 
Renewal item_db update
 2016-09-14 12:38:34 +07:00
zackdreaver
17eab30242 Renewal item_db update: 
- Add new costumes

Signed-off-by: zackdreaver <zackdreaver@gmail.com>
 2016-09-13 19:07:06 +07:00