41 Commits

Author SHA1 Message Date
zephyrus
5954733c85 - Moved char server's mercenary code to a different file (int_mercenary.*)
- New Sql Patch for create mercenary_owner DB.
- Removed mer_id from char_db.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13166 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-01 00:03:10 +00:00
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
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
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
ultramage
94943b2b6a Adjusted eAthena code to compile cleanly in C++ mode.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12436 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-26 10:37:45 +00:00
skotlex
5a8962fca0 - Corrected pc_checkitem not behaving correctly when you had more than one equip with a restricted card.
- Fixed non-chatroom owners being able to kick others from the chatroom.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12310 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-06 19:43:37 +00:00
skotlex
8ae4bd12ad - Updated firepillar so it cannot be placed on top of others.
- Updated the firepillar code so it behaves like the other traps.
- Changed the default format for @me and @main to avoid crashes on the newer clients.
- Fixed the char-sql server so it returns a valid 'not found' packet when attempting to load a non-existing homunculus.
- Fixed jump to use 0,0 for random coordinates rather than -1,-1
- Added missing \n to error reporting in getmonsterinfo
- Additional status changes now only get triggered if the attack did damage, not if they get absorbed.
- Fixed a logical comparison in unit_free to properly remove pets/homuncs when their intimacy is reduced to 0.
- Properly set the opt3 value for Moonlight, Changeundead and Soul Link
- Fixed the "no equip" flag of cards not being properly applied when attemting to equip items.
- Added a check to avoid invoking pet menu entries when the pet is incuvated.
- Fixed the session_data de-association in chrif_auth_delete
- Cleaned chrif_auth_ok so that the latest received char info is kept when previous char login data was already in there.
- Corrected docs mentioning non-existing flag 'mf_nopvp'


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12293 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-04 18:04:04 +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
b5cf6976a2 Fixed some homunculus skill offset calculation mistakes (bugreport:363)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11731 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-14 09:31:47 +00:00
ultramage
5216ecf05e * Fixed a typo in the status-change saving code (wrong variable used)
* Fixed a case of bad sql code conversion breaking homun skill loading

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11264 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-21 21:19:59 +00:00
FlavioJS
65642f6f1c * Merged the tmpsql branch:
- Abstraction for the sql code (sql.c/h).
- New configure script and makefiles.
- Restored txt zeny logging code. (r10814)
- Rewrote mapserver's sql code - itemdb, mobdb, mapreg, logs. (r10814)
- Fixed a precedence issue (&& and ) in char_sql/char.c. (r10833)
- Improved db reading code a bit for consistency. (r11077)
- Added separate atcommand for mail deletion. (r11077)
- Corrected a few messages that said "new" instead of "unread". (r11077)
- Broadcast (*) messages now use "*" as the target's name (not ""). (r11077)
- Moved StringBuf code from utils.c/h to strlib.c/h. (r11084 r11117)
- Some misc login server cleanups (reformatting etc). (r11136)
- Corrected/modified some header entries. (r11141 r11147 11148)
- Adjusted VS project files. (r11147)
- Adjusted the way the sql charserver does item saving. (r11192)
- Corrected usage of reserved keyword 'friend' in mmo.h. (r11192)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11245 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-20 11:09:36 +00:00
ultramage
301d493855 - Added new flag to skill_castnodex.txt, to allow per-skill tweaking of cast time and delay reducibility by item scripts (cards and such)
- Fixed Martyr's Reckoning never triggering for gms with all skills
- Added MO_TRIPLEATTACK and RG_SNATCHER to @skillall's skill filter 
- Made gm_skill_unconditional bypass skill blocking (guild timer, etc)
- Reverted the weird delay_dependon_agi thing (r8923, r9055, r9059)
- Changed a few memsets to strncpy (reading past buffer is a bad idea)
- Sped up some memset operations (multiples of 4 are faster)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10613 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-23 21:23:36 +00:00
ultramage
9e7eb8804f - Removed the TURBO socket mechanism - it was in fact just using a variable to cache a few arithmetic operations (premature optimization)
- Since the fifohead mess is gone, fixed leftover bad code structuring

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10599 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-21 18:40:29 +00:00
toms
b6ee9b3559 Forgot one in in_homun.c :s
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10277 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-17 13:28:32 +00:00
ultramage
5d3ea3da27 * Played around with MinGW a bit today...
- adjusted code so that it handles mingw-specific compatibility problems
- adjusted the makefile, mingw is not a subset of cygwin
* As an experiment Corrected many /W4 warnings on the txt login server

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10192 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-09 00:46:55 +00:00
ultramage
49096125fb Applied a consistent look to all header files (copyright, ifdefs)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9891 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-21 15:09:20 +00:00
ultramage
148f3fca88 Cleaning up of the socket code
- Shuffled includes around for files that were leeching off of socket.h
- Added code that enforces standard shutdown behavior for sockets

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9817 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-07 19:34:54 +00:00
skotlex
8ec0ed0d47 - Corrected homunculus's aspd being halved after using some aspd adjusting skill.
- Cleaned up the resetskill function (even though the functionality is the same as before)
- Corrected item 1459 (unused Partizan with no slots) being wlv3 instead of 2 (as the other two partizans)
- Changed the name of the four second versions of homunculi to not have a 2. (so you get a 'lif' and not a 'lif2'
- Removed flag graffiti from abracadabra
- Updated the stun times of Bash, Npc-StunAttack and meteor Assault to 5 secs as reported by Ultra Mage (still pending more data to see if all others need updating as well)
- Removed the log info message 'created homunc...', and the 'loaded homunc' message will only show if the save_log is enabled.
- Some cleanups


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9760 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-01 18:34:05 +00:00
skotlex
50a03b0751 - Corrected char deletion not working (column is called homun_id, not hom_id...)
- Collapsed config settings produce_item_name_input, produce_potion_name_input, making_arrow_name_input, holywater_name_input, cdp_name_input into a single config produce_item_name_input which uses bitmasks to determine what it affects.
- Updated arrow_decrement to have 3 possible values: Disabled, Enabled, and Enabled as well as giving arrow requirements to skills that do not have them when used with ranged weapons (auto-guess for plagiarized/item-granted skills)
- Minor cleanings


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-30 17:38:39 +00:00
skotlex
59faa0164c - Fixed compiltation error ~.~ I was sure I compiled before the previous commit...
- Corrected a null pointer error when a non-player uses amplify magic power.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9743 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-29 22:08:09 +00:00
skotlex
c52340cb3a - Corrected the homunculus deletion functions so that the homunculus is deleted together with the character.
- Added npc_check_areanpc so that Wand of Hermod will correctly check for nearby warps.
- Emergency avoid now stacks with other speed boost statuses
- Item skills and skills that bring up a menu now are cleared on death.
- Minor cleanings


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9742 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-29 22:00:51 +00:00
skotlex
d65e051707 - Added a wrapper to delete_timer so it prints out from where the invocation was done.
- Fixed some unsigned warnings.
- Fixed Splash attacks consuming 2 ammo on each attack.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9718 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-26 18:49:46 +00:00
skotlex
a578128619 - Changed some %lu (long unsigned int) to %u (unsigned int)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9541 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-20 18:56:31 +00:00
FlavioJS
637ae9a4dc - Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05 13:23:07 +00:00
skotlex
cfee0ccf63 - Added all the missing FIFOHEADs in the login/sql servers (required for TURBO support)
- Fixed the fact that the TURBO code breaks when you attempt to handle more than one connection at a time within the same function. However this broke map-server compilation, therefore, don't use TURBO yet! It needs more fixing (and I need more time to fix it)
- While at it, cleaned a few packet implementations in the char/login servers which were not only ugly, but had some really stupid flaws within (stuff like escaping a string, and then using the non-escaped variable to insert to SQL? T_T) And will someone explain me why the TXT servers are coded much more cleanly, and without such horribly broken code as I find in the SQL ones? T_T;


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9307 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-24 12:41:38 +00:00
skotlex
71601f58b3 - Made the exp bonus settings be adjustable:
- exp_bonus_attacker: Indicates how much additional exp a mob gives per additional attacker (eg: 10 -> +10%*attacker)
- exp_bonus_max_attacker: Indicates at which number of attackers the bonus is capped (eg: 5 -> 5 attackers, so a mob yield the same exp whether 5 or 10 people attack it)
- Changed the way the party_even_share_bonus setting works. It now uses a simple linear bonus increase (eg: 10 -> +10%*party member)
- The defaults are as explained by Tharis: +25%/attacker, capped at 12 attackers, no party bonus.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9067 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-25 14:44:14 +00:00
skotlex
a78eb50f08 - Removed NJ_TOBIDOUGU adding damage to W_HUUMA weapons which somehow got readded.
- When nonplayers use Cloaking, it will be forced to level 10 since mobs shouldn't have movement/attack restrictions while walking cloaked.
- Should fix a warning in int_homun.c


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9043 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-23 13:57:54 +00:00
skotlex
1107b381bd - Fixed Charge Atk being able to go through chasm/pits.
- Moved the homunculus DB information from the player structure to the homun structure. Modified the homunculus creation packets to hold this information during creation, also, all initial values are handled by the map-server, the char server only assigns it a homun ID.
- Removed target_id/attacked_id from homun_data as it wasn't really used.
- Codes cleanup (removing of commented code mostly)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9031 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-20 18:30:05 +00:00
toms
5dffc4b45e Fixed "int format, long unsigned int arg" warning
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8391 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-20 20:56:08 +00:00
skotlex
5c44979d67 - Applied multiple fixes which should take care of making homun save/load work on TXT now.
- Added Gatling Fever's batk bonus.
- Some cleaning in status_damage which should prevent trying to free already free'd pointers when unit_remove_map invokes unit_free (when status_damage was going to invoke unit_free anyway)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8308 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-15 23:30:48 +00:00
toms
2f858a5ea7 Delete homunc's skills from sql when the homunc is destroyed
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8307 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-15 23:05:29 +00:00
skotlex
80ded70c4f - Fixed the int_homun.c compilation issue with Char-SQL.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8300 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-15 19:56:11 +00:00
skotlex
c16d90c8a3 - Some cleanup of int_homun.c
- Added homun saving/loading support to char-TXT. Note that this is completely untested, so it may be as good as broken.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-15 19:44:22 +00:00
skotlex
a0ab1d07f5 - Applied the fix to homunculus name saving...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7777 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-20 19:57:18 +00:00
skotlex
c89acf814e - Fixed the homun creation sql statement. Why noone else did so before?
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7749 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-19 15:29:55 +00:00
skotlex
97b00a11ad - Added a proper check to make aggressive mobs never override homun targets regardless of distance.
- Removed a bunch of homun-related variables that are not needed at all. The alive condition is removed, now the code checks for the hp value to know if the homun is alive or not.
- Cleaned up a bit the skill-id function, homun skill checks (such as delay and skill-lv learned) should be correct now.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-18 13:25:21 +00:00
Vicious
1090167f97 orn's lil fix
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7707 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-17 01:53:59 +00:00
DracoRPG
15dd140846 Orn's and Albator's Homunculus system, finally, YAY!!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7706 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-17 00:15:33 +00:00