teeworlds 2.5.2 → 2.5.4

package/lib/snapshot.ts

@@ -1,7 +1,7 @@
 import { UUIDManager, createTwMD5Hash } from "./UUIDManager";
 import { Client } from "./client";
 import { MsgUnpacker } from "./MsgUnpacker";
-import { PlayerInput, PlayerInfo, Projectile, Laser, Pickup, Flag, GameInfo, GameData, CharacterCore, Character, ClientInfo, SpectatorInfo, Common, Explosion, Spawn, HammerHit, Death, SoundGlobal, SoundWorld, DamageInd, MyOwnObject, DDNetCharacter, DDNetPlayer, GameInfoEx, DDNetProjectile, DDNetLaser } from "./snapshots";
+import { SnapshotItemTypes, DeltaItem, DDNetItem, Item } from "./enums_types/types";
 var decoder = new TextDecoder('utf-8');
 
 const ___itemAppendix: {"type_id": number, "size": number, "name": string}[] = [ // only used for the events underneath. the actual itemAppendix below this is only used for size
@@ -75,8 +75,6 @@ export enum items {
 	EVENT_DAMAGE_INDICATOR
 }
 
-export declare type Item = PlayerInput | PlayerInfo | Projectile | Laser | Pickup | Flag | GameInfo | GameData | CharacterCore | Character | PlayerInfo | ClientInfo | SpectatorInfo | Common | Explosion | Spawn |HammerHit | Death | SoundGlobal | SoundWorld | DamageInd;
-export declare type DDNetItem = MyOwnObject | DDNetCharacter | DDNetPlayer | GameInfoEx | DDNetProjectile | DDNetLaser;
 interface eSnap {
 	Snapshot: {Key: number, Data: number[]},
 	ack: number,
@@ -93,7 +91,7 @@ let supported_uuids = [
 ]
 
 export class Snapshot {
-	deltas: {'data': number[], 'parsed': Item | DDNetItem, 'type_id': number, 'id': number, 'key': number}[] = [];
+	deltas: DeltaItem[] = [];
 	eSnapHolder: eSnap[] = [];
 	crc_errors: number = 0;
 	client: Client;
@@ -128,7 +126,7 @@ export class Snapshot {
 			if (this.uuid_manager.LookupType(Type)?.name == "my-own-object@heinrich5991.de") {
 				_item = {
 					m_Test: data[0]
-				} as MyOwnObject;
+				} as SnapshotItemTypes.MyOwnObject;
 			} else if (this.uuid_manager.LookupType(Type)?.name == "character@netobj.ddnet.tw") {
 				_item = {
 					m_Flags: data[0],
@@ -147,21 +145,21 @@ export class Snapshot {
 					m_TargetY: data[9] ?? null,
 					id: id
 			
-				} as DDNetCharacter;
+				} as SnapshotItemTypes.DDNetCharacter;
 			} 
 			else if (this.uuid_manager.LookupType(Type)?.name == "player@netobj.ddnet.tw") {
 				_item = {
 					m_Flags: data[0],
 					m_AuthLevel: data[1],
 					id: id
-				} as DDNetPlayer
+				} as SnapshotItemTypes.DDNetPlayer
 			} 
 			else if (this.uuid_manager.LookupType(Type)?.name == "gameinfo@netobj.ddnet.tw") {
 				_item = {
 					m_Flags: data[0],
 					m_Version: data[1],
 					m_Flags2: data[2]
-				} as GameInfoEx
+				} as SnapshotItemTypes.GameInfoEx
 			} 
 			else if (this.uuid_manager.LookupType(Type)?.name == "projectile@netobj.ddnet.tw") {
 				_item = {
@@ -171,7 +169,7 @@ export class Snapshot {
 					m_Data: data[3],
 					m_Type: data[3],
 					m_StartTick: data[3]
-				} as DDNetProjectile
+				} as SnapshotItemTypes.DDNetProjectile
 			} 
 			else if (this.uuid_manager.LookupType(Type)?.name == "laser@netobj.ddnet.tw") {
 				_item = {
@@ -181,7 +179,7 @@ export class Snapshot {
 					m_FromY: data[3],
 					m_Owner: data[3],
 					m_Type: data[3]
-				} as DDNetLaser
+				} as SnapshotItemTypes.DDNetLaser
 			} 
 			return _item;
 		}
