diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts index 4cbde107..610b0a37 100644 --- a/src/nitro/communication/messages/incoming/index.ts +++ b/src/nitro/communication/messages/incoming/index.ts @@ -4,6 +4,7 @@ export * from './avatar'; export * from './bots'; export * from './callforhelp'; export * from './camera'; +export * from './campaign'; export * from './catalog'; export * from './client'; export * from './desktop'; diff --git a/src/nitro/communication/messages/parser/campaign/CampaignCalendarData.ts b/src/nitro/communication/messages/parser/campaign/CampaignCalendarData.ts index a7fb5f94..8a4b9183 100644 --- a/src/nitro/communication/messages/parser/campaign/CampaignCalendarData.ts +++ b/src/nitro/communication/messages/parser/campaign/CampaignCalendarData.ts @@ -21,22 +21,18 @@ export class CampaignCalendarData let count = wrapper.readInt(); - while(count > 0) + for(let i = 0; i < count; i++) { this._openedDays.push(wrapper.readInt()); - - count--; } this._missedDays = []; count = wrapper.readInt(); - while(count > 0) + for(let i = 0; i < count; i++) { this._missedDays.push(wrapper.readInt()); - - count--; } return true; @@ -46,72 +42,72 @@ export class CampaignCalendarData { const data = new CampaignCalendarData(); - data._Str_8399 = this._campaignDays; - data._Str_19589 = this._campaignImage; - data._Str_11123 = this._campaignName; - data._Str_5472 = this._currentDay; - data._Str_14267 = this._missedDays; - data._Str_10724 = this._openedDays; + data.campaignDays = this._campaignDays; + data.campaignImage = this._campaignImage; + data.campaignData = this._campaignName; + data.currentDay = this._currentDay; + data.missedDays = this._missedDays; + data.openedDays = this._openedDays; return data; } - public get _Str_11123(): string + public get campaignData(): string { return this._campaignName; } - public set _Str_11123(name: string) + public set campaignData(name: string) { this._campaignName = name; } - public get _Str_19589(): string + public get campaignImage(): string { return this._campaignImage; } - public set _Str_19589(image: string) + public set campaignImage(image: string) { this._campaignImage = image; } - public get _Str_5472(): number + public get currentDay(): number { return this._currentDay; } - public set _Str_5472(day: number) + public set currentDay(day: number) { this._currentDay = day; } - public get _Str_8399(): number + public get campaignDays(): number { return this._campaignDays; } - public set _Str_8399(days: number) + public set campaignDays(days: number) { this._campaignDays = days; } - public get _Str_10724(): number[] + public get openedDays(): number[] { return this._openedDays; } - public set _Str_10724(days: number[]) + public set openedDays(days: number[]) { this._openedDays = days; } - public get _Str_14267(): number[] + public get missedDays(): number[] { return this._missedDays; } - public set _Str_14267(days: number[]) + public set missedDays(days: number[]) { this._missedDays = days; } diff --git a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts index 3bfce039..a590bc2d 100644 --- a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts +++ b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDataMessageParser.ts @@ -17,6 +17,7 @@ export class CampaignCalendarDataMessageParser implements IMessageParser { if(!wrapper) return false; + this._calendarData = new CampaignCalendarData(); this._calendarData.parse(wrapper); return true; diff --git a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts index 3bf902dc..0e9ff0d0 100644 --- a/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts +++ b/src/nitro/communication/messages/parser/campaign/CampaignCalendarDoorOpenedMessageParser.ts @@ -3,17 +3,17 @@ import { IMessageParser } from './../../../../../core'; export class CampaignCalendarDoorOpenedMessageParser implements IMessageParser { - private _Str_17229: boolean; + private _doorOpened: boolean; private _productName: string; private _customImage: string; - private _Str_6002: string; + private _furnitureClassName: string; public flush(): boolean { - this._Str_17229 = false; + this._doorOpened = false; this._productName = null; this._customImage = null; - this._Str_6002 = null; + this._furnitureClassName = null; return true; } @@ -22,17 +22,17 @@ export class CampaignCalendarDoorOpenedMessageParser implements IMessageParser { if(!wrapper) return false; - this._Str_17229 = wrapper.readBoolean(); + this._doorOpened = wrapper.readBoolean(); this._productName = wrapper.readString(); this._customImage = wrapper.readString(); - this._Str_6002 = wrapper.readString(); + this._furnitureClassName = wrapper.readString(); return true; } - public get _Str_22341(): boolean + public get doorOpened(): boolean { - return this._Str_17229; + return this._doorOpened; } public get productName(): string @@ -45,8 +45,8 @@ export class CampaignCalendarDoorOpenedMessageParser implements IMessageParser return this._customImage; } - public get _Str_8979(): string + public get furnitureClassName(): string { - return this._Str_6002; + return this._furnitureClassName; } }