diff --git a/.gitignore b/.gitignore index d6f5527..2ec2183 100755 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ out/ *.ipr *.iws *.ids -*.stackdump \ No newline at end of file +*.stackdump +.idea/ \ No newline at end of file diff --git a/project.xml b/project.xml index 7386f3b..9f0d172 100755 --- a/project.xml +++ b/project.xml @@ -1,14 +1,12 @@ - + - - + - diff --git a/protohx.json b/protohx.json index a9c1128..31df606 100755 --- a/protohx.json +++ b/protohx.json @@ -1,7 +1,7 @@ { "protoPath": ".", "protoFiles": [ - "proto/base.proto" + "src/common/proto/base.proto" ], "cleanOut": true, "haxeOut": "src-gen/haxe", diff --git a/src/client/haxe/ru/m/tankz/Client.hx b/src/client/haxe/ru/m/tankz/Client.hx index f644a2a..c6b0789 100755 --- a/src/client/haxe/ru/m/tankz/Client.hx +++ b/src/client/haxe/ru/m/tankz/Client.hx @@ -40,7 +40,7 @@ class Client implements IConnectionHandler { private var switcher:FrameSwitcher; public function new() { - var bytes = Assets.getBytes("res/layout/main.json"); + var bytes = Assets.getBytes("resources/layout/main.json"); var form:Dynamic = Json.parse(bytes.readUTFBytes(bytes.bytesAvailable)); view = GuiBuilder.build(form, {listener:this}); new Root(view); diff --git a/src/client/resources/animations.xml b/src/client/resources/animations.xml new file mode 100644 index 0000000..07e2e0d --- /dev/null +++ b/src/client/resources/animations.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/resources/conf/tank-z.ini b/src/client/resources/conf/tank-z.ini new file mode 100644 index 0000000..d2408f1 --- /dev/null +++ b/src/client/resources/conf/tank-z.ini @@ -0,0 +1,95 @@ +[keyboard] +reset = 27 ;Escape +pause = 80 ;P + +[player0] +key_left = 37 ;Left +key_up = 38 ;Up +key_right = 39 ;Rigth +key_down = 40 ;Down +key_shot = 96 ;Num0 + +[player1] +key_left = 65 ;A +key_up = 87 ;W +key_right = 68 ;D +key_down = 83 ;S +key_shot = 32 ;Space + +[bonus] +score = 500 +freeztime = 10 +eagletime = 20 +protecttime = 15 + +[bots] +count = 20 ;количество ботов на уровне +respawntime = 2.5 ;задержка между появлением ботов в секундах +shotdelay = 1.0 ;задержка между выстрелами +turndelay = 0.3 ;задержка перед поворотом при столкновении +rndturndelay = 2.0 ;задержка перед случайным поворотом +turntoeagle = 0.75 ;вероятность поворота к Орлу +bonus = 0.25 ;вероятность появления бонусного танка + + +[tank_p0] +movespeed = 2.5 ;скорость передвижения +bulletspeed = 8.0 ;скорость полёта снаряда +bullettype = 0 ;тип снаряда (0 - обычный, 1 - бронебойный) +bulletcount = 1 ;количество снарядов +hits = 1 ;количество хитпойнтов + +[tank_p1] +movespeed = 3.0 +bulletspeed = 8.5 +bullettype = 0 +bulletcount = 1 +hits = 1 + +[tank_p2] +movespeed = 3.0 +bulletspeed = 9.0 +bullettype = 0 +bulletcount = 2 +hits = 1 + +[tank_p3] +movespeed = 2.9 +bulletspeed = 9.0 +bullettype = 1 +bulletcount = 2 +hits = 2 + + + +[tank_b0] +movespeed = 2.0 +bulletspeed = 7.0 +bullettype = 0 +bulletcount = 1 +hits = 1 +score = 100 + +[tank_b1] +movespeed = 4.0 +bulletspeed = 7.0 +bullettype = 0 +bulletcount = 1 +hits = 1 +score = 200 + +[tank_b2] +movespeed = 2.0 +bulletspeed = 9.0 +bullettype = 0 +bulletcount = 1 +hits = 1 +score = 300 + +[tank_b3] +movespeed = 1.8 +bulletspeed = 8.0 +bullettype = 0 +bulletcount = 1 +hits = 4 +score = 400 diff --git a/src/client/resources/fonts/BookmanOldStyle.ttf b/src/client/resources/fonts/BookmanOldStyle.ttf new file mode 100644 index 0000000..d5ed82f Binary files /dev/null and b/src/client/resources/fonts/BookmanOldStyle.ttf differ diff --git a/src/client/resources/gui/main.json b/src/client/resources/gui/main.json new file mode 100755 index 0000000..6e23bd5 --- /dev/null +++ b/src/client/resources/gui/main.json @@ -0,0 +1,82 @@ +{ + "type":"haxework.frame.FrameSwitcher", + "skin":{"type":"haxework.gui.skin.BitmapSkin", "image":"@~image:resources/images/background.png", "fillType":"REPEAT"}, + "views":[ + { + "id":"menu", "type":"haxework.gui.VGroupView", + "pWidth":100, "pHeight":100, + "views":[ + { + "id":"logo", "type":"haxework.gui.SpriteView", "contentSize":true, + "skin":{"type":"haxework.gui.skin.BitmapSkin", "image":"@~image:resources/images/logo/logo.png"} + }, + { + "type":"haxework.gui.VGroupView", "contentSize":true, + "views":[ + { + "id":"start1", "type":"haxework.gui.ButtonView", "_include":"button", + "text":"1 Player", "onPress":"#listener" + }, + { + "id":"start2", "type":"haxework.gui.ButtonView", "_include":"button", + "text":"2 Player", "onPress":"#listener" + }, + { + "id":"options", "type":"haxework.gui.ButtonView", "_include":"button", + "text":"Options", "onPress":"#listener" + }, + { + "id":"about", "type":"haxework.gui.ButtonView", "_include":"button", + "text":"About", "onPress":"#listener" + } + ] + } + ] + }, + { + "id":"game", "type":"haxework.gui.HGroupView", + "pWidth":100, "pHeight":100, + "views":[ + { + "id":"map", "type":"haxework.gui.SpriteView", + "pHeight":100, "r":1, + "skin":{"type":"haxework.gui.skin.ColorSkin", "color":"0xff0000"} + }, + { + "type":"haxework.gui.VGroupView", + "pWidth":100, "pHeight":100, + "skin":{"type":"haxework.gui.skin.ColorSkin", "color":"0x00ff00"} + } + ] + }, + { + "id":"about", "type":"haxework.gui.VGroupView", + "pWidth":100, "pHeight":100, + "views":[ + { + "type":"haxework.gui.LabelView", "text":"@text:about", + "fontFamily":"@text:font", "fontEmbed":true, "fontSize":48, "contentSize":true + }, + {"type":"haxework.gui.SpriteView", "height":400}, + { + "id":"back", "type":"haxework.gui.ButtonView", "_include":"button", + "text":"Back", "onPress":"#listener" + } + ] + } + ], + + "_includes":{ + "button":{ + "width":250, "height":60, + "skin":{ + "type":"haxework.gui.skin.ButtonBitmapSkin", + "upImage":"@~image:resources/images/control/button_normal.png", + "overImage":"@~image:resources/images/control/button_over.png", + "downImage":"@~image:resources/images/control/button_down.png", + "fillType":"NINEPATH" + }, + "fontFamily":"@text:font", "fontEmbed":true, "fontColor":"0xE7E0BB", "fontSize":20 + } + } +} \ No newline at end of file diff --git a/src/client/resources/images/background.png b/src/client/resources/images/background.png new file mode 100644 index 0000000..7a799e6 Binary files /dev/null and b/src/client/resources/images/background.png differ diff --git a/src/client/resources/images/bonus/bonus_0-0.png b/src/client/resources/images/bonus/bonus_0-0.png new file mode 100644 index 0000000..5d6be95 Binary files /dev/null and b/src/client/resources/images/bonus/bonus_0-0.png differ diff --git a/src/client/resources/images/bonus/bonus_0-1.png b/src/client/resources/images/bonus/bonus_0-1.png new file mode 100644 index 0000000..2772af1 Binary files /dev/null and b/src/client/resources/images/bonus/bonus_0-1.png differ diff --git a/src/client/resources/images/bonus/bonus_1-0.png b/src/client/resources/images/bonus/bonus_1-0.png new file mode 100644 index 0000000..eb27a75 Binary files /dev/null and b/src/client/resources/images/bonus/bonus_1-0.png differ diff --git a/src/client/resources/images/bonus/bonus_2-0.png b/src/client/resources/images/bonus/bonus_2-0.png new file mode 100644 index 0000000..823b6e8 Binary files /dev/null and b/src/client/resources/images/bonus/bonus_2-0.png differ diff --git a/src/client/resources/images/bonus/bonus_3-0.png b/src/client/resources/images/bonus/bonus_3-0.png new file mode 100644 index 0000000..9746dac Binary files /dev/null and b/src/client/resources/images/bonus/bonus_3-0.png differ diff --git a/src/client/resources/images/bonus/bonus_4-0.png b/src/client/resources/images/bonus/bonus_4-0.png new file mode 100644 index 0000000..06cf55b Binary files /dev/null and b/src/client/resources/images/bonus/bonus_4-0.png differ diff --git a/src/client/resources/images/bonus/bonus_5-0.png b/src/client/resources/images/bonus/bonus_5-0.png new file mode 100644 index 0000000..c4c59d0 Binary files /dev/null and b/src/client/resources/images/bonus/bonus_5-0.png differ diff --git a/src/client/resources/images/bullet/boom/boom-0.png b/src/client/resources/images/bullet/boom/boom-0.png new file mode 100644 index 0000000..3f4a5f1 Binary files /dev/null and b/src/client/resources/images/bullet/boom/boom-0.png differ diff --git a/src/client/resources/images/bullet/boom/boom-1.png b/src/client/resources/images/bullet/boom/boom-1.png new file mode 100644 index 0000000..19cc250 Binary files /dev/null and b/src/client/resources/images/bullet/boom/boom-1.png differ diff --git a/src/client/resources/images/bullet/bullet_0.png b/src/client/resources/images/bullet/bullet_0.png new file mode 100644 index 0000000..0d72568 Binary files /dev/null and b/src/client/resources/images/bullet/bullet_0.png differ diff --git a/src/client/resources/images/bullet/bullet_1.png b/src/client/resources/images/bullet/bullet_1.png new file mode 100644 index 0000000..eac8339 Binary files /dev/null and b/src/client/resources/images/bullet/bullet_1.png differ diff --git a/src/client/resources/images/control/button_down.png b/src/client/resources/images/control/button_down.png new file mode 100644 index 0000000..7e8a4bf Binary files /dev/null and b/src/client/resources/images/control/button_down.png differ diff --git a/src/client/resources/images/control/button_normal.png b/src/client/resources/images/control/button_normal.png new file mode 100644 index 0000000..a55b5cd Binary files /dev/null and b/src/client/resources/images/control/button_normal.png differ diff --git a/src/client/resources/images/control/button_over.png b/src/client/resources/images/control/button_over.png new file mode 100644 index 0000000..34c7232 Binary files /dev/null and b/src/client/resources/images/control/button_over.png differ diff --git a/src/client/resources/images/eagle/eagle-0.png b/src/client/resources/images/eagle/eagle-0.png new file mode 100644 index 0000000..86fdd5c Binary files /dev/null and b/src/client/resources/images/eagle/eagle-0.png differ diff --git a/src/client/resources/images/eagle/eagle-1.png b/src/client/resources/images/eagle/eagle-1.png new file mode 100644 index 0000000..5e71aa4 Binary files /dev/null and b/src/client/resources/images/eagle/eagle-1.png differ diff --git a/src/client/resources/images/logo/logo.png b/src/client/resources/images/logo/logo.png new file mode 100644 index 0000000..a42339d Binary files /dev/null and b/src/client/resources/images/logo/logo.png differ diff --git a/src/client/resources/images/map/map_0.png b/src/client/resources/images/map/map_0.png new file mode 100644 index 0000000..f133468 Binary files /dev/null and b/src/client/resources/images/map/map_0.png differ diff --git a/src/client/resources/images/map/map_1.png b/src/client/resources/images/map/map_1.png new file mode 100644 index 0000000..df394b5 Binary files /dev/null and b/src/client/resources/images/map/map_1.png differ diff --git a/src/client/resources/images/map/map_2.png b/src/client/resources/images/map/map_2.png new file mode 100644 index 0000000..7f1615e Binary files /dev/null and b/src/client/resources/images/map/map_2.png differ diff --git a/src/client/resources/images/map/map_3-0.png b/src/client/resources/images/map/map_3-0.png new file mode 100644 index 0000000..2151ef8 Binary files /dev/null and b/src/client/resources/images/map/map_3-0.png differ diff --git a/src/client/resources/images/map/map_3-1.png b/src/client/resources/images/map/map_3-1.png new file mode 100644 index 0000000..e8b3726 Binary files /dev/null and b/src/client/resources/images/map/map_3-1.png differ diff --git a/src/client/resources/images/map/map_4.png b/src/client/resources/images/map/map_4.png new file mode 100644 index 0000000..16ecf69 Binary files /dev/null and b/src/client/resources/images/map/map_4.png differ diff --git a/src/client/resources/images/map/map_5.png b/src/client/resources/images/map/map_5.png new file mode 100644 index 0000000..cc14732 Binary files /dev/null and b/src/client/resources/images/map/map_5.png differ diff --git a/src/client/resources/images/tank/appear/appear-0.png b/src/client/resources/images/tank/appear/appear-0.png new file mode 100644 index 0000000..517a9c5 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-0.png differ diff --git a/src/client/resources/images/tank/appear/appear-1.png b/src/client/resources/images/tank/appear/appear-1.png new file mode 100644 index 0000000..1620365 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-1.png differ diff --git a/src/client/resources/images/tank/appear/appear-2.png b/src/client/resources/images/tank/appear/appear-2.png new file mode 100644 index 0000000..d191986 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-2.png differ diff --git a/src/client/resources/images/tank/appear/appear-3.png b/src/client/resources/images/tank/appear/appear-3.png new file mode 100644 index 0000000..bdd35d9 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-3.png differ diff --git a/src/client/resources/images/tank/appear/appear-4.png b/src/client/resources/images/tank/appear/appear-4.png new file mode 100644 index 0000000..d191986 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-4.png differ diff --git a/src/client/resources/images/tank/appear/appear-5.png b/src/client/resources/images/tank/appear/appear-5.png new file mode 100644 index 0000000..bdd35d9 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-5.png differ diff --git a/src/client/resources/images/tank/appear/appear-6.png b/src/client/resources/images/tank/appear/appear-6.png new file mode 100644 index 0000000..d191986 Binary files /dev/null and b/src/client/resources/images/tank/appear/appear-6.png differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-0.png b/src/client/resources/images/tank/bot/tank_b0_0-0.png new file mode 100644 index 0000000..51192e5 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b0_0-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-1.png b/src/client/resources/images/tank/bot/tank_b0_0-1.png new file mode 100644 index 0000000..a86501b Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b0_0-1.png differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-2.png b/src/client/resources/images/tank/bot/tank_b0_0-2.png new file mode 100644 index 0000000..45f96f0 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b0_0-2.png differ diff --git a/src/client/resources/images/tank/bot/tank_b0_0-3.png b/src/client/resources/images/tank/bot/tank_b0_0-3.png new file mode 100644 index 0000000..e868972 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b0_0-3.png differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-0.png b/src/client/resources/images/tank/bot/tank_b1_0-0.png new file mode 100644 index 0000000..7bf3b5f Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b1_0-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-1.png b/src/client/resources/images/tank/bot/tank_b1_0-1.png new file mode 100644 index 0000000..f3648cb Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b1_0-1.png differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-2.png b/src/client/resources/images/tank/bot/tank_b1_0-2.png new file mode 100644 index 0000000..2e3bc62 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b1_0-2.png differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-3.png b/src/client/resources/images/tank/bot/tank_b1_0-3.png new file mode 100644 index 0000000..919f23f Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b1_0-3.png differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-4.png b/src/client/resources/images/tank/bot/tank_b1_0-4.png new file mode 100644 index 0000000..936d030 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b1_0-4.png differ diff --git a/src/client/resources/images/tank/bot/tank_b1_0-5.png b/src/client/resources/images/tank/bot/tank_b1_0-5.png new file mode 100644 index 0000000..22bb7c8 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b1_0-5.png differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-0.png b/src/client/resources/images/tank/bot/tank_b2_0-0.png new file mode 100644 index 0000000..7c4b37c Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b2_0-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-1.png b/src/client/resources/images/tank/bot/tank_b2_0-1.png new file mode 100644 index 0000000..5eae1c7 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b2_0-1.png differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-2.png b/src/client/resources/images/tank/bot/tank_b2_0-2.png new file mode 100644 index 0000000..f16f08d Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b2_0-2.png differ diff --git a/src/client/resources/images/tank/bot/tank_b2_0-3.png b/src/client/resources/images/tank/bot/tank_b2_0-3.png new file mode 100644 index 0000000..1390f38 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b2_0-3.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-0.png b/src/client/resources/images/tank/bot/tank_b3_0-0.png new file mode 100644 index 0000000..a1bcb78 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_0-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-1.png b/src/client/resources/images/tank/bot/tank_b3_0-1.png new file mode 100644 index 0000000..cd2a683 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_0-1.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-2.png b/src/client/resources/images/tank/bot/tank_b3_0-2.png new file mode 100644 index 0000000..8559ffd Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_0-2.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_0-3.png b/src/client/resources/images/tank/bot/tank_b3_0-3.png new file mode 100644 index 0000000..30ac685 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_0-3.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_1-0.png b/src/client/resources/images/tank/bot/tank_b3_1-0.png new file mode 100644 index 0000000..0c68a8c Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_1-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_1-1.png b/src/client/resources/images/tank/bot/tank_b3_1-1.png new file mode 100644 index 0000000..38fe3f0 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_1-1.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_2-0.png b/src/client/resources/images/tank/bot/tank_b3_2-0.png new file mode 100644 index 0000000..80e526c Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_2-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_2-1.png b/src/client/resources/images/tank/bot/tank_b3_2-1.png new file mode 100644 index 0000000..29d81db Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_2-1.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_3-0.png b/src/client/resources/images/tank/bot/tank_b3_3-0.png new file mode 100644 index 0000000..086dd3b Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_3-0.png differ diff --git a/src/client/resources/images/tank/bot/tank_b3_3-1.png b/src/client/resources/images/tank/bot/tank_b3_3-1.png new file mode 100644 index 0000000..5fc5144 Binary files /dev/null and b/src/client/resources/images/tank/bot/tank_b3_3-1.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-0.png b/src/client/resources/images/tank/kaboom/kaboom-0.png new file mode 100644 index 0000000..f077896 Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-0.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-1.png b/src/client/resources/images/tank/kaboom/kaboom-1.png new file mode 100644 index 0000000..1bf4731 Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-1.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-2.png b/src/client/resources/images/tank/kaboom/kaboom-2.png new file mode 100644 index 0000000..6bc786d Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-2.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-3.png b/src/client/resources/images/tank/kaboom/kaboom-3.png new file mode 100644 index 0000000..f7bbb17 Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-3.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-4.png b/src/client/resources/images/tank/kaboom/kaboom-4.png new file mode 100644 index 0000000..3ea46dd Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-4.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-7.png b/src/client/resources/images/tank/kaboom/kaboom-7.png new file mode 100644 index 0000000..13d90fc Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-7.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-8.png b/src/client/resources/images/tank/kaboom/kaboom-8.png new file mode 100644 index 0000000..ac1dd75 Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-8.png differ diff --git a/src/client/resources/images/tank/kaboom/kaboom-9.png b/src/client/resources/images/tank/kaboom/kaboom-9.png new file mode 100644 index 0000000..b7ce897 Binary files /dev/null and b/src/client/resources/images/tank/kaboom/kaboom-9.png differ diff --git a/src/client/resources/images/tank/player/tank_p0_0-0.png b/src/client/resources/images/tank/player/tank_p0_0-0.png new file mode 100644 index 0000000..8ad71cc Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p0_0-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p0_0-1.png b/src/client/resources/images/tank/player/tank_p0_0-1.png new file mode 100644 index 0000000..22efcf4 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p0_0-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p0_1-0.png b/src/client/resources/images/tank/player/tank_p0_1-0.png new file mode 100644 index 0000000..16833f3 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p0_1-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p0_1-1.png b/src/client/resources/images/tank/player/tank_p0_1-1.png new file mode 100644 index 0000000..11e74f4 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p0_1-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p1_0-0.png b/src/client/resources/images/tank/player/tank_p1_0-0.png new file mode 100644 index 0000000..6f9d3e2 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p1_0-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p1_0-1.png b/src/client/resources/images/tank/player/tank_p1_0-1.png new file mode 100644 index 0000000..a19cd03 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p1_0-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p1_1-0.png b/src/client/resources/images/tank/player/tank_p1_1-0.png new file mode 100644 index 0000000..11b875f Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p1_1-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p1_1-1.png b/src/client/resources/images/tank/player/tank_p1_1-1.png new file mode 100644 index 0000000..8f2430c Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p1_1-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p2_0-0.png b/src/client/resources/images/tank/player/tank_p2_0-0.png new file mode 100644 index 0000000..fb0887c Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p2_0-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p2_0-1.png b/src/client/resources/images/tank/player/tank_p2_0-1.png new file mode 100644 index 0000000..e874352 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p2_0-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p2_1-0.png b/src/client/resources/images/tank/player/tank_p2_1-0.png new file mode 100644 index 0000000..123035a Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p2_1-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p2_1-1.png b/src/client/resources/images/tank/player/tank_p2_1-1.png new file mode 100644 index 0000000..bc0258d Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p2_1-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p3_0-0.png b/src/client/resources/images/tank/player/tank_p3_0-0.png new file mode 100644 index 0000000..64d6086 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p3_0-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p3_0-1.png b/src/client/resources/images/tank/player/tank_p3_0-1.png new file mode 100644 index 0000000..66b82df Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p3_0-1.png differ diff --git a/src/client/resources/images/tank/player/tank_p3_1-0.png b/src/client/resources/images/tank/player/tank_p3_1-0.png new file mode 100644 index 0000000..e0148c6 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p3_1-0.png differ diff --git a/src/client/resources/images/tank/player/tank_p3_1-1.png b/src/client/resources/images/tank/player/tank_p3_1-1.png new file mode 100644 index 0000000..0425369 Binary files /dev/null and b/src/client/resources/images/tank/player/tank_p3_1-1.png differ diff --git a/src/client/resources/images/tank/protect/protect-0.png b/src/client/resources/images/tank/protect/protect-0.png new file mode 100644 index 0000000..8aa78b9 Binary files /dev/null and b/src/client/resources/images/tank/protect/protect-0.png differ diff --git a/src/client/resources/images/tank/protect/protect-1.png b/src/client/resources/images/tank/protect/protect-1.png new file mode 100644 index 0000000..698ca75 Binary files /dev/null and b/src/client/resources/images/tank/protect/protect-1.png differ diff --git a/res/layout/main.json b/src/client/resources/layout/main.json similarity index 78% rename from res/layout/main.json rename to src/client/resources/layout/main.json index 0ccb43e..bf97b04 100755 --- a/res/layout/main.json +++ b/src/client/resources/layout/main.json @@ -1,4 +1,17 @@ { + "_includes": { + "button_skin": { + "skin": { + "type": "haxework.gui.skin.ButtonBitmapSkin", + "upImage": "@~image:resources/images/control/button_normal.png", + "downImage": "@~image:resources/images/control/button_down.png", + "overImage": "@~image:resources/images/control/button_over.png", + "fillType": "NINEPATH" + }, + "fontColor": "0xffffff" + } + }, + "type": "haxework.gui.VGroupView", "pWidth": 100, "pHeight": 100, "views": [ @@ -10,16 +23,17 @@ { "id": "logout", "type": "haxework.gui.ButtonView", "width": 100, "height": 30, - "skin": {"type": "haxework.gui.skin.ButtonColorSkin"}, - "text": "Logout" + "text": "Logout", + "_include": "button_skin" } ] }, { "id": "switcher", "type": "haxework.frame.FrameSwitcher", "pWidth": 100, "pHeight": 100, - "skin": {"type": "haxework.gui.skin.ColorSkin", "color": "0x50a000"}, + "skin": {"type": "haxework.gui.skin.BitmapSkin", "image": "@~image:resources/images/background.png", "fillType": "REPEAT"}, "views": [ + { "id": "auth", "type": "ru.m.tankz.view.frames.AuthFrame", "pWidth": 100, "pHeight": 100, "layoutMargin": 3, @@ -58,10 +72,9 @@ { "id": "auth", "type": "haxework.gui.ButtonView", - "width": 100, - "height": 30, - "skin": {"type": "haxework.gui.skin.ButtonColorSkin"}, - "text": "Auth" + "width": 100, "height": 45, + "text": "Auth", + "_include": "button_skin" } ] }, @@ -96,9 +109,9 @@ }, { "id": "create", "type": "haxework.gui.ButtonView", - "width": 100, "height": 30, - "skin": {"type": "haxework.gui.skin.ButtonColorSkin"}, - "text": "Create" + "width": 100, "height": 45, + "text": "Create", + "_include": "button_skin" }, { "id": "list", "type": "haxework.gui.list.VListView", @@ -125,15 +138,15 @@ }, { "id": "start", "type": "haxework.gui.ButtonView", - "width": 100, "height": 30, - "skin": {"type": "haxework.gui.skin.ButtonColorSkin"}, - "text": "Start" + "width": 100, "height": 45, + "text": "Start", + "_include": "button_skin" }, { "id": "exit", "type": "haxework.gui.ButtonView", - "width": 100, "height": 30, - "skin": {"type": "haxework.gui.skin.ButtonColorSkin"}, - "text": "Exit" + "width": 100, "height": 45, + "text": "Exit", + "_include": "button_skin" }, { "id": "list", "type": "haxework.gui.list.VListView", @@ -160,9 +173,9 @@ }, { "id": "restart", "type": "haxework.gui.ButtonView", - "width": 100, "height": 30, - "skin": {"type": "haxework.gui.skin.ButtonColorSkin"}, - "text": "Restart" + "width": 100, "height": 45, + "text": "Restart", + "_include": "button_skin" }, { "id": "render", "type": "ru.m.tankz.render.Render", diff --git a/src/client/resources/levels/level000.txt b/src/client/resources/levels/level000.txt new file mode 100644 index 0000000..e82f25b --- /dev/null +++ b/src/client/resources/levels/level000.txt @@ -0,0 +1,27 @@ +00000000000000000000000000 +00000000000000000000000000 +00055500055500005000555000 +00550550550550055005505500 +00000050500050555005000500 +00000550500050505005000500 +00055500500050005005000500 +00550000550550055005505500 +00555550055500555500555000 +00000000000000000000000000 +22222222222222222222222222 +22222222222222222222222222 +44111111111144111111111144 +44111111111144111111111144 +00000000005522550000000000 +00000000005522550000000000 +11442255225555552255224411 +11442255225555552255224411 +00000055000044000055000000 +00000055000044000055000000 +33335555005500550055553333 +33335555005500550055553333 +11111111000000000011111111 +11111111000555500011111111 +00000000000500500000000000 +00000000000500500000000000 + diff --git a/src/client/resources/levels/level001.txt b/src/client/resources/levels/level001.txt new file mode 100644 index 0000000..b129e79 --- /dev/null +++ b/src/client/resources/levels/level001.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +00550055005500550055005500 +00550055005500550055005500 +00550055005500550055005500 +00550055005500550055005500 +00550055005544550055005500 +00550055005544550055005500 +00550055005500550055005500 +00550055000000000055005500 +00550055000000000055005500 +00000000005500550000000000 +00000000005500550000000000 +55005555000000000055550055 +44005555000000000055550044 +00000000005500550000000000 +00000000005555550000000000 +00550055005555550055005500 +00550055005500550055005500 +00550055005500550055005500 +00550055005500550055005500 +00550055000000000055005500 +00550055000000000055005500 +00550055000555500055005500 +00000000000500500000000000 +00000000000500500000000000 diff --git a/src/client/resources/levels/level002.txt b/src/client/resources/levels/level002.txt new file mode 100644 index 0000000..3631323 --- /dev/null +++ b/src/client/resources/levels/level002.txt @@ -0,0 +1,26 @@ +00000044000000440000000000 +00000044000000440000000000 +00550044000000550055005500 +00550044000000550055005500 +00550000000055550055445500 +00550000000055550055445500 +00000055000000000044000000 +00000055000000000044000000 +22000055000044000055225544 +22000055000044000055225544 +22220000005500004455220000 +22220000005500004400220000 +00555555222222440000225500 +00555555222222440000225500 +00000044225500550055005500 +00000044225500550055005500 +44550044005500550000005500 +44550044005500550000005500 +00550055005555550055445500 +00550055005555550055445500 +00550055005555550000000000 +00550055005555550000000000 +00550000000000000055005500 +00550000000555500055005500 +00550055000500500055555500 +00550055000500500055555500 diff --git a/src/client/resources/levels/level003.txt b/src/client/resources/levels/level003.txt new file mode 100644 index 0000000..da1fee8 --- /dev/null +++ b/src/client/resources/levels/level003.txt @@ -0,0 +1,26 @@ +00000000550000005500000000 +00000000550000005500000000 +00222222550000000000000000 +00222222550000000000444444 +55222222000000000000000000 +55222222000000000000000000 +22222222000000550055555550 +22222222000000550055555550 +22222222555555550055000500 +22222222555555000055000500 +22222222000055000000000500 +22222222000055000000000500 +00220000000044444400002200 +00220000000044444400002200 +00000000000000000022222222 +00550055000000000022222222 +55500555500555555522222222 +55500555500500000022222222 +00000000005500000022222222 +00000000005500555522222222 +55000040000000555522222200 +55000040000000000022222200 +55550040000000000022222200 +55550040000555500022222200 +44555500000500500055000000 +44555500000500500055000000 diff --git a/src/client/resources/levels/level004.txt b/src/client/resources/levels/level004.txt new file mode 100644 index 0000000..ef9f295 --- /dev/null +++ b/src/client/resources/levels/level004.txt @@ -0,0 +1,26 @@ +00222200000000000000002200 +00222200000000000000002200 +22220000005555000000000022 +22220000555555555500000022 +22000005555555555555000044 +22000005555555555555550000 +44000055555555555555555000 +00000055555555555555555000 +00000555000000555555005000 +00000500000000005555005000 +33000500400040005550000000 +33000500400040005550000000 +00005500000000005550003333 +00005500555500005550003333 +00005555555555555555000000 +00005555555555555555000000 +00055555555555555555500000 +00055555555555555555500000 +00555555555555555555550000 +00000055555555555500000000 +00555500555555550055550022 +00555555005555005555550022 +22005555000000005555002222 +22000000000555500000002222 +44220000000500500000222244 +44220000000500500000222244 diff --git a/src/client/resources/levels/level005.txt b/src/client/resources/levels/level005.txt new file mode 100644 index 0000000..19febc8 --- /dev/null +++ b/src/client/resources/levels/level005.txt @@ -0,0 +1,26 @@ +00000000555500000000000000 +00000000555500000000000000 +00000000550000004444440000 +44005500550000000000440000 +44005500000055000000000000 +44005500000055000000000000 +55005555550055550033330033 +55005555550055550033330033 +55000000550000000033000000 +00000000000000000033000000 +00000000333300333333005555 +00005500333300333333005555 +55550000335500555000000000 +55550000335500555000000000 +00000000330000000000044000 +00000000330000000000044000 +33333300330044005500040000 +33333300330044005500040000 +00000000000000000000045555 +00000055550000000000045555 +00000000555555555500000000 +00000000550000005555000000 +55555500000000000055550000 +55550000000555500000550000 +55000000000500500000000000 +00000000000500500000000000 diff --git a/src/client/resources/levels/level006.txt b/src/client/resources/levels/level006.txt new file mode 100644 index 0000000..7bb1838 --- /dev/null +++ b/src/client/resources/levels/level006.txt @@ -0,0 +1,26 @@ +00000000000500502222000000 +00000000000500502222000000 +00500400500000000522500522 +00500400500000000522500522 +00500400500055000522500522 +00500400500055000522500522 +00550000550044005522005522 +00550000550044005522005522 +00000005440055005540002222 +00000005000055000040002222 +55555000002255220000055555 +55555000002255220000055555 +00000000052222225000000000 +00000000052222225000000000 +44555500552222225505555544 +44555500002222220005555544 +44444400000022000000444444 +00000000550022005500000000 +00550000550000005500000000 +00550000550000005500000000 +00555000005500550000055522 +00555000000000000000055522 +00005500000000000000222222 +00000000000555500000222222 +00000000000500500000002222 +00005500000500500000552222 diff --git a/src/client/resources/levels/level007.txt b/src/client/resources/levels/level007.txt new file mode 100644 index 0000000..ecabfb3 --- /dev/null +++ b/src/client/resources/levels/level007.txt @@ -0,0 +1,26 @@ +00000000000000444400000000 +00000000000000000000000000 +00004444444400000000440000 +00004400000000000000440000 +00004400000022004444440000 +00004400000022000044440000 +00440000002244000000440000 +00440000002244000000440000 +00000000224444000000444400 +00000000224444000000004400 +00440022444444004400000000 +00440022444444004400000000 +00040044440000004444000000 +00040044440000004444000000 +40000000440044444400000400 +40000000440044444400000400 +00044400000044442200004400 +00044400000044442200004400 +00440000000044220000444400 +00440000000044220000444400 +00444444000022000044000000 +00000044000022000044000000 +00000000000000000044000044 +00000000000555500000004444 +00000000000500500000000000 +44440000000500500000000000 diff --git a/src/client/resources/levels/level008.txt b/src/client/resources/levels/level008.txt new file mode 100644 index 0000000..7129b17 --- /dev/null +++ b/src/client/resources/levels/level008.txt @@ -0,0 +1,26 @@ +00005500005500000055000000 +00005500005500550055000000 +22555555005500000055500000 +22555555005500440055500000 +22222200005500550055000550 +22222200000000550000000550 +22333333333333333333330033 +22333333333333333333330033 +00550000000000000000000000 +00550000000055550000000000 +00005500000555555555554444 +00005500000555550055000000 +55550055000555552255000055 +55550055000555552255444455 +00000044000000222222220000 +00000044004400222222220000 +33330033333333330033333333 +33330033333333330033333333 +22220005000000000000000000 +22220005000055550000000000 +22225500500000050000005500 +22225500500000050044555500 +22005500500000000055005500 +22445500500555500000005500 +00000000000500500000005500 +00000000000500500055000000 diff --git a/src/client/resources/levels/level009.txt b/src/client/resources/levels/level009.txt new file mode 100644 index 0000000..b263e56 --- /dev/null +++ b/src/client/resources/levels/level009.txt @@ -0,0 +1,26 @@ +00000055000000000000220000 +00000055000000000044220000 +55000000000000220444400055 +55000000000044220444400055 +00000000220444400044220000 +00000044220444400000220000 +00000444400044220000000000 +00000444400000220000000000 +00000044220000000000000000 +00000000220000000000000000 +00000022002200220022000000 +00000022442200224422000000 +44550004444000044440005544 +44550004444000044440005544 +00000022442200224422000000 +00000022002200220022000000 +00000000000000000000000000 +00000000440000004400000000 +55000004444000044440000055 +55000004444000044440000055 +55000022442200224422000055 +55000022002200220022000055 +00000000000000000000000000 +00005500000555500000550000 +00005555000500500055550000 +00005555000500500055550000 diff --git a/src/client/resources/levels/level010.txt b/src/client/resources/levels/level010.txt new file mode 100644 index 0000000..380162f --- /dev/null +++ b/src/client/resources/levels/level010.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +00055555000000000000555550 +00050055000000000000550050 +05550000550022220055000005 +05000000550022220055000005 +55000000552222222255000005 +55000000552222222255000005 +55000005552244442255500055 +55000005552244442255500055 +05000055333333333333555555 +05555555333333333333555555 +00555555444455444455555550 +00555555444455444455555550 +00005555440055004455555000 +00005555440055004455555000 +00005555555555555555555000 +00005555555555555555555000 +55225555554444555555552255 +55220000004444000000002255 +55222222222222222222222255 +55222222222222222222222255 +00002222220000002222222200 +00002222220555502222222200 +00000050000500500000500000 +00000050000500500000500000 diff --git a/src/client/resources/levels/level011.txt b/src/client/resources/levels/level011.txt new file mode 100644 index 0000000..8471088 --- /dev/null +++ b/src/client/resources/levels/level011.txt @@ -0,0 +1,26 @@ +00000000004400550055550000 +00000000004400550055550000 +00055555555500550000000000 +00055555555500550000000000 +00000050005500555500222222 +00000050005500555500222222 +00050000000000440022222222 +00050000000000440022222222 +00050055555544555522225544 +00050055555544555522220044 +00555555440000550022220005 +00000000440000550022220005 +05555555004422222222220000 +05555555004422222222220000 +00000044000022222222225500 +00000044000022222222225500 +44550022222222442222225500 +44550022222222442222225500 +05552222222222000000005550 +05552222222222000000005550 +00552222000000004455555500 +00552222000000000055555500 +00002222000000000055000500 +00002222000555500055000500 +00002222000500500000000000 +00552222000500500000000000 diff --git a/src/client/resources/levels/level012.txt b/src/client/resources/levels/level012.txt new file mode 100644 index 0000000..cc851bf --- /dev/null +++ b/src/client/resources/levels/level012.txt @@ -0,0 +1,26 @@ +00000000000000555555000000 +00000000000000555555000000 +00555555000000000055000000 +00555555550055000055000000 +00000000550055000000005555 +00000000550000000000005555 +00333333333300555000005544 +00333333333300555000005500 +00000000003300550044405500 +00004444443300550044405500 +55005555553333330033555500 +55005555553333330033555500 +00000000443300000033440000 +00000000443300000033000000 +33333300333355550033000000 +33333300333355550033000000 +00000000005544440033333300 +00000000005500000033333300 +55555500000000000000000000 +55555500000000000000000000 +00005500444400000055550005 +00005500000000000055550005 +55000000000000000055000055 +55000000000555500055000055 +00000000000500500000000000 +00000000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level013.txt b/src/client/resources/levels/level013.txt new file mode 100644 index 0000000..6b41fc5 --- /dev/null +++ b/src/client/resources/levels/level013.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000550000005500000000 +00555555550000005555555500 +00555555550000005555555500 +00550000000055000000004400 +00550000000055000000004400 +00440055550000005555005555 +00440055000000000055005555 +00550050220044002205004455 +00550050224444442205004455 +00550000222222222200004455 +00000000222222222200000055 +55000000222222222200000055 +55440000222222222200005555 +55440050224444442205005500 +55440050220044002205005500 +55550055000000000055004400 +55550055550000005555004400 +55440000000055000000005500 +55440000000055000000005500 +55555555550000005555554444 +55555555550000005555554444 +55550000550000005500005500 +55550000000555500000005500 +55550000000500500000000000 +55550000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level014.txt b/src/client/resources/levels/level014.txt new file mode 100644 index 0000000..4d74d6d --- /dev/null +++ b/src/client/resources/levels/level014.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +22220000005555550000002222 +22220000555555555500002222 +22000005555555555550000022 +22000005555555555550000022 +00000055552255225555000000 +00000055552255225555000000 +00000055222255222255000000 +00000055222255222255000000 +22000055555555555555000022 +22000055555555555555000022 +22220000552255225500002222 +22220000552255225500002222 +33333300555555555500333333 +33333300555555555500333333 +00000000050505050500000000 +00000000050505050500000000 +00000000505050505000000000 +00000000505050505000000000 +04040400000000000000404040 +04040400000000000000404040 +50505000000000000000050505 +50505000000555500000050505 +40404004000500500040040404 +40404004000500500040040404 \ No newline at end of file diff --git a/src/client/resources/levels/level015.txt b/src/client/resources/levels/level015.txt new file mode 100644 index 0000000..4daa187 --- /dev/null +++ b/src/client/resources/levels/level015.txt @@ -0,0 +1,26 @@ +00000000555500005500000000 +00000000555500005500000000 +00222255550000005500000000 +00222255550000005500000000 +22222222222222225555000000 +22222222222222225555000000 +22445522555555222222225544 +22005522555555222222225544 +22225522222244222255405500 +22225522222200222255405500 +00222255002222222255005500 +00222255442222222255005500 +00555555555522225555502222 +00555555555522225555502222 +04445555000000555500000022 +04005555000000550000000022 +00550055000000552222555022 +00550055004455002222555022 +00550000055555222255000022 +00550000055500222255000022 +00555550055522220022552222 +00555550050022225522552222 +00005500220000005522552200 +00005500220555505522002200 +00005500000500500022222200 +00000000000500500022222200 \ No newline at end of file diff --git a/src/client/resources/levels/level016.txt b/src/client/resources/levels/level016.txt new file mode 100644 index 0000000..f0ce867 --- /dev/null +++ b/src/client/resources/levels/level016.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +00004422440000000000000000 +00004422440000000000000000 +00000022002200000000000000 +00000022002244000000000000 +00220000000022000000000000 +00220000000022550000000000 +00222200002200220000000000 +00222200002200224400000000 +00220022002200002200000000 +00220022002200002255000000 +00220000220000002222000000 +00220000220000002222440000 +00002200000000222222220000 +00002200000000222222225500 +00000022000022002222222200 +00000022000022002222222200 +55000000000022000022222244 +55000000000022000022222244 +55550000000000220022222222 +55550000000000220022222222 +44555500000000002200222222 +44555500000555502200222222 +44445555000500502200002222 +44445555000500502200002222 \ No newline at end of file diff --git a/src/client/resources/levels/level017.txt b/src/client/resources/levels/level017.txt new file mode 100644 index 0000000..aee081d --- /dev/null +++ b/src/client/resources/levels/level017.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000550000000000550000 +00550055550000111111555500 +00550055550000111111555500 +00550000550044111111111100 +00550000550044111111111100 +11111140550000551111111100 +11111140550000551111111100 +11111111111155550550000000 +11111111111155550550000000 +00000411111111550550004444 +00000411111111550550000000 +55555555111111111111115555 +55555555111111111111115555 +00000055551111111140000000 +00000055551111111140000000 +00555555001111115555005500 +00555555001111115555005500 +11111155110000000055005500 +11111155110000000055005500 +11111111114400440000005500 +11111111110000000000555500 +55111111110000000055000000 +55111111110555500055000000 +55554000000500500055005500 +55554000000500500055005500 \ No newline at end of file diff --git a/src/client/resources/levels/level018.txt b/src/client/resources/levels/level018.txt new file mode 100644 index 0000000..8787235 --- /dev/null +++ b/src/client/resources/levels/level018.txt @@ -0,0 +1,26 @@ +00000000000000004444442200 +00000000000000004444442200 +00550000000000004400004400 +00550000000000004400004400 +55225500000055555555004400 +55225500000055555555004400 +00552255000055002255444400 +00552255000055002255444400 +00005500224455220055000000 +00005500224455220055000000 +00000000440055445555000000 +00000000440055445555000000 +00005555445500440000000000 +00005555445500440000000000 +00005500225544220000000000 +00005500225544220000000000 +44444422005500005555000000 +44444422005500005555000000 +44005555555500005544440000 +44005555555500005544440000 +44000044000000000044555500 +44000044000000000044555500 +22444444000000000000554444 +22444444000555500000554444 +00000000000500500000004444 +00000000000500500000004444 \ No newline at end of file diff --git a/src/client/resources/levels/level019.txt b/src/client/resources/levels/level019.txt new file mode 100644 index 0000000..867479d --- /dev/null +++ b/src/client/resources/levels/level019.txt @@ -0,0 +1,26 @@ +00550055005500550055005500 +00550055005500550055005500 +00550055005500550055005500 +00550055005500550055005500 +00440044004400440044004400 +00000000000000000000000000 +00000000550000005500000000 +55005500550000005500550055 +55005555550055005555550055 +55005500550055005500550055 +44004400440044004400440044 +00000000440000004400000000 +22220000550022005500002222 +22220000550022005500002222 +22220000555522555500002222 +22220000550022005500002222 +22222222222222222222222222 +22222222222222222222222222 +00000000552222225500000000 +55005500552222225500550055 +00550055000022000055005500 +00550055000022000055005500 +00550055000000000055005500 +00550055000555500055005500 +00550055000500500055005500 +00000000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level020.txt b/src/client/resources/levels/level020.txt new file mode 100644 index 0000000..99452bb --- /dev/null +++ b/src/client/resources/levels/level020.txt @@ -0,0 +1,26 @@ +00000033005500005500550000 +00000033005500005500550000 +00000000000000005500440000 +00000000000000005500440000 +00000033000044005500550000 +00000033005544005500550000 +44005533004400005500550000 +00005533004400550000550000 +00005533000000550000000000 +00005533000000550000000000 +55005533330033333333000055 +55005533330033333333000055 +00000000000000220033004444 +00000055000000220033000000 +55550555004422222233000000 +55550555004422222233005555 +55000500005522222233005500 +00000500005522222233005500 +00000000005500220033002200 +00440000005500220033002200 +00550000005555550000222222 +00550044000000000000222222 +00550055000000000033222222 +00550055000555500033222222 +00000000000500500033002200 +00000000000500500033002200 \ No newline at end of file diff --git a/src/client/resources/levels/level021.txt b/src/client/resources/levels/level021.txt new file mode 100644 index 0000000..e8082c5 --- /dev/null +++ b/src/client/resources/levels/level021.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000055555500005500000000 +00005555555555555555000000 +00555555555555555555000000 +00222222222222222255550000 +00222222222222222255550000 +22220000000000002222555500 +22220000000000002222555500 +22004400004400000022222200 +22004400004400000022222200 +22004400004400000022222200 +22004400004400000022222200 +22000022000000002222555550 +22000022000000002222555550 +22222222222222222255555550 +22222222222222222255555550 +55222255552222225555555500 +55222255552222225555555500 +00555555555555555555550044 +00555555555555555555550044 +44005544555555555555500044 +44005544555555555555500044 +00445555440000005555444444 +00445500440555505555444444 +00000000000500500000000000 +00000000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level022.txt b/src/client/resources/levels/level022.txt new file mode 100644 index 0000000..4cc92a0 --- /dev/null +++ b/src/client/resources/levels/level022.txt @@ -0,0 +1,26 @@ +00000000002200000000000000 +00000000002200000000000000 +00000000224422000000000000 +00000000224422000000000000 +00002200002200002222000000 +00002200002200002222000000 +00225522000000225555220000 +00225522000000225555220000 +00002255220000002222000022 +00002255220000002222000022 +22000022000022000000002244 +22000022000022000000002244 +55220000002244220000220022 +55220000002244220000220022 +44552200000022000022442200 +44552200000022000022442200 +55220000220000002200220000 +55220000220000002200220000 +22000022552200225522000000 +22000022552200225522000000 +00000022552200002200002200 +00000022552200002200002200 +00220000220000000000224422 +00220000220555500000224422 +22442200000500500022552200 +22442200000500500022552200 \ No newline at end of file diff --git a/src/client/resources/levels/level023.txt b/src/client/resources/levels/level023.txt new file mode 100644 index 0000000..9920f5c --- /dev/null +++ b/src/client/resources/levels/level023.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +00000000004444000000000000 +00000000004444000000000000 +00000000000044000000000000 +00000000000044000000000000 +00444422225544552222444400 +00444422225544552222444400 +00000044222244222244000000 +00000044222244222244000000 +22000000442222224400000022 +22000000442222224400000022 +44220000002222220000002244 +44220000002222220000002244 +22000000004422440000000022 +22000000440022004400000022 +00000000440000004400000000 +00000000440044004400000000 +00000044000044000044000000 +00000044000044000044000000 +00000000000000000000000000 +00000000000000000000000000 +00000000000000000000000000 +00000000000555500000000000 +00004400000500500000440000 +00004400000500500000440000 \ No newline at end of file diff --git a/src/client/resources/levels/level024.txt b/src/client/resources/levels/level024.txt new file mode 100644 index 0000000..2eb977f --- /dev/null +++ b/src/client/resources/levels/level024.txt @@ -0,0 +1,26 @@ +00004400554400000000550000 +00004400550000000000550000 +00005500552200555555550000 +00005500552200005555550000 +00222200552205500000004444 +00222200552205500000004444 +22222222222255555500055500 +22222222222255555500055500 +00002222000044550005555505 +00002222555500550005550005 +55440000555500000055550005 +55000055000000000055000005 +05000055111111111111111111 +05005555111111111111111111 +05005500111111111111111111 +05000000111111111111111111 +00004400111111111111111111 +00004400111111111111111111 +55005500111111111111111111 +55005500111111111111111111 +05005500111111111111111111 +05005500111111111111111111 +05005500000000001111111111 +05005500000555501111111111 +00000000000500500011111111 +00000000000500500011111111 \ No newline at end of file diff --git a/src/client/resources/levels/level025.txt b/src/client/resources/levels/level025.txt new file mode 100644 index 0000000..c84ba17 --- /dev/null +++ b/src/client/resources/levels/level025.txt @@ -0,0 +1,26 @@ +00000044005500550055004400 +00000044005500550055004400 +00550055000000000044000000 +00550055000000000044000000 +00550055000044000044004444 +00550055000044000044004444 +00550000005500445500000044 +00550000005500445500000044 +00000000555500555500440000 +00000000555500555500440000 +00004400550000555500555500 +00004400550000555500555500 +44004400005500440000445500 +44004400005500440000445500 +00005555005500000055440000 +00005555005500000055440000 +00445555005555005555000055 +00445555005555005555000055 +00550000005544000000005555 +00550000005544000000005555 +00000055005555440044000055 +00000055005555440044000055 +55005555000000000055440000 +55005555000555500055440000 +55005500000500500055555500 +55005500000500500055555500 \ No newline at end of file diff --git a/src/client/resources/levels/level026.txt b/src/client/resources/levels/level026.txt new file mode 100644 index 0000000..5ecf03f --- /dev/null +++ b/src/client/resources/levels/level026.txt @@ -0,0 +1,26 @@ +00003333000000000000000000 +00003333000000000000000000 +00000033220050000000000000 +44000033220050000000000000 +22000000000040005000333300 +22440000000040005000333300 +22220044000500004022330000 +22220000550500004022330000 +22222200004400050000000000 +22222200004455050000000044 +22224400000500440000000022 +22220044000500445500004422 +22440000554400050044002222 +22000000004400050000002222 +00000000005055440000222222 +00000000005000440000222222 +00003322040000505500442222 +00003322040000500044002222 +00333300050004000000000022 +00333300500004000000000022 +00000000000005002233000044 +00000000000005002233000000 +44000000000000000033330000 +44000000000555500033330000 +44440000000500500000000044 +44440000000500500000000044 \ No newline at end of file diff --git a/src/client/resources/levels/level027.txt b/src/client/resources/levels/level027.txt new file mode 100644 index 0000000..0f7b677 --- /dev/null +++ b/src/client/resources/levels/level027.txt @@ -0,0 +1,26 @@ +00000000440000000000000000 +00000000440000000000000000 +44440000440000444400000000 +44440000440000444400000000 +00440000440000004400444422 +00440000440000004400444422 +00440000444444002200440000 +00440000444444002200440000 +00550000000044004444440000 +00550000000044004444440000 +22444400445544555500000000 +22444400445544555500000000 +00004422442200005500004444 +00004422442200005500004444 +00004400002200004400004400 +00004400002200004400004400 +00005500004400004444554400 +00005500004400004444554400 +22444444222255444400554400 +22444444222255444400554400 +00000055000000002222005500 +00000055000000002222005500 +00000044000000000022005500 +00000044000555500022005500 +00000044000500500044005500 +00000044000500500044005500 \ No newline at end of file diff --git a/src/client/resources/levels/level028.txt b/src/client/resources/levels/level028.txt new file mode 100644 index 0000000..2b49dc9 --- /dev/null +++ b/src/client/resources/levels/level028.txt @@ -0,0 +1,26 @@ +00000000000000000000044000 +00000000000000000000044000 +00000000000000000000440000 +00000000000044000000440000 +00000000000022000055500000 +00000000005522550055500000 +00000000002222220055500000 +00000000442222224455500000 +00000000222211222255500000 +00000055222211222255500000 +00000022221111112222500000 +00004422221111112222500000 +00002222111111111122220000 +00552222111111111122225500 +00222211111111111111222200 +44222211111111111111222244 +22221111111111111111112222 +22221111111111111111112222 +00221111111111111111112200 +00221111111111111111112200 +00221111111111111111112200 +00221111111111111111112200 +00221111110000001111112200 +00221111110555501111112200 +00221111000500500011112200 +00221111000500500011112200 \ No newline at end of file diff --git a/src/client/resources/levels/level029.txt b/src/client/resources/levels/level029.txt new file mode 100644 index 0000000..667c7cc --- /dev/null +++ b/src/client/resources/levels/level029.txt @@ -0,0 +1,26 @@ +00000000000000000000550000 +00000000000000000000550000 +00553333004400550000000000 +00553333004400550000000000 +00003333552222223333004400 +00003333552222223333004400 +00000000002222223333550000 +00000000002222223333550000 +00440000333300220000000000 +00440000333300220000000000 +22225500333344000000005500 +22225500333344000000005500 +22222200000000000044000044 +22222200000000000044000044 +00553333005500000000000000 +00553333005500000000000000 +44003333222233332222005500 +44003333222233332222005500 +00000000220033332222333300 +00000000220033332222333300 +00000044220000002222333300 +00000044220000002222333300 +00005500550000000000000000 +00005500550555500000000000 +55000000000500500055440000 +55000000000500500055440000 \ No newline at end of file diff --git a/src/client/resources/levels/level030.txt b/src/client/resources/levels/level030.txt new file mode 100644 index 0000000..2af11f5 --- /dev/null +++ b/src/client/resources/levels/level030.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +00000000000000000000000000 +00000000005555000000440000 +00000000002222000000220000 +00444400552222440055225500 +00222200222222220022222200 +55222255222222225522222255 +22222222222222222222222222 +22222222222222222222222222 +44223322222222223322222222 +44223322222222223322222222 +22223333332222223333332244 +22223333332222223333332244 +22222222332244222222332222 +22222222332244222222332222 +22222222222222222222222222 +22222222222222222222222222 +22222222225555222222222244 +22222222220000222222222200 +44222222550000552222224400 +00222222000000002222220000 +00445555000000005555550000 +00000000000555500000000000 +00000000000500500000000000 +00000000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level031.txt b/src/client/resources/levels/level031.txt new file mode 100644 index 0000000..f71b290 --- /dev/null +++ b/src/client/resources/levels/level031.txt @@ -0,0 +1,26 @@ +00000033000000003300000000 +00000033000000003300000000 +33330033003333333300333333 +33330033003333333300333333 +22225500005500003300332233 +22225500005500003300332233 +22333333330044000055222222 +22333333330044000055222222 +22220033000033003333333322 +22220033000033003333333322 +33330033003333000033000000 +33330033003333000033000000 +00005522550055220033000033 +00005522550055220033000033 +00333322333333330022550033 +00333322333333330022550033 +55000055000033002222330033 +55000055000033002222330033 +33330033330033553333330000 +33330033330033553333330000 +00005500222200002233000033 +00005500222200002233000033 +00333333220000000033003333 +00333333220555500033003333 +00330000000500500000000000 +00330000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level032.txt b/src/client/resources/levels/level032.txt new file mode 100644 index 0000000..2652cfe --- /dev/null +++ b/src/client/resources/levels/level032.txt @@ -0,0 +1,26 @@ +00111111111100111111111100 +00111111111100111111111100 +11111111111111111111111111 +11111111111111111111111111 +11111155111111111155111111 +11111155111111111155111111 +11550055005511550055005511 +11550055005511550055005511 +11555555000000000055555511 +11000055000000000055000011 +11111155005544550055111111 +11111155555544555555111111 +44111111004400440011111144 +44111111000000000011111144 +11111111000000000011111111 +11111111005500550011111111 +11111111005500550011111111 +11111111005500550011111111 +11111155000000000055111111 +11111155000055000055111111 +11551155004444440055115511 +11551155000000000055115511 +00550055000000000055005500 +00555555000555500055555500 +00550000000500500000005500 +00000000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/levels/level033.txt b/src/client/resources/levels/level033.txt new file mode 100644 index 0000000..1d015aa --- /dev/null +++ b/src/client/resources/levels/level033.txt @@ -0,0 +1,26 @@ +00000000440000000044000000 +00000000440000000044000000 +00440000004400004422220000 +00440000004400004422220000 +00004400000000442200400000 +00004400000000442244400000 +00000044002222222222000400 +00000044002222222222000400 +00400000442222442200004400 +00400000442222442200004400 +00444022004422224400000400 +00004022004422224400000400 +00002222222222000044000000 +00002222222222000044000000 +00004022004422000000440000 +00444022004422000000440000 +00222222440044000000004400 +00222222440044004400004400 +22222244000000000400000000 +22222244000000000400000000 +00004400000000000000000444 +00004400000000000000000444 +00000000000000000000400000 +00000000000555500044400000 +40000000000500500000000000 +40004400000500500000000000 diff --git a/src/client/resources/levels/level034.txt b/src/client/resources/levels/level034.txt new file mode 100644 index 0000000..1376e1f --- /dev/null +++ b/src/client/resources/levels/level034.txt @@ -0,0 +1,26 @@ +00000000500500000000000000 +00000000500500000000000000 +50505005005000005050000000 +50505005005000005050000000 +50505055550000005055500000 +50505055550000005055500000 +05050055500000055055550000 +05050055500000055055550000 +00500055055000505555550000 +00500055055000505555550000 +00500500005550550505550000 +00500500005550550505550000 +00500000055555500050550000 +00500000055555500050550000 +00050000505555500050550000 +00050000505555500050550000 +00055555005555550050505555 +00050000005555550050500055 +00050000055055055050500505 +00050000055055055050500505 +00005000550550555500000500 +00005000550550555500000500 +00005005500000005550005000 +00005005500555505550005000 +00005005000500500055550000 +00005005000500500055550000 \ No newline at end of file diff --git a/src/client/resources/levels/level035.txt b/src/client/resources/levels/level035.txt new file mode 100644 index 0000000..dc3ca19 --- /dev/null +++ b/src/client/resources/levels/level035.txt @@ -0,0 +1,26 @@ +00000000000000000000000000 +00000000000000000000000000 +00000000550055000000000000 +00000000550055000000000000 +22000022552255220000220000 +22000022552255220000220000 +55222255555555552222552200 +55222255555555552222552200 +55555555445544555555552200 +55555555445544555555552200 +33333355555555553333332200 +33333355555555553333332200 +33555555555555555555333322 +33555555555555555555333322 +55555533555555335555552222 +55555533555555335555552222 +55553333335533333355553333 +55553333335533333355553333 +22333322222222223333223322 +22333322222222223333223322 +00222200000000002222002200 +00222200000000002222002200 +00000000000000000000000000 +00000000000555500000000000 +00000000000500500000000000 +00000000000500500000000000 \ No newline at end of file diff --git a/src/client/resources/sounds/bonus_add.mp3 b/src/client/resources/sounds/bonus_add.mp3 new file mode 100644 index 0000000..26b24e9 Binary files /dev/null and b/src/client/resources/sounds/bonus_add.mp3 differ diff --git a/src/client/resources/sounds/bonus_get.mp3 b/src/client/resources/sounds/bonus_get.mp3 new file mode 100644 index 0000000..78c9e59 Binary files /dev/null and b/src/client/resources/sounds/bonus_get.mp3 differ diff --git a/src/client/resources/sounds/boom_bot.mp3 b/src/client/resources/sounds/boom_bot.mp3 new file mode 100644 index 0000000..83d10a2 Binary files /dev/null and b/src/client/resources/sounds/boom_bot.mp3 differ diff --git a/src/client/resources/sounds/boom_player.mp3 b/src/client/resources/sounds/boom_player.mp3 new file mode 100644 index 0000000..1e491fb Binary files /dev/null and b/src/client/resources/sounds/boom_player.mp3 differ diff --git a/src/client/resources/sounds/bullet_block.mp3 b/src/client/resources/sounds/bullet_block.mp3 new file mode 100644 index 0000000..848eab4 Binary files /dev/null and b/src/client/resources/sounds/bullet_block.mp3 differ diff --git a/src/client/resources/sounds/bullet_hit.mp3 b/src/client/resources/sounds/bullet_hit.mp3 new file mode 100644 index 0000000..51d0f0d Binary files /dev/null and b/src/client/resources/sounds/bullet_hit.mp3 differ diff --git a/src/client/resources/sounds/bullet_wall.mp3 b/src/client/resources/sounds/bullet_wall.mp3 new file mode 100644 index 0000000..caf7fcd Binary files /dev/null and b/src/client/resources/sounds/bullet_wall.mp3 differ diff --git a/src/client/resources/sounds/button.mp3 b/src/client/resources/sounds/button.mp3 new file mode 100644 index 0000000..1bd4cc8 Binary files /dev/null and b/src/client/resources/sounds/button.mp3 differ diff --git a/src/client/resources/sounds/game_over.mp3 b/src/client/resources/sounds/game_over.mp3 new file mode 100644 index 0000000..3286636 Binary files /dev/null and b/src/client/resources/sounds/game_over.mp3 differ diff --git a/src/client/resources/sounds/live.mp3 b/src/client/resources/sounds/live.mp3 new file mode 100644 index 0000000..3fc2da3 Binary files /dev/null and b/src/client/resources/sounds/live.mp3 differ diff --git a/src/client/resources/sounds/move_bot.mp3 b/src/client/resources/sounds/move_bot.mp3 new file mode 100644 index 0000000..3fec7a2 Binary files /dev/null and b/src/client/resources/sounds/move_bot.mp3 differ diff --git a/src/client/resources/sounds/move_player.mp3 b/src/client/resources/sounds/move_player.mp3 new file mode 100644 index 0000000..a99dbce Binary files /dev/null and b/src/client/resources/sounds/move_player.mp3 differ diff --git a/src/client/resources/sounds/pause.mp3 b/src/client/resources/sounds/pause.mp3 new file mode 100644 index 0000000..9d2dace Binary files /dev/null and b/src/client/resources/sounds/pause.mp3 differ diff --git a/src/client/resources/sounds/score.mp3 b/src/client/resources/sounds/score.mp3 new file mode 100644 index 0000000..47417d4 Binary files /dev/null and b/src/client/resources/sounds/score.mp3 differ diff --git a/src/client/resources/sounds/shot.mp3 b/src/client/resources/sounds/shot.mp3 new file mode 100644 index 0000000..060a259 Binary files /dev/null and b/src/client/resources/sounds/shot.mp3 differ diff --git a/src/client/resources/sounds/slide.mp3 b/src/client/resources/sounds/slide.mp3 new file mode 100644 index 0000000..22157c7 Binary files /dev/null and b/src/client/resources/sounds/slide.mp3 differ diff --git a/src/client/resources/sounds/start.mp3 b/src/client/resources/sounds/start.mp3 new file mode 100644 index 0000000..8c7d504 Binary files /dev/null and b/src/client/resources/sounds/start.mp3 differ diff --git a/proto/base.proto b/src/common/proto/base.proto similarity index 100% rename from proto/base.proto rename to src/common/proto/base.proto