@@ -200,7 +198,7 @@ export class Snapshot {
 					wanted_weapon: data[7],
 					next_weapon: data[8],
 					prev_weapon: data[9],
-				} as PlayerInput
+				} as SnapshotItemTypes.PlayerInput
 				break;
 			case items.OBJ_PROJECTILE:
 				_item = {
@@ -210,7 +208,7 @@ export class Snapshot {
 					vel_y: data[3],
 					type_: data[4],
 					start_tick: data[5],
-				} as Projectile 
+				} as SnapshotItemTypes.Projectile 
 				break;
 			case items.OBJ_LASER:
 				_item = {
@@ -219,7 +217,7 @@ export class Snapshot {
 					from_x: data[2],
 					from_y: data[3],
 					start_tick: data[4],
-				} as Laser
+				} as SnapshotItemTypes.Laser
 				break;
 			case items.OBJ_PICKUP:
 				_item = {
@@ -227,14 +225,14 @@ export class Snapshot {
 					y: data[1],
 					type_: data[2],
 					subtype: data[3],
-				} as Pickup
+				} as SnapshotItemTypes.Pickup
 				break;
 			case items.OBJ_FLAG:
 				_item = {
 					x: data[0],
 					y: data[1],
 					team: data[2],
-				} as Flag
+				} as SnapshotItemTypes.Flag
 				break;
 			case items.OBJ_GAME_INFO:
 				_item = {
@@ -247,7 +245,7 @@ export class Snapshot {
 					round_num: data[6],
 					round_current: data[7],
 
-				} as GameInfo
+				} as SnapshotItemTypes.GameInfo
 				break; 
 			case items.OBJ_GAME_DATA:
 				_item = {
@@ -255,7 +253,7 @@ export class Snapshot {
 					teamscore_blue: data[1],
 					flag_carrier_red: data[2],
 					flag_carrier_blue: data[3],
-				} as GameData
+				} as SnapshotItemTypes.GameData
 				break;
 			case items.OBJ_CHARACTER_CORE:
 				_item = {
@@ -274,7 +272,7 @@ export class Snapshot {
 					hook_y: data[12],
 					hook_dx: data[13],
 					hook_dy: data[14],
-				} as CharacterCore
+				} as SnapshotItemTypes.CharacterCore
 				break;
 			case items.OBJ_CHARACTER:
 				_item = {
@@ -294,7 +292,7 @@ export class Snapshot {
 						hook_y: data[12],
 						hook_dx: data[13],
 						hook_dy: data[14],
-					} as CharacterCore,
+					} as SnapshotItemTypes.CharacterCore,
 					player_flags: data[15],
 					health: data[16],
 					armor: data[17],
