[proto] add game event proto messages

gulpfile.js

@@ -1,13 +1,11 @@
-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;
@@ -22,7 +20,7 @@ if (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() {
@@ -51,25 +49,32 @@ exports.generate = function generate() {
  */
 const config = new Project.Config({
     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,
     libs: packageInfo.haxeDependencies,
-  sources: ["src/common/haxe", "src-gen/haxe"],
+    sources: [
-  assets: ["src/common/resources/config"],
+        'src/common/haxe',
-  flags: ["proto_debug"],
+        'src-gen/haxe',
-  macros: [
-    `CompilationOption.set('build','${dateformat(new Date(), "yyyy-mm-dd HH:MM:ss")}')`,
     ],
+    assets: [
+        '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;
 
 /**
@@ -85,11 +90,16 @@ const client = new Project(
         Project.Platform.ANDROID,
     ],
     config.branch({
-    name: "client",
+        name: 'client',
-    sources: ["src/client/haxe"],
+        sources: [
-    main: "ru.m.tankz.Client",
+            'src/client/haxe',
-    preloader: "ru.m.tankz.Preloader",
+        ],
-    assets: ["src/common/resources/level", "src/client/resources"],
+        main: 'ru.m.tankz.Client',
+        preloader: 'ru.m.tankz.Preloader',
+        assets: [
+            'src/common/resources/level',
+            'src/client/resources',
+        ],
         meta: {
             width: 1024,
             height: 576,
@@ -103,7 +113,7 @@ const client = new Project(
         macros: [
             `CompilationOption.set('host','${host}')`,
             `CompilationOption.set('port',${port})`,
-    ],
+        ]
     }),
 ).bind(module, gulp);
 
@@ -112,23 +122,33 @@ const client = new Project(
  */
 const editor = new Project(
     Project.BuildSystem.OPENFL,
-  [Project.Platform.FLASH, Project.Platform.HTML5, Project.Platform.LINUX],
+    [
+        Project.Platform.FLASH,
+        Project.Platform.HTML5,
+        Project.Platform.LINUX,
+    ],
     config.branch({
-    name: "editor",
+        name: 'editor',
-    sources: ["src/client/haxe", "src/editor/haxe"],
+        sources: [
-    main: "ru.m.tankz.editor.Editor",
+            'src/client/haxe',
-    preloader: "ru.m.tankz.Preloader",
+            'src/editor/haxe',
-    assets: ["src/client/resources", "src/editor/resources"],
+        ],
+        main: 'ru.m.tankz.editor.Editor',
+        preloader: 'ru.m.tankz.Preloader',
+        assets: [
+            'src/client/resources',
+            'src/editor/resources',
+        ],
         meta: {
-      filename: "editor",
+            filename: 'editor',
-      pack: "ru.m.tankz.editor",
+            pack: 'ru.m.tankz.editor',
             width: 1024,
             height: 768,
         },
         flags: [
             //'dev_layout',
-    ],
+        ]
-  }),
+    })
 ).bind(module, gulp);
 
 /**
@@ -138,22 +158,19 @@ const server = new Project(
     Project.BuildSystem.HAXE,
     Project.Platform.CPP,
     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: ["src/common/resources/level"],
+        assets: [
+            'src/common/resources/level',
+        ]
     }),
 ).bind(module, gulp);
 
 /**
  * publish
  */
-module.exports.publish = publish(
+module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
-  packageInfo.name,
-  packageInfo.version,
-  Config.PublishDir,
-  Config.PublishUrl,
-);
 
 /**
  * default
@@ -161,35 +178,37 @@ module.exports.publish = publish(
 const defaultSeries = [
     exports.clean,
     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(
-    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(
-    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(exports.publish);
+defaultSeries.push(
+    exports.publish,
+);
 
 module.exports.default = gulp.series(defaultSeries);

package-lock.json

@@ -1,18 +1,18 @@
 {
     "name": "tankz",
-  "version": "0.18.0",
+    "version": "0.17.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "tankz",
-      "version": "0.18.0",
+            "version": "0.17.6",
             "devDependencies": {
                 "dateformat": "^3.0.3",
                 "gulp": "^4.0.0",
                 "gulp-add": "0.0.2",
                 "gulp-clean": "^0.4.0",
-        "gulp-haxetool": "^0.2.1",
+                "gulp-haxetool": "^0.1.9",
                 "yargs": "^13.2.4"
             }
         },
@@ -3296,11 +3296,10 @@
             }
         },
         "node_modules/gulp-haxetool": {
-      "version": "0.2.1",
+            "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-0.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/gulp-haxetool/-/gulp-haxetool-0.1.9.tgz",
-      "integrity": "sha512-+p38E66G67AxYY1V8ZHRGlNG08EnfdEJezteKhocjBFjnGIguJrwFc0paGvL/zlyWJV1vSyfiLWN8J5HYZLjYg==",
+            "integrity": "sha512-ABS3nWVrGMA0iLnIoOHl06zp6OOB9BCE5Nda0cpuaKVX2LGMPnJMhxPJNDQXvMhYTDnX90z2EpyIFDH6Pyv37A==",
             "dev": true,
-      "license": "ISC",
             "dependencies": {
                 "ansi-colors": "^1.1.0",
                 "async": "^2.6.0",

package.json

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