From 6d80fae7d1d3fee03a4be78f2d553bb29fbc453e Mon Sep 17 00:00:00 2001
From: punibird <127067784+punibird@users.noreply.github.com>
Date: Thu, 30 Mar 2023 15:39:23 +0900
Subject: [PATCH] Minor bug fix

Fixed issue with Adv/Disadv not applying to non-multi hit rolls
---
 ProjectMoonTRPG/ProjectMoonTRPG.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ProjectMoonTRPG/ProjectMoonTRPG.html b/ProjectMoonTRPG/ProjectMoonTRPG.html
index 393abcdec2..4260b778ef 100644
--- a/ProjectMoonTRPG/ProjectMoonTRPG.html
+++ b/ProjectMoonTRPG/ProjectMoonTRPG.html
@@ -6876,7 +6876,7 @@ on('clicked:rollCombat', (info) => {
 	combinedice3 = parseInt(basedice3) + parseInt(distortdice3) + parseInt(skilldice3) + parseInt(activepower);
 
 	/* Multi-hit roll prep */
-	let multihitdebuff = " ";
+	let multihitdebuff = "";
 
 	if(combinedice1 > 1 && multihitfull != "true"){
 	multihitdebuff = parseInt((-2)*(combinedice1 - 1));
@@ -6952,11 +6952,17 @@ on('clicked:rollCombat', (info) => {
 		for(let i = 0; i< dcounter ;i++){
    	 	rollformat += " [[" + baseformat + "]]";
 		}
-	}
+		}
 
 	}
 	else {
-	rollformat = "[[" + baseformat + "]]";
+		if(advstate != "0"){
+		rollformat = "[[" + advformat + advmod + "]]";
+		}
+		else {
+
+		rollformat = "[[" + baseformat + "]]";
+		}
 
 	}