Merge pull request #962 from Sklore/fenris447-ongoing-updates

Release 3.0
Sklore · Dec 29, 2020 · e867ca0 · e867ca0
2 parents 1ddc33b + c564688
commit e867ca0
Show file tree

Hide file tree

Showing 61 changed files with 21,202 additions and 1,459 deletions.
diff --git a/COM_5ePack - Deprecated Things.user b/COM_5ePack - Deprecated Things.user
diff --git a/COM_5ePack - Helper Things.user b/COM_5ePack - Helper Things.user
@@ -16,6 +16,7 @@
     <bootstrap thing="cfg5CFeatB"></bootstrap>
     <bootstrap thing="cfg5CProf"></bootstrap>
     <bootstrap thing="cfg5CSupGif"></bootstrap>
+    <bootstrap thing="cfg5CTashVar"></bootstrap>
     <bootstrap thing="sel5CEleAc"></bootstrap>
     <bootstrap thing="sel5CEleCo"></bootstrap>
     <bootstrap thing="sel5CEleLi"></bootstrap>

diff --git a/COM_5ePack_BGDiA - Magic Items.user b/COM_5ePack_BGDiA - Magic Items.user
@@ -211,25 +211,26 @@
     <usesource source="p5eBGDiAP"/>
     <tag group="ItemRarity" tag="Artifact"/>
     <tag group="Helper" tag="NeedAttune"/>
-    <bootstrap thing="lCelestial">
-      <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
-      </bootstrap>
-    <bootstrap thing="ab5CDiAFeaWings">
-      <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
-      </bootstrap>
+    <tag group="Custom" tag="5CArtPrp"/>
+    <tag group="Custom" tag="5CAPEIB" name="Minor Beneficial Artifact Properties Eligible"/>
     <bootstrap thing="raTruesigh">
       <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
       <autotag group="Value" tag="60"/>
       </bootstrap>
     <bootstrap thing="ab5CDiAHolyLight">
       <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
       </bootstrap>
-    <bootstrap thing="bn5CMinBPrp1">
+    <bootstrap thing="lCelestial">
       <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
       </bootstrap>
-    <bootstrap thing="bn5CMinBPrp2">
+    <bootstrap thing="cfg5CArtPrp"></bootstrap>
+    <bootstrap thing="ab5CDiAFeaWings">
       <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
       </bootstrap>
+    <eval phase="Final" priority="20000" index="4"><![CDATA[doneif (field[gIsEquip].value = 0)
+      doneif (field[gIsAttuned].value = 0)
+
+#situational[hero.child[skInsight], "Advantage on all Wisdom (Insight) checks.", field[thingname].text]]]></eval>
     <eval phase="PreLevel" priority="10000" index="2">doneif (field[gIsAttuned].value = 0)
 
       hero.child[aCHA].field[Minimum].value = maximum(20,hero.child[aCHA].field[aNormal].value)</eval>
@@ -247,10 +248,12 @@
 
       perform hero.assign[DamageRes.dtRadiant]
       perform hero.assign[DamageRes.dtNecrotic]</eval>
-    <eval phase="Final" priority="20000" index="4"><![CDATA[doneif (field[gIsEquip].value = 0)
-      doneif (field[gIsAttuned].value = 0)
+    <eval phase="First" index="5">perform hero.childfound[cfg5CArtPrp].setfocus
 
-#situational[hero.child[skInsight], "Advantage on all Wisdom (Insight) checks.", field[thingname].text]]]></eval>
+focus.field[cfgMax1].value += 2</eval>
+    <eval phase="Final" index="6"><![CDATA[if (tagcount[Custom.5CAPIB] >= 2) then
+perform delete[Custom.5CAPEIB]
+endif]]></eval>
     <child entity="wSpecMagic">
       <bootstrap thing="wLongsword"></bootstrap>
       </child>
@@ -297,24 +300,33 @@
     <usesource source="p5eBGDiAP"/>
     <tag group="Helper" tag="NeedAttune"/>
     <tag group="ItemRarity" tag="Legendary"/>
-    <bootstrap thing="bn5CMinBPrp2">
-      <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
-      </bootstrap>
-    <bootstrap thing="bn5CMinBPrp1">
-      <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
-      </bootstrap>
-    <bootstrap thing="bn5CMajBPrp">
-      <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
-      </bootstrap>
-    <bootstrap thing="bn5CMajDPrp">
-      <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
-      </bootstrap>
+    <tag group="Custom" tag="5CArtPrp" name="Artifact Properties"/>
+    <tag group="Custom" tag="5CAPEIB" name="Minor Beneficial Artifact Properties Eligible"/>
+    <tag group="Custom" tag="5CAPEAB" name="Major Beneficial Artifact Properties Eligible"/>
+    <tag group="Custom" tag="5CAPEAD" name="Major Detrimental Artifact Properties Eligible"/>
+    <bootstrap thing="cfg5CArtPrp"></bootstrap>
     <bootstrap thing="ab5CRuleAver">
       <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
       </bootstrap>
     <bootstrap thing="ab5CInfRcll">
       <containerreq phase="First" priority="2000"><![CDATA[fieldval:gIsAttuned <> 0]]></containerreq>
       </bootstrap>
+    <eval phase="First">perform hero.childfound[cfg5CArtPrp].setfocus
+
+focus.field[cfgMax1].value += 2
+focus.field[cfgMax2].value += 1
+focus.field[cfgMax4].value += 1</eval>
+    <eval phase="Final" index="2"><![CDATA[if (tagcount[Custom.5CAPIB] >= 2) then
+perform delete[Custom.5CAPEIB]
+endif
+
+if (tagcount[Custom.5CAPAB] >= 1) then
+perform delete[Custom.5CAPEAB]
+endif
+
+if (tagcount[Custom.5CAPAD] >= 1) then
+perform delete[Custom.5CAPEAD]
+endif]]></eval>
     <child entity="wSpecMagic">
       <bootstrap thing="wLongsword"></bootstrap>
       </child>