6562 Commits

Author SHA1 Message Date
skotlex
146ca072bb - Corrected mob spawn utilization of the delay1/delay2 values (one is respawn delay base, the second is random variance added on top of it). Cleaned up related code.
- Changed abit map_add_block to prevent adding a player object which is invalid (not authed, waiting to be disconnected)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11964 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 18:08:37 +00:00
ultramage
e0611bf8b5 Fixed server not always sending the correct level values to the client.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11963 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 17:30:49 +00:00
ultramage
3d545fd51a Cleaned the script conf files (see topic:171384 for details)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11962 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 17:26:15 +00:00
ultramage
08980b13b3 Fixed non-skill splash attacks showing 'unknown skill' (bugreport:665)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11961 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 16:05:47 +00:00
ultramage
66e434316b Fixed some typos in skill_db.txt, caused by r11949 (bugreport:657)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11960 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 14:35:37 +00:00
ultramage
0d011cc9b2 forgot path.h ._.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11959 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 13:05:51 +00:00
ultramage
b3b275f24f Path code cleaning...
* Added map/path.h, moved path-related function headers to path.h.
 * Removed the macroed _real() path functions.
 * Modified some functions to use boolean return values instead of 1/0 or 0/-1.
 * Modified path_search_long() to allow a NULL output pointer (in which case a temporary local buffer will be used instead).
 * Removed an unused ->path_half member variable from struct walkpath_data.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 13:00:48 +00:00
