Update warps. 024-1 Frostia Guard.

4 files changed, 33 insertions, 0 deletions

diff --git a/npc/022-1/_warps.txt b/npc/022-1/_warps.txt
index 87403b8fc..fb1ac2eea 100644
--- a/npc/022-1/_warps.txt
+++ b/npc/022-1/_warps.txt
@@ -1,4 +1,9 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 022-1: North Icelands warps
+022-1,80,65,0	warp	#022-1_80_65	0,0,023-1,57,42
+022-1,73,62,0	warp	#022-1_73_62	0,0,023-1,47,58
+022-1,58,52,0	warp	#022-1_58_52	0,0,023-1,37,27
+022-1,70,81,0	warp	#022-1_70_81	0,0,023-1,52,61
 022-1,68,90,0	warp	#022-1_68_90	0,0,023-1,45,69
+022-1,49,55,0	warp	#022-1_49_55	0,0,023-1,26,35
 022-1,70,112,0	warp	#022-1_70_112	1,0,021-1,136,30
diff --git a/npc/023-1/_warps.txt b/npc/023-1/_warps.txt
index fa37e4920..14f6c1012 100644
--- a/npc/023-1/_warps.txt
+++ b/npc/023-1/_warps.txt
@@ -10,16 +10,19 @@ OnTouch:
 OnTouch:
 	slide 50,56; end;
 }
+023-1,37,28,0	warp	#023-1_37_28	0,0,022-1,58,53
 023-1,35,33,0	script	#023-1_35_33	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
 	slide 31,61; end;
 }
+023-1,57,43,0	warp	#023-1_57_43	0,0,022-1,80,66
 023-1,50,43,0	script	#023-1_50_43	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
 	slide 50,49; end;
 }
+023-1,26,36,0	warp	#023-1_26_36	0,0,022-1,49,56
 023-1,36,47,0	script	#023-1_36_47	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
@@ -35,6 +38,8 @@ OnTouch:
 OnTouch:
 	slide 62,31; end;
 }
+023-1,47,59,0	warp	#023-1_47_59	0,0,022-1,73,63
+023-1,52,62,0	warp	#023-1_52_62	0,0,022-1,70,82
 023-1,31,62,0	script	#023-1_31_62	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
diff --git a/npc/024-1/_import.txt b/npc/024-1/_import.txt
index 3221209aa..1434d7261 100644
--- a/npc/024-1/_import.txt
+++ b/npc/024-1/_import.txt
@@ -1,4 +1,5 @@
 // Map 024-1: Frostia
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/024-1/_warps.txt",
+"npc/024-1/guard.txt",
 "npc/024-1/mapflags.txt",
diff --git a/npc/024-1/guard.txt b/npc/024-1/guard.txt
new file mode 100644
index 000000000..b32f51185
--- /dev/null
+++ b/npc/024-1/guard.txt
@@ -0,0 +1,22 @@
+// TMW2 Script
+
+024-1,93,73,0	script	Frostia Guard	NPC_ELF,{
+    mesn;
+    mesq l("You're not welcome here. Get moving.");
+    end;
+
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, WarlordPlate);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, JeansChaps);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 2);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 4);
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+