diff options
author | Saulc <lucashelaine14@gmail.com> | 2018-02-09 15:31:46 +0100 |
---|---|---|
committer | Saulc <lucashelaine14@gmail.com> | 2018-02-09 15:31:46 +0100 |
commit | 2e66d22e0586aea3af18887f42bf48abfe985577 (patch) | |
tree | 93a762cffcc7d744bf74f77de594ad793baf538f /npc/005-1 | |
parent | 2bbbacacf8cdf8a06a95b3346207ea72b9917da0 (diff) | |
parent | 1646ea8eca6ed14afaf4c4f254e69e007fc27b55 (diff) | |
download | serverdata-2e66d22e0586aea3af18887f42bf48abfe985577.tar.gz serverdata-2e66d22e0586aea3af18887f42bf48abfe985577.tar.bz2 serverdata-2e66d22e0586aea3af18887f42bf48abfe985577.tar.xz serverdata-2e66d22e0586aea3af18887f42bf48abfe985577.zip |
Merge branch 'master' of gitlab.com:TMW2/serverdata
Diffstat (limited to 'npc/005-1')
-rw-r--r-- | npc/005-1/_import.txt | 3 | ||||
-rw-r--r-- | npc/005-1/_warps.txt | 2 | ||||
-rw-r--r-- | npc/005-1/aahna.txt | 10 | ||||
-rw-r--r-- | npc/005-1/ayasha.txt | 44 | ||||
-rw-r--r-- | npc/005-1/liana.txt | 50 | ||||
-rw-r--r-- | npc/005-1/maya.txt | 2 | ||||
-rw-r--r-- | npc/005-1/zegas.txt | 100 |
7 files changed, 196 insertions, 15 deletions
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt index 5c79c44df..b2de1340f 100644 --- a/npc/005-1/_import.txt +++ b/npc/005-1/_import.txt @@ -2,6 +2,9 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/005-1/_mobs.txt", "npc/005-1/_warps.txt", +"npc/005-1/aahna.txt", "npc/005-1/ayasha.txt", "npc/005-1/maya.txt", +"npc/005-1/liana.txt", "npc/005-1/warpcandorbattle.txt", +"npc/005-1/zegas.txt", diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt index 37724759a..ce38a46e4 100644 --- a/npc/005-1/_warps.txt +++ b/npc/005-1/_warps.txt @@ -1,6 +1,6 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-1: Candor Island warps -005-1,43,107,0 warp #005-1_43_107 0,0,002-2,21,28 +005-1,43,107,0 warp #005-1_43_107 0,0,002-3,21,28 005-1,31,80,0 warp #005-1_31_80 0,0,005-2,33,42 005-1,34,74,0 warp #005-1_34_74 0,0,005-3,25,42 005-1,48,70,0 warp #005-1_48_70 0,0,005-4,25,42 diff --git a/npc/005-1/aahna.txt b/npc/005-1/aahna.txt new file mode 100644 index 000000000..c679ca07d --- /dev/null +++ b/npc/005-1/aahna.txt @@ -0,0 +1,10 @@ +005-1,61,43,0 script Aahna NPC_GUARD1,{ + mesn; + mesq l("Hello, What a lovely day for a stroll."); + close; + +OnInit: + .sex = G_MALE; + .distance = 3; + end; +} diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index 8a6338455..9bc7b2d2f 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -1,17 +1,17 @@ // Author:
// Crazyfefe
+// Jesusalva (fixes)
-
-005-1,52,81,0 script Ayasha NPC_PLAYER,{
+005-1,52,81,0 script Ayasha NPC_HUMAN_FEMALE_NOOB,{
function quest_findAllKids
{
setq CandorQuest_HAS, 1;
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Good luck !");
+ l("Good luck!");
close;
}
@@ -19,7 +19,7 @@ if (.@has == 0)
{
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("Hello! can you help me for find all kids?");
+ l("Hello! Can you help me to find all kids?");
do
{
select
@@ -37,7 +37,7 @@ else if (.@has == 1)
{
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
- l("You don't find all of them yet.");
+ l("You still haven't found all of them yet.");
close;
}
else if (.@has == 2)
@@ -61,15 +61,15 @@ close;
OnInit:
- .sex = G_MALE;
+ .sex = G_FEMALE;
.distance = 3;
end;
}
function script CheckEnfant {
- .questCheck = .questCheck + 1; // NOTE: Do we really want this as a **NPC** variable? These affects other players, right?
- l("Oh Welcome then.");
+ .questCheck = .questCheck + 1; // FIXME: This is broken scope.
+ l("Oh Welcome then."); // NOTE: This will never work
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Oh! You found me. Well played!");
narrator("You receive 5 exp.");
@@ -84,6 +84,9 @@ function script CheckEnfant { if (getq(CandorQuest_HAS) == 1)
{
CheckEnfant();
+ } else {
+ mes l("The kid is not paying attention to you.");
+ close;
}
end;
OnInit:
@@ -95,10 +98,13 @@ OnInit: if (getq(CandorQuest_HAS) == 1)
{
CheckEnfant();
+ } else {
+ mes l("The kid is not paying attention to you.");
+ close;
}
end;
OnInit:
- .sex = G_OTHER;
+ .sex = G_MALE;
.distance = 1;
end;
}
@@ -106,10 +112,13 @@ OnInit: if (getq(CandorQuest_HAS) == 1)
{
CheckEnfant();
+ } else {
+ mes l("The kid is not paying attention to you.");
+ close;
}
end;
OnInit:
- .sex = G_OTHER;
+ .sex = G_MALE;
.distance = 1;
end;
}
@@ -117,10 +126,13 @@ OnInit: if (getq(CandorQuest_HAS) == 1)
{
CheckEnfant();
+ } else {
+ mes l("The kid is not paying attention to you.");
+ close;
}
end;
OnInit:
- .sex = G_OTHER;
+ .sex = G_MALE;
.distance = 1;
end;
}
@@ -128,10 +140,13 @@ OnInit: if (getq(CandorQuest_HAS) == 1)
{
CheckEnfant();
+ } else {
+ mes l("The kid is not paying attention to you.");
+ close;
}
end;
OnInit:
- .sex = G_OTHER;
+ .sex = G_MALE;
.distance = 1;
end;
}
@@ -139,10 +154,13 @@ OnInit: if (getq(CandorQuest_HAS) == 1)
{
CheckEnfant();
+ } else {
+ mes l("The kid is not paying attention to you.");
+ close;
}
end;
OnInit:
- .sex = G_OTHER;
+ .sex = G_MALE;
.distance = 1;
end;
}
diff --git a/npc/005-1/liana.txt b/npc/005-1/liana.txt new file mode 100644 index 000000000..fc06cf41b --- /dev/null +++ b/npc/005-1/liana.txt @@ -0,0 +1,50 @@ +// TMW2 Script +// Author: Jesusalva +// Author: TMW-Org. Script Writers +// PS. Liana could (should) explain too the small cave north of there. It can be +// a place to run, or maybe monsters there are natural and protect them from the +// Mana Monsters, etc. + +005-1,47,86,0 script Liana NPC_ELVEN_FEMALE,{ + mesn; + //mesq l("Hurnscald is a large city. I'm sure glad I live in Candor because I know where everything's at."); + mesq l("Monsters do not aim small towns like Candor. This city also comes with the plus that I know where everything's at."); + if (QL_BEGIN == 10) goto L_Hasan; + close; + +L_Hasan: + mes "[Liana]"; + mesq l("Are you enjoying yourself in Candor? Do you have any questions?"); + menu + l("A guy named Hasan is bullying people."),L_Next, + l("No, thanks."),L_Close; + +L_Next: + mesq l("Ah, Hasan. He's causing trouble again?"); + next; + mes l("She shakes her head."); + next; + mesq l("This guy has been a plague ever since he could walk. He's always causing trouble."); + next; + mesq l("And his father... Well, one day his father thought he should teach Hasan a lesson."); + next; + mesq l("He took him into the desert and then left him there!"); + next; + mes l("Hasan was only seven years old!"); + next; + mesq l("I never understood how someone could do something like that to a child, even if it's a rascal like Hasan."); + next; + mesq l("Anyway, Hasan tried to find his way back home, but stumbled into a nest of scorpions!"); + next; + mes l("She shakes her head."); + mesq l("If Lieutenant Dausen hadn't have come along that moment, Hasan would have died that day."); + next; + mesq l("However, the scorpions poison caused a bad fever and once Hasan had recovered from that, he was even more malicious than before."); + next; + mes l("She sighs."); + QL_BEGIN = 11; + goto L_Close; + +L_Close: + close; +} diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt index b21ac8a52..5b6a5afee 100644 --- a/npc/005-1/maya.txt +++ b/npc/005-1/maya.txt @@ -11,5 +11,5 @@ 005-1,42,37,0 script Maya NPC_RAIJIN_FEMALE_LEGION_ARTIS,{ - + hello; } diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt new file mode 100644 index 000000000..f2acc6a13 --- /dev/null +++ b/npc/005-1/zegas.txt @@ -0,0 +1,100 @@ +005-1,35,77,0 script Zegas NPC_MONA,{ + .@q = getq(CandorQuest_Barrel); + if (.@q == 1) + goto L_Find; + if (.@q == 2) + goto L_Looking; + if (.@q == 3) + goto L_QuestEnd; + if (.@q == 4) + goto L_Thanks; + goto L_Meet; + +L_Meet: + mesn; + mesq l("Hey do you have a second?"); + next; + mesq l("The storehouse here is over run with house maggots."); + next; + mesq l("Wouldn't you know it, the bug bomb Eomie gave us is in one of the store room barrels."); + next; + mesq l("Can you search the barrels for the bug bomb and set it off when you find it?"); + setq CandorQuest_Barrel, 1; + menu + l("Sure."),L_Start, + l("Maybe some other time."),L_Close; + +L_Find: + mesn; + mesq l("The storehouse is still over run with house maggots."); + next; + mesq l("Please help me find the bug bomb Eomie gave us is in one of the store room barrels?"); + menu + l("Sure."),L_Start, + l("Maybe some other time."),L_Close; + +L_Start: + mesn; + mesq l("Thanks, come back and see me once you found the bug bomb and set it off."); + setq CandorQuest_Barrel, 2; + goto L_Close; + +L_Looking: + mesn; + mesq l("Still haven't found it? Well keep looking I know it's in there, somewhere."); + goto L_Close; + +L_QuestEnd: + mesn; + mesq l("From the smell I can see you found the bug bomb!"); + mesq l("Thanks once again, I know it's not much but here is 50 GP for your troubles."); + getexp 50, 0; + Zeny = (Zeny + 50); + setq CandorQuest_Barrel, 4; + goto L_Close; + +L_Thanks: + mesn; + mesq l("Thanks for Helping with clear out the store room!"); + goto L_Close; + +L_Close: + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} + +005-1,32,73,0 script ZegasDebug NPC_MONA,{ + showavatar NPC_MONA; // this is handled by avatars.xml + mesn; + mesq l("Reset?"); + next; + menu + l("Yes."), L_Reset, + l("No."), L_Close; + +L_Reset: + setq CandorQuest_Barrel, 0; + STARTAREA = STARTAREA &~ (1 << 2); + STARTAREA = STARTAREA &~ (1 << 3); + STARTAREA = STARTAREA &~ (1 << 4); + STARTAREA = STARTAREA &~ (1 << 5); + STARTAREA = STARTAREA &~ (1 << 6); + STARTAREA = STARTAREA &~ (1 << 7); + STARTAREA = STARTAREA &~ (1 << 8); + STARTAREA = STARTAREA &~ (1 << 9); + mes l("Reset!"); + goto L_Close; + +L_Close: + //showavatar; // Use this to hide the showavatar + close; + +//OnInit: + //if (!debug) + // disablenpc "ZegasDebug"; + //end; +} |