summaryrefslogtreecommitdiff
path: root/world/map/npc/042-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/042-2')
-rw-r--r--world/map/npc/042-2/_mobs.txt4
-rw-r--r--world/map/npc/042-2/barrels_config.txt12
2 files changed, 8 insertions, 8 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_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)