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

9117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ultramage
ab77ae1f2b Partially reverted r13197 to maintain consistency with followup sql update. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13200 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-08 00:13:18 +00:00
zephyrus
953a0325ae - Updating refine method according to BugReport 2156 
- Little fix on mjolnir_seal.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13199 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-07 16:37:01 +00:00
zephyrus
1c87c6d891 - Skill Reset fix for Taekwon Ranger. (Bugreport 1759). 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13198 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-07 13:19:22 +00:00
zephyrus
d475f7aaff - Removed mer_id from main.sql in char table. (Bug Report 2192) 
- Removed 13117 sql patch, not necessary anymore.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13197 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-07 10:56:08 +00:00
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
12d5adad29 Lots of small updates and corrections to seal quests. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13194 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-06 11:28:53 +00:00
L0ne_W0lf
e7296bb193 Applied bug fixes for IDs in recent quests. (bugreport:2189) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13193 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-06 10:15:27 +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
akrus
eb67080768 Typo (c) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13190 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-04 00:38:01 +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
L0ne_W0lf
532c5fcd90 Fixed inconsistencies with nob_skill_db, and mosk_dun spawns. (bugreport:2148 and bugreport:2165) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13188 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-03 10:44:06 +00:00
L0ne_W0lf
fea4f97b37 Fixed bug in refiner merchants. (bugreport:2168) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13187 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-03 10:17:07 +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
L0ne_W0lf
d6f93d3f2f Fixed item requirements for PH D. Hat again. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13181 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 17:51:54 +00:00
L0ne_W0lf
cfacc9c21d Updating god item seal quests (5/5) 
Disabled god item quest variable modifying NPCs.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13180 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 13:04:06 +00:00
L0ne_W0lf
2642b26cca Updating god item seal quests (4/5) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13179 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 13:01:42 +00:00
L0ne_W0lf
eb0487d6e9 Updating god item seal quests (3/5) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13178 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 13:00:29 +00:00
L0ne_W0lf
9cf1b97254 Updating god item seal quests (2/5) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13177 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 12:54:21 +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
L0ne_W0lf
2165ebbd1b Updating god item seal quests (1/5) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13175 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 12:51:56 +00:00
L0ne_W0lf
1379d666e6 More bugfixes tot he keil Hyre quest. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13174 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 10:50:49 +00:00
L0ne_W0lf
45b8c1be6b Fixed item requirements for PH D. Hat. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13173 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 10:22:55 +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
L0ne_W0lf
04bdc02cb9 Updated refiner and related merchants. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13168 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-09-01 00:58:01 +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
L0ne_W0lf
639c161d4b Updated Monster Taming item cute pet armor quests. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13164 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-31 22:19:24 +00:00
L0ne_W0lf
3d4883f590 Updated several ancient headgear quests. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13163 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-31 22:17:21 +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
L0ne_W0lf
3108fa5d0c Added item effects for Mercenary potions. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13160 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-31 21:31:27 +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
L0ne_W0lf
9a6ec64e4f Missed one of those blatant errors in the Keil Hyre Quest. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13155 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-31 10:36:47 +00:00
L0ne_W0lf
e4e01655a5 Fixed blatant errors that I added to Keil Hyre Quest. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13154 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-31 10:27:19 +00:00
L0ne_W0lf
c268fbd5d8 Couple small corrections to the mob database. (bugreport:2109) 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13153 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-29 11:18:24 +00:00
L0ne_W0lf
d60db9cfcf * Just fixing some reported script bug. 
- 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://svn.code.sf.net/p/rathena/svn/trunk@13152 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-29 11:17:04 +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
Kisuka
c6675b9cea - Small fix in Juice Maker quest, NPC kept saying text for just grape juice. 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13150 54d463be-8e91-2dee-dedb-b68131a5f0ec
 2008-08-29 03:11:12 +00:00