cleaned IFurnitureItemData

This commit is contained in:
Dank074 2021-06-11 23:07:21 -05:00
parent 3f0062d3db
commit d0754d22c4
9 changed files with 78 additions and 78 deletions

View File

@ -17,12 +17,12 @@
this._type = k;
}
public get _Str_3882(): number
public get subType(): number
{
return this._subType;
}
public set _Str_3882(k: number)
public set subType(k: number)
{
this._subType = k;
}
@ -37,32 +37,32 @@
this._duration = k;
}
public get _Str_18572(): number
public get inactiveEffectsInInventory(): number
{
return this._inactiveEffectsInInventory;
}
public set _Str_18572(k: number)
public set inactiveEffectsInInventory(k: number)
{
this._inactiveEffectsInInventory = k;
}
public get _Str_12185(): number
public get secondsLeftIfActive(): number
{
return this._secondsLeftIfActive;
}
public set _Str_12185(k: number)
public set secondsLeftIfActive(k: number)
{
this._secondsLeftIfActive = k;
}
public get _Str_4010(): boolean
public get isPermanent(): boolean
{
return this._permanent;
}
public set _Str_4010(k: boolean)
public set isPermanent(k: boolean)
{
this._permanent = k;
}

View File

@ -15,14 +15,14 @@ export interface IFurnitureItemData
secondsToExpiration: number;
flatId: number;
slotId: string;
_Str_3951: number;
_Str_2794: number;
songId: number;
extra: number;
rentable: boolean;
isWallItem: boolean;
hasRentPeriodStarted: boolean;
_Str_10616: number;
_Str_8932: number;
_Str_9050: number;
_Str_9408: number;
_Str_19297: boolean;
}
expirationTimeStamp: number;
creationDay: number;
creationMonth: number;
creationYear: number;
isExternalImageFurni: boolean;
}

View File

@ -4,9 +4,9 @@ import { IObjectData } from '../../../../../room/object/data/IObjectData';
import { FurnitureDataParser } from '../../../parser/room/furniture/FurnitureDataParser';
import { IFurnitureItemData } from '../furni/IFurnitureItemData';
export class TradingListItem implements IFurnitureItemData
export class ItemDataStructure implements IFurnitureItemData
{
private _Str_5390: number;
private _expirationTimeStamp: number;
private _isWallItem: boolean;
private _itemId: number;
private _furniType: string;
@ -14,13 +14,13 @@ export class TradingListItem implements IFurnitureItemData
private _spriteId: number;
private _category: number;
private _stuffData: IObjectData;
private _Str_3182: number;
private _extra: number;
private _secondsToExpiration: number;
private _Str_9291: number;
private _Str_8744: number;
private _Str_9700: number;
private _creationDay: number;
private _creationMonth: number;
private _creationYear: number;
private _isGroupable: boolean;
private _Str_2808: number;
private _songId: number;
private _flatId: number;
private _rentable: boolean;
private _hasRentPeriodStarted: boolean;
@ -35,12 +35,12 @@ export class TradingListItem implements IFurnitureItemData
this._isGroupable = wrapper.readBoolean();
this._stuffData = FurnitureDataParser.parseObjectData(wrapper);
this._secondsToExpiration = -1;
this._Str_5390 = Nitro.instance.time;
this._expirationTimeStamp = Nitro.instance.time;
this._hasRentPeriodStarted = false;
this._Str_9291 = wrapper.readInt();
this._Str_8744 = wrapper.readInt();
this._Str_9700 = wrapper.readInt();
this._Str_3182 = ((this.furniType === 'S') ? wrapper.readInt() : -1);
this._creationDay = wrapper.readInt();
this._creationMonth = wrapper.readInt();
this._creationYear = wrapper.readInt();
this._extra = ((this.furniType === 'S') ? wrapper.readInt() : -1);
this._flatId = -1;
this._rentable = false;
this._isWallItem = (this._furniType === 'I');
@ -76,9 +76,9 @@ export class TradingListItem implements IFurnitureItemData
return this._stuffData;
}
public get _Str_2794(): number
public get extra(): number
{
return this._Str_3182;
return this._extra;
}
public get secondsToExpiration(): number
@ -86,19 +86,19 @@ export class TradingListItem implements IFurnitureItemData
return this._secondsToExpiration;
}
public get _Str_8932(): number
public get creationDay(): number
{
return this._Str_9291;
return this._creationDay;
}
public get _Str_9050(): number
public get creationMonth(): number
{
return this._Str_8744;
return this._creationMonth;
}
public get _Str_9408(): number
public get creationYear(): number
{
return this._Str_9700;
return this._creationYear;
}
public get isGroupable(): boolean
@ -106,9 +106,9 @@ export class TradingListItem implements IFurnitureItemData
return this._isGroupable;
}
public get _Str_3951(): number
public get songId(): number
{
return this._Str_3182;
return this._extra;
}
public get flatId(): number
@ -131,9 +131,9 @@ export class TradingListItem implements IFurnitureItemData
return this._hasRentPeriodStarted;
}
public get _Str_10616(): number
public get expirationTimeStamp(): number
{
return this._Str_5390;
return this._expirationTimeStamp;
}
public get isRecycleable(): boolean
@ -156,7 +156,7 @@ export class TradingListItem implements IFurnitureItemData
return null;
}
public get _Str_19297(): boolean
public get isExternalImageFurni(): boolean
{
return (this._furniType.indexOf('external_image') !== -1);
}

