4121 Commits

Author SHA1 Message Date
ultramage
eb99fad326 Added itemid defines for Stone and Skull_ (used by Pick Stone skill and pvp skull drop, respectively).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13035 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-02 12:18:24 +00:00
ultramage
c9d36f8201 Disabled the gm-hide namerequest cheat detection, uncomment if you know what you're doing.
Related revisions: r5813, r6709, r6715, r9905.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13031 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-01 10:35:43 +00:00
ultramage
dac1c2d2df Removed unused guardian hp columns from the guild castles table in main.sql (should have been done in r11915).
Corrected incorrect use of the datetime column in the `login` table (bugreport:1962). Refreshed txt account savefile.
Cleaned up some random minor source code glitches.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13030 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-01 07:05:16 +00:00
shadow
414c0f41e2 Quagmire now will affect boss monsters, but more info is required to code the debuff exceptions properly.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13028 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 22:49:09 +00:00
ultramage
8dca8ac00f Corrected one wrong config option name causing db connection problems (followup to r13005).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13027 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 17:34:44 +00:00
ultramage
438367ae22 @autoloot and @autolootitem can now be used together for more precise looting (no idea why it was blocked...)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13023 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 06:42:14 +00:00
ultramage
5033b0f675 Reverted r12230. cUSTOM_CFLAGS is redundant since you can achieve the same result by setting CFLAGS.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13022 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 06:08:07 +00:00
ultramage
115c5b6896 Removed the mob controller system, now a customization (see topic:194375).
The system consists of
 * script command to spawn a controlled mob
 * script commands to attach npcs to such mobs and manipulate their AI
 * a page of documentation for these commands
 * callbacks at various source code locations that invoke the attached npcs
 * two npc examples

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13021 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 05:37:40 +00:00
ultramage
aed027a0d4 Small cleanup of script.c
* removed DEBUG_FUNCIN (some tracing code for expression parsing)
 * cleaned up the hashing functions code a bit
 * removed SCRIPT_HASH_PJW since it gives results identical to SCRIPT_HASH_ELF
 * switched the hashing function used to ELF, since on current eathena it gives strictly better results than all others (w.r.t. entry count in buckets whose size is above the expected average)
 - note: ELF behaves very poorly if SCRIPT_HASH_SIZE is changed to 1024, others don't.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-30 13:40:47 +00:00
