mirror of
https://github.com/Nighthawk42/roll20-character-sheets.git
synced 2026-09-02 05:02:28 +00:00
Merge pull request #14615 from Mongoose-Publishing/master
Mongoose Traveller 2e Official - Version 1.1.11
This commit is contained in:
David
@@ -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;
|
||||
|
||||
+131
-13
@@ -10015,7 +10015,20 @@
|
||||
<input type="text" name="attr_shipmdrive_tons" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipmdrive_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipmdrive_bonpen"/>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shipmdrive_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shipmdrive">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shipmdrive_detail-rep"/>
|
||||
<input type="text" name="attr_shipmdrivetons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipmdrive_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipmdrive_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span data-i18n="shipjdrive-u">J-Drive</span>
|
||||
@@ -10023,7 +10036,20 @@
|
||||
<input type="text" name="attr_shipjdrive_tons" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipjdrive_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipjdrive_bonpen"/>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shipjdrive_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shipjdrive">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shipjdrive_detail-rep"/>
|
||||
<input type="text" name="attr_shipjdrivetons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipjdrive_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipjdrive_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span data-i18n="shippower-u">Power Plant</span>
|
||||
@@ -10035,7 +10061,20 @@
|
||||
<input type="text" name="attr_shippower_tons" value="0" min="0"/>
|
||||
<input type="text" name="attr_shippower_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shippower_bonpen"/>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shippower_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shippower">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shippower_detail-rep"/>
|
||||
<input type="text" name="attr_shippowertons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shippower_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shippower_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span data-i18n="shipfuel-u">Fuel Tanks</span>
|
||||
@@ -10043,7 +10082,20 @@
|
||||
<input type="text" name="attr_shipfuel_tons" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipfuel_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipfuel_bonpen"/>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shipfuel_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shipfuel">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shipfuel_detail-rep"/>
|
||||
<input type="text" name="attr_shipfueltons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipfuel_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipfuel_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span data-i18n="shipbridge-u">Bridge</span>
|
||||
@@ -10051,7 +10103,20 @@
|
||||
<input type="text" name="attr_shipbridge_tons" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipbridge_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipbridge_bonpen"/>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shipbridge_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shipbridge">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shipbridge_detail-rep"/>
|
||||
<input type="text" name="attr_shipbridgetons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipbridge_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipbridge_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span data-i18n="shipcomputer-u">Computer</span>
|
||||
@@ -10059,7 +10124,20 @@
|
||||
<input type="text" name="attr_shipcomputer_tons" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipcomputer_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipcomputer_bonpen"/>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shipcomputer_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shipcomputer">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shipcomputer_detail-rep"/>
|
||||
<input type="text" name="attr_shipcomputertons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipcomputer_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipcomputer_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span data-i18n="shipsensors-u">Sensors</span>
|
||||
@@ -10284,6 +10362,29 @@
|
||||
<input type="text" name="attr_shipcargo_cost" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipcargo_bonpen"/>
|
||||
</div>
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span>Other</span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<input type="checkbox" name="attr_shipother_more_show"
|
||||
class="sheet-hider sheet-crate sheet-laf-ship-component-hider" value="1"/>
|
||||
<span class="sheet-laf-ship-component-hider"></span>
|
||||
<input type="checkbox" name="attr_shipother_more_show" class="sheet-hider sheet-hidden"
|
||||
value="1"/>
|
||||
<div class="sheet-laf-ship-component-rep sheet-body">
|
||||
<fieldset class="repeating_shipother">
|
||||
<div class="sheet-laf-centredgrid sheet-laf-ship-components sheet-bold">
|
||||
<span></span>
|
||||
<input type="text" name="attr_shipother_detail-rep"/>
|
||||
<input type="text" name="attr_shipother_tons-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipother_cost-rep" value="0" min="0"/>
|
||||
<input type="text" name="attr_shipother_bonpen-rep"/>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-redborder sheet-laf-ship-crew-p">
|
||||
<h4>
|
||||
@@ -12712,7 +12813,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet-tab-content sheet-help">
|
||||
<h3>Character Sheet Version 1.1.10</h3>
|
||||
<h3>Character Sheet Version 1.1.11</h3>
|
||||
<br>
|
||||
<h4>Assigning Attributes To Tokens</h4>
|
||||
<p style="margin-left: 10px; margin-top: 5px;">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
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
@@ -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
|
||||
-
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user