From 585efc25264b96a339d85186eb2c3463d51688e2 Mon Sep 17 00:00:00 2001
From: chrisgregan <chris@snozbot.com>
Date: Mon, 25 Aug 2014 22:44:45 +0100
Subject: [PATCH] Added command categories

---
 Assets/Fungus/Audio/Commands/PlayMusic.cs     |   1 +
 Assets/Fungus/Audio/Commands/PlaySound.cs     |   1 +
 .../Fungus/Audio/Commands/SetMusicVolume.cs   |   1 +
 Assets/Fungus/Audio/Commands/StopMusic.cs     |   1 +
 Assets/Fungus/Camera/Commands/FadeToView.cs   |   1 +
 Assets/Fungus/Camera/Commands/MoveToView.cs   |   1 +
 Assets/Fungus/Dialog/Commands/AddOption.cs    |   1 +
 Assets/Fungus/Dialog/Commands/Say.cs          |   1 +
 Assets/Fungus/FungusScript/Commands/Call.cs   |   1 +
 Assets/Fungus/FungusScript/Commands/If.cs     |   1 +
 .../FungusScript/Commands/LoadGlobals.cs      |   1 +
 .../Fungus/FungusScript/Commands/LoadScene.cs |   1 +
 .../FungusScript/Commands/SaveGlobals.cs      |   1 +
 Assets/Fungus/FungusScript/Commands/Set.cs    |   1 +
 Assets/Fungus/FungusScript/Commands/Wait.cs   |   1 +
 .../Fungus/FungusScript/Editor/CallEditor.cs  |   1 -
 .../FungusScript/Editor/FungusScriptEditor.cs |  86 +++++++++++++-----
 .../FungusScript/Editor/FungusScriptWindow.cs |   5 +-
 .../FungusScript/Scripts/FungusCommand.cs     |  10 ++
 .../FungusScript/Scripts/FungusScript.cs      |   3 +
 Assets/Fungus/Sprite/Commands/FadeSprite.cs   |   1 +
 Assets/Shuttle/ShuttleGame.unity              | Bin 123540 -> 123468 bytes
 22 files changed, 92 insertions(+), 29 deletions(-)

diff --git a/Assets/Fungus/Audio/Commands/PlayMusic.cs b/Assets/Fungus/Audio/Commands/PlayMusic.cs
index e22dfee0..dee22250 100644
--- a/Assets/Fungus/Audio/Commands/PlayMusic.cs
+++ b/Assets/Fungus/Audio/Commands/PlayMusic.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Audio")]
 	[CommandName("Play Music")]
 	[HelpText("Plays game music. If any game music is already playing, it is stopped. Music continues playing across scene loads.")]
 	public class PlayMusic : FungusCommand
diff --git a/Assets/Fungus/Audio/Commands/PlaySound.cs b/Assets/Fungus/Audio/Commands/PlaySound.cs
index 4c0d9400..8ac91ac5 100644
--- a/Assets/Fungus/Audio/Commands/PlaySound.cs
+++ b/Assets/Fungus/Audio/Commands/PlaySound.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Audio")]
 	[CommandName("Play Sound")]
 	[HelpText("Plays a sound effect. Multiple sound effects can play at the same time.")]
 	public class PlaySound : FungusCommand
diff --git a/Assets/Fungus/Audio/Commands/SetMusicVolume.cs b/Assets/Fungus/Audio/Commands/SetMusicVolume.cs
index b02e85d9..5d0e31c9 100644
--- a/Assets/Fungus/Audio/Commands/SetMusicVolume.cs
+++ b/Assets/Fungus/Audio/Commands/SetMusicVolume.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Audio")]
 	[CommandName("Set Music Volume")]
 	[HelpText("Sets the game music volume level.")]
 	public class SetMusicVolume : FungusCommand
