summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 23:22:03 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-14 23:22:03 +0000
commitfb86a5e5c6f48b1a4b206c93923deb0392f04cb9 (patch)
treed0cd5774c6a03417f8e1290586a9683e0b5f58e9
parent394354577a12737bb6ede6bf78868de868cfba9c (diff)
downloadhercules-fb86a5e5c6f48b1a4b206c93923deb0392f04cb9.tar.gz
hercules-fb86a5e5c6f48b1a4b206c93923deb0392f04cb9.tar.bz2
hercules-fb86a5e5c6f48b1a4b206c93923deb0392f04cb9.tar.xz
hercules-fb86a5e5c6f48b1a4b206c93923deb0392f04cb9.zip
- Fixed some typos in quest_13 files. (bugreport:5023)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15123 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/instances/NydhoggsNest.txt2
-rw-r--r--npc/quests/quests_13_1.txt16
-rw-r--r--npc/quests/quests_13_2.txt38
3 files changed, 28 insertions, 28 deletions
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index f999e6744..51e029b76 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -114,7 +114,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper 111,8,8,{
}
else if ((ins_nyd == 131) || (ins_nyd == 132) || (ins_nyd > 199)) {
set .@ins_nyd_check,checkquest(3135,PLAYTIME); // 3 Day cooldown
- set .@ins_nyd_check2,checkquest(3135,PLAYTIME); // 4 Hour play limit
+ set .@ins_nyd_check2,checkquest(3136,PLAYTIME); // 4 Hour play limit
if (.@ins_nyd_check == -1) {
mes "As I put my hands on the stone gate, a voice sounded from the depth of my heart.";
next;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index bd30a29d8..054858926 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -12660,7 +12660,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -12729,7 +12729,7 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -12835,7 +12835,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -12904,7 +12904,7 @@ man_fild03,202,251,3 script Expedition Scout#2 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -13000,7 +13000,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -13069,7 +13069,7 @@ spl_fild02,295,368,3 script Expedition Scout#3 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -13175,7 +13175,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
@@ -13244,7 +13244,7 @@ spl_fild03,172,71,3 script Expedition Scout#4 707,{
mes "Well then, keep up the good work!";
close;
}
- else if ((.@ep13_search_lotto == 1) && (.@ep13_search_lotto == 6)) {
+ else if ((.@ep13_search_lotto == 1) || (.@ep13_search_lotto == 6)) {
mes "[Expedition Scout]";
mes "Oh, you must be" + strcharinfo(0) + ". I heard that you'll be delivering the report.";
next;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index f36595cde..583705a8c 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -7581,8 +7581,8 @@ mjolnir_01,32,309,3 script #mj01_01 111,7,7,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -7645,7 +7645,7 @@ OnTimer60000:
end;
}
-mjolnir_01,32,309,3 script #mj01_02 111,7,7,{
+mjolnir_01,217,34,3 script #mj01_02 111,7,7,{
if ((ep13_2_tre == 2) && (countitem(6076) == 1)) {
if (countitem(6077) < 10) {
mes "- I can see some different colored minerals where the detector pointed to. This must be the mineral that Mr. Lifeguard told me about. -";
@@ -7653,8 +7653,8 @@ mjolnir_01,32,309,3 script #mj01_02 111,7,7,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -7775,8 +7775,8 @@ mjolnir_02,90,195,3 script #mj02_01 111,5,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -7845,8 +7845,8 @@ mjolnir_02,206,187,3 script #mj02_02 111,7,7,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -8045,8 +8045,8 @@ mjolnir_04,125,380,3 script #mj04_01 111,7,7,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -8115,8 +8115,8 @@ mjolnir_04,220,130,3 script #mj04_02 111,7,7,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -8727,8 +8727,8 @@ mjolnir_09,229,214,3 script #mj09_01 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -8922,8 +8922,8 @@ mjolnir_10,188,260,3 script #mj10_01 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9236,8 +9236,8 @@ hu_fild05,251,345,3 script #hu_01 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9304,8 +9304,8 @@ hu_fild05,134,322,3 script #hu_02 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9374,8 +9374,8 @@ hu_fild05,72,104,3 script #hu_03 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9443,8 +9443,8 @@ hu_fild05,65,99,3 script #hu_04 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9510,8 +9510,8 @@ hu_fild05,323,84,3 script #hu_05 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9635,8 +9635,8 @@ ve_fild03,152,134,3 script #ve_01 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9704,8 +9704,8 @@ ve_fild03,256,228,3 script #ve_02 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9773,8 +9773,8 @@ ve_fild03,85,189,3 script #ve_03 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9842,8 +9842,8 @@ ve_fild03,282,268,3 script #ve_04 111,10,10,{
switch(select("Mine minerals.:Do nothing.")) {
case 1:
mes "Clang! Clang! Clang! Clang!";
+ close2;
progressbar "ffff00",4;
- next;
set .@get_stone,rand(1,6);
if (.@get_stone < 4) {
mes "- You failed to mine minerals. -";
@@ -9997,7 +9997,7 @@ spl_in01,30,324,3 script High Laphine#grenouille 446,{
setquest 2183;
close;
}
- else if ((ep13_2_tre1 == 1) && (ep13_2_tre1 == 2)) {
+ else if ((ep13_2_tre1 == 1) || (ep13_2_tre1 == 2)) {
mes "[Grenouille]";
mes "Get a seed from Flowery,";
mes "and then use a Purifier";