From 13b98abcfc8aa9ca34900a349dad9ef8ee825cc3 Mon Sep 17 00:00:00 2001
From: alberto-aresu <55198329+alberto-aresu@users.noreply.github.com>
Date: Thu, 28 Apr 2022 19:37:27 +0200
Subject: [PATCH] fixd merit function

---
 Ultima Torcia - Pagina Singola/lutps.html | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Ultima Torcia - Pagina Singola/lutps.html b/Ultima Torcia - Pagina Singola/lutps.html
index d41366c754..03c4dbed92 100644
--- a/Ultima Torcia - Pagina Singola/lutps.html	
+++ b/Ultima Torcia - Pagina Singola/lutps.html	
@@ -613,17 +613,15 @@
 
 </div>
 
-  <!-- this script is not my work. Is made by Francesco Calise and Giovanni M. -->
 <script type="text/worker">
 
-  on("change:attr_agility_merit change:attr_courage_merit change:attr_strength_merit change:attr_intelligence_merit change:attr_magic_merit change:attr_dexterity_merit change:attr_perception_merit change:attr_presence_merit ",
+  on("change:agility_merit change:courage_merit change:strength_merit change:intelligence_merit change:magic_merit change:dexterity_merit change:perception_merit change:presence_merit ",
   (eventInfo) => {
-  const merit ="ro<2";
+  const merit= "ro<2";
   
   switch(eventInfo.sourceAttribute){
-      case "attr_agility_merit":{
+      case "agility_merit":{
           getAttrs(["agility_roll"], v => {
-            console.log("agility_roll", v)
               if(!v.agility_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Agilità}} {{Agilità:= [[@{agility}d10kh1" + merit + " @{agility_mod}]] }}"
                   setAttrs({
@@ -638,7 +636,7 @@
           });
       break;
       }
-      case "attr_courage_merit":{
+      case "courage_merit":{
           getAttrs(["courage_roll"], v => {
               if(!v.courage_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Coraggio}} {{Coraggio:= [[@{courage}d10kh1" + merit + " @{courage_mod}]] }}"
@@ -654,7 +652,7 @@
           });
       break;
       }
-      case "attr_strength_merit":{
+      case "strength_merit":{
           getAttrs(["strength_roll"], v => {
               if(!v.strength_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Forza}} {{Forza:= [[@{strength}d10kh1" + merit + " @{strength_mod}]] }}"
@@ -670,7 +668,7 @@
           });
       break;
       }
-      case "attr_intelligence_merit":{
+      case "intelligence_merit":{
           getAttrs(["intelligence_roll"], v => {
               if(!v.intelligence_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Intelligenza}} {{Intelligenza:= [[@{intelligence}d10kh1" + merit + " @{intelligence_mod}]] }}"
@@ -686,7 +684,7 @@
           });
       break;
       }
-      case "attr_magic_merit":{
+      case "magic_merit":{
           getAttrs(["magic_roll"], v => {
               if(!v.magic.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Magia}} {{Magia:= [[@{magic}d10kh1" + merit + " @{magic_mod}]] }}"
@@ -702,7 +700,7 @@
           });
       break;
       }
-      case "attr_dexterity_merit":{
+      case "dexterity_merit":{
           getAttrs(["dexterity_roll"], v => {
               if(!v.dexterity_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Manualità}} {{Manualità:= [[@{dexterity}d10kh1" + merit + " @{dexterity_mod}]] }}"
@@ -719,7 +717,7 @@
           });
       break;
       }
-      case "attr_perception_merit":{
+      case "perception_merit":{
           getAttrs(["perception_roll"], v => {
               if(!v.perception_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Percezione}} {{Percezione:= [[@{perception}d10kh1" + merit + " @{perception_mod}]] }}"
@@ -735,7 +733,7 @@
           });
       break;
       }
-      case "attr_presence_merit":{
+      case "presence_merit":{
           getAttrs(["presence_roll"], v => {
               if(!v.presence_roll.includes(merit)){
                   var valueRoll="&{template:default} {{name=@{characterName}, Socialità}} {{Socialità:= [[@{presence}d10kh1" + merit + " @{presence_mod}]] }}"