diff options
-rw-r--r-- | conf/map/maps.conf | 1 | ||||
-rw-r--r-- | db/map_index.txt | 49 | ||||
-rwxr-xr-x | db/re/map_cache.dat | bin | 22279 -> 23091 bytes | |||
-rw-r--r-- | npc/003-1/lieutenantdausen.txt | 54 | ||||
-rw-r--r-- | npc/004-1/_import.txt | 2 | ||||
-rw-r--r-- | npc/_import.txt | 1 |
6 files changed, 79 insertions, 28 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index aafbdde3b..237a6ab53 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -75,6 +75,7 @@ map_list: ( "003-6", "003-7", "003-8", + "004-1", "005-1", "005-2", "005-3", diff --git a/db/map_index.txt b/db/map_index.txt index 523bcb1e7..0d18d32da 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -72,27 +72,28 @@ 003-6 72 003-7 73 003-8 74 -005-1 75 -005-2 76 -005-3 77 -005-4 78 -005-5 79 -005-6 80 -008-1 81 -008-2-0 82 -008-2-1 83 -008-2-10 84 -008-2-11 85 -008-2-12 86 -008-2-13 87 -008-2-14 88 -008-2-2 89 -008-2-3 90 -008-2-4 91 -008-2-5 92 -008-2-6 93 -008-2-7 94 -008-2-8 95 -008-2-9 96 -test 97 -testbg 98 +004-1 75 +005-1 76 +005-2 77 +005-3 78 +005-4 79 +005-5 80 +005-6 81 +008-1 82 +008-2-0 83 +008-2-1 84 +008-2-10 85 +008-2-11 86 +008-2-12 87 +008-2-13 88 +008-2-14 89 +008-2-2 90 +008-2-3 91 +008-2-4 92 +008-2-5 93 +008-2-6 94 +008-2-7 95 +008-2-8 96 +008-2-9 97 +test 98 +testbg 99 diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat Binary files differindex 28d9c9a8f..14833427a 100755 --- a/db/re/map_cache.dat +++ b/db/re/map_cache.dat diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index cbd463543..397c1abf3 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -264,12 +264,58 @@ OnInit: end;
}
003-1,102,80,0 script Guard Tetric NPC_GUARD1,{
- legiontalk;
+ if (getq(CandorQuest_HAS) == 1)
+ {
+ //CheckEnfant(); // FIXME and everywhere else: Missing Function
+ }
end;
+
+OnTimer1000:
+ domovestep;
+
OnInit:
- .sex = G_OTHER;
- .distance = 1;
- end;
+ initpath "move", 110, 84,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 110, 101,
+ "dir", RIGHT, 0,
+ "wait", 0, 0,
+ "move", 99, 121,
+ "dir", LEFT, 0,
+ "wait", 1, 0,
+ "move", 89, 136,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 65, 152,
+ "dir", DOWN, 0,
+ "wait", 1, 0,
+ "move", 71, 139,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 59, 128,
+ "dir", LEFT, 0,
+ "wait", 1, 0,
+ "move", 47, 79,
+ "dir", LEFT, 0,
+ "wait", 1, 0,
+ "move", 80, 73,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 53, 52,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 52, 37,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 35, 35,
+ "dir", RIGHT, 0,
+ "wait", 1, 0,
+ "move", 62, 105,
+ "dir", DOWN, 0,
+ "wait", 1, 0;
+ initialmove;
+ initnpctimer;
+ .distance = 5;
}
003-1,107,80,0 script Guard Biscop NPC_GUARD1,{
legiontalk;
diff --git a/npc/004-1/_import.txt b/npc/004-1/_import.txt new file mode 100644 index 000000000..5faddb3c5 --- /dev/null +++ b/npc/004-1/_import.txt @@ -0,0 +1,2 @@ +// Map 004-1: Tulimshar South +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/_import.txt b/npc/_import.txt index 2e960517e..098e7b4b0 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -74,6 +74,7 @@ @include "npc/003-6/_import.txt" @include "npc/003-7/_import.txt" @include "npc/003-8/_import.txt" +@include "npc/004-1/_import.txt" @include "npc/005-1/_import.txt" @include "npc/005-2/_import.txt" @include "npc/005-3/_import.txt" |