ultramage
9fd3dfd23b Fixed TXT storage code handling storage incorrectly (bugreport:1928)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13016 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-30 04:37:21 +00:00
ultramage
eef8f96e51 AccountDB_TXT will now correctly read inconsistent EOLs (bugreport:1934)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13015 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-30 03:19:35 +00:00
ultramage
54dc1c0f1a Removed the IRC bot system, now a customization (see topic:194306)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13014 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-30 02:24:04 +00:00
zephyrus
9edfef4924 - Fixed a bug with Status Resist Potion.
- Fixed double char data save on quit with storage opened. BugReport 1794.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13013 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-29 10:31:41 +00:00
ultramage
582c36c11e Renamed struct 'skill' to 's_skill' to remove naming collisions.
Added defines for mercenary skill ranges.
Added a mapping of mercenary skills to the skill db (700-799 atm).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13012 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-29 08:19:07 +00:00
ultramage
6fd34c5052 Fixed Sql object not initializing default values properly.
Fixed Sql_Free producing timer deallocation errors when called without first establishing a database connection.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13011 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-29 07:59:27 +00:00
ultramage
5fcd3cf029 Fixed loginlog not reading database config settings (followup to r13005).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13009 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-28 02:49:14 +00:00
ultramage
372aa678c2 Added code to md5 password received from charserver before comparing them with the database
(compatibility with previous implementation where 'S' passwords need to be hashed too)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13008 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 17:30:37 +00:00
ultramage
76f831a5ff Fixed md5 passwords not working
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13007 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 15:00:44 +00:00
ultramage
4b21dc3d57 Cleaned up several poorly chosen loginlog variable names.
Removed the unused login and txt->sql options in inter_athena.conf.
Renamed config option log_db to log_db_db in inter_athena.conf.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13005 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 12:40:29 +00:00
ultramage
8fed0c403c * Removed some leftover code that shouldn't have been merged
* Possibly corrected a guild saving problem (bugreport:1908)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13003 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 07:07:20 +00:00
FlavioJS
a389d52d34 * Fixed a memory leak in mmo_auth_tosql (extra sql statement being allocated).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13002 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 06:49:30 +00:00
FlavioJS
501b089d73 * Added missing option 'log_db_db' to loginlog_config_read(loginlog_sql.c).
* Fixed a memory leak in account_db_sql_destroy.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13001 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 06:32:02 +00:00
ultramage
106b44c1e7 Merged the /loginmerge branch (topic:192754)
* the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 20:45:57 +00:00
ultramage
19d4559ab6 Partially reverted the timer code changes from r12926 - r12969.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12999 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 20:13:41 +00:00
ultramage
6c8cf8d611 Replaced occurences of '-1' with the more appropriate 'INVALID_TIMER' value where appropriate.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12998 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 14:22:28 +00:00
zephyrus
d48a482180 - Implemented official Convex Mirror (With help of Yomanda and Sirius White)
- Fixed SC_WARN don't receiving reflecting damage (Bug Report 1854).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12997 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 11:13:39 +00:00
ultramage
249d1350e5 Fixed a bug in the npc shop code, where requesting an item that wasn't on the list caused the server to keep scanning past the list's array bounds.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12980 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-22 16:09:20 +00:00
FlavioJS
cb565d9d45 ops ('|'->'&' in delete_timer debug code)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12969 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-20 02:36:23 +00:00
FlavioJS
99a1aaa9e1 * Simplified the search in pop_timer_heap and added more debug info to help determine the source condition of timer errors. (bugreport:1860)
* Fixed crash in skill_castend_id. (bugreport:1860)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-20 01:16:59 +00:00
sketchyphoenix
37683bf468 Corrected #storagelist target typo (bugreport:1873)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12967 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-20 00:31:26 +00:00
FlavioJS
3f7b407d6d * Added a check to make sure only released timers are acquired from the free list.
* Changed TIMER_MAX_INTERVAL to 1 second (was set to 1 minute by mistake).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12963 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-16 10:34:16 +00:00
shadow
dde58291e4 Fixed TK_JUMPKICK, should not jump over objects and cliffs.
- This also might fix them being able to jump barricades on WoESE.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12962 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-16 00:07:16 +00:00
ultramage
398d3821df Removed the party_share_conflict() check.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12959 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 10:49:42 +00:00
ultramage
1d9c99dc72 Corrected wrong data loading order in txt storage code causing crashes at startup (followup to r12950).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12957 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 01:50:06 +00:00
FlavioJS
47ee54852d * Fixed pop_timer_heap using max heap comparisons instead of min heap comparisons and protected timer functions against improper use. (should fix bugreport:1833 bugreport:1841)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12956 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 01:41:49 +00:00
sketchyphoenix
da66cd1d32 * Corrected compiler warning and error made from r12959 and r12953, respectively. [SketchyPhoenix]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12954 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-14 06:29:35 +00:00
shadow
f17b22e948 Made homunculi have doubled regen rates (they regen twice as fast) defined on battle configs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12953 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-14 04:47:29 +00:00
Lupus
af4359b20f added missing pick_log
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12952 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-13 23:34:43 +00:00
ultramage
4546c7fc0a Modified storage data loading
* storage is now loaded/saved along with character status
 * as a consequence, a lot of storage handling code was removed
 * there is no more locking done within storage data
 * mapservers no longer cache the data (solves muiltimapserver exploit)
 * loading storage on char select may decrease charserver performance

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-13 16:14:32 +00:00
ultramage
d8ce1f4aa5 storage code cleanup (no behavioral changes yet)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12948 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-13 11:21:33 +00:00
shadow
6eda4e104a Fixed a bad check on NPC_EVILLAND, actually healing players instead of doing damage.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12938 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-12 00:31:51 +00:00
ultramage
bfd5397913 Renamed 'storage_' to 'items' in the storage_data structure.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12933 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-10 08:42:41 +00:00
ultramage
a35279667d Renamed 'struct storage' to 'struct storage_data' (to make 'storage' available as a variable name).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12932 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-10 08:27:03 +00:00
FlavioJS
9df0adf347 * Users can't click floating npcs directly. (quick fix for bugreport:1814)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12930 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-10 00:37:07 +00:00
shadow
b851a4ee69 Fixed SG_FUSION hp penalty (0.5% to 2%), bugreport:1805
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12929 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-09 13:14:00 +00:00
ultramage
df7e9922e9 Small cleanup of sql storage code (useless data structure allocation)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12927 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-09 06:03:26 +00:00
FlavioJS
cdda61ce1b * Added const to the return value of get_timer.
* Added a maximum timer interval. Avoids server shutdowns being delayed for ~10 seconds under some circumstances on windows.
* Replaced the fake timer heap (ordered array) with a binary min heap.

(actually, this is just a merge and has been in use for months)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12926 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-09 01:25:19 +00:00
ultramage
d40b9b93d4 First attempt at implementing the official walk speed system
* separated speed modifiers into bonuses, penalties and other statuses
 * no bonuses stack, instead the maximum is taken
 * no penalties stack, instead the maximum is taken
 * Union, Riding and Pushcart are the only other statuses that stack
 * both bonuses and penalties are linear modifiers of the base walk speed
 * 'other' statuses are applied after bonuses and penalties

Changed many equations to match official walk speed system
 * Steel Body now sets a fixed walk speed of 200 (bypassing everything else)
 * Defender now caps the walk speed to a minimum of 200
 * Slow Grace now uses official equation for aspd/walk speed decrease
 * Pushcart's speed penalty is now halved
 * Free Cast now changes walk speed to a fixed value, bypassing bonuses and penalties
 * Wedding clothes now have a penalty of +100%, not +200%
 * rogue's Tunnel Drive and stalker's Chasewalk ignore all penalties
 * taekwon's Running is now 5% faster
 * Frenzy is now 5% faster
 * Gospel's offensive slowdown is now +75% instead of +33%
 * Quagmire now slows down by +50% instead of +100%
 * Gatling Fever now slows down by +100% instead of +33%
 * Cloaking modifier is now a bonus/penalty, depending on presence of wall
 * Longing for Freedom overrides the song/dance penalty (bugreport:416)
 * Bard/Dancer Spriit now properly affects song/dance penalty (bugreport:1019)
 * item-granted speedup no longer stacks with speed bonuses (topic:145019)
 * removed some status code that pre-calculated speed bonuses/penalties, to make calculations more localized and less messy (see song/dance code)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12923 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-07 11:40:57 +00:00
ultramage
1df733fb4b Small cleanup of leftover Grimtooth data (followup to r12917)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12922 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-07 08:03:30 +00:00
akrus
a4c55c070a Fixed a typo :o
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-07 07:25:09 +00:00