servo/Hashtag-DnD
1
0
Fork 0
mirror of https://github.com/raeleus/Hashtag-DnD.git synced 2025-07-05 05:00:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved #heal to have parameters like #damage.

Browse source
This commit is contained in:
raeleus 2024-10-26 16:37:29 -07:00
parent bc23453669
commit be4f84816f
3 changed files with 58 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Input.js
View file

@ -1532,21 +1532,62 @@ function doHeal(command) {
state.show = "none"
return "\n[Error: Not enough parameters. See #help]\n"
}
arg0 = parseInt(arg0)
var haveWord = character.name == "You" ? "have" : "has"
var areWord = character.name == "You" ? "are" : "is"
var arg1 = getArgumentRemainder(command, 1)
if (arg1 == null) {
if (character == null) {
state.show = "none"
return "\n[Error: Character must be specified. See #help]\n"
}
var healing
var healingMatches = arg0.match(/\d*d\d+((\+|-)d+)?/gi)
if (healingMatches != null) healing = calculateRoll(healingMatches[0])
else {
healingMatches = arg0.match(/\d+/g)
if (healingMatches != null) healing = parseInt(healingMatches[healingMatches.length - 1])
}
if (healing == null) {
state.show = "none"
return "\n[Error: Expected a number. See #help]\n"
}
var haveWord = character.name == "You" ? "have" : "has"
character.health += healing
character.health = clamp(character.health, 0, getHealthMax())
if (character.health >= getHealthMax()) {
state.show = "none"
return `\n[${character.name} ${areWord} at maximum health]\n`
return `\n[${character.name} ${haveWord} been healed for ${healing} hp to a total of ${character.health}]\n`
} else {
var healing
var healingMatches = arg0.match(/\d*d\d+((\+|-)d+)?/gi)
if (healingMatches != null) healing = calculateRoll(healingMatches[0])
else {
healingMatches = arg0.match(/\d+/g)
log(healingMatches)
if (healingMatches != null) healing = parseInt(healingMatches[0])
}
if (healing == null) {
state.show = "none"
return "\n[Error: Expected a number. See #help]\n"
}
for (var enemy of state.enemies) {
if (enemy.name.toLowerCase() == arg1.toLowerCase()) {
enemy.health = Math.max(0, enemy.health + healing)
return `\n[${toTitleCase(enemy.name)} has been healed for ${healing} hp to a total of ${enemy.health}]\n`
}
}
state.show = "none"
return `\n[Error: Could not find an enemy matching the name ${enemy.name}. Type #enemies to see a list]`
}
character.health = character.health + arg0
character.health = clamp(character.health, 0, getHealthMax())
state.show = "none"
return `\n[${character.name} ${haveWord} been healed by ${arg0} hp to ${character.health} health]\n`
}
function doDamage(command) {
@ -1585,7 +1626,7 @@ function doDamage(command) {
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`
return `\n[${character.name} ${haveWord} been damaged for ${damage} hp with ${character.health} remaining] ${character.health == 0 ? " You are unconscious" : ""}\n`
} else {
var damage
@ -1605,7 +1646,7 @@ function doDamage(command) {
for (var enemy of state.enemies) {
if (enemy.name.toLowerCase() == arg1.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`
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`
}
}