diff options
Diffstat (limited to 'world/map/npc/042-2')
| -rw-r--r-- | world/map/npc/042-2/_mobs.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/042-2/barrels.txt | 16 | ||||
| -rw-r--r-- | world/map/npc/042-2/barrels_config.txt | 12 | ||||
| -rw-r--r-- | world/map/npc/042-2/magic_basement.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/042-2/morgan.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/042-2/sorfina.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/042-2/stat_reset.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/042-2/tanisha.txt | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/world/map/npc/042-2/_mobs.txt b/world/map/npc/042-2/_mobs.txt index 60ac26d6..31c54238 100644 --- a/world/map/npc/042-2/_mobs.txt +++ b/world/map/npc/042-2/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Tulimshar Suburbs Indoor mobs -042-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000,30000,Mob042-2::On1050 +042-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob042-2::On1050 -042-2.gat,0,0,0|script|Mob042-2|-1, +042-2.gat,0,0,0|script|Mob042-2|-1 { end; diff --git a/world/map/npc/042-2/barrels.txt b/world/map/npc/042-2/barrels.txt index 8e5b6c49..60a0e163 100644 --- a/world/map/npc/042-2/barrels.txt +++ b/world/map/npc/042-2/barrels.txt @@ -1,6 +1,6 @@ // Barrels // Author: Wushin -042-2.gat,23,86,0|script|Barrel#0|400, +042-2.gat,23,86,0|script|Barrel#0|400 { setarray @npc_loc, 23, 86, 2; set @barrel, 0; @@ -12,49 +12,49 @@ OnMaggotDeath: callfunc "MobPoints"; end; } -042-2.gat,28,86,0|script|Barrel#1|400, +042-2.gat,28,86,0|script|Barrel#1|400 { setarray @npc_loc, 28, 86, 2; set @barrel, 1; callfunc "CheckBarrel"; end; } -042-2.gat,31,91,0|script|Barrel#2|400, +042-2.gat,31,91,0|script|Barrel#2|400 { setarray @npc_loc, 31, 91, 2; set @barrel, 2; callfunc "CheckBarrel"; end; } -042-2.gat,36,85,0|script|Barrel#3|400, +042-2.gat,36,85,0|script|Barrel#3|400 { setarray @npc_loc, 36, 85, 2; set @barrel, 3; callfunc "CheckBarrel"; end; } -042-2.gat,40,89,0|script|Barrel#4|400, +042-2.gat,40,89,0|script|Barrel#4|400 { setarray @npc_loc, 40, 89, 2; set @barrel, 4; callfunc "CheckBarrel"; end; } -042-2.gat,38,91,0|script|Barrel#5|400, +042-2.gat,38,91,0|script|Barrel#5|400 { setarray @npc_loc, 38, 91, 2; set @barrel, 5; callfunc "CheckBarrel"; end; } -042-2.gat,29,92,0|script|Barrel#6|400, +042-2.gat,29,92,0|script|Barrel#6|400 { setarray @npc_loc, 29, 92, 2; set @barrel, 6; callfunc "CheckBarrel"; end; } -042-2.gat,24,91,0|script|Barrel#7|400, +042-2.gat,24,91,0|script|Barrel#7|400 { setarray @npc_loc, 24, 91, 2; set @barrel, 7; diff --git a/world/map/npc/042-2/barrels_config.txt b/world/map/npc/042-2/barrels_config.txt index 0b45af21..d125d9e1 100644 --- a/world/map/npc/042-2/barrels_config.txt +++ b/world/map/npc/042-2/barrels_config.txt @@ -1,7 +1,7 @@ // Barrels // Author: Wushin -042-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000,30000,Barrel#0::OnMaggotDeath --|script|#BarrelConfig|-1, +042-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath +-|script|#BarrelConfig|-1 { end; @@ -14,19 +14,19 @@ OnInit: set $@BarrelMax, getarraysize($@BarrelBits); end; } -function|script|SetBarrelMask|, +function|script|SetBarrelMask { set STARTAREA, (STARTAREA & ~(NIBBLE_4_MASK) | (@barrel_tmp << NIBBLE_4_SHIFT)); set @barrel_tmp, 0; return; } -function|script|CheckBarrelQuest|, +function|script|CheckBarrelQuest { callfunc "CountBarrels"; set @barrel_quest, ((STARTAREA & NIBBLE_4_MASK) >> NIBBLE_4_SHIFT); return; } -function|script|CountBarrels|, +function|script|CountBarrels { set @barrel_count, 0; set @count_tmp, 0; @@ -50,7 +50,7 @@ L_LoopAgain: L_BarrelTally: return; } -function|script|CheckBarrel|, +function|script|CheckBarrel { callfunc "PCtoNPCRange"; if (@npc_check) diff --git a/world/map/npc/042-2/magic_basement.txt b/world/map/npc/042-2/magic_basement.txt index 2f278a5a..0817375d 100644 --- a/world/map/npc/042-2/magic_basement.txt +++ b/world/map/npc/042-2/magic_basement.txt @@ -1,7 +1,7 @@ // // Author: Wushin -042-2.gat,103,56,0|script|#MagicBasement|400,0,0, +042-2.gat,103,56,0|script|#MagicBasement|400,0,0 { callfunc "MorganState"; if (@morgan < 4) diff --git a/world/map/npc/042-2/morgan.txt b/world/map/npc/042-2/morgan.txt index 20cc34c1..ed6367ff 100644 --- a/world/map/npc/042-2/morgan.txt +++ b/world/map/npc/042-2/morgan.txt @@ -3,19 +3,19 @@ // Gains Access to Magic School // See 024-2 clean that shit up // Morgan, liana -function|script|MorganState|, +function|script|MorganState { callfunc "ClearVariables"; set @morgan, ((STARTAREA & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); return; } -function|script|SetMorganMask|, +function|script|SetMorganMask { set STARTAREA, (STARTAREA & ~(NIBBLE_3_MASK) | (@morgan_tmp << NIBBLE_3_SHIFT)); set @morgan_tmp, 0; return; } -042-2,105,57,0|script|MorganDebug|355, +042-2,105,57,0|script|MorganDebug|355 { mes "[Morgan Debug]"; mes "Reset?"; @@ -35,7 +35,7 @@ OnInit: disablenpc "MorganDebug"; end; } -042-2,101,57,0|script|Morgan|355, +042-2,101,57,0|script|Morgan|355 { setarray @npc_loc, 101, 57, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt index 22216327..92e27f9a 100644 --- a/world/map/npc/042-2/sorfina.txt +++ b/world/map/npc/042-2/sorfina.txt @@ -300,7 +300,7 @@ OnTouch: close; } -042-2.gat,29,23,0|script|Chest#tutorial|111, +042-2.gat,29,23,0|script|Chest#tutorial|111 { callfunc "TutorialState"; if (@tutorial > 2) goto L_Empty; diff --git a/world/map/npc/042-2/stat_reset.txt b/world/map/npc/042-2/stat_reset.txt index a6b61378..43a13f5d 100644 --- a/world/map/npc/042-2/stat_reset.txt +++ b/world/map/npc/042-2/stat_reset.txt @@ -1,6 +1,6 @@ // -042-2.gat,98,91,0|script|Jessie|159, +042-2.gat,98,91,0|script|Jessie|159 { setarray @npc_loc, 98, 91, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index 77e95ab7..aad93769 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -2,7 +2,7 @@ // Authors: Jenalya, alastrim // Cleanup: o11c -042-2.gat,110,88,0|script|Tanisha|114, +042-2.gat,110,88,0|script|Tanisha|114 { setarray @npc_loc, 110, 88, 4; callfunc "PCtoNPCRange"; |