summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-28 04:10:17 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-28 04:10:17 +0000
commit382f0b77bf009b938e578286b1048ccf8038d443 (patch)
tree38149064107c7d0cf3fcf8846674b8b4e2e8c6b5 /npc
parentdf3a626f0375fa50c21b1371d565178ec1415935 (diff)
downloadhercules-382f0b77bf009b938e578286b1048ccf8038d443.tar.gz
hercules-382f0b77bf009b938e578286b1048ccf8038d443.tar.bz2
hercules-382f0b77bf009b938e578286b1048ccf8038d443.tar.xz
hercules-382f0b77bf009b938e578286b1048ccf8038d443.zip
* Added a point to 'npcskill' documentation.
* Added Malangdo Tool Dealer. * Fixed quest log sample, which never worked to begin with -- thanks clydelion! * Fixed potential error with clones in custom Hunting Missions script (bugreport:7055). * Follow-up r16990, forgot to commit the EXP fix. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17055 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/quests/hunting_missions.txt4
-rw-r--r--npc/quests/quests_lighthalzen.txt13
-rw-r--r--npc/re/merchants/shops.txt8
3 files changed, 16 insertions, 9 deletions
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index 438444a14..5f09c19fd 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -225,7 +225,7 @@ OnNPCKillEvent:
if (!getcharid(1) || !.Party) {
if (!#Mission_Count || !Mission0) end;
for (set .@i, 0; .@i<.Quests; set .@i,.@i+1) {
- if (strmobinfo(1,killedrid) == strmobinfo(1,getd("Mission"+.@i))) {
+ if (""+strmobinfo(1,killedrid) == strmobinfo(1,getd("Mission"+.@i))) {
if (getd("Mission"+.@i+"_") < #Mission_Count) {
dispbottom "[Hunting Mission] Killed "+(set(getd("Mission"+.@i+"_"),getd("Mission"+.@i+"_")+1))+" of "+#Mission_Count+" "+strmobinfo(1,killedrid)+".";
end;
@@ -244,7 +244,7 @@ OnNPCKillEvent:
getmapxy(.@map2$,.@x2,.@y2,0);
if ((.@map1$ == .@map2$ || .Party == 1) && (distance(.@x1,.@y1,.@x2,.@y2) <= 30 || .Party < 3)) {
for(set .@j,0; .@j<.Quests; set .@j,.@j+1) {
- if (strmobinfo(1,.@mob) == strmobinfo(1,getd("Mission"+.@j))) {
+ if (""+strmobinfo(1,.@mob) == strmobinfo(1,getd("Mission"+.@j))) {
if (getd("Mission"+.@j+"_") < #Mission_Count) {
dispbottom "[Hunting Mission] Killed "+(set(getd("Mission"+.@j+"_"),getd("Mission"+.@j+"_")+1))+" of "+#Mission_Count+" "+strmobinfo(1,.@mob)+".";
break;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 64d468837..e9a8458ad 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4,7 +4,7 @@
//= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
//= Lupus, Lord Gywall
//===== Current Version: =====================================
-//= 4.7
+//= 4.8
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -77,6 +77,7 @@
//= 4.6 Added quest log entries for:
//= - Cursed Spirit Quest
//= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
+//= 4.8 Fixed Cursed Spirit Quest EXP reward. [Euphy]
//============================================================
// Gangster Alert [Official Conversion]
@@ -5269,13 +5270,13 @@ OnTouch_:
set lhz_curse,26;
changequest 2093,2094;
if (BaseLevel < 70)
- getexp 80000,30000;
+ getexp 800000,300000;
else if ((BaseLevel > 69) && (BaseLevel < 80))
- getexp 100000,50000;
+ getexp 1000000,500000;
else if ((BaseLevel > 79) && (BaseLevel < 90))
- getexp 150000,80000;
- else if ((BaseLevel > 89) && (BaseLevel < 151))
- getexp 200000,100000;
+ getexp 1500000,800000;
+ else if (BaseLevel > 89)
+ getexp 2000000,1000000;
}
close;
}
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index f9bde7a99..a6f64174d 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
//= 1.1 Added Dicastes merchants. [Joseph]
//= 1.2 Moved more shops to Renewal file. [Euphy]
+//= 1.3 Added Malangdo tool dealer. [Euphy]
//============================================================
//=======================================================
@@ -52,6 +53,11 @@ lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,28
s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1
//=======================================================
+// Malangdo
+//=======================================================
+malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
+
+//=======================================================
// Mid Camp
//=======================================================
mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1