Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,479 Commits 66 Branches 0 Tags 560 MiB
Commit Graph

4608 Commits

Author SHA1 Message Date
zephyrus
4d3666cf1e - Fixing some linux warnings (uninitialized variable). 
- Other cleanups.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13196 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-07 10:38:46 +00:00
zephyrus
879ada0f6c - Renamed createmercenary to mercenary_create. 
- Added other required mercenary script commands for official script.
- New Constants entries for this script.
- Update to missing configuration on mercenary skills.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13195 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-06 15:21:25 +00:00
L0ne_W0lf
02e80513d3 * Updated mmo.h, increased merc max count to 36. 
* Fixed save crash related to non-guilded mercenaries.
* Removed job and level restriction on Mercenary ASPD potions.
* Added Monster Mercenaries using mobs original stats.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13192 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-04 23:41:59 +00:00
ultramage
6efa1dd946 Patched a dormant off-by-one bug in guild leader changing code, which was triggered by r11571 and caused guild data corruption on TXT charserver (bugreport:2175). 
Blame goes to r3185 and r3719.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13191 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-04 15:29:06 +00:00
zephyrus
5acebe170f - Starting Mercenary Skill implementation. 
- MS_BASH Completed.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13189 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-03 13:32:38 +00:00
zephyrus
874a628fb3 - Fixed problem deleting characters. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13186 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-02 21:18:33 +00:00
zephyrus
ef61b07219 - Implementing a correct update of mercenary status window on status change updates. 
- Fixed Mercenary Heal is reduced 50%.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13185 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-02 16:29:29 +00:00
zephyrus
5ee4ef95e0 - Supportive Skill Behavior for Mercenaries: 
* Endow skills such as Aspersio and the 4 sage endows can only be cast on the mercenary if they are the master.
* Aid Potion does not currently work on mercenaries.
* Lex Aeterna only doubles damage of regular attacks. Skill damage from mercenaries are not doubled.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13184 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 23:14:35 +00:00
zephyrus
c562d05efc - More code for mercenaries and starting work on restrictions. 
* Heal and Sanctuary skills have their effectiveness on mercenaries reduced by 50%.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13183 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 22:19:18 +00:00
zephyrus
3d3946138a - Mercenary Bonus Status (currently activated each mob kill for testing). 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13182 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 19:23:57 +00:00
zephyrus
8752909a84 - Mercenary Loyalty Updates. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13176 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 12:53:43 +00:00
ultramage
17319aac50 Skip woe:se treasure boxes when counting max. item droprate (followup to r13156). 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13172 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 08:34:42 +00:00
ultramage
cf57c2fc20 Removed hardcoded equip position names from getequipname (bugreport:2156). 
Now it's the npc's responsibility to store and display the names.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13171 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 08:06:46 +00:00
ultramage
bba8e623b7 Removed leftover calls to custom sathena guild_canescape() (see r13161) (bugreport:2154). 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13170 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 03:09:49 +00:00
ultramage
42bb5d7927 Temporary workaround against the party/guild send_xy_timer dangling pointer crash that is somehow still possible (bugreport:2143). 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13169 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 02:53:58 +00:00
zephyrus
3fd4ec074a - Something i forget to commit mmo.h. 
- Preparatives for Faith/Calls/Kills for mercenaries.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13167 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 00:45:56 +00:00
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
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