8717 Commits

Author SHA1 Message Date
ai4rei
c0d9aa1c02 * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14470 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-20 00:44:46 +00:00
ai4rei
c1c7ed6666 * Fixed packet layout of wanttoconnection for packet_ver 16 and 22 (bugreport:3359, since r9958).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14469 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-19 23:15:49 +00:00
ai4rei
c038d41ecc * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14468 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-19 22:57:01 +00:00
ai4rei
9f66787edb * Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14467 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-19 22:06:33 +00:00
ai4rei
68fda95c60 * Various VC6-related fixes and tweaks. [Ai4rei]
- Fixed a typo in VC6 project files, that prevented login-server from compiling (bugreport:4061, since r12727).
- Fixed usage of 'long long' in Sql_P_BindSqlDataType preventing SQL VC6 projects from compiling (bugreport:1741, since r10779).
- Fixed usage of 'long long' in strtoull preventing VC6 projects from compiling (bugreport:4059, follow up to r14245).
- Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245).
- Fixed functions in db.c not being returned as pointer, causing warnings on VC6.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-19 21:25:30 +00:00
Paradox924X
f3217a0ad7 Added a missing argument to a warning containing a format specifier.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14465 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-17 02:16:13 +00:00
Paradox924X
906945e1da Follow-up to r14456. Default initialize atk_rate to 0 instead of 100 to match new effect of bonus bAtkRate.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14464 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-16 02:01:19 +00:00
L0ne_W0lf
f85ce66792 * Updated quest_read_db. Might need reviewing. ;-;
- Reports entries when read by server at start up like other DBs.
- Will now skip blank lines instead of reporting false errors.
- Will report when entries are > MAX_QUEST_DB.
* Updated quest and item DB with Eden Group information.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14463 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-14 22:26:26 +00:00
brianluau
f61f849488 - Fixed a typo in abra_db.txt (bugreport:4548)
- Fixed a weight check in Level 4 Weapon Quest. (bugreport:4533)
- Removed a duplicate if() in battle.c, follow up to r14381. (bugreport:4549)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14461 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-13 18:23:35 +00:00
L0ne_W0lf
af0e9da5b5 * Added some items with enforced delays to the item_delay_db!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14458 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-10 21:07:04 +00:00
Paradox924X
502194d7a6 Changed the check prior to adding to the attack rate so it ensures the value is non-zero instead of not 100.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14457 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-10 20:46:18 +00:00
Paradox924X
46802cab31 Made bAtkRate add the rate rather than setting it. (bugreport:4499)
Warning: This will break backwards compatibility for item scripts which rely on the previous effect for this (although most people assumed it added, as described in the bonus doc).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14456 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-10 20:32:31 +00:00
Paradox924X
7944dc71a8 Added an item_delay database usable for item-specific use delays.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14455 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-10 18:57:14 +00:00
Paradox924X
9c672be638 Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14454 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-10 03:55:52 +00:00
Paradox924X
3d238234d4 Follow-up to r14368. Load last_map from SQL on char load so the information is available during char select for PACKETVER > 20100721. Patch based on Ai4rei's. (bugreport:4429)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14453 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-09 20:17:56 +00:00
Paradox924X
7cf0394d6c Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14452 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-08 23:28:11 +00:00
Paradox924X
527041fb58 Send the actual level of the person you're trading with rather than limiting it by the max_lv/aura_lv settings.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14451 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-08 22:21:03 +00:00
Gepard
00ed934470 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14450 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-07 11:08:06 +00:00
Gepard
5c72ec7b7e Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14449 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-07 10:44:16 +00:00
L0ne_W0lf
c3322bda41 * Just a couple Bug fixes. :P
- Added a missing close in quests_13_2.txt. (bugreport:4520)
- Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14448 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-05 02:02:53 +00:00
L0ne_W0lf
eb0b88fe56 Adding back a / that got removed in nowarpto.txt. THIS IS FOR YOU REDMAGEJOE. GOD SPEED.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14447 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-04 23:45:33 +00:00
L0ne_W0lf
ee06147108 Added mapflags for the map 'cave' used in the Crow of Fate quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14444 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 22:21:02 +00:00
Paradox924X
bc60de6f03 Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14443 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 16:28:45 +00:00
Paradox924X
a2194e03ae Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14442 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 05:27:19 +00:00
Paradox924X
669bc84b0f Fixed incorrect status change constants being used in cash food scripts. (bugreport:4477)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14441 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 04:54:34 +00:00
Paradox924X
625a3870ac Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14440 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 04:46:03 +00:00
Paradox924X
03bc90dab7 Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14439 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 04:37:41 +00:00
Paradox924X
53e81e1369 Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14438 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 04:24:46 +00:00
Paradox924X
6f582c37ab Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14437 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 03:38:24 +00:00
Paradox924X
95c5d9c4f1 Modified certain atcommands to use 64 bit arithmetic before capping a value to correct boundary logic for overflowing values.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14436 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-02 01:36:14 +00:00
Gepard
123a803ccb * Removed unused 'indoors' mapflag (follow-up to r3729).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14434 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-21 00:38:57 +00:00
Gepard
99d0eef42f Fixed wrong char info packet size for clients after 2010-07-27 (follow-up to r14368).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14432 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-17 19:02:45 +00:00
Inkfish
cc758e9c60 Fixed a typo in quests_13_1
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14431 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-13 10:27:19 +00:00
Paradox924X
aad461e0f5 Prevented direct transformation into dummy jobs via @jobchange command. (bugreport:4227)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14429 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-13 10:22:59 +00:00
Paradox924X
a724b440b9 Prevented @stpoint and @skpoint from causing overflows.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14428 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-13 07:33:18 +00:00
Paradox924X
44daf9cc34 Renamed Changelog-Trunk.txt to Changelog-Renewal.txt in renewal branch. Removed unnecessary notice from top of Changelog-Trunk.txt and Changelog-Renewal.txt regarding updating of stable branch.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14427 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 06:22:03 +00:00
Paradox924X
d95e3e7999 Implemented official cash food behavior, including use delay, not being dispelled (including on death), distinct status effects and icons from the ordinary food types.
Updated items accordingly. (bugreport:2560)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14426 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 06:17:49 +00:00
Paradox924X
40feb456e8 Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14425 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 04:30:26 +00:00
Paradox924X
ef4055a3b7 Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14424 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 04:01:42 +00:00
Paradox924X
f90cd14259 Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:58:18 +00:00
Paradox924X
0aceee708c Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14420 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:46:06 +00:00
Paradox924X
120bf1dfec Added a missing const qualifier to a variable. (bugreport:4472)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14419 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:10:11 +00:00
L0ne_W0lf
0beff75597 Follow up from r14413, should take care of the errors from bugreport:4472.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14418 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 02:21:49 +00:00
Paradox924X
d046e32913 Pull name from character table instead of using master from guild table when loading guild data.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14417 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 01:57:27 +00:00
Paradox924X
b95fe4e843 Use char_id rather than master when checking if a guild needs to be deleted during character deletion.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14416 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 01:35:02 +00:00
Paradox924X
2f9e3dbf81 Replaced all nullpo_retr() calls which returned 0 with nullpo_ret() calls.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14414 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-09 01:57:04 +00:00
L0ne_W0lf
b0ba85081c * Touched up the party booking patch, seems I forgot some lines in clif.c...and managed to duplicate a line in map.c.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14413 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-06 15:36:41 +00:00
L0ne_W0lf
ba7f770b45 * Added Spira's Party Booking System implementation
- Added two additional mercenaries and updated data.
- Added place holder values to the item database.
- Added packets for the party booking system.
- Updated the 13.2 monster skills to official.
- Updated stats and drop rates on several monsters.
- Fixed Lullaby working on allies/party members.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14412 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-05 17:17:58 +00:00
brianluau
8f05766ab1 - Added instance, GVG, and BG maps to nopvp.txt (bugreport:4396)
and changed /conf/mapflag/nopvp.txt to be loaded first.
- Removed a duplicate line in item_misc.txt (bugreport:4453)
- Updated script paths to custom BG scripts, follow up to r14374. (bugreport:4443)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14411 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-02 18:33:10 +00:00
Inkfish
c57a1afa9d Fixed when devoter is killed by the redirected damage, devotee takes the whole damage. (follow up to r14406)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-20 13:37:12 +00:00