diff --git a/Assets/Fungus/Audio/Commands/StopMusic.cs b/Assets/Fungus/Audio/Commands/StopMusic.cs
index 062c25cf..ceb92e20 100644
--- a/Assets/Fungus/Audio/Commands/StopMusic.cs
+++ b/Assets/Fungus/Audio/Commands/StopMusic.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Audio")]
 	[CommandName("Stop Music")]
 	[HelpText("Stops the currently playing game music.")]
 	public class StopMusic : FungusCommand
diff --git a/Assets/Fungus/Camera/Commands/FadeToView.cs b/Assets/Fungus/Camera/Commands/FadeToView.cs
index 5e62899a..a6ee8b3f 100644
--- a/Assets/Fungus/Camera/Commands/FadeToView.cs
+++ b/Assets/Fungus/Camera/Commands/FadeToView.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Camera")]
 	[CommandName("Fade To View")]
 	[HelpText("Fades the camera out and in again at a location specified by a View object.")]
 	public class FadeToView : FungusCommand 
diff --git a/Assets/Fungus/Camera/Commands/MoveToView.cs b/Assets/Fungus/Camera/Commands/MoveToView.cs
index 97dbb3d1..101be2eb 100644
--- a/Assets/Fungus/Camera/Commands/MoveToView.cs
+++ b/Assets/Fungus/Camera/Commands/MoveToView.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Camera")]
 	[CommandName("Move To View")]
 	[HelpText("Moves the camera to a location specified by a View object.")]
 	public class MoveToView : FungusCommand 
diff --git a/Assets/Fungus/Dialog/Commands/AddOption.cs b/Assets/Fungus/Dialog/Commands/AddOption.cs
index 8e590487..ec80688f 100644
--- a/Assets/Fungus/Dialog/Commands/AddOption.cs
+++ b/Assets/Fungus/Dialog/Commands/AddOption.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Dialog")]
 	[CommandName("Add Option")]
 	[HelpText("Adds an option button to be displayed by the next Say command. The target sequence is run when the player selects the option. A condition can be specified for when the option should be shown.")]
 	public class AddOption : FungusCommand
