From 7f90d2a629f0b982a87823a17c8a67fbfdd10b00 Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Mon, 2 Dec 2019 10:39:24 +1300
Subject: [PATCH] Update paint, Add XP per hour gained

---
 .idea/compiler.xml                            |   2 +-
 ...n__org_parabot_317_api_minified_1_21_3.xml |  13 -----
 .../Maven__org_parabot_client_2_7.xml         |  13 -----
 ...Maven__org_parabot_internal_api_1_52_1.xml |  13 -----
 pom.xml                                       |   4 +-
 script-factory.iml                            |  10 ++--
 src/main/java/scriptfactory/Core.java         |  46 ++++++++++++------
 .../scriptfactory/Strategies/RunLoop.java     |   2 +
 src/main/java/scriptfactory/VarsMethods.java  |  35 +++++++++++--
 target/classes/config.xml                     |   2 +-
 .../scriptfactory/Actions/Action.class        | Bin 4978 -> 4978 bytes
 .../Actions/Logic/LogicHandler$1.class        | Bin 1328 -> 1328 bytes
 .../Actions/Logic/LogicHandler.class          | Bin 3448 -> 3719 bytes
 target/classes/scriptfactory/Core.class       | Bin 3212 -> 3764 bytes
 .../NewGuis/ConditionGuiInfo.class            | Bin 2032 -> 2279 bytes
 .../Strategies/ActionExecutor.class           | Bin 5556 -> 5472 bytes
 .../scriptfactory/Strategies/RunLoop.class    | Bin 920 -> 988 bytes
 .../classes/scriptfactory/VarsMethods.class   | Bin 7507 -> 8570 bytes
 18 files changed, 75 insertions(+), 65 deletions(-)
 delete mode 100644 .idea/libraries/Maven__org_parabot_317_api_minified_1_21_3.xml
 delete mode 100644 .idea/libraries/Maven__org_parabot_client_2_7.xml
 delete mode 100644 .idea/libraries/Maven__org_parabot_internal_api_1_52_1.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 52abc0b..bfb3792 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="script-factory" target="1.8" />
+      <module name="script-factory" target="1.7" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_parabot_317_api_minified_1_21_3.xml b/.idea/libraries/Maven__org_parabot_317_api_minified_1_21_3.xml
deleted file mode 100644
index 50d2f12..0000000
--- a/.idea/libraries/Maven__org_parabot_317_api_minified_1_21_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.parabot:317-api-minified:1.21.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/317-api-minified/1.21.3/317-api-minified-1.21.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/317-api-minified/1.21.3/317-api-minified-1.21.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/317-api-minified/1.21.3/317-api-minified-1.21.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_parabot_client_2_7.xml b/.idea/libraries/Maven__org_parabot_client_2_7.xml
deleted file mode 100644
index c6b0498..0000000
--- a/.idea/libraries/Maven__org_parabot_client_2_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.parabot:client:2.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/client/2.7/client-2.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/client/2.7/client-2.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/client/2.7/client-2.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_parabot_internal_api_1_52_1.xml b/.idea/libraries/Maven__org_parabot_internal_api_1_52_1.xml
deleted file mode 100644
index d2756be..0000000
--- a/.idea/libraries/Maven__org_parabot_internal_api_1_52_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.parabot:internal-api:1.52.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/internal-api/1.52.1/internal-api-1.52.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/internal-api/1.52.1/internal-api-1.52.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/parabot/internal-api/1.52.1/internal-api-1.52.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d241bb9..b640e48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,12 @@
         <dependency>
             <groupId>org.parabot</groupId>
             <artifactId>client</artifactId>
-            <version>2.7</version>
+            <version>2.8.1</version>
         </dependency>
         <dependency>
             <groupId>org.parabot</groupId>
             <artifactId>317-api-minified</artifactId>
-            <version>1.21.3</version>
+            <version>1.21.5</version>
         </dependency>
     </dependencies>
 
diff --git a/script-factory.iml b/script-factory.iml
index a2a044f..946d483 100644
--- a/script-factory.iml
+++ b/script-factory.iml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
@@ -9,10 +11,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.parabot:client:2.7" level="project" />
+    <orderEntry type="library" name="Maven: org.parabot:client:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.parabot:internal-api:1.52.1" level="project" />
-    <orderEntry type="library" name="Maven: org.parabot:317-api-minified:1.21.3" level="project" />
+    <orderEntry type="library" name="Maven: org.parabot:internal-api:1.53.1" level="project" />
+    <orderEntry type="library" name="Maven: org.parabot:317-api-minified:1.21.5" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/main/java/scriptfactory/Core.java b/src/main/java/scriptfactory/Core.java
index 1a0ecb3..680c563 100644
--- a/src/main/java/scriptfactory/Core.java
+++ b/src/main/java/scriptfactory/Core.java
@@ -1,5 +1,6 @@
 package scriptfactory;
 
+import org.parabot.environment.api.utils.Timer;
 import scriptfactory.GUI.GUI;
 import scriptfactory.Strategies.RunLoop;
 import scriptfactory.Actions.Action;
@@ -20,13 +21,14 @@ import static scriptfactory.VarsMethods.log;
  * Welcome to AIO AIO - ScriptFactory. Make your own scripts!
  */
 
