summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-07-03 11:29:29 +0000
committerGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-07-03 11:29:29 +0000
commitae4f376004739b0178be6ab3f5d9fecbb7a53ca1 (patch)
treefc65762acfccdef5835388be63edfc63af83610f
parentd2964687c691b302d0d74bde1ba842baa67108ca (diff)
downloadhercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.gz
hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.bz2
hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.tar.xz
hercules-ae4f376004739b0178be6ab3f5d9fecbb7a53ca1.zip
Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319). Fixed checkweights in Manuk & Splendide shops. Fixed some condition checks in Moscovia quests. Fixed some typos in Sealed Shrine and Manuk quests dialogues. Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/battleground/bg_kvm01.txt2
-rw-r--r--npc/battleground/bg_kvm02.txt2
-rw-r--r--npc/battleground/bg_kvm03.txt2
-rw-r--r--npc/cities/lighthalzen.txt19
-rw-r--r--npc/instances/SealedShrine.txt23
-rw-r--r--npc/merchants/manuk.txt6
-rw-r--r--npc/merchants/splendide.txt6
-rw-r--r--npc/quests/quests_13_2.txt25
-rw-r--r--npc/quests/quests_moscovia.txt7
9 files changed, 54 insertions, 38 deletions
diff --git a/npc/battleground/bg_kvm01.txt b/npc/battleground/bg_kvm01.txt
index efc5c12fb..f8b767277 100644
--- a/npc/battleground/bg_kvm01.txt
+++ b/npc/battleground/bg_kvm01.txt
@@ -100,7 +100,7 @@ OnReadyCheck:
if( .@Guillaume < 5 || .@Croix < 5 )
{
- if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && $@KvM_Flood < gettimetick(2) )
+ if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && !agitcheck2() && $@KvM_Flood < gettimetick(2) )
{
announce "Battleground -- Kreiger Von Midgard [80-99] G: " + .@Guillaume + "/5, C: " + .@Croix + "/5",0,0x696969;
set $@KvM_Flood, gettimetick(2) + 15;
diff --git a/npc/battleground/bg_kvm02.txt b/npc/battleground/bg_kvm02.txt
index 521192f07..4116f7f58 100644
--- a/npc/battleground/bg_kvm02.txt
+++ b/npc/battleground/bg_kvm02.txt
@@ -100,7 +100,7 @@ OnReadyCheck:
if( .@Guillaume < 5 || .@Croix < 5 )
{
- if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && $@KvM_Flood < gettimetick(2) )
+ if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && !agitcheck2() && $@KvM_Flood < gettimetick(2) )
{
announce "Battleground -- Kreiger Von Midgard [60-79] G: " + .@Guillaume + "/5, C: " + .@Croix + "/5",0,0x808080;
set $@KvM_Flood, gettimetick(2) + 15;
diff --git a/npc/battleground/bg_kvm03.txt b/npc/battleground/bg_kvm03.txt
index 7765cebff..315f4bf9d 100644
--- a/npc/battleground/bg_kvm03.txt
+++ b/npc/battleground/bg_kvm03.txt
@@ -100,7 +100,7 @@ OnReadyCheck:
if( .@Guillaume < 5 || .@Croix < 5 )
{
- if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && $@KvM_Flood < gettimetick(2) )
+ if( .@Guillaume > 3 && .@Croix > 3 && !agitcheck() && !agitcheck2() && $@KvM_Flood < gettimetick(2) )
{
announce "Battleground -- Kreiger Von Midgard [1-59] G: " + .@Guillaume + "/5, C: " + .@Croix + "/5",0,0xC0C0C0;
set $@KvM_Flood, gettimetick(2) + 15;
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index d6a476d63..dc4a31cc7 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA, Au{R}oN (Translated by Alan), $ephiroth
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -39,6 +39,7 @@
//= 1.7b Another fix to Lucius (trivial). (bugreport:1125)
//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
//= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf]
+//= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard]
//=============================================================
lighthalzen,198,285,5 script Jiwon#zen5 862,{
@@ -1630,6 +1631,22 @@ lhz_in03,186,29,7 script Bad Drunk#12 869,{
close;
}
+lhz_in02,265,273,6 script Lab Staff#amano08 865,{
+ mes "[Assam]";
+ mes "This place is nice";
+ mes "and usually pretty quiet.";
+ mes "I like to come here after";
+ mes "work, have a drink and just";
+ mes "chat with the bartender.";
+ next;
+ mes "[Assam]";
+ mes "The rum here is incredibly";
+ mes "good too. It might even be";
+ mes "the best in the world. I dunno";
+ mes "why, but for some reason, its";
+ mes "taste reminds me of teamwork~";
+ close;
+}
lhz_in03,192,93,3 script City Girl#amano05 862,{
mes "[Lanko]";
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index db5f837f6..99d168870 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,6 +14,7 @@
//= 1.1 Added setquest for instance cooldown. [L0ne_W0lf]
//= 1.2 Fixed Torch#12 not being disabled. (bugreport:4044) [L0ne_w0lf]
//= 1.3 Fixed cutins not being removed. (bugreport:4117) [L0ne_w0lf]
+//= 1.4 Fixed some typos. [Gepard]
//============================================================
// Sealed Catacomb Entrance
@@ -43,7 +44,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "The very place where the great Devil who once demolished this world is sleeping.";
next;
- switch(select("Tell me more.:Stop talikng.")) {
+ switch(select("Tell me more.:Stop talking.")) {
case 1:
cutin "ins_cata_pri_n",2;
mes "[Friar Patrick]";
@@ -183,7 +184,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "And one more thing... In this cursed area, some skills, which are protected by outer physical power, are prohibited by the effect of the seal.";
next;
mes "[Friar Patrick]";
- mes "For example, the skills like^0000FFSafety wall, Assumptio^000000... So you'd better to prepare enoughly before enter the grave.";
+ mes "For example, the skills like ^0000FFSafety wall, Assumptio^000000... So you'd better to prepare enoughly before enter the grave.";
close2;
cutin "",255;
}
@@ -764,7 +765,7 @@ OnMyMobDead:
if ('ins_baphomet == 0) {
mes "The gravestone is trembling...";
next;
- mes "By touching the gravestone, I hear a voice";
+ mes "By touching the gravestone, I hear a voice.";
next;
specialeffect2 EF_CONE;
mes "[Voice of the Gravestone]";
@@ -998,7 +999,7 @@ OnTouch:
else if (('ins_baphomet == 3) && (getpartyleader(.@party_id,2) == getcharid(0))) {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
- mes "Did you get 10^0000FFEssence of Fire^000000 and ^0000FFToken of Apostle^000000?";
+ mes "Did you get 10 ^0000FFEssence of Fire^000000 and ^0000FFToken of Apostle^000000?";
next;
if ((countitem(6001) > 9) && (countitem(6002) > 0)) {
delitem 6001,countitem(6001); //Essence_Of_Fire
@@ -1090,7 +1091,7 @@ OnTouch:
}
else {
mes "[Soul of Ancient Hero]";
- mes "Where is your Token_of_Apostle? I said you should carry the Token_of_Apostle to pass this gate.";
+ mes "Where is your Token of Apostle? I said you should carry the Token of Apostle to pass this gate.";
close;
}
}
@@ -2240,7 +2241,7 @@ OnMyMobDead:
set 'ins_baphomet,7;
setquest 3040;
erasequest 3041;
- instance_announce 0, "Baphomet : No! Nonono!I get this insult again from these trivial bugs... No...",bc_map,"0xdb7093";
+ instance_announce 0, "Baphomet : No! Nonono! I get this insult again from these trivial bugs... No...",bc_map,"0xdb7093";
enablenpc instance_npcname("Soul of Ancient Hero#2F", instance_id());
disablenpc instance_npcname("slave_down", instance_id());
disablenpc instance_npcname("slave_left", instance_id());
@@ -2400,7 +2401,7 @@ OnTimer70000:
disablenpc instance_npcname("Magical Seal#10", instance_id());
break;
case 2:
- instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 2o'clock is running out. Go to the direction of 2o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+ instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 2 o'clock is running out. Go to the direction of 2o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
disablenpc instance_npcname("Magical Seal#0", instance_id());
enablenpc instance_npcname("Magical Seal#2", instance_id());
disablenpc instance_npcname("Magical Seal#4", instance_id());
@@ -2408,7 +2409,7 @@ OnTimer70000:
disablenpc instance_npcname("Magical Seal#10", instance_id());
break;
case 3:
- instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 4o'clock is running out. Go to the direction of 4o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+ instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 4 o'clock is running out. Go to the direction of 4o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
disablenpc instance_npcname("Magical Seal#0", instance_id());
disablenpc instance_npcname("Magical Seal#2", instance_id());
enablenpc instance_npcname("Magical Seal#4", instance_id());
@@ -2416,7 +2417,7 @@ OnTimer70000:
disablenpc instance_npcname("Magical Seal#10", instance_id());
break;
case 4:
- instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 8o'clock is running out. Go to the direction of 8o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+ instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 8 o'clock is running out. Go to the direction of 8o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
disablenpc instance_npcname("Magical Seal#0", instance_id());
disablenpc instance_npcname("Magical Seal#2", instance_id());
disablenpc instance_npcname("Magical Seal#4", instance_id());
@@ -2424,7 +2425,7 @@ OnTimer70000:
disablenpc instance_npcname("Magical Seal#10", instance_id());
break;
case 5:
- instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 10o'clock is running out. Go to the direction of 10o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
+ instance_announce 0, "Soul of Ancient Hero : The magical power of the seal in the direction of 10 o'clock is running out. Go to the direction of 10o'clock and put the magical power in the seal.",bc_map,"0xFFFF00";
disablenpc instance_npcname("Magical Seal#0", instance_id());
disablenpc instance_npcname("Magical Seal#2", instance_id());
disablenpc instance_npcname("Magical Seal#4", instance_id());
diff --git a/npc/merchants/manuk.txt b/npc/merchants/manuk.txt
index c7dbe9891..b98f040ea 100644
--- a/npc/merchants/manuk.txt
+++ b/npc/merchants/manuk.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -11,12 +11,12 @@
//= Manuk coin redemption NPC.
//===== Additional Comments: =================================
//= 1.0 First version
+//= 1.1 Fixed checkweight. [Gepard]
//============================================================
man_in01,286,16,1 script Merchant of Manuk 454,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
- set .@anrp_test,1201;
- if (anrp_test == 1) {
+ if (checkweight(1201,1) == 0) {
mes "[Merchant of Manuk]";
mes "It looks like you're carrying too many things.";
mes "Why not put some of your items in storage and come back?";
diff --git a/npc/merchants/splendide.txt b/npc/merchants/splendide.txt
index e707a30d8..8bc8a9d34 100644
--- a/npc/merchants/splendide.txt
+++ b/npc/merchants/splendide.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -11,12 +11,12 @@
//= Splendide coin redemption NPC.
//===== Additional Comments: =================================
//= 1.0 First version
+//= 1.1 Fixed checkweight. [Gepard]
//============================================================
spl_in01,110,326,5 script Merchant of Splendide 439,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
- set .@anrp_test,1201;
- if (anrp_test == 1) {
+ if (checkweight(1201,1) == 0) {
mes "[Merchant of Splendide]";
mes "It looks like you're carrying too many things.";
mes "Why not put some of your items in storage and come back?";
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index abbbadac8..b5010bdf9 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -34,6 +34,9 @@
//= 1.8 Added a missing " in the GM only NPC.
//= 1.9 Added Monster Suppression, Bradium Collection, and
//= Laphine Craftsman quests.
+//= 2.0 Added missing global var check in Yggdrasil Dungeon
+//= floor 2 puzzle. Fixed a typo. Commented out untranslated
+//= line. [Gepard]
//============================================================
// Cat Hand Addition.
@@ -5075,12 +5078,12 @@ man_in01,378,276,3 script Manuk Engineer#ep13_2 453,{
mes "Hello.";
mes "This is where we refine stones.";
next;
- switch(select("About colleting stones.:About the usage of stones.")) {
+ switch(select("About collecting stones.:About the usage of stones.")) {
case 1:
mes "[Manuk Engineer]";
mes "To prevent our bodies from becoming numb, we need Bradium.";
mes "From the Bradium we can extract a special element that we need to survive.";
- mes "Ìá?ÌØÊâµ???¬²¢¾­³£'Óá£";
+ //mes "Ìá?ÌØÊâµ???¬²¢¾­³£'Óá£";
next;
mes "[Manuk Engineer]";
mes "The mining industry is primary here since our lives depend on it.";
@@ -10810,8 +10813,7 @@ OnTouch:
}
nyd_dun02,139,274,0 script Strange Device#ep13_in 844,3,3,{
- //set go_to_2f,08_ep13nydun02_in;
- if (go_to_2f == 1) {
+ if ($@08_ep13nydun02_in == 1) {
mes "The device has already been activated.";
mes "You must wait for the controls to reset.";
close;
@@ -10822,13 +10824,12 @@ nyd_dun02,139,274,0 script Strange Device#ep13_in 844,3,3,{
next;
switch(select("Control.:Quit.")) {
case 1:
- //set go_to_2f2,08_ep13nydun02_in;
- if (go_to_2f2 == 1) {
+ if ($@08_ep13nydun02_in == 1) {
mes "Seems to have been started.";
close;
}
else {
- //set $@08_ep13nydun02_in,1; //Global Variable
+ set $@08_ep13nydun02_in,1;
set .@way_loot,rand(1,2);
if (.@way_loot == 1) {
donpcevent "ep13_warp_s1::OnDisable";
@@ -10858,14 +10859,10 @@ nyd_dun02,139,274,0 script Strange Device#ep13_in 844,3,3,{
OnTimer70000:
donpcevent "ep13_nd2f_mng::Onreset";
- //set $@08_ep13nydun02_in,0; //Global Variable
+ set $@08_ep13nydun02_in,0;
stopnpctimer;
end;
-OnInit:
- //set $@08_ep13nydun02_in,0; //Global Variable
- end;
-
OnTouch:
specialeffect EF_LEVEL99_4;
end;
@@ -12952,7 +12949,7 @@ nyd_dun02,1,1,0 script ep13_nd2f_mng 844,{
switch(select("Yes:No")) {
case 1:
donpcevent "ep13_nd2f_mng::Onreset";
- //set $@08_ep13nydun02_in,0; //Global Variable
+ set $@08_ep13nydun02_in,0;
mes "Puzzle reset";
close;
case 2:
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index d4f52b2d2..8371f59bd 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= 1.5 Fixes to 'Koshei the Immortal' quest. [Kisuka]
//= 1.6 Added 'tides' to Ibanoff & Fixed time check for Marozka. [Kisuka]
//= 1.7 Fixes on donpcevents and fixed some left over aegis stuff. [Kisuka]
+//= 1.8 Fixed some condition checks. [Gepard]
//============================================================
//============================================================================
@@ -4881,7 +4882,7 @@ OnTouch:
mes "Stop by the whale island?";
next;
if(select("Go to Whale Island.:Stay put.") == 1) {
- if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+ if (getequipid(EQI_ACC_L) == 2707 || getequipid(EQI_ACC_R) == 2707) {
soundeffect "mos_gusli2.wav",0;
mes "-Slowly, your hands are on the";
mes "Gusli, and the playing starts...";
@@ -10036,7 +10037,7 @@ OnTouch:
while(1) {
if(select("Look for it.:I will try next time.") == 1) {
set .@findout,rand(1,20);
- if (Class == THIEF || Class == THIEF_H || Class == ROGUE || Class == ROGUE_H || Class == ASSASSIN || Class == ASSASSIN_H) {
+ if (BaseJob == Job_Thief) {
mes "["+strcharinfo(0)+"]";
mes "Here it is.";
mes "That was easy to find.";