summaryrefslogtreecommitdiff
path: root/world/map/npc/027-7
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/027-7')
-rw-r--r--world/map/npc/027-7/_import.txt4
-rw-r--r--world/map/npc/027-7/_mobs.txt4
-rw-r--r--world/map/npc/027-7/_warps.txt2
-rw-r--r--world/map/npc/027-7/general_razha.txt46
-rw-r--r--world/map/npc/027-7/general_razha_exitdoor.txt4
-rw-r--r--world/map/npc/027-7/mapflags.txt4
6 files changed, 32 insertions, 32 deletions
diff --git a/world/map/npc/027-7/_import.txt b/world/map/npc/027-7/_import.txt
index 6e3d2cae..8990d426 100644
--- a/world/map/npc/027-7/_import.txt
+++ b/world/map/npc/027-7/_import.txt
@@ -1,6 +1,6 @@
// Map 027-7: Crypt Sub-Basement Two
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-7.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-7
npc: npc/027-7/_mobs.txt
npc: npc/027-7/_warps.txt
npc: npc/027-7/general_razha.txt
diff --git a/world/map/npc/027-7/_mobs.txt b/world/map/npc/027-7/_mobs.txt
index da029343..482bf900 100644
--- a/world/map/npc/027-7/_mobs.txt
+++ b/world/map/npc/027-7/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two mobs
-027-7.gat,0,0,0|script|Mob027-7|-1
+027-7,0,0,0|script|Mob027-7|-1
{
end;
}
diff --git a/world/map/npc/027-7/_warps.txt b/world/map/npc/027-7/_warps.txt
index 5b56046c..fc9e6717 100644
--- a/world/map/npc/027-7/_warps.txt
+++ b/world/map/npc/027-7/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two warps
diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt
index 755aa610..9a99e8b8 100644
--- a/world/map/npc/027-7/general_razha.txt
+++ b/world/map/npc/027-7/general_razha.txt
@@ -2,7 +2,7 @@
// Based off Cindy Fight
// General Razha Fight
-027-7.gat,39,25,0|script|General Razha|400
+027-7,39,25,0|script|General Razha|400
{
if ($@CRYPT_FIGHT2 != 0)
end;
@@ -57,9 +57,9 @@ L_Ritual:
set $@CRYPT_FIGHT2, 1;
set $@CRYPT_FIGHT2_WAVE, 0;
set $@CRYPT_FIGHT2_SUMMONS_COUNT, 2;
- set $@CRYPT_FIGHT2_PLAYER_COUNT, getmapusers("027-7.gat");
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, 1, "General Razha::OnPetDeath";
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, 1, "General Razha::OnPetDeath";
+ set $@CRYPT_FIGHT2_PLAYER_COUNT, getmapusers("027-7");
+ areamonster "027-7", 0, 0, 79, 84, "", 1036, 1, "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1124, 1, "General Razha::OnPetDeath";
initnpctimer;
goto L_Announce;
@@ -86,7 +86,7 @@ OnTimer5000:
L_Return_1:
set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
- areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnTick";
+ areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnTick";
end;
L_CryptLogic:
@@ -96,7 +96,7 @@ L_CryptLogic:
if ($@CRYPT_FIGHT2_PLAYER_COUNT <= 0)
goto L_CleanUpLosers;
set $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
- if (mobcount("027-7.gat", "General Razha::OnPetDeath") < 0)
+ if (mobcount("027-7", "General Razha::OnPetDeath") < 0)
goto L_NextWave;
if ($@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT2_ROUND_PEN >= 120)
goto L_NextWave;
@@ -121,31 +121,31 @@ L_NextWave:
L_SummonNuke:
set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4;
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath";
goto L_Announce;
L_WeakSummons:
set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
goto L_Announce;
L_StrongSummons:
set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
goto L_Announce;
L_BossSummons:
set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
- areamonster "027-7.gat", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+ areamonster "027-7", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath";
set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + 1;
goto L_Announce;
@@ -153,8 +153,8 @@ L_Announce:
set $@msg$, $@CRYPT_FIGHT2_MESSAGES$[$@CRYPT_FIGHT2_WAVE];
if ($@msg$ == "")
goto L_Return_1;
- mapannounce "027-7.gat", $@msg$, 0;
- mapannounce "027-4.gat", $@msg$, 0;
+ mapannounce "027-7", $@msg$, 0;
+ mapannounce "027-4", $@msg$, 0;
set $@msg$, "";
goto L_Return_1;
@@ -169,8 +169,8 @@ OnPetDeath:
end;
L_CleanUpLosers:
- mapannounce "027-7.gat", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0;
- mapannounce "027-4.gat", "The battle is lost.", 0;
+ mapannounce "027-7", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0;
+ mapannounce "027-4", "The battle is lost.", 0;
set $@CRYPT_FIGHT2, 0;
set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
set $@CRYPT_FIGHT2_WAVE, 0;
@@ -178,15 +178,15 @@ L_CleanUpLosers:
set $@CRYPT_FIGHT2_SUMMONS_COUNT, 0;
set $@CRYPT_FIGHT2_ROUND_PEN, 0;
set $@CRYPT_FIGHT2_SUMMONS_NUMBER, 0;
- killmonster "027-7.gat", "General Razha::OnPetDeath";
+ killmonster "027-7", "General Razha::OnPetDeath";
stopnpctimer;
setnpctimer 0;
end;
L_CleanUp:
- mapannounce "027-7.gat", "General Razha:* How in all hells could that happen? I am lost forever.", 0;
- mapannounce "027-4.gat", "General Razha is defeated.", 0;
- areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnReward";
+ mapannounce "027-7", "General Razha:* How in all hells could that happen? I am lost forever.", 0;
+ mapannounce "027-4", "General Razha is defeated.", 0;
+ areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnReward";
set $@CRYPT_FIGHT2, 0;
set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
set $@CRYPT_FIGHT2_WAVE, 0;
@@ -194,7 +194,7 @@ L_CleanUp:
set $@CRYPT_FIGHT2_SUMMONS_COUNT, 0;
set $@CRYPT_FIGHT2_ROUND_PEN, 0;
set $@CRYPT_FIGHT2_SUMMONS_NUMBER, 0;
- killmonster "027-7.gat", "General Razha::OnPetDeath";
+ killmonster "027-7", "General Razha::OnPetDeath";
stopnpctimer;
setnpctimer 0;
end;
diff --git a/world/map/npc/027-7/general_razha_exitdoor.txt b/world/map/npc/027-7/general_razha_exitdoor.txt
index 97468895..5389a74b 100644
--- a/world/map/npc/027-7/general_razha_exitdoor.txt
+++ b/world/map/npc/027-7/general_razha_exitdoor.txt
@@ -1,11 +1,11 @@
// Mini-Boss
// General Razha
-027-7.gat,36,61,0|script|#GeneralExit2|35,6,0
+027-7,36,61,0|script|#GeneralExit2|35,6,0
{
if ($@CRYPT_FIGHT2 != 0)
goto L_Block;
- warp "027-4.gat",73,77;
+ warp "027-4",73,77;
end;
L_Block:
diff --git a/world/map/npc/027-7/mapflags.txt b/world/map/npc/027-7/mapflags.txt
index 012a5cf5..d592dbdc 100644
--- a/world/map/npc/027-7/mapflags.txt
+++ b/world/map/npc/027-7/mapflags.txt
@@ -1,2 +1,2 @@
-027-7.gat|mapflag|nosave|027-4,73,78
-027-7.gat|mapflag|resave|027-4,73,78
+027-7|mapflag|nosave|027-4,73,78
+027-7|mapflag|resave|027-4,73,78