v0.3.8 for WoT 1.13.0.0 and higher

- textfield propertie 'GlowFilter' added - WG swc files removed from project - swc markdown file added with info where the latest swc files from WG can be found - version number increased to 0.3.8 - gambiter.guiflash_0.3.8.wotmod included - guiflash_0.3.8_1.13.0.0.zip included
CH4MPi · Jul 10, 2021 · 3235e34 · 3235e34
1 parent 14b8826
commit 3235e34
Show file tree

Hide file tree

Showing 25 changed files with 182 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## .. GUIFlash ..
 
-Copyright: (c) 2017-2019 GambitER, 2020 CH4MPi
+Copyright: (c) 2017-2019 GambitER, since 2020 CH4MPi
 
 This project is maintained by CH4MPi
 

diff --git a/build.json b/build.json
@@ -6,13 +6,13 @@
     },
     "game": {
         "folder": "X:\\wot\\ct",
-        "version": "1.10.1.3"
+        "version": "1.13.0.0"
     },
     "info": {
         "id": "guiflash",
         "author": "gambiter",
         "name": "GUIFlash",
         "description": "Flash components for use in python mods.",
-        "version": "0.3.7"
+        "version": "0.3.8"
     }
 }
diff --git a/build/gambiter.guiflash_0.3.7.wotmod b/build/gambiter.guiflash_0.3.7.wotmod
diff --git a/build/gambiter.guiflash_0.3.8.wotmod b/build/gambiter.guiflash_0.3.8.wotmod
diff --git a/build/guiflash_0.3.7_1.10.1.3.zip b/build/guiflash_0.3.7_1.10.1.3.zip
diff --git a/build/guiflash_0.3.8_1.13.0.0.zip b/build/guiflash_0.3.8_1.13.0.0.zip
diff --git a/res/gui/flash/GUIFlash.swf b/res/gui/flash/GUIFlash.swf
diff --git a/res/gui/flash/as3proj/GUIFlash.as3proj b/res/gui/flash/as3proj/GUIFlash.as3proj
@@ -16,6 +16,7 @@
   <!-- Other classes to be compiled into your SWF -->
   <classpaths>
     <class path="src" />
+    <class path="..\..\..\..\..\champiMODS\res\flash\swc" />
   </classpaths>
   <!-- Build options -->
   <build>
@@ -64,6 +65,14 @@
     <element path="swc\wg\gui_battle-1.0-SNAPSHOT.swc" />
     <element path="swc\wg\gui_lobby-1.0-SNAPSHOT.swc" />
     <element path="swc\wg\lobby.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\base_app-1.0-SNAPSHOT.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\battle.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\common_i18n_library-1.0-SNAPSHOT.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\common-1.0-SNAPSHOT.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\gui_base-1.0-SNAPSHOT.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\gui_battle-1.0-SNAPSHOT.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\gui_lobby-1.0-SNAPSHOT.swc" />
+    <element path="..\..\..\..\..\champiMODS\res\flash\swc\lobby.swc" />
   </externalLibraryPaths>
   <!-- Runtime Shared Libraries -->
   <rslPaths>

diff --git a/res/gui/flash/as3proj/obj/GUIFlashConfig.old b/res/gui/flash/as3proj/obj/GUIFlashConfig.old
@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'14.10.2020'</value>
+      <value>'10.07.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>
@@ -35,17 +35,18 @@
     <verbose-stacktraces>false</verbose-stacktraces>
     <source-path append="true">
       <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\src</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
     <external-library-path append="true">
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\base_app-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\battle.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\common_i18n_library-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\common-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\gui_base-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\gui_battle-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\gui_lobby-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\lobby.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\base_app-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\battle.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\common_i18n_library-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\common-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\gui_base-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\gui_battle-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\gui_lobby-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\lobby.swc</path-element>
     </external-library-path>
   </compiler>
   <file-specs>

diff --git a/res/gui/flash/as3proj/obj/GUIFlashConfig.xml b/res/gui/flash/as3proj/obj/GUIFlashConfig.xml
@@ -16,7 +16,7 @@
     </define>
     <define append="true">
       <name>CONFIG::timeStamp</name>
-      <value>'14.10.2020'</value>
+      <value>'10.07.2021'</value>
     </define>
     <define append="true">
       <name>CONFIG::air</name>
