Removed simplify helper functions

CCDirectLink · Jun 4, 2019 · b749ba5 · b749ba5
1 parent 9799f7f
commit b749ba5
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/assets/package.json b/assets/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "multiplayer",
 	"main": "mod.js",
-	"version": "0.0.4",
+	"version": "0.0.7",
 	"dependencies": {
 		"ccloader": "^2.0.0",
 		"crosscode": "^1.0.0"

diff --git a/src/@types/crosscode/fixes.d.ts b/src/@types/crosscode/fixes.d.ts
@@ -28,6 +28,8 @@ declare namespace ig {
         multiplayerId?: number;
         face: Vector2;
         currentAnim: string;
+        currentState: string;
+        animState: ig.AnimationState;
     }
 
     interface Gui {

diff --git a/src/listeners/connection/onKillEntity.ts b/src/listeners/connection/onKillEntity.ts
@@ -14,7 +14,7 @@ export class OnKillEntityListener {
             return;
         }
 
-        simplify.killEntity(this.main.entities[id]);
+        this.main.entities[id].kill();
         delete this.main.entities[id];
     }
 }
diff --git a/src/listeners/connection/onSetHost.ts b/src/listeners/connection/onSetHost.ts
@@ -53,7 +53,7 @@ export class OnSetHostListener {
             set(value: ig.Vector2) { face = value; },
         });
 
-        let state = simplify.getCurrentState(entity);
+        let state = entity.currentState;
         Object.defineProperty(entity, 'currentState', {
             get() { return state; },
             set(value: string) { state = value; },
@@ -92,7 +92,7 @@ export class OnSetHostListener {
         Object.defineProperty(entity, 'face',
             { get() { return protectedFace; }, set() {console.log('tried to maniplulate face'); } });
 
-        let protectedState = simplify.getCurrentState(entity);
+        let protectedState = entity.currentState;
         Object.defineProperty(entity, 'currentState', {
             get() { return protectedState; },
             set(data) { if (data.protected) { protectedState = data.protected; } },

diff --git a/src/listeners/connection/onThrowBall.ts b/src/listeners/connection/onThrowBall.ts
@@ -21,7 +21,7 @@ export class OnThrownBallListener {
         }
 
         const actonStep = new ig.ACTION_STEP.SHOOT_PROXY({ proxy: ballInfo.ballInfo, dir: ballInfo.dir });
-        simplify.runAction(actonStep, entity);
+        actonStep.run(entity);
     }
 
     private resolveEntity(combatant: number | string | undefined): ig.Entity | undefined {

diff --git a/src/listeners/connection/onUpdateAnimationTimer.ts b/src/listeners/connection/onUpdateAnimationTimer.ts
@@ -12,7 +12,7 @@ export class OnUpdateAnimationTimerListener {
     public onUpdateAnimationTimer(player: string, time: number): void {
         const pl = this.main.players[player];
         if (pl && pl.entity) {
-            simplify.setAnimationTimer(pl.entity, time);
+            pl.entity.animState.timer = time;
         }
     }
 }
diff --git a/src/listeners/connection/onUpdateEntityAnimation.ts b/src/listeners/connection/onUpdateEntityAnimation.ts
@@ -20,6 +20,6 @@ export class OnUpdateEntityAnimationListener {
     private setEntityAnimation(from: {face: ig.Vector2, anim: string}, to: ig.Entity) {
         to.face.xProtected = from.face.x;
         to.face.yProtected = from.face.y;
-        simplify.setAnimation(to, {protected: from.anim});
+        to.currentAnim = {protected: from.anim} as unknown as string;
     }
 }
diff --git a/src/listeners/connection/onUpdateEntityHealth.ts b/src/listeners/connection/onUpdateEntityHealth.ts
@@ -19,7 +19,7 @@ export class OnUpdateEntityHealthListener {
 
         console.log('[multiplayer] Set ' + id + '\'s health to ' + health);
 
-        simplify.setCurrentHp(entity, health);
+        entity.params.currentHp = health;
     }
 
     private getEntity(id: number | string): IMultiplayerEntity | null {

diff --git a/src/multiplayer.ts b/src/multiplayer.ts
@@ -147,7 +147,7 @@ export class Multiplayer {
             Object.defineProperty(entity, 'face',
                 { get() { return protectedFace; }, set() {console.log('tried to maniplulate face'); } });
 
-            let protectedState = simplify.getCurrentState(entity);
+            let protectedState = entity.currentState;
             Object.defineProperty(entity, 'currentState', {
                 get() { return protectedState; },
                 set(data) { if (data.protected) { protectedState = data.protected; } },
@@ -260,9 +260,10 @@ export class Multiplayer {
 
     private launchGame(): void {
         // Remove title screen interact.
-        const buttonInteract = ig.gui.menues[15].children[2].buttonInteract; // TODO Resolve buttonInteract
+        // const buttonInteract = ig.gui.menues[15].children[2].buttonInteract; // TODO Resolve buttonInteract
+        // ig.interact.removeEntry(buttonInteract);
 
-        ig.interact.removeEntry(buttonInteract);
+        ig.interact.removeEntry(ig.interact.entries[0]);
         ig.bgm.clear('MEDIUM_OUT'); // Clear BGM
         ig.game.start(); // Start the game in story mode.
     }