View File

@ -1,7 +1,7 @@
import { IMessageEvent } from '../../../../../../core/communication/messages/IMessageEvent';
import { MessageEvent } from '../../../../../../core/communication/messages/MessageEvent';
import { TradingListItemParser } from '../../../parser/inventory/trading/TradingListItemParser';
import { TradingListItem } from './TradingListItem';
import { ItemDataStructure } from './ItemDataStructure';
export class TradingListItemEvent extends MessageEvent implements IMessageEvent
{
@ -40,12 +40,12 @@ export class TradingListItemEvent extends MessageEvent implements IMessageEvent
return this.getParser()._Str_9138;
}
public get _Str_17841(): TradingListItem[]
public get _Str_17841(): ItemDataStructure[]
{
return this.getParser()._Str_17841;
}
public get _Str_17465(): TradingListItem[]
public get _Str_17465(): ItemDataStructure[]
{
return this.getParser()._Str_17465;
}
@ -54,4 +54,4 @@ export class TradingListItemEvent extends MessageEvent implements IMessageEvent
{
return this.parser as TradingListItemParser;
}
}
}

View File

@ -1,8 +1,8 @@
export * from './ItemDataStructure';
export * from './TradingAcceptEvent';
export * from './TradingCloseEvent';
export * from './TradingCompletedEvent';
export * from './TradingConfirmationEvent';
export * from './TradingListItem';
export * from './TradingListItemEvent';
export * from './TradingNotOpenEvent';
export * from './TradingOpenEvent';

View File

@ -35,7 +35,7 @@ export class AvatarEffectAddedParser implements IMessageParser
return this._type;
}
public get _Str_3882(): number
public get subType(): number
{
return this._subType;
}
@ -45,7 +45,7 @@ export class AvatarEffectAddedParser implements IMessageParser
return this._duration;
}
public get _Str_4010(): boolean
public get isPermanent(): boolean
{
return this._permanent;
}

View File

@ -24,11 +24,11 @@ export class AvatarEffectsParser implements IMessageParser
const effect = new AvatarEffect();
effect.type = wrapper.readInt();
effect._Str_3882 = wrapper.readInt();
effect.subType = wrapper.readInt();
effect.duration = wrapper.readInt();
effect._Str_18572 = wrapper.readInt();
effect._Str_12185 = wrapper.readInt();
effect._Str_4010 = wrapper.readBoolean();
effect.inactiveEffectsInInventory = wrapper.readInt();
effect.secondsLeftIfActive = wrapper.readInt();
effect.isPermanent = wrapper.readBoolean();
this._effects.push(effect);

View File

