added resources

.gitignore

@@ -5,4 +5,5 @@ out/
 *.ipr
 *.iws
 *.ids
-*.stackdump
+*.stackdump
+.idea/

project.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
-  <meta title="Tank'z" package="ru.m.tankz" version="0.0.0" company="m"/>
+  <meta title="Tank'z" package="ru.m.tankz" version="0.0.0" company="MegaLoMania"/>
   <app main="ru.m.tankz.Client" path="target" file="tankz"/>
   <source path="src/common/haxe"/>
   <source path="src/client/haxe"/>
   <source path="src-gen/haxe"/>
-  <assets path="res" include="*"/>
+  <assets path="src/client/resources" rename="resources" include="*"/>
-  <!--<haxelib name="openfl-bitfive"/>-->
   <haxelib name="openfl"/>
-  <!--<haxelib name="openfl-html5-dom"/>-->
   <haxelib name="protohx"/>
   <haxelib name="haxework" version="git"/>
   <window width="800" height="600" if="desktop"/>

protohx.json

@@ -1,7 +1,7 @@
 {
   "protoPath": ".",
   "protoFiles": [
-    "proto/base.proto"
+    "src/common/proto/base.proto"
   ],
   "cleanOut": true,
   "haxeOut": "src-gen/haxe",

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);

