diff --git a/WORK.md b/WORK.md index 76a99fa..13fdd28 100644 --- a/WORK.md +++ b/WORK.md @@ -1,23 +1,17 @@ -* bonuses - * death game bonuses +* death game bonus * tanks and bullets speed balancing -* game series - * clean player state on restart in classic type - * network series -* map packs - * import in game - * save imported in local storage - * database -* improve bots - * A star +* clean player state on restart in classic type +* network series +* map pack version (or hash) +* bot upgrade * game config validate -* additional weapon - * mine z-order - * spawn mine on tank back - * check mine exist when spawn mine - * double rocket - * display count - * bonus ammo - * screen gamepad (button enabled, count label) -* ui: - * game frame layouts +* mine z-order +* mine spawn position +* mine spawn on other mine +* double rocket +* display ammo count (panel) +* display ammo count (screen gamepad) +* bonus ammo +* game panel rework +* pause +* game state: config, map, entities, players diff --git a/gulp b/gulp new file mode 120000 index 0000000..b356e5e --- /dev/null +++ b/gulp @@ -0,0 +1 @@ +node_modules/.bin/gulp \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 495fccf..9b94d41 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -119,6 +119,7 @@ const editor = new Project( ], meta: { filename: 'editor', + pack: 'ru.m.tankz.editor', width: 1024, height: 768, }, diff --git a/src/client/haxe/ru/m/tankz/Const.hx b/src/client/haxe/ru/m/tankz/Const.hx index 9c5ec77..141bbd2 100755 --- a/src/client/haxe/ru/m/tankz/Const.hx +++ b/src/client/haxe/ru/m/tankz/Const.hx @@ -7,12 +7,14 @@ class Const { public static var FPS:Int; public static var BUILD:String; public static var VERSION:String; + public static var NAME:String; public static var DEBUG:Bool; public static function init():Void { FPS = Std.parseInt(Lib.current.stage.application.meta.get("fps")); BUILD = CompilationOption.get("build"); VERSION = Lib.current.stage.application.meta.get("version"); + NAME = Lib.current.stage.application.meta.get("name"); DEBUG = Capabilities.isDebugger; } } diff --git a/src/client/haxe/ru/m/tankz/view/ClientView.hx b/src/client/haxe/ru/m/tankz/view/ClientView.hx index ac19547..1a803aa 100644 --- a/src/client/haxe/ru/m/tankz/view/ClientView.hx +++ b/src/client/haxe/ru/m/tankz/view/ClientView.hx @@ -20,6 +20,7 @@ import ru.m.tankz.sound.SoundManager; public function init():Void { resources.text.put('version', '${Const.VERSION}'); + resources.text.put('name', '${Const.NAME}'); switcher = switcherView; } diff --git a/src/client/haxe/ru/m/tankz/view/MenuFrame.yaml b/src/client/haxe/ru/m/tankz/view/MenuFrame.yaml index b0f4b4b..cced200 100644 --- a/src/client/haxe/ru/m/tankz/view/MenuFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/MenuFrame.yaml @@ -10,7 +10,7 @@ views: layout.hAlign: center views: - $type: haxework.view.form.LabelView - text: Tank'z + text: $r:text:name style: font font.size: 100 geometry.margin.bottom: 30 diff --git a/src/common/haxe/ru/m/tankz/Type.hx b/src/common/haxe/ru/m/tankz/Type.hx index 97e443d..1bdae1f 100644 --- a/src/common/haxe/ru/m/tankz/Type.hx +++ b/src/common/haxe/ru/m/tankz/Type.hx @@ -63,19 +63,19 @@ abstract PlayerId(Array) { } } -abstract PackId(Array) { +abstract PackId({type:GameType, name:String}) { public static inline var DEFAULT = "standard"; public var type(get, never):GameType; public var name(get, never):String; public function new(type:GameType, name:String = DEFAULT) { - this = [type, name]; + this = {type: type, name: name}; } - private inline function get_type():GameType return this[0]; + private inline function get_type():GameType return this.type; - private inline function get_name():String return this[1]; + private inline function get_name():String return this.name; @:from static public inline function fromArray(value:Array):PackId { return new PackId(value[0], value[1]); diff --git a/src/common/resources/level/classic_modern.zip b/src/common/resources/level/classic_modern.zip index bb1a663..c8ea34a 100644 Binary files a/src/common/resources/level/classic_modern.zip and b/src/common/resources/level/classic_modern.zip differ