diff options
| author | QwertyDragon <me@christophergoodwin.name> | 2015-11-09 22:24:19 -0500 |
|---|---|---|
| committer | QwertyDragon <me@christophergoodwin.name> | 2015-11-09 22:24:19 -0500 |
| commit | 0b448f9417623f4f5093f87ec33e33985197390b (patch) | |
| tree | c8ce6422276ccd3e12480e56b33e904419e63fc8 /npc | |
| parent | 786bf2dd1d07a12eded1f668474b4fe72f8986cc (diff) | |
| parent | cfa5239a9561c584a8b3c8b7c8c361ea990631e1 (diff) | |
| download | serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.gz serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.bz2 serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.xz serverdata-0b448f9417623f4f5093f87ec33e33985197390b.zip | |
Merge branch 'master' of gitlab.com:evol/serverdata
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-1/merlin.txt | 18 | ||||
| -rw-r--r-- | npc/001-2-19/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-2-19/lloyd.txt | 18 | ||||
| -rw-r--r-- | npc/001-2-26/_import.txt | 3 | ||||
| -rw-r--r-- | npc/001-2-26/ivan.txt | 18 |
6 files changed, 58 insertions, 1 deletions
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index b429f46a..5d509830 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -15,6 +15,7 @@ npc: npc/001-1/harbours.txt npc: npc/001-1/juscare.txt npc: npc/001-1/katja.txt npc: npc/001-1/lozerk.txt +npc: npc/001-1/merlin.txt npc: npc/001-1/nalkri.txt npc: npc/001-1/panels.txt npc: npc/001-1/qonan.txt diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt new file mode 100644 index 00000000..0223e3ce --- /dev/null +++ b/npc/001-1/merlin.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Fishmonger NPC + +001-1,72,128,0 script Merlin NPC_MERLIN,{ + + speech + l("Fish is good for the brain!"); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/001-2-19/_import.txt b/npc/001-2-19/_import.txt index f5348802..2bbc8082 100644 --- a/npc/001-2-19/_import.txt +++ b/npc/001-2-19/_import.txt @@ -1,3 +1,4 @@ npc: npc/001-2-19/mapflags.txt npc: npc/001-2-19/_warps.txt npc: npc/001-2-19/doors.txt +npc: npc/001-2-19/lloyd.txt diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt new file mode 100644 index 00000000..04b427a7 --- /dev/null +++ b/npc/001-2-19/lloyd.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Lloyd the banker NPC + +001-2-19,31,25,0 script Lloyd the banker NPC_LLOYD,{ + + speech + l("The bank is not open yet."); + + close; + +OnInit: + .sex = G_MALE; + .distance = 4; + end; +} diff --git a/npc/001-2-26/_import.txt b/npc/001-2-26/_import.txt index 618a5e6e..35d2343b 100644 --- a/npc/001-2-26/_import.txt +++ b/npc/001-2-26/_import.txt @@ -1,4 +1,5 @@ // Map 001-2-26 +npc: npc/001-2-26/flask.txt +npc: npc/001-2-26/ivan.txt npc: npc/001-2-26/mapflags.txt npc: npc/001-2-26/_warps.txt -npc: npc/001-2-26/flask.txt diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt new file mode 100644 index 00000000..d52843d1 --- /dev/null +++ b/npc/001-2-26/ivan.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Alchemist NPC + +001-2-26,28,30,0 script Ivan NPC_IVAN,{ + + speech + l("Croc."); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} |