diff --git a/Assets/Fungus/Dialog/Commands/Say.cs b/Assets/Fungus/Dialog/Commands/Say.cs
index 067278f4..da1fe1bc 100644
--- a/Assets/Fungus/Dialog/Commands/Say.cs
+++ b/Assets/Fungus/Dialog/Commands/Say.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Dialog")]
 	[HelpText("Writes a line of story text to the dialog. A condition can be specified for when the story text should be shown.")]
 	public class Say : FungusCommand 
 	{
diff --git a/Assets/Fungus/FungusScript/Commands/Call.cs b/Assets/Fungus/FungusScript/Commands/Call.cs
index 12fae471..87db0705 100644
--- a/Assets/Fungus/FungusScript/Commands/Call.cs
+++ b/Assets/Fungus/FungusScript/Commands/Call.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Scripting")]
 	[HelpText("Execute another sequence.")]
 	public class Call : FungusCommand
 	{	
diff --git a/Assets/Fungus/FungusScript/Commands/If.cs b/Assets/Fungus/FungusScript/Commands/If.cs
index 5492eda4..ca48c70b 100644
--- a/Assets/Fungus/FungusScript/Commands/If.cs
+++ b/Assets/Fungus/FungusScript/Commands/If.cs
@@ -14,6 +14,7 @@ namespace Fungus.Script
 		GreaterThanOrEquals		// >=
 	}
 
+	[CommandCategory("Scripting")]
 	[HelpText("Execute another sequence IF a condition is true. Sequences can be specified for both true (THEN) and false (ELSE) conditions.")]
 	public class If : FungusCommand
 	{
diff --git a/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs b/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs
index a3bb2547..2b27d6d5 100644
--- a/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs
+++ b/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Scripting")]
 	[CommandName("Load Globals")]
 	[HelpText("Loads a set of global variables previously saved using the SaveGlobals command.")]
 	public class LoadGlobals : FungusCommand
diff --git a/Assets/Fungus/FungusScript/Commands/LoadScene.cs b/Assets/Fungus/FungusScript/Commands/LoadScene.cs
index 78422551..0a1f6099 100644
--- a/Assets/Fungus/FungusScript/Commands/LoadScene.cs
+++ b/Assets/Fungus/FungusScript/Commands/LoadScene.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Scripting")]
 	[CommandName("Load Scene")]
 	[HelpText("Loads a new scene and displays an optional loading image. This is useful " +
 		"for splitting a large game across multiple scene files to reduce peak memory " +
diff --git a/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs b/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs
index 7a8c544f..4a9c5365 100644
--- a/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs
+++ b/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Scripting")]
 	[CommandName("Save Globals")]
 	[HelpText("Saves all current global variables to be loaded again later using the LoadGlobals command. This provides a basic save game system.")]
 	public class SaveGlobals : FungusCommand
diff --git a/Assets/Fungus/FungusScript/Commands/Set.cs b/Assets/Fungus/FungusScript/Commands/Set.cs
index 652718a3..10611e8a 100644
--- a/Assets/Fungus/FungusScript/Commands/Set.cs
+++ b/Assets/Fungus/FungusScript/Commands/Set.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Scripting")]
 	[HelpText("Sets a variable to a new value using simple arithmetic operations. The value can be a constant or another variable.")]
 	public class Set : FungusCommand 
 	{
diff --git a/Assets/Fungus/FungusScript/Commands/Wait.cs b/Assets/Fungus/FungusScript/Commands/Wait.cs
index abb29b8e..dca69418 100644
--- a/Assets/Fungus/FungusScript/Commands/Wait.cs
+++ b/Assets/Fungus/FungusScript/Commands/Wait.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Scripting")]
 	[HelpText("Waits for period of time before executing the next command in the sequence.")]
 	public class Wait : FungusCommand 
 	{
diff --git a/Assets/Fungus/FungusScript/Editor/CallEditor.cs b/Assets/Fungus/FungusScript/Editor/CallEditor.cs
index 9c9ee618..99ed0495 100644
--- a/Assets/Fungus/FungusScript/Editor/CallEditor.cs
+++ b/Assets/Fungus/FungusScript/Editor/CallEditor.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 
 namespace Fungus.Script
 {
-
 	[CustomEditor (typeof(Call))]
 	public class CallEditor : FungusCommandEditor 
 	{
diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs
index 752c983c..6e0a0610 100644
--- a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs
+++ b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs
@@ -95,9 +95,7 @@ namespace Fungus.Script
 				sequence.description = desc;
 			}
 
-			GUI.backgroundColor = Color.yellow;
 			GUILayout.Box("Commands", GUILayout.ExpandWidth(true));
-			GUI.backgroundColor = Color.white;
 
 			FungusCommand[] commands = sequence.GetComponents<FungusCommand>();
 			int index = 1;
@@ -113,52 +111,90 @@ namespace Fungus.Script
 			}
 
 			EditorGUILayout.Separator();
-
-			GUI.backgroundColor = Color.yellow;
+			
 			GUILayout.Box("New Command", GUILayout.ExpandWidth(true));
-			GUI.backgroundColor = Color.white;
 
+			List<string> categories = new List<string>();
+			
 			// Build list of categories
-			List<System.Type> commandTypes = EditorExtensions.FindDerivedTypes(typeof(FungusCommand)).ToList();
-			if (commandTypes.Count == 0)
+			List<System.Type> subTypes = EditorExtensions.FindDerivedTypes(typeof(FungusCommand)).ToList();
+			foreach(System.Type type in subTypes)
 			{
-				return;
+				object[] attributes = type.GetCustomAttributes(false);
+				foreach (object obj in attributes)
+				{
+					CommandCategoryAttribute categoryAttr = obj as CommandCategoryAttribute;
+					if (categoryAttr != null)
+					{
+						if (!categories.Contains(categoryAttr.Category))
+						{
+							categories.Add(categoryAttr.Category);
+						}
+					}
+				}
 			}
 
-			List<string> commandNames = new List<string>();
-			foreach(System.Type type in commandTypes)
-			{
-				commandNames.Add(GetCommandName(type));
-			}
+			categories.Sort();
 
 			EditorGUI.BeginChangeCheck();
 
-			int selectedCommandIndex = EditorGUILayout.Popup("Command", fungusScript.selectedCommandIndex, commandNames.ToArray());
+			EditorGUILayout.BeginHorizontal();
 
+			int selectedCategoryIndex = EditorGUILayout.Popup(fungusScript.selectedCategoryIndex, categories.ToArray());
+			
+			List<string> commandNames = new List<string>();
+			List<System.Type> commandTypes = new List<System.Type>();
+			
+			string categoryName = categories[selectedCategoryIndex];
+			foreach (System.Type type in subTypes)
+			{
+				object[] attributes = type.GetCustomAttributes(false);
+				foreach (object obj in attributes)
+				{
+					CommandCategoryAttribute categoryAttr = obj as CommandCategoryAttribute;
+					if (categoryAttr != null)
+					{
+						if (categoryAttr.Category == categoryName)
+						{
+							commandNames.Add(type.Name);
+							commandTypes.Add(type);
+						}
+					}
+				}
+			}
+			
+			int selectedCommandIndex = EditorGUILayout.Popup(fungusScript.selectedCommandIndex, commandNames.ToArray());
+
+			if (selectedCategoryIndex != fungusScript.selectedCategoryIndex)
+			{
+				// Default to first item in list if category has changed
+				selectedCommandIndex = 0;
+			}
+			
 			if (EditorGUI.EndChangeCheck())
 			{
 				Undo.RecordObject(fungusScript, "Select Command");
+				fungusScript.selectedCategoryIndex = selectedCategoryIndex;
 				fungusScript.selectedCommandIndex = selectedCommandIndex;
 			}
 
 			System.Type selectedType = commandTypes[selectedCommandIndex];
-			if (selectedType == null)
+			if (fungusScript.selectedSequence == null ||
+				selectedType == null)
 			{
+				EditorGUILayout.EndHorizontal();
 				return;
 			}
 
-			GUILayout.BeginHorizontal();
-			GUILayout.FlexibleSpace();
-			if (GUILayout.Button(new GUIContent("Add Command", "Add the selected command to the sequence")))
+			if (GUILayout.Button(new GUIContent("Add", "Add the selected command to the sequence"), EditorStyles.miniButton))
 			{
-				Undo.AddComponent(sequence.gameObject, selectedType);
+				Undo.AddComponent(fungusScript.selectedSequence.gameObject, selectedType);
 			}
-			GUILayout.EndHorizontal();
+			
+			EditorGUILayout.EndHorizontal();
 
-			EditorGUILayout.Separator();
-							
-			object[] attributes = selectedType.GetCustomAttributes(typeof(HelpTextAttribute), false);
-			foreach (object obj in attributes)
+			object[] helpAttributes = selectedType.GetCustomAttributes(typeof(HelpTextAttribute), false);
+			foreach (object obj in helpAttributes)
 			{
 				HelpTextAttribute helpTextAttr = obj as HelpTextAttribute;
 				if (helpTextAttr != null)
@@ -169,6 +205,8 @@ namespace Fungus.Script
 					break;
 				}
 			}
+
+			EditorGUILayout.Separator();
 		}
 
 		public void DrawVariablesGUI()
diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs
index 59e64430..fe3a6dac 100755
--- a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs
+++ b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs
@@ -190,11 +190,8 @@ namespace Fungus.Script
 
 			EditorGUILayout.BeginVertical();
 
-			EditorGUILayout.Separator();
-			GUI.backgroundColor = Color.yellow;
 			GUILayout.Box("Sequence", GUILayout.ExpandWidth(true));
-			GUI.backgroundColor = Color.white;
-			
+
 			GUILayout.BeginHorizontal();
 			
 			if (fungusScript.selectedSequence == null)
diff --git a/Assets/Fungus/FungusScript/Scripts/FungusCommand.cs b/Assets/Fungus/FungusScript/Scripts/FungusCommand.cs
index c3e73774..eef19df5 100644
--- a/Assets/Fungus/FungusScript/Scripts/FungusCommand.cs
+++ b/Assets/Fungus/FungusScript/Scripts/FungusCommand.cs
@@ -28,6 +28,16 @@ namespace Fungus.Script
 		public string HelpText { get; set; }
 	}
 
+	public class CommandCategoryAttribute : Attribute
+	{
+		public CommandCategoryAttribute(string categoryText)
+		{
+			this.Category = categoryText;
+		}
+		
+		public string Category { get; set; }
+	}
+	
 	[RequireComponent(typeof(Sequence))]
 	public class FungusCommand : MonoBehaviour 
 	{
diff --git a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs
index 383243e7..e01d7861 100644
--- a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs
+++ b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs
@@ -15,6 +15,9 @@ namespace Fungus.Script
 		[System.NonSerialized]
 		public FungusCommand copyCommand;
 
+		[HideInInspector]
+		public int selectedCategoryIndex;
+
 		[HideInInspector]
 		public int selectedCommandIndex;
 
diff --git a/Assets/Fungus/Sprite/Commands/FadeSprite.cs b/Assets/Fungus/Sprite/Commands/FadeSprite.cs
index 1c898356..e9c2f8de 100644
--- a/Assets/Fungus/Sprite/Commands/FadeSprite.cs
+++ b/Assets/Fungus/Sprite/Commands/FadeSprite.cs
@@ -4,6 +4,7 @@ using System.Collections;
 
 namespace Fungus.Script
 {
+	[CommandCategory("Sprite")]
 	[CommandName("Fade Sprite")]
 	[HelpText("Fades a sprite to a target color over a period of time.")]
 	public class FadeSprite : FungusCommand 
diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity
index a2879f9e71b487c09f958d11732317bbc9f7ef45..54f03d44a34222396efa10354c548d43ab4f054d 100644
GIT binary patch
delta 2941
zcmZ|RZ)}rA90%|_7_i~k25ic(8$|{TCQyZq8qpPo(m^2w$J`%Tx3NDR+gQOl1`-}b
zkS5MpJ)uP~%oipz5$M89(HPhZb&D~sFGPtiv<!rz3`+1%HR$|4?LG7Ei7vf7Pe1+L
z{qBCxbC<pK*`zN&os>psLm#2THbO`e?t{H)hfQZ6U-i{^*1u#zYJE%n*7o|kqMG*l
z#<rciS?98BW_lulH7(1ene5K=>FnsTEIO0T%b&#xOeySqX)<%<Ph<_Z(%Gc^Y?>AO
z<;;d;_DN|<?3W>aujEgmMs|5kCcBj}nfddl(b;TjRt`IFC}c`-GBXuqu(YfyX3Chz
z-Y<B7oy|*UUl(N1TsCrW4qd>e9x~E}vHsTOnKUof_sac`y?kML;KFh`m`<k!+%`IT
zpYj)0MtRHWEV1{jAtYfO8cc0-Vg6!5T)4kIIy$-&*Lg7GT0*S2zr}4n%&D_nwXe<=
zz@o6#@xDrIz=c4|I(fi6m>af2Nb)djP-lx^iFiJIz}R?;VRo2B=(_~w(V3}JDX|BE
zVv<J?n6_T-{HQu0OpJSS=p(xab_hwd3Kqg<Y#`(yEX11y)(x}c`!Bp&D`62>yMmr~
zIj#aa5v7*;H*Q6+OE3fMd)^8Q4sVLWdhuOLY=QYV64C<uQ%eFfZbA~+9W4jU2Xpf{
zMSY${YTz?*jPStKupVyOfKS0pC4}HZ{@`&>!`uKLA5b07s*bmrkUHGo<8j4m98B$-
zz}uSRT}nv^D3;KAysN}nDwnVr7J*^WV<lV*vpkE{2^CxiJ69%G&<4vbmn(Q`_uUdJ
ztcfW9mhd$29Pk8^gm^mxE31$P^uq>W;v=~{`+7wfb`1TrM=}g^SIXtT0wd4Gs}QRU
z@{_B;GLBkleuVj9_>d7^!fUX!Epqv<!<;a+GB<hL4cIwYCro>ERgRQOQxze2MaCxR
zfGKXE_)K2S9;giI0=r;lha5N8@!b{=tVS4c9xMt|C#@}HKCG;o5D)BUK0)6emm>_r
zWR$Vl90OV~nmCznk`6e0Fmcx3!Xmo3vwgohthI7nAFLZDj@No<xH>Auq5j)}_N{Ut
zy+~?$U@hYaxiLQ8%5QI|nb9C8serj)ViN1Z&9#HNxMG;GQI4B=;z(_$0u)#GATX#4
z9Qa|tnd_9}24VYQV&bjulr~+0iMy!|R^24;rg~TyroJ<Zb|N(Z&D-Sd)Clu8%WuCE
zX2dCDKxgehO0iyOw!p-9Ar;mG>q1<Jw=|f!l@J@g{~do96tbv1)a(X|RaguQ!Nk>_
zw7%P7-Y&;=!#prCZsW<dtzli<CYYs7jvMl?aQWKs{KdpUU_=+VWy&s>)g{MO!Mb5$
z;(ggEJEFQc1!mtN$2Em5J9=Pmpb8ZEV>@6Q(1Np59IzSYgY89(wvSt2GoFthDnIe<
z)C%+HY&$HmJwBdx1h>JeVVEP)`YPVW%Jv{|H=hW_)d#b`K!_RlH+Yg`FgHx?9Om{m
zEDBozyUy)6%-kU_<j4p49Uhoi>7%f42ll_X;;xG)J1o28z}H|tm>8Eb_fkhh7ncgN
z;>Z)@(r=gU>V}DlGhorNIMiP~sj^<VyVs5qU{{PCNZGJ{m|Ff2Z?j;QJ@Sq)!u&9C
zN8CJhWnT~`CLV$1z9>&{X&|wdew+~KZ=gFDJhZ<MY4C?@&`?zN(r`ZszKLt?N}&2%
zq4!>p8Uij4y=S1Q-quqz;5D75w!r?=G-uod98`pQ-}BQs>A%~`*Q<|GZR(%;Uy`@K
zm*xbLd#P=_H_}KGytdb=!8_PTztCl_UV1f_xq4}xE_3ihIxSI*HeW0H|7hcR8ctMG
VB?r<6=;ukgj{mj502b(*`VY8f2WS8Q

delta 2847
zcmZA3e^8Tk90&047Z69*oHh&yVV)>xsg&}gJ1^&tav;hiqzTCe$}i=|oNIu24pR~@
z?B;#d2a<CAw?D$>sW<Gdi|Z`8&dd3S=GC1oti;rqXLVE-y}#S@aNlP;zU<+(_xH#1
z`99Axu3Vaa{LAS&LhDZwI(nQCl7wUbS>55>bN142;@R-BX>4Fc3Ol$$&qh|vrK!x4
zmr2vuu_LK0GcS?l=W5x9M-tgfc^PcZEiJ3do6TH$Eo*Z;8TtHxBTci%S!XYAYN=!Y
z{*%fKC#JCn$urm}f<Z?$v)xE!<2RmQwfV`+b*-A^CMUA*^Pge5u%0CrB-3n`**%};
zFk^v%9fI-xods!ZT1NH3hXsL$1$0DDpALLlLMLaqlPDqhiL|Vaa`Vu7LK5Q8V7x7W
z4HpsO#PRs#<fH@d3t@%DgqU#rn{3&zt{BUKjl|d@m~I0h>!N+#kpUM2EkJR==U`sg
zN@0@cVWAjX0yC6M4Hy}3DXbA@6#6cM`C=@$!(DD31B#QpfMCu>b>|oPfG{z)oDT>?
z_o*tpeD$Jv0@e*vs=5l+wTX~Ju#nu0Fij~TW;ft>xrD2M7N8S7AIY``7BmxLNA6GA
z*20XN2}y_DlH02M!(}$uS^TX`Y=oth5z-9%TbTpa1LNEI5a#ClxdupHBcw+NuH`}5
z!gA+zFkQJi_X?~Jh9B~moO=}(2J{KznfQ2H2-yL9Ea!^y54+34K;D^OY`m>M)mv_=
zP?yjI3&O+_7Qrm9qlD<ARInK4gNYT~05fb=SFi-;fu$4FUn${W=c95zun7YyB|HN&
zR1z`(3(4&h*f31o5<e`rO1&jN&bw1-hV={Mjl#k(CybZh!T0|*u<?y(6_nEa1RIu3
zsm#x?lx>87$pg8BzrZ?RV)^gDf-qj0`*Q9s%ur282TZvZs;$~8cOMYf&D0rNfnk`q
zCGTcjt}<EGxn7tTCgv7czuPtes}aUq2(#Iui&jn~8#WB{5Y+#kyu!Y{cB>gZ#l`f)
zd@ym68%b|lNv%5fEzANFbLY<gVfDx4&cig@#T@G2(miUk0mX@1VMD4QDs-LH=yu?C
ziX-H1e6(#H-&E68ukKq3y9pB)V_LkWHn%~YD}wd7fnqRi;6!aGCipC@uu+}6{KMr&
z4@_M22y84SxBY{PCL^wB@qx4hHUi^!lRJc8yww5CJJq*SJ<JOeZ>I)W3Z5w9)!zu~
zfu&;{<!;iNKHueoiPyqRn68D8UU^Q;>n1v&7gz%PPreqGYz^%S!^E>&3Ny8;t8m)%
zQL`5&=De_pnB3;m#VzJGb*>ENYs3DF<-h7*Y3HXV4j6=4U}A3DQ|)$tOs*QH*{#m)
z&(Q9+!Nl?0upuRf`6ExgrZMAg9iGL<@Hds)PM8lSPP_|7_7JiU8Rb51hIPT5uwUg0
zw!kK0tQBTQh>xc{XWVVT5g^}BrL)vf<t%)YkWQGgm_FDLtPplro}?cZhVi~*vb_(p
zxuV~ccVs&S^TPPV$}`}^$9b*^7xrH)%}JoST^;Pbe%j@OiMgXN{wNa%)GoN`vcSaL
zOqf3=rys9q*Wk>eIn<w@VKUGL6bGF9&ZB)pF!B2!1D3NlTK*9F@s<hm!FUyvuV@1-
z<t_Ccaewgk{z90zzy}FHPhd_h{W>8qT2JkZq#5tgMbe%NG&$h$(8uXiCmkK6fh7Jt
z&0ou<)n{m_q-&%J0nZtl6-TE_7yWepywYnOdVVT+Iz?Xm{~~_C|4rfVanb?A0{XMG
zBwh-gqgfIT^|Q73Xk%wdTWdo_jiafiwz*EKJWs=sWdyK{Y>jm93Y~Sbou&pZeMTQ^
bq@aW90>Q877fDl}NX`pX9|#8NzFGeR%VP3Q