From 00c571ea863a2ebf8ae2d79f4bafc60034545049 Mon Sep 17 00:00:00 2001 From: Dank074 Date: Fri, 11 Jun 2021 23:41:44 -0500 Subject: [PATCH] cleaned trading parsers --- .../inventory/trading/TradingAcceptEvent.ts | 10 +++--- .../inventory/trading/TradingCloseEvent.ts | 6 ++-- .../inventory/trading/TradingListItemEvent.ts | 32 +++++++++---------- .../inventory/trading/TradingOpenEvent.ts | 18 +++++------ .../inventory/trading/TradingAcceptParser.ts | 6 ++-- .../inventory/trading/TradingCloseParser.ts | 6 ++-- .../trading/TradingListItemParser.ts | 16 +++++----- .../trading/TradingOpenFailedParser.ts | 14 ++++---- .../inventory/trading/TradingOpenParser.ts | 10 +++--- 9 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts index bc9e636a..3a471864 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts @@ -9,18 +9,18 @@ export class TradingAcceptEvent extends MessageEvent implements IMessageEvent super(callBack, TradingAcceptParser); } - public get _Str_4963(): number + public get userID(): number { - return this.getParser()._Str_4963; + return this.getParser().userID; } - public get _Str_15794(): boolean + public get userAccepts(): boolean { - return this.getParser()._Str_15794; + return this.getParser().userAccepts; } public getParser(): TradingAcceptParser { return this.parser as TradingAcceptParser; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts index e0957081..4747ddf5 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts @@ -9,13 +9,13 @@ export class TradingCloseEvent extends MessageEvent implements IMessageEvent super(callBack, TradingCloseParser); } - public get _Str_4963(): number + public get userID(): number { - return this.getParser()._Str_4963; + return this.getParser().userID; } public getParser(): TradingCloseParser { return this.parser as TradingCloseParser; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts index 18500575..38638f45 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts @@ -10,44 +10,44 @@ export class TradingListItemEvent extends MessageEvent implements IMessageEvent super(callBack, TradingListItemParser); } - public get _Str_15162(): number + public get firstUserID(): number { - return this.getParser()._Str_15162; + return this.getParser().firstUserID; } - public get _Str_18215(): number + public get secondUserID(): number { - return this.getParser()._Str_18215; + return this.getParser().secondUserID; } - public get _Str_14946(): number + public get firstUserNumItems(): number { - return this.getParser()._Str_14946; + return this.getParser().firstUserNumItems; } - public get _Str_13801(): number + public get secondUserNumItems(): number { - return this.getParser()._Str_13801; + return this.getParser().secondUserNumItems; } - public get _Str_15709(): number + public get firstUserNumCredits(): number { - return this.getParser()._Str_15709; + return this.getParser().firstUserNumCredits; } - public get _Str_9138(): number + public get secondUserNumCredits(): number { - return this.getParser()._Str_9138; + return this.getParser().secondUserNumCredits; } - public get _Str_17841(): ItemDataStructure[] + public get firstUserItemArray(): ItemDataStructure[] { - return this.getParser()._Str_17841; + return this.getParser().firstUserItemArray; } - public get _Str_17465(): ItemDataStructure[] + public get secondUserItemArray(): ItemDataStructure[] { - return this.getParser()._Str_17465; + return this.getParser().secondUserItemArray; } public getParser(): TradingListItemParser diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts index 2ed9243c..bf387f6d 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts @@ -9,28 +9,28 @@ export class TradingOpenEvent extends MessageEvent implements IMessageEvent super(callBack, TradingOpenParser); } - public get _Str_4963(): number + public get userID(): number { - return this.getParser()._Str_4963; + return this.getParser().userID; } - public get _Str_16764(): boolean + public get userCanTrade(): boolean { - return this.getParser()._Str_16764; + return this.getParser().userCanTrade; } - public get _Str_17613(): number + public get otherUserID(): number { - return this.getParser()._Str_17613; + return this.getParser().otherUserID; } - public get _Str_13374(): boolean + public get otherUserCanTrade(): boolean { - return this.getParser()._Str_13374; + return this.getParser().otherUserCanTrade; } public getParser(): TradingOpenParser { return this.parser as TradingOpenParser; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/parser/inventory/trading/TradingAcceptParser.ts b/src/nitro/communication/messages/parser/inventory/trading/TradingAcceptParser.ts index bbd24e58..9d59b4f0 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/TradingAcceptParser.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/TradingAcceptParser.ts @@ -24,13 +24,13 @@ export class TradingAcceptParser implements IMessageParser return true; } - public get _Str_4963(): number + public get userID(): number { return this._userID; } - public get _Str_15794(): boolean + public get userAccepts(): boolean { return this._userAccepts; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/parser/inventory/trading/TradingCloseParser.ts b/src/nitro/communication/messages/parser/inventory/trading/TradingCloseParser.ts index 7ca2c836..0ff562f0 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/TradingCloseParser.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/TradingCloseParser.ts @@ -3,7 +3,7 @@ import { IMessageParser } from '../../../../../../core/communication/messages/IM export class TradingCloseParser implements IMessageParser { - public static _Str_16410: number = 1; + public static ERROR_WHILE_COMMIT: number = 1; private _userId: number; private _reason: number; @@ -23,7 +23,7 @@ export class TradingCloseParser implements IMessageParser return true; } - public get _Str_4963(): number + public get userID(): number { return this._userId; } @@ -32,4 +32,4 @@ export class TradingCloseParser implements IMessageParser { return this._reason; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts b/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts index a8ce6554..c0a54b4f 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/TradingListItemParser.ts @@ -64,42 +64,42 @@ export class TradingListItemParser implements IMessageParser return true; } - public get _Str_15162(): number + public get firstUserID(): number { return this._firstUserID; } - public get _Str_17841(): ItemDataStructure[] + public get firstUserItemArray(): ItemDataStructure[] { return this._firstUserItemArray; } - public get _Str_14946(): number + public get firstUserNumItems(): number { return this._firstUserNumItems; } - public get _Str_15709(): number + public get firstUserNumCredits(): number { return this._firstUserNumCredits; } - public get _Str_18215(): number + public get secondUserID(): number { return this._secondUserID; } - public get _Str_17465(): ItemDataStructure[] + public get secondUserItemArray(): ItemDataStructure[] { return this._secondUserItemArray; } - public get _Str_13801(): number + public get secondUserNumItems(): number { return this._secondUserNumItems; } - public get _Str_9138(): number + public get secondUserNumCredits(): number { return this._secondUserNumCredits; } diff --git a/src/nitro/communication/messages/parser/inventory/trading/TradingOpenFailedParser.ts b/src/nitro/communication/messages/parser/inventory/trading/TradingOpenFailedParser.ts index 2f9950a8..7fe0cd86 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/TradingOpenFailedParser.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/TradingOpenFailedParser.ts @@ -3,11 +3,11 @@ import { IMessageParser } from '../../../../../../core/communication/messages/IM export class TradingOpenFailedParser implements IMessageParser { - public static _Str_18150: number = 7; - public static _Str_18383: number = 8; + public static REASON_YOU_ARE_ALREADY_TRADING: number = 7; + public static REASON_OTHER_USER_ALREADY_TRADING: number = 8; private _reason: number; - private _Str_10068: string; + private _otherUserName: string; public flush(): boolean { @@ -19,7 +19,7 @@ export class TradingOpenFailedParser implements IMessageParser if(!wrapper) return false; this._reason = wrapper.readInt(); - this._Str_10068 = wrapper.readString(); + this._otherUserName = wrapper.readString(); return true; } @@ -29,8 +29,8 @@ export class TradingOpenFailedParser implements IMessageParser return this._reason; } - public get _Str_17035(): string + public get otherUserName(): string { - return this._Str_10068; + return this._otherUserName; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/parser/inventory/trading/TradingOpenParser.ts b/src/nitro/communication/messages/parser/inventory/trading/TradingOpenParser.ts index 37b318d3..441b9ae4 100644 --- a/src/nitro/communication/messages/parser/inventory/trading/TradingOpenParser.ts +++ b/src/nitro/communication/messages/parser/inventory/trading/TradingOpenParser.ts @@ -30,23 +30,23 @@ export class TradingOpenParser implements IMessageParser return true; } - public get _Str_4963(): number + public get userID(): number { return this._userId; } - public get _Str_16764(): boolean + public get userCanTrade(): boolean { return this._userCanTrade; } - public get _Str_17613(): number + public get otherUserID(): number { return this._otherUserId; } - public get _Str_13374(): boolean + public get otherUserCanTrade(): boolean { return this._otherUserCanTrade; } -} \ No newline at end of file +}