8070 Commits

Author SHA1 Message Date
aleos89
a0caaa1036 Fixed cart data for older cart types
* Follow up to c0bd422.
* Resolves older carts that don't use the SC_PUSH_CART status to update their weight and item data properly.
* Moved to pc_scdata_received so that it will hit both versions just fine.
Thanks to @Lemongrass3110!
2016-10-28 17:51:58 -04:00
aleos89
c0bd422af2 Resolved some more inventory issues
* Moved storage type loading further up the chain to ensure data is loaded sooner.
* Resolved cart weight and cart count to update properly.
* Resolved item display index not displaying in the correct order when opening a Vending Shop.
Thanks to @Tokeiburu!
2016-10-27 20:28:31 -04:00
aleos89
7e2efec61b Moved some inventory checks
* Resolved item bonuses not properly being given that get applied before the player's inventory is received.
* Resolved rental items that have Status Changes attached to them not getting removed if the timer expired when the player logs in.
* Removed an extra call for player's with item sets.
Thanks to @Tokeiburu!
2016-10-14 12:50:06 -04:00
Cydh Ramdh
748035141b Merge branch 'master' into cleanup/storages_optimization 2016-10-14 06:12:52 +07:00
Cydh Ramdh
b2c4178209 Corrected 'VIP' personal info notification (#1613)
* Only displayed when map-server is changed or when changing map that has different base rate with previous map's rate, should not when map changed/warped.
* Updated some packet that related with VIP and its doc.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-10-14 06:04:09 +07:00
Lemongrass3110
768d801f3d Merged storage loading into a single function
Follow up to 800714a forgot to eliminate TABLE_CART_ completely.
2016-10-14 00:41:15 +02:00
aleos89
a8c8cbd498 Small cleanups
* Corrected the spacing to tabs in a few locations.
* Corrected a variable typo.
2016-10-13 18:06:58 -04:00
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
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
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
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
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
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
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
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
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
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
aleos89
391f0d68fd Fixed map-server errors from Cloud Kill (fixes #1553)
* Resolves the Cloud Kill status trying to add a timer to a dead target.
2016-09-12 11:04:01 -04:00
Jittapan Pluemsumran
ddac48d5dd
Adjusted minimum vit_penalty_num config to 1 to avoid potential crash
* To disable this feature, just set vit_penalty_type to 0 is enough!
2016-09-12 18:26:45 +07:00
Jittapan Pluemsumran
33cda97717 Battleground script command expansion (#1534)
* Implemented 2 new battleground commands. Closes #1531.
* bg_join - join battleground without npc chat room
* bg_create - create a battle group without npc chat room
* Made events for bg_create and waitingroom2bg optional
* Made map,x,y parameters on waitingroom2bg_single optional

Thanks to @Lemongrass3110 and @cydh for code reviews
Thanks to @aleos89 for documentation cleanup
2016-09-12 13:30:50 +07:00
Cydh Ramdh
dc8471d77e Fixed Cart is not shown after relog (#1472)
* Fixed #1391
* Clean up `clif_status_change`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-09-11 06:45:56 +07:00
Cydh Ramdh
17946ea286 Fixed Cart save issue for vending (#1551)
* Added check if cart need to be saved first or not before vending
* Removed `id` from item struct when new item added to cart.
  * The `id` value from inventory is never be used, on relog, `id`s for cart are always use 'real' value from table.
  * 0-ing the value also prevent wrong `id` number while inserting records to `vending_items`.
* Ordered by `id` whiel loading cart items from table.
* Initialize `sd->inventory`,  `sd->inventory`, and `sd->storage` to 0 on `pc_authok`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-09-11 06:40:03 +07:00
Cydh Ramdh
b46e4332df Item Updates and New Status Changes (#1539)
* Item Updates
* Added new Status Changes
* Implemented effect for respective items
  * 12874,Frost_Giant_Blood: SC_GVG_GIANT
  * 12875,Golem_Stone: SC_GVG_GOLEM
  * 12876,Elf_Tear_Stun: SC_GVG_STUN
  * 12877,Elf_Tear_Stone_Curse: SC_GVG_STONE
  * 12878,Elf_Tear_Freezing: SC_GVG_FREEZ
  * 12879,Elf_Tear_Sleep: SC_GVG_SLEEP
  * 12880,Elf_Tear_Curse: SC_GVG_CURSE
  * 12881,Elf_Tear_Silence: SC_GVG_SILENCE
  * 12882,Elf_Tear_Blind: SC_GVG_BLIND
* Thanks Divine-Pride.net

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

* Follow up 9267a32d8c4828bde19f2fe80f83aeec7056b18f
* Updated Status Change doc
2016-09-09 05:54:22 +07:00
aleos89
cb252ded85 Storage types optimization clean ups
* Removed char_inventory_to_sql and merged differences with char_memitemdata_to_sql.
Thanks to @Jeybla's suggestion!
2016-09-06 14:43:52 -04:00
aleos89
7a05b59dd1 Merge branch 'master' into cleanup/storages_optimization 2016-09-06 13:40:01 -04:00
aleos89
c3a308ffdb Storage types optimization fixes
* Fixed guild storage getting reset on server restart.
* Adjusted a guild bound item acknowledgment attempting to create guild storage data if not found.
* Added expire_time to guild storage data.
* Added some missing random option item checks.
Thanks to @Jeybla!
2016-09-06 13:16:14 -04:00
aleos89
adbabeeef5 Fixed guild storage item transfers
* Fixed items not getting removed from inventory/cart when transferring to guild storage.
Thanks to @Jeybla!
2016-09-06 11:18:33 -04:00
Atemo
23b271c958 Initial release of nocostume map flag (#1137)
* Initial release of `nocostume` map flag to follow official `DISABLE_COSTUMEITEM` map property.
* Added map flag `nocostume`, current confirmed maps are TE Castles and Guild Dungeons.
* Fixed #815.
* Stores `setlook` values so it won't be removed on `nocostume` mapflag

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-09-06 11:34:36 +02:00
Cydh Ramdh
cf80d72359 Typo fix
* Fixed typo in warning message of `getcastledata`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-09-05 18:00:38 +07:00
aleos89
432dcda695 Corrected script command unitwalk (fixes #1535)
* Resolved the event label not triggering when the unit reaches the destination.
Thanks to Cyan Hijirikawa!
2016-09-03 12:17:33 -04:00
Jittapan Pluemsumran
443a2b0f9b Merge pull request #1520 from cyilcode/hotfix/issue1378
Prevented Phatasmic Arrow to knock back targets that would die from i…
2016-09-03 21:30:25 +07:00
Jittapan Pluemsumran
9d51221f33
Merge branch 'master' into itemskill 2016-09-02 16:50:47 +07:00
aleos89
382c8d4a52 Added defines and constants for new skills (related to #1525)
* Skill are not complete, these are just the placeholders.
2016-08-31 21:09:06 -04:00
aleos89
7ffb943343 Storage optimization clean ups
* Cleaned up some of the script command documentation.
* Adjusted some checks to use constants.
2016-08-31 19:55:19 -04:00
Jittapan Pluemsumran
a79d065973
Implemented new item bonuses bRegenPercentHP and bRegenPercentHP 2016-08-31 23:37:57 +07:00