From 2b5e6c95130bff4ace39bd6c87f798820dfd844b Mon Sep 17 00:00:00 2001
From: femapj <hoyer555@yahoo.it>
Date: Tue, 31 Aug 2021 00:49:24 +0200
Subject: [PATCH] [D&D 3.5] new layout for Weapon macro

---
 D&D_3-5/charsheet_3-5.css  | 11 +++++++
 D&D_3-5/charsheet_3-5.html | 60 ++++++++++++++++++++++++--------------
 D&D_3-5/translation.json   |  4 +++
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/D&D_3-5/charsheet_3-5.css b/D&D_3-5/charsheet_3-5.css
index 60a91f65af..5072923e3e 100644
--- a/D&D_3-5/charsheet_3-5.css
+++ b/D&D_3-5/charsheet_3-5.css
@@ -37,16 +37,27 @@
 .sheet-pc-miscaccalc-show:not(:checked)~.sheet-pc-miscaccalc {display:none;}
 
 .sheet-pc-weapon1-show:not(:checked)~.sheet-pc-weapon1 {display:none;}
+.sheet-pc-weapon1Macro-show:not(:checked)~.sheet-pc-weapon1Macro {display:none;}
 .sheet-pc-weapon2-show:not(:checked)~.sheet-pc-weapon2 {display:none;}
+.sheet-pc-weapon2Macro-show:not(:checked)~.sheet-pc-weapon2Macro {display:none;}
 .sheet-pc-weapon3-show:not(:checked)~.sheet-pc-weapon3 {display:none;}
+.sheet-pc-weapon3Macro-show:not(:checked)~.sheet-pc-weapon3Macro {display:none;}
 .sheet-pc-weapon4-show:not(:checked)~.sheet-pc-weapon4 {display:none;}
+.sheet-pc-weapon4Macro-show:not(:checked)~.sheet-pc-weapon4Macro {display:none;}
 .sheet-pc-weapon5-show:not(:checked)~.sheet-pc-weapon5 {display:none;}
+.sheet-pc-weapon5Macro-show:not(:checked)~.sheet-pc-weapon5Macro {display:none;}
 .sheet-pc-weapon6-show:not(:checked)~.sheet-pc-weapon6 {display:none;}
+.sheet-pc-weapon6Macro-show:not(:checked)~.sheet-pc-weapon6Macro {display:none;}
 .sheet-pc-weapon7-show:not(:checked)~.sheet-pc-weapon7 {display:none;}
+.sheet-pc-weapon7Macro-show:not(:checked)~.sheet-pc-weapon7Macro {display:none;}
 .sheet-pc-weapon8-show:not(:checked)~.sheet-pc-weapon8 {display:none;}
+.sheet-pc-weapon8Macro-show:not(:checked)~.sheet-pc-weapon8Macro {display:none;}
 .sheet-pc-weapon9-show:not(:checked)~.sheet-pc-weapon9 {display:none;}
+.sheet-pc-weapon9Macro-show:not(:checked)~.sheet-pc-weapon9Macro {display:none;}
 .sheet-pc-weapon10-show:not(:checked)~.sheet-pc-weapon10 {display:none;}
+.sheet-pc-weapon10Macro-show:not(:checked)~.sheet-pc-weapon10Macro {display:none;}
 .sheet-pc-weapon11-show:not(:checked)~.sheet-pc-weapon11 {display:none;}
+.sheet-pc-weapon11Macro-show:not(:checked)~.sheet-pc-weapon11Macro {display:none;}
 
 .sheet-pc-spellAction-show:not(:checked)~.sheet-pc-spellAction {display:none;}
 .sheet-pc-spellActionDescription-show:not(:checked)~.sheet-pc-spellActionDescription {display:none;}
diff --git a/D&D_3-5/charsheet_3-5.html b/D&D_3-5/charsheet_3-5.html
index 5f43aaba15..392ad844c7 100644
--- a/D&D_3-5/charsheet_3-5.html
+++ b/D&D_3-5/charsheet_3-5.html
@@ -136,8 +136,6 @@
 		<span class="sheet-tab sheet-tab8" data-i18n="miscellaneous">Misc</span>
 	<input type="radio" name="attr_tab" class="sheet-tab sheet-tab9" value="9" title="Other" />
 		<span class="sheet-tab sheet-tab9" data-i18n="summons">Summons</span>
