userissues: fail calc on missing blowpipe ammo

Closes #293
weirdgloop · Apr 24, 2024 · b4f378f · b4f378f
1 parent e5f2118
commit b4f378f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/src/enums/UserIssueType.ts b/src/enums/UserIssueType.ts
@@ -1,6 +1,7 @@
 enum UserIssueType {
   EQUIPMENT_MISSING_AMMO = 'equipment_slot_ammo_missing',
   EQUIPMENT_WRONG_AMMO = 'equipment_slot_ammo_wrong',
+  BLOWPIPE_MISSING_AMMO = 'equipment_slot_weapon_blowpipe_missing_ammo',
   EQUIPMENT_SET_EFFECT_UNSUPPORTED = 'equipment_slot_body_unsupported_set_effect',
   SPELL_WRONG_WEAPON = 'spell_wrong_weapon',
   SPELL_WRONG_MONSTER = 'spell_wrong_monster',

diff --git a/src/lib/BaseCalc.ts b/src/lib/BaseCalc.ts
@@ -554,6 +554,11 @@ export default class BaseCalc {
       };
     }
 
+    if (eq.weapon && ['Toxic blowpipe', 'Blazing blowpipe'].includes(eq.weapon.name) && ['Empty', 'Charged'].includes(eq.weapon.version)) {
+      // this can happen on a load from runelite, since we can't detect the ammo loaded into the blowpipe
+      this.addIssue(UserIssueType.BLOWPIPE_MISSING_AMMO, 'This blowpipe does not contain ammo. Select another version in the equipment selector.');
+    }
+
     if (this.player.style.stance !== 'Manual Cast' && ammoApplicability(eq.weapon?.id, eq.ammo?.id) === AmmoApplicability.INVALID) {
       if (eq.ammo?.name) {
         this.addIssue(UserIssueType.EQUIPMENT_WRONG_AMMO, 'This ammo does not work with your current weapon.');

diff --git a/src/lib/PlayerVsNPCCalc.ts b/src/lib/PlayerVsNPCCalc.ts
@@ -11,17 +11,13 @@ import {
   WeightedHit,
 } from '@/lib/HitDist';
 import {
-  canUseSunfireRunes,
-  isBindSpell,
-  isFireSpell,
-  isWaterSpell,
+  canUseSunfireRunes, isBindSpell, isFireSpell, isWaterSpell,
 } from '@/types/Spell';
-import {
-  PrayerData, PrayerMap,
-} from '@/enums/Prayer';
+import { PrayerData, PrayerMap } from '@/enums/Prayer';
 import { isVampyre, MonsterAttribute } from '@/enums/MonsterAttribute';
 import {
-  CAST_STANCES, DEFAULT_ATTACK_SPEED,
+  CAST_STANCES,
+  DEFAULT_ATTACK_SPEED,
   GLOWING_CRYSTAL_IDS,
   GUARDIAN_IDS,
   IMMUNE_TO_MAGIC_DAMAGE_NPC_IDS,
@@ -30,21 +26,23 @@ import {
   IMMUNE_TO_RANGED_DAMAGE_NPC_IDS,
   OLM_HEAD_IDS,
   OLM_MAGE_HAND_IDS,
-  OLM_MELEE_HAND_IDS, ONE_HIT_MONSTERS, SECONDS_PER_TICK,
+  OLM_MELEE_HAND_IDS,
+  ONE_HIT_MONSTERS,
+  SECONDS_PER_TICK,
   TEKTON_IDS,
-  TOMBS_OF_AMASCUT_MONSTER_IDS, TTK_DIST_EPSILON, TTK_DIST_MAX_ITER_ROUNDS,
+  TOMBS_OF_AMASCUT_MONSTER_IDS,
+  TTK_DIST_EPSILON,
+  TTK_DIST_MAX_ITER_ROUNDS,
   USES_DEFENCE_LEVEL_FOR_MAGIC_DEFENCE_NPC_IDS,
   VERZIK_P1_IDS,
 } from '@/lib/constants';
 import { EquipmentCategory } from '@/enums/EquipmentCategory';
 import { DetailKey } from '@/lib/CalcDetails';
 import { Factor } from '@/lib/Math';
-import {
-  AmmoApplicability,
-  ammoApplicability,
-} from '@/lib/Equipment';
+import { AmmoApplicability, ammoApplicability } from '@/lib/Equipment';
 import BaseCalc, { CalcOpts, InternalOpts } from '@/lib/BaseCalc';
 import { scaleMonsterHpOnly } from '@/lib/MonsterScaling';
+import UserIssueType from '@/enums/UserIssueType';
 
 /**
  * Class for computing various player-vs-NPC metrics.
@@ -603,7 +601,7 @@ export default class PlayerVsNPCCalc extends BaseCalc {
     if (this.player.style.stance !== 'Manual Cast') {
       const weaponId = this.player.equipment.weapon?.id;
       const ammoId = this.player.equipment.ammo?.id;
-      if (ammoApplicability(weaponId, ammoId) === AmmoApplicability.INVALID) {
+      if (ammoApplicability(weaponId, ammoId) === AmmoApplicability.INVALID || this.userIssues.some((ui) => ui.type === UserIssueType.BLOWPIPE_MISSING_AMMO)) {
         return 0;
       }
     }