[proto] add game event proto messages

gulpfile.js

@@ -1,26 +1,28 @@
-const gulp = require('gulp');
+const gulp = require("gulp");
-const gulpClean = require('gulp-clean');
+const gulpClean = require("gulp-clean");
-const Config = require('./config.json');
+const Config = require("./config.json");
-const packageInfo = require('./package.json');
+const packageInfo = require("./package.json");
-const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
+const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
-const dateformat = require('dateformat');
+const dateformat = require("dateformat");
-const argv = require('yargs').argv;
+const argv = require("yargs").argv;
-const publish = require('./tasks/gulp-publish');
+const publish = require("./tasks/gulp-publish");
+
+Project.useRuffle();
 
 if (packageInfo.haxe) {
-    Haxe.VERSION = packageInfo.haxe;
+  Haxe.VERSION = packageInfo.haxe;
 }
 
 if (Config.SdkDir) {
-    Sdk.dir = Config.SdkDir;
+  Sdk.dir = Config.SdkDir;
 }
 
 if (Config.BuildDir) {
-    Haxe.buildDir = Config.BuildDir;
+  Haxe.buildDir = Config.BuildDir;
 }
 
 exports.clean = function clean() {
-    return gulp.src('target/*', {read: false}).pipe(gulpClean());
+  return gulp.src("target/*", { read: false }).pipe(gulpClean());
 };
 
 exports.setup = function setup() {
@@ -48,167 +50,146 @@ exports.generate = function generate() {
  * base config
  */
 const config = new Project.Config({
-    meta: {
+  meta: {
-        title: 'Tank\'z',
+    title: "Tank'z",
-        filename: 'tankz',
+    filename: "tankz",
-        icon: 'src/client/resources/icon.png',
+    icon: "src/client/resources/icon.png",
-        pack: 'ru.m.tankz',
+    pack: "ru.m.tankz",
-        author: 'shmyga <shmyga.z@gmail.com>',
+    author: "shmyga <shmyga.z@gmail.com>",
-        company: 'MegaLoMania',
+    company: "MegaLoMania",
-        version: packageInfo.version + (Config.Develop ? '-SNAPSHOT' : ''),
+    version: packageInfo.version + (Config.Develop ? "-SNAPSHOT" : ""),
-    },
+  },
-    key: Config.Key,
+  key: Config.Key,
-    libs: packageInfo.haxeDependencies,
+  libs: packageInfo.haxeDependencies,
-    sources: [
+  sources: ["src/common/haxe", "src-gen/haxe"],
-        'src/common/haxe',
+  assets: ["src/common/resources/config"],
-        'src-gen/haxe',
+  flags: ["proto_debug"],
-    ],
+  macros: [
-    assets: [
+    `CompilationOption.set('build','${dateformat(new Date(), "yyyy-mm-dd HH:MM:ss")}')`,
-        'src/common/resources/config',
+  ],
-    ],
-    flags: [
-        'proto_debug',
-    ],
-    macros: [
-        `CompilationOption.set('build','${dateformat(new Date(), 'yyyy-mm-dd HH:MM:ss')}')`,
-    ]
 });
 
-const host = argv.host || 'localhost';
+const host = argv.host || "localhost";
 const port = argv.port || 5000;
 
 /**
  * client
  */
 const client = new Project(
-    Project.BuildSystem.OPENFL,
+  Project.BuildSystem.OPENFL,
-    [
+  [
-        Project.Platform.FLASH,
+    Project.Platform.FLASH,
-        Project.Platform.HTML5,
+    Project.Platform.HTML5,
-        Project.Platform.LINUX,
+    Project.Platform.LINUX,
-        Project.Platform.WINDOWS,
+    Project.Platform.WINDOWS,
-        Project.Platform.ANDROID,
+    Project.Platform.ANDROID,
+  ],
+  config.branch({
+    name: "client",
+    sources: ["src/client/haxe"],
+    main: "ru.m.tankz.Client",
+    preloader: "ru.m.tankz.Preloader",
+    assets: ["src/common/resources/level", "src/client/resources"],
+    meta: {
+      width: 1024,
+      height: 576,
+    },
+    flags: [
+      //'proto_debug',
+      //'dom',
+      //'dev_layout',
+      //'bitmap_text',
     ],
-    config.branch({
+    macros: [
-        name: 'client',
+      `CompilationOption.set('host','${host}')`,
-        sources: [
+      `CompilationOption.set('port',${port})`,
-            'src/client/haxe',
+    ],
-        ],
+  }),
-        main: 'ru.m.tankz.Client',
-        preloader: 'ru.m.tankz.Preloader',
-        assets: [
-            'src/common/resources/level',
-            'src/client/resources',
-        ],
-        meta: {
-            width: 1024,
-            height: 576,
-        },
-        flags: [
-            //'proto_debug',
-            //'dom',
-            //'dev_layout',
-            //'bitmap_text',
-        ],
-        macros: [
-            `CompilationOption.set('host','${host}')`,
-            `CompilationOption.set('port',${port})`,
-        ]
-    }),
 ).bind(module, gulp);
 
 /**
  * editor
  */
 const editor = new Project(
-    Project.BuildSystem.OPENFL,
+  Project.BuildSystem.OPENFL,
-    [
+  [Project.Platform.FLASH, Project.Platform.HTML5, Project.Platform.LINUX],
-        Project.Platform.FLASH,
+  config.branch({
-        Project.Platform.HTML5,
+    name: "editor",
-        Project.Platform.LINUX,
+    sources: ["src/client/haxe", "src/editor/haxe"],
+    main: "ru.m.tankz.editor.Editor",
+    preloader: "ru.m.tankz.Preloader",
+    assets: ["src/client/resources", "src/editor/resources"],
+    meta: {
+      filename: "editor",
+      pack: "ru.m.tankz.editor",
+      width: 1024,
+      height: 768,
+    },
+    flags: [
+      //'dev_layout',
     ],
-    config.branch({
+  }),
-        name: 'editor',
-        sources: [
-            'src/client/haxe',
-            'src/editor/haxe',
-        ],
-        main: 'ru.m.tankz.editor.Editor',
-        preloader: 'ru.m.tankz.Preloader',
-        assets: [
-            'src/client/resources',
-            'src/editor/resources',
-        ],
-        meta: {
-            filename: 'editor',
-            pack: 'ru.m.tankz.editor',
-            width: 1024,
-            height: 768,
-        },
-        flags: [
-            //'dev_layout',
-        ]
-    })
 ).bind(module, gulp);
 
 /**
  * server
  */
 const server = new Project(
-    Project.BuildSystem.HAXE,
+  Project.BuildSystem.HAXE,
-    Project.Platform.CPP,
+  Project.Platform.CPP,
-    config.branch({
+  config.branch({
-        name: 'server',
+    name: "server",
-        sources: ['src/server/haxe'],
+    sources: ["src/server/haxe"],
-        main: 'ru.m.tankz.server.Server',
+    main: "ru.m.tankz.server.Server",
-        assets: [
+    assets: ["src/common/resources/level"],
-            'src/common/resources/level',
+  }),
-        ]
-    }),
 ).bind(module, gulp);
 
 /**
  * publish
  */
-module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
+module.exports.publish = publish(
+  packageInfo.name,
+  packageInfo.version,
+  Config.PublishDir,
+  Config.PublishUrl,
+);
 
 /**
  * default
  */
 const defaultSeries = [
-    exports.clean,
+  exports.clean,
-    exports.generate,
+  exports.generate,
-    module.exports['client:flash:build'],
+  module.exports["client:flash:build"],
-    module.exports['client:flash:html'],
+  module.exports["client:flash:html"],
-    module.exports['client:html5:build'],
+  module.exports["client:html5:build"],
 
-    module.exports['editor:flash:build'],
+  module.exports["editor:flash:build"],
-    module.exports['editor:flash:html'],
+  module.exports["editor:flash:html"],
-    module.exports['editor:html5:build'],
+  module.exports["editor:html5:build"],
 
-    module.exports['server:cpp:build'],
+  module.exports["server:cpp:build"],
 ];
 
 if (System.isLinux) {
-    defaultSeries.push(
+  defaultSeries.push(
-        module.exports['client:linux:build'],
+    module.exports["client:linux:build"],
-        module.exports['client:linux:archive'],
+    module.exports["client:linux:archive"],
-        module.exports['client:linux:deb'],
+    module.exports["client:linux:deb"],
 
-        module.exports['client:android:build'],
+    module.exports["client:android:build"],
-    );
+  );
 }
 
 if (System.isWindows) {
-    defaultSeries.push(
+  defaultSeries.push(
-        module.exports['client:windows:build'],
+    module.exports["client:windows:build"],
-        module.exports['client:windows:archive'],
+    module.exports["client:windows:archive"],
-        module.exports['client:windows:installer'],
+    module.exports["client:windows:installer"],
-    );
+  );
 }
 
-defaultSeries.push(
+defaultSeries.push(exports.publish);
-    exports.publish,
-);
 
 module.exports.default = gulp.series(defaultSeries);

package.json

@@ -7,7 +7,7 @@
     "gulp": "^4.0.0",
     "gulp-add": "0.0.2",
     "gulp-clean": "^0.4.0",
-    "gulp-haxetool": "^0.1.9",
+    "gulp-haxetool": "^0.2.1",
     "yargs": "^13.2.4"
   },
   "haxeDependencies": {

src/common/proto/game.proto

@@ -2,7 +2,116 @@ syntax = "proto3";
 
 package ru.m.tankz.proto.game;
 
+message PositionProto {
+    float x = 1;
+    float y = 2;
+}
+
+message RectangleProto {
+    float x = 1;
+    float y = 2;
+    float width = 3;
+    float height = 4;
+}
+
+message ShotProto {
+    int32 tankId = 1;
+    int32 bulletId = 2;
+    int32 score = 3;
+}
+
+message BrickProto {
+    int32 gridX = 1;
+    int32 gridY = 2;
+    string type = 3;
+}
+
+message EagleProto {
+    string team = 1;
+}
+
+message TankProto {
+    string team = 1;
+    int32 index = 2;
+    string type = 3;
+    int32 hits = 4;
+    bool bonus = 5;
+    int32 color = 6;
+    string name = 7;
+}
+
+message BulletProto {
+    string team = 1;
+    int32 index = 2;
+    int32 piercing = 3;
+}
+
+message BonusProto {
+    string type = 1;
+}
+
+message GameStateProto {
+    string state = 1;
+}
+
+message GameEventStartProto {
+    GameStateProto state = 1;
+}
+
+message GameEventCompleteProto {
+    GameStateProto state = 1;
+}
+
+message GameEventSpawnProto {
+    int32 entityId = 1;
+    RectangleProto rectangle = 2;
+    oneof entity {
+        EagleProto eagle = 3;
+        TankProto tank = 4;
+        BulletProto bullet = 5;
+        BonusProto bonus = 6;
+        BrickProto bricks = 7;
+    }
+}
+
+message GameEventMoveProto {
+    int32 entityId = 1;
+    PositionProto position = 2;
+}
+
+message GameEventStopProto {
+    int32 entityId = 1;
+}
+
+message GameEventHitProto {
+    int32 entityId = 1;
+    ShotProto shot = 2;
+}
+
+message GameEventDestroyProto {
+    int32 entityId = 1;
+    ShotProto shot = 2;
+}
+
+message GameEventActionProto {
+    int32 entityId = 1;
+    oneof action {
+        PositionProto move = 2;
+        bool stop = 3;
+        bool shot = 4;
+    }
+}
+
 message GameEventProto {
     int32 time = 1;
-    string event = 2;
+    oneof event {
+        GameEventStartProto start = 2;
+        GameEventCompleteProto complete = 3;
+        GameEventSpawnProto spawn = 4;
+        GameEventMoveProto move = 5;
+        GameEventStopProto stop = 6;
+        GameEventHitProto hit = 7;
+        GameEventDestroyProto destroy = 8;
+        GameEventActionProto action = 9;
+    }
 }