summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-07 21:34:11 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-07 21:34:11 +0100
commit6d786005f794bf4e245e9b1b3ad7cf4b6cee9429 (patch)
treee6ee0044be33a10636b31a75eb48688021196c37 /npc
parent137395b992709248896fe66888778fe26169c1dc (diff)
downloadserverdata-6d786005f794bf4e245e9b1b3ad7cf4b6cee9429.tar.gz
serverdata-6d786005f794bf4e245e9b1b3ad7cf4b6cee9429.tar.bz2
serverdata-6d786005f794bf4e245e9b1b3ad7cf4b6cee9429.tar.xz
serverdata-6d786005f794bf4e245e9b1b3ad7cf4b6cee9429.zip
fix duplicated names
Diffstat (limited to 'npc')
-rw-r--r--npc/002-3/doors.txt4
-rw-r--r--npc/002-3/julia.txt2
-rw-r--r--npc/002-3/note.txt2
-rw-r--r--npc/005-1/maya.txt209
4 files changed, 4 insertions, 213 deletions
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
index 4e39b520c..7d8a9d11d 100644
--- a/npc/002-3/doors.txt
+++ b/npc/002-3/doors.txt
@@ -19,7 +19,7 @@
// 11 Need to see Julia
// 12 Has been registered by Julia
-002-3,19,28,0 script AreaNPC#doors1 NPC_HIDDEN,0,0,{
+002-3,19,28,0 script AreaNPC#doors4 NPC_HIDDEN,0,0,{
OnTouch:
.@nard = getq(ShipQuests_Nard);
@@ -72,7 +72,7 @@ L_End:
close;
}
-002-3,33,28,0 script AreaNPC#doors2 NPC_HIDDEN,0,0,{
+002-3,33,28,0 script AreaNPC#doors5 NPC_HIDDEN,0,0,{
OnTouch:
.@julia = getq(ShipQuests_Julia);
diff --git a/npc/002-3/julia.txt b/npc/002-3/julia.txt
index 5c873a158..f2c2f83ba 100644
--- a/npc/002-3/julia.txt
+++ b/npc/002-3/julia.txt
@@ -32,7 +32,7 @@
// 24 ChefGado Quest completed and "Introduction" chapter finalized.
// 25 Reward taken from the box.
-002-3,27,24,0 script Julia NPC_JULIA,2,10,{
+002-3,27,24,0 script Julia#TMW2 NPC_JULIA,2,10,{
function ynMenu {
if (select(l("Yes, I do."), l("No, none.")) == 1) {
diff --git a/npc/002-3/note.txt b/npc/002-3/note.txt
index 0509e9f02..31b395541 100644
--- a/npc/002-3/note.txt
+++ b/npc/002-3/note.txt
@@ -7,7 +7,7 @@
// Description:
// A small note presenting the 6 main rules of Evol Online.
-002-3,29,25,0 script Note NPC_PAPER_NOTE,{
+002-3,29,25,0 script Note#johanne NPC_PAPER_NOTE,{
narrator S_LAST_NEXT,
l("There is a paper with some rules written on it.");
diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt
index ff833506b..b21ac8a52 100644
--- a/npc/005-1/maya.txt
+++ b/npc/005-1/maya.txt
@@ -12,213 +12,4 @@
005-1,42,37,0 script Maya NPC_RAIJIN_FEMALE_LEGION_ARTIS,{
- .Item1 = CottonCloth;
- .Item2 = Pearl;
- .Item3 = WolvernTooth;
-
- function quest_close {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Maybe next time.");
- goodbye;
- close;
- }
-
- function quest_giveitem {
- .@maya = getq(CandorQuest_Maya);
- if (.@maya == 2)
- {
- if (countitem("Iron Ingot") == 0)
- {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("You don't have the item.");
- goodbye;
- close;
- }
- delitem .Item3, 1;
- Zeny = Zeny + 8000;
- getexp 1500,0;
- setq CandorQuest_Tolchi, 3;
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Thanks mate that all i need ! Have a good day !");
- }
- if (.@maya == 1)
- {
- if (countitem("Coal") <= 2)
- {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("You don't have the item.");
- goodbye;
- close;
- }
- delitem .Item2, 3;
- Zeny = Zeny + 800;
- getexp 100,0;
- setq CandorQuest_Maya, 2;
- }
- if (.@maya == 0)
- {
- if (countitem("Iron Ore") == 0)
- {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("You don't have the item.");
- goodbye;
- close;
- }
- delitem .Item1, 1;
- Zeny = Zeny + 200;
- getitem RustyKnife, 1;
- getexp 50,0;
- setq CandorQuest_Maya, 1;
- }
- close;
- }
-
- function quest_first {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Can you bring me 2 @@", getitemlink(.Item1));
- do
- {
- select
- l("Yes."),
- l("No.");
-
- switch (@menu)
- {
- case 1:
- quest_giveitem;
- break;
- case 2:
- quest_close;
- break;
- }
- } while (@menu != 2);
- }
-
- function quest_second {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Can you bring me 3 @@", getitemlink(.Item2));
- do
- {
- select
- l("Yes."),
- l("No.");
-
- switch (@menu)
- {
- case 1:
- quest_giveitem;
- break;
- case 2:
- quest_close;
- break;
- }
- } while (@menu != 2);
- }
-
- function quest_third {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Can you bring me 4 @@", getitemlink(.Item3));
- do
- {
- select
- l("Yes."),
- l("No.");
-
- switch (@menu)
- {
- case 1:
- quest_giveitem;
- break;
- case 2:
- quest_close;
- break;
- }
- } while (@menu != 2);
- }
-
- .@maya = getq(CandorQuest_Maya,
-
- if (BaseLevel <= 4 || BaseLevel <= 9 && .@maya == 1 || BaseLevel <= 14 && .@maya == 2)
- {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("You aren't strong enought. Come Back Later.");
- goodbye;
- close;
- }
-
- if (.@maya == 3)
- {
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Hey ! How are you today ? Thanks again for your help.");
- goodbye;
- close;
- }
-
- speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Hello can you help me?");
-
-
- do
- {
- select
- rif(.@maya == 0, l("Yes.")),
- rif(.@maya == 1, l("Yes.")),
- rif(.@maya == 2, l("Yes.")),
- l("No.");
-
- switch (@menu)
- {
- case 1:
- quest_first;
- setq CandorQuest_Maya, 0;
- break;
- case 2:
- quest_second;
- break;
- case 3:
- quest_third;
- break;
- case 4:
- quest_close;
- goodbye;
- break;
- }
- } while (@menu != 4);
-
- closedialog;
- goodbye;
- close;
-
-OnTimer1000:
- domovestep;
-
-OnInit:
- initpath "move", 44, 35,
- "dir", UP, 0,
- "wait", 30, 0,
- "move", 43, 40,
- "dir", UP, 0,
- "wait", 30, 0,
- "move", 40, 35,
- "dir", UP, 0,
- "wait", 30, 0,
- "dir", LEFT, 0,
- "wait", 30, 0,
- "move", 42, 37,
- "dir", DOWN, 0,
- "dir", UP, 0,
- "wait", 30, 0,
- "Mmove", 45, 37,
- "dir", DOWN, 0,
- "wait", 30, 0,
- "move", 33, 37,
- "dir", LEFT, 0,
- "wait", 30, 0,
- "move", 33, 37,
- "dir", RIGHT, 0,
- "wait", 30, 0;
-
- initialmove;
- initnpctimer;
- .distance = 5;
}