+
b
+
+
Sensors (Electronics (sensors) DM)
-
+
b
Camoflage (Recon DM)
-
+
b
+
+
Stealth (Electronics (sensors) DM)
-
@@ -5413,11 +5538,28 @@
const mod = (calc <= 0) ? -3 : (Math.floor(calc/3) -2);
setAttrs({
[`calc-${stat}`]: calc,
+ [`current-${stat}`]: calc,
+ [`currwithmax-${stat}`]: score,
+ [`currwithmax-${stat}_max`]: score,
[`mod-${stat}`]: mod
- });
+ }, {silent: true}); // Do not propogate to fire the 'current' listener below
});
});
- });
+
+ // This should only get triggered from an actual change to a current value, in which case we set the
+ // injury to calculate our mod
+ on(`change:current-${stat.toLowerCase()}`, function () {
+ getAttrs([`base-${stat}`, `current-${stat}`], function(values) {
+ // Set current
+ const score = int(values[`base-${stat}`]);
+ const current = int(values[`current-${stat}`]);
+ const injury = current - score;
+ setAttrs({
+ [`injury-${stat}`]: injury
+ }); // This will fire the 'injury' listener above to re-calc mod
+ });
+ });
+ });
on("change:repeating_characteristic:base change:repeating_characteristic:injury", function (info) {
@@ -5428,6 +5570,7 @@
const injuryAttr = "repeating_characteristic_" + rowId + "_injury";
const modAttr = "repeating_characteristic_" + rowId + "_modifier";
const calcAttr = "repeating_characteristic_" + rowId + "_calc";
+ const currentAttr = "repeating_characteristic_" + rowId + "_current";
getAttrs([baseAttr, injuryAttr, modAttr], function(values) {
@@ -5437,8 +5580,30 @@
const mod = (calc <= 0) ? -3 : (Math.floor(calc/3) -2);
setAttrs({
+ [calcAttr]: calc,
+ [currentAttr]: calc,
[modAttr]: mod
- });
+ }, {silent: true}); // Do not propogate to fire the 'current' listener below
+ });
+ });
+
+ // This should only get triggered from an actual change to a current value, in which case we set the
+ // injury to calculate our mod
+ on(`change:repeating_characteristic:current`, function (info) {
+
+ const rowId = info.sourceAttribute.split('_')[2];
+ const baseAttr = "repeating_characteristic_" + rowId + "_base";
+ const currentAttr = "repeating_characteristic_" + rowId + "_current";
+ const injuryAttr = "repeating_characteristic_" + rowId + "_injury";
+
+ getAttrs([baseAttr, currentAttr], function(values) {
+ // Set current
+ const score = int(values[baseAttr]);
+ const current = int(values[currentAttr]);
+ const injury = current - score;
+ setAttrs({
+ [injuryAttr]: injury
+ }); // This will fire the 'injury' listener above to re-calc mod
});
});
@@ -5474,7 +5639,7 @@
on(`change:${skill.toLowerCase()} sheet:opened`, () => {
getAttrs([skill], values => {
const toggle = int(values[skill]);
- console.log("MgT2E: Skill: " + skill + ", toggle: " + toggle);
+ //console.log("MgT2E: Skill: " + skill + ", toggle: " + toggle);
setAttrs({
[`${skill}_show`]: toggle
})
@@ -5492,68 +5657,6 @@
});
});
- /*
- * TODO Deprecated for now
- */
- on("change:skill_trained", (info) => {
-
- console.log("MgT2E: Skill trained: " + JSON.stringify(info));
-
- attrs=[];
- skills.forEach(skill => {
- attrs.push("untrained-" + skill);
- });
-
- const showTrained = +info.newValue === 1;
- console.log("MgT2E: showTrained: " + showTrained);
-
- getAttrs(attrs, values => {
-
- var attrsToSet = {};
- skills.forEach(skill => {
-
- //console.log("MgT2E: skill: " + skill + ": " + +values["untrained-" + skill]);
- if(showTrained) {
- if(+values["untrained-" + skill] === 0) {
- // Show this
- attrsToSet[skill + "_show"] = 1;
- }
- else {
- // Hide this
- attrsToSet[skill + "_show"] = 0;
- }
- }
- else {
- // Show everything
- attrsToSet[skill + "_show"] = 1;
- }
- /*
- if(+values["untrained-" + skill] === 0 && +info.newValue === 1) {
- // Trained
- attrsToSet[skill + "_show"] = 1;
- }
- else {
- attrsToSet[skill + "_show"] = 0;
- }
- */
- //attrsToSet[skill + "_show"] = +info.newValue === 0 ? 1 : 0;
- /*
- if(+values["untrained-" + skill] === 0) {
- // Trained
- attrsToSet[skill + "_show"] = 1;
- }
- else {
- // Untrained
- attrsToSet[skill] = info.newValue === 0 ? "1" : "0";
- }
-
- */
- });
-
- setAttrs(attrsToSet);
- });
- });
-
const buttonlist = ["prime","skills","inventory","combat","powers","notes"];
buttonlist.forEach(button => {
on(`clicked:${button}`, function() {
@@ -9121,31 +9224,6 @@
});
});
});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.png b/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.png
index cdeb6a9f51..c89063a687 100644
Binary files a/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.png and b/Mongoose Traveller 2e Official/Official Mongoose Publishing Traveller 2nd Edition.png differ
diff --git a/Mongoose Traveller 2e Official/README.md b/Mongoose Traveller 2e Official/README.md
index 2cb9c9a3fb..7568d78d14 100644
--- a/Mongoose Traveller 2e Official/README.md
+++ b/Mongoose Traveller 2e Official/README.md
@@ -25,4 +25,15 @@ This is the Official Mongoose Traveller 2nd Edition Character Sheet
- Removed all table elements
+### Version 1.0.04
+
+- Fixed URL to orange divider
+- Increased and normalised font sizes, borders, colours and spacing across sheet
+- Fixed bug in Ship sheet repeating blocks
+- Added 'Current Characteristic Values' toggle to allow characteristics to use absolute levels rather than 'Temp' offsets and set the _max version of a version of these attributes to allow better representation on tokens
+- Added missing translations
+- Updated character sheet image
+- Fixed Jack-of-All-Trades not updating untrained skill DMs properly
+
+
diff --git a/Mongoose Traveller 2e Official/translation.json b/Mongoose Traveller 2e Official/translation.json
index 7adc87c1ae..044841a5ee 100644
--- a/Mongoose Traveller 2e Official/translation.json
+++ b/Mongoose Traveller 2e Official/translation.json
@@ -1,7 +1,10 @@
{
"rating-u": "Rating",
"temp-u": "Temp",
+ "current-u": "Current",
"mod-u": "Mod",
+ "type-u": "Type",
+ "roll-u": "Roll",
"strength-u": "Strength",
"dexterity-u": "Dexterity",
"endurance-u": "Endurance",
@@ -30,6 +33,7 @@
"enemiestitle-u": "Enemies",
"rivalstitle-u": "Rivals",
"skillstitle-u": "Skills",
+ "skilltotal-u": "Skill Total",
"skills-all-u": "All",
"skills-combat-u": "Combat",
"skills-trained-u": "Show Trained",
@@ -51,6 +55,7 @@
"skilleducationoption-u": "Education",
"skillenduranceoption-u": "Endurance",
"skillsocialoption-u": "Social",
+ "skillpsionicstrengthoption-u": "Psionic Strength",
"skilltableroll-u": "Roll",
"equipmenttitle-u": "Equipment",
"geartitle-u": "Gear",
@@ -83,7 +88,10 @@
"armourvaccsuit2-u": "Vacc Suit 2",
"armourvaccsuit3-u": "Vacc Suit 3",
"armourvaccsuit4-u": "Vacc Suit 4",
- "initiativeroll-u": "",
+ "initiativeroll-u": "Roll Initiative (Select Token)",
+ "initiativeeffect-u": "Initiative Effect",
+ "wounds-u": "Wounds",
+ "showcurrcharvalues-u": "Show Current Characteristic Values",
"weaponstitle-u": "Weapons",
"weaponroll-u": "Roll",
"weaponweapon-u": "Weapon",
@@ -98,6 +106,9 @@
"weaponautomode-u": "Mode",
"powerstitle-u": "Powers",
"notestitle-u": "Notes",
+ "damage-u": "Damage",
+ "traits-u": "Traits",
+ "behaviour-u": "Behaviour",
"legacy-u": "Legacy",
"normal-u": "Normal",
"prompt-u": "Prompt",
@@ -113,7 +124,7 @@
"modprompt-u": "Modifier: ",
"settings-u": "Settings: ",
"mod_default-Q": "Ask for modifier?",
- "mod_default-D": "Yes prompts for a modifier on every roll, No never pronpts for a modifier, Toggle displays Yes/No buttons.",
+ "mod_default-D": "Yes prompts for a modifier on every roll, No never prompts for a modifier, Toggle displays Yes/No buttons.",
"shipname-u": "Ship Name",
"shipclass-u": "Class",
"shiptl-u": "TL",
@@ -130,6 +141,9 @@
"shipbridge-u": "Bridge",
"shipcomputer-u": "Computer",
"shipsensors-u": "Sensors",
+ "hardpoint-u": "Hardpoint",
+ "sensormod-u": "Sensor Mod",
+ "playermod-u": "Player Mod",
"shipweapons-u": "Weapons",
"shipammunition-u": "Ammunition",
"shipscreens-u": "Screens",
@@ -142,6 +156,9 @@
"shipcommon-u": "Common Areas",
"shipcargo-u": "Cargo",
"shiptotal-u": "TOTAL",
+ "gunnerskill-u": "Gunner Skill",
+ "dexmod-u": "DEX Mod",
+ "custommod-u": "Custom Mod",
"powerreq-u": "Power Requirements",
"powmanu-u": "Manoeuvre Drive",
"powjump-u": "Jump Drive",
@@ -213,12 +230,14 @@
"vaccsuit-u": "VaccSuit",
"otherskills-u": "Other Skills",
"psionicstrength-u": "Psionic Strength",
+ "psicost-u": "PSI Cost",
"npcskills-u": "NPC Skills",
"rollwithboon-u": "Rolling with BOON",
"rollwithbane-u": "Rolling with BANE",
"boonbane-u": "Boon/Bane",
"misc-u": "Misc",
"attack-u": "Attack",
+ "attacks-u": "Attacks",
"initiative-u": "Initiative",
"telepathy-u": "Telepathy",
"clairvoyance-u": "Clairvoyance",