diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreateOfferComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreateOfferComposer.ts index d4ad510..5bbd2ef 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreateOfferComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreateOfferComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminCreateOfferComposer implements IMessageComposer; - constructor(pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number) + constructor(pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number, catalogMode: string = 'NORMAL') { - this._data = [ pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber ]; + this._data = [ pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreatePageComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreatePageComposer.ts index 0fb00cf..e876c30 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreatePageComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminCreatePageComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminCreatePageComposer implements IMessageComposer; - constructor(caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number) + constructor(caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number, targetCatalogType: string, catalogMode: string = 'NORMAL') { - this._data = [ caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId ]; + this._data = [ caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId, targetCatalogType, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeleteOfferComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeleteOfferComposer.ts index aee2872..efe7dba 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeleteOfferComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeleteOfferComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminDeleteOfferComposer implements IMessageComposer; - constructor(offerId: number) + constructor(offerId: number, catalogMode: string = 'NORMAL') { - this._data = [ offerId ]; + this._data = [ offerId, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeletePageComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeletePageComposer.ts index cce2813..c32e15b 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeletePageComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminDeletePageComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminDeletePageComposer implements IMessageComposer; - constructor(pageId: number) + constructor(pageId: number, catalogMode: string = 'NORMAL') { - this._data = [ pageId ]; + this._data = [ pageId, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminMoveOfferComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminMoveOfferComposer.ts index 6bcb847..f58618e 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminMoveOfferComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminMoveOfferComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminMoveOfferComposer implements IMessageComposer; - constructor(offerId: number, orderNumber: number) + constructor(offerId: number, orderNumber: number, catalogMode: string = 'NORMAL') { - this._data = [ offerId, orderNumber ]; + this._data = [ offerId, orderNumber, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminMovePageComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminMovePageComposer.ts index 8aa546f..82deb59 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminMovePageComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminMovePageComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminMovePageComposer implements IMessageComposer; - constructor(pageId: number, newParentId: number, newIndex: number) + constructor(pageId: number, newParentId: number, newIndex: number, catalogMode: string = 'NORMAL') { - this._data = [ pageId, newParentId, newIndex ]; + this._data = [ pageId, newParentId, newIndex, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminSaveOfferComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminSaveOfferComposer.ts index af08001..7b399a9 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminSaveOfferComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminSaveOfferComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminSaveOfferComposer implements IMessageComposer; - constructor(offerId: number, pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number) + constructor(offerId: number, pageId: number, itemId: number, catalogName: string, costCredits: number, costPoints: number, pointsType: number, amount: number, clubOnly: number, extradata: string, haveOffer: boolean, offerIdGroup: number, limitedStack: number, orderNumber: number, catalogMode: string = 'NORMAL') { - this._data = [ offerId, pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber ]; + this._data = [ offerId, pageId, itemId, catalogName, costCredits, costPoints, pointsType, amount, clubOnly, extradata, haveOffer, offerIdGroup, limitedStack, orderNumber, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/outgoing/catalog/CatalogAdminSavePageComposer.ts b/packages/communication/src/messages/outgoing/catalog/CatalogAdminSavePageComposer.ts index 8b231fa..4147028 100644 --- a/packages/communication/src/messages/outgoing/catalog/CatalogAdminSavePageComposer.ts +++ b/packages/communication/src/messages/outgoing/catalog/CatalogAdminSavePageComposer.ts @@ -4,9 +4,9 @@ export class CatalogAdminSavePageComposer implements IMessageComposer; - constructor(pageId: number, caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number, headline: string, teaser: string, textDetails: string) + constructor(pageId: number, caption: string, caption2: string, layout: string, iconType: number, minRank: number, visible: boolean, enabled: boolean, orderNum: number, parentId: number, headline: string, teaser: string, textDetails: string, targetCatalogType: string, catalogMode: string = 'NORMAL') { - this._data = [ pageId, caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId, headline, teaser, textDetails ]; + this._data = [ pageId, caption, caption2, layout, iconType, minRank, visible, enabled, orderNum, parentId, headline, teaser, textDetails, targetCatalogType, catalogMode ]; } dispose(): void diff --git a/packages/communication/src/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts b/packages/communication/src/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts index a4a64dd..536b700 100644 --- a/packages/communication/src/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts +++ b/packages/communication/src/messages/parser/catalog/BuildersClubSubscriptionStatusMessageParser.ts @@ -6,6 +6,8 @@ export class BuildersClubSubscriptionStatusMessageParser implements IMessagePars private _furniLimit: number; private _maxFurniLimit: number; private _secondsLeftWithGrace: number; + private _placementBlockedByVisitors: boolean; + private _placementAllowedInCurrentRoom: boolean; public flush(): boolean { @@ -13,6 +15,8 @@ export class BuildersClubSubscriptionStatusMessageParser implements IMessagePars this._furniLimit = 0; this._maxFurniLimit = 0; this._secondsLeftWithGrace = 0; + this._placementBlockedByVisitors = false; + this._placementAllowedInCurrentRoom = false; return true; } @@ -28,6 +32,12 @@ export class BuildersClubSubscriptionStatusMessageParser implements IMessagePars if(wrapper.bytesAvailable) this._secondsLeftWithGrace = wrapper.readInt(); else this._secondsLeftWithGrace = this._secondsLeft; + if(wrapper.bytesAvailable) this._placementBlockedByVisitors = wrapper.readBoolean(); + else this._placementBlockedByVisitors = false; + + if(wrapper.bytesAvailable) this._placementAllowedInCurrentRoom = wrapper.readBoolean(); + else this._placementAllowedInCurrentRoom = false; + return true; } @@ -50,4 +60,14 @@ export class BuildersClubSubscriptionStatusMessageParser implements IMessagePars { return this._secondsLeftWithGrace; } + + public get placementBlockedByVisitors(): boolean + { + return this._placementBlockedByVisitors; + } + + public get placementAllowedInCurrentRoom(): boolean + { + return this._placementAllowedInCurrentRoom; + } } diff --git a/packages/communication/src/messages/parser/catalog/HabboClubOffersMessageParser.ts b/packages/communication/src/messages/parser/catalog/HabboClubOffersMessageParser.ts index c87ea4f..e5903aa 100644 --- a/packages/communication/src/messages/parser/catalog/HabboClubOffersMessageParser.ts +++ b/packages/communication/src/messages/parser/catalog/HabboClubOffersMessageParser.ts @@ -4,10 +4,12 @@ import { ClubOfferData } from './ClubOfferData'; export class HabboClubOffersMessageParser implements IMessageParser { private _offers: ClubOfferData[]; + private _windowId = 1; public flush(): boolean { this._offers = []; + this._windowId = 1; return true; } @@ -25,6 +27,8 @@ export class HabboClubOffersMessageParser implements IMessageParser totalOffers--; } + if(wrapper.bytesAvailable) this._windowId = wrapper.readInt(); + return true; } @@ -32,4 +36,9 @@ export class HabboClubOffersMessageParser implements IMessageParser { return this._offers; } + + public get windowId(): number + { + return this._windowId; + } }