summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-30 14:44:56 -0200
committershennetsind <ind@henn.et>2013-11-30 14:44:56 -0200
commit4e20f139fa7d0ebd6de30fde9b91ec5e235981d2 (patch)
treec42b4af0c8a7be63ef7ff7fc56fcfd017e982cd1 /npc/quests
parent6fc1cae2088dd9f450e15728ca4bf4a82fcb8070 (diff)
parentc952fe0da69ebd5371004d6737a4e2e54859b9b0 (diff)
downloadhercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.gz
hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.bz2
hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.xz
hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/quests_moscovia.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index fd68f6663..a181a81d9 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1484,7 +1484,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
mes "This is a traditional instrument";
mes "which comes from a faraway land of";
mes "the ancestors of Moscovia.";
- getitem 2707,1;
+ getitem GUSLI, 1;
set mos_whale_edq,35;
next;
mes "[Aged Stranger]";
@@ -1509,7 +1509,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
mes "Are you ready to learn the Gusli?";
mes "Please equip the Gusli.";
next;
- if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+ if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) {
mes "[Aged Stranger]";
mes "Hm... Very well.";
mes "At first, look at me how I play,";
@@ -1552,7 +1552,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
mes "[Aged Stranger]";
mes "Are you ready to learn the Gusli?";
next;
- if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+ if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) {
mes "[Aged Stranger]";
mes "Um... You did well.";
next;
@@ -2123,7 +2123,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{
mes "A Gooselri? Which only exists";
mes "in the whale island? Let's see.";
next;
- if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707) > 0) {
+ if (countitem(GUSLI) > 0) {
mes "[Csar Alexsay III]";
mes "Oh... Is this instrument... a Gooselri?";
next;
@@ -2233,7 +2233,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{
mes "something to satisfy me";
mes "at the whale island?";
next;
- if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707 || countitem(2707)) {
+ if (countitem(GUSLI) > 0) {
mes "[Csar Alexsay III]";
mes "Oh... Is this instrument... a Gooselri?";
next;
@@ -2478,7 +2478,7 @@ OnTouch:
mes "Stop by the whale island?";
next;
if(select("Go to Whale Island.:Stay put.") == 1) {
- if (getequipid(EQI_ACC_L) == 2707 || getequipid(EQI_ACC_R) == 2707) {
+ if (getequipid(EQI_ACC_L) == GUSLI || getequipid(EQI_ACC_R) == GUSLI) {
soundeffect "mos_gusli2.wav",0;
mes "-Slowly, your hands are on the";
mes "Gusli, and the playing starts...";