src/client/resources/animations.xml

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<animations>
+	<!--	Бонусы			-->
+	<animation id="bonus_0">
+		<frame id="bonus_0-0" duration="15"/>
+		<frame id="bonus_0-1" duration="15"/>
+	</animation>
+	<animation id="bonus_1">
+		<frame id="bonus_1-0" duration="15"/>
+		<frame id="bonus_0-1" duration="15"/>
+	</animation>
+	<animation id="bonus_2">
+		<frame id="bonus_2-0" duration="15"/>
+		<frame id="bonus_0-1" duration="15"/>
+	</animation>
+	<animation id="bonus_3">
+		<frame id="bonus_3-0" duration="15"/>
+		<frame id="bonus_0-1" duration="15"/>
+	</animation>
+	<animation id="bonus_4">
+		<frame id="bonus_4-0" duration="15"/>
+		<frame id="bonus_0-1" duration="15"/>
+	</animation>
+	<animation id="bonus_5">
+		<frame id="bonus_5-0" duration="15"/>
+		<frame id="bonus_0-1" duration="15"/>
+	</animation>
+	<!--	Снаряды			-->
+	<animation id="bullet_0">
+		<frame id="bullet_0" duration="3"/>
+	</animation>
+	<animation id="bullet_1">
+		<frame id="bullet_1" duration="3"/>
+	</animation>
+	<!--	Взрыв снаряда	-->
+	<animation id="boom">
+		<frame id="boom-0" duration="1"/>
+		<frame id="boom-1" duration="2"/>
+		<frame id="boom-0" duration="2"/>
+		<frame id="boom-1" duration="1"/>
+	</animation>
+	<!--	Орёл			-->
+	<animation id="eagle">
+		<frame id="eagle-0" duration="15"/>
+		<frame id="eagle-1" duration="15"/>
+	</animation>
+	<!--	Карта			-->
+	<animation id="map_0">
+		<frame id="map_0" duration="15"/>
+	</animation>
+	<animation id="map_1">
+		<frame id="map_1" duration="15"/>
+	</animation>
+	<animation id="map_2">
+		<frame id="map_2" duration="15"/>
+	</animation>
+	<animation id="map_3">
+		<frame id="map_3-0" duration="15"/>
+		<frame id="map_3-1" duration="15"/>
+	</animation>
+	<animation id="map_4">
+		<frame id="map_4" duration="15"/>
+	</animation>
+	<animation id="map_5">
+		<frame id="map_5" duration="15"/>
+	</animation>
+	<!--	Вспышка			-->
+	<animation id="appear">
+		<frame id="appear-0" duration="1"/>
+		<frame id="appear-1" duration="1"/>
+		<frame id="appear-2" duration="1"/>
+		<frame id="appear-3" duration="2"/>
+		<frame id="appear-4" duration="1"/>
+		<frame id="appear-5" duration="2"/>
+		<frame id="appear-6" duration="1"/>
+	</animation>
+	<!--	Взрыв			-->
+	<animation id="kaboom">
+		<frame id="kaboom-0" duration="1"/>
+		<frame id="kaboom-1" duration="1"/>
+		<frame id="kaboom-2" duration="1"/>
+		<frame id="kaboom-3" duration="1"/>
+		<frame id="kaboom-4" duration="3"/>
+		<frame id="kaboom-1" duration="1"/>
+		<frame id="kaboom-4" duration="2"/>
+		<frame id="kaboom-7" duration="2"/>
+		<frame id="kaboom-8" duration="1"/>
+		<frame id="kaboom-9" duration="2"/>
+	</animation>
+	<!--	Защита			-->
+	<animation id="protect">
+		<frame id="protect-0" duration="5"/>
+		<frame id="protect-1" duration="5"/>
+	</animation>
+	<!--	Танки (ботов)	-->
+	<animation id="tank_b0_0">
+		<frame id="tank_b0_0-0" duration="3"/>
+		<frame id="tank_b0_0-1" duration="3"/>
+	</animation>
+	<animation id="tank_b0_7">
+		<frame id="tank_b0_0-2" duration="3"/>
+		<frame id="tank_b0_0-3" duration="3"/>
+		<frame id="tank_b0_0-0" duration="3"/>
+		<frame id="tank_b0_0-1" duration="3"/>
+	</animation>
+	
+	<animation id="tank_b1_0">
+		<frame id="tank_b1_0-0" duration="2"/>
+		<frame id="tank_b1_0-1" duration="2"/>
+		<frame id="tank_b1_0-2" duration="2"/>
+	</animation>
+	<animation id="tank_b1_7">
+		<frame id="tank_b1_0-3" duration="2"/>
+		<frame id="tank_b1_0-4" duration="2"/>
+		<frame id="tank_b1_0-5" duration="2"/>
+		<frame id="tank_b1_0-0" duration="2"/>
+		<frame id="tank_b1_0-1" duration="2"/>
+		<frame id="tank_b1_0-2" duration="2"/>
+	</animation>
+	
+	<animation id="tank_b2_0">
+		<frame id="tank_b2_0-0" duration="3"/>
+		<frame id="tank_b2_0-1" duration="3"/>
+	</animation>
+	<animation id="tank_b2_7">
+		<frame id="tank_b2_0-2" duration="3"/>
+		<frame id="tank_b2_0-3" duration="3"/>
+		<frame id="tank_b2_0-0" duration="3"/>
+		<frame id="tank_b2_0-1" duration="3"/>
+	</animation>
+	
+	<animation id="tank_b3_0">
+		<frame id="tank_b3_0-0" duration="3"/>
+		<frame id="tank_b3_0-1" duration="3"/>
+	</animation>
+	<animation id="tank_b3_1">
+		<frame id="tank_b3_1-0" duration="3"/>
+		<frame id="tank_b3_1-1" duration="3"/>
+	</animation>
+	<animation id="tank_b3_2">
+		<frame id="tank_b3_2-0" duration="3"/>
+		<frame id="tank_b3_2-1" duration="3"/>
+	</animation>
+	<animation id="tank_b3_3">
+		<frame id="tank_b3_3-0" duration="3"/>
+		<frame id="tank_b3_3-1" duration="3"/>
+	</animation>
+	<animation id="tank_b3_7">
+		<frame id="tank_b3_0-2" duration="3"/>
+		<frame id="tank_b3_0-3" duration="3"/>
+		<frame id="tank_b3_0-0" duration="3"/>
+		<frame id="tank_b3_0-1" duration="3"/>
+	</animation>
+	<!--	Танки (игроков)	-->
+	<animation id="tank_p0_0">
+		<frame id="tank_p0_0-0" duration="3"/>
+		<frame id="tank_p0_0-1" duration="3"/>
+	</animation>
+	<animation id="tank_p1_0">
+		<frame id="tank_p1_0-0" duration="3"/>
+		<frame id="tank_p1_0-1" duration="3"/>
+	</animation>
+	<animation id="tank_p2_0">
+		<frame id="tank_p2_0-0" duration="3"/>
+		<frame id="tank_p2_0-1" duration="3"/>
+	</animation>
+	<animation id="tank_p3_0">
+		<frame id="tank_p3_0-0" duration="3"/>
+		<frame id="tank_p3_0-1" duration="3"/>
+	</animation>
+	
+	<animation id="tank_p0_1">
+		<frame id="tank_p0_1-0" duration="3"/>
+		<frame id="tank_p0_1-1" duration="3"/>
+	</animation>
+	<animation id="tank_p1_1">
+		<frame id="tank_p1_1-0" duration="3"/>
+		<frame id="tank_p1_1-1" duration="3"/>
+	</animation>
+	<animation id="tank_p2_1">
+		<frame id="tank_p2_1-0" duration="3"/>
+		<frame id="tank_p2_1-1" duration="3"/>
+	</animation>
+	<animation id="tank_p3_1">
+		<frame id="tank_p3_1-0" duration="3"/>
+		<frame id="tank_p3_1-1" duration="3"/>
+	</animation>
+</animations>

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

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
+    }
+  }
+}

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,
+              "width": 100, "height": 45,
-              "height": 30,
+              "text": "Auth",
-              "skin": {"type": "haxework.gui.skin.ButtonColorSkin"},
+              "_include": "button_skin"
-              "text": "Auth"
             }
           ]
         },
