7351 Commits

Author SHA1 Message Date
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
6409465768 Fixed one 'additional include directories' entry in the vs9 mapcache project file (release mode) that wasn't updated for the new paths (bugreport:1950).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13017 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-30 11:13:57 +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
f03a7e2413 Corrected upgrade_svn12975_view.sql not assigning default values to the two dummy columns (bugreport:1940).
Please drop the view and re-run the script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13010 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-29 03:06:58 +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
L0ne_W0lf
dff7d38acb * Added values to skill_require_db for mercenary skills.
* Added values to skill_unit_db for mercenary ground skills.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13006 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 13:35:13 +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
L0ne_W0lf
e64c594e63 * Added values to skill_cast_db for mercenary skills.
- These skills are NOT implemented. Place holders only.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13004 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 11:59:45 +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
L0ne_W0lf
f3ca89db2b Slight change to the nameless island quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12995 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 00:18:48 +00:00
L0ne_W0lf
b26cccf4e2 Should fix any more issues in Nameless access quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12994 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-25 15:47:29 +00:00
L0ne_W0lf
e787f3ca89 * Corrected Luna Bow Bonuses. (bugreport:1919)
* Swapped dis/enable for hideon/off in wedding script.
* Corrected Slotting NPCs triggering on touch. (bugreport:1916) 
* Added a missing close in juperos quest. (bugreport:1918)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12993 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-25 15:22:54 +00:00
akrus
eaa85e10a3 typo fixed ;)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12990 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-25 02:05:33 +00:00
zephyrus
1b3acad0d6 - Some cleanups and a bug fix on schg_cas03.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12989 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-24 22:40:32 +00:00
L0ne_W0lf
335f078bf8 Enabled Ontouchnpc event in a rachel quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12988 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-24 18:46:17 +00:00
Paradox924X
94ba231582 Removed an extra ) in Item 2765's script.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12987 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-24 13:31:52 +00:00
ultramage
03d91b511f Increased max. hairstyle number, 23 -> 25 (bugreport:1773)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12986 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-23 16:23:06 +00:00
L0ne_W0lf
38f2bd2e48 Another small fix to Nameless island quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12984 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-22 21:44:54 +00:00
L0ne_W0lf
15f3aba273 Implemented stats for Sealed Shine and Endless Tower monsters.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12983 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-22 20:37:20 +00:00
zephyrus
61761ac8f4 - Some new items and a correction in Dark Lord Card.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12982 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-22 19:25:11 +00:00
L0ne_W0lf
74a8d68769 * Removed mail commands that no longer exist from help.txt.
* Finally getting around to fixing a few bug reports
- Corrected some view IDs for some newer headgears. (bugreport:1842)
- 11.3 bows are now equippable by all archer classes. (bugreport:1885)
* Getting around to fixing some script bug.
- Fixed bugs in the nameless quest, and other npcs. (bugreport:1845)
- Fixed some bugs in the WoE:SE control devices. (bugreport:1848)
- Fixed minor typo in the novice grounds. (Bugreport:1877)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12981 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-22 16:37:32 +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
ultramage
93bdf28e3b another useless product of ignorance
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12979 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-22 08:32:01 +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
L0ne_W0lf
77d04c1f72 Updated the Satan Morroc skills (still custom, based on Future Wiki)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12966 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-16 15:12:06 +00:00
shadow
ba430d6c2e This shouldnt have been commited, but i did by mistake (bugreport:1861). And since its already here:
- Added custom 12.1 monster skills, these skills will be changed when we get official info about them.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12965 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-16 15:04:10 +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
shadow
1fc5701465 Removed "old" from IG_OldGiftBox by mistake.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12961 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 22:17:30 +00:00
shadow
3adffcab45 Fixed some bad named gift boxes on constant db, bugreport:1857
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12960 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 22:15:23 +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
Paradox924X
0d0f4588ea Updated WoE Time Explanation for Sunday.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 02:28:03 +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
a1ce35b2c6 Fixed my typo in the Changelog-Trunk.txt (r12959 does not exist yet. Should have been r12952)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-14 06:33:26 +00:00