ultramage
db3db2c2e5 Fixed mob AI code iterating over non-mob objects without checking, when monster_ai flag 0x20 is set (caused by r11943)
Cleaned up macros that wrap unit_stop_attack() (bugreport:357)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11957 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 09:00:57 +00:00
ultramage
9a8739d28e Fixed some formatting glitches in atcommand.c
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11956 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-19 22:15:27 +00:00
ultramage
6730ae32cc Fixed yet another buffer overflow, in @adopt
(caused by a conflict between a mass replace in r2207 and very dumb variable reuse in r1316)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-19 20:56:37 +00:00
FlavioJS
f218726d7d * Changes to the configure script.
- fixed the 'pointers can be stored in ints' test not working
- fixed the linker trying to build 64 bit executables with 32 bit code on x86_64 (missing -m32 flag in LDFLAGS)
- made MYSQL_CFLAGS be built from the --include option to be more portable
- made --with-mysql check if the optional argument is an executable file
- make --with-pcre check if the optional argument is a directory
- other minor changes


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11952 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-19 17:17:29 +00:00
skotlex
c5415465da - Corected the SC_MIRACLE + Anger code using the wrong skill level to calculate damage bonus.
- Corrected SC_MIRACLE to trigger Bless of the Stars on all defeated mobs.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-19 16:41:56 +00:00
skotlex
a6875211ef - Fixed skill name for skill 39 (MC_PUSHCART)
- Corrected some formatting in a few entries in skill_db (TODO: if you really want to format the file to have file names aligned, spaces should be used instead of tabs, like it was done for GD/HLIF skills!)
- Corrected placement of leveled up mobs bonus exp
- Fixed a possible crash when parsing MSC_MASTERATTACKED mob skills.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11949 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-19 13:10:48 +00:00
ultramage
f32a0b4355 Corrected mistakes in script_commands.txt (bugreport:373)
- reformatted the file header (less junk more info)
- corrected "$" variable description saying that it always uses save/mapreg.txt
- added missing OnMinute: reference
- corrected OnLoadMapEvent saying 'loadmap' is the mapflag to use (should be 'loadevent')
- fixed getcharid() script example doing the opposite of what it said it was doing
- corrected getmonsterinfo() saying its parameter was an 'item id'
- corrected attachrid() saying "use character id as parameter" when RIDs are account ids
- placed commands from the 'RoVeRT' block to where they logically belong
- re-phrased the documentation to npc timers

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11948 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-19 12:04:42 +00:00
ultramage
ff2ae0fe05 Fixed a possible buffer overflow in @partyoption code.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11947 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-18 22:06:36 +00:00
Playtester
4703cc8e2e * Updated respawn time interpretation according to latest kRO update
- this first time is the "min respawn time"
- the second time is the "variance" which is added to the "min respawn time"

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11946 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-18 21:22:29 +00:00
skotlex
ece12b6e42 - Cleaned up a bit the format of skill_db.txt (that comma next to the skill name looks ugly if you ask me)
- Corrected skill_db reading to properly trim the skill name/descs.
- Added a mobid_db in map.c to handle mob lookups faster.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11943 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-18 15:45:48 +00:00
skotlex
ace81763bc - removed redundant clif_hominfo line in merc_hom_dead (it was sent already from hom_damage)
- Item usage is now blocked while hidden.
- Moved the bladestop/berserk check from clif_parse_EquipItem to pc_equipitem


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11942 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-18 15:01:18 +00:00
ultramage
11f67e9099 Fixed a glitch where the TXT charserver would not unlock castle.txt after creating it, thus preventing it from being saved correctly.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11941 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-18 14:46:19 +00:00
ultramage
acad1ac4dd minor code tweaking
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11936 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-18 09:13:01 +00:00
ultramage
5790585d16 * Added flag.server to indicate interserver sockets
- replaces the previous way (setting 'client_addr' to 0)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11930 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-17 13:23:34 +00:00
ultramage
e5b0ee65bf Removed the 'create athena.txt' step from athena-start as the server does that automatically.
Removed the 'kill -9' action from athena-start, as it prevents the server from shutting down cleanly. If your process gets stuck, kill it manually (or add a hard-stop option).
Fixed one wrong revision number in changelog.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11924 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-17 07:09:10 +00:00
L0ne_W0lf
23d79b9943 Touched up Merchant quest Biliban Kafra function
- Will now return to the previous script execution if all conditions fail.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11922 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-16 23:38:41 +00:00
L0ne_W0lf
f53f2a4d05 Updated Louyang NPCs, quests, and warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-16 22:51:19 +00:00
ultramage
86b5e0c6f6 Replaced the 'map name' castle data variable with the equivalent 'map index'.
Optimized the castle lookup functions (direct dbmap enumeration, and no redundant operations inside the searching loop).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11918 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-16 21:00:36 +00:00
ultramage
950e40ed47 Some more guild code reformatting (moved do_init_guild() to the end of guild.c, cleaned up and documented the castle/guild/member lookup functions, fixed a compilation warning...)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11917 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-16 13:50:50 +00:00
ultramage
d68cc86799 Fixed one query that I missed when doing r11915
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11916 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-15 07:57:36 +00:00
ultramage
1e6922174e Guardian hp handling code removal (see bugreport:342)
- removed guardian hp from the castle data structure, database, savefiles and various script functions (use upgrade_svn11914.sql)
- removed guardian hp calculation and manipulation from the castle manager npc, now the hp values are updated by the server itself (glitch: when castle defense changes, all guardians are healed to full)
- tweaked script function 'guardianinfo' to provide some data needed by the manager npc (currently available are hp, maxhp and visibility); also, it doesn't need a player attached to execute anymore
The whole thing is experimental, use at your own risk (seems to work though...)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11915 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 23:38:11 +00:00
FlavioJS
71efbff724 * Commited the quick fix "emps not respawning if the emp breaker logs off". (from r11630 bureport:369)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11913 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 10:57:38 +00:00
ultramage
a772e3699d Added a precise and consistent tick() function for freebsd (see bugreport:240)
(TODO: apply it to multiple platforms using an appropriate configure script)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11912 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 10:52:51 +00:00
skotlex
aa83de997f - corrected Option_Xmas value in const.txt
- Wand of Hermode now dispells buffs only of allies.
- Fixed some null pointer checks in status_change_end.
- Corrected a crashy Warning message.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11910 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 02:57:54 +00:00
L0ne_W0lf
10bec9ed67 Fixed Big Defense Potion 10ea Box. (was giving small def pot.)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11909 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 01:16:31 +00:00
L0ne_W0lf
6ee5ac12f6 Maheo in Ice dungeon quest now uses setnpcdisplay.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11906 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 01:07:46 +00:00
L0ne_W0lf
da3f962b22 * Minor fixes, guild manager, and a couple others.
- bugreport:579, attempt at fixing bugreport:581
- Fixed a typo in the hunter quest. (Not noticable really.)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 00:58:20 +00:00
L0ne_W0lf
1d4d4feee2 Updated Ayothaya NPCs, Quests, and Warps.
- Should also fix bugreport:586 (Footprint2 error)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 00:38:41 +00:00
ultramage
822ba1ddd7 Fixed a mistake in r11895 where guild invitation data was being cleared too soon, causing a check to fail when confirmation arrived from the charserver.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11902 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-13 23:29:41 +00:00
FlavioJS
9bfc5b4425 * Fixed possible segmentation faults in the script engine.
- some strings that can be freed outside the script engine were being pushed into the stack as constant strings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-13 21:42:38 +00:00
FlavioJS
ef54f5d793 * Disabled ers until recent crashes are fixed.
- ers entries are being corrupted, probably by modifying them after they are released or by releasing something else

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11900 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-13 18:50:48 +00:00
FlavioJS
02d21582a6 * Abstracted the windows socket code so that all fd's are in the range [1,FD_SETSIZE[. (bugreport:604)
- The socket of a fd is forgotten when executing sClose, so things that depend on the socket (like sFD_CLR) must be executed before closing.
* Replaced the fd_set of the short list with a custom implementation (works like the linux fd_set).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11897 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-13 16:32:58 +00:00
ultramage
2af4a7f61b Some more tweaks to the guild code
- unrolling of foreach()/_sub() pairs using db iterators
- usage of ARR_FIND instead of for()/break;
- old function header adjustment

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11896 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-12 14:18:46 +00:00
ultramage
8be1c4d48c * Some preparations for the guild script update
- cleaned up npc event execution code
- cleaned up guild data loading/saving code; to be improved later
- removed dummy 'account name' expulsion list management code
- removed columns 'rsv1' and 'rsv2' from guild member data
- removed columns 'rsv1' 'rsv2' 'rsv3' and 'acc' from guild expulsion data
- added upgrade_svn11895.sql for SQL

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11895 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-12 09:55:13 +00:00
ultramage
e464c81aea Removed the badly designed/unfinished guild_check_conflict() data integrity check (that wasn't actually being used up 'till now).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11894 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-12 09:41:51 +00:00
zephyrus
0d17cff99b - Added some new cash-items and headgears.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11893 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-12 04:34:02 +00:00
skotlex
9d353fba9b - Added query_logsql script command to perform sql commands using the log db connection.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11892 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 22:37:07 +00:00
skotlex
4adcab437f - Status change start will now fail when invoked on players that are disconnecting.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11891 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 22:06:36 +00:00
ultramage
ef8bf03761 Fixed TXT charserver attempting to do a guild master change instead of an integrity check whenever a new guild member gets added.
See revisions r3185 and r3719 on how the code arrived into such a state...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11890 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 21:01:55 +00:00
L0ne_W0lf
a4f1cab764 Oops, forgot to commit!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11889 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 20:43:57 +00:00
ultramage
0ca1cee5fc Fixed a mistake in r11876 that prevented the login server from doing auth correctly due to an incorrect IP being used in the process.
The whole thing should be reverted when there is a proper flag to identify interserver connections.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11888 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 20:11:44 +00:00
L0ne_W0lf
3c65f35146 Updated Amatsu NPCs, Quests, and Warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 18:38:55 +00:00
skotlex
11c0438e85 - The interserver outgoing buffer now gets flushed when it reaches 512KB of data stored on it.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11886 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-10 19:13:12 +00:00