-	<!--input type="radio" name="attr_tab" class="sheet-tab sheet-tab10" value="10" title="Notes" />
-		<span class="sheet-tab sheet-tab10" data-i18n="notes">Notes</span-->
 	<input type="radio" name="attr_tab" class="sheet-tab sheet-tab99" value="99" title="All" checked="checked" />
 		<span class="sheet-tab sheet-tab99" data-i18n="all">All</span>
 	<br>&nbsp;
@@ -554,7 +552,7 @@
 								 <td class="sheet-table-data-left">
 									<table class="tableNoCellSpacingCellPadding10">
 										<tr>
-											<td colspan="6" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 790px;"><span data-i18n="weapons">Weapons</span></td>
+											<td colspan="6" class="sheet-statlabel-big-gray" style="font-size: 1.5em; width: 800px;"><span data-i18n="weapons">Weapons</span></td>
 										</tr>
 									</table>
 									<input type="checkbox" class="sheet-pc-weapon1-show sheet-arrow" title="weapon1-show" name="attr_weapon1-show" value="1" checked /><span style="text-align: left;"><span data-i18n="weapon">Weapon</span>1</span>
@@ -600,18 +598,39 @@
 												</select></td>
 												<td><input class="sheet-inputbox" type="text" name="attr_weapon1statdamage" title="weapon1statdamage" style="height: 24px; width: 59px;" value="0"></td>
 												<td><input class="sheet-inputbox" type="text" name="attr_weapon1vardamage" title="weapon1vardamage" style="height: 24px; width: 59px;" value="0"></td>
-												<td><textarea input class="sheet-inputbox" rows="1" cols="45" style="height: 20px; width: 105px; margin-top:6px;" name="attr_weapon1specialproperties" title="weapon1specialproperties">0</textarea></td>
+												<td><textarea input class="sheet-inputbox" rows="1" cols="45" style="height: 18px; width: 105px; margin-top:6px;" name="attr_weapon1specialproperties" title="weapon1specialproperties">0</textarea></td>
 											</tr>
 											<tr>
