From 5b6db4339a1ccc573910a75f673a5ec2ed370f1a Mon Sep 17 00:00:00 2001
From: raeleus <raymond.ray3k@gmail.com>
Date: Tue, 8 Oct 2024 09:05:24 -0700
Subject: [PATCH] Improved #damage with dice rolls and targeting enemies.

---
 Input.js  | 58 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 Output.js |  4 ++--
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/Input.js b/Input.js
index b16605e..4c02509 100644
--- a/Input.js
+++ b/Input.js
@@ -1001,13 +1001,57 @@ function doDamage(command) {
     return "\n[Error: Not enough parameters. See #help]\n"
   }
 
-  var haveWord = character.name == "You" ? "have" : "has"
+  var arg1 = getArgument(command, 1)
+  
+  if (arg1 == null) {
+    var damage
 
-  character.health -= arg0
-  character.health = clamp(character.health, 0, getHealthMax())
+    var damageMatches = arg0.match(/\d*d\d+((\+|-)d+)?/g)
+    if (damageMatches != null) damage = calculateRoll(damageMatches[0])
+    else {
+      damageMatches = arg0.match(/\d+/g)
+      if (damageMatches != null) damage = parseInt(damageMatches[damageMatches.length - 1])
+    }
 
-  state.show = "none"
-  return `\n[${character.name} ${haveWord} been damaged for ${arg0} hp with ${character.health} remaining].${character.health == 0 ? " You are unconcious" : ""}\n`
+    if (damage == null) {
+      state.show = "none"
+      return "\n[Error: Expected a number. See #help]\n"
+    }
+
+    var haveWord = character.name == "You" ? "have" : "has"
+
+    character.health -= damage
+    character.health = clamp(character.health, 0, getHealthMax())
+
+    state.show = "none"
+    return `\n[${character.name} ${haveWord} been damaged for ${damage} hp with ${character.health} remaining].${character.health == 0 ? " You are unconscious" : ""}\n`
+  } else {
+    if (arg1 == null) {
+      state.show = "none"
+      return "\n[Error: Not enough parameters. See #help]\n"
+    }
+
+    var damage
+
+    var damageMatches = arg1.match(/\d*d\d+((\+|-)d+)?/g)
+    if (damageMatches != null) damage = calculateRoll(damageMatches[0])
+    else {
+      damageMatches = arg1.match(/\d+/g)
+      if (damageMatches != null) damage = parseInt(damageMatches[damageMatches.length - 1])
+    }
+
+    if (damage == null) {
+      state.show = "none"
+      return "\n[Error: Expected a number. See #help]\n"
+    }
+
+    for (var enemy of state.enemies) {
+      if (enemy.name.toLowerCase() == arg0.toLowerCase()) {
+        enemy.health = Math.max(0, enemy.health - damage)
+        return `\n[${toTitleCase(enemy.name)} has been damaged for ${damage} hp with ${enemy.health} remaining].${enemy.health == 0 ? " " + toTitleCase(enemy.name) + " has been defeated!" : ""}\n`
+      }
+    }
+  }
 }
 
 function doRest(command) {
@@ -1864,7 +1908,7 @@ function doTurn(command) {
       target.health = Math.max(target.health - damage, 0)
 
       text += `${activeCharacterName} attacks ${target.name} for ${damage} damage! \n`
-      if (target.health == 0) text += `${target.name} ${areWord} unconcious!\n`
+      if (target.health == 0) text += `${target.name} ${areWord} unconscious!\n`
       else text += `${target.name} ${areWord} at ${target.health} health.\n`
     } else {
       var spell = activeCharacter.spells[getRandomInteger(0, activeCharacter.spells.length)]
@@ -1876,7 +1920,7 @@ function doTurn(command) {
         target.health = Math.max(target.health - damage, 0)
 
         text += `${activeCharacterName} casts spell ${spell} at ${targetNameAdjustedCase} for ${damage} damage!`
-        if (target.health == 0) text += `${target.name} ${areWord} unconcious!\n`
+        if (target.health == 0) text += `${target.name} ${areWord} unconscious!\n`
         else text += `${target.name} ${areWord} at ${target.health} health.\n`
       }
     }
diff --git a/Output.js b/Output.js
index b786045..091f9df 100644
--- a/Output.js
+++ b/Output.js
@@ -286,8 +286,8 @@ const modifier = (text) => {
       text += "\n    Sets the character's health to specified value. It's capped at the character's max health."
       text += "\n#heal value"
       text += "\n    Increases the character's health by the specified value. It's capped at the character's max health."
-      text += "\n#damage value"
-      text += "\n    Decreases the character's health by the specified value. Reaching 0 causes the character to become \"unconcious\"."
+      text += "\n#damage (enemy) damage or dice_roll"
+      text += "\n    Decreases the enemy's health by the specified damage or dice_roll. If an enemy isn't specified, the character calling the command is damaged. Reaching 0 causes the character to become \"unconscious\"."
       text += "\n#setac value"
       text += "\n    Sets the armor class of the character. The default is 10"
       text += "\n#rest"