From a25c231d8a2c4706fb2ca35f99e219f70f72238a Mon Sep 17 00:00:00 2001 From: Reid Date: Thu, 8 Dec 2011 01:38:03 +0100 Subject: Update wlk maps, Add 000-0-0 map to resnametable.txt, Change area script to sailors script (name change), Correction on alige script, Correction on Poisoned Water function, Added function importation on scripts.conf . --- npc/000-0/_import.txt | 2 +- npc/000-0/area.txt | 36 ------------------------------------ npc/000-0/sailors.txt | 36 ++++++++++++++++++++++++++++++++++++ npc/000-2-1/_warps.txt | 3 +-- npc/000-2-1/alige.txt | 6 +++--- npc/items/PoisonedWater.txt | 2 +- npc/scripts.conf | 8 ++++---- 7 files changed, 46 insertions(+), 47 deletions(-) delete mode 100644 npc/000-0/area.txt create mode 100644 npc/000-0/sailors.txt (limited to 'npc') diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt index 14d47ea4..79a1d1ec 100644 --- a/npc/000-0/_import.txt +++ b/npc/000-0/_import.txt @@ -1,4 +1,4 @@ map: 000-0.gat npc: npc/000-0/_mobs.txt npc: npc/000-0/_warps.txt -npc: npc/000-0/area.txt \ No newline at end of file +npc: npc/000-0/sailors.txt \ No newline at end of file diff --git a/npc/000-0/area.txt b/npc/000-0/area.txt deleted file mode 100644 index 0af6d5ad..00000000 --- a/npc/000-0/area.txt +++ /dev/null @@ -1,36 +0,0 @@ -// Evol scripts. -// Authors: -// Vasily_Makarov -// Description: -// fix me - -000-0.gat,0,0,0,0 script Sailors 0,0,0,{ - - mesn l("Narrator"); - mesn l("You are on a raft, adrift in the sea. You don't remember anything before this. You can hear a voice from the sky. As you open your eyes and look around, you see a large ship. Some sailors are trying to talk to you.."); //italic - next; - - mesn; - mesq g(l("Hey lady!"), l("Hey man!")); - next; - - mesq l("Hey! Do you hear me? Are you okay?"); - next; - - menu - l("Try to move your hand to show them that you're alive"), -, - l("Don't move at all"), -; - next; - - mesn; - mesq g(l("This girl needs rescuing, let's help her!"), - l("This guy needs rescuing, let's help him!")); - next; - - mesn l("Narrator"); - mesq l("The sailors take you aboard their ship to help you."); //italic - next; - - warp 000-0-0,0,0; - -} diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt new file mode 100644 index 00000000..0af6d5ad --- /dev/null +++ b/npc/000-0/sailors.txt @@ -0,0 +1,36 @@ +// Evol scripts. +// Authors: +// Vasily_Makarov +// Description: +// fix me + +000-0.gat,0,0,0,0 script Sailors 0,0,0,{ + + mesn l("Narrator"); + mesn l("You are on a raft, adrift in the sea. You don't remember anything before this. You can hear a voice from the sky. As you open your eyes and look around, you see a large ship. Some sailors are trying to talk to you.."); //italic + next; + + mesn; + mesq g(l("Hey lady!"), l("Hey man!")); + next; + + mesq l("Hey! Do you hear me? Are you okay?"); + next; + + menu + l("Try to move your hand to show them that you're alive"), -, + l("Don't move at all"), -; + next; + + mesn; + mesq g(l("This girl needs rescuing, let's help her!"), + l("This guy needs rescuing, let's help him!")); + next; + + mesn l("Narrator"); + mesq l("The sailors take you aboard their ship to help you."); //italic + next; + + warp 000-0-0,0,0; + +} diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt index 4514344f..2eae0742 100644 --- a/npc/000-2-1/_warps.txt +++ b/npc/000-2-1/_warps.txt @@ -1,5 +1,4 @@ // 000-2-1 warps -000-2-1.gat,61,34 warp ToLevel2 -1,-1,000-2-2.gat,27,31 -000-2-1.gat,61,30 warp ToLevel0 -1,-1,000-2-0.gat,30,26 +000-2-1.gat,61,34 warp ToLevel2 -1,-1,000-2-2.gat,31,27 000-2-1.gat,61,30 warp ToLevel0 -1,-1,000-2-0.gat,30,26 diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index 5cc9ae7c..f1301232 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -12,7 +12,7 @@ // 0 first talking (before food) // 1 already talked -000-2-1.gat,33,31,0 script Alige 301,1,1{ +000-2-1.gat,33,31,0,1 script Alige 301,1,1{ if (geta2(ShipQuests, ShipQuests_Alige) == 1) goto l_AskForFood; @@ -29,7 +29,7 @@ l_NeedHelp: mesn l("Hidden person"); - mesq l("Good, good!") + " " + l("Could you help me please?") + " " + l("I beg you, please, pleeeease..."); + mesq l("Good, good! ") + " " + l("Could you help me please? ") + " " + l("I beg you, please, pleeeease... "); menu l("Why not... but, who are you?") + l("And what kind of help do you need?"), l_CanHelp; @@ -117,7 +117,7 @@ set @menulist$[@j], l("I don't have anything good for you today."); set @menureference[@j], -1; - menu @menulist$[0],-,@menulist$[1],-,....@menulist$[150],-; + menu @menulist$[0],-,@menulist$[1],-,@menulist$[150],-; set @id, @menureference[@menu-1]; if (@id == -1) goto l_DamnYou; diff --git a/npc/items/PoisonedWater.txt b/npc/items/PoisonedWater.txt index 40e93093..93034ef8 100644 --- a/npc/items/PoisonedWater.txt +++ b/npc/items/PoisonedWater.txt @@ -4,7 +4,7 @@ // Description: // Heal of 25hp and add 1/4 bad luck to be poisoned. -function|script|usePoisonedWater|{ +function script usePoisonedWater { set @temp, rand(4); if (!@temp) sc_start sc_poison, 1, 50; if (!@temp) message strcharinfo(0), "Debug: Poisoned"; diff --git a/npc/scripts.conf b/npc/scripts.conf index 2bfd0bdd..e5db521f 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -1,7 +1,7 @@ // This is the main script import file -// NPC Functions -// npc: npc/functions/.txt - -// maps +// Maps import: npc/_import.txt + +// Item Functions +npc: npc/items/PoisonedWater.txt \ No newline at end of file -- cgit v1.2.3-70-g09d2