diff --git a/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.css b/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.css index e14ca845ef..69f0968199 100644 --- a/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.css +++ b/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.css @@ -1274,6 +1274,10 @@ input.sheet-power[type="checkbox"]:checked + span::before { line-height: 25px; } +.sheet-rolltemplate-alt span:empty { + display: none; +} + .sheet-rolltemplate-alt .sheet-rolltemplate-message > span.inlinerollresult { border: 0 !important; font-size: 20px; diff --git a/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.html b/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.html index 6f08ed35c9..200e7408ef 100644 --- a/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.html +++ b/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.html @@ -10015,7 +10015,20 @@ - + + +
+
+
+ + + + + +
+
+
J-Drive @@ -10023,7 +10036,20 @@ - + + +
+
+
+ + + + + +
+
+
Power Plant @@ -10035,7 +10061,20 @@ - + + +
+
+
+ + + + + +
+
+
Fuel Tanks @@ -10043,7 +10082,20 @@ - + + +
+
+
+ + + + + +
+
+
Bridge @@ -10051,7 +10103,20 @@ - + + +
+
+
+ + + + + +
+
+
Computer @@ -10059,7 +10124,20 @@ - + + +
+
+
+ + + + + +
+
+
Sensors @@ -10284,6 +10362,29 @@
+
+ Other + + + + + + + +
+
+
+ + + + + +
+
+
+

@@ -12712,7 +12813,7 @@

-

Character Sheet Version 1.1.10

+

Character Sheet Version 1.1.11


Assigning Attributes To Tokens

To represent the core character attributes on a token so they can be @@ -14163,7 +14264,7 @@ console.log("MgT2E: Roll weapon: " + JSON.stringify(info)); - getAttrs(["weapon_damage-" + weapon, "weapon_auto-" + weapon, "weapon_automode-" + weapon, "weapon_DM-" + weapon], values => { + getAttrs(["mod-Strength", "weapon_damage-" + weapon, "weapon_auto-" + weapon, "weapon_automode-" + weapon, "weapon_DM-" + weapon, "weapon_range-" + weapon], values => { // Check if auto is set, let autoValue = +values["weapon_auto-" + weapon]; @@ -14201,7 +14302,7 @@ for(let i=1; i<=autoValue; i++) { // If doing Full-Auto then add a suffix weaponSuffix = fullAuto ? " [" + i + "]" : ""; - startRoll("@{whispertoggle}&{template:combat-alt} {{character=@{character_name}}} {{weapon=@{weapon_name-" + weapon + "}" + weaponSuffix + "}} {{effect=[[0D6]]}} @{ro_default_rolltype_nodiff} + @{weapon_DM-" + weapon + "}[DM] + @{weapon_skill-" + weapon + "}[Skill] + @{weapon_mod-" + weapon + "}[Mod] @{ro_default_mod}]]}} {{damage=[[" + wD.weaponDamage + "+" + burstDamage + "]]}} {{effect=''}} {{range=@{weapon_range-" + weapon + "}}}", (results) => { + startRoll("@{whispertoggle}&{template:combat-alt} {{character=@{character_name}}} {{weapon=@{weapon_name-" + weapon + "}" + weaponSuffix + "}} {{effect=[[0D6]]}} @{ro_default_rolltype_nodiff} + @{weapon_DM-" + weapon + "}[DM] + @{weapon_skill-" + weapon + "}[Skill] + @{weapon_mod-" + weapon + "}[Mod] @{ro_default_mod}]]}} {{damage=[[" + wD.weaponDamage + "+" + burstDamage + "]]}} {{effect=''}} {{message=[[0D6]]}} {{range=@{weapon_range-" + weapon + "}}}", (results) => { const toHit = results.results.roll.result; var damage = results.results.damage.result @@ -14213,12 +14314,21 @@ effect = toHit - 8; } + // If weapon is Melee then add strength modifier + let message = ""; + if(values["weapon_range-" + weapon] === "Melee") { + damage += +values["mod-Strength"]; + message = "(Melee)"; + console.log("- Message set to melee"); + } + finishRoll( results.rollId, { roll: toHit, damage: damage, - effect: effect + effect: effect, + message: message } ); }); @@ -14239,7 +14349,7 @@ const weaponAuto = "repeating_weapons_" + rowId + "_weapon_auto-rep"; const weaponAutoMode = "repeating_weapons_" + rowId + "_weapon_automode-rep"; - getAttrs([weaponDamage, weaponAuto, weaponAutoMode, weaponDM], values => { + getAttrs(["mod-Strength", weaponDamage, weaponAuto, weaponAutoMode, weaponDM, weaponRange], values => { // Check if auto is set, let autoValue = +values[weaponAuto]; @@ -14278,7 +14388,7 @@ // If doing Full-Auto then add a suffix weaponSuffix = fullAuto ? " [" + i + "]" : ""; - startRoll("@{whispertoggle}&{template:combat-alt} {{character=@{character_name}}} {{weapon=@{" + weaponName + "}" + weaponSuffix + "}} {{effect=[[0D6]]}} @{ro_default_rolltype_nodiff} + @{" + weaponDM + "}[DM] + @{" + weaponSkill + "}[Skill] + @{" + weaponMod + "}[Mod] @{ro_default_mod}]]}} {{damage=[[" + wD.weaponDamage + "+" + burstDamage + "]]}} {{range=@{" + weaponRange + "}}}", (results) => { + startRoll("@{whispertoggle}&{template:combat-alt} {{character=@{character_name}}} {{weapon=@{" + weaponName + "}" + weaponSuffix + "}} {{effect=[[0D6]]}} @{ro_default_rolltype_nodiff} + @{" + weaponDM + "}[DM] + @{" + weaponSkill + "}[Skill] + @{" + weaponMod + "}[Mod] @{ro_default_mod}]]}} {{damage=[[" + wD.weaponDamage + "+" + burstDamage + "]]}} {{message=[[0D6]]}} {{range=@{" + weaponRange + "}}}", (results) => { const toHit = results.results.roll.result; var damage = results.results.damage.result var effect = 0; @@ -14287,12 +14397,20 @@ effect = toHit - 8; } + // If weapon is Melee then add strength modifier + let message = ""; + if(values[weaponRange] === "Melee") { + damage += +values["mod-Strength"]; + message = "(Melee)"; + } + finishRoll( results.rollId, { roll: toHit, damage: damage, - effect: effect + effect: effect, + message: message } ); }); diff --git a/Mongoose Traveller 2e Official/README.md b/Mongoose Traveller 2e Official/README.md index 3067ebfa81..313673430b 100644 --- a/Mongoose Traveller 2e Official/README.md +++ b/Mongoose Traveller 2e Official/README.md @@ -128,5 +128,9 @@ This is the Official Mongoose Traveller 2nd Edition Character Sheet - Addition of highly detailed Ship Combat tab (with help from Roll20 member and superstar TrooperSJP) - Fix to Robot parsing on drag'n'drop +### Version 1.1.11 +- Added STR modifier when weapon range is 'Melee' as per rules +- Added repeating groups under all ship sheet components to allow for extended/custom/2300AD entries +- ![Image](Official%20Mongoose%20Publishing%20Traveller%202nd%20Edition.png)