Merge pull request #12160 from Tealk/butterflyaspect

[ButterflyAspect] bugfix
Roll20 · Sep 19, 2023 · e26eb9d · e26eb9d
2 parents 12fe1df + 5b53c9f
commit e26eb9d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/ButterflyAspect/ButterflyAspect.css b/ButterflyAspect/ButterflyAspect.css
diff --git a/ButterflyAspect/ButterflyAspect.css.map b/ButterflyAspect/ButterflyAspect.css.map
diff --git a/ButterflyAspect/ButterflyAspect.html b/ButterflyAspect/ButterflyAspect.html
@@ -116,14 +116,14 @@
               <option value="@{Na}">Nahkampf</option>
             </select>
           </div>
-          <div><input type="number" name="attr_unbewaffnet_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_unbewaffnet_skill" title="Fertigkeitswert" value="1" min="1" /></div>
           <div><input type="number" name="attr_unbewaffnet_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Unbewaffnet Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{unbewaffnet}}} {{rolling=[[{@{unbewaffnet_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{unbewaffnet_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{unbewaffnet}}} {{rolling=[[{@{unbewaffnet_skill}d10!}k@{Na}]]}} {{rolling2=[[{@{unbewaffnet_skill}d10!}k@{Na}]]}}"
             ></button>
           </div>
         </div>
@@ -134,14 +134,14 @@
               <option value="@{Fe}">Fernkampf</option>
             </select>
           </div>
-          <div><input type="number" name="attr_werfen_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_werfen_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_werfen_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Werfen Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{werfen}}} {{rolling=[[{@{werfen_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{werfen_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{werfen}}} {{rolling=[[{@{werfen_skill}d10!}k@{Fe}]]}} {{rolling2=[[{@{werfen_skill}d10!}k@{Fe}]]}}"
             ></button>
           </div>
         </div>
@@ -152,14 +152,14 @@
               <option value="@{Ge}">Geschick</option>
             </select>
           </div>
-          <div><input type="number" name="attr_athletik_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_athletik_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_athletik_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Athletik Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{athletik}}} {{rolling=[[{@{athletik_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{athletik_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{athletik}}} {{rolling=[[{@{athletik_skill}d10!}k@{Ge}]]}} {{rolling2=[[{@{athletik_skill}d10!}k@{Ge}]]}}"
             ></button>
           </div>
         </div>
@@ -170,14 +170,14 @@
               <option value="@{Wa}">Wahrnehmung</option>
             </select>
           </div>
-          <div><input type="number" name="attr_aufmerksamkeit_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_aufmerksamkeit_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_aufmerksamkeit_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Aufmerksamkeit Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{aufmerksamkeit}}} {{rolling=[[{@{aufmerksamkeit_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{aufmerksamkeit_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{aufmerksamkeit}}} {{rolling=[[{@{aufmerksamkeit_skill}d10!}k@{Wa}]]}} {{rolling2=[[{@{aufmerksamkeit_skill}d10!}k@{Wa}]]}}"
             ></button>
           </div>
         </div>
@@ -188,14 +188,14 @@
               <option value="@{Ko}">Konstitution</option>
             </select>
           </div>
-          <div><input type="number" name="attr_gewalt_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_gewalt_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_gewalt_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Gewalt Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{gewalt}}} {{rolling=[[{@{gewalt_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{gewalt_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{gewalt}}} {{rolling=[[{@{gewalt_skill}d10!}k@{Ko}]]}} {{rolling2=[[{@{gewalt_skill}d10!}k@{Ko}]]}}"
             ></button>
           </div>
         </div>
@@ -206,14 +206,14 @@
               <option value="@{in}">Intelligenz</option>
             </select>
           </div>
-          <div><input type="number" name="attr_knobeln_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_knobeln_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_knobeln_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Knobeln Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{knobeln}}} {{rolling=[[{@{knobeln_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{knobeln_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{knobeln}}} {{rolling=[[{@{knobeln_skill}d10!}k@{in}]]}} {{rolling2=[[{@{knobeln_skill}d10!}k@{in}]]}}"
             ></button>
           </div>
         </div>
@@ -224,14 +224,14 @@
               <option value="@{Wi}">Wissen</option>
             </select>
           </div>
-          <div><input type="number" name="attr_geisteswissenschaft_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_geisteswissenschaft_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_geisteswissenschaft_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Geisteswissenschaft Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{geisteswissenschaft}}} {{rolling=[[{@{geisteswissenschaft_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{geisteswissenschaft_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{geisteswissenschaft}}} {{rolling=[[{@{geisteswissenschaft_skill}d10!}k@{Wi}]]}} {{rolling2=[[{@{geisteswissenschaft_skill}d10!}k@{Wi}]]}}"
             ></button>
           </div>
         </div>
@@ -242,14 +242,14 @@
               <option value="@{Ca}">Charisma</option>
             </select>
           </div>
-          <div><input type="number" name="attr_einschaetzen_skill" title="Fertigkeitswert" value="1" /></div>
+          <div><input type="number" name="attr_einschaetzen_skill" title="Fertigkeitswert" value="1" min="1"  /></div>
           <div><input type="number" name="attr_einschaetzen_pp" title="Praxispunkt" value="0" /></div>
           <div>
             <button
               type="roll"
               name="roll_skill"
               title="Einschätzen Würfeln"
-              value="@{abilityroll} &{template:butterfly} {{name=@{einschaetzen}}} {{rolling=[[{@{einschaetzen_skill}d10!}k@{attribut}]]}} {{rolling2=[[{@{einschaetzen_skill}d10!}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{einschaetzen}}} {{rolling=[[{@{einschaetzen_skill}d10!}k@{Ca}]]}} {{rolling2=[[{@{einschaetzen_skill}d10!}k@{Ca}]]}}"
             ></button>
           </div>
         </div>
@@ -369,7 +369,7 @@
             <input type="checkbox" name="attr_ziehlbereich" value="10" />
           </div>
           <div id="verbraucht"><input type="checkbox" name="attr_verbraucht" title="Zauber ist verbraucht" value="1" /></div>
-          <div><input type="number" name="attr_spelluse" title="Nutzung" value="0" /></div>
+          <div><input type="number" name="attr_spelluse" title="Zauber benutzungsanzahl" value="0" /></div>
           <div>
             <button
               type="roll"
@@ -574,7 +574,7 @@
 
   <div class="break"></div>
 
-  <div class="float full version">v2023-07-31</div>
+  <div class="float full version">v2023-09-18</div>
 </div>
 
 <!-- rolltemplate -->

diff --git a/ButterflyAspect/ButterflyAspect.sass b/ButterflyAspect/ButterflyAspect.sass
@@ -169,8 +169,11 @@ input::read-only
           -moz-box-shadow: none
           box-shadow: none
 
-        .repitem:nth-child(even)
-          background: var(--color-surface2)
+        .repitem,
+        .items
+
+          &:nth-child(even)
+            background: var(--color-surface2)
 
         .repcontrol_move
           float: left
@@ -651,8 +654,11 @@ input::read-only
 
       .gridplace
 
-        .repitem:nth-child(2n)
-          background-color: rgb(34, 36, 38)
+        .repitem,
+        .items
+
+          &:nth-child(even)
+            background-color: rgb(34, 36, 38)
 
       .skills,
       .weapons,