diff --git a/ShadowrunAnarchy/ShadowrunAnarchy.css b/ShadowrunAnarchy/ShadowrunAnarchy.css index 34ed554fcb..6ca364a604 100644 --- a/ShadowrunAnarchy/ShadowrunAnarchy.css +++ b/ShadowrunAnarchy/ShadowrunAnarchy.css @@ -321,13 +321,14 @@ img.sheet-header { .sheet-karma-bubbles input[type="number"] { border: none; height: 1.5em; - margin-top: -1.8em; + margin-top: -0.5em; width: 5em; } .sheet-karma label { - font-size: 0.9em; - text-align: center; + font-size : 0.9em; + text-align : center; + margin-bottom: 0px; } /**** Dispositions Customizations ****/ diff --git a/ShadowrunAnarchy/ShadowrunAnarchy.html b/ShadowrunAnarchy/ShadowrunAnarchy.html index 53b27b9870..3cac381226 100644 --- a/ShadowrunAnarchy/ShadowrunAnarchy.html +++ b/ShadowrunAnarchy/ShadowrunAnarchy.html @@ -503,7 +503,7 @@
- y + y

NPC Options

@@ -900,16 +900,16 @@
{{#header}}{{header}}{{/header}}{{#spec}}
({{spec}}){{/spec}}
{{#attr}}{{attr}}{{/attr}} - {{#rollLess() wound 0}} ♦ Wounds{{/rollLess() wound 0}} - {{#rollLess() mod 0}} ♦ Modifier{{/rollLess() mod 0}} - {{#rollGreater() mod 0}} ♦ Modifier{{/rollGreater() mod 0}} - {{#rollGreater() edge 0}} ♦ Edge{{/rollGreater() edge 0}} + {{#rollLess() wound 0}} ♦ Wounds{{/rollLess() wound 0}} + {{#rollLess() mod 0}} ♦ Modifier{{/rollLess() mod 0}} + {{#rollGreater() mod 0}} ♦ Modifier{{/rollGreater() mod 0}} + {{#rollGreater() edge 0}} ♦ Edge{{/rollGreater() edge 0}}
{{#dice}}{{dice}}{{/dice}} - {{#rollTotal() glitch 1}}GLITCH! {{glitch}}{{/rollTotal() glitch 1}} - {{#rollBetween() glitch 2 4}}No consequence...{{glitch}}{{/rollBetween() glitch 2 4}} - {{#rollBetween() glitch 5 6}}EXPLOIT! {{glitch}}{{/rollBetween() glitch 5 6}} + {{#rollTotal() glitch 1}}GLITCH! {{glitch}}{{/rollTotal() glitch 1}} + {{#rollBetween() glitch 2 4}}No consequence... {{glitch}}{{/rollBetween() glitch 2 4}} + {{#rollBetween() glitch 5 6}}EXPLOIT! {{glitch}}{{/rollBetween() glitch 5 6}} {{#desc}}{{desc}}{{/desc}}
@@ -1004,63 +1004,47 @@ on("change:edge_toggle", function() { }); //Set the Attribute to a name for the Roll Template -on("change:repeating_skills:skill_attribute", function() { - getAttrs(["repeating_skills_skill_attribute"], function(v) { - console.log(v.repeating_skills_skill_attribute); - switch (v.repeating_skills_skill_attribute) { - case '@{strength}': - setAttrs({ - repeating_skills_attribute_name: "Strength" - }); - break; - case '@{agility}': - setAttrs({ - repeating_skills_attribute_name: "Agility" - }); - break; - case '@{willpower}': - setAttrs({ - repeating_skills_attribute_name: "Willpower" - }); - break; - case '@{logic}': - setAttrs({ - repeating_skills_attribute_name: "Logic" - }); - break; - case '@{charisma}': - setAttrs({ - repeating_skills_attribute_name: "Charisma" - }); - break; - case '@{edge}': - setAttrs({ - repeating_skills_attribute_name: "Edge" - }); - break; - case '0': - setAttrs({ - repeating_skills_attribute_name: "Knowledge" - }); - break; - default: - setAttrs({ - repeating_skills_attribute_name: "Null Attribute" - }); - } +on("change:repeating_skills:skill_attribute", function(eventinfo) { + const skill = eventinfo.newValue; + switch (skill) { + case '@{strength}': + attr = "Strength" + break; + case '@{agility}': + attr = "Agility" + break; + case '@{willpower}': + attr = "Willpower" + break; + case '@{logic}': + attr = "Logic" + break; + case '@{charisma}': + attr = "Charisma" + break; + case '@{edge}': + attr = "Edge" + break; + case '0': + attr = "Knowledge" + break; + default: + attr = "Null Attribute" + } + + setAttrs({ + repeating_skills_attribute_name: attr }); }); //Put () around Skill specializations -on("change:repeating_skills:skill_specalization", function() { - getAttrs(["repeating_skills_skill_specalization"], function(v){ - var ski = "(" + (v.repeating_skills_skill_specalization) + ")"; - var emp = ""; - if (v.repeating_skills_skill_specalization === '') { - setAttrs({repeating_skills_skill_spec_display: emp}); - } else {setAttrs({repeating_skills_skill_spec_display: ski}); - }; - }); +on("change:repeating_skills:skill_specalization", function(eventinfo) { + const ski = eventinfo.newValue; + const spec = (ski) ? `(${ski})` : ""; + + setAttrs({ + repeating_skills_skill_spec_display: spec + }); }); //NPC Skill Toggles @@ -1106,9 +1090,6 @@ on("change:repeating_skills", function() { const skill = (v.repeating_skills_skill); const spec = (v.repeating_skills_skill_specalization); - console.log(skill.length + "skill"); - console.log(spec.length + "spec"); - if (spec === "") { (skill.length > 0 && skill.length <= 24) ? setAttrs({repeating_skills_skill_display: skill}) : diff --git a/ShadowrunAnarchy/translation.json b/ShadowrunAnarchy/translation.json index f72dfdf155..8323262f31 100644 --- a/ShadowrunAnarchy/translation.json +++ b/ShadowrunAnarchy/translation.json @@ -1,61 +1,66 @@ { - "awakened": "Awakened", - "emerged": "Emerged", - "strength": "Strength", - "agility": "Agility", - "willpower": "Willpower", - "logic": "Logic", - "charisma": "Charisma", - "edge": "Edge", - "totalkarma": "Total Karma", - "karmabalance": "Karma Balance", - "dispositions": "Dispositions", - "shadowamps": "Shadow Amps", - "essence": "Essence", - "cues": "Cues", - "qualities": "Qualities", - "weapons": "Weapons", - "unarmed": "Unarmed", - "damage": "Damage", - "close": "Close", - "near": "Near", - "far": "Far", - "condition": "Condition Monitor", - "armor": "Armor", - "physical": "Physical", - "stun": "Stun", - "plot": "Plot", - "gear": "Gear", - "contacts": "Contacts", - "npcoptions": "NPC Options", - "skills": "Skills", - "astralcombat": "Astral Combat", - "athletics": "Athletics", - "biotech": "Biotech", - "closecombat": "Close Combat", - "con": "Con", - "conjuring": "Conjuring", - "disguise": "Disguise", - "electronics": "Electronics", - "engineering": "Engineering", - "escapeartist": "Escape Artist", - "firearms": "Firearms", - "hacking": "Hacking", - "heavyweapons": "Heavy Weapons", - "intimidation": "Intimidation", - "negotiation": "Negotiation", - "pilotground": "Piloting (Ground)", - "pilotother": "Piloting (Other)", + "agility" : "Agility", + "armor" : "Armor", + "astralcombat" : "Astral Combat", + "athletics" : "Athletics", + "awakened" : "Awakened", + "biotech" : "Biotech", + "charisma" : "Charisma", + "close" : "Close", + "closecombat" : "Close Combat", + "con" : "Con", + "condition" : "Condition Monitor", + "conjuring" : "Conjuring", + "contacts" : "Contacts", + "cues" : "Cues", + "damage" : "Damage", + "disguise" : "Disguise", + "dispositions" : "Dispositions", + "edge" : "Edge", + "electronics" : "Electronics", + "emerged" : "Emerged", + "engineering" : "Engineering", + "escapeartist" : "Escape Artist", + "essence" : "Essence", + "exploit" : "EXPLOIT!", + "far" : "Far", + "firearms" : "Firearms", + "gear" : "Gear", + "glitch" : "GLITCH!", + "hacking" : "Hacking", + "heavyweapons" : "Heavy Weapons", + "intimidation" : "Intimidation", + "karmabalance" : "Karma Balance", + "logic" : "Logic", + "modifier" : "Modifier", + "name" : "Name", + "near" : "Near", + "negotiation" : "Negotiation", + "nocons" : "No consequence...", + "npcoptions" : "NPC Options", + "npctoggle" : "Npc Toggle", + "physical" : "Physical", + "physicalbonus" : "Physical Bonus", + "pilotground" : "Piloting (Ground)", + "pilotother" : "Piloting (Other)", + "plot" : "Plot", "projectileweapons": "Projectile Weapons", - "sorcery": "Sorcery", - "stealth": "Stealth", - "survival": "Survival", - "tasking": "Tasking", - "tracking": "Tracking", - "vehicleweapons": "Vehicle Weapons", - "physicalbonus": "Physical Bonus", - "stunbonus": "Stun Bonus", - "npctoggle": "Npc Toggle", - "name": "Name", + "qualities" : "Qualities", + "shadowamps" : "Shadow Amps", + "skills" : "Skills", + "sorcery" : "Sorcery", + "stealth" : "Stealth", + "strength" : "Strength", + "stun" : "Stun", + "stunbonus" : "Stun Bonus", + "survival" : "Survival", + "tasking" : "Tasking", + "totalkarma" : "Total Karma", + "tracking" : "Tracking", + "unarmed" : "Unarmed", + "vehicleweapons" : "Vehicle Weapons", + "weapons" : "Weapons", + "willpower" : "Willpower", + "wounds" : "Wounds", "topps": "The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever." } \ No newline at end of file