Commit Graph

481 Commits

Author SHA1 Message Date
zephyrus
6a1de57730 - A proper mercenary lifetime calculation.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 22:56:05 +00:00
zephyrus
5df63da5e7 - Implemented Mercenary Scrolls (item_db)
- There are some little problems, like remaining time going to 0, but you can summon it, make it walk, follow you.
- Feel free to test it.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13126 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 22:45:32 +00:00
zephyrus
daf7030ce9 - Ops!! this is mine (homunculus hungry messages).
- Fixed a bug on char delete.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13123 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 15:51:33 +00:00
zephyrus
0cd39a6399 - Some stuff i forgot for char_sql. Bug Report 2112.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13119 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23 22:21:32 +00:00
zephyrus
399efe15bd - Completed Mercenary Create, Delete, Save. Tests OK.
- Incremented MAX_SKILL required for a proper load of Mercenary Skills.
- Some fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13118 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23 19:08:54 +00:00
zephyrus
e5e14c14fe - Added column mer_id on char_db
- More mercenary implementations (delete, load, create)
- Some fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13117 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23 14:59:51 +00:00
zephyrus
1204fd49db - Mercenary Packets (Server to Client). Still need a little more info.
- Packet for Mercenary Menu.
- Some other progress as creation but need more code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13116 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23 13:09:50 +00:00
ultramage
e3d39453fd * Fixed a storage saving issue with txt charserver (bugreport:2084)
- caused by incorrect idb_ensure -> idb_get change (see r12950)
- removed redundant account_id variable from storage data
- cleaned up the very messy txt storage handling code

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13093 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-19 16:00:30 +00:00
zephyrus
83f55ea8bf ** Please update your server ASAP. **
- Fixed a wrong auth process, setting account offline in Login server when accessing Char server. (OMG!)
- Fixed a bug on TK_JUMPKICK. It should only do damage if can reach target.
- Fixed bug on Arug_cas01 script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13087 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-17 00:21:13 +00:00
ultramage
581c0a893f Fixed an ancient sql query typo (bugreport:1979)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13046 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-04 13:05:52 +00:00
ultramage
5ce6f6c51a Added configs for quest table name adjustment (bugreport:1778)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13041 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-04 03:19:00 +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
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
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
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
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
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
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
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
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
ultramage
7444eb572c Random assortment of various small corrections and tweaks.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12894 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-29 06:00:05 +00:00
ultramage
801084a7c0 Basic cleanup of the SQL charserver homunculus code.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12863 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-19 20:26:02 +00:00
zephyrus
edcd7e6d28 - Fixed bug report 1436 (Auction)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12742 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-29 11:46:36 +00:00
ultramage
dcbee8ef6c Fixed 64bit timestamps messing up auction/storage (bugreport:1454)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12713 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-16 16:11:16 +00:00
skotlex
ade0947216 - Corrected default guild positions not being saved during guild creation.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12690 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-07 20:20:40 +00:00
Kevin
21802ff355 Cleaned up char server set online/offline/char select functions. (bugreport:1359)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12670 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-28 15:03:33 +00:00
ultramage
155416f712 fixing some timestamp type difference warnings...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12669 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-27 20:03:25 +00:00
ultramage
fc5918e335 Removed the calc_times() no-op (bugreport:1289)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12668 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-27 19:46:17 +00:00
Kevin
679e600fcc Cleaned up auth system after change back to map server request.
- Created function set_char_charselect to get rid of some of the "special case" variables.
- Removed code that involved the char server sending auth data at char select.
- Changed char select code to update the instance of the char data in the DB to fix map/sex info not being propagated to auth request.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12658 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-26 22:13:02 +00:00
FlavioJS
c880052f0f * Changed the data field of timers from int to intptr.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12633 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-21 21:34:31 +00:00
toms
ccb23efe49 Made some cleanup in changesex
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12626 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-21 16:19:25 +00:00
zephyrus
bb98e43f3c - Some mistake from someone but OMG!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12609 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-17 00:51:15 +00:00
ultramage
70e34f81cd Fixed an issue in r12575 where 'not setting char offline when going from mapserver to charserver' also caused a permanent account lockout if the player pressed 'cancel' in the char select screen.
Merged some recent changes from SQL to TXT, as someone didn't bother to do it.
Ifdefed the quest data request code as SQL-only (this was causing server disconnects whenver someone logged in).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12606 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-16 07:48:53 +00:00
FlavioJS
f2fd4cde62 * Fixed a possible crash in char_sql. (since r12575, later modified in r12590).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12593 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 20:22:48 +00:00
toms
73df203735 Fixed a memory leak in mapif_quests_fromsql
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12592 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 15:01:04 +00:00
toms
92f9bf6a8c Fixed a typo in char_sql/char.c
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12591 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 14:22:54 +00:00
toms
e61bf34e4f Fixed a bug in the disconnection part char-server (not sending you offline)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12590 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 13:48:25 +00:00
Kevin
a653b4e2d6 Removed some unused variables that appeared in the last commit (r12584).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12585 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 02:45:11 +00:00
Kevin
236c7cba43 Some more updates to the quest log system. It has been completely moved to the inter server instead of the char server.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12584 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 02:32:24 +00:00
FlavioJS
dcf71ce50b * Followup to r12579 (all other players appeared as female on sql branch).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12583 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-14 01:11:21 +00:00
Kevin
302adbf42a Major updates to the quest system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-13 22:19:02 +00:00
FlavioJS
49aac80ed6 * Quick&dirty reversal of the inter-server behaviour introduced in r3255/r3256:
- the behaviour enabled a desynch between the char-server and the map-server
- now the map-server asks the char-server to authenticate the auth info (the char-server doesn't send the auth info immediatelly)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12579 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-13 18:31:49 +00:00
Kevin
69114a1c7d Login will no longer set character offline when going from map to character select.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12575 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-13 05:14:01 +00:00
Kevin
fc2bec97d7 At char select, the char server will set character to server -2 (server unknown) rather then -1 (at char select) and will be changed to the map server id once the character loads in.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12569 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-11 23:10:14 +00:00
ultramage
00a5bccbd3 The max_account_id packetver detection mechanism will never cause any connection problems ever again. (bugreport:388)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12563 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-11 09:31:32 +00:00
Kevin
ffa3b60fc0 Finished most of the quest log code, still bits here and there but it's usable now.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12558 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-11 07:12:45 +00:00
Kevin
12aff369d9 Some quest log changes and removed one of the set char offline calls that was added in revision 12552.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12557 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-11 02:42:30 +00:00
Kevin
3c7a81a079 Client not marked online until map receives auth request from the client and is approved. Also added some online/offline sets to the auth system that were being looked over and not properly updating the char server as to what's going on.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-10 21:28:27 +00:00
ultramage
fd5f918452 Modified the charservers to use a DBMap instead of a cyclic array for auth data.
Merged the auth fix from r12473 to TXT as well.
Removed the no-op from r12547.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12551 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-10 19:07:00 +00:00