ddbot.js-0374 4.4.3 → 4.4.4

package/lib/ddutils.js

@@ -18,39 +18,39 @@ function DefaultIdentity(name = 'nameless tee') {
  */
 function reconstructPlayerInput(char, ddnetChar = null, tick = null) {
     const input = {
-        direction: char.character_core.direction,
-        target_x: 0,
-        target_y: -1,
-        jump: 0,
-        fire: 0,
-        hook: 0,
-        player_flags: char.player_flags || 0,
-        wanted_weapon: char.weapon,
-        next_weapon: 0,
-        prev_weapon: 0
+        m_Direction: char.character_core.direction,
+        m_TargetX: 0,
+        m_TargetY: -1,
+        m_Jump: 0,
+        m_Fire: 0,
+        m_Hook: 0,
+        m_PlayerFlags: char.player_flags || 0,
+        m_WantedWeapon: char.weapon,
+        m_NextWeapon: 0,
+        m_PrevWeapon: 0
     };
     if (ddnetChar && (ddnetChar.m_TargetX !== 0 || ddnetChar.m_TargetY !== 0)) {
-        input.target_x = ddnetChar.m_TargetX;
-        input.target_y = ddnetChar.m_TargetY;
+        input.m_TargetX = ddnetChar.m_TargetX;
+        input.m_TargetY = ddnetChar.m_TargetY;
     }
     else {
         const angleRad = (char.character_core.angle / 256.0) * Math.PI / 128.0;
-        input.target_x = Math.cos(angleRad) * 256;
-        input.target_y = Math.sin(angleRad) * 256;
+        input.m_TargetX = Math.cos(angleRad) * 256;
+        input.m_TargetY = Math.sin(angleRad) * 256;
     }
-    if (input.target_x === 0 && input.target_y === 0) {
-        input.target_y = -1;
+    if (input.m_TargetX === 0 && input.m_TargetY === 0) {
+        input.m_TargetY = -1;
     }
     const hookActive = char.character_core.hook_state !== 0 ||
         char.character_core.hooked_player !== -1;
-    input.hook = hookActive ? 1 : 0;
+    input.m_Hook = hookActive ? 1 : 0;
     const jumped = char.character_core.jumped;
     const grounded = Math.abs(char.character_core.vel_y) < 1 && jumped === 0;
-    input.jump = jumped > 0 && !grounded ? 1 : 0;
+    input.m_Jump = jumped > 0 && !grounded ? 1 : 0;
     const isNinja = ddnetChar != null && (ddnetChar.m_Flags & 0x20) !== 0;
-    input.wanted_weapon = isNinja ? 5 : char.weapon;
-    const isAutofireWeapon = [2, 3, 4].includes(input.wanted_weapon);
-    const isJetpackGun = input.wanted_weapon === 1 && ddnetChar?.m_Flags != null;
-    input.fire = isAutofireWeapon || isJetpackGun ? 0 : 0; // без tick всегда 0
+    input.m_WantedWeapon = isNinja ? 5 : char.weapon;
+    const isAutofireWeapon = [2, 3, 4].includes(input.m_WantedWeapon);
+    const isJetpackGun = input.m_WantedWeapon === 1 && ddnetChar?.m_Flags != null;
+    input.m_Fire = isAutofireWeapon || isJetpackGun ? 0 : 0;
     return input;
 }

package/lib/modules/snap.js

@@ -73,12 +73,19 @@ class Snap extends module_js_1.default {
         return this._isFrozen;
     }
     lookatplayer(client_id) {
-        const pl_character = this.bot.bot_client?.SnapshotUnpacker.getObjCharacter(client_id);
-        const own_character = this.bot.bot_client?.SnapshotUnpacker.getObjCharacter(this.bot.OwnID);
-        if (!pl_character || !own_character)
+        try {
+            const pl_character = this.bot.bot_client?.SnapshotUnpacker.getObjCharacter(client_id);
+            const own_character = this.bot.bot_client?.SnapshotUnpacker.getObjCharacter(this.bot.OwnID);
+            if (!pl_character || !own_character) {
+                return;
+            }
+            const angle = Math.atan2(pl_character.character_core.y - own_character.character_core.y, pl_character.character_core.x - own_character.character_core.x);
+            this.bot.send_input({ m_TargetX: Math.cos(angle) * 256, m_TargetY: Math.sin(angle) * 256 });
             return;
-        const angle = Math.atan2(pl_character.character_core.y - own_character.character_core.y, pl_character.character_core.x - own_character.character_core.x);
-        this.bot.send_input({ target_x: Math.cos(angle) * 256, target_y: Math.sin(angle) * 256 });
+        }
+        catch (e) {
+            return;
+        }
     }
     _start() {
         this.bot.on('snapshot', this.snapslistener);

package/lib/types.d.ts

@@ -3,16 +3,16 @@
  */
 export declare namespace SnapshotItemTypes {
     interface PlayerInput {
-        direction: number;
-        target_x: number;
-        target_y: number;
-        jump: number;
-        fire: number;
-        hook: number;
-        player_flags: number;
-        wanted_weapon: number;
-        next_weapon: number;
-        prev_weapon: number;
+        m_Direction: number;
+        m_TargetX: number;
+        m_TargetY: number;
+        m_Jump: number;
+        m_Fire: number;
+        m_Hook: number;
+        m_PlayerFlags: number;
+        m_WantedWeapon: number;
+        m_NextWeapon: number;
+        m_PrevWeapon: number;
     }
     interface iOptions {
         identity?: Identity;

package/package.json

@@ -3,7 +3,7 @@
     "teeworlds": "^2.5.11"
   },
   "name": "ddbot.js-0374",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "description": "ddbot.js — это Node.js проект для автоматизации и управления ботами.",
   "main": "./lib/index.js",
   "scripts": {