Skip to content

issue #41 Request: input custom HP by dice #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
e-lawniczak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issue #41 Request: input custom HP by dice #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions dnd/dnd-statblock-print.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
<link rel="stylesheet" type="text/css" href="css/libre-baskerville.css">
<link rel="stylesheet" type="text/css" href="css/noto-sans.css">
<link rel="stylesheet" type="text/css" href="css/all.min.css"> <!-- Font Awesome 5.9.0 -->
<script src="js/jquery-3.4.1.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/FileSaver.min.js"></script>
<script src="js/statblock-script.js"></script>
<script src="js/statblock-print-script.js"></script>
<script src="./js/jquery-3.4.1.min.js"></script>
<script src="./js/bootstrap.min.js"></script>
<script src="./js/FileSaver.min.js"></script>
<script src="./js/helper-functions.js"></script>
<script src="./js/statblock-script.js"></script>
<script src="./js/statblock-print-script.js"></script>
</head>

<body id="stat-block-body" style="min-width: 1000px;">
Expand Down
12 changes: 7 additions & 5 deletions dnd/dnd-statblock.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
<link rel="stylesheet" type="text/css" href="css/dnd-style.css">
<link rel="stylesheet" type="text/css" href="css/libre-baskerville.css">
<link rel="stylesheet" type="text/css" href="css/noto-sans.css">
<script src="js/jquery-3.4.1.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/FileSaver.min.js"></script>
<script src="js/dom-to-image.min.js"></script>
<script src="js/statblock-script.js"></script>
<script src="./js/jquery-3.4.1.min.js"></script>
<script src="./js/bootstrap.min.js"></script>
<script src="./js/FileSaver.min.js"></script>
<script src="./js/dom-to-image.min.js"></script>
<script src="./js/helper-functions.js"></script>
<script src="./js/statblock-script.js"></script>


<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-145234284-1"></script>
Expand Down
10 changes: 10 additions & 0 deletions dnd/js/helper-functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const CalculateAverageCustomHP = (monHp, conMod) =>{
let regExp = /^\d+d(?:4|6|8|10|12|20)$/
if(!regExp.test(monHp)) {
return monHp
}

let [numDice, dieType] = monHp.split('d')
let average = parseInt(numDice) * (parseInt(dieType) + 1) / 2 + (parseInt(numDice) * parseInt(conMod))
return `${Math.floor(average)} (${monHp})${!!conMod && conMod > 0 ? ` + ${parseInt(numDice) * parseInt(conMod)}` : ''}`
}
4 changes: 2 additions & 2 deletions dnd/js/statblock-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,9 +1675,9 @@ var StringFunctions = {

// Get the string displayed for the monster's HP
GetHP: function () {
if (mon.customHP)
return mon.hpText;
let conBonus = MathFunctions.PointsToBonus(mon.conPoints);
if (mon.customHP)
return CalculateAverageCustomHP(mon.hpText, conBonus);
hitDieSize = data.sizes[mon.size].hitDie,
avgHP = Math.floor(mon.hitDice * ((hitDieSize + 1) / 2)) + (mon.hitDice * conBonus);
if (conBonus > 0)
Expand Down