diff options
author | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-07-07 20:36:00 -0300 |
commit | 6967b9e0b63d19141d4f59b7933a960ac81916d0 (patch) | |
tree | 8ecd9cd2461f3598cb7faece71eb77162aa4ef2a /npc/001-3 | |
parent | 9877fd4ad81120af8e63e96d5d429092014dc017 (diff) | |
parent | 046c659193e1ca8bd13478678d1277df8bf9395c (diff) | |
download | serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.gz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.bz2 serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.tar.xz serverdata-6967b9e0b63d19141d4f59b7933a960ac81916d0.zip |
Merge branch 'master' into legacy
Override all files with 'master' version.
This version is meant to preserve git history as requested by bjorn.
Diffstat (limited to 'npc/001-3')
-rw-r--r-- | npc/001-3/_import.txt | 7 | ||||
-rw-r--r-- | npc/001-3/_mobs.txt | 3 | ||||
-rw-r--r-- | npc/001-3/_warps.txt | 3 | ||||
-rw-r--r-- | npc/001-3/guards.txt | 32 | ||||
-rw-r--r-- | npc/001-3/mapflags.txt | 2 | ||||
-rw-r--r-- | npc/001-3/pvpflag.txt | 1 |
6 files changed, 48 insertions, 0 deletions
diff --git a/npc/001-3/_import.txt b/npc/001-3/_import.txt new file mode 100644 index 00000000..4bcf3b3b --- /dev/null +++ b/npc/001-3/_import.txt @@ -0,0 +1,7 @@ +// Map 001-3: Tulimshar Arena +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-3/_mobs.txt", +"npc/001-3/_warps.txt", +"npc/001-3/guards.txt", +"npc/001-3/mapflags.txt", +"npc/001-3/pvpflag.txt", diff --git a/npc/001-3/_mobs.txt b/npc/001-3/_mobs.txt new file mode 100644 index 00000000..3fc96876 --- /dev/null +++ b/npc/001-3/_mobs.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-3: Tulimshar Arena mobs +001-3,0,0,0,0 monster Maggot 1002,10,0,0 diff --git a/npc/001-3/_warps.txt b/npc/001-3/_warps.txt new file mode 100644 index 00000000..f0afb857 --- /dev/null +++ b/npc/001-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-3: Tulimshar Arena warps +001-3,73,28,0 warp #001-3_73_28 0,0,002-2,74,59 diff --git a/npc/001-3/guards.txt b/npc/001-3/guards.txt new file mode 100644 index 00000000..21bebab0 --- /dev/null +++ b/npc/001-3/guards.txt @@ -0,0 +1,32 @@ +001-3,77,37,0 script Phaet#arena NPC125,{ + mes "[Phaet the Royal Guard]"; + mes "\"Do you want to go back?\""; + next; + menu + "Yes", L_Sure, + "No", L_Next; + +L_Next: + mes "Have fun."; + close; + +L_Sure: + mes "[Phaet the Royal Guard]"; + mes "\"Ok.\""; + next; + if(DUELS & $@DuelPvpBit) goto L_FightClub; + warp "002-2", 74, 59; + close; + +L_FightClub: + DUELS = DUELS &~ $@DuelPvpBit; + warp "009-7", 39, 37; + close; +} + +001-3,69,37,0 script Aradin NPC126,{ + mes "[Aradin the Royal Guard]"; + mes "\"Don't touch me..."; + mes "You wouldn't enjoy the consequences.\""; + close; +} diff --git a/npc/001-3/mapflags.txt b/npc/001-3/mapflags.txt new file mode 100644 index 00000000..d86f50e1 --- /dev/null +++ b/npc/001-3/mapflags.txt @@ -0,0 +1,2 @@ +001-3 mapflag nosave 002-2,74,59 +001-3 mapflag zone MMO diff --git a/npc/001-3/pvpflag.txt b/npc/001-3/pvpflag.txt new file mode 100644 index 00000000..50d670bd --- /dev/null +++ b/npc/001-3/pvpflag.txt @@ -0,0 +1 @@ +001-3 mapflag pvp |