@@ -35,17 +35,18 @@
     <verbose-stacktraces>false</verbose-stacktraces>
     <source-path append="true">
       <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\src</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc</path-element>
       <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
     </source-path>
     <external-library-path append="true">
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\base_app-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\battle.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\common_i18n_library-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\common-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\gui_base-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\gui_battle-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\gui_lobby-1.0-SNAPSHOT.swc</path-element>
-      <path-element>D:\Coding\PythonProjects\GUIFlash\res\gui\flash\as3proj\swc\wg\lobby.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\base_app-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\battle.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\common_i18n_library-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\common-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\gui_base-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\gui_battle-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\gui_lobby-1.0-SNAPSHOT.swc</path-element>
+      <path-element>D:\Coding\PythonProjects\champiMODS\res\flash\swc\lobby.swc</path-element>
     </external-library-path>
   </compiler>
   <file-specs>

diff --git a/res/gui/flash/as3proj/src/net/gambiter/FlashUI.as b/res/gui/flash/as3proj/src/net/gambiter/FlashUI.as
@@ -29,7 +29,7 @@
 		public var epicMapOverlayVisibility:Boolean;
 		public var epicRespawnOverlayVisibility:Boolean;
 		public var battleRoyaleRespawnVisibility:Boolean;
-
+		
 		public var screenSize:Object;
 		private var viewPage:DisplayObjectContainer;
 		private var components:Object;
@@ -62,7 +62,7 @@
 
 			screenSize = {width: SCREEN_WIDTH, height: SCREEN_HEIGHT};
 		}
-
+		
 		override protected function onPopulate():void
 		{
 			super.onPopulate();
@@ -78,7 +78,8 @@
 					{
 						viewContainer.setFocusedView(topmostView);
 					}
-					else{
+					else
+					{
 						py_log("Error: topmostView is NULL!");
 					}
 					viewPage = viewContainer.getChildByName(NAME_MAIN) as DisplayObjectContainer;
@@ -93,9 +94,9 @@
 				py_log(error.getStackTrace());
 			}
 		}
-
-		// Wot 1.10.1
-		private function _getContainer(containerName:String) : ISimpleManagedContainer
+		
+		// since WoT 1.10.1
+		private function _getContainer(containerName:String):ISimpleManagedContainer
 		{
 			return App.containerMgr.getContainer(LAYER_NAMES.LAYER_ORDER.indexOf(containerName))
 		}
@@ -114,7 +115,8 @@
 		public function as_cursor(arg:Boolean):void
 		{
 			if (arg != showCursor) showCursor = arg;
-			if (!showCursor) for (var alias:String in components) components[alias].hideCursor();
+			if (!showCursor)
+				for (var alias:String in components) components[alias].hideCursor();
 		}
 
 		public function as_radialMenu(arg:Boolean):void
@@ -132,27 +134,32 @@
 		public function as_fullStatsQuestProgress(arg:Boolean):void
 		{
 			if (arg != showFullStatsQuestProgress) showFullStatsQuestProgress = arg;
-			for (var alias:String in components) components[alias].updateVisible();			 
+			for (var alias:String in components) components[alias].updateVisible();
 		}
-
+		
 		public function as_epicMapOverlayVisibility(arg:Boolean):void
 		{
 			if (arg != epicMapOverlayVisibility) epicMapOverlayVisibility = arg;
-			for (var alias:String in components) components[alias].updateVisible();			 
+			for (var alias:String in components) components[alias].updateVisible();
 		}
-
+		
 		public function as_epicRespawnOverlayVisibility(arg:Boolean):void
 		{
 			if (arg != epicRespawnOverlayVisibility) epicRespawnOverlayVisibility = arg;
-			for (var alias:String in components) components[alias].updateVisible();			 
+			for (var alias:String in components) components[alias].updateVisible();
 		}
-
-		public function as_battleRoyaleRespawnVisibility(arg:Boolean):void
+		
+		public function as_battleRoyaleRespawnVisibility(isVisible:Boolean):void
 		{
-			if (arg != battleRoyaleRespawnVisibility) battleRoyaleRespawnVisibility = arg;
-			for (var alias:String in components) components[alias].updateVisible();
+			if (isVisible != battleRoyaleRespawnVisibility)
+				battleRoyaleRespawnVisibility = isVisible;
+
+			for (var alias:String in components)
+				components[alias].updateVisible();
+
+			py_log("as_battleRoyaleRespawnVisibility called: isVisible:" + isVisible + "!");
 		}
