summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-09-01- Moved char server's mercenary code to a different file (int_mercenary.*)zephyrus15-170/+362
- New Sql Patch for create mercenary_owner DB. - Removed mer_id from char_db. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13166 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31- A proper mercenary lifetime calculation.zephyrus7-21/+23
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31Updated Monster Taming item cute pet armor quests.L0ne_W0lf2-417/+581
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13164 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31Updated several ancient headgear quests.L0ne_W0lf9-1289/+1702
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31- Protection for mercenary scrolls. (Don't consume it if you already have a ↵zephyrus1-0/+3
mercenary). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13162 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31- Cleanup on pc_isUseitem and added restriction for mercenary items.zephyrus1-25/+78
- Also added restriction for Battle Manual / Bubble Gum. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13161 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31Added item effects for Mercenary potions. L0ne_W0lf2-5/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31- Implemented script commands for mercenary items (mercenary_heal and ↵zephyrus5-2/+45
mercenary_sc_start). - Fixed a bug crashing server with mercenary. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13159 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31* More mercenary updates.zephyrus8-124/+197
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13158 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31- Limitations to WoE SE Treasures (no steal, drop rates, no class change).zephyrus2-10/+11
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13156 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31Missed one of those blatant errors in the Keil Hyre Quest.L0ne_W0lf2-3/+5
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13155 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31Fixed blatant errors that I added to Keil Hyre Quest.L0ne_W0lf2-9/+10
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13154 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-29Couple small corrections to the mob database. (bugreport:2109)L0ne_W0lf2-2/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13153 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-29* Just fixing some reported script bug.L0ne_W0lf5-23/+35
- Fixed coordinate in level 60 arena. (bugreport:1663) - Fixed errors in the Keil Hyre quest. (bugreport:2129) - Fixed guild look ups in Arug_cas02. (bugreport:2134) - Corrected treasure spawn in schg_cas03. (bugreport:2142) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13152 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-29swtcompilationerror (followup to r13149)ultramage1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13151 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-29- Small fix in Juice Maker quest, NPC kept saying text for just grape juice.Kisuka1-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13150 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-28Fixed a txt login server crash when reading a malformed accounts file.ultramage1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13149 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-28Replaced the engrish ksprotection message with one provided by Itakou.ultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13147 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-28Fixed @cash/@points not handling negative values properly (bugreport:2132)ultramage3-4/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13145 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-27- Fix on Kiel Hyre Quest.zephyrus2-3/+3
- Fixed setcell on schg_cas03 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13144 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-27* pc_isGM() checks in gm_cant_party config checks will now check against ↵sketchyphoenix2-2/+3
being lower or higher than lowest_gm_level config. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13143 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26* Fixed @agjgmlvl bug preventing its use on other players. (bugreport:2124)sketchyphoenix2-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26Added mercenary code (it should have been done this way in r13122).ultramage3-1/+431
Removed 2 unused variables in homunculus code. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13137 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26Renamed files of 'mercenary' to 'homunculus'.ultramage2-11/+8
Applied relevant changes that were reverted (relevant = not unneccessary whitespace changes). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13136 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-26Reverted all mercenary changes to mapserver homunculus codeultramage4-1515/+1084
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13135 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25- Fixed crash on Pet hatch. Resorted the way a Pet is initialized. (Bug ↵zephyrus1-14/+14
Report 2121) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13134 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25Corrected Spear and Swordman mercenary scrolls again. L0ne_W0lf2-20/+21
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13133 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25Corrected Spear and Swordman mercenary summoning scrolls.L0ne_W0lf2-28/+31
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13132 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25quick compilation fix to r13130ultramage1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13131 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25Last commitshadow2-6/+8
Fixed homun sp regen bug introduced on r12953 bugreport:2071 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13130 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25* Fixed: several compiler warnings [akrus]akrus3-2/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13129 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-25* Fixed: compiler warning in admin.c [akrus]akrus2-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13128 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24- Mercenary Dismiss packet and some corrections.zephyrus4-5/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13127 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24- Implemented Mercenary Scrolls (item_db)zephyrus9-92/+211
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13126 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24Fixed a compilation problem caused by r13123.ultramage1-2/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24- Fixed skill problems (who did this? Mercenary skills values are big than ↵zephyrus2-7/+7
homunculus). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13124 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24- Ops!! this is mine (homunculus hungry messages).zephyrus2-8/+1
- Fixed a bug on char delete. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13123 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24- Moving all content of Homunculus code to a proper file Homunculus.c/hzephyrus26-1234/+1363
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24- Implemented unit_calc_pos (copy from pet_calc_pos) to implement it on ↵zephyrus8-98/+147
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13121 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23- Fixed Taekwon job quest NPC facing the wrong way. (bugreport:2090)Kisuka2-3/+6
- Fixed an issue with Kiel_Hyre_Quest.txt where dialog window wouldn't close. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13120 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23- Some stuff i forgot for char_sql. Bug Report 2112.zephyrus1-4/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13119 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23- Completed Mercenary Create, Delete, Save. Tests OK.zephyrus16-262/+419
- Incremented MAX_SKILL required for a proper load of Mercenary Skills. - Some fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13118 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23- Added column `mer_id` on char_dbzephyrus8-34/+105
- More mercenary implementations (delete, load, create) - Some fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13117 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23- Mercenary Packets (Server to Client). Still need a little more info.zephyrus12-36/+375
- Packet for Mercenary Menu. - Some other progress as creation but need more code. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13116 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23- Database structure for Mercenary.zephyrus2-0/+29
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13115 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22- Mercenary data structures.zephyrus5-3/+44
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13110 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22- Mercenary Database Reading.zephyrus3-30/+184
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13109 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22- Ups. I forget this merge about Basilica (caster cannot walk).zephyrus1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13108 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22- Starting Mercenary's Project.zephyrus2-0/+176
* Mercenary DB files. (Thanks to L0ne Wolf). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-21- Big update to Basilica, implementing official behavior.zephyrus6-53/+75
* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13106 54d463be-8e91-2dee-dedb-b68131a5f0ec