diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/000-2-1/chefgado.txt | 1 | ||||
-rw-r--r-- | npc/000-2-1/rumly.txt | 3 | ||||
-rw-r--r-- | npc/000-2-2/bacchus.txt | 2 | ||||
-rw-r--r-- | npc/000-2-3/nard.txt | 1 | ||||
-rw-r--r-- | npc/001-1/calypsan.txt | 1 | ||||
-rw-r--r-- | npc/001-1/chelios.txt | 1 | ||||
-rw-r--r-- | npc/001-1/pious.txt | 1 | ||||
-rw-r--r-- | npc/001-1/rumly.txt | 1 | ||||
-rw-r--r-- | npc/001-1/salem.txt | 7 | ||||
-rw-r--r-- | npc/001-1/trees.txt | 1 | ||||
-rw-r--r-- | npc/001-2-0/resa.txt | 2 | ||||
-rw-r--r-- | npc/001-2-28/jenna.txt | 2 | ||||
-rw-r--r-- | npc/001-2-28/plush.txt | 1 | ||||
-rw-r--r-- | npc/functions/doors.txt | 2 | ||||
-rw-r--r-- | npc/functions/fishing.txt | 1 | ||||
-rw-r--r-- | npc/functions/main.txt | 4 | ||||
-rw-r--r-- | npc/functions/npcmovegraph.txt | 11 | ||||
-rw-r--r-- | npc/items/shovel.txt | 3 |
18 files changed, 6 insertions, 39 deletions
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 4a6a5c3b..7ab5b156 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -138,7 +138,6 @@ L_GotAll: getitem 717, 1; close; - L_Need: mes ""; mesn; diff --git a/npc/000-2-1/rumly.txt b/npc/000-2-1/rumly.txt index b2d59620..b6146c3c 100644 --- a/npc/000-2-1/rumly.txt +++ b/npc/000-2-1/rumly.txt @@ -88,7 +88,7 @@ L_Menu: goto L_ResetStats; case 3: if (.@visited != 2) goto L_Quit; - + speech 5, l("See you! And come back with the plushrooms!"); @@ -183,7 +183,6 @@ L_Quit: goodbye; - OnTimer1800: stopnpctimer; diff --git a/npc/000-2-2/bacchus.txt b/npc/000-2-2/bacchus.txt index 05375095..541c6823 100644 --- a/npc/000-2-2/bacchus.txt +++ b/npc/000-2-2/bacchus.txt @@ -2,7 +2,6 @@ // Authors: // Vasily_Makarov - 000-2-2.gat,32,29,0,1 script Bacchus NPC_BACCHUS,{ mesn; @@ -127,5 +126,4 @@ L_DoHat: mesq l("That's remarkable, I've never made anything like that one before, consider yourself lucky!"); close; - } diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index 7f6e17ab..f0655d1c 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -236,7 +236,6 @@ L_GoBackArtis: close; } - L_Reward: mesn; mesq l("Hey! There's a reward for you in the box next to me!"); diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt index 9450667e..9b6c6cca 100644 --- a/npc/001-1/calypsan.txt +++ b/npc/001-1/calypsan.txt @@ -33,7 +33,6 @@ l("If yoiis wants to see a different use of cards he can yeye for Resa on the light armor shop for a description of styling cards."); } - speech 4, l("Yoiis envies a rainbow in the sky?"), l("It is possible to yeye your cloth with my beautiful dyes."), diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt index 73638d41..c03ff6e1 100644 --- a/npc/001-1/chelios.txt +++ b/npc/001-1/chelios.txt @@ -22,7 +22,6 @@ l("It's better to deal with the Merchant Guild than the old man, Don has this ability to hammer down your enthusiasm in sparkling fury!"), l("If Enora wants her sword now, I need to ask for your help."); - switch (select (l("Let's not keep her waiting."), l("Not now."))) { diff --git a/npc/001-1/pious.txt b/npc/001-1/pious.txt index 8884c63d..10f9d8e4 100644 --- a/npc/001-1/pious.txt +++ b/npc/001-1/pious.txt @@ -6,7 +6,6 @@ // Variables: // none - 001-1,55,119,0 script #MarketPiou1 NPC_MARKET_PIOU,{ end; diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt index 742b143e..d6f8cd9c 100644 --- a/npc/001-1/rumly.txt +++ b/npc/001-1/rumly.txt @@ -198,7 +198,6 @@ L_Quit: goodbye; - OnTimer1800: stopnpctimer; diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt index fb51da0f..e3db2d81 100644 --- a/npc/001-1/salem.txt +++ b/npc/001-1/salem.txt @@ -105,7 +105,6 @@ mesq l("Just look at my goods for sale! Fresh fruits and vegetables were shipped only this morning. And for reasonable price, of course."); next; - L_SalemMenuShop: .@fexil = getq(ArtisQuests_Fexil); @@ -119,7 +118,7 @@ L_SalemMenuShop: mes ""; mesn; - + switch (@menuret) { case 0: @@ -149,6 +148,7 @@ L_SalemMenuShop: case 5: break; } + closedialog; goodbye; close; @@ -181,7 +181,7 @@ L_AboutPious: rif (.@q == 1, l("I'm on my way! I will bring it back to you.")), 1, l("I don't really have time to go chasing pious, let me just buy one at the regular price (30000E)."), 2, l("I don't want to buy a piou right now."), 3; - + mes ""; mesn; @@ -201,7 +201,6 @@ L_AboutPious: goodbye; close; - L_QuestInfo: mesq l("The little piou is flying nearby, all you need is to catch it and bring back to me."); next; diff --git a/npc/001-1/trees.txt b/npc/001-1/trees.txt index 3e34fcf5..98ac2ebf 100644 --- a/npc/001-1/trees.txt +++ b/npc/001-1/trees.txt @@ -15,7 +15,6 @@ // 3 - player decided to tell Katja where her brother is // 4 - "good" ending, player helped Katja - function script LazyBrotherTreeFunc { .@q = getq(ArtisQuests_LazyBrother); if (.@q == 0 || .@q >= 2) diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt index a3f57bcd..1660b5d6 100644 --- a/npc/001-2-0/resa.txt +++ b/npc/001-2-0/resa.txt @@ -18,7 +18,7 @@ speech 4, l("Welcome to my office."), l("What would you like today?"); - + do { .@q = select (l("[Trade]"), diff --git a/npc/001-2-28/jenna.txt b/npc/001-2-28/jenna.txt index bcfdee57..147f5bc3 100644 --- a/npc/001-2-28/jenna.txt +++ b/npc/001-2-28/jenna.txt @@ -69,7 +69,7 @@ OnInit: "big_table_r", "s_table_2", 1, "dir 4; wait 8", "lf_table_2", "m_table_2", 1, "dir 0; wait 8", "lf_table_2", "big_table_r",1, "dir 4; wait 1; emote 3; wait 6"; - + firstmove "wait 8"; initnpctimer; } diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt index 9ae9fb9d..4089a0f0 100644 --- a/npc/001-2-28/plush.txt +++ b/npc/001-2-28/plush.txt @@ -109,7 +109,6 @@ return; } - speech 4, l("Welcome to the RedPlush INN!"), l("What do you need?"); diff --git a/npc/functions/doors.txt b/npc/functions/doors.txt index 8b49bf0b..b8171a9d 100644 --- a/npc/functions/doors.txt +++ b/npc/functions/doors.txt @@ -39,7 +39,6 @@ function script doorInit { end; } - function script open_door { .@door$ = getarg(0); setnpcdir.@door$, 2; @@ -49,7 +48,6 @@ function script open_door { return 0; } - function script close_door { .@door$ = getarg(0); setnpcdir .@door$, 4; diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt index 7ff60c30..e3289daf 100644 --- a/npc/functions/fishing.txt +++ b/npc/functions/fishing.txt @@ -4,7 +4,6 @@ // Description: // Fishing functions. - function script fishing { .@wait_time_min = 5000; diff --git a/npc/functions/main.txt b/npc/functions/main.txt index a9edd4a1..3303658c 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -76,7 +76,6 @@ function script strip { return substr(.@s$, .@start, .@end); } - // Function to show narrator text. Accepts string args. // If first arg is a number N, then it represents bit flags. // Bit flags : @@ -113,7 +112,6 @@ function script narrator { return; } - // Function to show NPC speech. Accepts string args. // If first arg is a number N, then it represents bit flags. // Bit flags : @@ -151,7 +149,6 @@ function script speech { return; } - // Show debug message if .debug variable of NPC is set to 1 function script npcdebug { if (getvariableofnpc(.debug, strnpcinfo(3))) @@ -159,7 +156,6 @@ function script npcdebug { return; } - function script abs { .@n = getarg(0); return .@n >= 0 ? .@n : -.@n; diff --git a/npc/functions/npcmovegraph.txt b/npc/functions/npcmovegraph.txt index a19e2df5..76b9a28c 100644 --- a/npc/functions/npcmovegraph.txt +++ b/npc/functions/npcmovegraph.txt @@ -6,7 +6,6 @@ // Variables: // none - function script initmovegraph { deletearray getvariableofnpc(.movegraphcmd$, strnpcinfo(3)); deletearray getvariableofnpc(.movegraphlabels$, strnpcinfo(3)); @@ -33,7 +32,6 @@ function script initmovegraph { return; } - function script findmovegraphlabel { if (!getargcount()) { @@ -57,7 +55,6 @@ function script findmovegraphlabel { return -1; } - /* setmovegraphcmd(fromPositionLabel,toPositionLabel[,moveChanceWeight[,moveFlags]],postCommand, ...); * This function manipulates NPC moving graph. Before calling it, make sure * `initmovegraph' was called. The function accepts 3-5 parameters (many times): @@ -91,7 +88,6 @@ function script setmovegraphcmd { return; } - function script execmovecmd { explode(.@cmd$, getarg(0), " "); @@ -200,7 +196,6 @@ function script execmovecmd { return 0; } - function script getnextmovecmd { .@cmds$ = getvariableofnpc(.nextcmd$, strnpcinfo(3)); .@firstCmd$ = .@cmds$; @@ -216,7 +211,6 @@ function script getnextmovecmd { return strip(.@firstCmd$); } - // getrandompoint(x1,y1,x2,y2) // -- Get a random walkable point within a map rectangle // x1, y1 -- top-left corner of rectangle @@ -274,7 +268,6 @@ L_Found: return 0; } - function script movetonextpoint { .@wait = getvariableofnpc(.waitticks, strnpcinfo(3)); if (.@wait > 0) @@ -360,7 +353,6 @@ function script movetonextpoint { return; } - // initial actions for npc when using move graphs. // function can accept 2 arguments: // 1: action sequence, for example "speed 200; dir 4". Default is "moveon" @@ -380,7 +372,6 @@ function script firstmove { return; } - function script npc_pausemove { stopnpctimer; .@move_after = 0; @@ -396,7 +387,6 @@ function script npc_pausemove { return 0; } - function script npc_resumemove { startnpctimer; @@ -410,7 +400,6 @@ function script npc_resumemove { return 0; } - // npc_turntoxy(x,y) // turn npc toward an object at position (x,y) function script npc_turntoxy { diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt index b22298e7..047ef038 100644 --- a/npc/items/shovel.txt +++ b/npc/items/shovel.txt @@ -4,7 +4,6 @@ // Description: // NPC to use shovel (dig, bury etc) - - script Shovel -1,{ function CheckDigLocation { @@ -179,7 +178,6 @@ OnInit: } - function script shovel_addquest { if (getargcount() < 4) { @@ -198,7 +196,6 @@ function script shovel_addquest { return 1; } - function script shovel_adddigrect { if (getargcount() < 5) { |