fix: A bunch of sanity checks so we're not getting the id of null items.

Author: Firebottle

src/firebot/commands/rpg-job.ts

@@ -283,6 +283,7 @@ export async function rpgJobCommand(userCommand: UserCommand) {
     let completePlayer = await getCompleteCharacterData(player);
 
     logger('debug', `JOB STARTED: ${username}`);
+    logger('debug', `PLAYER: ${JSON.stringify(completePlayer)}`);
 
     // Combat time.
     if (selectedJob.encounter != null) {

src/systems/characters/characters.ts

@@ -261,11 +261,15 @@ export async function getCharacterDamageBonus(
     const int = await getAdjustedCharacterStat(attacker, 'int');
 
     // Get our item first.
-    if (slot === 'mainHand') {
+    if (slot === 'mainHand' && attacker.mainHand != null) {
         item = getItemByID(attacker.mainHand.id, 'weapon') as Weapon | Spell;
     }
 
-    if (slot === 'offHand' && attacker.offHand.itemType !== 'shield') {
+    if (
+        slot === 'offHand' &&
+        attacker.offHand.itemType !== 'shield' &&
+        attacker.offHand != null
+    ) {
         item = getItemByID(attacker.offHand.id, 'weapon') as Weapon | Spell;
     }
 

src/systems/combat/approach.ts

@@ -219,18 +219,23 @@ async function getDistanceMoved(
     let approacherArmor = null;
 
     if (characterOneMaxRange >= characterTwoMaxRange) {
+        if (characterTwo.armor != null) {
+            approacherArmor = (await getItemByID(
+                characterTwo.armor.id,
+                'armor'
+            )) as Armor;
+        }
+
+        return getArmorMovementSpeed(approacherArmor);
+    }
+
+    if (characterOne.armor != null) {
         approacherArmor = (await getItemByID(
-            characterTwo.armor?.id,
+            characterOne.armor.id,
             'armor'
         )) as Armor;
-        return getArmorMovementSpeed(approacherArmor);
     }
 
-    approacherArmor = (await getItemByID(
-        characterOne.armor?.id,
-        'armor'
-    )) as Armor;
-
     return getArmorMovementSpeed(approacherArmor);
 }
 

src/systems/combat/combat-hit.ts

@@ -151,11 +151,14 @@ export async function didCharacterHitMelee(
     const defenderAC = await getCharacterTotalAC(defender, roundCounter);
     const hitBonus = await getCharacterHitBonus(attacker, slot);
     const roll = rollDice(`1d20 +${hitBonus}`);
+    let item = null;
 
-    const item = getItemByID(
-        attacker[slot as EquippableSlots].id,
-        attacker[slot as EquippableSlots].itemType
-    ) as Weapon | Spell;
+    if (attacker[slot as EquippableSlots] != null) {
+        item = getItemByID(
+            attacker[slot as EquippableSlots].id,
+            attacker[slot as EquippableSlots].itemType
+        ) as Weapon | Spell;
+    }
 
     if (item == null) {
         logger(

src/systems/combat/magic.ts

@@ -8,6 +8,11 @@ import { rollDice } from '../utils';
 export async function didCharacterCastSuccessfully(
     attacker: Character
 ): Promise<boolean> {
+    // Naked users have no arcane failure.
+    if (attacker.armor == null) {
+        return true;
+    }
+
     const armor = (await getItemByID(attacker.armor.id, 'armor')) as Armor;
     const failureChance = getArcaneFailureChance(armor.properties[0]);
     const roll = rollDice('1d100');