Update for WoT v1.0.2

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2017 Vlad
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2018 GambitER
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,5 +1,7 @@
-##### World of Tanks - Mods
-## .. GUIFlash ..
-_Позволяет динамически создавать компоненты для отображения текстовой и графической информации в Flash интерфейсе игры World of Tanks. Создание и управление компонентами производится через Python скрипты (модификации клиента)._
-
-Подробнее в [**Wiki**](https://github.com/GambitER/GUIFlash/wiki).
+##### World of Tanks - Mods
+
+## .. GUIFlash ..
+
+_Позволяет динамически создавать компоненты для отображения текстовой и графической информации в Flash интерфейсе игры World of Tanks. Создание и управление компонентами производится через Python скрипты (модификации клиента)._
+
+Подробнее в [**Wiki**](https://github.com/GambitER/GUIFlash/wiki).

meta.xml

@@ -1,6 +1,6 @@
-<root>
-	<id>gambiter.guiflash</id>
-	<version>0.2.3</version>
-	<name>GUIFlash</name>
-	<description>Flash components for use in python mods.</description>
-</root>
+<root>
+	<id>gambiter.guiflash</id>
+	<version>0.2.5</version>
+	<name>GUIFlash</name>
+	<description>Flash components for use in python mods.</description>
+</root>

res/gui/flash/as3proj/src/net/gambiter/FlashUI.as

@@ -7,7 +7,7 @@
 
 	import net.wg.infrastructure.managers.impl.ContainerManagerBase;
 	import net.wg.gui.components.containers.MainViewContainer;
-	import net.wg.data.constants.ContainerTypes;
+	import net.wg.data.constants.generated.APP_CONTAINERS_NAMES;
 	import net.wg.infrastructure.base.AbstractView;
 
 	public class FlashUI extends AbstractView
@@ -56,7 +56,7 @@
 			try
 			{
 				parent.removeChild(this);
-				viewContainer = (App.containerMgr as ContainerManagerBase).containersMap[ContainerTypes.VIEW];
+				viewContainer = (App.containerMgr as ContainerManagerBase).containersMap[APP_CONTAINERS_NAMES.VIEWS];
 				viewContainer.setFocusedView(viewContainer.getTopmostView());
 				viewPage = viewContainer.getChildByName("main") as DisplayObjectContainer;
 			}
@@ -74,7 +74,8 @@
 		public function as_cursor(arg:Boolean):void
 		{
 			if (arg != showCursor) showCursor = arg;
-			if (showCursor) null; // App.cursor.loader.hitTestObject / App.cursor.loader.hitTestPoint
+			if (showCursor)
+				null; // App.cursor.loader.hitTestObject / App.cursor.loader.hitTestPoint
 			else
 				for (var alias:String in components) components[alias].hideCursor();
 		}

res/gui/flash/as3proj/src/net/gambiter/components/LabelEx.as

@@ -4,6 +4,7 @@
 	import flash.text.TextFormat;
 	import flash.text.GridFitType;
 	import flash.text.AntiAliasType;
+	import flash.text.TextFieldAutoSize;
 
 	import scaleform.gfx.TextFieldEx;
 
@@ -33,18 +34,24 @@
 			_hAlign = Align.LEFT;
 			_vAlign = Align.TOP;
 
-			textField.mouseEnabled = false;
+			textField.width = 0;
+			textField.height = 0;
 
+			textField.mouseEnabled = false;
+
 			textField.wordWrap = false;
 			textField.multiline = false;
 			textField.selectable = false;
+			textField.background = false;
+			textField.backgroundColor = 0x000000;
 
 			textField.embedFonts = true;
-			textField.gridFitType = GridFitType.PIXEL; 
+			textField.gridFitType = GridFitType.PIXEL;
+			textField.autoSize = TextFieldAutoSize.LEFT;
 			textField.antiAliasType = AntiAliasType.ADVANCED;
 
 			textField.defaultTextFormat = new TextFormat("$UniversCondC", 12, 0xFFFFFF, false, false, false, "", "", "left", 0, 0, 0, 0);
-			Properties.setShadow(textField, {"distance": 4, "angle": 45, "color": 0, "alpha": 1, "blurX": 4, "blurY": 4, "strength": 1, "quality": 1});
+			Properties.setShadow(textField, {"distance": 4, "angle": 45, "color": 0x999999, "alpha": 1, "blurX": 4, "blurY": 4, "strength": 1, "quality": 1});
 		}
 
 		override protected function configUI():void
@@ -71,7 +78,7 @@
 		{
 			if (text == null || textField == null) return;
 			if (isHtml) textField.htmlText = text;
-			else textField.text = text;
+			else textField.text = text;			
 			initialize();
 		}
 
@@ -81,14 +88,16 @@
 		}
 
 		override protected function updateSize():void
