summaryrefslogtreecommitdiff
path: root/npc/001-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/001-1')
-rw-r--r--npc/001-1/_import.txt1
-rw-r--r--npc/001-1/doors.txt6
-rw-r--r--npc/001-1/enora.txt2
-rw-r--r--npc/001-1/eugene.txt2
-rw-r--r--npc/001-1/koga.txt5
-rw-r--r--npc/001-1/marine.txt17
-rw-r--r--npc/001-1/rowboat.txt9
7 files changed, 34 insertions, 8 deletions
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 14af4b49..18f8e363 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -23,6 +23,7 @@
"npc/001-1/lucas.txt",
"npc/001-1/manhole.txt",
"npc/001-1/mapflags.txt",
+"npc/001-1/marine.txt",
"npc/001-1/merlin.txt",
"npc/001-1/mouboo.txt",
"npc/001-1/nalkri.txt",
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 7cf4e132..c4288328 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -10,7 +10,7 @@
OnTouch:
.@enora = getq(ArtisQuests_Enora);
- if (.@enora < 11)
+ if (.@enora < 4)
{
narrator S_LAST_NEXT,
l("The door to the legion building is temporarily closed.");
@@ -34,7 +34,7 @@ OnTouch:
.@enora = getq(ArtisQuests_Enora);
.@legion = getq(Artis_Legion_Progress);
.@brotherhood = getq(General_Brotherhood);
- if (.@enora < 11)
+ if (.@enora < 4)
{
setfakecells 57, 41, 1;
end;
@@ -46,7 +46,7 @@ OnTouch:
OnUnTouch:
.@enora = getq(ArtisQuests_Enora);
- if (.@enora < 11)
+ if (.@enora < 4)
{
end;
}
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index a57b5e78..73e81422 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -128,6 +128,8 @@
narrator S_LAST_NEXT,
l("You received @@ EXP and @@ E.", .@exp_reward, .@zeny_reward);
+ // This is silent (can be caught as a string variable)
+ faction_addrep("Legion", 10);
return;
}
diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt
index 3efe4d7f..950da353 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/001-1/eugene.txt
@@ -65,7 +65,7 @@ L_CheckItems:
l("Have a good time fishing!");
delitem .BaitID, .BaitCount;
- getitem FishingRod, 1;
+ getitembound FishingRod, 1, IBT_ACCOUNT;
getitem FishingGuideVolI, 1;
setq ArtisQuests_Fishman, 2;
close;
diff --git a/npc/001-1/koga.txt b/npc/001-1/koga.txt
index 57d0938d..045f9431 100644
--- a/npc/001-1/koga.txt
+++ b/npc/001-1/koga.txt
@@ -5,7 +5,7 @@
// The Koga in Artis, only accessable via Rowboat.
// THIS IS A PLACEHOLDER!
-001-1,225,59,0 script Koga#001-1 NPC_KOGA,{
+/*001-1,225,59,0 script Koga#001-1 NPC_LA_MARINE,{
.@q=getq(General_Narrator);
speech
l("Ah, whom did you bring here?"),
@@ -42,4 +42,5 @@ OnInit:
.distance = 6;
//.alwaysVisible = true;
end;
-}
+}*/
+
diff --git a/npc/001-1/marine.txt b/npc/001-1/marine.txt
new file mode 100644
index 00000000..b9cd93f9
--- /dev/null
+++ b/npc/001-1/marine.txt
@@ -0,0 +1,17 @@
+// Moubootaur Legends scripts.
+// Authors:
+// Jesusalva
+// Description:
+// This script controls access to Ships, fixing variables.
+
+// Use NPC_LA_MARINE if needed
+001-1,204,85,0 script Gema IV#A NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ EnterTown("Artis");
+
+ warp "marine@"+LOCATION$, 42, 26;
+ closedialog;
+ close;
+}
diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt
index a067b711..a3b50597 100644
--- a/npc/001-1/rowboat.txt
+++ b/npc/001-1/rowboat.txt
@@ -23,12 +23,17 @@
if (askyesno() == ASK_YES) {
if (getq(General_Brotherhood) >= 2)
{
- slide 227, 62;
+ //slide 227, 62;
//slide 204, 62;
+ PC_DEST$="Argaes";
+ @timer_navio_running = 1;
+ addtimer 210000, "#MarineShip::OnEvent"; // This route is 30s slower
+ warp "marine-2", 40, 32;
+ dispbottom l("You're smuggled aboard the Legion expedition. ACT NATURALLY!");
.caller=0;
.clocks=gettimetick(2);
movenpc("#Rowboat", 192, 25);
- setmount 1;
+ //setmount 1;
}
else
{