Feat/add pets

scene/package.json

@@ -37,4 +37,4 @@
     "fp-future": "^1.0.1",
     "typescript": "^5.3.2"
   }
-}
+}

scene/src/controllers/main-hud/inventory.controller.tsx

@@ -37,6 +37,7 @@ import {
   type CompanionType
 } from '../../ui/inventory/companionsData'
 import { type ProfessionType } from '../../ui/inventory/professionsData'
+import { equipCompanion } from '../../inventory/equipCompanion'
 // import { WearablesConfig } from '../../player/wearables-config'
 // import {type GetPlayerDataRes, getPlayer }  from '@dcl/sdk/src/players'
 
@@ -481,7 +482,7 @@ export class InventoryController {
         this.componionButtonSprite =
           companionPageSprite.equip_button_when_clicked
         // execute function equip companion
-        console.log('equip')
+        equipCompanion(this.selectedCompanion.name)
         this.equipedCompanion = this.selectedCompanion
       } else {
         this.componionButtonSprite = companionPageSprite.Purchase_while_clicked

scene/src/controllers/realm.controller.ts

@@ -15,7 +15,7 @@ export class RealmController {
     this.gameController = gameController
   }
 
-  switchRealm(realm: RealmType): void {
+  switchRealm(realm: RealmType, difficulty: string): void {
     this.cleanUpScene()
 
     // TODO: utils and npc library should be cleaned as well
@@ -29,13 +29,13 @@ export class RealmController {
         this.currentRealm = new DemonKingDungeon(this.gameController)
         break
       case 'dungeon':
-        this.currentRealm = new Dungeon(this.gameController)
+        this.currentRealm = new Dungeon(this.gameController, difficulty)
         break
       case 'dungeonBase':
         this.currentRealm = new DungeonBase(this.gameController)
         break
       case 'minersCave':
-        this.currentRealm = new MinersCave(this.gameController)
+        this.currentRealm = new MinersCave(this.gameController, difficulty)
         break
     }
   }

scene/src/controllers/ui.controller.tsx

@@ -17,6 +17,7 @@ import { LoadingUI } from '../ui/loading/loading'
 import { CreationPlayerController } from './creation-player.controller'
 import { type GameController } from './game.controller'
 import { MainHudController } from './main-hud'
+import { type RealmType } from '../realms/types'
 
 export class UIController {
   loadingUI: LoadingUI
@@ -53,6 +54,10 @@ export class UIController {
     this.mainHud = new MainHudController()
   }
 
+  loadRealm(realm: RealmType, difficulty: string): void {
+    this.gameController.realmController.switchRealm(realm, difficulty)
+  }
+
   displayAnnouncement(
     announcement: string,
     color: Color4 = Color4.Yellow(),

scene/src/counters.ts

@@ -7,5 +7,7 @@ export const jailGuards = new UICounter()
 export const jailOpenOnce = new UICounter()
 export const demonKill = new UICounter()
 export const DungeonStage = new UICounter()
+export const desertDungeonMonsterCount = new UICounter()
+export const caveDungeonMonsterCount = new UICounter()
 
 demonKill.set(1)

scene/src/enemies/Executioner.ts

@@ -1,25 +1,25 @@
 import { Transform } from '@dcl/sdk/ecs'
 import { Color4, Quaternion, Vector3 } from '@dcl/sdk/math'
-import MonsterMob from './MonsterMob'
 import { LEVEL_TYPES } from '../player/LevelManager'
 import { Player } from '../player/player'
 import { BannerType } from '../ui/banner/bannerConstants'
 import { ITEM_TYPES } from '../inventory/playerInventoryMap'
 import { entityController } from '../realms/entityController'
+import MonsterMobAuto from './monsterMobAuto'
 
 function getRandomIntRange(min: number, max: number): number {
   min = Math.ceil(min)
   max = Math.floor(max)
   return Math.floor(Math.random() * (max - min + 1)) + min
 }
 
-export default class Executioner extends MonsterMob {
+export default class Executioner extends MonsterMobAuto {
   shapeFile = 'assets/models/ExecutionerAxe.glb'
   hoverText: string
 
   constructor() {
     const player = Player.getInstanceOrNull()
-    const level = player?.levels.getLevel(LEVEL_TYPES.PLAYER) ?? 1
+    const level = player?.levels.getLevel(LEVEL_TYPES.PLAYER) ?? 2
     super(level + 20, level + 60, level - 10, level * 100)
     this.minLuck = 10
     this.hoverText = `Attack LVL ${level} Executioner!`

scene/src/enemies/ExecutionerCaveDungeon.ts

@@ -0,0 +1,132 @@
+import { Color4, Quaternion, Vector3 } from '@dcl/sdk/math'
+import { LEVEL_TYPES } from '../player/LevelManager'
+import MonsterMob from './MonsterMob'
+import { Player } from '../player/player'
+import { type GameController } from '../controllers/game.controller'
+import { DungeonStage, caveDungeonMonsterCount } from '../counters'
+import { Transform } from '@dcl/sdk/ecs'
+import { getRandomInt, getRandomIntRange } from '../utils/getRandomInt'
+import { ITEM_TYPES } from '../inventory/playerInventoryMap'
+
+export default class ExecutionerCaveDungeon extends MonsterMob {
+  shapeFile = 'assets/models/RockMonster.glb'
+  hoverText = `Attack Metapsammite Disciple!`
+
+  gameController: GameController
+  constructor(gameController: GameController, initialPos: Vector3) {
+    const player = Player.getInstanceOrNull()
+    const level = player?.levels.getLevel(LEVEL_TYPES.PLAYER) ?? 1
+    const stage = DungeonStage.read()
+    super(5 + stage * 7, level + 100, level + 1, 10)
+    this.gameController = gameController
+    this.minLuck = 20
+
+    Transform.createOrReplace(this.entity, {
+      position: Vector3.create(0, 0, 0)
+    })
+    this.initMonster()
+    super.setupEngageTriggerBox()
+    this.loadTransformation(initialPos)
+    this.setTopOffset(2.25)
+    this.dropRate = -2
+  }
+
+  onDropXp(): void {
+    const xp = getRandomIntRange(this.xp, this.xp + 10)
+    console.log(xp)
+    caveDungeonMonsterCount.increase(1)
+    this.gameController.uiController.displayAnnouncement(
+      `${caveDungeonMonsterCount.read()}`
+    )
+    // ui.displayAnnouncement(`${easyDungeonMonsterCount1.read()}`)
+
+    if (caveDungeonMonsterCount.read() === 6) {
+      this.gameController.uiController.displayAnnouncement(
+        'Cube Removed!',
+        Color4.Yellow(),
+        2000
+      )
+      if (
+        this.gameController.realmController.currentRealm?.removeSingleEntity !==
+        undefined
+      ) {
+        // remove cube 1 and 2
+      }
+
+      if (caveDungeonMonsterCount.read() === 21) {
+        this.gameController.uiController.displayAnnouncement(
+          'Cube Removed!',
+          Color4.Yellow(),
+          2000
+        )
+        if (
+          this.gameController.realmController.currentRealm
+            ?.removeSingleEntity !== undefined
+        ) {
+          // Remove cube 3
+        }
+      }
+
+      if (caveDungeonMonsterCount.read() === 27) {
+        this.gameController.uiController.displayAnnouncement(
+          'Cube Removed!',
+          Color4.Yellow(),
+          2000
+        )
+        if (
+          this.gameController.realmController.currentRealm
+            ?.removeSingleEntity !== undefined
+        ) {
+          // Remove cube 4
+        }
+      }
+
+      const exp = [
+        {
+          type: LEVEL_TYPES.ENEMY,
+          value: 1
+        },
+        {
+          type: LEVEL_TYPES.PLAYER,
+          value: xp
+        }
+      ]
+      const loot = [
+        {
+          type: ITEM_TYPES.BONE,
+          value: 1
+        }
+      ]
+      console.log(exp, loot)
+      // UI ? addRewards(exp, loot)
+      // DailyQuestHUD.getInstance().listenAndUpdateForAnyActiveQuest(
+      //   LEVEL_TYPES.ENEMY
+      // )
+    }
+  }
+
+  onDropLoot(): void {}
+
+  setupAttackTriggerBox(): void {
+    super.setupAttackTriggerBox()
+  }
+
+  create(): void {}
+
+  loadTransformation(initialPos: Vector3): void {
+    const initialPosition = Vector3.create(
+      initialPos.x,
+      initialPos.y,
+      initialPos.z
+    )
+    const initialRotation = Quaternion.fromEulerDegrees(
+      0,
+      getRandomInt(10) / 10 + getRandomInt(4),
+      0
+    )
+    Transform.createOrReplace(this.entity, {
+      position: initialPosition,
+      rotation: initialRotation
+    })
+  }
+}