3877 Commits

Author SHA1 Message Date
ultramage
95f651807d Fixed a missing include/export, and typos in the previous revision.
Corrected wrong length values in one charserver packet.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-11 10:56:39 +00:00
skotlex
a65db8120c - Cleaned up pc_calc_weapontype
- made on-touch areas work with walking npcs. Note that the implementation is performance may not be optimal, but I am not sure if it can be done in any better way.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11713 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-11 10:12:58 +00:00
ultramage
ffd150e6f0 Fixed a bug in r11384 letting you bypass requirements for some skills (see bugreport:219).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11710 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-10 21:26:12 +00:00
ultramage
3b742b114e Fixed some more gcc incompatibilities...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11706 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-10 13:59:23 +00:00
ultramage
12a567a5f9 Changing enum weapon_type in the mmo_charstatus structure back to integer until someone resolves that include mess...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11705 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-10 13:26:08 +00:00
ultramage
5eda6c0e57 Replaced several 'int' variables with enums that they represent.
Expanded weapon_type enum with dual-wield constants (bugreport:384).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11704 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-09 22:42:56 +00:00
ultramage
376a1f68ba * Re-worked the login-char-map packet spam mechanism
- mapserver no longer sends entire user list to charserver every 10 seconds; similar change done to the char-login connection
- user count updates are only sent when the value actually changes instead of servers polling each other every few seconds
- the servers now prevent interserver connection timeout explicitly by sending ping/ack packet pairs instead of relying on the usercount polling to do so; keepalive is sent every 'stall_time'-2 seconds
- removed the @refreshonline command as refresh happens automatically every 5 seconds

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11703 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-09 21:44:29 +00:00
ultramage
0f6d747991 Fixed socket.c using time() incorrectly, causing stall timer desynchronization (bugreport:394)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11702 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-09 21:23:02 +00:00
FlavioJS
58aba77ff3 * Added a database iterator to db.c/db.h.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11701 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-09 20:59:20 +00:00
zephyrus
0f3255eca8 - Ooops! Adding a missing comma (,).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11700 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-08 17:54:43 +00:00
zephyrus
bec0f75b57 - Added a new setting 'guild_skill_relog_delay' to activate the guild skills delay on Guild Master relog.
- The official setting is 'No', but this is an option for game masters.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11699 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-08 17:39:40 +00:00
FlavioJS
9d2688ad87 * Changed EXIT_SUCCESS back to 0 in console.c to avoid an unnecessary include.
* Fixed gm_account_db not being deallocated in login-converter.c.
* Refactoring names and documentation in db.h/db.c:
  - changed 'struct dbt' to 'struct DBMap' and 'DB' to 'DBMap*'
  - changed 'struct db' to 'struct DBMap_impl' and 'DB_impl' to 'DBMap_impl*'
  - changed COUNT to DB_COUNTSTAT and made it's existence not depend on DB_ENABLE_STATS
  - removed some @see links and corrected small typos in the documentation

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11698 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-08 14:08:32 +00:00
ultramage
492650729a Synced the charservers' init procedure.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-08 10:50:08 +00:00
ultramage
1fb3859183 Synced charserver char creation creation code
* removed most of the creation failure messages printed to console
 * fixed sql charserver letting you use control chars in char names
 * new chars will not start with the 'Knife' and 'Cotton Shirt' equipped anymore (charserver blindly placed magic values into the equip field)
