From 2c4a94e278ba9ce65f341f121f9192b7f12aa4b6 Mon Sep 17 00:00:00 2001
From: Ian Merryweather <mrianmerry@gmail.com>
Date: Sun, 13 Apr 2025 17:59:33 +0100
Subject: [PATCH] feat: Adds range label text to templates

- Adds a range label to move roll templates to enable easier recognition of the range of used moves
---
 PokemonTabletopAdventures_v3/PTA3.html | 82 ++++++++++++++++++++++++--
 PokemonTabletopAdventures_v3/README.md |  5 +-
 2 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/PokemonTabletopAdventures_v3/PTA3.html b/PokemonTabletopAdventures_v3/PTA3.html
index db9aad43f1..91eb88ad9e 100644
--- a/PokemonTabletopAdventures_v3/PTA3.html
+++ b/PokemonTabletopAdventures_v3/PTA3.html
@@ -1,3 +1,20 @@
+<!--
+Table of Contents:
+- Character Sheet
+  - Character Page........L#40
+  - Configuration Page....L#1591
+- Roll Templates
+  - Move-Roll.............L#2111
+  - Dual-Hit-Move-Roll....L#2244
+  - Ten-Hit-Move-Roll.....L#2409
+  - Multi-Hit-Move-Roll...L#2998
+  - Triple-Hit-Move-Roll..L#3322
+  - Skill-Roll............L#3540
+  - Inline-Skill-Roll.....L#3559
+  - Feature-Output........L#3579
+- Sheet Scripts...........L#3595
+-->
+
 <!-- Background coloring strategy inspired by the GURPS sheet -->
 <input class="sheet-color-setting" name="attr_active_type1" type="hidden" value="typeless" />
 <input class="sheet-form-setting" name="attr_display-form" type="hidden" value="" />
@@ -1288,7 +1305,7 @@
               <div class="sheet-pokemon-move-info-header">
                 <span class="sheet-fill-space">
                   <button class="sheet-inline-roller sheet-skill-roller" name="roll-movetemplate" title="Click this to roll this attack with the option of choosing temporary modifiers or effectiveness." type="roll"
-                    value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{target=@{move_category_defense}}} {{effectiveness=?{Effectiveness|Neutral, 0|Super Effective, 1|Extremely Effective, 2|Resisted, -1|Shielded, -2}}} {{effectiveness-roll=[[ 1d1 + 1 + ?{Effectiveness} ]]}} {{critical-damage=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} + [[ @{move_totaldamage} + ?{Temp Damage Bonus|0} ]] ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} ]]}} @{attack_rolls}">
+                    value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{range=@{move_range}}} {{target=@{move_category_defense}}} {{effectiveness=?{Effectiveness|Neutral, 0|Super Effective, 1|Extremely Effective, 2|Resisted, -1|Shielded, -2}}} {{effectiveness-roll=[[ 1d1 + 1 + ?{Effectiveness} ]]}} {{critical-damage=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} + [[ @{move_totaldamage} + ?{Temp Damage Bonus|0} ]] ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} ]]}} @{attack_rolls}">
                     <span name="attr_move_name"></span>
                   </button>
                   <b class="sheet-info-tooltip" title="Click this to roll this attack with the option of choosing temporary modifiers or effectiveness.">ℹ</b>
@@ -1296,7 +1313,7 @@
 
                 <span class="sheet-fill-space sheet-hide-on-mobile">
                   <button class="sheet-inline-roller sheet-skill-roller" name="roll-quick-move" title="Click this to roll this attack without the fuss of choosing temporary modifiers or effectiveness - it will be rolled with Neutral effectiveness, and no modifiers." type="roll"
