From efdfbeb59e254ddb5cc0745f5365378a60c209d2 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 11 Jul 2017 08:12:52 +0200 Subject: [PATCH 1/3] Moved export to lib --- .../{views/character/export => lib}/improvedInitiativeJson.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rpg-docs/client/{views/character/export => lib}/improvedInitiativeJson.js (100%) diff --git a/rpg-docs/client/views/character/export/improvedInitiativeJson.js b/rpg-docs/client/lib/improvedInitiativeJson.js similarity index 100% rename from rpg-docs/client/views/character/export/improvedInitiativeJson.js rename to rpg-docs/client/lib/improvedInitiativeJson.js From 37291b347a54a0adf3bf593220a0d5eeff1f255f Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 11 Jul 2017 08:42:21 +0200 Subject: [PATCH 2/3] Fixed vulnerabilities, resistances, immunities export closes #96 --- rpg-docs/client/lib/improvedInitiativeJson.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rpg-docs/client/lib/improvedInitiativeJson.js b/rpg-docs/client/lib/improvedInitiativeJson.js index d5e3298e..79aad9b5 100644 --- a/rpg-docs/client/lib/improvedInitiativeJson.js +++ b/rpg-docs/client/lib/improvedInitiativeJson.js @@ -116,10 +116,11 @@ var getDamageMods = function(charId){ ]; // jscs:enable maximumLineLength multipliers = _.groupBy(multipliers, "value"); + var names = o => o.name; return { - "immunities": multipliers["0"] || [], - "resistances": multipliers["0.5"] || [], - "weaknesses": multipliers["2"] || [], + "immunities": _.map(multipliers["0"], names), + "resistances": _.map(multipliers["0.5"], names), + "vulnerabilities": _.map(multipliers["2"], names), }; } From 834b9cf3842990cacd69f3110960dcdeacebb488 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 11 Jul 2017 08:52:47 +0200 Subject: [PATCH 3/3] Added passive perception to improved initiative export closes #97 --- rpg-docs/client/lib/improvedInitiativeJson.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpg-docs/client/lib/improvedInitiativeJson.js b/rpg-docs/client/lib/improvedInitiativeJson.js index 79aad9b5..eb1502e8 100644 --- a/rpg-docs/client/lib/improvedInitiativeJson.js +++ b/rpg-docs/client/lib/improvedInitiativeJson.js @@ -49,7 +49,10 @@ improvedInitiativeJson = function(charId, options){ {"Name": "Cha", "Modifier": skillMod("charismaSave")}, ], "Skills": getSkills(charId), - "Senses": [], + "Senses": [ + "passive Perception " + + Characters.calculate.passiveSkill(charId, "perception") + ], "Languages": getLanguages(charId), "Challenge": "", "Traits": options.features ? getTraits(charId) : [],