This commit is contained in:
kookroach
2021-04-04 21:29:34 +02:00
parent 91353bdcf0
commit bce480aad5
4 changed files with 9 additions and 6 deletions

View File

@@ -194,13 +194,12 @@ class RageObject extends RageEntity implements IObject {
public object: ObjectMp; public object: ObjectMp;
public __attachmentData: object; public __attachmentData: object;
constructor(object: ObjectMp, attachmentData: object) { constructor(object: ObjectMp) {
if (!object) { if (!object) {
throw "Object is undefined" throw "Object is undefined"
} }
super(object); super(object);
this.object = object; this.object = object;
this.__attachmentData = attachmentData;
} }
} }

View File

@@ -81,7 +81,7 @@ interface IEntityPool<TEntity> {
} }
interface IObjectPool extends IEntityPool<IObject> { interface IObjectPool extends IEntityPool<IObject> {
setData(entity: ObjectMp, attachmentData: object): void; setData(entity: ObjectMp): void;
} }
interface IPlayerPool extends IEntityPool<IPlayer> { interface IPlayerPool extends IEntityPool<IPlayer> {

View File

@@ -340,6 +340,8 @@ interface EntityMp {
setVisible(toggle: boolean, p1: boolean): void; setVisible(toggle: boolean, p1: boolean): void;
stopAnim(animation: string, animGroup: string, p2: number): void; stopAnim(animation: string, animGroup: string, p2: number): void;
stopSynchronizedAnim(p0: number, p1: boolean): boolean; stopSynchronizedAnim(p0: number, p1: boolean): boolean;
__attachments: any;
__attachmentObjects: any;
} }
interface CheckpointMp extends EntityMp { interface CheckpointMp extends EntityMp {
@@ -386,6 +388,7 @@ interface ObjectMp extends EntityMp {
p7: number, p8: number, p9: number, buoyancy: number): void; p7: number, p8: number, p9: number, buoyancy: number): void;
setTargettable(targettable: boolean): void; setTargettable(targettable: boolean): void;
slide(toX: number, toY: number, toZ: number, speedX: number, speedY: number, speedZ: number, collision: boolean): boolean; slide(toX: number, toY: number, toZ: number, speedX: number, speedY: number, speedZ: number, collision: boolean): boolean;
__attMgrData: any;
} }
interface PedBaseMp extends EntityMp { interface PedBaseMp extends EntityMp {

View File

@@ -1,6 +1,5 @@
import { IGame, IEntity } from "../game"; import { IGame, IEntity } from "../game";
var attachId = 0;
export default function attachmentManager(game: IGame) { export default function attachmentManager(game: IGame) {
mp.events.add("SERVER:LoadAttachments", () => { mp.events.add("SERVER:LoadAttachments", () => {
@@ -12,6 +11,8 @@ export default function attachmentManager(game: IGame) {
attachmentMngr.register("weapondeal2", "w_sg_pumpshotgun", "weapondeal2w_sg_pumpshotgun", new mp.Vector3(0.4, 1.6, 0.62), new mp.Vector3(90, 0, 180)); attachmentMngr.register("weapondeal2", "w_sg_pumpshotgun", "weapondeal2w_sg_pumpshotgun", new mp.Vector3(0.4, 1.6, 0.62), new mp.Vector3(90, 0, 180));
}); });
const attachmentMngr = const attachmentMngr =
{ {
attachments: {}, attachments: {},