From bfa1356daedb25854ec141fe91027f458ca92f29 Mon Sep 17 00:00:00 2001 From: wushin Date: Sat, 19 Apr 2014 12:17:29 -0500 Subject: Fixed mapflag for resave 011-4,023-1,023-2,023-3,026-1,031-3,044-3,068-1,068-2,069-1,069-2,056-2,botcheck.gat --- world/map/npc/011-4/mapflags.txt | 2 +- world/map/npc/023-1/_import.txt | 1 + world/map/npc/023-1/mapflags.txt | 1 + world/map/npc/023-2/_import.txt | 1 + world/map/npc/023-2/mapflags.txt | 1 + world/map/npc/023-3/_import.txt | 1 + world/map/npc/023-3/mapflags.txt | 1 + world/map/npc/026-1/mapflags.txt | 2 +- world/map/npc/031-3/mapflags.txt | 2 +- world/map/npc/044-3/mapflags.txt | 2 +- world/map/npc/056-2/mapflags.txt | 1 + world/map/npc/068-1/_import.txt | 1 + world/map/npc/068-1/mapflags.txt | 2 ++ world/map/npc/068-2/_import.txt | 1 + world/map/npc/068-2/mapflags.txt | 2 ++ world/map/npc/068-3/_import.txt | 5 --- world/map/npc/068-3/_mobs.txt | 61 ------------------------------------- world/map/npc/068-3/_warps.txt | 4 --- world/map/npc/069-1/_import.txt | 1 + world/map/npc/069-1/mapflags.txt | 2 ++ world/map/npc/069-2/_import.txt | 1 + world/map/npc/069-2/mapflags.txt | 2 ++ world/map/npc/069-3/_import.txt | 5 --- world/map/npc/069-3/_mobs.txt | 61 ------------------------------------- world/map/npc/069-3/_warps.txt | 4 --- world/map/npc/botcheck/_import.txt | 1 + world/map/npc/botcheck/mapflags.txt | 1 + 27 files changed, 25 insertions(+), 144 deletions(-) create mode 100644 world/map/npc/023-1/mapflags.txt create mode 100644 world/map/npc/023-2/mapflags.txt create mode 100644 world/map/npc/023-3/mapflags.txt create mode 100644 world/map/npc/068-1/mapflags.txt create mode 100644 world/map/npc/068-2/mapflags.txt delete mode 100644 world/map/npc/068-3/_import.txt delete mode 100644 world/map/npc/068-3/_mobs.txt delete mode 100644 world/map/npc/068-3/_warps.txt create mode 100644 world/map/npc/069-1/mapflags.txt create mode 100644 world/map/npc/069-2/mapflags.txt delete mode 100644 world/map/npc/069-3/_import.txt delete mode 100644 world/map/npc/069-3/_mobs.txt delete mode 100644 world/map/npc/069-3/_warps.txt create mode 100644 world/map/npc/botcheck/mapflags.txt diff --git a/world/map/npc/011-4/mapflags.txt b/world/map/npc/011-4/mapflags.txt index 8b9a503f..9e064cbd 100644 --- a/world/map/npc/011-4/mapflags.txt +++ b/world/map/npc/011-4/mapflags.txt @@ -1 +1 @@ -011-3.gat|mapflag|resave|011-1,103,34 +011-4.gat|mapflag|resave|011-1,103,34 diff --git a/world/map/npc/023-1/_import.txt b/world/map/npc/023-1/_import.txt index 79efdd7c..b850d7ea 100644 --- a/world/map/npc/023-1/_import.txt +++ b/world/map/npc/023-1/_import.txt @@ -3,3 +3,4 @@ map: 023-1.gat npc: npc/023-1/_mobs.txt npc: npc/023-1/_warps.txt +npc: npc/023-1/mapflags.txt diff --git a/world/map/npc/023-1/mapflags.txt b/world/map/npc/023-1/mapflags.txt new file mode 100644 index 00000000..0db48b57 --- /dev/null +++ b/world/map/npc/023-1/mapflags.txt @@ -0,0 +1 @@ +023-1.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/023-2/_import.txt b/world/map/npc/023-2/_import.txt index c9571ad9..ceb63a25 100644 --- a/world/map/npc/023-2/_import.txt +++ b/world/map/npc/023-2/_import.txt @@ -3,3 +3,4 @@ map: 023-2.gat npc: npc/023-2/_mobs.txt npc: npc/023-2/_warps.txt +npc: npc/023-2/mapflags.txt diff --git a/world/map/npc/023-2/mapflags.txt b/world/map/npc/023-2/mapflags.txt new file mode 100644 index 00000000..84596948 --- /dev/null +++ b/world/map/npc/023-2/mapflags.txt @@ -0,0 +1 @@ +023-2.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/023-3/_import.txt b/world/map/npc/023-3/_import.txt index 9e295b77..b9b116f0 100644 --- a/world/map/npc/023-3/_import.txt +++ b/world/map/npc/023-3/_import.txt @@ -3,3 +3,4 @@ map: 023-3.gat npc: npc/023-3/_mobs.txt npc: npc/023-3/_warps.txt +npc: npc/023-3/mapflags.txt diff --git a/world/map/npc/023-3/mapflags.txt b/world/map/npc/023-3/mapflags.txt new file mode 100644 index 00000000..8d7ca6b9 --- /dev/null +++ b/world/map/npc/023-3/mapflags.txt @@ -0,0 +1 @@ +023-3.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/026-1/mapflags.txt b/world/map/npc/026-1/mapflags.txt index 695e576c..9f5b3a8f 100644 --- a/world/map/npc/026-1/mapflags.txt +++ b/world/map/npc/026-1/mapflags.txt @@ -1 +1 @@ -027-1.gat|mapflag|resave|025-1,33,50 +026-1.gat|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/031-3/mapflags.txt b/world/map/npc/031-3/mapflags.txt index 5b7ea1ea..758e2feb 100644 --- a/world/map/npc/031-3/mapflags.txt +++ b/world/map/npc/031-3/mapflags.txt @@ -1 +1 @@ -031-1.gat|mapflag|resave|020-1,52,118 +031-3.gat|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/044-3/mapflags.txt b/world/map/npc/044-3/mapflags.txt index 5f02a6ad..16c93b94 100644 --- a/world/map/npc/044-3/mapflags.txt +++ b/world/map/npc/044-3/mapflags.txt @@ -1 +1 @@ -044-1.gat|mapflag|resave|044-1,145,20 +044-3.gat|mapflag|resave|044-1,145,20 diff --git a/world/map/npc/056-2/mapflags.txt b/world/map/npc/056-2/mapflags.txt index 43c466a2..6c4c9171 100644 --- a/world/map/npc/056-2/mapflags.txt +++ b/world/map/npc/056-2/mapflags.txt @@ -1 +1,2 @@ 056-2.gat|mapflag|nosave|056-1,56,62 +056-2.gat|mapflag|resave|056-1,56,62 diff --git a/world/map/npc/068-1/_import.txt b/world/map/npc/068-1/_import.txt index 5f518fae..f4e777a7 100644 --- a/world/map/npc/068-1/_import.txt +++ b/world/map/npc/068-1/_import.txt @@ -3,6 +3,7 @@ map: 068-1.gat npc: npc/068-1/_mobs.txt npc: npc/068-1/_warps.txt +npc: npc/068-1/mapflags.txt npc: npc/068-1/stat_reset.txt npc: npc/068-1/tombstones.txt npc: npc/068-1/vendors.txt diff --git a/world/map/npc/068-1/mapflags.txt b/world/map/npc/068-1/mapflags.txt new file mode 100644 index 00000000..15694f25 --- /dev/null +++ b/world/map/npc/068-1/mapflags.txt @@ -0,0 +1,2 @@ +068-1.gat|mapflag|town +068-1.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/068-2/_import.txt b/world/map/npc/068-2/_import.txt index d9ee2cc9..38ad884b 100644 --- a/world/map/npc/068-2/_import.txt +++ b/world/map/npc/068-2/_import.txt @@ -7,3 +7,4 @@ npc: npc/068-2/bank.txt npc: npc/068-2/hetchel.txt npc: npc/068-2/inya.txt npc: npc/068-2/latoy.txt +npc: npc/068-2/mapflags.txt diff --git a/world/map/npc/068-2/mapflags.txt b/world/map/npc/068-2/mapflags.txt new file mode 100644 index 00000000..4968bf61 --- /dev/null +++ b/world/map/npc/068-2/mapflags.txt @@ -0,0 +1,2 @@ +068-2.gat|mapflag|town +068-2.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/068-3/_import.txt b/world/map/npc/068-3/_import.txt deleted file mode 100644 index 649dd453..00000000 --- a/world/map/npc/068-3/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 068-3: North Tulimshar -// This file is generated automatically. All manually changes will be removed when running the Converter. -map: 068-3.gat -npc: npc/068-3/_mobs.txt -npc: npc/068-3/_warps.txt diff --git a/world/map/npc/068-3/_mobs.txt b/world/map/npc/068-3/_mobs.txt deleted file mode 100644 index af826257..00000000 --- a/world/map/npc/068-3/_mobs.txt +++ /dev/null @@ -1,61 +0,0 @@ -// This file is generated automatically. All manually changes will be removed when running the Converter. -// North Tulimshar mobs - -068-3.gat,82,114,7,12|monster|Mouboo|1028,20,12000,10,Mob068-3::On1028 -068-3.gat,82,94,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002 -068-3.gat,135,108,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002 -068-3.gat,28,119,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002 -068-3.gat,29,39,1,4|monster|SeaSlime|1033,8,100000,30000,Mob068-3::On1033 -068-3.gat,33,70,1,4|monster|SeaSlime|1033,8,100000,30000,Mob068-3::On1033 -068-3.gat,60,49,8,6|monster|Scorpion|1003,4,100000,30000,Mob068-3::On1003 -068-3.gat,86,63,24,18|monster|FireGoblin|1011,6,100000,30000,Mob068-3::On1011 -068-3.gat,114,70,8,6|monster|Scorpion|1003,4,100000,30000,Mob068-3::On1003 -068-3.gat,78,28,8,6|monster|BlackScorpion|1009,1,100000,30000,Mob068-3::On1009 -068-3.gat,95,35,15,10|monster|Snake|1010,3,100000,30000,Mob068-3::On1010 -068-3.gat,137,50,15,18|monster|GreenSlime|1005,3,100000,30000,Mob068-3::On1005 -068-3.gat,87,142,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002 - - -068-3.gat,0,0,0|script|Mob068-3|-1,{ -On1002: - set @mobID, 1002; - callfunc "MobPoints"; - end; - -On1003: - set @mobID, 1003; - callfunc "MobPoints"; - end; - -On1005: - set @mobID, 1005; - callfunc "MobPoints"; - end; - -On1009: - set @mobID, 1009; - callfunc "MobPoints"; - end; - -On1010: - set @mobID, 1010; - callfunc "MobPoints"; - end; - -On1011: - set @mobID, 1011; - callfunc "MobPoints"; - end; - -On1028: - set @mobID, 1028; - callfunc "MobPoints"; - end; - -On1033: - set @mobID, 1033; - callfunc "MobPoints"; - end; - - end; -} diff --git a/world/map/npc/068-3/_warps.txt b/world/map/npc/068-3/_warps.txt deleted file mode 100644 index b02e2f27..00000000 --- a/world/map/npc/068-3/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually changes will be removed when running the Converter. -// North Tulimshar warps - -068-3.gat,34,149|warp|to Tulmishar|3,-1,021-1.gat,144,24 diff --git a/world/map/npc/069-1/_import.txt b/world/map/npc/069-1/_import.txt index ab877bf9..a5cb1023 100644 --- a/world/map/npc/069-1/_import.txt +++ b/world/map/npc/069-1/_import.txt @@ -3,3 +3,4 @@ map: 069-1.gat npc: npc/069-1/_mobs.txt npc: npc/069-1/_warps.txt +npc: npc/069-1/mapflags.txt diff --git a/world/map/npc/069-1/mapflags.txt b/world/map/npc/069-1/mapflags.txt new file mode 100644 index 00000000..4fcb8b81 --- /dev/null +++ b/world/map/npc/069-1/mapflags.txt @@ -0,0 +1,2 @@ +069-1.gat|mapflag|town +069-1.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/069-2/_import.txt b/world/map/npc/069-2/_import.txt index 33239ec5..250938b3 100644 --- a/world/map/npc/069-2/_import.txt +++ b/world/map/npc/069-2/_import.txt @@ -3,4 +3,5 @@ map: 069-2.gat npc: npc/069-2/_mobs.txt npc: npc/069-2/_warps.txt +npc: npc/069-2/mapflags.txt npc: npc/069-2/wizards.txt diff --git a/world/map/npc/069-2/mapflags.txt b/world/map/npc/069-2/mapflags.txt new file mode 100644 index 00000000..7c8e2695 --- /dev/null +++ b/world/map/npc/069-2/mapflags.txt @@ -0,0 +1,2 @@ +069-2.gat|mapflag|town +069-2.gat|mapflag|resave|001-1,57,71 diff --git a/world/map/npc/069-3/_import.txt b/world/map/npc/069-3/_import.txt deleted file mode 100644 index edbd2da9..00000000 --- a/world/map/npc/069-3/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 069-3: North Tulimshar -// This file is generated automatically. All manually changes will be removed when running the Converter. -map: 069-3.gat -npc: npc/069-3/_mobs.txt -npc: npc/069-3/_warps.txt diff --git a/world/map/npc/069-3/_mobs.txt b/world/map/npc/069-3/_mobs.txt deleted file mode 100644 index 1933ac83..00000000 --- a/world/map/npc/069-3/_mobs.txt +++ /dev/null @@ -1,61 +0,0 @@ -// This file is generated automatically. All manually changes will be removed when running the Converter. -// North Tulimshar mobs - -069-3.gat,82,114,7,12|monster|Mouboo|1028,20,12000,10,Mob069-3::On1028 -069-3.gat,82,94,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002 -069-3.gat,135,108,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002 -069-3.gat,28,119,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002 -069-3.gat,29,39,1,4|monster|SeaSlime|1033,8,100000,30000,Mob069-3::On1033 -069-3.gat,33,70,1,4|monster|SeaSlime|1033,8,100000,30000,Mob069-3::On1033 -069-3.gat,60,49,8,6|monster|Scorpion|1003,4,100000,30000,Mob069-3::On1003 -069-3.gat,86,63,24,18|monster|FireGoblin|1011,6,100000,30000,Mob069-3::On1011 -069-3.gat,114,70,8,6|monster|Scorpion|1003,4,100000,30000,Mob069-3::On1003 -069-3.gat,78,28,8,6|monster|BlackScorpion|1009,1,100000,30000,Mob069-3::On1009 -069-3.gat,95,35,15,10|monster|Snake|1010,3,100000,30000,Mob069-3::On1010 -069-3.gat,137,50,15,18|monster|GreenSlime|1005,3,100000,30000,Mob069-3::On1005 -069-3.gat,87,142,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002 - - -069-3.gat,0,0,0|script|Mob069-3|-1,{ -On1002: - set @mobID, 1002; - callfunc "MobPoints"; - end; - -On1003: - set @mobID, 1003; - callfunc "MobPoints"; - end; - -On1005: - set @mobID, 1005; - callfunc "MobPoints"; - end; - -On1009: - set @mobID, 1009; - callfunc "MobPoints"; - end; - -On1010: - set @mobID, 1010; - callfunc "MobPoints"; - end; - -On1011: - set @mobID, 1011; - callfunc "MobPoints"; - end; - -On1028: - set @mobID, 1028; - callfunc "MobPoints"; - end; - -On1033: - set @mobID, 1033; - callfunc "MobPoints"; - end; - - end; -} diff --git a/world/map/npc/069-3/_warps.txt b/world/map/npc/069-3/_warps.txt deleted file mode 100644 index ed6f7c09..00000000 --- a/world/map/npc/069-3/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually changes will be removed when running the Converter. -// North Tulimshar warps - -069-3.gat,34,149|warp|to Tulmishar|3,-1,021-1.gat,144,24 diff --git a/world/map/npc/botcheck/_import.txt b/world/map/npc/botcheck/_import.txt index 3702ba87..affc86ce 100644 --- a/world/map/npc/botcheck/_import.txt +++ b/world/map/npc/botcheck/_import.txt @@ -4,3 +4,4 @@ map: botcheck.gat npc: npc/botcheck/_mobs.txt npc: npc/botcheck/_warps.txt npc: npc/botcheck/announcements.txt +npc: npc/botcheck/mapflags.txt diff --git a/world/map/npc/botcheck/mapflags.txt b/world/map/npc/botcheck/mapflags.txt new file mode 100644 index 00000000..b4dbac8a --- /dev/null +++ b/world/map/npc/botcheck/mapflags.txt @@ -0,0 +1 @@ +botcheck.gat|mapflag|resave|botcheck.gat,37,37 -- cgit v1.2.3-70-g09d2