Fixed a glitch where all packets immediately after the map->char login packet would get discarded and the mapserver disconnected.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11696 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-08 10:17:44 +00:00
skotlex
ea9b71e78b - Fixed not all objects spawning within your range of sight when you warp/relog if CIRCULAR_AREA is defined.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11694 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-08 08:43:28 +00:00
zephyrus
3575f9ad9a - Added separated packets for get and set attachment on mail system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11693 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-07 20:45:16 +00:00
zephyrus
009ce06822 - Some updates on the mail system packets [Zephyrus]
- Corrected the mail database structure on main.sql
- TODO: find what happens when you cannot receive an emailed item due to weight problems.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11692 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-07 17:16:53 +00:00
ultramage
ed0f069c10 Applied knc's fix to let authorized GMs use @go on 'nogo'-flagged maps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11691 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-07 08:34:10 +00:00
ultramage
f47413c0fa Fixed a crash caused by a mistake in r11657 (bad macro -> function code conversion)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11690 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-06 22:43:15 +00:00
ultramage
535df984a3 Patching a gcc compilation problem...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11689 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-06 19:27:55 +00:00
ultramage
9d59dba910 Corrected the max. allowed skill name length, and optimized code that works with skill names according to latest changes.
Changed skill db loading code to work similarly to how itemdb/mobdb is loaded (generic file loader + specialized function to process rows).
 * all skill db files are now checked for inconsistencies the same way.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11659 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-05 14:45:13 +00:00