-@ScriptManifest(author = "Before", name = "Script Factory 1.9", category = Category.OTHER, version = 1.9, description = "Create your own scripts!", servers = "All")
+@ScriptManifest(author = "Before", name = "Script Factory 1.10", category = Category.OTHER, version = 1.10, description = "Create your own scripts!", servers = "All")
 public class Core extends Script implements Paintable {
 
     private ArrayList<Action> actions = new ArrayList<>();
     private ArrayList<Strategy> strategies = new ArrayList<>();
 
     private GUI gui;
+    public Timer SCRIPT_TIMER;
 
     @Override
     public boolean onExecute() {
@@ -45,12 +47,15 @@ public class Core extends Script implements Paintable {
             }
         }
 
+
         if (!gui.scriptStarted)
         {
             gui.killAllGuis();
             VarsMethods.savescript(actions, new File(VarsMethods.CACHED_LOC));
             return false;
         }
+        VarsMethods.calculateBaseXP();
+        SCRIPT_TIMER = new Timer();
 
         strategies.add(new RunLoop(actions));
         provide(strategies);
@@ -59,20 +64,33 @@ public class Core extends Script implements Paintable {
     }
 
     @Override
-    public void paint(Graphics g) {
-        try { g.setColor(Color.BLUE);
-        g.fillRect(560, 310, 170, 70);
+    public void paint(Graphics graphics) {
+        try {
+            Graphics2D g = (Graphics2D) graphics;
+            Color c2 = new Color(44, 62, 80, 160);
+            g.setColor(c2);
+            g.setBackground(c2);
+            g.fillRect(4, 232, 160, 20);
 
-        g.setColor(Color.YELLOW);
-        g.setFont(new Font("Cordia New", Font.PLAIN, 16));
-        g.drawString("Script Factory", 580, 330);
-        g.setFont(new Font("Cordia New", Font.PLAIN, 12));
-        g.drawString("Currently executing: ", 580, 347);
-        g.drawString(VarsMethods.currentAction, 580, 360);
-        g.drawString(VarsMethods.currentSubscript.equals("") ? "" : "Subscript " + VarsMethods.currentSubscript, 580, 373);}
-        catch (Exception e)
-        {
-            log("Found it");
+            Color c = new Color(44, 62, 80, 80);
+            g.setColor(c);
+            g.setBackground(c);
+            g.fillRect(4, 252, 160, 85);
+
+            g.setColor(Color.WHITE);
+            g.setFont(new Font("Arial", Font.BOLD, 14));
+            g.drawString("Script Factory", 9, 247);
+            g.setFont(new Font("Arial", Font.BOLD, 11));
+            if (SCRIPT_TIMER == null) {
+                g.drawString("Awaiting Start:", 9, 270);
+                return;
+            }
+            g.drawString("Currently Executing:", 9, 270);
+            g.drawString(VarsMethods.currentAction, 9, 290);
+            g.drawString("EXP(P/H): " + VarsMethods.formatNumber((int) VarsMethods.gainedXP) + "(" + VarsMethods.formatNumber(SCRIPT_TIMER.getPerHour((int) VarsMethods.gainedXP)) + ")", 9, 310);
+            g.drawString("Runtime: " + SCRIPT_TIMER.toString(), 9, 330);
+        } catch (Exception e) {
+            log("Paint Error");
         }
     }
 }
diff --git a/src/main/java/scriptfactory/Strategies/RunLoop.java b/src/main/java/scriptfactory/Strategies/RunLoop.java
index d4a55d3..b414439 100644
--- a/src/main/java/scriptfactory/Strategies/RunLoop.java
+++ b/src/main/java/scriptfactory/Strategies/RunLoop.java
@@ -3,6 +3,7 @@ package scriptfactory.Strategies;
 
 import scriptfactory.Actions.Action;
 import org.parabot.environment.scripts.framework.Strategy;
+import scriptfactory.VarsMethods;
 
 import java.util.ArrayList;
 
@@ -25,6 +26,7 @@ public class RunLoop implements Strategy {
 
     @Override
     public void execute() {
+        VarsMethods.calculateGainedXP();
         actionExecutor.execute();
     }
 
diff --git a/src/main/java/scriptfactory/VarsMethods.java b/src/main/java/scriptfactory/VarsMethods.java
index d6737de..47b1d97 100644
--- a/src/main/java/scriptfactory/VarsMethods.java
+++ b/src/main/java/scriptfactory/VarsMethods.java
@@ -1,10 +1,7 @@
 package scriptfactory;
 
 import org.parabot.core.ui.Logger;
-import org.rev317.min.api.methods.GroundItems;
-import org.rev317.min.api.methods.Items;
-import org.rev317.min.api.methods.Npcs;
-import org.rev317.min.api.methods.SceneObjects;
+import org.rev317.min.api.methods.*;
 import scriptfactory.Actions.Action;
 import scriptfactory.Actions.Logic.Endif;
 import scriptfactory.Actions.Logic.If;
@@ -13,12 +10,15 @@ import scriptfactory.Actions.Logic.IfNot;
 import javax.swing.*;
 import java.awt.*;
 import java.io.*;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 
 public class VarsMethods {
     public static int tickSpeed = 1200;
     public static String currentAction = "";
     public static String currentSubscript = "";
+    public static int baseXP = 0;
+    public static int gainedXP = 0;
 
     public final static String DEFAULT_DIR = System.getProperty("user.home") + System.getProperty("file.separator") + "Parabot" + System.getProperty("file.separator") + "Script Factory";
     public final static String CACHED_LOC = DEFAULT_DIR + System.getProperty("file.separator") + "Your Previous Script.txt";
@@ -170,4 +170,31 @@ public class VarsMethods {
                 return GroundItems.Option.valueOf(option);
         }
     }
+
+    public static String formatNumber(int number) {
+        DecimalFormat nf = new DecimalFormat("0.0");
+        double i = number;
+        if (i >= 1000000) {
+            return nf.format((i / 1000000)) + "M";
+        }
+        if (i >= 1000) {
+            return nf.format((i / 1000)) + "K";
+        }
+        return "" + number;
+    }
+
+    public static void calculateBaseXP(){
+        baseXP = 0;
+        for (Skill skill : Skill.values()){
+            baseXP += skill.getExperience();
+        }
+    }
+
+    public static void calculateGainedXP(){
+        gainedXP = 0;
+        for (Skill skill : Skill.values()){
+            gainedXP += skill.getExperience();
+        }
+        gainedXP -= baseXP;
+    }
 }
diff --git a/target/classes/config.xml b/target/classes/config.xml
index 1698320..6156235 100644
--- a/target/classes/config.xml
+++ b/target/classes/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <config>
-    <jars basedir="/home/dr_cookie/Projects/ScriptFactory3/target/">
+    <jars basedir="C:/Users/Dan-j/Documents/GitHub/Script-Factory/target/">
         <jar in="1000202.jar" out="/home/ci/jars/1000202.jar"/>
     </jars>
 
diff --git a/target/classes/scriptfactory/Actions/Action.class b/target/classes/scriptfactory/Actions/Action.class
index db9c9e82ed7cdcabe902ec38898fa683595f1994..b4638ca305ea7669e6e3319a39b83e7537ff2bc7 100644
GIT binary patch
delta 255
zcmXYs!7GDt9L7HfYFl30Xhpq=%UiF*L^G0QVxh=Hvqo#J%>hXwt)@8`mJRDSZj(Pj
zIl1~r9Q+5nxOxt|eEas)^E{uY<8+*lZ)<v<9s>A@F~kBR#F=D~DVCUFnIs9$SfR`s
zxBBa>^TdYvvwp12t}{u9E%V#oa<{w6j<Qn9+9gby2{O#G#~k~tlGV+bcmJ2SKp#cM
zIWYM^b?guiNBB6#;Y8{w5j96S7ukiVE{!L6Z<X<KC0|9v*QOo(bZ?|orQB&njbR?J
cML9|Xmq&RUTJkKCrYQ})^}eX#)!2ine-VW-rT_o{

