summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/011-1/oscar.txt4
-rw-r--r--npc/012-1/flowerpentagram2.txt3
-rw-r--r--npc/013-1/flowerpentagram.txt3
-rw-r--r--npc/017-1/flowerpentagram1.txt3
-rw-r--r--npc/017-1/flowerpentagram5.txt3
-rw-r--r--npc/018-1/flowerpentagram3.txt3
-rw-r--r--npc/027-6/general_krukan.txt2
-rw-r--r--npc/027-7/general_razha.txt2
-rw-r--r--npc/027-8/general_terogan.txt2
-rw-r--r--npc/030-4/mana_battery.txt4
-rw-r--r--npc/048-2/slimes.txt28
-rw-r--r--npc/051-3/reinforcements.txt2
-rw-r--r--npc/052-2/lobby.txt6
-rw-r--r--npc/052-2/storage.txt2
-rw-r--r--npc/055-1/flowerpentagram4.txt3
-rw-r--r--npc/annuals/xmas/mobmanager.txt2
16 files changed, 33 insertions, 39 deletions
diff --git a/npc/011-1/oscar.txt b/npc/011-1/oscar.txt
index 133ebcaf..7e5f9481 100644
--- a/npc/011-1/oscar.txt
+++ b/npc/011-1/oscar.txt
@@ -306,8 +306,8 @@ L_TimerFunction:
end;
callsub S_CheckPlayer;
$@HalloweenQuest_PumpkinsTimer = $@HalloweenQuest_PumpkinsTimer + 1;
- if (mobcount("011-1", "Oscar::OnPD") < 0 &&
- mobcount("011-1", "Oscar::OnPDP") < 0 &&
+ if (mobcount("011-1", "Oscar::OnPD") <= 0 &&
+ mobcount("011-1", "Oscar::OnPDP") <= 0 &&
$@HalloweenQuest_PumpkinsCount <= 0)
goto L_AllPumpkinsDead;
// A quick "cheer up"
diff --git a/npc/012-1/flowerpentagram2.txt b/npc/012-1/flowerpentagram2.txt
index f10524d3..b7f6f99b 100644
--- a/npc/012-1/flowerpentagram2.txt
+++ b/npc/012-1/flowerpentagram2.txt
@@ -26,8 +26,7 @@ L_Place:
mobcount("012-1", "#FlowerPentagram2::OnSquirrelDeath") +
mobcount("012-1", "#FlowerPentagram2::OnMushroomDeath") +
mobcount("012-1", "#FlowerPentagram2::OnScorpionDeath") +
- mobcount("012-1", "#FlowerPentagram2::OnRScorpionDeath") +
- 4; // the mobcount function has an offset of -1, so we add 4 to have the actual amount of monsters
+ mobcount("012-1", "#FlowerPentagram2::OnRScorpionDeath");
if (@localMonsterCount > 2)
goto L_MonstersAlive;
diff --git a/npc/013-1/flowerpentagram.txt b/npc/013-1/flowerpentagram.txt
index 1df7bd77..1a2e8f85 100644
--- a/npc/013-1/flowerpentagram.txt
+++ b/npc/013-1/flowerpentagram.txt
@@ -88,7 +88,6 @@ function script FlowerPentagramCount {
mobcount("013-1", "#FlowerPentagram::OnScorpionDeath") +
mobcount("013-1", "#FlowerPentagram::OnRScorpionDeath") +
mobcount("013-1", "#FlowerPentagram::OnAScorpionDeath") +
- mobcount("013-1", "#FlowerPentagram::OnBScorpionDeath") +
- 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters
+ mobcount("013-1", "#FlowerPentagram::OnBScorpionDeath");
return;
}
diff --git a/npc/017-1/flowerpentagram1.txt b/npc/017-1/flowerpentagram1.txt
index 8d2d7118..c16c20c1 100644
--- a/npc/017-1/flowerpentagram1.txt
+++ b/npc/017-1/flowerpentagram1.txt
@@ -24,8 +24,7 @@ L_Next:
L_Place:
set @localMonsterCount,
mobcount("017-1", "#FlowerPentagram1::OnSquirrelDeath") +
- mobcount("017-1", "#FlowerPentagram1::OnScorpionDeath") +
- 2; // the mobcount function has an offset of -1, so we add 2 to have the actual amount of monsters
+ mobcount("017-1", "#FlowerPentagram1::OnScorpionDeath");
if (@localMonsterCount > 2)
goto L_MonstersAlive;
diff --git a/npc/017-1/flowerpentagram5.txt b/npc/017-1/flowerpentagram5.txt
index c9f6d5af..22395d06 100644
--- a/npc/017-1/flowerpentagram5.txt
+++ b/npc/017-1/flowerpentagram5.txt
@@ -29,8 +29,7 @@ L_Place:
mobcount("013-1", "#FlowerPentagram5::OnScorpionDeath") +
mobcount("013-1", "#FlowerPentagram5::OnRScorpionDeath") +
mobcount("013-1", "#FlowerPentagram5::OnAScorpionDeath") +
- mobcount("013-1", "#FlowerPentagram5::OnBScorpionDeath") +
- 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters
+ mobcount("013-1", "#FlowerPentagram5::OnBScorpionDeath");
if (@localMonsterCount > 4)
goto L_MonstersAlive;
diff --git a/npc/018-1/flowerpentagram3.txt b/npc/018-1/flowerpentagram3.txt
index a24dd0cb..4e5232b4 100644
--- a/npc/018-1/flowerpentagram3.txt
+++ b/npc/018-1/flowerpentagram3.txt
@@ -28,8 +28,7 @@ L_Place:
mobcount("018-1", "#FlowerPentagram3::OnBlueparDeath") +
mobcount("018-1", "#FlowerPentagram3::OnScorpionDeath") +
mobcount("018-1", "#FlowerPentagram3::OnRScorpionDeath") +
- mobcount("018-1", "#FlowerPentagram3::OnAScorpionDeath") +
- 6; // the mobcount function has an offset of -1, so we add 6 to have the actual amount of monsters
+ mobcount("018-1", "#FlowerPentagram3::OnAScorpionDeath");
if (@localMonsterCount > 4)
goto L_MonstersAlive;
diff --git a/npc/027-6/general_krukan.txt b/npc/027-6/general_krukan.txt
index c901dfd0..1116ea67 100644
--- a/npc/027-6/general_krukan.txt
+++ b/npc/027-6/general_krukan.txt
@@ -91,7 +91,7 @@ L_CryptLogic:
if ($@CRYPT_FIGHT1_PLAYER_COUNT <= 0)
goto L_CleanUpLosers;
set $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
- if (mobcount("027-6", "General Krukan::OnPetDeath") < 0)
+ if (mobcount("027-6", "General Krukan::OnPetDeath") <= 0)
goto L_NextWave;
if ($@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT1_ROUND_PEN >= 120)
goto L_NextWave;
diff --git a/npc/027-7/general_razha.txt b/npc/027-7/general_razha.txt
index 79259cc7..5eb32bc2 100644
--- a/npc/027-7/general_razha.txt
+++ b/npc/027-7/general_razha.txt
@@ -91,7 +91,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", "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;
diff --git a/npc/027-8/general_terogan.txt b/npc/027-8/general_terogan.txt
index 451daeca..1038e4fe 100644
--- a/npc/027-8/general_terogan.txt
+++ b/npc/027-8/general_terogan.txt
@@ -147,7 +147,7 @@ L_CryptLogic:
if (getareausers("027-8", 20, 39, 35, 60, 1) < 1) goto L_Failure;
if (getareausers("027-8", 43, 39, 58, 60, 1) < 1) goto L_Failure;
set $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
- if (mobcount("027-8", "General Terogan#Main::OnPetDeath") < 0)
+ if (mobcount("027-8", "General Terogan#Main::OnPetDeath") <= 0)
goto L_NextWave;
if ($@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT3_ROUND_PEN >= 120)
goto L_NextWave;
diff --git a/npc/030-4/mana_battery.txt b/npc/030-4/mana_battery.txt
index 8fd59ab1..5126099d 100644
--- a/npc/030-4/mana_battery.txt
+++ b/npc/030-4/mana_battery.txt
@@ -184,7 +184,7 @@ L_CaveLogic:
if ($@XmasBossPlayerCount < 1)
goto L_AllDead;
set $@BombTimer, $@BombTimer + 5; // Advance 5 seconds
- if ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0)
+ if (mobcount("030-4", "AniManOMat::OnGuardDeath") == 0)
goto L_NextWave;
if ($@BombTimer >= 120)
goto L_NextWave;
@@ -194,7 +194,7 @@ L_NextWave:
$@BombTimer = 0;
$@DangerCellNumber = rand(8);
$@XmasBossRound = $@XmasBossRound + 1;
- if (($@XmasBossRound > 10) && ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0))
+ if (($@XmasBossRound > 10) && mobcount("030-4", "AniManOMat::OnGuardDeath") == 0)
goto L_Finished;
// Break/LastChance(s)
if (($@XmasBossRound > 10) && ($@XmasBossRound <= 16))
diff --git a/npc/048-2/slimes.txt b/npc/048-2/slimes.txt
index c3d4e5c8..f9733871 100644
--- a/npc/048-2/slimes.txt
+++ b/npc/048-2/slimes.txt
@@ -4,7 +4,7 @@
048-2,181,95,0 script #Slime0Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime0::OnSlimeDeath") <= 0)
$@BlueSageSlime0_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -46,7 +46,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime0_Spawn = $@BlueSageSlime0_Spawn - 1;
- if (mobcount("048-2", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime0::OnSlimeDeath") <= 0)
$@BlueSageSlime0_Spawn = 0;
if ($@Slime0VictimID == getcharid(3))
@@ -90,7 +90,7 @@ L_ClearedPoint:
048-2,164,123,0 script #Slime1Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime1::OnSlimeDeath") <= 0)
$@BlueSageSlime1_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -132,7 +132,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime1_Spawn = $@BlueSageSlime1_Spawn - 1;
- if (mobcount("048-2", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime1::OnSlimeDeath") <= 0)
$@BlueSageSlime1_Spawn = 0;
if ($@Slime1VictimID == getcharid(3))
@@ -176,7 +176,7 @@ L_ClearedPoint:
048-2,198,115,0 script #Slime2Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime2::OnSlimeDeath") <= 0)
$@BlueSageSlime2_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -218,7 +218,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime2_Spawn = $@BlueSageSlime2_Spawn - 1;
- if (mobcount("048-2", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime2::OnSlimeDeath") <= 0)
$@BlueSageSlime2_Spawn = 0;
if ($@Slime2VictimID == getcharid(3))
@@ -262,7 +262,7 @@ L_ClearedPoint:
048-2,167,79,0 script #Slime3Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime3::OnSlimeDeath") <= 0)
$@BlueSageSlime3_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -304,7 +304,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime3_Spawn = $@BlueSageSlime3_Spawn - 1;
- if (mobcount("048-2", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime3::OnSlimeDeath") <= 0)
$@BlueSageSlime3_Spawn = 0;
if ($@Slime3VictimID == getcharid(3))
@@ -348,7 +348,7 @@ L_ClearedPoint:
048-2,192,86,0 script #Slime4Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime4::OnSlimeDeath") <= 0)
$@BlueSageSlime4_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -390,7 +390,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime4_Spawn = $@BlueSageSlime4_Spawn - 1;
- if (mobcount("048-2", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime4::OnSlimeDeath") <= 0)
$@BlueSageSlime4_Spawn = 0;
if ($@Slime4VictimID == getcharid(3))
@@ -434,7 +434,7 @@ L_ClearedPoint:
048-2,183,110,0 script #Slime5Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime5::OnSlimeDeath") <= 0)
$@BlueSageSlime5_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -476,7 +476,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime5_Spawn = $@BlueSageSlime5_Spawn - 1;
- if (mobcount("048-2", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime5::OnSlimeDeath") <= 0)
$@BlueSageSlime5_Spawn = 0;
if ($@Slime5VictimID == getcharid(3))
@@ -520,7 +520,7 @@ L_ClearedPoint:
048-2,164,102,0 script #Slime6Trigger NPC32767,2,2,{
@slimes = ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
- if (mobcount("048-2", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime6::OnSlimeDeath") <= 0)
$@BlueSageSlime6_Spawn = 0;
// if finished or haven't started yet or spawn already active or spawn already done, do nothing
@@ -562,7 +562,7 @@ OnSpawn:
OnSlimeDeath:
$@BlueSageSlime6_Spawn = $@BlueSageSlime6_Spawn - 1;
- if (mobcount("048-2", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters
+ if (mobcount("048-2", "#Slime6::OnSlimeDeath") <= 0)
$@BlueSageSlime6_Spawn = 0;
if ($@Slime6VictimID == getcharid(3))
diff --git a/npc/051-3/reinforcements.txt b/npc/051-3/reinforcements.txt
index f9d48acc..b56b6271 100644
--- a/npc/051-3/reinforcements.txt
+++ b/npc/051-3/reinforcements.txt
@@ -61,7 +61,7 @@ OnTimer2000:
setnpctimer 0;
if ($@illia_level_2_progress != 3 || $@illia_progress != 2)
end;
- if (mobcount("051-3", "Door::OnB") < 0)
+ if (mobcount("051-3", "Door::OnB") <= 0)
goto L_OpenDoor;
end;
diff --git a/npc/052-2/lobby.txt b/npc/052-2/lobby.txt
index 047fd903..0245cc6b 100644
--- a/npc/052-2/lobby.txt
+++ b/npc/052-2/lobby.txt
@@ -278,11 +278,11 @@ OnTimer2000:
end;
setnpctimer 0;
// Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
- if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 20))
+ if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 21))
npctalk strnpcinfo(0), "Ahaha! Run... Run!";
- if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") < 0))
+ if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") <= 0))
goto L_AllWavesClear;
- if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") < 0))
+ if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") <= 0))
goto L_AllWavesClear;
end;
diff --git a/npc/052-2/storage.txt b/npc/052-2/storage.txt
index ae1656e3..8dfcdfaf 100644
--- a/npc/052-2/storage.txt
+++ b/npc/052-2/storage.txt
@@ -118,7 +118,7 @@ L_MakeSpecialItem:
L_CheckMobs:
if ($@illia_progress != 6)
goto L_Clear;
- if (mobcount("052-2", "#ItemsInvoker::OnDeath") < 0)
+ if (mobcount("052-2", "#ItemsInvoker::OnDeath") <= 0)
goto L_Stop;
setnpctimer 0;
end;
diff --git a/npc/055-1/flowerpentagram4.txt b/npc/055-1/flowerpentagram4.txt
index f310e218..86966c15 100644
--- a/npc/055-1/flowerpentagram4.txt
+++ b/npc/055-1/flowerpentagram4.txt
@@ -30,8 +30,7 @@ L_Place:
mobcount("055-1", "#FlowerPentagram4::OnScorpionDeath") +
mobcount("055-1", "#FlowerPentagram4::OnRScorpionDeath") +
mobcount("055-1", "#FlowerPentagram4::OnAScorpionDeath") +
- mobcount("055-1", "#FlowerPentagram4::OnBScorpionDeath") +
- 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters
+ mobcount("055-1", "#FlowerPentagram4::OnBScorpionDeath");
if (@localMonsterCount > 4)
goto L_MonstersAlive;
diff --git a/npc/annuals/xmas/mobmanager.txt b/npc/annuals/xmas/mobmanager.txt
index e478e6be..d96b0fb0 100644
--- a/npc/annuals/xmas/mobmanager.txt
+++ b/npc/annuals/xmas/mobmanager.txt
@@ -17,7 +17,7 @@ L_InitSpawn:
L_StartLoop:
$@xmas_mob_lck = 1;
$@mob_count = mobcount($@xmas_map_spawns$[$@xmas_map_loop], "XmasSpawnCounter#" + $@xmas_map_loop + "::OnTally");
- $@spawn_amount = ($@xmas_mob_counts[$@xmas_map_loop] - ($@mob_count + 1));
+ $@spawn_amount = ($@xmas_mob_counts[$@xmas_map_loop] - $@mob_count);
if ($@spawn_amount)
goto L_Spawn;
goto L_NextMap;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 02:29:02 +0000