@@ -304,7 +302,7 @@ export class Snapshot {
 					attack_tick: data[21],
 
 					client_id: id
-				} as Character
+				} as SnapshotItemTypes.Character
 				break;
 			case items.OBJ_PLAYER_INFO:
 				_item = {
@@ -313,7 +311,7 @@ export class Snapshot {
 					team: data[2],
 					score: data[3],
 					latency: data[4],
-				} as PlayerInfo
+				} as SnapshotItemTypes.PlayerInfo
 				break;
 			case items.OBJ_CLIENT_INFO:
 				_item = {
@@ -325,44 +323,44 @@ export class Snapshot {
 					color_body: Number(data.slice(15, 16)),
 					color_feet: Number(data.slice(16, 17)),
 					id: id
-				} as ClientInfo
+				} as SnapshotItemTypes.ClientInfo
 				break;
 			case items.OBJ_SPECTATOR_INFO:
 				_item = {
 					spectator_id: data[0],
 					x: data[1],
 					y: data[2],
-				} as SpectatorInfo
+				} as SnapshotItemTypes.SpectatorInfo
 				break;
 			case items.EVENT_COMMON:
 				_item = {
 					x: data[0],
 					y: data[1],
-				} as Common
+				} as SnapshotItemTypes.Common
 				break;
 			case items.EVENT_EXPLOSION:
 				_item = {
 					common: {
 						x: data[0],
 						y: data[1]
-					} as Common
-				} as Explosion
+					} as SnapshotItemTypes.Common
+				} as SnapshotItemTypes.Explosion
 				break;
 			case items.EVENT_SPAWN:
 				_item = {
 					common: {
 						x: data[0],
 						y: data[1]
-					} as Common
-				} as Spawn
+					} as SnapshotItemTypes.Common
+				} as SnapshotItemTypes.Spawn
 				break;
 			case items.EVENT_HAMMERHIT:
 				_item = {
 					common: {
 						x: data[0],
 						y: data[1]
-					} as Common
-				} as HammerHit
+					} as SnapshotItemTypes.Common
+				} as SnapshotItemTypes.HammerHit
 				break;
 			case items.EVENT_DEATH:
 				_item = {
@@ -370,26 +368,26 @@ export class Snapshot {
 					common: {
 						x: data[1],
 						y: data[2]
-					} as Common
-				} as Death
+					} as SnapshotItemTypes.Common
+				} as SnapshotItemTypes.Death
 				break;
 			case items.EVENT_SOUND_GLOBAL:
 				_item = {
 					common: {
 						x: data[0],
 						y: data[1]
-					} as Common,
+					} as SnapshotItemTypes.Common,
 					sound_id: data[2]
-				} as SoundGlobal
+				} as SnapshotItemTypes.SoundGlobal
 				break;
 			case items.EVENT_SOUND_WORLD:
 				_item = {
 					common: {
 						x: data[0],
 						y: data[1]
-					} as Common,
+					} as SnapshotItemTypes.Common,
 					sound_id: data[2]
-				} as SoundWorld
+				} as SnapshotItemTypes.SoundWorld
 				break;
 			case items.EVENT_DAMAGE_INDICATOR:
 				_item = {
@@ -397,8 +395,8 @@ export class Snapshot {
 					common: {
 						x: data[0],
 						y: data[1]
-					} as Common,
-				} as DamageInd
+					} as SnapshotItemTypes.Common,
+				} as SnapshotItemTypes.DamageInd
 				break;
 
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "teeworlds",
-	"version": "2.5.2",
+	"version": "2.5.4",
 	"description": "Library for (ingame) teeworlds bots.",
 	"license": "MIT",
 	"main": "index.js",

package/lib/snapshots.d.ts