-                    value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{target=@{move_category_defense}}} {{effectiveness=0}} {{effectiveness-roll=[[2]]}} {{critical-damage=[[ @{move_dicenumber} * @{damage_dice} + @{move_totaldamage} ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ @{move_dicenumber} * @{damage_dice} ]]}} @{quick_attack_rolls}">
+                    value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{range=@{move_range}}} {{target=@{move_category_defense}}} {{effectiveness=0}} {{effectiveness-roll=[[2]]}} {{critical-damage=[[ @{move_dicenumber} * @{damage_dice} + @{move_totaldamage} ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ @{move_dicenumber} * @{damage_dice} ]]}} @{quick_attack_rolls}">
                     Quick Roll
                   </button>
                   <b class="sheet-info-tooltip" title="Click this to roll this attack without the fuss of choosing temporary modifiers or effectiveness - it will be rolled with Neutral effectiveness, and no modifiers.">ℹ</b>
@@ -1331,7 +1348,7 @@
 
                 <span class="sheet-fill-space sheet-hide-on-mobile">
                   <button class="sheet-inline-roller sheet-skill-roller" name="roll-quick-move" title="Click this to roll this attack without the fuss of choosing temporary modifiers or effectiveness - it will be rolled with Neutral effectiveness, and no modifiers." type="roll"
-                    value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{target=@{move_category_defense}}} {{effectiveness=0}} {{effectiveness-roll=[[2]]}} {{critical-damage=[[ @{move_dicenumber} * @{damage_dice} + @{move_totaldamage} ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ @{move_dicenumber} * @{damage_dice} ]]}} @{quick_attack_rolls}">
+                    value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{range=@{move_range}}} {{target=@{move_category_defense}}} {{effectiveness=0}} {{effectiveness-roll=[[2]]}} {{critical-damage=[[ @{move_dicenumber} * @{damage_dice} + @{move_totaldamage} ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ @{move_dicenumber} * @{damage_dice} ]]}} @{quick_attack_rolls}">
                     Quick Roll
                   </button>
                   <b class="sheet-info-tooltip" title="Click this to roll this attack without the fuss of choosing temporary modifiers or effectiveness - it will be rolled with Neutral effectiveness, and no modifiers.">ℹ</b>
@@ -1421,7 +1438,7 @@
                     <option value="triple-hit-move-roll">Three Hits</option>
                     <option value="multi-hit-move-roll">Up to Five Hits</option>
                     <option value="ten-hit-move-roll">Up to Ten Hits</option>
-          </select>
+                  </select>
                 </span>
 
                 <span>
@@ -1492,7 +1509,7 @@
               <div class="sheet-move-notes-roller">
                 <textarea class="sheet-3row-textarea" name="attr_move_effect" placeholder="Additional Effect Notes" spellcheck="false" title="Attribute: move_effect"></textarea>
                 <button class="sheet-move-roller" name="roll-movetemplate" type="roll"
-                  value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{target=@{move_category_defense}}} {{effectiveness=?{Effectiveness|Neutral, 0|Super Effective, 1|Extremely Effective, 2|Resisted, -1|Shielded, -2}}} {{effectiveness-roll=[[ 1d1 + 1 + ?{Effectiveness} ]]}} {{critical-damage=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} + [[ @{move_totaldamage} + ?{Temp Damage Bonus|0} ]] ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} ]]}} @{attack_rolls}">
+                  value="@{publicity_roll} &{template:@{move_template}} {{move-type=@{move_type}}} {{character-name=@{character_name}}} {{character-id=@{character_id}}} {{move-name=@{move_name}}} {{range=@{move_range}}} {{target=@{move_category_defense}}} {{effectiveness=?{Effectiveness|Neutral, 0|Super Effective, 1|Extremely Effective, 2|Resisted, -1|Shielded, -2}}} {{effectiveness-roll=[[ 1d1 + 1 + ?{Effectiveness} ]]}} {{critical-damage=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} + [[ @{move_totaldamage} + ?{Temp Damage Bonus|0} ]] ]]}} {{effect1=@{move_effect1}}} {{effect1_roll=[[ 0 + @{move_effect1} ]]}} {{effect1_name=@{move_effect1_name}}} {{effect1_threshold=[[ 0 + @{move_effect1_threshold} ]]}} {{effect2=@{move_effect2}}} {{effect2_roll=[[ 0 + @{move_effect2} ]]}} {{effect2_name=@{move_effect2_name}}} {{effect2_threshold=[[ 0 + @{move_effect2_threshold} ]]}} {{notes=@{move_effect}}} {{critical-damage-extra=[[ ([[ @{move_dicenumber} + ?{Effectiveness} ]]) * @{damage_dice} ]]}} @{attack_rolls}">
                   T
                 </button>
               </div>