-		{
+		{			
 			if (autoSize)
 			{
-				textField.width = _originalWidth;
-				textField.height = _originalHeight;
+				textField.autoSize = TextFieldAutoSize.LEFT;
+				// textField.width = _originalWidth;
+				// textField.height = _originalHeight;
 			}
 			else
 			{
+				textField.autoSize = TextFieldAutoSize.NONE;
 				textField.width = width;
 				textField.height = height;
 			}
@@ -167,6 +176,26 @@
 			return textField.wordWrap;
 		}
 
+		public function set background(value:Boolean):void
+		{
+			if (value != textField.background) textField.background = value;
+		}
+
+		public function get background():Boolean
+		{
+			return textField.background;
+		}
+
+		public function set backgroundColor(value:uint):void
+		{
+			if (value != textField.backgroundColor) textField.backgroundColor = value;
+		}
+
+		public function get backgroundColor():uint
+		{
+			return textField.backgroundColor;
+		}
+
 		public function set shadow(args:Object):void
 		{
 			Properties.setShadow(textField, args);

res/gui/flash/as3proj/src/net/gambiter/core/UIBorderEx.as

@@ -14,27 +14,29 @@
 			super();
 
 			visible = false;
-			_rect = new Rectangle(0, 0, 100, 100);
+			_rect = new Rectangle(0, 0, 0, 0);
 
 		}
 
-		public function show():void
+		private function draw():void
 		{
-			if (obj) _rect = obj.getRect(obj);
-
 			graphics.clear();
 			graphics.beginFill(0x999999, 0.1);
 			graphics.lineStyle(1, 0x999999, 1, true);
 			graphics.drawRect(_rect.x, _rect.y, _rect.width, _rect.height);
 			graphics.endFill();
-
+		}
+
+		public function show():void
+		{
+			if (obj) _rect = obj.getRect(obj);			
+			draw();			
 			visible = true;
 		}
 
 		public function hide():void
 		{
-			graphics.clear();
-
+			graphics.clear();			
 			visible = false;			
 		}
 

res/gui/flash/as3proj/src/net/gambiter/core/UIComponentEx.as

@@ -76,6 +76,7 @@
 		override protected function draw():void
 		{
 			super.draw();
+			refresh();
 		}
 
 		public function refresh():void
@@ -92,9 +93,9 @@
 			super.visible = _visible && (!FlashUI.ui.showFullStats || _fullStats) && (!FlashUI.ui.showRadialMenu || _radialMenu);
 		}
 
-		private function updateIndex():void
+		private function updateIndex():void		
 		{
-			if (_index) parent.setChildIndex(this, Math.min(_index, parent.numChildren - 1));
+			if ((_index != undefined) && (_index != parent.getChildIndex(this))) parent.setChildIndex(this, Math.min(_index, parent.numChildren - 1));
 		}
 
 		protected function updateSize():void

res/scripts/client/gui/mods/gambiter/__init__.py

@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
-
-from flash import GUIFlash
-
-g_guiFlash = GUIFlash()
+# -*- coding: utf-8 -*-
+
+from flash import GUIFlash
+
+g_guiFlash = GUIFlash()