Playtester
9f7a8cb1e5 * Reverted official drop rate estimation
- although it really exists we don't have enough information about it
- if server owners really want it they can implement it themselves (it's just a one-line fix anyways)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11658 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-05 11:21:08 +00:00
ultramage
f7d4427c1a Changed the skill_db.txt skill names in comments into actual columns, now the server reads these instead of a hardcoded array (see topic:170438).
Corrected skill db loading code which was using a totally wrong column count in sevreal cases (or didn't do any checks at all).
Cleaned up skill db lookup code
 * added some well-behaved functions to replace macros (skill_get_index)
 * used skill_get_index() to replace often occuring blocks of code that did the skill_id -> skilldb_index calculation in-line

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11657 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-05 08:59:19 +00:00
Playtester
d8a73e6f5f * Adjusted drop bug according to special information...
- this will be changed further in the future

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11652 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-04 12:06:37 +00:00
Playtester
2aae5965dc * Implemented official drop rate estimation
- estimation is rounded on 2 positions after decimal point
- this will effectively raise drop rates below 50% by 0.01%

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11651 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-04 10:47:33 +00:00
ultramage
17eb2f7764 Added script function 'strnpcinfo', for increased npc awareness (originally from jAthena).
Updated script reference doc.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11650 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-03 22:07:47 +00:00
ultramage
59b9654397 Tried to make sense out of timer.c ... and failed
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11647 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-03 12:35:34 +00:00
ultramage
d3d23aa363 Corrected Whirlwind/Violent Gale to give a numeric flee bonus instead of percentual (bugreport:329)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11644 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 20:29:22 +00:00
ultramage
98a809813b AGAIN corrected the sql charserver query that broke TXT->SQL conversion (fixed in r10835, reverted in 11245...)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11642 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 18:01:58 +00:00
ultramage
989a557598 Removed some long-unneccessary debug messages (from r1105).
Removed function skill_count_target() because it's a duplicate (see topic:169337).
Renamed skill_get_pl to skill_get_ele (because it retrieves element ids).
The block_list structure now uses the BL_ enums instead of 'unsigned char'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11640 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 15:54:27 +00:00
ultramage
9c9859a1c5 Fixed one wrong return value in buildin_getcharid (bugreport:33)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11638 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 12:07:37 +00:00
ultramage
45cf77f464 Moved the BUILDIN_DEF() block to the end of script.c.
Removed the big list of BUILDIN_FUNC() declarations in script.c, as they are not needed anymore and no code utilizes them => file size-= 11 kB.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11637 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 11:42:36 +00:00
skotlex
856a3dc17c - Modified trap related code so it behaves as explained by Playtester: Traps trigger on everyone in their 'effect range' (skill_db's splash) for every target that lies within its trigger range at trigger time (range and interval in the skill_unit_db).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11634 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 01:19:38 +00:00
ultramage
65ad6362c5 Fixed silly copy-paste typo in r11607 preventing #-commands from working...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11631 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-01 21:41:32 +00:00
ultramage
78dd6eda46 Removed code that queues OnAgitEliminate after the Emperium is broken, this is now done properly by the gvg script instead (partially deals with bugreport:342).
If you have any extra castles, update your scripts accordingly.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11630 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-01 16:34:21 +00:00
ultramage
b45c651770 Reverted the part of r11625 where MAP_NAME_LENGTH_EXT was changed (to allow .gat in commands)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11629 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-01 09:38:52 +00:00
ultramage
26166c5dc6 Commented out msg_athena.conf strings disabled in r11625.
Reverted changes in r11625 that used enum sc_type where it shouldn't have been used.
Removed leftover npc/other/arena.txt.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11627 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-31 16:37:16 +00:00
ultramage
ac33a63e54 * Added names to the SC_ and SI_ enums, now they can be used to properly indicate where such values are to be used (replaces usage of 'int')
* removed MIN_/MAX_PORTAL_MEMO, set MAX_MEMOPOINTS from 10 to 3
* removed support for @go-ing to your memo points
* simplified the overly verbose @memo command; now re-uses pc_memo()
* cleaned up pc_memo(), now uses semi-correct packet replies
* Minor code cleaning/formatting

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11625 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-31 13:20:48 +00:00
skotlex
fe0c93c77b - Fixed the pc_additem weight check breaking when your current weight is above your max.
- Some minor cleanups.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11621 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-31 00:42:56 +00:00
ultramage
dc6254185a Fixed a compilation problem and warning (maybe).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11611 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-29 20:01:09 +00:00
ultramage
fc9d14b1bd Command code cleaning (refer to topic:169759)
* separated the execution part of command code into interface part and internal part to better see which checks are done and when (fixes problem where 'nocommand' mapflag blocked server npcs)
 * moved the internal commands list (array) to the end of the file, this let me discard that long block of ACMD_FUNC() declarations
 * removed enum AtCommandType from command headers and commands array; its purpose was perhaps to identify aliased commands, but apparently it was never finished because the rest of the code doesn't use it (also doing aliases like this is not a very good idea)
 * internally, commands are now referenced to using their function name
 * removed the @/# symbols from the command lists; all lookup functions will now properly deal with strings with- and without a command symbol (commands interface still requires the symbol tho', so TODO for later)
 * removed several unneeded commands (*id2 code, dmalloc debug commands)
 * reverted atcommand config from alphabetically-sorted to how it was before (with additional fixes; see /conf changelog)
 * added missing code for #dropall / #storeall
 * added a warning when trying to set gm level of an undefined command

The structure of the commands table has changed, please adjust docs/guides to match the new format (sorry for the inconvenience).


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11607 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-29 09:16:39 +00:00
FlavioJS
82a3432bd4 * Minor adjustment to take into account the end of line.
* Fixed the line count in the new error message of npc_parse_function.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11606 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 23:48:29 +00:00
FlavioJS
d51639d405 * Restricted more the parsing of npc code. (fixes bugreport:317)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11603 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 23:17:56 +00:00
skotlex
88e0444634 - Corrected the firewall/kaensin knockback code to how it is supposed to be done (the element/race check was originally in battle.c, and it was moved to skill.c because of the firewall hits on undead setting, now that it is not needed the code can be changed to how it was back then).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11594 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 15:48:12 +00:00
zephyrus
f0cc5dd038 - Fixed a bug on the Attachment [Mail System]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11593 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 15:12:54 +00:00
ultramage
f676a041a8 Fixed missing forward declaration of mail_message.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11592 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 16:48:17 +00:00
ultramage
ac7ffe49bb Slightly improved the message you get when trying to load a mob into the range reserved for player clones.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11589 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 15:59:05 +00:00
ultramage
3aa603d420 Fixed a typo in r11505 messing up the 'npcmove' command (only 'x' coordinate was being set correctly)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11588 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 15:45:24 +00:00
ultramage
acd2c914a5 Fixed a compilation error in the mail code. Blame the C standard and gcc for giving enums a variable-sized type, thus making forward declarations impossible.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11587 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 14:20:10 +00:00
ultramage
0031c1553e Removed 'petid', a command from r284 to look up pet ids by name.
Cleaned up some pet-related code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11586 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 12:45:12 +00:00