-
+		
 		public function as_create(alias:String, type:String, props:Object):void
 		{
 			if (viewPage) createComponent(alias, type, props);
@@ -174,7 +181,7 @@
 			{
 				var _path:Array = alias.split(".");
 				var _name:String = _path.pop();
-				var _container:DisplayObjectContainer = Properties.getComponentByPath(viewPage, _path) as DisplayObjectContainer;				
+				var _container:DisplayObjectContainer = Properties.getComponentByPath(viewPage, _path) as DisplayObjectContainer;
 
 				if (!components.hasOwnProperty(alias) && _container && !_container.getChildByName(_name))
 				{
@@ -198,18 +205,24 @@
 			{
 				var obj:DisplayObject = null;
 
-				if (components.hasOwnProperty(alias)) obj = components[alias];
-				else obj = Properties.getComponentByPath(viewPage, alias.split("."));
+				if (components.hasOwnProperty(alias)) {
+					obj = components[alias];
+				} else {
+					obj = Properties.getComponentByPath(viewPage, alias.split("."));
+				}
 
-				if (params) Properties.setAnimateProperty(obj, props, params);
-				else Properties.setProperty(obj, props);
+				if (params) {
+					Properties.setAnimateProperty(obj, props, params);
+				} else {
+					Properties.setProperty(obj, props);
+				}
 			}
 			catch (error:Error)
 			{
 				py_log(error.getStackTrace());
 			}
 		}
-				
+
 		private function deleteComponent(alias:String):void
 		{
 			try

diff --git a/res/gui/flash/as3proj/src/net/gambiter/components/LabelEx.as b/res/gui/flash/as3proj/src/net/gambiter/components/LabelEx.as
@@ -12,7 +12,8 @@
 
 	public class LabelEx extends UIComponentEx
 	{
-		public static const NAME_FONT:String = "$UniversCondC";
+		//public static const NAME_FONT:String = "$UniversCondC";
+		public static const NAME_FONT:String = "$Fieldfont";
 
 		private var textField:TextField;
 
@@ -66,20 +67,26 @@
 			}
 			super.onDispose();
 		}
-		
+
 		override public function refresh():void
 		{
 			super.refresh();
 		}
-		
+
 		private function updateText():void
 		{
-			if (text == null || textField == null) return;
-			if (isHtml) textField.htmlText = text;
-			else textField.text = text;			
+			if (text == null || textField == null) {
+				return;
+			}
+			if (isHtml) {
+				textField.htmlText = text;
+			}
+			else {
+				textField.text = text;			
+			}
 			initialize();
 		}
-		
+
 		override protected function updateBorder():void
 		{
 			borderEx.update(textField.x, textField.y, textField.width, textField.height);
@@ -198,5 +205,11 @@
 		{
 			Properties.setShadow(textField, args);
 		}
+
+		public function set glowfilter(args:Object):void
+		{
+			Properties.setGlowFilter(textField, args);
+		}
+
 	}
 }
diff --git a/res/gui/flash/as3proj/src/net/gambiter/core/UIComponentEx.as b/res/gui/flash/as3proj/src/net/gambiter/core/UIComponentEx.as
@@ -34,6 +34,8 @@
 		private var _radialMenu:Boolean;
 		private var _fullStats:Boolean;		
 		private var _fullStatsQuestProgress:Boolean;
+		private var _epicMapOverlayVisible:Boolean;
+		private var	_epicRespawnOverlayVisible:Boolean;
 
 		public function UIComponentEx()
 		{
@@ -55,7 +57,9 @@
 			_visible = true;
 			_radialMenu = false;
 			_fullStats = false;
-			_fullStatsQuestProgress = false;			
+			_fullStatsQuestProgress = false;
+			_epicMapOverlayVisible = false;
+			_epicRespawnOverlayVisible = false;
 
 			focusable = false;
 		}
@@ -93,7 +97,12 @@
 
 		public function updateVisible():void
 		{
-			super.visible = _visible && (!FlashUI.ui.showRadialMenu || _radialMenu) && (!FlashUI.ui.showFullStats || _fullStats) && (!FlashUI.ui.showFullStatsQuestProgress || _fullStatsQuestProgress) && (!FlashUI.ui.epicMapOverlayVisibility || !FlashUI.ui.epicRespawnOverlayVisibility);
+			super.visible = _visible &&
+				(!FlashUI.ui.showRadialMenu || _radialMenu) &&
+				(!FlashUI.ui.showFullStats || _fullStats) &&
+				(!FlashUI.ui.showFullStatsQuestProgress || _fullStatsQuestProgress) &&
+				(!FlashUI.ui.epicMapOverlayVisibility || _epicMapOverlayVisible) &&
+				(!FlashUI.ui.epicRespawnOverlayVisibility || _epicRespawnOverlayVisible);
 		}
 
 		private function updateIndex():void