diff --git a/GammaWorld3e/README.rst b/GammaWorld3e/README.md
similarity index 100%
rename from GammaWorld3e/README.rst
rename to GammaWorld3e/README.md
diff --git a/GammaWorld3e/sheet.html b/GammaWorld3e/sheet.html
index cda4d0449c..40a6528be9 100644
--- a/GammaWorld3e/sheet.html
+++ b/GammaWorld3e/sheet.html
@@ -1,1874 +1,5 @@
-
-
-
Gamma World 3e
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Physical Abilities
-
-
-
Cur.
-
Orig.
-
Adv.
-
Tmp.
-
Mod.
-
Roll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Mental Abilities
-
-
-
Cur.
-
Orig.
-
Adv.
-
Tmp.
-
Mod.
-
Roll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Mutations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Attacks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Armour
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Gear
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
kg.
-
-
-
-
Combat Stats
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Skills
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Talents
-
-
-
-
-
-
-
Coins
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Cells
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Combat Stats
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Physical
-
-
Energy
-
-
Mental
-
-
-
-
-
-
-
-
-
Physical Abilities
-
-
-
Cur.
-
Orig.
-
Adv.
-
Tmp.
-
Mod.
-
Roll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Mental Abilities
-
-
-
Cur.
-
Orig.
-
Adv.
-
Tmp.
-
Mod.
-
Roll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Mutations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Attacks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
${description}
`;
+ }
+ }
+
+ if (parameters["save"]) {
+ save = parameters["save"];
+ }
+ let effectsContent = "";
+ // override save type from damage type
+ if (parameters["dmg_type"]) {
+ log(
+ "Damage Type: " +
+ data["damage_types"][parameters["dmg_type"]].name
+ );
+ if (data["damage_types"][parameters["dmg_type"]]) {
+ if (data["damage_types"][parameters["dmg_type"]].save) {
+ save = data["damage_types"][parameters["dmg_type"]].save;
+ }
+ if (data["damage_types"][parameters["dmg_type"]].effect_crit) {
+ parameters["effect_crit"] =
+ data["damage_types"][parameters["dmg_type"]].effect_crit;
+ }
+ if (data["damage_types"][parameters["dmg_type"]].effect) {
+ parameters["effect"] =
+ data["damage_types"][parameters["dmg_type"]].effect;
+ }
+ if (data["damage_types"][parameters["dmg_type"]].description) {
+ content += `Damage Type: ${
+ data["damage_types"][parameters["dmg_type"]].name
+ }${
+ data["damage_types"][parameters["dmg_type"]].description
+ }
`;
}
}
}
if (parameters["effect"]) {
effectName = parameters["effect"];
+ log("effect name: " + effectName);
if (
!empty(data.effects) &&
!empty(data.effects[parameters["effect"]])
) {
- effectName = data.effects[parameters["effect"]].name;
+ effectDisplayName = data.effects[parameters["effect"]].name;
+ log("effect name: " + effectDisplayName);
// let result = getEffectResult(parameters['effect'], colorResult.background);
- content += `Effect:
${effectName}
`;
+ content += `Effect:
${effectDisplayName}
`;
} else if (
!empty(data.damage_types) &&
data.damage_types[parameters["effect"]]
) {
- log(
- "damage_type based on effect: " +
- parameters["effect"] +
- ", " +
- data.damage_types[parameters["effect"]]
- );
- content += `Effect: Critical Effect: ${
data.effects[parameters["effect_crit"]].name
}
`;
- } else if (data.damage_types[parameters["effect_crit"]]) {
- log(data.damage_types);
- log(parameters["effect_crit"]);
- log(data.damage_types[parameters["effect_crit"]]);
- content += `Critical Effect: ${
- data.damage_types[parameters["effect_crit"]].name
- }
`;
- save = data.damage_types[parameters["effect_crit"]].save;
}
+ // else if (data.damage_types[parameters["effect_crit"]]) {
+ // log("Crit effect according to Damage Type");
+ // log(data.damage_types);
+ // log(parameters["effect_crit"]);
+ // log(data.damage_types[parameters["effect_crit"]]);
+ // content += `Critical Effect: ${
+ // data.damage_types[parameters["effect_crit"]].name
+ // }
`;
+ // save = data.damage_types[parameters["effect_crit"]].save;
+ // content += renderSaveRoll(
+ // save,
+ // targetCharacter,
+ // roll2,
+ // parameters,
+ // effectType,
+ // colorResult,
+ // effectName
+ // );
+ // }
}
}
-
- if (parameters["save"]) {
- save = save || parameters["save"];
- let saveScore = getAttrByName(targetCharacter.id, `${save}`);
- let effectsActRow = getActRow(saveScore);
- let effectsColorResult = getRollColour(roll2, effectsActRow);
- let effectsResult = { result: effectsColorResult.background };
- let result = "";
- log("effectType: " + effectType);
- log(parameters[effectType]);
- if (!empty(data.effects) && data.effects[parameters[effectType]]) {
- effectsResult = getEffectResult(
- parameters[effectType],
- effectsColorResult.background
- );
- }
- result = effectsResult.result;
- let success =
- parseInt(effectsColorResult.RF) >= parseInt(colorResult.RF);
- let successMessage = success
- ? `success`
- : `fail`;
- content += `Save (${effectName}): ${result} ${successMessage}
`;
+ if (!empty(save)) {
+ content += renderSaveRoll(
+ save,
+ targetCharacter,
+ roll2,
+ parameters,
+ effectType,
+ colorResult,
+ effectsContent
+ );
+ } else {
+ log('Will not render Save as the "save" parameter was not set.');
}
send(msg, parameters, title, content);
});
},
+ renderSaveRoll = (
+ save,
+ targetCharacter,
+ roll2,
+ parameters,
+ effectType,
+ colorResult,
+ effectsContent
+ ) => {
+ const data = getData();
+ if (!data) {
+ return;
+ }
+ log("START renderSaveRoll");
+ let saveScore = getAttrByName(targetCharacter.id, `${save}`);
+ log("saveScore: " + saveScore);
+ let effectsActRow = getActRow(saveScore);
+ log("effectsActRow");
+ log(effectsActRow);
+ let effectsColorResult = getRollColour(roll2, effectsActRow);
+ let effectsResult = { result: effectsColorResult.background };
+ let result = "";
+ if (!empty(data.effects) && data.effects[parameters[effectType]]) {
+ effectsResult = getEffectResult(
+ parameters[effectType],
+ effectsColorResult.background
+ );
+ }
+ result = effectsResult.result;
+ let success =
+ parseInt(effectsColorResult.RF) >= parseInt(colorResult.RF);
+ let successMessage = success
+ ? `success`
+ : `fail`;
+
+ log("END renderSaveRoll");
+ let content = `Save vs. ${save}: ${result} ${successMessage}
`;
+ if (!success) {
+ content += effectsContent;
+ }
+ return content;
+ },
getActRow = (rank) => {
log("getActRow");
rank = parseInt(rank);
@@ -799,27 +1009,27 @@ var GW3Companion =
A: [18, 74, 99, null, null, 100],
B: [17, 73, 98, 99, null, 100],
C: [16, 72, 97, 99, null, 100],
- "1": [15, 71, 96, 98, 99, 100],
- "2": [14, 69, 94, 97, 99, 100],
- "3": [13, 68, 93, 97, 97, 100],
- "4": [12, 66, 91, 96, 97, 100],
- "5": [11, 62, 87, 93, 97, 99],
- "6": [10, 60, 85, 92, 96, 99],
- "7": [9, 58, 83, 91, 96, 99],
- "8": [8, 56, 80, 89, 95, 99],
- "9": [7, 54, 78, 88, 93, 99],
- "10": [6, 52, 75, 86, 92, 99],
- "11": [5, 49, 71, 83, 91, 98],
- "12": [5, 47, 68, 81, 90, 98],
- "13": [4, 44, 65, 79, 89, 98],
- "14": [4, 42, 62, 77, 88, 98],
- "15": [4, 40, 58, 75, 87, 98],
- "16": [3, 37, 53, 72, 86, 97],
- "17": [3, 35, 49, 70, 85, 97],
- "18": [3, 33, 45, 68, 84, 97],
- "19": [3, 30, 41, 66, 83, 97],
- "20": [2, 26, 36, 63, 82, 96],
- "21": [2, 23, 32, 61, 81, 96],
+ 1: [15, 71, 96, 98, 99, 100],
+ 2: [14, 69, 94, 97, 99, 100],
+ 3: [13, 68, 93, 97, 97, 100],
+ 4: [12, 66, 91, 96, 97, 100],
+ 5: [11, 62, 87, 93, 97, 99],
+ 6: [10, 60, 85, 92, 96, 99],
+ 7: [9, 58, 83, 91, 96, 99],
+ 8: [8, 56, 80, 89, 95, 99],
+ 9: [7, 54, 78, 88, 93, 99],
+ 10: [6, 52, 75, 86, 92, 99],
+ 11: [5, 49, 71, 83, 91, 98],
+ 12: [5, 47, 68, 81, 90, 98],
+ 13: [4, 44, 65, 79, 89, 98],
+ 14: [4, 42, 62, 77, 88, 98],
+ 15: [4, 40, 58, 75, 87, 98],
+ 16: [3, 37, 53, 72, 86, 97],
+ 17: [3, 35, 49, 70, 85, 97],
+ 18: [3, 33, 45, 68, 84, 97],
+ 19: [3, 30, 41, 66, 83, 97],
+ 20: [2, 26, 36, 63, 82, 96],
+ 21: [2, 23, 32, 61, 81, 96],
X: [2, 20, 27, 59, 80, 96],
Y: [2, 17, 22, 56, 78, 95],
Z: [2, 13, 16, 51, 76, 94],
@@ -973,21 +1183,23 @@ var GW3Companion =
}
if (category === "attacks" || category === "ammo") {
if (category === "attacks") {
- let character_rank = parseInt(
- getAttrByName(character.id, "character_rank")
- );
- log("character rank:" + character_rank);
- if (character_rank === NaN) {
- log(
- "character rank was not found and thus the attack rank could not be accurately determined and will default to 1"
- );
- character_rank = 1;
- }
- let obj = Object.assign(objTemplate, {
- name: `repeating_${category}_${rowId}_rank`,
- current: character_rank,
- });
- createObj("attribute", obj);
+ //@deprecated: Attack ranks are distinct from Character ranks
+ // log("import attack");
+ // let character_rank = parseInt(
+ // getAttrByName(character.id, "character_rank")
+ // );
+ // log("character rank:" + character_rank);
+ // if (_.isNaN(character_rank)) {
+ // log(
+ // "character rank was not found and thus the attack rank could not be accurately determined and will default to 1"
+ // );
+ // character_rank = 1;
+ // }
+ // let obj = Object.assign(objTemplate, {
+ // name: `repeating_${category}_${rowId}_rank`,
+ // current: character_rank,
+ // });
+ // createObj("attribute", obj);
}
// also add it to gear
_.each(itemAttributes, (attributeValue, attributeName) => {
@@ -1138,13 +1350,13 @@ var GW3Companion =
sendChat(
script_name,
whisper +
- '' +
title +
contents +
- "
",
+ "
' +
title +
contents +
- "
",
+ "