suabthon

Author: ramsteream

subathon/control-panel-main.js

@@ -24,8 +24,8 @@ window.controlPanel.serviceModules.registerServiceModuleProvider({
                     "t2": [true, 480],
                     "t3": [true, 600],
                     "sub": [true, 360],
-                    "tip": [true, 600],
-                    "cheer": [true, 240],
+                    "tip": [true, 40],
+                    "cheer": [true, 20],
                     "follow": [true, 60],
 
                 },
@@ -114,6 +114,8 @@ window.controlPanel.serviceModules.registerServiceModuleProvider({
             managedData.timeAdditions.follow=[document.getElementById("follow-enabled").checked,formatTime2sec(document.getElementById("follow-duration").value)];
             managedData.commands.pause=document.getElementById("pause-command").value;
             managedData.commands.resume=document.getElementById("resume-command").value;
+            managedData.commands.addTime=document.getElementById("addtime-command").value;
+           
             managedData.messages.pasueMessage=document.getElementById("pause-message").value;
             managedData.messages.endMessage=document.getElementById("end-message").value;
             console.log(managedData.timeAdditions);

subathon/controller.html

@@ -114,7 +114,7 @@ <h3>Time Additions</h3><br />
                 <div class="row g-2 mb-3">
 
                     <div class="form-check form-switch col">
-                        <label class="form-label" for="tip-duration">Tips</label>
+                        <label class="form-label" for="tip-duration">Tips (per $1)</label>
                         <input class="form-check-input durationToggle" type="checkbox" role="switch" id="tip-enabled">
 
                     </div>
@@ -123,7 +123,7 @@ <h3>Time Additions</h3><br />
                 <div class="row g-2 mb-3">
 
                     <div class="form-check form-switch col">
-                        <label class="form-label" for="cheer-duration">Cheers</label>
+                        <label class="form-label" for="cheer-duration">Cheers (per x500)</label>
                         <input class="form-check-input durationToggle" type="checkbox" role="switch"  id="cheer-enabled">
 
                     </div>

subathon/widget-main.js

@@ -71,8 +71,8 @@ window.widget.serviceModules.registerServiceModuleProvider({
               "t1": [true, 360],
               "t2": [true, 480],
               "t3": [true, 600],
-              "tip": [true, 600],
-              "cheer": [true, 600],
+              "tip": [true, 40],
+              "cheer": [true, 20],
               "follow": [true, 60],
 
           },
@@ -200,6 +200,7 @@ window.widget.serviceModules.registerServiceModuleProvider({
 
     // Define what happens when we receive an Activity]
     async function handle_activityReceived({activity}) {
+      if (activity.isMock)return;
       if (window.widget.persistentStorage.getValue({ key: "state" })!="play") return; // only get events when the timer is running
       let str = "";
       // Update subathon end timestamp
@@ -225,15 +226,21 @@ window.widget.serviceModules.registerServiceModuleProvider({
           break;
         case 'tip':
           str = managedData.timeAdditions.tip[1];
-          if (isInt(str) && managedData.timeAdditions.tip[0]) addTime(parseInt(str, 10));
+          var amount=Math.floor(parseInt(str, 10)*activity.data.amount);
+          window.widget.bindableData.setValue({key:"subathon_tipAddition",value:amount});
+          console.log(amount);
+          if (isInt(str) && managedData.timeAdditions.tip[0]) addTime(amount);
           break;
         case 'follow':
           str = managedData.timeAdditions.follow[1];
           if (isInt(str) && managedData.timeAdditions.follow[0]) addTime(parseInt(str, 10));
           break;
         case 'cheer':
           str = managedData.timeAdditions.cheer[1];
-          if (isInt(str) && managedData.timeAdditions.cheer[0]) addTime(parseInt(str, 10));
+          var amount=Math.floor(parseInt(str, 10)*activity.data.amount/500);
+          console.log(amount);
+          window.widget.bindableData.setValue({key:"subathon_tipAddition",value:amount});
+          if (isInt(str) && managedData.timeAdditions.cheer[0]) addTime(amount);
           break;
       }
     }