Merge pull request #1213 from vince-roll20/Pathfiner

Pathfinder - npc-hp max fix
This commit is contained in:
Riley Dutton
2015-12-16 07:00:05 -06:00
+6 -7
View File
@@ -9760,16 +9760,16 @@
<span class="sheet-table-name">Sheet configuration</span>
<div class="sheet-table-row">
<span class="sheet-table-data sheet-left"><label><span title="Syncs @{NPC-HP} to @{HP} if using @{HP} for npc/monster hit points."><input type="checkbox" title="@{sync_npc_pc_hp}" name="attr_sync_npc_pc_hp" value="1" checked="checked" /> Editing NPC HP updates PC HP</span></label></span>
<span class="sheet-table-data sheet-left"><label>NPC rolls: Whisper to GM or broadcast publicaly<span title="All NPC rolls will be whispered to the GM.">
<span class="sheet-table-data sheet-left"><label>NPC rolls: Whisper to GM or broadcast publicly<span title="All NPC rolls will be whispered to the GM.">
<select name="attr_NPC-whisper">
<option value="">Public Rolls</option>
<option value="/w gm" selected>Whisper GM</option>
</select></label></span>
<span class="sheet-table-data sheet-left"><label>PC rolls: Whisper to GM or broadcast publicaly <span title="All PC rolls will be whispered to the GM.">
</select></span></label></span>
<span class="sheet-table-data sheet-left"><label>PC rolls: Whisper to GM or broadcast publicly<span title="All PC rolls will be whispered to the GM.">
<select name="attr_PC-whisper">
<option value="" selected>Public Rolls</option>
<option value="/w gm">Whisper GM</option>
</select></label></span>
</select></span></label></span>
</div>
</div>
<br>
@@ -9778,7 +9778,7 @@
<div class="sheet-footer">
<div class="sheet-table">
<div class="sheet-table-row">
<span class="sheet-table-data sheet-center">Created by Samuel Marino w/contributions by Vince, Samuel Terrazas, Nibrodooh, Chris Buchholz | Last updated: <i>12.09.15'</i></span>
<span class="sheet-table-data sheet-center">Created by Samuel Marino w/contributions by Vince, Samuel Terrazas, Nibrodooh, Chris Buchholz | Last updated: <i>12.15.15'</i></span>
</div>
<div class="sheet-table-row">
<span class="sheet-table-data sheet-center">Have questions or feedback? This thread can help:<input type="text" style="width:50%; border:0px;" value="https://app.roll20.net/forum/post/1915585/pathfinder-sheet-thread-4-life-after-sam" /></span>
@@ -12277,7 +12277,7 @@ var PFSheet = PFSheet || (function(){
* updates the NPC hp, and also PC hp, because some people use "HP" attributes for monsters. could put this in config as well, */
updateNPCHP = function () {
getAttrs(["npc-hd","npc-hd-num","npc-hd-misc","NPC-HP_max","NPC-HP","sync_npc_pc_hp"],function(v){
var hp = Math.floor(((parseInt(v["npc-hd"],10)||0)/2) * (parseInt(v["npc-hd-num"],10)||0) + parseInt(v["npc-hd-misc"],10)||0 ),
var hp = Math.floor((((parseInt(v["npc-hd"],10)||0)+1)/2) * (parseInt(v["npc-hd-num"],10)||0) + parseInt(v["npc-hd-misc"],10)||0 ),
maxhp=parseInt(v["NPC-HP_max"],10)||0,
currhp=parseInt(v["NPC-HP"],10)||0,
updatehp=parseInt(v.sync_npc_pc_hp,10)||0,
@@ -12836,4 +12836,3 @@ on("change:recalc1",function(){PFSheet.checkUpdate();});
on("change:npc-hd change:npc-hd-num change:npc-hd-misc",function() {PFSheet.updateNPCHP();});
</script>