summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2010-12-16 00:18:03 +0100
committerStefan Beller <stefanbeller@googlemail.com>2010-12-16 00:18:03 +0100
commitf6e57121b237dd1f84e49885e99cfa18fe087ec5 (patch)
tree7cbfd21f624bed3e08d57b47449264cc19ea9265 /npc
parent70ea12a375c8bb69cc3d645aba0463c5653f5327 (diff)
downloadserverdata-f6e57121b237dd1f84e49885e99cfa18fe087ec5.tar.gz
serverdata-f6e57121b237dd1f84e49885e99cfa18fe087ec5.tar.bz2
serverdata-f6e57121b237dd1f84e49885e99cfa18fe087ec5.tar.xz
serverdata-f6e57121b237dd1f84e49885e99cfa18fe087ec5.zip
nivalis
Diffstat (limited to 'npc')
-rw-r--r--npc/014-1_Woodland/_import.txt1
-rw-r--r--npc/014-1_Woodland/taro.txt (renamed from npc/020-2_Nivalis/taro.txt)2
-rwxr-xr-xnpc/020-1_Nivalis/KrickKrackKrock.txt17
-rwxr-xr-xnpc/020-1_Nivalis/rockscissor.txt5
-rwxr-xr-xnpc/020-1_Nivalis/well.txt6
-rwxr-xr-xnpc/020-2_Nivalis/baktar.txt2
6 files changed, 24 insertions, 9 deletions
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index b84a9892..25cc56c3 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -2,3 +2,4 @@ map: 014-1.gat
npc: npc/014-1_Woodland/_mobs.txt
npc: npc/014-1_Woodland/_warps.txt
npc: npc/014-1_Woodland/wedding-officiator.txt
+npc: npc/014-1_Woodland/taro.txt
diff --git a/npc/020-2_Nivalis/taro.txt b/npc/014-1_Woodland/taro.txt
index a9418f80..3ec76163 100644
--- a/npc/020-2_Nivalis/taro.txt
+++ b/npc/014-1_Woodland/taro.txt
@@ -1,7 +1,7 @@
// Woodland Taro
-020-2.gat,104,28,0 script Taro 114,{
+014-1.gat,54,43,0 script Taro 114,{
if (getequipid(equip_head) == 511 || getequipid(equip_head) == 1206) goto L_Santa;
if (getequipid(equip_head) == 633) goto L_Elf;
if (getequipid(equip_head) == 628) goto L_NearElf;
diff --git a/npc/020-1_Nivalis/KrickKrackKrock.txt b/npc/020-1_Nivalis/KrickKrackKrock.txt
index c35ed798..2feb1d15 100755
--- a/npc/020-1_Nivalis/KrickKrackKrock.txt
+++ b/npc/020-1_Nivalis/KrickKrackKrock.txt
@@ -1,6 +1,6 @@
// author: Lien
// reviewed by Pjotr Orial and Jenalya
-020-1.gat,82,82,0 script Criker 183, {
+020-1.gat,82,82,0 script Criker 192, {
L_Main:
//Var
@@ -17,7 +17,8 @@ L_Main:
mes @NPC_NAME$;
mes "\"Hello " + strcharinfo(0) + ", do you want to play Krick-Krack-Krock?\"";
L_Menu:
- menu "Let's start!", L_Start,
+ menu
+ "Let's start!", L_Start,
"What's this?", L_info,
"Well, not for the moment.", -;
close;
@@ -43,7 +44,7 @@ L_Start:
set @menu, @menu - 1;
mes @NPC_NAME$;
- mes "\" "+ @KRICK$[@NPC_KRICK] +" !\"";
+ mes "\" "+ @KRICK$[@NPC_KRICK] +"!\"";
if( @menu == @NPC_KRICK ) goto L_Work;
mes @NPC_NAME$;
mes "\"Too bad! You were not lucky!\"";
@@ -64,6 +65,8 @@ L_Money:
close;
L_Item:
//item
+getinventorylist;
+ if (@inventorylist_count == 100) goto L_Full_Inv;
if( @BET > 50) getitem @ITEM_RAND[rand(1)], 1;
if( @BET > 200) getitem @ITEM_RAND[1 + rand(1)], 1;
@@ -78,7 +81,9 @@ if( @BET == 2000) getitem @ITEM_RAND[6 + rand(1)], 1;
L_Health_item:
// health item
-
+getinventorylist;
+ if (@inventorylist_count == 100) goto L_Full_Inv
+
if( @BET > 50) getitem @ITEM_HEALTH[rand(1)], 1;
if( @BET > 200) getitem @ITEM_HEALTH[ 1 +rand(1)], 1 + rand(1);
if( @BET > 500) getitem @ITEM_HEALTH[2 + rand(1)], 1 + rand(3);
@@ -89,6 +94,10 @@ if( @BET == 2000) getitem @ITEM_HEALTH[3], 5 + rand(10);
mes "\"Here it is !\"";
close;
+L_Full_Inv:
+ mes @NPC_NAME$;
+ mes "\"What are you doing? You have so many stuff with you, you can't carry what you won. Ha, well, then I will keep it!\"";
+ close;
L_poor:
mes @NPC_NAME$;
diff --git a/npc/020-1_Nivalis/rockscissor.txt b/npc/020-1_Nivalis/rockscissor.txt
index ac46a773..0f5c20c9 100755
--- a/npc/020-1_Nivalis/rockscissor.txt
+++ b/npc/020-1_Nivalis/rockscissor.txt
@@ -9,7 +9,7 @@
// ------------------------ #
//#####################################
-020-1.gat,74,78,0 script Gobmel 183, {
+020-1.gat,74,78,0 script Gobmel 189, {
//var
set @NPC_name$, "[Gobmel]";
set @NPC_point, 0;
@@ -45,7 +45,9 @@ L_Start:
mes @NPC_name$;
mes "[ " + @gamblerun + "/3 ]";
mes "\"1... 2... 3...\"";
+ mes "";
mes"[chose what sign you do]";
+ mes "";
menu
@CHOOSE_PC$[0], -,
@CHOOSE_PC$[1], -,
@@ -54,6 +56,7 @@ L_Start:
set @CHOSEN, @menu -1;
mes "Gobmal: " + @CHOOSE_PC$[@CHOOSE_NPCID];
mes strcharinfo(0)+" " + strcharinfo(0)+ ": " +@CHOOSE_PC$[@CHOSEN];
+ mes "";
if(@CHOSEN == @CHOOSE_NPCID) goto L_Start;
if(@CHOSEN == 0 && @CHOOSE_NPCID == 2) goto L_Lost;
if(@CHOSEN == 1 && @CHOOSE_NPCID == 0) goto L_Lost;
diff --git a/npc/020-1_Nivalis/well.txt b/npc/020-1_Nivalis/well.txt
index 4c200be8..ed025a0f 100755
--- a/npc/020-1_Nivalis/well.txt
+++ b/npc/020-1_Nivalis/well.txt
@@ -53,7 +53,8 @@ L_trew:
mes "[Mysterious voice inside the well]";
mes "\" "+ @quote$ +"\"";
next;
- menu "Who are you?", -,
+ menu
+ "Who are you?", -,
"How did you get there?", -,
"Do you need help?", -;
@@ -94,7 +95,8 @@ S_Update_Var:
mes "\"Hello!\"";
if(@Q_status == 2) close;
if(@Q_status == 1)
- menu "Hello.", -,
+ menu
+ "Hello.", -,
"Hello, Can you help me?", L_HELP;
close;
L_HELP:
diff --git a/npc/020-2_Nivalis/baktar.txt b/npc/020-2_Nivalis/baktar.txt
index b037d7bb..b29b4be1 100755
--- a/npc/020-2_Nivalis/baktar.txt
+++ b/npc/020-2_Nivalis/baktar.txt
@@ -32,7 +32,7 @@
//# bit 0 knows the name/location of the opponent
//# bit 1 killed the ugly opponent
//#=========================
-020-2.gat,70,61,0 script Baktar 183,{
+020-2.gat,70,61,0 script Baktar 191,{
set @npcname$, "[Baktar]";
set @Q_MASK, BYTE_0_MASK;