diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-12-31 19:09:49 -0200 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-12-31 19:09:49 -0200 |
| commit | 2f16d8b8c34257733180058c82415d395ea27474 (patch) | |
| tree | 09a7e0b77ba01cfade269593ee88c02122fd5976 /npc/008-2-17 | |
| parent | f4ac215d94dc2c5eb58675f79e0be87932f78cc3 (diff) | |
| parent | 28fdcc18ff9c80fea20414482ecc7c74fd0bf9cf (diff) | |
| download | serverdata-jesusalva/GuidedTour.tar.gz serverdata-jesusalva/GuidedTour.tar.bz2 serverdata-jesusalva/GuidedTour.tar.xz serverdata-jesusalva/GuidedTour.zip | |
Merge branch 'master' into jesusalva/GuidedTourjesusalva/GuidedTour
Diffstat (limited to 'npc/008-2-17')
| -rw-r--r-- | npc/008-2-17/_import.txt | 2 | ||||
| -rw-r--r-- | npc/008-2-17/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/008-2-17/angus.txt | 20 | ||||
| -rw-r--r-- | npc/008-2-17/caul.txt | 20 |
4 files changed, 43 insertions, 1 deletions
diff --git a/npc/008-2-17/_import.txt b/npc/008-2-17/_import.txt index d90289e3..854dad03 100644 --- a/npc/008-2-17/_import.txt +++ b/npc/008-2-17/_import.txt @@ -1,3 +1,5 @@ // Map 008-2-17: Mining Camp // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/008-2-17/_warps.txt", +"npc/008-2-17/angus.txt", +"npc/008-2-17/caul.txt", diff --git a/npc/008-2-17/_warps.txt b/npc/008-2-17/_warps.txt index 9857c005..1010521a 100644 --- a/npc/008-2-17/_warps.txt +++ b/npc/008-2-17/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 008-2-17: Mining Camp warps 008-2-17,52,40,0 warp #008-2-17_52_40 0,0,008-1,236,40 -008-2-17,25,42,0 warp #008-2-17_25_39 1,0,008-2-18,22,24 +008-2-17,25,39,0 warp #008-2-17_25_39 1,0,008-2-18,22,24 008-2-17,24,34,0 warp #008-2-17_24_34 0,0,008-2-19,20,29 diff --git a/npc/008-2-17/angus.txt b/npc/008-2-17/angus.txt new file mode 100644 index 00000000..3efeefb6 --- /dev/null +++ b/npc/008-2-17/angus.txt @@ -0,0 +1,20 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Angus the Smith. +// THIS IS A PLACEHOLDER! + +008-2-17,34,47,0 script Angus#008-2-17 NPC_ANGUS_THE_SMITH,{ + speech + l("Hello."), + l("Do you need your pickaxe or your shovel fixed? Then I am your man."), + lg("If you want to play with unicorns, you better piss off now."); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/008-2-17/caul.txt b/npc/008-2-17/caul.txt new file mode 100644 index 00000000..41c5488c --- /dev/null +++ b/npc/008-2-17/caul.txt @@ -0,0 +1,20 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Caul the Alchemist. +// THIS IS A PLACEHOLDER! + +008-2-17,40,33,0 script Caul#008-2-17 NPC_CAUL,{ + speech + l("Hi there."), + l("Don't you like the smoke, when there is a nice fire beneath a cauldron?"), + lg("Honestly, sometimes I prefer nice explosions. Better keep back!"); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} |