diff --git a/WORK.md b/WORK.md index 1bd9d7f..76a99fa 100644 --- a/WORK.md +++ b/WORK.md @@ -2,6 +2,7 @@ * death game bonuses * tanks and bullets speed balancing * game series + * clean player state on restart in classic type * network series * map packs * import in game @@ -11,6 +12,10 @@ * A star * 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) diff --git a/src/client/haxe/ru/m/tankz/Init.hx b/src/client/haxe/ru/m/tankz/Init.hx index 79df69a..5df4f35 100644 --- a/src/client/haxe/ru/m/tankz/Init.hx +++ b/src/client/haxe/ru/m/tankz/Init.hx @@ -66,7 +66,7 @@ class Init { public static function init():Void { theme = new AppTheme(); resources = new Resources(); - levelBundle = new CachedLevelBundle(new ClientLevelSource(), new SharedObjectStorage()); + levelBundle = new CachedLevelBundle(new ClientLevelSource()/*, new SharedObjectStorage()*/); //ToDo: update levelBundle.load(); configBundle = new ConfigBundle(); settingsStorage = new SettingsStorage(); diff --git a/src/client/resources/image/bullet/mine.png b/src/client/resources/image/bullet/mine.png index 97d99e9..49f79e4 100644 Binary files a/src/client/resources/image/bullet/mine.png and b/src/client/resources/image/bullet/mine.png differ diff --git a/src/client/resources/image/bullet/rocket.png b/src/client/resources/image/bullet/rocket.png index 597864b..adc2327 100644 Binary files a/src/client/resources/image/bullet/rocket.png and b/src/client/resources/image/bullet/rocket.png differ diff --git a/src/common/resources/config/death.yaml b/src/common/resources/config/death.yaml index f0e2a5f..705f1ac 100644 --- a/src/common/resources/config/death.yaml +++ b/src/common/resources/config/death.yaml @@ -6,8 +6,8 @@ map: width: 22 height: 22 grid: - width: 20 - height: 20 + width: 30 + height: 30 bricks: - {type: border, index: -1, layer: -1, armor: -1} @@ -62,13 +62,13 @@ presets: points: - {team: alpha, type: tank, index: 0, direction: right, x: 0, y: 0} - - {team: beta, type: tank, index: 0, direction: right, x: 2, y: 0} - - {team: gamma, type: tank, index: 0, direction: right, x: 4, y: 0} - - {team: delta, type: tank, index: 0, direction: right, x: 6, y: 0} - - {team: epsilon, type: tank, index: 0, direction: right, x: 0, y: 2} - - {team: zeta, type: tank, index: 0, direction: right, x: 2, y: 2} - - {team: eta, type: tank, index: 0, direction: right, x: 4, y: 2} - - {team: theta, type: tank, index: 0, direction: right, x: 6, y: 2} + - {team: beta, type: tank, index: 0, direction: right, x: 14, y: 0} + - {team: gamma, type: tank, index: 0, direction: right, x: 28, y: 0} + - {team: delta, type: tank, index: 0, direction: right, x: 0, y: 14} + - {team: epsilon, type: tank, index: 0, direction: right, x: 28, y: 14} + - {team: zeta, type: tank, index: 0, direction: right, x: 0, y: 28} + - {team: eta, type: tank, index: 0, direction: right, x: 14, y: 28} + - {team: theta, type: tank, index: 0, direction: right, x: 28, y: 28} tanks: - type: default diff --git a/src/common/resources/level/death_standard.zip b/src/common/resources/level/death_standard.zip index 664e4ea..86ae2b4 100644 Binary files a/src/common/resources/level/death_standard.zip and b/src/common/resources/level/death_standard.zip differ