9284 Commits

Author SHA1 Message Date
ai4rei
5f93676dea * Fixed script command 'progressbar' resuming fails on second invocation, when there was no script pause between the first and second call (bugreport:4698, since r14024).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14659 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 12:28:41 +00:00
ai4rei
c8f5056a4a * Fixed kill steal protection result in skill casting (unit_skilluse_id2) not getting evaluated (bugreport:1808, since r12203).
- Moved kill steal protection in skill casting to be only executed, after the actual target has been determined and validated (since r12203).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14658 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 12:25:59 +00:00
ai4rei
bc191110f2 * Applied fix provided by Valaris to make /pvpinfo actually work. (bugreport:1785, since r1602).
- Filled-in missing packet fields and documented the packet. Note, that this command does not show anything outside of PvP maps (client-side limitation).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14657 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 12:19:07 +00:00
ai4rei
f543097124 * Fixed @homlevel usage message stating, that deleveling is possible, although it is not (bugreport:1485, since r10272).
- The command now fails, if it is given a zero or negative value.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14656 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 12:05:13 +00:00
brianluau
6db17907b0 - Removed extra slashes in item_db.txt (bugreport:4686)
- Removed punctuation from Time2Str script function.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14655 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 08:55:02 +00:00
ai4rei
b7ab5cac1d * Fixed @alootid using 'autolootitem' (internal name) in it's usage message (bugreport:1445, since r12203).
- Reworded the turn off message of @alootid.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14654 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-07 22:06:07 +00:00
ai4rei
d3d3e871cd * Updated mapcache once more, because the one from r14643 contained official xmas versions of the town maps, now causing glitches after the xmas event on kRO ended.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14653 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-06 09:06:53 +00:00
ai4rei
7c8ea87859 * Fixed script command 'deletearray' deleting incorrect amount of array elements from arrays with empty elements (bugreport:4628).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14652 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-06 06:00:30 +00:00
ai4rei
03933a951b * Fixed ends of statement blocks missing script EOL processing, thus causing 'next line' label (-) to misbehave in statement blocks without additional curly braces (bugreport:4417, since r3422).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14651 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-05 10:37:25 +00:00
L0ne_W0lf
edc1fa9bb8 Shuffled around disabled headgears, more accurate to what is and isn't avaliable in kRO. Snuck in a few minor fixes.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14650 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-04 21:36:16 +00:00
ai4rei
2cfd322c38 * Added support for removal of trailing comments to sv_readdb (bugreport:4680).
- Disabled monster BACSOJIN_T (1996) whose drop White Snake Hat (5411) is not enabled (was hidden by '//', which would cause errors now) (since r14412).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14649 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-04 18:59:50 +00:00
ai4rei
7eae5b9381 * Fixed local files could not be aliased with resnametable.txt in grfio (bugreport:2203, since r5152).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14648 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-02 00:20:51 +00:00
ai4rei
630a5810e9 * Cleanups to grfio.
- Replaced strncpy with safestrncpy (bugreport:3080).
- Ensured, that all local paths are normalized and work whether or not the data dir ends with '/'.
- Local files are no longer added to the GRF+alias file list (apparently served to cache file size, with no performance gain).
- Buffer for files is no longer allocated with 1024 extra bytes, but only 1 for zero-termination of text files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14647 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-02 00:07:58 +00:00
ai4rei
0a86d090c1 * Updates to map cache generator tool.
- Removed unmaintained grfio library copy and made the tool use the one in /common instead (related r12726).
- Updated makefile to use compile options/libraries determined by configure (bugreport:1109).
- Fixed error messages from the tool and grfio library overlapping each other (bugreport:2403).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14646 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-01 20:43:02 +00:00
ai4rei
bf53c4e2a8 * Pending trade requests no longer prevent a character from trading someone else instead (official).
- This fixes trade window displaying wrong name when attempting to deal multiple characters (bugreport:344).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14645 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-01 01:05:32 +00:00
ai4rei
9256dbfc80 * Fixed a nullpo crash in pc_gainexp when receiving exp though script command getexp (topic:262958, since r14625).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14644 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-31 01:17:03 +00:00
ai4rei
55a4f8411e * Updated mapcache up to 2010-12-01. Adds Bifrost, Dewata and Malangdo maps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14643 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-31 01:00:05 +00:00
ai4rei
75ca2f146a * Fixed improper use of itemdb_search. It does not return NULL but a dummy item, if the item id is invalid.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14642 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-30 17:23:54 +00:00
L0ne_W0lf
310d719f6e - Lowered the required level to equip Expert Ring from 90 to 50. (bugreport:2853)
- Changed equip location for Odin mask, and made it non-refinable. (bugreport:4221)
- Changed the weight of the Atroce Blade from 200 to 350. (bugreport:4405)
- Added Tatacho Card to Tatacho's drops. (bugreport:4469)
- Changed Crunch Toast generated by the F_Toast_Box. (Bugreport:4610)
- Corrected typo with Dagger of Hunter, casts Bash level 10 at 10% chance (bugreport:4667)
- Corrected Veteran Hammer, now uses bHealPower instead of bSkillheal. (bugreport:4670)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14641 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-30 16:46:14 +00:00
ai4rei
ad0f39a6ec * Made remaining csv databases (guild, castle, homunculus, itemdb, mercenary) use sv_readdb, where applicable (follow up to r14524, r14526 and r14532).
- Few databases remain unchanged, which have either a custom layout or are otherwise incompatible with sv_readdb.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14640 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-30 01:25:19 +00:00
ai4rei
33d2446b11 * Collection of random insignificant changes.
- Added progress indication on map-server shutdown when objects are removed from maps, as it takes significant amount of time to complete.
- Moved ers_free in db_obj_vclear, so that the node pointer is not used for comparison after it has been freed.
- Some documentation of shop packets.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14639 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-29 21:31:36 +00:00
ai4rei
73ea4abec4 * Fixed 'console' plugin not working on Windows, due to NULL passed to CreateThread instead of required pointer to thread id variable.
- Fixed 'console' plugin causing delete_timer error when it fails to load, due to uninitialized variable.
* Renamed plugin.def to sample.def and added 'sample' plugin exports into it, as it's purpose is nothing than a sample right now.
- Also added .def files for 'gui' and 'pid' plugins as MSVC does not export everything automatically and missing event export cause the plugins silently failing.
- Added VS6, VS8 and VS9 projects for compiling plug-ins, which can be used on Windows.
* The plug-in system will now report, if it cannot import an event function.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14638 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-29 05:14:16 +00:00
ai4rei
b7c868ef79 * Fixed char-server making assumptions about RFIFO data length in character deletion packet (since r10909).
* Fixed login-server discarding RFIFO data, when the length is 1 byte; minimum packet size is 2 bytes (since r5027).
- Fixed login-server not skipping packet 0x2728's data on failure (since r12043).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14637 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-29 01:55:05 +00:00
ai4rei
e52ae8ad6c * Removed unmaintained and broken 'adduser' tool (topic:262284).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14636 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-28 13:26:35 +00:00
ai4rei
8b9b627e1e * Added item stacking limit database (item_stack.txt) required for runes and other 3rd class related skill items.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14635 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-27 11:30:37 +00:00
ai4rei
0ac09ae0aa * Merged fixes from trunk for script command 'checkweight' (r14631) and skill-based item production (r14633).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14634 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-27 11:30:00 +00:00
ai4rei
3ca9ea993f * Fixed skill_can_produce_mix not checking, whether or not the produced goods can actually be stored (bugreport:4674).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14633 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-27 09:36:44 +00:00
ai4rei
2b6f273e92 * Merged changes from trunk [14496:14630/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14632 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 22:36:41 +00:00
brianluau
85d04b3cfb - Added missing script_pushint() in 'checkweight' that were forgotten in r14629.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14631 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 22:22:04 +00:00
ai4rei
17cbc67f05 * Reverted r14565, as the database version is already properly commented in source and is overwritten upon first sync of account.txt anyway.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14630 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 18:25:46 +00:00
ai4rei
b0a320808c * Cleaned up script command checkweight.
- Replaced some code parts with calls to pc_checkadditem and pc_inventoryblank (follow up to r13735).
- Fixed item id not getting checked for validity properly.
* Moved MAX_AMOUNT check in pc_checkadditem to the top of the function, to prevent unnecessary inventory scan before it.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14629 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 16:42:39 +00:00
ai4rei
5984718d86 * Fixed opening other player's vending terminating currently running NPC conversation. Vending is now unavailable when talking to an NPC (bugreport:2208).
* Fixed vending not accepting 0 Zeny as sell price. The client asks for confirmation when you attempt to sell items at 0 Zeny (bugreport:2595, since r918 and r11344).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14628 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 15:02:31 +00:00
ai4rei
226fa32b4c * Fixed items, that get dropped at 100% chance, being reported in @iteminfo as 'available in the shops only' (since/replaces r3482).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14627 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 13:32:07 +00:00
ai4rei
708ea3bf59 * Updated commands @delitem/#delitem.
- No longer deletes stackable items one by one (bugreport:1914).
- Fixed pets not getting deleted when a pet egg was deleted.
- Fixed outdated usage message (since r13403).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14626 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 12:19:36 +00:00
SketchyPhoenix
6e428a589a * Merry Christmas eAthena!
* Exp modifiers based off player/mob level difference.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14625 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 03:41:31 +00:00
ai4rei
cce4c55f47 * Fixed two-hand weapons not getting recognized as such upon equipping, causing respective one-hand weapon's base ASPD values being used instead (bugreport:4659, related r12599).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14624 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-26 03:36:14 +00:00
ai4rei
e07b6c4caa * Updated script commands delitem and delitem2.
- Items are now deleted only if there is enough of them (as per r14395, related r13368).
- Not equipped items are now actually prioritized over equipped ones (related r200).
- Fixed item id not getting checked for validity.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14623 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-25 23:00:05 +00:00
ai4rei
3eb60a58f7 * Fixed a compile error in txt-converter-char caused by 'save_log' being declared by both SQL and TXT (bugreport:4671, since r14619).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14622 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-25 19:51:31 +00:00
ai4rei
78f2401ea0 * Made SQL char-server options 'chars_per_account' and 'char_del_level' work on TXT as well (follow up to r1063 and r8420).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14621 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-25 15:48:26 +00:00
ai4rei
9aa76bdd13 * Added support for new /remove and /recall packets for 2010-08-03aRagexeRE and newer.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14620 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-25 01:40:35 +00:00
ai4rei
8af3da1d3e * Synchronized TXT/SQL char-server code a bit.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14619 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-25 01:08:36 +00:00
ai4rei
adb8fd5aa3 * Fixes to char-server.
- Removed unnecessary #includes from TXT and synchronized them with SQL.
- Fixed TXT having start Zeny of 500 instead of 0 by default (follow up to r4409 and r8420).
- Fixed TXT using 1024 instead of NAME_LENGTH for 'unknown_char_name' (follow up to r2191).
- Fixed SQL potentionally attempting to disconnect a player for account_id == 0 in changesex packet.
- Fixed SQL looking for option 'db_path' in 'inter_athena.conf' instead of 'char_athena.conf'.
- Fixed char select not sending a reply packet, when selected character was not found.
- Made use of safestrncpy instead of strcpy, strncpy and memset for copying strings where appropriate.
- Removed unused function 'chardb_final' in TXT (since r4878).
- Removed unnecessary WFIFOHEAD in char deletion in SQL (since r11245, related r9307 and r10909).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14618 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-24 23:04:35 +00:00
ai4rei
a45a6400e3 * Fixed server processing the sell list (deleting items and giving zeny) for script-controlled shops (OnSellItem), causing the controller script to fail (bugreport:4656, since r6557).
- This also makes the server first check the sell list and only continue, if all items can be processed, thus no longer causing incomplete deals and the need for client disconnection in such case (since r6557).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14617 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-23 16:05:49 +00:00
ai4rei
d23eafd077 * NPC shop buy list received from the client is now validated for scripted shops (OnBuyItem), before the control is transfered to the script, as well (bugreport:3680, since r5841, related r8525).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14616 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-22 23:05:50 +00:00
ai4rei
1e81541e66 * Resolved random compiler warnings.
- Silenced pointer size mismatch gcc warning for variables passed to script_setarray_pc (bugreport:4661, since r14613).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-22 14:06:37 +00:00
ai4rei
951823bbde * Fixed sql mapreg loading code specifying output buffer size for SqlStmt_BindColumn without zero-terminator, leading to truncations of variable names and/or their values when using the maximum length (bugreport:1939, since r11245).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14614 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-22 12:11:15 +00:00
ai4rei
b86d48e71a * Added script_setarray_pc for setting temporary character array variables outside of script.c without requiring them to use script-interal code (add_str and reference_uid).
- Applied script_setarray_pc to assignment of dynamic shop arrays (related r5841).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14613 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-21 23:23:06 +00:00
ai4rei
cbf4ef5dd5 * Replaced in-place generation of uid of script array elements with reference_uid macro (follow up to r10813).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14612 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-21 22:52:25 +00:00
ai4rei
7c90fd1bf1 * Fixed dynamic shop arrays @bought_nameid, @bought_quantity, @sold_nameid and @sold_quantity not getting reset to zero before use, thus providing attached script with wrong/old data, if it did not clear them by itself in previous call (bugreport:1574, since r5841).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14611 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-21 21:30:46 +00:00
ai4rei
2a043e4999 * Removed 'strsignal' forward-declaration from 'sig' plugin to prevent random gcc distributions from failing to compile due to mismatched declaration already present in <string.h> (bugreport:4644, topic:262284, follow up to r14591).
- Removed WIN32 conditions in non-WIN32 code in 'sig' plugin (follow up to r4380).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14610 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-21 10:04:10 +00:00