4640 Commits

Author SHA1 Message Date
zephyrus
c67c8f6184 - Protection for mercenary scrolls. (Don't consume it if you already have a mercenary).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13162 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 22:04:58 +00:00
zephyrus
2fdb259e9e - Cleanup on pc_isUseitem and added restriction for mercenary items.
- Also added restriction for Battle Manual / Bubble Gum.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13161 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 22:00:12 +00:00
zephyrus
f0439c9f56 - Implemented script commands for mercenary items (mercenary_heal and mercenary_sc_start).
- Fixed a bug crashing server with mercenary.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13159 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 21:05:35 +00:00
zephyrus
908c3d2e86 * More mercenary updates.
- Implemented Mercenary Die, Damage, Run Away when master dies.
- Log mercenary damage and gives exp to Master.
- Some little bugs.
* Fixed Bubble Gums effect works on mvp_sd not sd (according to Doddler).

NOTE: Now you can summon a mercenary, make it attack (not skills), follow you even on map change.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13158 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 18:37:00 +00:00
zephyrus
5aa3858e9a - Limitations to WoE SE Treasures (no steal, drop rates, no class change).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13156 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 11:00:32 +00:00
ultramage
bf86e54281 swtcompilationerror (followup to r13149)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13151 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-29 06:08:31 +00:00
ultramage
38ca0f6e4c Fixed a txt login server crash when reading a malformed accounts file.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13149 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-28 17:37:54 +00:00
ultramage
22c79e2098 Replaced the engrish ksprotection message with one provided by Itakou.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13147 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-28 04:02:39 +00:00
ultramage
8fcc1c7432 Fixed @cash/@points not handling negative values properly (bugreport:2132)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13145 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-28 03:55:21 +00:00
sketchyphoenix
c8fec27dfe * pc_isGM() checks in gm_cant_party config checks will now check against being lower or higher than lowest_gm_level config.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13143 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-27 19:47:26 +00:00
sketchyphoenix
b30900cce1 * Fixed @agjgmlvl bug preventing its use on other players. (bugreport:2124)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26 06:10:57 +00:00
ultramage
c9b246393c Added mercenary code (it should have been done this way in r13122).
Removed 2 unused variables in homunculus code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13137 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26 05:11:58 +00:00
ultramage
cbcc989ab9 Renamed files of 'mercenary' to 'homunculus'.
Applied relevant changes that were reverted (relevant = not unneccessary whitespace changes).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13136 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26 05:03:19 +00:00
ultramage
d4bcc0a143 Reverted all mercenary changes to mapserver homunculus code
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13135 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26 04:50:15 +00:00
zephyrus
9db51ad4e8 - Fixed crash on Pet hatch. Resorted the way a Pet is initialized. (Bug Report 2121)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13134 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25 19:41:27 +00:00
ultramage
4fcdf96f2a quick compilation fix to r13130
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13131 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25 10:05:37 +00:00
shadow
b75838a07b Last commit
Fixed homun sp regen bug introduced on r12953 bugreport:2071

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13130 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25 09:55:22 +00:00
akrus
65939ee758 * Fixed: several compiler warnings [akrus]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13129 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25 00:56:11 +00:00
akrus
d0bcebabe2 * Fixed: compiler warning in admin.c [akrus]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13128 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25 00:50:46 +00:00
zephyrus
62c214e0f2 - Mercenary Dismiss packet and some corrections.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13127 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 23:26:14 +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
ultramage
71a1081f70 Fixed a compilation problem caused by r13123.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 18:33:20 +00:00
zephyrus
be66dce771 - Fixed skill problems (who did this? Mercenary skills values are big than homunculus).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13124 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 16:02:26 +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
c5cc2257d3 - Moving all content of Homunculus code to a proper file Homunculus.c/h
- Update of all project files.

NOTE: All functions on homunculus.c should be renamed i think, to remove all the merc_*.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 15:00:26 +00:00
zephyrus
d650043597 - Implemented unit_calc_pos (copy from pet_calc_pos) to implement it on Mercenary/Homunculus and don't use x,y-1 always.
- Implemented Mercenary walk to master (same packet as Homunculus).
- Starting work on Stats but i will need lot of help.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13121 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 13:33:36 +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
zephyrus
4ca3bd6ce3 - Mercenary data structures.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13110 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22 18:53:11 +00:00
zephyrus
bc00263633 - Mercenary Database Reading.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13109 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22 15:14:07 +00:00
zephyrus
144ae2e37a - Ups. I forget this merge about Basilica (caster cannot walk).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13108 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22 12:13:13 +00:00
zephyrus
c6af5ab8d5 - Big update to Basilica, implementing official behavior.
* Basilica caster cannot walk.
* On Basilica area, only caster can use Basilica again to stop it.
* On Basilica no one can use skills. (Previous bug on eA because you can use support skills on it, also caster).
* Only Pressure can bypass Basilica protection.
* Any enemy of the caster bounce 2 cells back from basilica, except Boss type. (Bugreport 2099).
* Any monster can target you on basilica and try to attack you, also with skills, but damage is reduced to 0, except Boss.

Notes:
- Basilica Cell stuff is not used anymore... is it required?
- Still need to add a check previous to cast basilica because if there are mobs, items, npcs, walls, skills around the caster (7x7 i think) the skill should fail.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13106 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-21 20:38:32 +00:00
zephyrus
75acf439cf - Fixed a bug. Warp portal cannot be casted on dead players.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13104 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-21 15:28:09 +00:00
ultramage
c2ba03b6e2 Deleted zombie extern variable declaration which was causing a "static declaration follows non-static declaration" gcc compilation error.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13103 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-21 01:27:25 +00:00
zephyrus
c1fa49b7e6 - New invisible walls system (for WOE SE and Battlegrounds).
- New script commands for this system "setwall" and "delwall"
- Added other scripts commands "changelook" (can be used to try clothes colors, hair styles, headgears, etc without saving this on logout).
- Added getmobdrops to request a list of drop and rate of an specified class.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13101 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 20:56:35 +00:00
zephyrus
ab500d3207 - More cleanup of Barricades (final i think)
- Fixed a bug, missing sizeof(add_steal_rate).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13100 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 20:08:00 +00:00
zephyrus
1c9ed48637 - Do not trigger event if killed by script at all.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13099 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 19:48:35 +00:00
L0ne_W0lf
a4a518d6cc * Implemented Brainstorm's and SketchyPhoenix's fixes for Flying side kick.
- Skill will now remove KA-type statuses and not remove stalker's link while preserved.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13098 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 19:47:02 +00:00
zephyrus
6b6ef43c4b - Removed my barricade implementation. Not required in WoE SE.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 19:40:53 +00:00
zephyrus
6ff274c89c - Fixes on schg_cas02 and arug_cas01.txt
- Official Meteor Storm. Meteors can fail and just not fall, and only fall where you can get a shootable path.
* Tested on Aegis with help of ultramage.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 19:24:19 +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
FlavioJS
442204b547 * Added global sql settings 'sql.*' to inter_athena.conf.
* Made account, ipban and loginlog use the global sql settings when the hostname is empty.
* Commented 'ipban.sql.*' and 'account.sql.*' so they default to the global settings.
* Removed deprecated settings 'case_sensitive' and 'add_to_unlimited_account' from in login_athena.conf.
* Made inter_athena.conf be imported from login_athena.conf instead of being handled separate.
* Changed ipban to get the failed login attempts of an ip from loginlog (respects if loginlog is enabled or not).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13092 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-19 15:48:57 +00:00
ultramage
78f10d9ac2 Fixed incorrect array capacity / format string for txt mapreg loading code.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13090 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-18 09:49:02 +00:00
ultramage
4c2a6255cd Merged a critical fix to charserver online tracking code (see r13087).
Corrected wrong variable use in txt charserver online tracking code (mistake in r4726).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13089 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-18 04:30:57 +00:00
ultramage
26a6b9c61c Fixed some messed up operator priority in the mapreg code (bugreport:2078).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13088 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-17 06:06:28 +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
420cee95d9 Some cleaning in script.c
- documentation of functions translation of japanese comments
- usage of const char* instead of char* where appropriate
- removal of unused isstr() function

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13083 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-15 17:08:52 +00:00
ultramage
dcc2cdb5da Split off mapreg code from script.c
* new mapserver files, mapreg.h, mapreg_txt.c, mapreg_sql.c
 * removed MAPREGSQL from project files / makefiles
 * mapreg storage engine is now fully dependent on the server type
 * added config settings mapreg_txt and mapreg_db to inter config
 * added get_str() function to complement add_str()
 * fixed txt mapreg code allowing too long variable names

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13081 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-15 11:14:45 +00:00