delta 255
zcmXYs%Su9F6h_y;K%<jd1O*Z~IdB>nMHdlHbW=o7EbK;w6jXx@(I^TkYM_W@k$>2z
z=n;ZOO?#0BzJZgbeFI1PW5NFR+8w)NfBslAE*=8-nP-><Mp<N%C8k(mjyPEolu2?;
zimLJhX`aZKKkL`Zb~jfUV$HPsUz}W*tgCBNU0X!hW`Z4}>=I*7O?jn#^Wp#Y9n!}U
z;~blVKqY*Fmjb<<Vp9|?G0hpXoa1sKvrFR*)~p+R+-mPm#`oqe_~leYsv<RgQD;Pk
dAsUSFh$B;1bD3w^G|kn(drwOjUQK9l;~y*jG2H+F

diff --git a/target/classes/scriptfactory/Actions/Logic/LogicHandler$1.class b/target/classes/scriptfactory/Actions/Logic/LogicHandler$1.class
index df64c235db8469c4971d80aead92c594e6d23eaf..dfa94feb5dc39f6d5b456d38e9774f7786ff2f49 100644
GIT binary patch
delta 25
fcmdnMwSjAc3k##<WLK6jMw!WTSVDp9Pb_u-UsVS`

delta 25
fcmdnMwSjAc3k#$8WLK6jMybhjSVDp9Pb_u-UlRv8

diff --git a/target/classes/scriptfactory/Actions/Logic/LogicHandler.class b/target/classes/scriptfactory/Actions/Logic/LogicHandler.class
index efa3c44d551d1fd013755fb0204fa2c858160908..0f694a01952d6c117e3668c8e001ed4cb2c9a109 100644
GIT binary patch
delta 1719
zcmZ8gYfx2H6#n*kun)%#Tn-){CU^zob&qsW10zLzq(Y%$h~C5p<<)KhqS8YvuNjK=
z5b=g)mZFxo6ce*9SMkwf#%BE0W2TvAnx<y*M?d=8^fFreK$M-Cy}tFWz0SAR-m~_v
z<2tj$H~zYG6~I({YGNAdOf1EN2I>tgGtq$M(yTBLkob^+l?ECOtTM3Lz#0Q<4K&F=
z9yaj^)=4jDV7(+8I36`&BV^(+JkHT<B6C>1#Y8JMO4?>(Q}^!Vz*BhI#8zyR<{6G>
zP2}M@X||gPV}}es&#}`)A?gggAhAQ%+9kc+B!W(p4zS0-UIQ;m_a%;(IbJ#c%`#^0
zbNw!AAu?U*no)*wjxK@y=w@J(X?Z#J2^>H~;8pZ6jIC}Dws=EZyrEWab?cMC*7l8?
zw+bA@p@^z(o63;3q`7HpaI<%IYpA8EJ+zV1<_Wxp!yK;*9Kjm`Z{jEeBq71#h@Tav
zOez&9!!eFtf#Wz4`9jUCI*A^Rw*=nCDS;>sal9k&E>3ft5$MBNj`t*<<LDPSkM}t)
z2z-DZfe#U5@J4>n(+(JkIrX9Dpj00ah)c<f0+%o-a9Nhmh|EmPh_q-0zALyYa1Gr8
zA4&5uJ`tFSN(QZd^AkY^eSTB(77}^@wHK~wYc!T0`8**vw?5P&H@7qggKd;sSY6b>
zAT|WsM=u~UK5<jpRGJ_8X<*b!Ioauv-o*6qJrqkI26#|GR=B>7dohC;lO4!hKwS!*
zGNJf=F({U5X))-vN~IG+!Wl}%MOwz*?nUW@XRjRj=@eo6FJG>82v-dC&sj{kKQ-Vx
zM|d>%#<w+uHQ_mX7OWv>{UWDu7vWCF;xQP95mGCoSm#)YE?cP)Yj7;nWwko7g^o4G
zWwR29RXCP#St%#xI98I&@(f}*j+N{(+aps`94p182_9Y<&OS|5>7dmv0G!ZIYZa|l
zS{<}*(E5(nP0HiiWiz1q)EGRA<4E<<Em&5XtH;$S3>oko2iKy|)V?^zx~ZdqLD+#}
z-vH9%$hdkGJUpB?h|ItMvMMySOt*Eq;BhCAnWgz`oz&vEBZl$IJ9HKux|yZLksU|Q
zXGk7#CtUxxnm2}tZow0`#d7-wkr!}V^GU@4Op4)7nHctrW)7E@?Vm)M5l6n8s`Vl*
z4$>`fb&tW;=v1S;7rNHhq3hA1>nar~q*D}G#WDEk3^W;JC&y8u_R;NWkh8WPS!6Bz
z37ZumBg`t0#g@R!0+`5x$Yt$>+mOdPF^TmM9z;GnjY4)F#q29M?0b~3AK_;|qm=!D
zDeM-?lrbn*lHe$5s8DRoP)cZM<uFf!&Ki+}S*Ri}K*Ky6bD*)W$#Y|<rFkBib?ME;
zJev0V=vR6NBR|Zi&KFQ*1qyDVkz*lCa=+v;{?%-VHZ_iFjvCsDw2Aca{p@#S+iDd7
zQmYseCXl%W1uQ@1H)?|l&=V$0j|z1ZR|q}DbX9j9hGF@m(5=#bimC2}4L{Dg?s?LO
zbN^|Wp6qbLvONwZX*Tt+os<`i>Nkw&+fsju<#z|wuu5eS|No0D_)iggw1|Cs5la>!
SRr#D1EWzD`Ce^eF>H8aoI71)+

delta 1510
zcmZ9LUr<za6vscm-Mjm{UM~n2R@4GlQZsfD47D^Rpwuw(Pk{m%N=CJcSb!E(Zlxw!
zp|xR=Wl1Gvl$y2dNcmRH_|*8;Ob@=)Oi#TvO*3ZacR@${&7AW+-*eAB-*fLh_dwy_
zGm;nnJ$D|cAmgxrH4bZ8XS3esL5GK^H?F~EgTak9jW$g-%{C9)Y_fU8l(#r+W{Zhh
zZ5}mbtL8C>eA*ly=LyY|4h7?_6As(hZfLv14mzA>cJh?N({ws?(e1E{-NrqmdDfwr
z9^-m7&pFItjm`50Uoc{OOq4WTUUVquC7YLR_L^{?X20f@Gru<|=YSvg$qcC#fkVqG
zSg7f9d6k0-RVo(M9B_G!*InMAUy)zi-L@l|=!zyfqO~2n+d8^;cJ{a&;&3V_*gM1J
zP2SR^T;68D<p}R6Fr+_qE?Bm;f_F88F7I(vk+-dNcWc?M?nHZ8b!TU5PhFy`+vR=w
zH6OSf<3pE^IIKDDGQ`K4Ph39bgl5>_XPVDlPV$9j#N|u+UB2R!BAUt#=cUT+N!j&@
z_BK~O+-a9HBEQ$Fj(yEpmv1=e@~v@cMqQS2m%^&=+|{NCt!!=YlACH-efCdlvy~c{
zv~yFre0Os!lyqAtevz;;L3uPnC8MY_5(HQ*KI|v6xkF-iyns7dB1{=2@p5zE93iPh
zT}*9p3X(%|Reyi<j}wCJe_h-X7hHGcbj@19zTBqRDZwMf7k*tWSX0xtYO`R=n)tl^
zg1vE1r?CfV4pt7+5ceketj-d)D(*Qxs|*QS689$itUN3%7WZ7A73-wX!nl{^(|lXl
zl(?7evv5whvhbwHpaRCrk+F%1HHsy~l43uI{UUbB`p#(z#)4_4tj&-Uv(n^xp5I9a
zhp|m!%5k(cj1?Tokmr{suVu!_Zz_q663H<2{IRQbV-z%vGHt09TpWsoVrixiF>SgP
zi-e?Gh8byY+PE*IhOhiK-O6xthQgo7o(PM6yxJwh%rsG7aOj5ItmMcT#ZCTfG1GFC
zThh$Fv2u(#GQ(W&)->~Eg4+brlw^nnN94IJ|I^oyBXJIw$WvKFR1pPgAw_CAGgU27
z)hO7)EVZ3t)g#!;Y}L<Pl^kH68l^=2Ox)j_5-e3k5zAOkNN!(FC3lO6?90S1nW&0t
z*`^wils%iMx<{(+l}sJ8E>o{rp|bolIo6`C$Tdr|QnSijAfQyZN|9Zals{2|%S_hX
zr~aWZ608y+SCZkG;!x&?5O4N=y)3%fg`5(35Ai{4uXLD@H~+Ncg4g{53;ai!I$nEq
zY<WB5W1As0fvjp7Wsh{e|62bI6a6Emf0<Y6Z;$QGHzK9~7g=<jNaUJG<VF$Ch)CBu
Q(G2haw+lL=nJ*~kKlTL*6951J

diff --git a/target/classes/scriptfactory/Core.class b/target/classes/scriptfactory/Core.class
index f84447408222362cda61a4c420f323bd41db32f4..9fe0d52cf406184856015b4005ff518d971adee1 100644
GIT binary patch
delta 2059
zcma)7X>=1+6#ibCFq2{0rllYhr72};OG*@EYgz0{Q`!>R(nU6>=`;k=q)w(RA_hf7
zC<-{>1|n{NiVIs>sUjeP;*J|GD2NL#$8$W#bM$yP;C)Fc$A3;T_uY5jci+ADeK#-b
z2JF8seDc!4LjXqOHwgs@3s@n+gs>I)xRZ;!1gsQrw*-M3SK%J6t>)UjBG&N9S_!?-
z&c!+|?h|moge0uz-W#~K(Lw>}VSh?^0EU1~68dAam6je1bHGD<yN4wbk8ts*fGrZz
zVo7Wj@R)?bSkKeiCefac3)n8;2?@jTq=aF3ii@YYc*aV$9RhZW*d-wc&vN5)BA(~t
zZV@ktc#(&CNyN*1+#?}-750kQ$HVOxaX>_bt7`>xi0I_WydvPBfGz>AZv6ZFc)7Z;
z%H^(^SL3QEu42e44{Ba#tD-55LEWha7WuSbphXSnPNmi7Y}0-Ikh8|uqH4xzcFauY
zxXIXV%1C2ghQ8$sltqeDS*$y!YD(*TpC>e`D38J98D+GJeND_`95JO@MQ`__amLg?
zp4T1C=QT>uxNO?YCK#LJ%7shK(Z{$DmzPnA=?s0MoAU&m`I@FIE%$|V8AT|TQHo-t
z#5_VhB;$1)mT?3}WxRpI404m&ss@_WfXAnXWE{hrGAeOg#tGEQcnh_Zb;zUnTJ>hd
zqX)I6&Z#q9{N=E>Wt3r>jFYGp@Q#dk@gBn<qtY~}LdN@;F5?4yDB~lpo#Jsn#wRj9
z<;f2JpNA-;92G{qWoY;_d@kcOzPM88e@~Giq33K1gZ`k#^ZQc9SNK}S87{uz({JHn
zi0?s`1OqyQC13L?e(rEq#yNaPdsRnEwwJ_emT?~8vkZy(ixr>l3wZ6-x}xd13@L?e
znnv9Fm)eV$s2)1}fHzmh_xxz3;(B+c+gX~GYnSl@ew6VOE-<i689(C}QnDDVRc!&C
znkCnMr7XV^@H&f^c+^(i7Ys1;b}PPsZZEcK8ZYWs95?>3tlrn&tDV^rJ&NDc=2vvJ
zKnbb!ZX-o35rs?_Jz2HJN--lnKBVdeif5r$3$_KC7{q3u-(RJAc-3{Ku9{-ws8}Bs
zy%a-js&`XTF6xQqpw^=3m2EAJsz&^0y0T)88_lg+*QiM9TFI;GZdEG{wh_ooAaafK
z2fawAA8Y{_3Sp+-FEt?PC3F{<FqK~F#h$r~=4H5M8owww(KN=9M(s?}ZQN#c<jo*k
z0$G6pwB0}?;#ySEOeO?qUX2<W8D^rE`;a<~a2&tOIA>iR?!=(%E~GVdz<vPf+52JX
z!r%rP%^k>yU`Smyw?#12yqo+>DfSGysNzV1^gbjr=raV_7z!s{HItD=C<m=M36n#)
zjHJj;G|+YG!5A#SSS-UhEXM?_KyDcAn22qdgdLa?P25hKS5b;}sHf^F&F&I1=;CR>
z&6LC}vL?cE5l#WK6RHHv5i-a;7xQ8jngqIX>3(IYBMxI&MHhxQ*c`UWHg^)XcObLU
zkrP1{7ugOWoP-NxwxvWc;wsSQCS0!BF~H1`ToN=17ddh!Asu_+;459oX-FPvwk34H
z8Nv0A<Qr_(B>WY@sGg<Xu_Zdh^b<&QB#$NpOCZD^NAis}YdAKc4ae|>!7*2X=n#{~
zMj-9QxK4~GC3yk~z6)6*$n7@fkuidJ?n-DLHRd|88yvx;tB5i}?1Z%<c}gd4+7mt8
zEn(J&DBH?x(J@AABM}VhNDK92KO%D=T(DCg=1>bxrY0;Ra?7X%>xkgF#8rS8T1suU
zhMH^xk-ddhwh~u6iLHIa*6*0jY?wz8=CBmZWdm?al<CPtQ`o|K(^R2s`r#imQjf$@
zkW*+P%}j6$ZKm>ES!#D9aIG2M?nX#M+$GQ-;(P%<`d-E&5dRAVECdtaw~%WKRb!$o
mgEVH5TPwxAH3SWz5K?utspPX5ONyw7Wg*;-<+H#-xZ__aOVWD)

delta 1521
zcmYL}`EyfM6vsa=3paT@N>fDv1p|?#4G?50OA!ifLxBL&TA<=WNMi}aq$DY&BBrh=
zf`X4Ki;9YZVqI8Fks^v4ihzHC|AOO;&iD(Xo|{5>Gw<AU&vw7(d+vK@M(rMvzx?mH
z3&3=KGpS^=B5C4avzM7Xp+!oOR<xNYZQMdeYgw)3Jhbc0R+B+=Xt7O;PQ{ZZKDO)Z
zr?j@iEeFVB{B80yc}17WaGvps>)E^xcutpl-W2hI;zg6uY}X)mno{8<FE6vp<P~;n
zu}5!TRlMe5ugQ4!Y2)i2Y`yOH(5*|op~agX4wxL|kcY#Hw>-S94|qp$MDecTJp&bu
z<?JcO?{?U6(IriG*@K;ddBY-`qFbY(WHi+ps@oQex8)M)RF#3zYH(Y>FWQj{EzU&S
zHYQ@(D#iQ7nn&djyT{pW%(fS~BI^1T{am%XT~&c<7D{fhY<n(|3@yxLqMeaMHfJ%L
zITrJnWB=s}PXEB-LylP-=Oc@cIc8wB#M|PjmUt?bh-WQM@QFn=Jr<u*Z}A!R_A2+t
zVby$YF`oq%Ur?_&X>p3vc9%PF=NT4Sd`ZEgS8Hc=^{+T*|KT2&@8i71*IZD1WAQB)
zr4fto_}=0Nezf?Biv~lApmo3DbSh_H)}%8niKu@?yh8)IWbre<7?d=|GKsdFKP-%<
zGo2QfxnwY`rahC1r*g?oe|%d!CatGh=lU&v)hMov(EZ8vIcjm0^HRF8eM7cb#{P5A
zh!RgY-JWXkCxoMG^w=ZSPG9M*!8GPFQtb2*wa2jMduz)}25{D-lj)3sYf+@B&Y<+x
zz>1D4dzUwGx99OhGT9K1NkeMl5_!s38w_f$i$qqgv9Ed8t}l)CBOiby?)aAWXfkWy
zOr~2IBR8`WgIPG`qRJ3OpDS0~L6y8R&w>5@vX{|_&nY&!2_hHS=gmn~HDW6fEAlb8
z7|BrXqE>d6L?C({VOb3pQ?GMGohflT{*WCQydz(626rE$n`L$Na!&#OnhI?zFvis*
z8TG7SmDF~kPYTO-hTsk`mI{#}#tE(o5>+8_lO-}p1Cv-SdNWgrF^x^~TiDJFc1WLl
zrON}-qekeLnhkjYvxKG6o&dT5Hb4i<h{)l~#X1!CbwY|2B@K#|Dj?<u<edIqX34KY
z_i{LRim?R(L7!u)&#3fqqBLCKUa^kT);`8JmrZb%mi98SKzXpN!sn><8A}V~g9A?M
zrgKu!xvoG^@+TKJ8~Zm?%0dOE9>h}?I?nJuRCBNB_Z2WtF-2s7A;s`^2|tc^dD--{
z%s44nVITX2i+&a>86uVia&4>g+#y35CFD*PQsxK)ON8Vm8P^6Ob)T@XUo73i$01?k
zCT-og#oAD0?eGoOgajIS@CIvsT>p?&H2ufzI25Zz)oYVt%`(MWx8ybph-nTUVx1`E
hlK8N&`AC*Wc`VC%qH)0xqotNOtywmbScj2i)BhOXKJEYj

diff --git a/target/classes/scriptfactory/NewGuis/ConditionGuiInfo.class b/target/classes/scriptfactory/NewGuis/ConditionGuiInfo.class
index fa4c4fe060bf29ecf41650dfa114b403c5f9653e..7e33a703e4c2cf1f6688780f4f499518ef3085b0 100644
GIT binary patch
delta 762
zcmZ9KU2oE06vzLi1x^YZrA&02(?@iU!BB8Gb-oQn-F%rZXd;({mQa<}K+UpvLE?p%
zdck+_ep%uY4c_Y)G4aaXtMRlo8?jBFKIiv8FFoh!&&2nn@$Jv2F8~(tM8#p8jbe##
zj&PoEfv`-tNVr6}Ot=!oRl*9Pq9TTCgzJPV;RfL*;TB<)utvB|xI?&0xTj(o>rvc~
z;=$I__aS)(4+lR&A0|>&(>0r}sMuDg;aZL@)~bVd@*8$|w4G8SQa?Q^3D*&ZA0Z*%
z>3QZ0$9XPVPFFPcQe?Yk)9G|f+b|8WR4nG_CA2c7%zy5iTuV4^+w2Or-LQEvg=3qd
z_tI=yEsJBbuX?K{bE_vdEVu2K@PZ1Z{SRTdxnG+rB`by@Y;!|29ow+Hp5mzC@pds>
zl4hrQtllN@J%b|%;V2ugp(4!mcWwugMuWGJxqe-X>S}FWqak8-`7<xM@DQQ8tjBA0
zMIWo}V4OF;paeo9VBt}w1uQbkk^zg3GCg4AGkJ)9$j`3@fsvp<%Bwt4tB3Uifx8yu
z_$Q}5`Jg8s^5tbEr%&b=3X{r5Ol@(0G6b(_zt=G+7)Kci>|zSP`2RS@S~-{lGS6_F
zO&$qOV3vpF?M`Bj2Uf;cWHHalb`eJo1x|E|^)zdN|LHydBC`_H5YF(k=<mu{;J3;?
JF+Pku@E30po>>3@

delta 525
zcmYk3IZpyX6vzL2zpNn3swkd#fi8*%-Z$QNLt@-oENrkbvD9y1%zg(8J0+1sgCD@q
z>o>5}%F_6DCo#+<GjD$Hn*Ypa^gD9=_WS$_Ad3SNEf_N}PRJ4_2$O^<!ZcxqFl%6r
zFi%)8VPcW6L|7)Q5ORc7!Wv<nuwkMZn+CQFY(ErkWF?Lr??=A#9+hjhcT1D1F11E;
zg+iiudYL#mFBZ-&&d!S=>|tL*(#z<v+b^q>)=BDb=Ii)F;u%LPWVG?&h}&ySKb$fo
z%kYkk)YYM7RA9Qw3onjVf$S=FUEWpgP`->X8-YU=j(WkgS{4yZuVt2CMlFj9Mgdc}
zUQqtZ5{bHKVEdgL@~&n#2H|t6V>hLThU4lJVh?<E1?{}X0vTbbs7D47R9WOZ%j{s^
zgpi0%bn%JBB7tsx2H)yIFF!>F_vk}E*Q#P8gd_&Jki!8nc8Y}bf5H&6VWxhXjFG?^
O#Q^Un$N1l#0{#H5xKrr>

diff --git a/target/classes/scriptfactory/Strategies/ActionExecutor.class b/target/classes/scriptfactory/Strategies/ActionExecutor.class
index 40d106481312df053feada568380bc0fe7c83bc4..96633da0784a6d02bca20dce2a47eff26e6aca80 100644
GIT binary patch
delta 2037
zcmYL}2XItX6o$Y1w%nJ;3n?VPnjlG>(MZ6cf(0oC1q&!jC?Z9|?g9&837bSw(G`NB
zhyp%QP_bZH>|$`SAhsDD8GCOiiWRX}P{4Du8=al^-~XO_?m6e4vYV@R_DXI)@WeLY
zSXJyWo@F_VW4Y!k2VZ8hLUXl4FtfQvv(h0avsq=c+H9^hcRYs?T&G!M*6TGln3J`d
zb($Luy~*Zg<6yl*KDXp>E4Mjv?e?T*gXRv09xSuD)2w$HxZ6O=5xtEz_Za<q9q!|P
z6UqYy9yEp?vU%8Mlfxsl8Q5&|s9D$Bq;0m?JZAH_%@a0H+HAFX%4VC*(>Bl8JZql#
zoKJA|pS?%s^RkKO6(fArn10RXb<G>*Im<L}nh4%9@V3KQykp>96Wx0@?;D*D41B2h
zNb_;qLN(da!q&*+yf1x&y6sTp#o~?8L{n|^w8n5E*3hIlz0y0{>gG-LPc6uA>=4(4
zn__e0jovnYxg+kyvtnk4Vu?4zSMH4poM=agyPU@aZ&jc&IEl%MO0UM()w?wq^v<^2
z{w`CvK%CC1yRfdhxhYm(UE5R_p6xP~I)#5sqB-jF37@)5BkZ!1&lII%q11NyoL!3Y
z4s*G~;*r>NmoNBIacEX*d#%C4E50(K!0@{IMltp^-?)6sZq0Wtdq}!m#C-47;Hbjy
z`N8FTesuYX-7Y`#i&w2{tA8b|`OW2b{&4w|zg+ej*vD>#>LXv7W{1n){Nu8pUEU_W
zC&>ZkyBriy7*GZ*13m+O0kJ16U?6BfD|ynTEO1qh**dC|qQ|gAVs2tU+1Pk&PD6ck
zPBh*Wjg-~3r+z@0qRanjt4Sp4E*=?clzO?d2AOQe=2j1n)kj_B$|F^-d1-`ST-90S
zxhh{3h+-t#5RFHo@o+5K=&C|Kb5$2r)E3Tp-RF(YZRt5q1_1(Cri3WYmz~8#`J|NK
z?a2*w@{2q|RAke=?wv=>m?1h9*n)@Pr$k1o2Spr8Px<wtjDB)@B8M?kG`h+y7(k3!
zvKp50Gh4VTb~BQR|9P$#Hix+2bZ>j-7n8=<nG^~hK^~R#6%WVLn<4b!WR8*;tC=Cv
znH(!s?$70%KnnwDl?axIxAmOF1_rZ{8XjP1drW0ASW6`Cxiqv#_h2@<JQ<>SB*b^4
z`0I^*kikb{X__?6C|M86&5pfURbg&uvgX1PlR#-Q6E^skN<#gT$5!v`{7^}}>RF1{
z(Y4oRI>~2OrKwDlJ3eKNX<L+kic)*M7YdF~?h>Cr$az4{2c~!_O9!RcmZgJJv}Ng#
z6dSYj<P__(v?j&1SvoYuk}N$X#eyt7HO0Iv9hPExuPWJCRlYRCw|EN*3!FT&PgCHJ
zcq<EswkLnN6cdJ_IZeua2IcbS(vMMUGo#g3YSq(>RWCA5ZRb4oCKJ><OjJ9Vq;@hz
zeItYaolN<!OjCalQ3r@xiWyc8GcA`{RuQwUZp^WI61OU7u=+C3swH8Kqsf{=^FXVP
zi>w&)t$Hr8uH>@+JIZS9=qO<q|5vk9DL*8%pBBv}-ij_I{bSjh`7<>Xv1+fM3OLSQ
zx=Yby90jFls!fV!dir_q<1STt#Dp!391!qIiz<qPp<tSG*O40vgo2MTIz_)wz?)Rm
zJz1Nk>=8x@_K`15#TL#Hh2F*fG-Jm5j?=|D6p(ywASAM4Jv9_4)@kz6j9si%>fo+T
z;?OS*jI?N;;1$wfi-fhvC@q!|TEvmks>iUDu`H8jUoN^USj$Rj)m0?#XEj@eJcrkw
zn@KW@LAiDrVR_94nMK32c~wWggk|z&WM&r4d_FI8lN8rJo{<p364EhZd7+#J#Bp50
zXc4<+W;63_Zpwee;H=t2Q8Ob`ir!C9snUG}_A^McSaW6Hf5=h$<UN_cmR6aOC8BGw
F^k4R$xkLZ}

delta 2071
zcmYLKYgANK6#mYg$GKe2$QvC+URDc1g36^U-+;0#DK!Yh#2kk~M`=I?NYoe=#l%PI
z^%0d}T8(9C3JsR6TGkKOa+R58zOpdWEX^{@@`1F^%%FGH-RIlq?0xn=d!O%4M`~M|
z=ir@>KLzjz>#d;}D?%^{D>+taFa(s<94~1w2b47&Yc+%flyxd}sjQbi8#GMBMvhH#
ze3_$JuDrtWD#vRQZdUQS4A7z>99u&02DWPCwylukO^&xT^u-DlZ_Cju#day)(a7#y
z6+5K;dm7%yPMOLsDL#-J?N+fzMXQE3d?<xaMY|kZ)}D?xs`y;h85=OwfG_27zLFk?
zWYn*vdRVI8s5l}c9aZry$1xe_J1LH9cmgLlPRiq~kjg2U%V`zg%b7D${J`-eM@MTN
zD^WP1O>`9fjA3}cvkVEg%1Vc;G{0uL+g|0YtS+d?vR6ARTzM6Cn;i9Y<9vOeF~Q0Z
z?(Q}Un7Anq3aob+*Myd#QeZNkVd$sNF~{oT4Q4$|;i|w?Jj;+mlW`;RDrPwCV{NX|
zaz~ZGG}suzX4z_O88y|;@{Igyn|-#xbl4e;1ywZ;fuC?rpcI6D#`$&TB*O*#qPxrq
zmNBkUXPLl7{K^ndd&kr41NZ+XRa365+)W;ra9QAYT;cdb;7=?PsKY!uufD*Lpr0_O
zM_$EW0#|WO;BQ<J_y^bZo;*L}UpP4a6S#q!0=IBmpi_!FxWd5F=}qJ~E6~Lt7^8HW
z`Q<T8!92kXQW&K$Nnw_POQDjW{Ro9fp-B<Sgun}^7tA8n9xO~hs3zJdBNon})ILo6
z`)lK@$jEh;I|PfMGq6Z`kTP6nh`Lv~tg0$oU7pijEm#zb7A%Ivl6R>?HrC;?I~{Jp
zdg8oby_mH%E99`j5SQ|p-lE0n5tfFWNp#r(6BOA$Fias$K?%LoIzOgP`A2Gvf25Ak
zXe8S*%pkj&`f<y+8BUr@hDx#zt;G?Q;t`Dm`XwS2Nf?NJcog?x7FooS7cc~~QBI>o
zf!NOx7PN0*rsQrmE<zQkBso)G-s6Br#(Er)BvTNE{>Vfc1|uCK@gPPagR;-0%pSr_
ziuybTp`Ic)U^p5n(lQLiW(>ntvfhqt;%bgRr$nOKGRl1ps{GmQ3}zRG7PwJOv1=&a
z0H|FU(H{y&EvLPy!?j)H*{#cwMOv&S9CQ1~qSCFCX#<9ZRAeL7wqCb{Tl<uy?MF;A
zVpH1?O0SycLy8ZUBCnFyniZbI*j0UL#9+^9ig|(7O|(ADi~T`3+zVe2j__hf5RUX>
zOAwCoVnYySdC?Sv*<N^pFvpAPARO(5GYH3cF*P-f6eZ2zLvFi1G%`Zr2E8yc+h6o1
zYB7)tj<M)XEl5Hhm3RVcLq7Wi1?)2vvI8h$2T{z9U@|*~DeMeNSO<LtE@B$Hgz4-W
zG5k6l><-Els*Dl>ry?+0iAK576D}nI6-qMZD4D2I#=)&Ti5jI4wH~Dya}^uvlv2!B
zh&uOfl2YG&lL*bf+pEz?>TT^r1IGep@jpHMPv|XVX?Gu6u!F`xN2Rg9o6MwXH_(e(
zC}SzGP!HK5>Y=>ir}S-6X)%3^+YujQ^kH0No)3vWB=4o~-?6CVc+);iq{XL(n5`xs
z@|$6?655LbF9ur8x`^)Od73=-U_8n6fNwh{kih`CUty795Rc(jvkwtlVWqhkKFw;5
z;XZ`<P_%?IZ`Zlql!p<L3fc4r0W6|xxR~g$geccYWLr$cSWa|kBHFGbqOGFBtfr%^
z!7i+W#|Ir>U_Fk~coG}^)to}CHIu7{7;eHx#9WEEJaBh~2?Z)F=Ok+-lTTrxKfD3Q
zDXfFivJ*ENC>0Y0c3~;mnIYL7U_N<f`#&*(#S&VS<cb6Dgqg9pn=o~vfTNLPS>|no
Tu$y$Iz=!EYV$*W6RnYW5+%>uC

diff --git a/target/classes/scriptfactory/Strategies/RunLoop.class b/target/classes/scriptfactory/Strategies/RunLoop.class
index 0f16f1d25dbc2721fe7849b71dd97817da8e0ed9..706873f3a8a2c986118239aa39d483b68f2c6eb8 100644
GIT binary patch
delta 402
zcmYk1yG{a85Qe{VKn^S`3Mhhd_l_hK*2Gd96Dp(SX2D28z`$Bq`3!`{7qGJ-A;wtv
z06v2jzKC&lA;z4{nSXBo{PSo&P2=O|?HxGg$RbL~P`1!iVi>9x+wAz^u3^uxZ#bCN
zW-4TppM0x&)@IqpB5pXesgbwYBCjZqPjcfgGimCxmLfNDhuvH6+Ht+X@V;^33`gf3
z?`F^*DUz<!bMJbN*Ew~%{Z9L`MMV}zQN+ZwPcGs@f@PP)iOG|$KCDPCAz4TfCe12q
zVvvyzNXkoz_fc9Zigm%Z_<1HHXhX0jD=5dN{0WKc;{6^Seh#YsmPnAv2JCYNP4X(B
oSN^e!(dJ?_{>oBqM)-xu^p9h%v><wma!=_WSA3yVQ3$$=zsI5~>;M1&

delta 325
zcmYk1O-=$q5QV>P26`A~Z~*yLlz$RJ;(~;Oa19UPA=r2bHzdS`3lHEKT)FTV##h6{
z*hzK0davqr^=Ehvn~$HjcVNdVA#fMCPw-6Y)R-EY1?GW8V0n5tyGnzb<G0&p4bqf4
zNy<pf+CNU1Y9!!@72Y)2R)p26Iy-*(*;7+oQ!KQIXp__7N>xuC#^nk-EomLiUJIwn
z7p5!J6ZZ6l1`Ks)s<+D4<D-{CwO48d(=XgF4xao_*gM;~9Nm|r@#akQO7-+-V4sIu
QeQEs9BraEUQf!g&FEiN{bN~PV

diff --git a/target/classes/scriptfactory/VarsMethods.class b/target/classes/scriptfactory/VarsMethods.class
index a938c5222de69649f57b90445750b2e6e6bd3bda..d7c94b0d0253888396c3154cd95584c577609772 100644
GIT binary patch
delta 3457
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
JPFf^`j{(}}&t?Ds

delta 2414
zcmb7`d0bRg6vuyO7`X2}E(#0{4mh|bq9HC>nxdvjVkxASxu78qFo<A?h*qMO?TdD8
zv&AyAEX`#~D@`j)i}te3_I)pH&jLE<fl7b%X+F&N+;`8pXSw&>#~dF1`YCnwjgRdD
z(2wRiD8n8HPvaRId$G^Kvv|%yJ)T#1LE%LQ3NJZ`!OMbIEWGOAHM}m^Z{ZD*Z(4ZE
z!rKb(I7q|+S^TcTdk&7n0fqM+B#ZpOK>!CVeCQyIx{t)$#|ob~NW-TJpDBFqpcD33
z_(J5Dg0BQ$D}3W19p5T^=O9CpsmJ%R_yIo(4vO2aMZsBTh|5C``e2X3PY(LwXL<NV
z@T-O2Ec`AB|KZdj8-I$U!-BsQ{&sk#!9t^jCW~MZS>&;?m7)Y*L9`%7pe(W+mbQ&Y
z$PvT}v>;B<#$mLzv4i3T34%m{Pmttb(hfS##xC*;k_GJq0YQqxNVO5B_JW`w&7uwt
z_EJZSI$6}&qAoJq)uQ7?b`zv4>aHlmBzs0j=6NiSk5BItMLiVtRCI#7!{3<Y-u2P=
zPElrLNOT5yHxhc8)!t;YG^Ph-nT;_EynP6R4JG)@bt-5kt2A#vLUzl<aBqLYh@;xZ
zxI`Lc_F9=;YA|2XNt#Zk0g47{I)w%)8muWBi#WWdA((IccJJ;rG*qL8hG{yLh7+hG
z=cj1|ou+9d<q$l%#hOm1QKrJ~7h8ixnsR9rp_5r+r<r=YsLMq%HyZN^zOura!mRSb
ziju4erB#*l3ulyvG@U_bntW$!{ummoX$<9Q%9lXR#^K7W+`N&sMWH#>;mQh4XC3py
zs{E>OMfJq0aCN9k(>NN>o1|$1ovrB{nrQxZGIMI^TuqZ`vSc-d5Hn?3@63S(1ZbK{
z1)8Q|ou=uOqv<><BqSWmFt?&QR3d(7P>!jL^(Pn6Oidv{v7kgyN;A!EvF+=^cvw>r
zm5BkPSWqG;6@>AqXlIF*Q7kAClnTPwDcW+;GKvKyf>J>kyESH^Tw^vWG%8U+u;<MU
zRrM;ZoXxv8n|Q)3)+a>GL510*gR$p}U6t4cOp_;I4(b`+N@<!ED%BMDw7DqG_Rb-6
zb0;RN*eFHko1wlmvq5PdSDBCE`bGw{>E$(!?-eesj9)qmwq(I0TM}_4=fW}o4(v(}
z>`IR9%DHS$sOGT;^PqXmJ;$u&nJkuk3W)Bp9kj(YS-^~OClj%d$FcxOh{grDkOwxn
zk$9@sEKEwv65}?AVx}P)9oV>It3`3Bb91n<7)v;MZDe24?L-Sq$UnVKd=KGBL4Ip4
zWiv05D2R)32|Uyvek{YKJj&zwWw?wNgC^i|T*0ekbS19hB(CNMH$PW*4L@DW-?{KN
zz^`zf!tzFBE3Du@YTH()#K*_~i8xOad?@rPT(4l7%|LAH<S<U>ZxiBS{Yx!7zr5Kf
zs)>{FG;4w33M(fm+~CEH9NB}Lc!O?kF4n9~9>=x*p4_usYVE<5bY<-=Sj8h?;E`&0
z)Le}RC*xM!#$Jxr<ysx7%Li`*;uUUJxZ^N7aJDPaD(q_9>7L8A?J~3FToT<dV__i=
zNytYE#<^$Xm(4_b+=VqPE!N$QwY<{CJy_>@_@iAg{a71JY;~d<_qLqqeOS+aYR%xl
zfI6}D^Z5f)c%P;s0R`L(Q*k_|yK6gghu9qPe(pqxosI|GgH+rt8?dqULAtsJ*+vdh
z!_xp;VG|ujYD=Y?+0zz0EO~MxbYXu{=F;FQb4^NL-s~q*()%B4+CA9jW-Gpupc}yN
z@)Z=vAE#@SeAw4^JnGiGD7eP#N);c6Qva`y$FTFLk00BMkIupW>*I0kZt=07*N;z2
zcP~iu<@@hCEIe`aPOo(L7${BfZjPWJaX<vq1k-n*)1>X_oOs?NDBOmwi8EScQR|19
z{ICt(BB%?s*l$IswL$R_gA&(41f}xcAV?FW@O=hft{C3#SpE$Y&%a-Wq8+zEfRlQX
jbsjv0hgf#z=G;oX5E&NW|M$IJxr6$;au=P*k^=t#;ZV_m