Energy Types (ShadowChemosh-

- Issue #59
-Added in the missing "Fire" selection helper.
-Set tags correctly to have "Energy Type" and "Energy Type (Base 4)" selections work correctly now.
-Changed the Elemental Adept feat back to using these Selection helpers and pulled the Element Tag to the feat so other Picks can easily test the feat for which energy type was chosen.

COM_5ePack - Helper Things.user

@@ -157,21 +157,30 @@
     </thing>
   <thing id="dt5CTrap" name="Traps" compset="DamageType"></thing>
   <thing id="sel5CEleAc" name="Acid" description="Base Elemental Type" compset="SelectHelp">
+    <tag group="Selection" tag="Energy" name="Energy Type (All)"/>
     <tag group="Selection" tag="EnergyBase" name="Energy Type (Base 4)"/>
     <tag group="5CElemType" tag="Acid"/>
     </thing>
   <thing id="sel5CEleCo" name="Cold" description="Base Elemental Type" compset="SelectHelp">
+    <tag group="Selection" tag="Energy" name="Energy Type (All)"/>
     <tag group="Selection" tag="EnergyBase" name="Energy Type (Base 4)"/>
     <tag group="5CElemType" tag="Cold"/>
     </thing>
   <thing id="sel5CEleLi" name="Lightning" description="Base Elemental Type" compset="SelectHelp">
+    <tag group="Selection" tag="Energy" name="Energy Type (All)"/>
     <tag group="Selection" tag="EnergyBase" name="Energy Type (Base 4)"/>
     <tag group="5CElemType" tag="Lightning"/>
     </thing>
-  <thing id="sel5CEleTh" name="Thunder" description="Base Elemental Type" compset="SelectHelp">
+  <thing id="sel5CEleFi" name="Fire" description="Base Elemental Type" compset="SelectHelp">
+    <tag group="Selection" tag="Energy" name="Energy Type (All)"/>
     <tag group="Selection" tag="EnergyBase" name="Energy Type (Base 4)"/>
+    <tag group="5CElemType" tag="Fire"/>
+    </thing>
+  <thing id="sel5CEleTh" name="Thunder" description="Base Elemental Type" compset="SelectHelp">
+    <tag group="Selection" tag="Energy" name="Energy Type (All)"/>
     <tag group="5CElemType" tag="Thunder"/>
     </thing>
+
   <thing id="cfg5CSpeSn" name="Spell Sniper" description="Helper Thing for the feat Spell Sniper." compset="Configure" uniqueness="unique">
     <tag group="Helper" tag="SpCountLev"/>
     <tag group="Helper" tag="ClsCastLev"/>

COM_5ePack - Tags.1st

@@ -17,6 +17,7 @@
   <group id="5CElemType" name="Elemental Types">
     <value id="Acid"      name="Acid"/>
     <value id="Cold"      name="Cold"/>
+    <value id="Fire"      name="Fire"/>
     <value id="Lightning" name="Lightning"/>
     <value id="Thunder"   name="Thunder"/>
   </group>

COM_5ePack_PHB - Feats.user

@@ -120,13 +120,19 @@
       hero.child[aCON].field[aStartMod].value += 1]]></eval>
     </thing>
   <thing id="ft5CElemAd" name="Elemental Adept" description="Spells you cast ignore resistance to damage of the selected elemental type. In addition, when you roll damage for a spell you cast that deals damage of the selected elemental type, you can treat any 1 on a damage die as a 2." compset="Feat" summary="Ignore resistance to dmg &amp; treat dmg dice of 1 as 2." uniqueness="useronce">
-    <arrayval field="usrArray" index="0" value="acid"/>
-    <arrayval field="usrArray" index="1" value="cold"/>
-    <arrayval field="usrArray" index="2" value="fire"/>
-    <arrayval field="usrArray" index="3" value="lightning"/>
-    <arrayval field="usrArray" index="4" value="thunder"/>
     <usesource source="5ePHBCP"/>
     <tag group="Helper" tag="ShowSpec"/>
+    <tag group="fShowWhat" tag="Energy"/>
+    <eval phase="First" priority="10000"><![CDATA[
+      ~ If we're disabled, do nothing & 
+      doneif (tagis[Helper.Disable] = 1)
+      ~ If nothing chosen then get out now!
+      doneif (field[usrChosen1].ischosen = 0)
+      
+      ~ Get the energy tag and place it on ourself. This
+      ~ allows other Picks to easily to test which energy
+      ~ type we selected.
+      perform field[usrChosen1].chosen.pulltags[5CElemType.?]]]></eval>
     <prereq message="You must be able to cast at least one spell. ">
       <validate><![CDATA[
         ~ Test that the character has at least one spell