@@ -2101,6 +2118,17 @@
           <td colspan="2" class="sheet-subhead">[{{character-name}}](https://journal.roll20.net/character/{{character-id}}" name="name-link")</td>
         </tr>
 
+        <!-- Range Label -->
+        {{#range}}
+        <tr>
+          <td class="sheet-effectiveness-text" colspan="2">
+            <span>
+              Range: {{range}}
+            </span>
+          </td>
+        </tr>
+        {{/range}}
+
         <!-- Accuracy Check -->
         {{#accuracy}}
         <tr>
@@ -2224,6 +2252,17 @@
             <td colspan="4" class="sheet-subhead">[{{character-name}}](https://journal.roll20.net/character/{{character-id}}" name="name-link")</td>
           </tr>
 
+          <!-- Range Label -->
+          {{#range}}
+          <tr>
+            <td class="sheet-effectiveness-text" colspan="4">
+              <span>
+                Range: {{range}}
+              </span>
+            </td>
+          </tr>
+          {{/range}}
+
           <!-- Targeted Defense -->
           {{#target}}
           <tr>
@@ -2378,6 +2417,17 @@
             <td colspan="4" class="sheet-subhead">[{{character-name}}](https://journal.roll20.net/character/{{character-id}}" name="name-link")</td>
           </tr>
 
+          <!-- Range Label -->
+          {{#range}}
+          <tr>
+            <td class="sheet-effectiveness-text" colspan="4">
+              <span>
+                Range: {{range}}
+              </span>
+            </td>
+          </tr>
+          {{/range}}
+
           <!-- Targeted Defense -->
           {{#target}}
           <tr>
@@ -2956,6 +3006,17 @@
             <td colspan="4" class="sheet-subhead">[{{character-name}}](https://journal.roll20.net/character/{{character-id}}" name="name-link")</td>
           </tr>
 
+          <!-- Range Label -->
+          {{#range}}
+          <tr>
+            <td class="sheet-effectiveness-text" colspan="4">
+              <span>
+                Range: {{range}}
+              </span>
+            </td>
+          </tr>
+          {{/range}}
+
           <!-- Targeted Defense -->
           {{#target}}
           <tr>
@@ -3269,6 +3330,17 @@
             <td colspan="4" class="sheet-subhead">[{{character-name}}](https://journal.roll20.net/character/{{character-id}}" name="name-link")</td>
           </tr>
 
+          <!-- Range Label -->
+          {{#range}}
+          <tr>
+            <td class="sheet-effectiveness-text" colspan="4">
+              <span>
+                Range: {{range}}
+              </span>
+            </td>
+          </tr>
+          {{/range}}
+
           <!-- Targeted Defense -->
           {{#target}}
           <tr>
diff --git a/PokemonTabletopAdventures_v3/README.md b/PokemonTabletopAdventures_v3/README.md
index df1af4252d..540c8cff4c 100644
--- a/PokemonTabletopAdventures_v3/README.md
+++ b/PokemonTabletopAdventures_v3/README.md
@@ -23,6 +23,9 @@ Things we want to add to the character sheet, presented in no particular order o
 
 ## Changelog
 
+### Apr 13, 2025
+- Added a range output to the various move roll templates
+
 ### Jan 28, 2025
 - Updated the Hybrid Character to allow entering the advanced class level
 
@@ -317,4 +320,4 @@ Current mobile bugs that I'm pretty sure are roll20 bugs:
 
 - Initial Commit
 
-</details>
\ No newline at end of file
+</details>