-												<td colspan="6"><div style="font-size: 0.5em; text-align: left;"><span data-i18n="attack-calculation-a">Attack Calc</span> / <span data-i18n="macro">Macro</span>:<br></div><textarea rows="1" cols="45" style="height: 18px; width: 120px;" title="weapon1attackcalc (Edit this to adjust the attack calculation)" name="attr_weapon1attackcalc">1d20cs>@{weapon1critmin} +@{bab}[BAB] +@{epicattackbonus}[Epic AB] + @{weapon1stat}[Ability] +@{size}[size] +@{weapon1enh}[Weapon Enh] +@{weapon1focus}[Weapon Focus] + ?{Flank (1=yes)|0}*2[Flank] +?{Power Attack? (put in penalty with negative sign ie -3)|0}[Pwr Attk] +?{Additional Attack Bonus?|0}[Ad'l Atk Bon] </textarea>
-												<textarea rows="1" cols="45" style="height: 18px; width: 120px;" title="weapon1attackmacro (Modify this macro to modify your attack macro)" name="attr_weapon1attackmacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}}} {{subtags=attacks with a @{weapon1name} }} {{attack1=hitting AC [[ @{weapon1attackcalc} ]] }} {{critconfirm1=Crit?: [[ @{weapon1attackcalc} ]] }} {{fumbleroll=Fumble: [[ d20 ]] }} {{damage1=for [[ @{weapon1damage} ]]dmg}} {{critdmg1=+ [[ @{weapon1crit} ]] crit dmg}} {{fullattackflag= [[ 0d1 ]] }} </textarea>
-												<button type="roll" name="roll_weapon1attack" title="weapon1attack" value="@{weapon1attackmacro}" style="width: 20px;" > </button></td>
-												<td colspan="3"><div style="font-size: 0.5em; text-align: left;"><span data-i18n="full-attack-macro" >Full Attack Macro</span>:<br></div><textarea rows="1" cols="45" style="height: 18px; width: 155px;" title="weapon1fullattackmacro (Modify this macro to modify your full round attack macro)" name="attr_weapon1fullattackmacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}}} {{subtags=attacks with a @{weapon1name} }} {{attack1=A1: [[ @{weapon1attackcalc} ]] }} {{critconfirm1=Crit?: [[ @{weapon1attackcalc} ]] }} {{fumbleroll=Fumble: [[ d20 ]] }} {{damage1=D1: [[ @{weapon1damage} ]] }} {{critdmg1=+ [[ @{weapon1crit} ]] }} {{fullattackflag= [[ ?{Full Attack?|No, 0d1|Yes, d1} ]] }} {{attack2=A2: [[ @{weapon1attackcalc}-5 ]] }} {{critconfirm2=Crit!: [[ @{weapon1attackcalc}-5 ]] }} {{damage2=D2: [[ @{weapon1damage} ]] }} {{critdmg2=+ [[ @{weapon1crit} ]] }} {{attack3=A3: [[ @{weapon1attackcalc}-10 ]] }} {{critconfirm3=Crit!: [[ @{weapon1attackcalc}-10 ]] }} {{damage3=D3: [[ @{weapon1damage} ]] }} {{critdmg3=+ [[ @{weapon1crit} ]] }} {{attack4=A4: [[ @{weapon1attackcalc}-15 ]] }} {{critconfirm4=Crit!: [[ @{weapon1attackcalc}-15 ]] }} {{damage4=D4: [[ @{weapon1damage} ]] }} {{critdmg4=+ [[ @{weapon1crit} ]] }} </textarea>
-													<button type="roll" name="roll_weapon1fullattack" title="weapon1fullattack" value="@{weapon1fullattackmacro}" style="width: 20px;" > </button></td>
-												<td colspan="5"><div style="font-size: 0.5em; text-align: left;"><span data-i18n="damage-calculation-a">Damage Calc</span> / <span data-i18n="critical-calculation-a">Crit Calc</span> / <span data-i18n="damage-macro">Damage Macro</span>:<br></div><textarea class="sheet-inputbox" type="text" name="attr_weapon1damage" rows="1" cols="45" style="height: 20px; width: 65px;" title="weapon1damage (Edit this to adjust the damage calculation.)">@{weapon1statdamage} [Dmg] + @{weapon1vardamage} [Var Dmg] + @{weapon1damagestat}[Weapon Dmg Ability] +@{weapon1enh}[Weapon Enh] +@{weapon1specialize}[Weapon Spec] +?{Power Attack Bonus?|0}[Pwr Attk] +?{Additional Damage Bonus?|0}[Ad'l Dmg Bon] </textarea>
-												<textarea class="sheet-inputbox" name="attr_weapon1crit" rows="1" cols="45" style="height: 20px; width: 65px;" title="weapon1crit (Edit this to adjust the critical calculation.)"> [[ (@{weapon1critmult}-1) ]] *(@{weapon1statdamage} + @{weapon1damagestat}[Weapon Dmg Ability] +@{weapon1enh}[Weapon Enh] +@{weapon1specialize}[Weapon Spec] +?{Power Attack Bonus?|0}[Pwr Attk] +?{Additional Damage Bonus?|0}[Ad'l Dmg Bon]) + @{weapon1vardamage} </textarea>
-												<textarea class="sheet-inputbox" name="attr_weapon1damagemacro" rows="1" cols="45" style="height: 20px; width: 100px;" title="weapon1damagemacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}'s @{weapon1name} }} {{damage1=does [[ @{weapon1damage} ]]damage}} {{fullattackflag= [[ 0d1 ]] }}</textarea>
-												<button type="roll" name="roll_weapon1damageroll" title="weapon1damageroll" style="width: 20px;" value="@{weapon1damagemacro}"></button></td>
+												<td colspan="14">
+													<input type="checkbox" class="sheet-pc-weapon1Macro-show sheet-arrow" title="weapon1Macro-show" name="attr_-show" value="1"/>
+													<span></span>
+													<div style="float: right; width: 780px; text-align: left;">
+														<span style="font-weight: bold; margin-left: 20px;" data-i18n="single-attack">Single attack</span>:&nbsp;
+														<button type="roll" name="roll_weapon1attack" title="weapon1singleattack" value="@{weapon1singleattackmacro}" style="width: 20px;" > </button>
+														
+														<span style="font-weight: bold; margin-left: 70px;" data-i18n="full-attack">Full Attack</span>:&nbsp;
+														<button type="roll" name="roll_weapon1fullattack" title="weapon1fullattack" value="@{weapon1fullattackmacro}" style="width: 20px;" > </button>
+														
+														<span style="font-weight: bold; margin-left: 70px;" data-i18n="damage-roll">Damage Roll</span>:&nbsp;
+														<button type="roll" name="roll_weapon1damageroll" title="weapon1damageroll" style="width: 20px;" value="@{weapon1damagemacro}"></button>
+														
+														<span style="font-weight: bold; margin-left: 70px;" data-i18n="single-roll-attack">Single roll Attack</span>:&nbsp;
+														<button type="roll" name="roll_weapon1attack" title="weapon1attack" value="@{weapon1attackmacro}" style="width: 20px;"> </button>
+													</div>
+													<div class="sheet-pc-weapon1Macro" style="width: 800px; text-align: left; padding-top: 10px">
+														<div>
+															<textarea rows="1" cols="45" style="height: 40px; width: 360px; margin-left: 30px; margin-bottom: 0;" title="weapon1attackcalc (Edit this to adjust the attack calculation)" name="attr_weapon1attackcalc">1d20cs>@{weapon1critmin} +@{bab}[BAB] +@{epicattackbonus}[Epic AB] + @{weapon1stat}[Ability] +@{size}[size] +@{weapon1enh}[Weapon Enh] +@{weapon1focus}[Weapon Focus] + ?{Flank |No, 0|Yes, 2}[Flank] + ?{Additional Attack Bonus?|0}[Ad'l Atk Bon]</textarea>
+															<textarea class="sheet-inputbox" type="text" name="attr_weapon1damage" rows="1" cols="45" style="height: 40px; width: 175px; margin-left: 10px; margin-bottom: 0;" title="weapon1damage (Edit this to adjust the damage calculation.)">@{weapon1statdamage}[Dmg] + @{weapon1damagestat}[Weapon Dmg Ability] + @{weapon1enh}[Weapon Enh] + @{weapon1specialize}[Weapon Spec] + ?{Additional Damage Bonus?|0}[Ad'l Dmg Bon] + @{weapon1vardamage}[Var Dmg]</textarea>
+															<textarea class="sheet-inputbox" name="attr_weapon1crit" rows="1" cols="45" style="height: 40px; width: 175px; margin-bottom: 0;" title="weapon1crit (Edit this to adjust the critical calculation.)">(@{weapon1critmult} -1) * (@{weapon1statdamage}[Dmg] + @{weapon1damagestat}[Weapon Dmg Ability] + @{weapon1enh}[Weapon Enh] + @{weapon1specialize}[Weapon Spec] + ?{Additional Damage Bonus?|0}[Ad'l Dmg Bon]) + @{weapon1vardamage}[Var Dmg]</textarea>
+														</div>
+														<div>
+															<textarea rows="1" cols="45" style="height: 40px; width: 175px; margin-left: 30px; margin-bottom: 0;" title="weapon1singleattackmacro (Modify this macro to modify your attack macro)" name="attr_weapon1singleattackmacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}}} {{subtags=attacks with a @{weapon1name} }} {{attack1=hitting AC [[ @{weapon1attackcalc} ]] }}</textarea>
+															<textarea rows="1" cols="45" style="height: 40px; width: 175px; margin-bottom: 0;" title="weapon1fullattackmacro (Modify this macro to modify your full round attack macro)" name="attr_weapon1fullattackmacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}}} {{subtags=attacks with @{weapon1name} }} {{attack1=1 - hitting AC: [[ @{weapon1attackcalc} ]] }} {{critconfirm1=Crit?: YES }} {{fumbleroll=Fumble: YES }} {{fullattackflag= [[ d1 ]] }} {{attack2=2 - hitting AC: [[ @{weapon1attackcalc}-5 ]] }} {{critconfirm2=Crit!: YES }} {{fumbleroll=Fumble: YES }} {{attack3=3 - hitting AC: [[ @{weapon1attackcalc}-10 ]] }} {{critconfirm3=Crit!: YES }} {{fumbleroll=Fumble: YES }} {{attack4=4 - hitting AC: [[ @{weapon1attackcalc}-15 ]] }} {{critconfirm4=Crit!: YES }} {{fumbleroll=Fumble: YES }}</textarea>
+															<textarea class="sheet-inputbox" name="attr_weapon1damagemacro" rows="1" cols="45" style="height: 40px; width: 175px; margin-left: 7px; margin-bottom: 0;" title="weapon1damagemacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}'s @{weapon1name} }} {{damage1=for [[ @{weapon1damage} ]]dmg}} {{c1=+ [[ @{weapon1crit} ]] crit dmg}}</textarea>
+															<textarea rows="1" cols="45" style="height: 40px; width: 175px; margin-bottom: 0;" title="weapon1attackmacro (Modify this macro to modify your attack macro)" name="attr_weapon1attackmacro">&{template:DnD35Attack} {{pcflag=true}} {{name=@{character_name}}} {{subtags=attacks with a @{weapon1name} }} {{attack1=hitting AC [[ @{weapon1attackcalc} ]] }} {{critconfirm1=Crit?: [[ @{weapon1attackcalc} ]] }} {{fumbleroll=Fumble: [[ d20 ]] }} {{damage1=for [[ @{weapon1damage} ]]dmg}} {{critdmg1=+ [[ @{weapon1crit} ]] crit dmg}} {{fullattackflag= [[ 0d1 ]] }}</textarea>
+														</div>
+													</div>
+												</td>
 											</tr>
 										</table>
 									</div>
@@ -1858,12 +1877,14 @@
 			<div style="margin-top: 5px;">
 				<input type="checkbox" class="sheet-pc-turnUndeadMarco-show sheet-arrow" title="turnUndeadMarco-show" name="attr_-show" value="1"/>
 				<span></span>
-				<div style="float: right; margin-right: 60px; width: 730px;">
-					<span style="margin-left: 55px;" data-i18n="turning-check">Turning Check</span>:&nbsp;
+				<div style="float: right; width: 780px;">
+					<span style="font-weight: bold;" data-i18n="turning-check">Turning Check</span>:&nbsp;
 					<button type="roll" name="roll_turningcheck" title="turningcheck" value="@{character_name} &{template:DnD35StdRoll} {{skillflag=true}} {{name=@{character_name} }} {{check=[MAX HD turned](https://www.dandwiki.com/wiki/SRD:Turn_or_Rebuke_Undead ):}} {{checkroll= [[@{turningcheckmacro}]] }}" ></button>
-					<span style="margin-left: 120px;" data-i18n="turning-damage">Turning Damage</span>:&nbsp;
+					
+					<span style="margin-left: 120px; font-weight: bold;" data-i18n="turning-damage">Turning Damage</span>:&nbsp;
 					<button type="roll" name="roll_turningdamage" title="turningdamage" value="&{template:DnD35StdRoll} {{skillflag=true}} {{name=@{character_name} }} {{check=HD turned:}} {{checkroll= [[@{turningdamagemacro}]] }}" ></button>
-					<span style="margin-left: 95px;" data-i18n="full-turning-check">Full Turning Check</span>:&nbsp;
+					
+					<span style="margin-left: 95px; font-weight: bold;" data-i18n="full-turning-check">Full Turning Check</span>:&nbsp;
 					<button type="roll" name="roll_fullturningcheck" title="fullturningcheck" value="@{fullturningmacro}" ></button>
 				</div>
 				<div style="width: 754px; margin-left: 30px;" class="sheet-pc-turnUndeadMarco">
@@ -6663,11 +6684,6 @@ on("change:repeating_summons:summonsautoCalcHP change:repeating_summons:summonsh
 		</div>
 	</div>
 
-	<div class="sheet-tab-content sheet-tab10">
-		<!-- ?? -->
-
-	</div>
-
 <!-- end PC section -->
 </div>
 
diff --git a/D&D_3-5/translation.json b/D&D_3-5/translation.json
index 0d9538726e..8a2c6fba71 100644
--- a/D&D_3-5/translation.json
+++ b/D&D_3-5/translation.json
@@ -142,6 +142,10 @@
 	"available": "Available",
 	"used": "Used",
 	"weapon": "Weapon",
+	"single-attack": "Single Attack",
+	"full-attack": "Full Attack",
+	"damage-roll": "Damage Roll",
+	"single-roll-attack": "Single Roll Attack",
 	"weapon-enhancement-a": "Weapon Enh",
 	"weapon-focus-s": "Weapon<br>Focus",
 	"weapon-specialization-as": "Weapon<br>Specialize",