[common] added LevelPack

gulpfile.js

@@ -1,4 +1,6 @@
 const gulp = require('gulp');
+const zip = require('gulp-zip');
+const foreach = require('gulp-foreach');
 const gulpClean = require('gulp-clean');
 const Config = require('./config.json');
 const packageInfo = require('./package.json');
@@ -25,6 +27,19 @@ exports.generate = function generate()  {
     });
 };
 
+exports.levels = function () {
+    return gulp.src("./src/common/level/*").pipe(foreach(function (stream, file) {
+        const type = file.path.substr(file.path.lastIndexOf("/") + 1);
+        gulp.src("./src/common/level/" + type + "/*").pipe(foreach(function (stream, file) {
+            const name = file.path.substr(file.path.lastIndexOf("/") + 1);
+            gulp.src("./src/common/level/" + type + "/" + name + "/*")
+                .pipe(zip(`${type}_${name}.zip`))
+                .pipe(gulp.dest("./target/levels"));
+        }));
+        return stream;
+    }));
+};
+
 /**
  * ToDo:
  * windows target
@@ -46,7 +61,8 @@ const config = new Project.Config({
         'src-gen/haxe',
     ],
     assets: [
-        'src/common/resources'
+        'src/common/resources',
+        'target/levels'
     ],
     flags: [
         //'proto_debug',

package.json

@@ -7,7 +7,9 @@
         "gulp": "^4.0.0",
         "gulp-add": "0.0.2",
         "gulp-clean": "^0.4.0",
+        "gulp-foreach": "^0.1.0",
         "gulp-haxetool": "^0.0.19",
+        "gulp-zip": "^5.0.0",
         "yargs": "^13.2.4"
     },
     "haxeDependencies": {

src/client/haxe/ru/m/tankz/bundle/ConfigBundle.hx

@@ -15,7 +15,7 @@ class ConfigBundle implements IConfigBundle {
 
     public function get(type:GameType):Config {
         if (!_cache.exists(type)) {
-            var source:ConfigSource = Yaml.parse(Assets.getText('resources/${type}/config.yaml'), Parser.options().useObjects());
+            var source:ConfigSource = Yaml.parse(Assets.getText('resources/config/${type}.yaml'), Parser.options().useObjects());
             _cache.set(type, Config.fromSource(type, source));
         }
         return _cache.get(type);

src/client/haxe/ru/m/tankz/bundle/LevelBundle.hx

@@ -1,5 +1,10 @@
 package ru.m.tankz.bundle;
 
+import haxe.io.BytesInput;
+import haxe.zip.Entry;
+import haxe.zip.Reader;
+import lime.utils.Bytes;
+import lime.utils.CompressionAlgorithm;
 import openfl.Assets;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;
@@ -7,17 +12,27 @@ import ru.m.tankz.util.LevelUtil;
 
 class LevelBundle implements ILevelBundle {
 
-    private var cache:Map<String, LevelConfig> = new Map();
-
     public function new() {}
 
-    public function get(type:GameType, config:Config, levelId:LevelId):LevelConfig {
-        var key = '${type}:${levelId}';
-        if (!cache.exists(key)) {
-            var data:String = Assets.getText('resources/${type}/levels/level${LevelUtil.formatLevel(levelId)}.txt');
-            cache[key] = LevelUtil.loads(config, data);
-            cache[key].id = levelId;
+    private function extract(entry:Entry):LevelConfig {
+        var bytes:Bytes = entry.data;
+        if (entry.compressed) {
+            bytes = bytes.decompress(CompressionAlgorithm.DEFLATE);
         }
-        return cache[key];
+        var level = LevelUtil.loads(bytes.toString());
+        if (level.id == null) {
+            level.id = Std.parseInt(entry.fileName.split("level").pop());
+        }
+        return level;
+    }
+
+    public function get(type:GameType, name:String):LevelPack {
+        var data = Assets.getBytes('levels/${type}_${name}.zip');
+        var files = Reader.readZip(new BytesInput(data));
+        return {
+            type: type,
+            name: name,
+            data: Lambda.array(files.map(extract)),
+        };
     }
 }

src/client/haxe/ru/m/tankz/network/NetworkGame.hx

@@ -14,7 +14,7 @@ class NetworkGame extends Game {
     private var network:NetworkManager;
 
     public function new(network:NetworkManager) {
-        super(new GameState(network.room.game.type, 0, network.room.game.level));
+        super(new GameState(network.room.game.type, 0));
         this.network = network;
         this.controlFactory = new NetworkControlFactory();
         network.gameEventSignal.connect(onGameEventProto);

src/client/haxe/ru/m/tankz/view/GameFrame.hx

@@ -1,6 +1,5 @@
 package ru.m.tankz.view;
 
-import haxe.ds.Option;
 import haxework.view.frame.FrameSwitcher;
 import haxework.view.VGroupView;
 import ru.m.tankz.game.GameEvent;
@@ -10,7 +9,6 @@ import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.Type;
 import ru.m.tankz.view.game.GameView;
 
 @:template class GameFrame extends VGroupView implements GameListener {
@@ -24,7 +22,6 @@ import ru.m.tankz.view.game.GameView;
     @:provide var soundManager:SoundManager;
     @:provide var state:GameState;
     @:provide var record:GameRecord;
-    @:provide("next") var nextState:GameState;
     @:provide var switcher:FrameSwitcher;
     @:provide var gameStorage:GameStorage;
 
@@ -56,34 +53,12 @@ import ru.m.tankz.view.game.GameView;
         switch event {
             case GameEvent.COMPLETE(state, winner):
                 this.state = state;
-                nextState = switch next(winner) {
-                    case Some(s):
-                        // ToDo:
-                        var progress = gameStorage.get(game.type);
-                        progress.completeLevel(state.levelId, state.presetId);
-                        gameStorage.set(progress);
-                        s;
-                    case None:
-                        null;
-                }
                 stop();
                 switcher.change(ResultFrame.ID);
             case _:
         }
     }
 
-    // ToDo:
-    private function next(winner:TeamId):Option<GameState> {
-        for (rule in game.config.game.complete) {
-            if (rule.team != null && rule.team != winner) {
-                return Option.None;
-            }
-        }
-        var level = state.levelId + 1;
-        if (level >= game.config.game.levels) level = 0;
-        return Option.Some(new GameState(game.type, state.presetId, level, state));
-    }
-
     public function onHide():Void {
         stop();
         soundManager.stopAll();

src/client/haxe/ru/m/tankz/view/LevelFrame.hx

@@ -11,14 +11,13 @@ import ru.m.tankz.game.GameState;
 import ru.m.tankz.game.IGame;
 import ru.m.tankz.local.LocalGame;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.Type;
 import ru.m.tankz.view.popup.LevelPopup;
 
 @:template class LevelFrame extends VGroupView {
     public static inline var ID = "level";
 
     @:view var header:LabelView;
-    @:view var levels:DataView<LevelId, ButtonView>;
+    @:view var levels:DataView<LevelConfig, ButtonView>;
 
     @:provide var state:GameState;
     @:provide var game:IGame;
@@ -30,35 +29,35 @@ import ru.m.tankz.view.popup.LevelPopup;
 
     public function onShow():Void {
         header.text = state.type;
-        levels.data = [for (i in 0...state.config.game.levels) i];
+        var pack = levelBundle.get(state.type, "standard");
+        levels.data = pack.data;
     }
 
     private function start(level:LevelConfig, preset:GamePreset, control:ControlPreset):Void {
-        state.levelId = level.id;
+        state.level = level;
         state.presetId = preset.id;
         state.controls = control.values;
         game = new LocalGame(state);
         switcher.change(GameFrame.ID);
     }
 
-    private function levelViewFactory(index:Int, levelId:LevelId):ButtonView {
+    private function levelViewFactory(index:Int, level:LevelConfig):ButtonView {
         var progress = storage.get(state.type);
         var result = new ButtonView();
         result.skinId = "button.level";
-        var presetsLine = [for (p in state.config.presets) progress.isPresetCompleted(levelId, p.id) ? '*' : '_'].join('');
-        result.text = '${levelId}\n${presetsLine}';
-        result.disabled = !progress.isLevelAvailable(levelId);
+        var presetsLine = [for (p in state.config.presets) progress.isPresetCompleted(level.id, p.id) ? '*' : '_'].join('');
+        result.text = '${level.id}\n${presetsLine}';
+        result.disabled = !progress.isLevelAvailable(level.id);
         return result;
     }
 
-    private function onLevelSelect(index:Int, levelId:LevelId, view:ButtonView):Void {
-        if (!storage.get(state.type).isLevelAvailable(levelId)) {
+    private function onLevelSelect(index:Int, level:LevelConfig, view:ButtonView):Void {
+        if (!storage.get(state.type).isLevelAvailable(level.id)) {
             return;
         }
         if (levelPopup == null) {
             levelPopup = new LevelPopup();
         }
-        var level = levelBundle.get(state.type, state.config, levelId);
         levelPopup.setData(
             level,
             state.config.presets,

src/common/haxe/ru/m/tankz/Type.hx

@@ -8,6 +8,8 @@ typedef TeamId = String;
 
 typedef BrickType = String;
 
+typedef BrickIndex = Int;
+
 typedef TankType = String;
 
 typedef BonusType = String;

src/common/haxe/ru/m/tankz/bundle/ILevelBundle.hx

@@ -4,5 +4,5 @@ import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;
 
 interface ILevelBundle {
-    public function get(type:GameType, config:Config, levelId:LevelId):LevelConfig;
+    public function get(type:GameType, name:String):LevelPack;
 }

src/common/haxe/ru/m/tankz/config/Config.hx

@@ -108,12 +108,18 @@ typedef GamePreset = {
 
 typedef LevelConfig = {
     @:optional var id:LevelId;
-    var data:Array<BrickConfig>;
+    var data:Array<BrickIndex>;
     @:optional var name:String;
     @:optional var points:Array<SpawnPoint>;
     @:optional var size:{width:Int, height:Int};
 }
 
+typedef LevelPack = {
+    var type:GameType;
+    var name:String;
+    var data:Array<LevelConfig>;
+}
+
 typedef PlayerControl = {
     var playerId:PlayerId;
     var control:String;

src/common/haxe/ru/m/tankz/game/GameRunner.hx

@@ -51,7 +51,8 @@ class GameRunner extends Game implements EngineListener {
 
     override public function start():Void {
         super.start();
-        engine.map.setData(state.level.data);
+        var mapData = state.level.data.map(function(index:BrickIndex) return config.getBrickByIndex(index));
+        engine.map.setData(mapData);
         for (team in teams.iterator()) {
             team.spawner.runner = spawn;
             for (player in team.players.iterator()) {
@@ -135,7 +136,8 @@ class GameRunner extends Game implements EngineListener {
         for (team in teams.iterator()) {
             if (team.isAlive) {
                 if (team.eagleId > -1) {
-                    if (!cast(engine.entities[team.eagleId], Eagle).death) {
+                    var eagle:Eagle = engine.getEntity(team.eagleId);
+                    if (!eagle.death) {
                         actives.push(team.id);
                     }
                 } else {
@@ -148,12 +150,6 @@ class GameRunner extends Game implements EngineListener {
             case []: complete(null);
             case _:
         }
-        /*if (actives.length == 1) {
-            complete(actives[0]);
-        }
-        if (actives.length == 0) {
-            complete(null);
-        }*/
     }
 
     private function complete(winner:TeamId):Void {

src/common/haxe/ru/m/tankz/game/GameState.hx

@@ -72,21 +72,20 @@ class GameState {
 
     public var type:GameType;
     public var presetId:PresetId;
-    public var levelId:LevelId;
+    public var levelId(get, null):LevelId;
     public var controls:Array<PlayerControl>;
     public var players:Map<String, PlayerState>;
     public var teams:Map<TeamId, TeamState>;
     public var preset(get, null):GamePreset;
     public var config(get, null):Config;
-    public var level(get, null):LevelConfig;
+    public var level(default, default):LevelConfig;
 
     @:provide static private var configBundle:IConfigBundle;
-    @:provide static private var levelBundle:ILevelBundle;
 
-    public function new(type:GameType, presetId:PresetId = 0, levelId:Int = 0, state:GameState = null, controls:Array<PlayerControl> = null) {
+    public function new(type:GameType, presetId:PresetId = 0, level:LevelConfig = null, state:GameState = null, controls:Array<PlayerControl> = null) {
         this.type = type;
         this.presetId = presetId;
-        this.levelId = levelId;
+        this.level = level;
         //this.controls = controls == null ? config.controls[0].values : controls;
         this.controls = controls == null ? [] : controls;
         if (state == null) {
@@ -118,8 +117,8 @@ class GameState {
         return configBundle.get(type);
     }
 
-    private function get_level():LevelConfig {
-        return levelBundle.get(type, config, levelId);
+    private function get_levelId():LevelId {
+        return level == null ? 0 : level.id;
     }
 
     public function getTeamLife(id:TeamId):Int {

src/common/haxe/ru/m/tankz/game/record/GameRecord.hx

@@ -32,7 +32,7 @@ class GameRecord {
     }
 
     private inline function get_state():GameState {
-        return new GameState(info.type, info.presetId, info.levelId);
+        return new GameState(info.type, info.presetId);
     }
 
     public function toString():String {

src/common/haxe/ru/m/tankz/map/LevelMap.hx

@@ -1,5 +1,6 @@
 package ru.m.tankz.map;
 
+import ru.m.tankz.Type.BrickType;
 import haxe.ds.HashMap;
 import ru.m.tankz.map.Grid;
 import ru.m.geom.Point;

src/common/haxe/ru/m/tankz/util/LevelUtil.hx

@@ -1,6 +1,7 @@
 package ru.m.tankz.util;
 
 import ru.m.tankz.config.Config;
+import ru.m.tankz.Type;
 import yaml.Parser;
 import yaml.Renderer;
 import yaml.Yaml;
@@ -20,12 +21,12 @@ class LevelUtil {
         return result;
     }
 
-    public static function loadsOld(config:Config, data:String):LevelConfig {
-        var bricks:Array<BrickConfig> = [];
+    public static function loadsOld(data:String):LevelConfig {
+        var bricks:Array<BrickIndex> = [];
         for (line in ~/\s+/g.split(data)) {
             for (c in line.split('')) {
                 if (c.length > 0) {
-                    bricks.push(config.getBrickByIndex(Std.parseInt(c)));
+                    bricks.push(Std.parseInt(c));
                 }
             }
         }
@@ -34,22 +35,22 @@ class LevelUtil {
         }
     }
 
-    public static function loads(config:Config, data:String):LevelConfig {
-        if (config.type == 'classic') {
-            return loadsOld(config, data);
-        } else {
+    public static function loads(data:String):LevelConfig {
+        try {
             var obj:LevelSource = Yaml.parse(data, Parser.options().useObjects());
             return {
-                data: obj.data.split('').map(function(c) return config.getBrickByIndex(Std.parseInt(c))),
+                data: obj.data.split('').map(function(c) return Std.parseInt(c)),
                 points: obj.points,
                 name: obj.name,
                 size: obj.size,
             }
+        } catch (error:Dynamic) {
+            return loadsOld(data);
         }
     }
 
     public static function dumps(config:Config, level:LevelConfig):String {
-        var bricksStr = level.data.map(function(brick:BrickConfig) return Std.string(brick.index)).join('');
+        var bricksStr = level.data.join('');
         return Yaml.render({
             data: bricksStr,
             points: level.points,
@@ -58,7 +59,7 @@ class LevelUtil {
         }, Renderer.options().setFlowLevel(1));
     }
 
-    public static function empty(size:GridSize, filler:BrickConfig):LevelConfig {
+    public static function empty(size:GridSize, filler:BrickIndex):LevelConfig {
         return {
             data: [for (i in 0...size.width * size.height) filler],
             size: size,

src/common/resources/config/classic.yaml

@@ -1,5 +1,4 @@
 game:
-  levels: 36
   friendlyFire: false
   complete:
     - team: human

src/common/resources/config/death.yaml

@@ -1,5 +1,4 @@
 game:
-  levels: 4
   friendlyFire: true
   complete:
     - team: alpha

src/common/resources/config/dota.yaml

@@ -1,5 +1,4 @@
 game:
-  levels: 23
   friendlyFire: true
   complete:
     - team: radiant