diff --git a/packages.txt b/packages.txt index 49a4da5..3f441a8 100644 --- a/packages.txt +++ b/packages.txt @@ -1,2 +1,3 @@ package_1 alternativa.osgi.service.console.variables -package_7 alternativa.tanks \ No newline at end of file +package_7 alternativa.tanks +package_13 alternativa.tanks.config \ No newline at end of file diff --git a/src/TanksTestingTool.as b/src/TanksTestingTool.as index 9a660aa..81f5b5a 100644 --- a/src/TanksTestingTool.as +++ b/src/TanksTestingTool.as @@ -18,7 +18,7 @@ package import package_10.name_17; import package_11.name_16; import package_12.name_15; - import package_13.name_18; + import alternativa.tanks.config.Config; import package_14.name_21; import package_15.name_19; import package_16.name_26; @@ -48,7 +48,7 @@ package { public static var testTask:TankTestTask; - private var config:name_18; + private var config:Config; private var gameKernel:name_17; @@ -201,7 +201,7 @@ package private function loadConfig(param1:String) : void { addChild(this.preloader); - this.config = new name_18(); + this.config = new Config(); this.config.addEventListener(Event.COMPLETE,this.onConfigLoadingComplete); this.config.load(param1,this.preloader); } diff --git a/src/alternativa/tanks/InitBattleTask.as b/src/alternativa/tanks/InitBattleTask.as index 381f604..31243b6 100644 --- a/src/alternativa/tanks/InitBattleTask.as +++ b/src/alternativa/tanks/InitBattleTask.as @@ -4,9 +4,9 @@ package alternativa.tanks import package_10.class_1; import package_10.name_17; import package_10.name_54; - import package_13.name_18; - import package_13.name_58; - import package_13.name_70; + import alternativa.tanks.config.Config; + import alternativa.tanks.config.BlobGroup; + import alternativa.tanks.config.BlobCategory; import package_15.name_55; import package_18.name_44; import package_19.name_53; @@ -17,13 +17,13 @@ package alternativa.tanks { private var gameKernel:name_17; - private var config:name_18; + private var config:Config; private var container:DisplayObjectContainer; private var preloader:Preloader; - public function InitBattleTask(param1:name_17, param2:name_18, param3:DisplayObjectContainer, param4:Preloader) + public function InitBattleTask(param1:name_17, param2:Config, param3:DisplayObjectContainer, param4:Preloader) { super(name_17.EVENT_SYSTEM_PRIORITY + 1); this.gameKernel = param1; @@ -50,9 +50,9 @@ package alternativa.tanks private function createMapEntity() : name_54 { var _loc2_:name_55 = null; - var _loc6_:name_58 = null; + var _loc6_:BlobGroup = null; var _loc7_:String = null; - var _loc3_:name_70 = this.config.name_68.name_72("skybox"); + var _loc3_:BlobCategory = this.config.name_68.name_72("skybox"); if(_loc3_ != null) { _loc2_ = new name_55(); diff --git a/src/alternativa/tanks/TankTestTask.as b/src/alternativa/tanks/TankTestTask.as index 7bc3c43..29ce669 100644 --- a/src/alternativa/tanks/TankTestTask.as +++ b/src/alternativa/tanks/TankTestTask.as @@ -13,7 +13,7 @@ package alternativa.tanks import package_10.name_54; import package_10.name_57; import package_100.name_301; - import package_13.name_18; + import alternativa.tanks.config.Config; import package_15.name_275; import package_15.name_55; import package_18.name_102; @@ -124,7 +124,7 @@ package alternativa.tanks private static var log:name_160 = name_160(name_3.name_8().name_30(name_160)); - private var config:name_18; + private var config:Config; private var gameKernel:name_17; @@ -178,7 +178,7 @@ package alternativa.tanks private var var_80:name_293 = new name_293(); - public function TankTestTask(param1:int, param2:name_18, param3:name_17, param4:name_20, param5:Preloader) + public function TankTestTask(param1:int, param2:Config, param3:name_17, param4:name_20, param5:Preloader) { super(param1); this.preloader = param5; @@ -1164,7 +1164,7 @@ import flash.media.Sound; import flash.utils.ByteArray; import package_10.name_17; import package_101.name_304; -import package_13.name_172; +import alternativa.tanks.config.TextureLibrary; import package_15.name_275; import package_18.name_44; import package_28.name_129; @@ -1286,11 +1286,11 @@ class WeaponHitEffects implements class_12 class TextureResourceCache { - private var textureLibrary:name_172; + private var textureLibrary:TextureLibrary; private var cache:Object = {}; - public function TextureResourceCache(param1:name_172) + public function TextureResourceCache(param1:TextureLibrary) { super(); this.textureLibrary = param1; @@ -1320,11 +1320,11 @@ class TextureResourceCache class MultiBitmapTextureResourceCache { - private var textureLibrary:name_172; + private var textureLibrary:TextureLibrary; private var cache:Object = {}; - public function MultiBitmapTextureResourceCache(param1:name_172) + public function MultiBitmapTextureResourceCache(param1:TextureLibrary) { super(); this.textureLibrary = param1; diff --git a/src/package_13/name_70.as b/src/alternativa/tanks/config/BlobCategory.as similarity index 67% rename from src/package_13/name_70.as rename to src/alternativa/tanks/config/BlobCategory.as index 8a58d97..bfd8ec8 100644 --- a/src/package_13/name_70.as +++ b/src/alternativa/tanks/config/BlobCategory.as @@ -1,10 +1,10 @@ -package package_13 +package alternativa.tanks.config { - public class name_70 + public class BlobCategory { private var groups:Object; - public function name_70() + public function BlobCategory() { super(); this.groups = new Object(); @@ -21,12 +21,12 @@ package package_13 return _loc1_; } - public function name_62(param1:String) : name_58 + public function name_62(param1:String) : BlobGroup { return this.groups[param1]; } - public function method_214(param1:String, param2:name_58) : void + public function method_214(param1:String, param2:BlobGroup) : void { this.groups[param1] = param2; } diff --git a/src/package_13/name_58.as b/src/alternativa/tanks/config/BlobGroup.as similarity index 84% rename from src/package_13/name_58.as rename to src/alternativa/tanks/config/BlobGroup.as index 730bf1f..55550c7 100644 --- a/src/package_13/name_58.as +++ b/src/alternativa/tanks/config/BlobGroup.as @@ -1,12 +1,12 @@ -package package_13 +package alternativa.tanks.config { import flash.utils.ByteArray; - public class name_58 + public class BlobGroup { private var blobs:Object; - public function name_58() + public function BlobGroup() { super(); this.blobs = new Object(); diff --git a/src/package_13/name_174.as b/src/alternativa/tanks/config/BlobLibrary.as similarity index 66% rename from src/package_13/name_174.as rename to src/alternativa/tanks/config/BlobLibrary.as index b2fbb16..6ce1be0 100644 --- a/src/package_13/name_174.as +++ b/src/alternativa/tanks/config/BlobLibrary.as @@ -1,10 +1,10 @@ -package package_13 +package alternativa.tanks.config { - public class name_174 + public class BlobLibrary { private var var_199:Object; - public function name_174() + public function BlobLibrary() { super(); this.var_199 = new Object(); @@ -21,12 +21,12 @@ package package_13 return _loc1_; } - public function name_72(param1:String) : name_70 + public function name_72(param1:String) : BlobCategory { return this.var_199[param1]; } - public function method_326(param1:String, param2:name_70) : void + public function method_326(param1:String, param2:BlobCategory) : void { this.var_199[param1] = param2; } diff --git a/src/package_13/name_18.as b/src/alternativa/tanks/config/Config.as similarity index 73% rename from src/package_13/name_18.as rename to src/alternativa/tanks/config/Config.as index c4ce394..35852f2 100644 --- a/src/package_13/name_18.as +++ b/src/alternativa/tanks/config/Config.as @@ -1,4 +1,4 @@ -package package_13 +package alternativa.tanks.config { import flash.events.Event; import flash.events.EventDispatcher; @@ -12,17 +12,17 @@ package package_13 import package_41.name_175; [Event(name="complete",type="flash.events.Event")] - public class name_18 extends EventDispatcher + public class Config extends EventDispatcher { public var mapData:name_55; - public var var_37:name_172; + public var var_37:TextureLibrary; - public var tankParts:name_176; + public var tankParts:TankPartsLibrary; public var soundsLibrary:name_173; - public var name_68:name_174 = new name_174(); + public var name_68:BlobLibrary = new BlobLibrary(); private var var_35:XML; @@ -32,7 +32,7 @@ package package_13 private var var_36:Object = {}; - public function name_18() + public function Config() { super(); } @@ -43,27 +43,27 @@ package package_13 this.var_34 = new name_170(); var _loc3_:ConfigXMLLoader = new ConfigXMLLoader(param1,this); this.var_34.addTask(_loc3_); - _loc3_.addEventListener(name_169.TASK_COMPLETE,this.method_103); + _loc3_.addEventListener(name_169.TASK_COMPLETE,this.onTaskProgress); var _loc4_:name_175 = new name_175(this); this.var_34.addTask(_loc4_); - _loc4_.addEventListener(name_169.TASK_PROGRESS,this.method_103); - this.var_37 = new name_172(this); - this.var_37.addEventListener(name_169.TASK_PROGRESS,this.method_103); + _loc4_.addEventListener(name_169.TASK_PROGRESS,this.onTaskProgress); + this.var_37 = new TextureLibrary(this); + this.var_37.addEventListener(name_169.TASK_PROGRESS,this.onTaskProgress); this.var_34.addTask(this.var_37); - var _loc5_:class_7 = this.method_106(); + var _loc5_:class_7 = this.createMapLoadTask(); this.var_34.addTask(_loc5_); - _loc5_.addEventListener(name_169.TASK_COMPLETE,this.method_103); - this.tankParts = new name_176(this); - this.tankParts.addEventListener(name_169.TASK_PROGRESS,this.method_103); + _loc5_.addEventListener(name_169.TASK_COMPLETE,this.onTaskProgress); + this.tankParts = new TankPartsLibrary(this); + this.tankParts.addEventListener(name_169.TASK_PROGRESS,this.onTaskProgress); this.var_34.addTask(this.tankParts); this.soundsLibrary = new name_173(this); - this.soundsLibrary.addEventListener(name_169.TASK_PROGRESS,this.method_103); + this.soundsLibrary.addEventListener(name_169.TASK_PROGRESS,this.onTaskProgress); this.var_34.addTask(this.soundsLibrary); - this.var_34.addEventListener(Event.COMPLETE,this.method_107); + this.var_34.addEventListener(Event.COMPLETE,this.onSequenceComplete); this.var_34.run(); } - private function method_103(param1:name_169) : void + private function onTaskProgress(param1:name_169) : void { this.preloader.method_82(param1.progress / param1.total * 0.1); } @@ -81,7 +81,7 @@ package package_13 public function set xml(param1:XML) : void { this.var_35 = param1; - this.method_104(); + this.parseOptions(); } public function get options() : Object @@ -100,24 +100,24 @@ package package_13 this.mapData = null; } - private function method_106() : class_7 + private function createMapLoadTask() : class_7 { - return new MapLoadTask(this,this.method_105); + return new MapLoadTask(this,this.setMapData); } - private function method_107(param1:Event) : void + private function onSequenceComplete(param1:Event) : void { this.var_34 = null; dispatchEvent(new Event(Event.COMPLETE)); } - private function method_105(param1:ByteArray) : void + private function setMapData(param1:ByteArray) : void { var _loc2_:name_171 = new name_171(param1); this.mapData = new name_55(_loc2_.data); } - private function method_104() : void + private function parseOptions() : void { var _loc1_:XML = null; for each(_loc1_ in this.var_35.kernelOptions.option) @@ -138,13 +138,13 @@ import package_40.class_7; class ConfigXMLLoader extends class_7 { - private var config:name_18; + private var config:Config; private var loader:URLLoader; private var url:String; - public function ConfigXMLLoader(param1:String, param2:name_18) + public function ConfigXMLLoader(param1:String, param2:Config) { super(); this.url = param1; @@ -170,11 +170,11 @@ class MapLoadTask extends class_7 { private var callback:Function; - private var config:name_18; + private var config:Config; private var loader:URLLoader; - public function MapLoadTask(param1:name_18, param2:Function) + public function MapLoadTask(param1:Config, param2:Function) { super(); this.config = param1; diff --git a/src/alternativa/tanks/config/ResourceLoader.as b/src/alternativa/tanks/config/ResourceLoader.as new file mode 100644 index 0000000..a19e0a6 --- /dev/null +++ b/src/alternativa/tanks/config/ResourceLoader.as @@ -0,0 +1,19 @@ +package alternativa.tanks.config +{ + import package_40.class_7; + + public class ResourceLoader extends class_7 + { + public var config:Config; + + public var name:String; + + public function ResourceLoader(param1:String, param2:Config) + { + super(); + this.config = param2; + this.name = param1; + } + } +} + diff --git a/src/package_13/name_459.as b/src/alternativa/tanks/config/SringUtils.as similarity index 70% rename from src/package_13/name_459.as rename to src/alternativa/tanks/config/SringUtils.as index 77fb9a1..bf94762 100644 --- a/src/package_13/name_459.as +++ b/src/alternativa/tanks/config/SringUtils.as @@ -1,8 +1,8 @@ -package package_13 +package alternativa.tanks.config { - public class name_459 + public class StringUtils { - public function name_459() + public function StringUtils() { super(); } diff --git a/src/package_13/name_176.as b/src/alternativa/tanks/config/TankPartsLibrary.as similarity index 59% rename from src/package_13/name_176.as rename to src/alternativa/tanks/config/TankPartsLibrary.as index ebdf0be..a6bd3eb 100644 --- a/src/package_13/name_176.as +++ b/src/alternativa/tanks/config/TankPartsLibrary.as @@ -1,4 +1,4 @@ -package package_13 +package alternativa.tanks.config { import flash.display.BitmapData; import flash.events.Event; @@ -11,7 +11,7 @@ package package_13 import package_71.name_249; import package_71.name_333; - public class name_176 extends class_21 + public class TankPartsLibrary extends ResourceLoader { private var var_196:Vector.; @@ -23,7 +23,7 @@ package package_13 private var var_195:name_462; - public function name_176(param1:name_18) + public function TankPartsLibrary(param1:Config) { super("Tank parts library",param1); } @@ -40,12 +40,12 @@ package package_13 public function name_353(param1:String) : name_249 { - return this.method_316(param1,this.var_196) as name_249; + return this.findPartByID(param1,this.var_196) as name_249; } public function name_350(param1:String) : int { - return this.method_317(param1,this.var_196); + return this.getPartIndex(param1,this.var_196); } public function get name_302() : int @@ -60,12 +60,12 @@ package package_13 public function name_331(param1:String) : name_234 { - return this.method_316(param1,this.var_197) as name_234; + return this.findPartByID(param1,this.var_197) as name_234; } public function name_338(param1:String) : int { - return this.method_317(param1,this.var_197); + return this.getPartIndex(param1,this.var_197); } public function get method_325() : int @@ -80,10 +80,10 @@ package package_13 override public function run() : void { - this.method_323(); + this.loadHulls(); } - private function method_316(param1:String, param2:Vector.) : name_333 + private function findPartByID(param1:String, param2:Vector.) : name_333 { var _loc3_:name_333 = null; for each(_loc3_ in param2) @@ -96,7 +96,7 @@ package package_13 return null; } - private function method_317(param1:String, param2:Vector.) : int + private function getPartIndex(param1:String, param2:Vector.) : int { var _loc4_:name_333 = null; var _loc3_:int = 0; @@ -112,55 +112,55 @@ package package_13 return -1; } - private function method_323() : void + private function loadHulls() : void { this.var_194 = new name_461(); - this.var_194.addEventListener(Event.COMPLETE,this.method_321); - this.var_194.load(this.method_320(),config.xml.tankParts.hull,new name_463()); + this.var_194.addEventListener(Event.COMPLETE,this.onHullsLoadingComplete); + this.var_194.load(this.getBaseUrl(),config.xml.tankParts.hull,new name_463()); } - private function method_321(param1:Event) : void + private function onHullsLoadingComplete(param1:Event) : void { dispatchEvent(new name_169(name_169.TASK_PROGRESS,1,3)); - this.var_194.removeEventListener(Event.COMPLETE,this.method_321); + this.var_194.removeEventListener(Event.COMPLETE,this.onHullsLoadingComplete); this.var_196 = this.var_194.parts; - this.method_324(); + this.loadTurrets(); } - private function method_324() : void + private function loadTurrets() : void { - this.var_194.addEventListener(Event.COMPLETE,this.method_319); - this.var_194.load(this.method_320(),config.xml.tankParts.turret,new name_464()); + this.var_194.addEventListener(Event.COMPLETE,this.onTurretsLoadingComplete); + this.var_194.load(this.getBaseUrl(),config.xml.tankParts.turret,new name_464()); } - private function method_319(param1:Event) : void + private function onTurretsLoadingComplete(param1:Event) : void { dispatchEvent(new name_169(name_169.TASK_PROGRESS,1,3)); - this.var_194.removeEventListener(Event.COMPLETE,this.method_319); + this.var_194.removeEventListener(Event.COMPLETE,this.onTurretsLoadingComplete); this.var_197 = this.var_194.parts; this.var_194 = null; - this.method_322(); + this.loadColormaps(); } - private function method_322() : void + private function loadColormaps() : void { this.var_195 = new name_462(); - this.var_195.addEventListener(Event.COMPLETE,this.method_318); - this.var_195.load(name_459.name_460(config.xml.colorings.@baseUrl),config.xml.colorings.image); + this.var_195.addEventListener(Event.COMPLETE,this.onColormapsLoadingComplete); + this.var_195.load(StringUtils.name_460(config.xml.colorings.@baseUrl),config.xml.colorings.image); } - private function method_318(param1:Event) : void + private function onColormapsLoadingComplete(param1:Event) : void { dispatchEvent(new name_169(name_169.TASK_PROGRESS,1,3)); this.var_198 = this.var_195.images; - this.var_195.removeEventListener(Event.COMPLETE,this.method_318); + this.var_195.removeEventListener(Event.COMPLETE,this.onColormapsLoadingComplete); this.var_195 = null; method_102(); } - private function method_320() : String + private function getBaseUrl() : String { - return name_459.name_460(config.xml.tankParts.@baseUrl); + return StringUtils.name_460(config.xml.tankParts.@baseUrl); } } } diff --git a/src/package_13/name_172.as b/src/alternativa/tanks/config/TextureLibrary.as similarity index 81% rename from src/package_13/name_172.as rename to src/alternativa/tanks/config/TextureLibrary.as index 99058aa..5b6cedf 100644 --- a/src/package_13/name_172.as +++ b/src/alternativa/tanks/config/TextureLibrary.as @@ -1,11 +1,11 @@ -package package_13 +package alternativa.tanks.config { import flash.display.BitmapData; import flash.events.Event; import package_40.name_169; import package_40.name_170; - public class name_172 extends class_21 + public class TextureLibrary extends ResourceLoader { private var textures:Object = {}; @@ -13,14 +13,14 @@ package package_13 private var var_34:name_170; - public function name_172(param1:name_18) + public function TextureLibrary(param1:Config) { super("Texture library loader",param1); } public function name_244(param1:String) : Object { - return this.textures[param1] || this.method_311(); + return this.textures[param1] || this.getDummyTexture(); } public function method_310(param1:String, param2:Object) : void @@ -32,29 +32,29 @@ package package_13 { var _loc3_:XML = null; var _loc1_:XML = config.xml.textures[0]; - var _loc2_:String = name_459.name_460(_loc1_.@baseUrl); + var _loc2_:String = StringUtils.name_460(_loc1_.@baseUrl); this.var_34 = new name_170(); for each(_loc3_ in _loc1_.texture) { this.var_34.addTask(new TextureLoader(_loc3_.@id,_loc2_ + _loc3_.@url,this)); } - this.var_34.addEventListener(name_169.TASK_COMPLETE,this.method_312); - this.var_34.addEventListener(Event.COMPLETE,this.method_107); + this.var_34.addEventListener(name_169.TASK_COMPLETE,this.onTaskComplete); + this.var_34.addEventListener(Event.COMPLETE,this.onSequenceComplete); this.var_34.run(); } - private function method_312(param1:name_169) : void + private function onTaskComplete(param1:name_169) : void { dispatchEvent(new name_169(name_169.TASK_PROGRESS,1,this.var_34.length)); } - private function method_107(param1:Event) : void + private function onSequenceComplete(param1:Event) : void { this.var_34 = null; method_102(); } - private function method_311() : BitmapData + private function getDummyTexture() : BitmapData { var _loc1_:int = 0; var _loc2_:uint = 0; @@ -98,13 +98,13 @@ class TextureLoader extends class_7 private var url:String; - private var library:name_172; + private var library:TextureLibrary; private var loader:Loader; private var urlLoader:URLLoader; - public function TextureLoader(param1:String, param2:String, param3:name_172) + public function TextureLoader(param1:String, param2:String, param3:TextureLibrary) { super(); this.id = param1; diff --git a/src/package_13/class_21.as b/src/package_13/class_21.as deleted file mode 100644 index 4c585cf..0000000 --- a/src/package_13/class_21.as +++ /dev/null @@ -1,19 +0,0 @@ -package package_13 -{ - import package_40.class_7; - - public class class_21 extends class_7 - { - public var config:name_18; - - public var name:String; - - public function class_21(param1:String, param2:name_18) - { - super(); - this.config = param2; - this.name = param1; - } - } -} - diff --git a/src/package_41/name_173.as b/src/package_41/name_173.as index f34b3ca..ab0bdcf 100644 --- a/src/package_41/name_173.as +++ b/src/package_41/name_173.as @@ -2,19 +2,19 @@ package package_41 { import flash.events.Event; import flash.media.Sound; - import package_13.class_21; - import package_13.name_18; - import package_13.name_459; + import alternativa.tanks.config.ResourceLoader; + import alternativa.tanks.config.Config; + import alternativa.tanks.config.StringUtils; import package_40.name_169; import package_40.name_170; - public class name_173 extends class_21 + public class name_173 extends ResourceLoader { private var sounds:Object = {}; private var var_34:name_170; - public function name_173(param1:name_18) + public function name_173(param1:Config) { super("Sounds library loader",param1); } @@ -38,7 +38,7 @@ package package_41 return; } var _loc1_:XML = config.xml.sounds[0]; - var _loc2_:String = name_459.name_460(_loc1_.@baseUrl); + var _loc2_:String = StringUtils.name_460(_loc1_.@baseUrl); this.var_34 = new name_170(); for each(_loc3_ in _loc1_.sound) { diff --git a/src/package_41/name_175.as b/src/package_41/name_175.as index 7484cbf..f9d1068 100644 --- a/src/package_41/name_175.as +++ b/src/package_41/name_175.as @@ -2,21 +2,21 @@ package package_41 { import flash.events.Event; import flash.utils.ByteArray; - import package_13.name_18; - import package_13.name_459; - import package_13.name_58; - import package_13.name_70; + import alternativa.tanks.config.Config; + import alternativa.tanks.config.StringUtils; + import alternativa.tanks.config.BlobGroup; + import alternativa.tanks.config.BlobCategory; import package_40.class_7; import package_40.name_169; import package_40.name_170; public class name_175 extends class_7 { - private var config:name_18; + private var config:Config; private var var_34:name_170; - public function name_175(param1:name_18) + public function name_175(param1:Config) { super(); this.config = param1; @@ -39,7 +39,7 @@ package package_41 for each(_loc3_ in _loc1_.elements("blobs-group")) { _loc4_ = _loc3_.@id; - _loc5_ = name_459.name_460(_loc3_.@baseUrl); + _loc5_ = StringUtils.name_460(_loc3_.@baseUrl); for each(_loc6_ in _loc3_.elements("blob")) { _loc7_ = _loc6_.@id; @@ -60,16 +60,16 @@ package package_41 public function method_328(param1:String, param2:String, param3:String, param4:ByteArray) : void { - var _loc5_:name_70 = this.config.name_68.name_72(param1); + var _loc5_:BlobCategory = this.config.name_68.name_72(param1); if(_loc5_ == null) { - _loc5_ = new name_70(); + _loc5_ = new BlobCategory(); this.config.name_68.method_326(param1,_loc5_); } - var _loc6_:name_58 = _loc5_.name_62(param2); + var _loc6_:BlobGroup = _loc5_.name_62(param2); if(_loc6_ == null) { - _loc6_ = new name_58(); + _loc6_ = new BlobGroup(); _loc5_.method_214(param2,_loc6_); } _loc6_.method_218(param3,param4);