diff --git a/package.json b/package.json index ba26d0e..23a797d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tankz", - "version": "0.5.1", + "version": "0.6.0", "private": true, "devDependencies": { "ansi-colors": "^1.0.1", diff --git a/src/client/haxe/ru/m/tankz/render/RenderItem.hx b/src/client/haxe/ru/m/tankz/render/RenderItem.hx index 74e90e6..cea12ce 100644 --- a/src/client/haxe/ru/m/tankz/render/RenderItem.hx +++ b/src/client/haxe/ru/m/tankz/render/RenderItem.hx @@ -153,14 +153,17 @@ class TankItem extends RenderItem { override public function redraw():Void { var colors:Array = [value.color, value.bonus ? 0xff00aa : value.color]; - tankView.frames = getFrames().map(function(src) return BitmapUtil.colorize(Assets.getBitmapData(src), colors.shift())); + var frames = [for (frame in getFrames()) BitmapUtil.colorize(Assets.getBitmapData(frame), colors.shift())]; + tankView.frames = [ + frames[0], frames[0], frames[0], + frames[1], frames[1], frames[1], + ]; } private function getFrames():Array { - return [ - 'resources/image/tank/${value.config.skin}-0.png', - 'resources/image/tank/${value.config.skin}-1.png', - ]; + var frame0 = 'resources/image/tank/${value.config.skin}-0.png'; + var frame1 = 'resources/image/tank/${value.config.skin}-1.png'; + return [frame1, frame0]; } override public function update():Void { @@ -210,11 +213,9 @@ class BonusItem extends AnimateItem { } override public function redraw():Void { - // ToDo: 15/15 frames - view.frames = [ - Assets.getBitmapData('resources/image/bonus/${value.bonusType}.png'), - new BitmapData(1, 1), - ]; + var image = Assets.getBitmapData('resources/image/bonus/${value.bonusType}.png'); + var empty = new BitmapData(image.width, image.height, true, 0x00000000); + view.frames = [for (i in 0...15) image].concat([for (i in 0...15) empty]); view.playing = true; } } diff --git a/src/client/resources/classic/config.yaml b/src/client/resources/classic/config.yaml index 8cdd87f..5b61783 100644 --- a/src/client/resources/classic/config.yaml +++ b/src/client/resources/classic/config.yaml @@ -24,10 +24,10 @@ teams: - id: bot spawnInterval: 3000 tanks: - - {type: bot0, rate: 0.25, bonus: 1} - - {type: bot1, rate: 0.25, bonus: 1} - - {type: bot2, rate: 0.25, bonus: 1} - - {type: bot3, rate: 0.25, bonus: 1} + - {type: bot0, rate: 0.25, bonus: 0.25} + - {type: bot1, rate: 0.25, bonus: 0.25} + - {type: bot2, rate: 0.25, bonus: 0.25} + - {type: bot3, rate: 0.25, bonus: 0.25} points: - {team: human, type: eagle, index: -1, direction: right, x: 12, y: 24} diff --git a/src/client/resources/dota/config.yaml b/src/client/resources/dota/config.yaml index f813fd4..8be74c7 100644 --- a/src/client/resources/dota/config.yaml +++ b/src/client/resources/dota/config.yaml @@ -54,10 +54,10 @@ tanks: - type: slow width: 38 height: 36 - speed: 2.0 + speed: 2.3 bullet: <<: *bullet - speed: 10.0 + speed: 12.0 bullets: 1 skin: bc @@ -67,7 +67,7 @@ tanks: speed: 4.0 bullet: <<: *bullet - speed: 7.0 + speed: 8.0 bullets: 1 skin: bb diff --git a/src/client/resources/image/tank/pa-0.png b/src/client/resources/image/tank/pa-0.png index 9c8bd0e..adf359d 100644 Binary files a/src/client/resources/image/tank/pa-0.png and b/src/client/resources/image/tank/pa-0.png differ diff --git a/src/client/resources/image/tank/pa-1.png b/src/client/resources/image/tank/pa-1.png index edf381c..94c9396 100644 Binary files a/src/client/resources/image/tank/pa-1.png and b/src/client/resources/image/tank/pa-1.png differ diff --git a/src/client/resources/image/tank/pb-0.png b/src/client/resources/image/tank/pb-0.png index 6f9d3e2..55b6bb1 100644 Binary files a/src/client/resources/image/tank/pb-0.png and b/src/client/resources/image/tank/pb-0.png differ diff --git a/src/client/resources/image/tank/pb-1.png b/src/client/resources/image/tank/pb-1.png index a19cd03..1a013dc 100644 Binary files a/src/client/resources/image/tank/pb-1.png and b/src/client/resources/image/tank/pb-1.png differ diff --git a/src/client/resources/image/tank/pc-0.png b/src/client/resources/image/tank/pc-0.png index fb0887c..c3aa280 100644 Binary files a/src/client/resources/image/tank/pc-0.png and b/src/client/resources/image/tank/pc-0.png differ diff --git a/src/client/resources/image/tank/pc-1.png b/src/client/resources/image/tank/pc-1.png index e874352..8359494 100644 Binary files a/src/client/resources/image/tank/pc-1.png and b/src/client/resources/image/tank/pc-1.png differ diff --git a/src/client/resources/image/tank/pd-0.png b/src/client/resources/image/tank/pd-0.png index 64d6086..7c2d14c 100644 Binary files a/src/client/resources/image/tank/pd-0.png and b/src/client/resources/image/tank/pd-0.png differ diff --git a/src/client/resources/image/tank/pd-1.png b/src/client/resources/image/tank/pd-1.png index 66b82df..64017c8 100644 Binary files a/src/client/resources/image/tank/pd-1.png and b/src/client/resources/image/tank/pd-1.png differ diff --git a/src/common/haxe/ru/m/tankz/game/ClassicGame.hx b/src/common/haxe/ru/m/tankz/game/ClassicGame.hx index ab86ddd..eb5f43c 100644 --- a/src/common/haxe/ru/m/tankz/game/ClassicGame.hx +++ b/src/common/haxe/ru/m/tankz/game/ClassicGame.hx @@ -15,8 +15,8 @@ class ClassicGame extends Game { public static var HUMAN(default, never):TeamId = 'human'; public static var BOT(default, never):TeamId = 'bot'; - private static var PLAYER1_COLOR:Color = 0xffff55; - private static var PLAYER2_COLOR:Color = 0x00ff00; + private static var PLAYER1_COLOR:Color = 0xFC9838; + private static var PLAYER2_COLOR:Color = 0x159D49; public static var PLAYER1(default, never):GameMode = [ {team:HUMAN, type:Control.HUMAN, color: PLAYER1_COLOR, index:0}