-
-
-
+
+
+
@@ -3797,33 +3805,34 @@ var TAS = TAS || (function(){
/* ---- END: TheAaronSheet.js ---- */
-on('change:repeating_othergear', function(){
+on('change:repeating_othergear remove:repeating_othergear', function(){
TAS.repeatingSimpleSum('othergear','masstotalright','weightright');
});
-on('change:repeating_othergear', function(){
+on('change:repeating_othergear remove:repeating_othergear', function(){
TAS.repeatingSimpleSum('othergear','masstotalleft','weightleft');
});
//Total Weight
on("change:weightright change:weightleft sheet:opened", function() {
getAttrs(["weightright", "weightleft"], function(values) {
+ const tw = parseFloat(values.weightright) + parseFloat(values.weightleft);
setAttrs({
- totalweight: (+values.weightright + +values.weightleft)
+ totalweight: tw.toFixed(2)
});
});
});
-on("change:repeating_othergear:massleft change:repeating_othergear:quantityleft sheet:opened", function() {
- getAttrs(["repeating_othergear_massleft", "repeating_othergear_quantityleft"], function(values) {
+on("change:repeating_othergear:massleft change:repeating_othergear:quantityleft change:repeating_othergear:equippedleft sheet:opened", function() {
+ getAttrs(["repeating_othergear_massleft", "repeating_othergear_quantityleft", "repeating_othergear_equippedleft"], function(values) {
setAttrs({
- repeating_othergear_masstotalleft: (parseInt(values.repeating_othergear_massleft)) * (parseInt(values.repeating_othergear_quantityleft))
+ repeating_othergear_masstotalleft: (parseFloat(values.repeating_othergear_massleft).toFixed(2)) * (parseInt(values.repeating_othergear_quantityleft) * parseInt(values.repeating_othergear_equippedleft))
});
});
});
-on("change:repeating_othergear:massright change:repeating_othergear:quantityright sheet:opened", function() {
- getAttrs(["repeating_othergear_massright", "repeating_othergear_quantityright"], function(values) {
+on("change:repeating_othergear:massright change:repeating_othergear:quantityright change:repeating_othergear:equippedright sheet:opened", function() {
+ getAttrs(["repeating_othergear_massright", "repeating_othergear_quantityright", "repeating_othergear_equippedright"], function(values) {
setAttrs({
- repeating_othergear_masstotalright: (parseInt(values.repeating_othergear_massright)) * (parseInt(values.repeating_othergear_quantityright))
+ repeating_othergear_masstotalright: (parseFloat(values.repeating_othergear_massright).toFixed(2)) * (parseInt(values.repeating_othergear_quantityright) * parseInt(values.repeating_othergear_equippedright))
});
});
});
diff --git a/Mongoose_Traveller2e/translation.json b/Mongoose_Traveller2e/translation.json
index aaefb948b3..806d75928f 100644
--- a/Mongoose_Traveller2e/translation.json
+++ b/Mongoose_Traveller2e/translation.json
@@ -52,6 +52,7 @@
"gearcell-u": "Gear",
"gearquantity-u": "Quantity",
"gearweight-u": "KG each",
+ "gearequipped-u": "Carried",
"financestitle-u": "Finances",
"pension-u": "Pension",
"debt-u": "Debt",