@ -21,13 +21,13 @@ export class FurnitureListItemParser implements IFurnitureItemData
private _tradable: boolean;
private _sellable: boolean;
private _secondsToExpiration: number;
private _Str_3182: number;
private _extra: number;
private _flatId: number;
private _isWallItem: boolean;
private _hasRentPeriodStarted: boolean;
private _Str_5390: number;
private _expirationTimeStamp: number;
private _slotId: string;
private _Str_2808: number;
private _songId: number;
constructor(wrapper: IMessageDataWrapper)
{
@ -51,13 +51,13 @@ export class FurnitureListItemParser implements IFurnitureItemData
this._tradable = false;
this._sellable = false;
this._secondsToExpiration = 0;
this._Str_3182 = 0;
this._extra = 0;
this._flatId = 0;
this._isWallItem = false;
this._hasRentPeriodStarted = false;
this._Str_5390 = 0;
this._expirationTimeStamp = 0;
this._slotId = '';
this._Str_2808 = -1;
this._songId = -1;
return true;
}
@ -77,7 +77,7 @@ export class FurnitureListItemParser implements IFurnitureItemData
this._isGroupable = wrapper.readBoolean();
this._sellable = wrapper.readBoolean();
this._secondsToExpiration = wrapper.readInt();
this._Str_5390 = Nitro.instance.time;
this._expirationTimeStamp = Nitro.instance.time;
if(this.secondsToExpiration > -1)
{
@ -96,7 +96,7 @@ export class FurnitureListItemParser implements IFurnitureItemData
if(this._furniType === FurnitureListItemParser.FLOOR_ITEM)
{
this._slotId = wrapper.readString();
this._Str_3182 = wrapper.readInt();
this._extra = wrapper.readInt();
}
return true;
@ -167,14 +167,14 @@ export class FurnitureListItemParser implements IFurnitureItemData
return this._slotId;
}
public get _Str_3951(): number
public get songId(): number
{
return this._Str_2808;
return this._songId;
}
public get _Str_2794(): number
public get extra(): number
{
return this._Str_3182;
return this._extra;
}
public get rentable(): boolean
@ -192,27 +192,27 @@ export class FurnitureListItemParser implements IFurnitureItemData
return this._hasRentPeriodStarted;
}
public get _Str_10616(): number
public get expirationTimeStamp(): number
{
return this._Str_5390;
return this._expirationTimeStamp;
}
public get _Str_8932(): number
public get creationDay(): number
{
return 0;
}
public get _Str_9050(): number
public get creationMonth(): number
{
return 0;
}
public get _Str_9408(): number
public get creationYear(): number
{
return 0;
}
public get _Str_19297(): boolean
public get isExternalImageFurni(): boolean
{
return !(this._furniType.indexOf('external_image') === -1);
}

View File

@ -1,15 +1,15 @@
import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper';
import { IMessageParser } from '../../../../../../core/communication/messages/IMessageParser';
import { TradingListItem } from '../../../incoming/inventory/trading/TradingListItem';
import { ItemDataStructure } from '../../../incoming/inventory/trading/ItemDataStructure';
export class TradingListItemParser implements IMessageParser
{
private _firstUserID: number;
private _firstUserItemArray: TradingListItem[];
private _firstUserItemArray: ItemDataStructure[];
private _firstUserNumItems: number;
private _firstUserNumCredits: number;
private _secondUserID: number;
private _secondUserItemArray: TradingListItem[];
private _secondUserItemArray: ItemDataStructure[];
private _secondUserNumItems: number;
private _secondUserNumCredits: number;
@ -50,13 +50,13 @@ export class TradingListItemParser implements IMessageParser
return true;
}
private parseItems(k: IMessageDataWrapper, itemArray: TradingListItem[]): boolean
private parseItems(k: IMessageDataWrapper, itemArray: ItemDataStructure[]): boolean
{
let count = k.readInt();
while(count > 0)
{
itemArray.push(new TradingListItem(k));
itemArray.push(new ItemDataStructure(k));
count--;
}
@ -69,7 +69,7 @@ export class TradingListItemParser implements IMessageParser
return this._firstUserID;
}
public get _Str_17841(): TradingListItem[]
public get _Str_17841(): ItemDataStructure[]
{
return this._firstUserItemArray;
}
@ -89,7 +89,7 @@ export class TradingListItemParser implements IMessageParser
return this._secondUserID;
}
public get _Str_17465(): TradingListItem[]
public get _Str_17465(): ItemDataStructure[]
{
return this._secondUserItemArray;
}
@ -103,4 +103,4 @@ export class TradingListItemParser implements IMessageParser
{
return this._secondUserNumCredits;
}
}
}