@@ -96,9 +109,9 @@
             },
             {
               "id": "create", "type": "haxework.gui.ButtonView",
-              "width": 100, "height": 30,
+              "width": 100, "height": 45,
-              "skin": {"type": "haxework.gui.skin.ButtonColorSkin"},
+              "text": "Create",
-              "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,
+              "width": 100, "height": 45,
-              "skin": {"type": "haxework.gui.skin.ButtonColorSkin"},
+              "text": "Start",
-              "text": "Start"
+              "_include": "button_skin"
             },
             {
               "id": "exit", "type": "haxework.gui.ButtonView",
-              "width": 100, "height": 30,
+              "width": 100, "height": 45,
-              "skin": {"type": "haxework.gui.skin.ButtonColorSkin"},
+              "text": "Exit",
-              "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,
+              "width": 100, "height": 45,
-              "skin": {"type": "haxework.gui.skin.ButtonColorSkin"},
+              "text": "Restart",
-              "text": "Restart"
+              "_include": "button_skin"
             },
             {
               "id": "render", "type": "ru.m.tankz.render.Render",

src/client/resources/levels/level000.txt

@@ -0,0 +1,27 @@
+00000000000000000000000000
+
+00000000000000000000000000
+
+00055500055500005000555000
+
+00550550550550055005505500
+
+00000050500050555005000500
+
+00000550500050505005000500
+
+00055500500050005005000500
+
+00550000550550055005505500
+
+00555550055500555500555000
+
+00000000000000000000000000
+
+22222222222222222222222222
+
+22222222222222222222222222
+
+44111111111144111111111144
+
+44111111111144111111111144

src/client/resources/levels/level001.txt

@@ -0,0 +1,26 @@
+00000000000000000000000000
+
+00000000000000000000000000
+
+00550055005500550055005500
+
+00550055005500550055005500
+
+00550055005500550055005500
+
+00550055005500550055005500
+
+00550055005544550055005500
+
+00550055005544550055005500
+
+00550055005500550055005500
+
+00550055000000000055005500
+
+00550055000000000055005500
+
+00000000005500550000000000
+
+00000000005500550000000000
+

src/client/resources/levels/level002.txt

@@ -0,0 +1,26 @@
+00000044000000440000000000
+
+00000044000000440000000000
+
+00550044000000550055005500
+
+00550044000000550055005500
+
+00550000000055550055445500
+
+00550000000055550055445500
+
+00000055000000000044000000
+
+00000055000000000044000000
+
+22000055000044000055225544
+
+22000055000044000055225544
+
+22220000005500004455220000
+
+22220000005500004400220000
+
+00555555222222440000225500
+

src/client/resources/levels/level003.txt

@@ -0,0 +1,26 @@
+00000000550000005500000000
+
+00000000550000005500000000
+
+00222222550000000000000000
+
+00222222550000000000444444
+
+55222222000000000000000000
+
+55222222000000000000000000
+
+22222222000000550055555550
+
+22222222000000550055555550
+
+22222222555555550055000500
+
+22222222555555000055000500
+
+22222222000055000000000500
+
+22222222000055000000000500
+
+00220000000044444400002200
+

src/client/resources/levels/level004.txt

@@ -0,0 +1,26 @@
+00222200000000000000002200
+
+00222200000000000000002200
+
+22220000005555000000000022
+
+22220000555555555500000022
+
+22000005555555555555000044
+
+22000005555555555555550000
+
+44000055555555555555555000
+
+00000055555555555555555000
+
+00000555000000555555005000
+
+00000500000000005555005000
+
+33000500400040005550000000
+
+33000500400040005550000000
+
+00005500000000005550003333
+

src/client/resources/levels/level005.txt

@@ -0,0 +1,26 @@
+00000000555500000000000000
+
+00000000555500000000000000
+
+00000000550000004444440000
+
+44005500550000000000440000
+
+44005500000055000000000000
+
+44005500000055000000000000
+
+55005555550055550033330033
+
+55005555550055550033330033
+
+55000000550000000033000000
+
+00000000000000000033000000
+
+00000000333300333333005555
+
+00005500333300333333005555
+
+55550000335500555000000000
+

src/client/resources/levels/level006.txt

@@ -0,0 +1,26 @@
+00000000000500502222000000
+
+00000000000500502222000000
+
+00500400500000000522500522
+
+00500400500000000522500522
+
+00500400500055000522500522
+
+00500400500055000522500522
+
+00550000550044005522005522
+
+00550000550044005522005522
+
+00000005440055005540002222
+
+00000005000055000040002222
+
+55555000002255220000055555
+
+55555000002255220000055555
+
+00000000052222225000000000
+

src/client/resources/levels/level007.txt

@@ -0,0 +1,26 @@
+00000000000000444400000000
+
+00000000000000000000000000
+
+00004444444400000000440000
+
+00004400000000000000440000
+
+00004400000022004444440000
+
+00004400000022000044440000
+
+00440000002244000000440000
+
+00440000002244000000440000
+
+00000000224444000000444400
+
+00000000224444000000004400
+
+00440022444444004400000000
+
+00440022444444004400000000
+
+00040044440000004444000000
+

src/client/resources/levels/level008.txt

@@ -0,0 +1,26 @@
+00005500005500000055000000
+
+00005500005500550055000000
+
+22555555005500000055500000
+
+22555555005500440055500000
+
+22222200005500550055000550
+
+22222200000000550000000550
+
+22333333333333333333330033
+
+22333333333333333333330033
+
+00550000000000000000000000
+
+00550000000055550000000000
+
+00005500000555555555554444
+
+00005500000555550055000000
+
+55550055000555552255000055
+