@@ -1,233 +0,0 @@
-export declare 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,
-}
-
-export declare interface Projectile {
-    x: number,
-    y: number,
-    vel_x: number,
-    vel_y: number,
-    type_: number,
-    start_tick: number,
-}
-
-export declare interface Laser {
-    x: number,
-    y: number,
-    from_x: number,
-    from_y: number,
-    start_tick: number,
-}
-
-export declare interface Pickup {
-    x: number,
-    y: number,
-    type_: number,
-    subtype: number,
-}
-
-export declare interface Flag {
-    x: number,
-    y: number,
-    team: number,
-}
-
-export declare interface GameInfo {
-    game_flags: number,
-    game_state_flags: number,
-    round_start_tick: number,
-    warmup_timer: number,
-    score_limit: number,
-    time_limit: number,
-    round_num: number,
-    round_current: number,
-}
-
-export declare interface GameData {
-    teamscore_red: number,
-    teamscore_blue: number,
-    flag_carrier_red: number,
-    flag_carrier_blue: number,
-}
-
-export declare interface CharacterCore {
-    tick: number,
-    x: number,
-    y: number,
-    vel_x: number,
-    vel_y: number,
-    angle: number,
-    direction: number,
-    jumped: number,
-    hooked_player: number,
-    hook_state: number,
-    hook_tick: number,
-    hook_x: number,
-    hook_y: number,
-    hook_dx: number,
-    hook_dy: number,
-}
-
-export declare interface Character {
-    character_core: CharacterCore,
-    player_flags: number,
-    health: number,
-    armor: number,
-    ammo_count: number,
-    weapon: number,
-    emote: number,
-    attack_tick: number,
-
-    client_id: number
-}
-
-export declare interface PlayerInfo {
-    local: number,
-    client_id: number,
-    team: number,
-    score: number,
-    latency: number,
-}
-
-export declare interface ClientInfo {
-    name: string,
-    clan: string,
-    country: number,
-    skin: string,
-    use_custom_color: number,
-    color_body: number,
-    color_feet: number,
-
-    id: number
-}
-
-export declare interface SpectatorInfo {
-    spectator_id: number,
-    x: number,
-    y: number,
-}
-
-export declare interface Common {
-    x: number,
-    y: number,
-}
-
-export declare interface Explosion {
-    common: Common,
-}
-
-export declare interface Spawn {
-    common: Common,
-}
-
-export declare interface HammerHit {
-    common: Common,
-}
-
-export declare interface Death {
-    common: Common,
-    client_id: number,
-}
-
-export declare interface SoundGlobal {
-    common: Common,
-    sound_id: number,
-}
-
-export declare interface SoundWorld {
-    common: Common,
-    sound_id: number,
-}
-
-export declare interface DamageInd {
-    common: Common,
-    angle: number,
-}
-export declare enum items {
-	OBJ_EX,
-	OBJ_PLAYER_INPUT,
-	OBJ_PROJECTILE,
-	OBJ_LASER,
-	OBJ_PICKUP,
-	OBJ_FLAG,
-	OBJ_GAME_INFO,
-	OBJ_GAME_DATA,
-	OBJ_CHARACTER_CORE,
-	OBJ_CHARACTER,
-	OBJ_PLAYER_INFO,
-	OBJ_CLIENT_INFO,
-	OBJ_SPECTATOR_INFO,
-	EVENT_COMMON,
-	EVENT_EXPLOSION,
-	EVENT_SPAWN,
-	EVENT_HAMMERHIT,
-	EVENT_DEATH,
-	EVENT_SOUND_GLOBAL,
-	EVENT_SOUND_WORLD,
-	EVENT_DAMAGE_INDICATOR
-}
-
-export declare interface MyOwnObject {
-    m_Test: number
-}
-
-export declare interface DDNetCharacter {
-    m_Flags: number,
-    m_FreezeEnd: number,
-    m_Jumps: number,
-    m_TeleCheckpoint: number,
-    m_StrongWeakID: number,
-
-    // # New data fields for jump display, freeze bar and ninja bar
-    // # Default values indicate that these values should not be used
-    m_JumpedTotal?: number,
-    m_NinjaActivationTick?: number,
-    m_FreezeStart?: number,
-    // # New data fields for improved target accuracy
-    m_TargetX?: number,
-    m_TargetY?: number,
-    id: number
-} //, validate_size=False),
-/** m_AuthLevel "AUTHED_NO", "AUTHED_ADMIN" */
-export declare interface DDNetPlayer {
-    m_Flags: number,
-    m_AuthLevel: number,
-    id: number
-}
-
-export declare interface GameInfoEx {
-
-    m_Flags: number,
-    m_Version: number,
-    m_Flags2: number,
-}//, validate_size=False),
-
-// # The code assumes that this has the same in-memory representation as
-// # the Projectile net object.
-export declare interface DDNetProjectile {
-    m_X: number,
-    m_Y: number,
-    m_Angle: number,
-    m_Data: number,
-    m_Type: number,
-    m_StartTick: number,
-}
-
-export declare interface DDNetLaser {
-    m_ToX: number,
-    m_ToY: number,
-    m_FromX: number,
-    m_FromY: number,
-    m_StartTick: number,
-    m_Owner: number,
-    m_Type: number,
-}