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 + "]]";
+ }
}