Merge branch 'master' of https://github.com/decentraland/Genesis-Plaz…

…a-SDK7
decentraland-scenes · Apr 30, 2024 · f259066 · f259066
2 parents 582533a + a123e47
commit f259066
Show file tree

Hide file tree

Showing 186 changed files with 6,323 additions and 394 deletions.
diff --git a/assets/scene/main.composite b/assets/scene/main.composite
@@ -0,0 +1 @@
+{"version":1,"components":[{"name":"core::Transform","jsonSchema":{"type":"object","properties":{"position":{"type":"object","properties":{"x":{"type":"number"},"y":{"type":"number"},"z":{"type":"number"}}},"scale":{"type":"object","properties":{"x":{"type":"number"},"y":{"type":"number"},"z":{"type":"number"}}},"rotation":{"type":"object","properties":{"x":{"type":"number"},"y":{"type":"number"},"z":{"type":"number"},"w":{"type":"number"}}},"parent":{"type":"integer"}},"serializationType":"transform"},"data":{"512":{"json":{"position":{"x":8,"y":1,"z":8},"scale":{"x":1,"y":1,"z":1},"rotation":{"x":0,"y":0,"z":0,"w":1},"parent":0}}}},{"name":"core::MeshRenderer","jsonSchema":{"type":"object","properties":{},"serializationType":"protocol-buffer","protocolBuffer":"PBMeshRenderer"},"data":{"512":{"json":{"mesh":{"$case":"box","box":{"uvs":[]}}}}}},{"name":"core-schema::Name","jsonSchema":{"type":"object","properties":{"value":{"type":"string","serializationType":"utf8-string"}},"serializationType":"map"},"data":{"512":{"json":{"value":"Magic Cube"}}}},{"name":"inspector::Scene","jsonSchema":{"type":"object","properties":{"layout":{"type":"object","properties":{"base":{"type":"object","properties":{"x":{"type":"integer","serializationType":"int32"},"y":{"type":"integer","serializationType":"int32"}},"serializationType":"map"},"parcels":{"type":"array","items":{"type":"object","properties":{"x":{"type":"integer","serializationType":"int32"},"y":{"type":"integer","serializationType":"int32"}},"serializationType":"map"},"serializationType":"array"}},"serializationType":"map"}},"serializationType":"map"},"data":{"0":{"json":{"layout":{"base":{"x":0,"y":0},"parcels":[{"x":0,"y":0}]}}}}},{"name":"cube-id","jsonSchema":{"type":"object","properties":{},"serializationType":"map"},"data":{"512":{"json":{}}}}]}
diff --git a/images/genesis-plaza.png b/images/genesis-plaza.png
diff --git a/models/TheWhale_Action_Elevator.glb b/models/TheWhale_Action_Elevator.glb
diff --git a/models/agora.glb b/models/agora.glb
diff --git a/models/artichoke.glb b/models/artichoke.glb
diff --git a/models/auditorium.glb b/models/auditorium.glb
diff --git a/models/basketball/basketball_hoop.glb b/models/basketball/basketball_hoop.glb
diff --git a/models/garden.glb b/models/garden.glb
diff --git a/models/hallway.glb b/models/hallway.glb
diff --git a/models/lobby/hover_arrow_E.glb b/models/lobby/hover_arrow_E.glb
diff --git a/models/lobby/hover_arrow_F.glb b/models/lobby/hover_arrow_F.glb
diff --git a/models/mountains.glb b/models/mountains.glb
diff --git a/models/shell.glb b/models/shell.glb
diff --git a/models/trading_center.glb b/models/trading_center.glb
diff --git a/models/wearables/AvatarWearables_TX 2.png b/models/wearables/AvatarWearables_TX 2.png
diff --git a/models/wearables/Avatar_FemaleSkinBase.png b/models/wearables/Avatar_FemaleSkinBase.png
diff --git a/models/wearables/Blood.png b/models/wearables/Blood.png
diff --git a/models/wearables/CyberSkiGlasses.png b/models/wearables/CyberSkiGlasses.png
diff --git a/models/wearables/Genesis_TX.png b/models/wearables/Genesis_TX.png
diff --git a/models/wearables/Genesis_TX_1.png b/models/wearables/Genesis_TX_1.png
diff --git a/models/wearables/Suits.jpg b/models/wearables/Suits.jpg
diff --git a/models/wearables/Xmas_Emissive_TX.png b/models/wearables/Xmas_Emissive_TX.png
diff --git a/models/wearables/Xmas_TP_TX.png b/models/wearables/Xmas_TP_TX.png
diff --git a/models/wearables/Xmas_TX.png b/models/wearables/Xmas_TX.png
diff --git a/models/wearables/first_floor/A/AvatarWearables_Emissive_TX.png b/models/wearables/first_floor/A/AvatarWearables_Emissive_TX.png
diff --git a/models/wearables/first_floor/A/AvatarWearables_TP_TX.png b/models/wearables/first_floor/A/AvatarWearables_TP_TX.png
diff --git a/models/wearables/first_floor/A/AvatarWearables_TX.png b/models/wearables/first_floor/A/AvatarWearables_TX.png
diff --git a/models/wearables/first_floor/A/Cyberlens_TX.png b/models/wearables/first_floor/A/Cyberlens_TX.png
diff --git a/models/wearables/first_floor/A/Eyewear_CyborgMonocle.glb b/models/wearables/first_floor/A/Eyewear_CyborgMonocle.glb
diff --git a/models/wearables/first_floor/A/Eyewear_Raver.glb b/models/wearables/first_floor/A/Eyewear_Raver.glb
diff --git a/models/wearables/first_floor/A/Genesis_TX.png b/models/wearables/first_floor/A/Genesis_TX.png
diff --git a/models/wearables/first_floor/A/MANA_Eyewear.glb b/models/wearables/first_floor/A/MANA_Eyewear.glb
diff --git a/models/wearables/first_floor/A/Spysuit_Goggles.glb b/models/wearables/first_floor/A/Spysuit_Goggles.glb
diff --git a/models/wearables/first_floor/B/DCL_Black.png b/models/wearables/first_floor/B/DCL_Black.png
diff --git a/models/wearables/first_floor/B/F_Hat_Foam.glb b/models/wearables/first_floor/B/F_Hat_Foam.glb
diff --git a/models/wearables/first_floor/B/Image_0.png b/models/wearables/first_floor/B/Image_0.png
diff --git a/models/wearables/first_floor/B/Image_1.png b/models/wearables/first_floor/B/Image_1.png
diff --git a/models/wearables/first_floor/B/MaleHat_DCL.glb b/models/wearables/first_floor/B/MaleHat_DCL.glb
diff --git a/models/wearables/first_floor/B/sporty_hat_male.png b/models/wearables/first_floor/B/sporty_hat_male.png
diff --git a/models/wearables/first_floor/B/sunhat.glb b/models/wearables/first_floor/B/sunhat.glb
diff --git a/models/wearables/first_floor/C/Ddm_Mask2-01.png b/models/wearables/first_floor/C/Ddm_Mask2-01.png
diff --git a/models/wearables/first_floor/C/Genesis_TX.png b/models/wearables/first_floor/C/Genesis_TX.png
diff --git a/models/wearables/first_floor/C/M_Mask_Skull.glb b/models/wearables/first_floor/C/M_Mask_Skull.glb
diff --git a/models/wearables/first_floor/C/M_TopHead_Machete.glb b/models/wearables/first_floor/C/M_TopHead_Machete.glb
diff --git a/models/wearables/first_floor/C/M_TopHead_Skull.glb b/models/wearables/first_floor/C/M_TopHead_Skull.glb
diff --git a/models/wearables/first_floor/C/skullpattern01.jpg b/models/wearables/first_floor/C/skullpattern01.jpg
diff --git a/models/wearables/first_floor/D/Prtection mask-01.png b/models/wearables/first_floor/D/Prtection mask-01.png
diff --git a/models/wearables/first_floor/D/Prtection mask-02.png b/models/wearables/first_floor/D/Prtection mask-02.png
diff --git a/models/wearables/first_floor/D/protection_mask_african_mask.glb b/models/wearables/first_floor/D/protection_mask_african_mask.glb
diff --git a/models/wearables/first_floor/D/protection_mask_funny_mask.glb b/models/wearables/first_floor/D/protection_mask_funny_mask.glb
diff --git a/models/wearables/first_floor/D/protection_mask_hot_mask.glb b/models/wearables/first_floor/D/protection_mask_hot_mask.glb
diff --git a/models/wearables/first_floor/D/protection_mask_skull_mask.glb b/models/wearables/first_floor/D/protection_mask_skull_mask.glb
diff --git a/models/wearables/first_floor/E/CyberHelmet2_v2.png b/models/wearables/first_floor/E/CyberHelmet2_v2.png
diff --git a/models/wearables/first_floor/E/Eyewear_XmasTree.glb b/models/wearables/first_floor/E/Eyewear_XmasTree.glb
diff --git a/models/wearables/first_floor/E/F_Hat_Elf.glb b/models/wearables/first_floor/E/F_Hat_Elf.glb
diff --git a/models/wearables/first_floor/E/F_Helmet_LedSuit.glb b/models/wearables/first_floor/E/F_Helmet_LedSuit.glb
diff --git a/models/wearables/first_floor/E/Xmas_Emissive_TX.png b/models/wearables/first_floor/E/Xmas_Emissive_TX.png
diff --git a/models/wearables/first_floor/E/Xmas_TP_TX.png b/models/wearables/first_floor/E/Xmas_TP_TX.png
diff --git a/models/wearables/first_floor/E/Xmas_TX.png b/models/wearables/first_floor/E/Xmas_TX.png
diff --git a/models/wearables/first_floor/F/AvatarWearables_TX.png b/models/wearables/first_floor/F/AvatarWearables_TX.png
diff --git a/models/wearables/first_floor/F/M_Hat_Hat_Of_Wonder.glb b/models/wearables/first_floor/F/M_Hat_Hat_Of_Wonder.glb
diff --git a/models/wearables/first_floor/F/MaleHat_MANA.glb b/models/wearables/first_floor/F/MaleHat_MANA.glb
diff --git a/models/wearables/first_floor/F/Umbrella_Hat.glb b/models/wearables/first_floor/F/Umbrella_Hat.glb
diff --git a/models/wearables/first_floor/F/dcl-20.20.20.png b/models/wearables/first_floor/F/dcl-20.20.20.png
diff --git a/models/wearables/first_floor/F/hat_of_wonder.png b/models/wearables/first_floor/F/hat_of_wonder.png
diff --git a/models/wearables/first_floor/FirstFloor.png b/models/wearables/first_floor/FirstFloor.png
diff --git a/models/wearables/first_floor/G/F_Tiara_GreenStone.glb b/models/wearables/first_floor/G/F_Tiara_GreenStone.glb
diff --git a/models/wearables/first_floor/G/F_Tiara_LaurelWreath.glb b/models/wearables/first_floor/G/F_Tiara_LaurelWreath.glb
diff --git a/models/wearables/first_floor/G/Genesis_TX.png b/models/wearables/first_floor/G/Genesis_TX.png
diff --git a/models/wearables/first_floor/G/Tiara_Bee.glb b/models/wearables/first_floor/G/Tiara_Bee.glb
diff --git a/models/wearables/halloween_stand.glb b/models/wearables/halloween_stand.glb
diff --git a/models/wearables/second_floor/A/Blood.png b/models/wearables/second_floor/A/Blood.png
diff --git a/models/wearables/second_floor/A/Genesis_TX.png b/models/wearables/second_floor/A/Genesis_TX.png
diff --git a/models/wearables/second_floor/A/M_lBody_GreyJoggers.glb b/models/wearables/second_floor/A/M_lBody_GreyJoggers.glb
diff --git a/models/wearables/second_floor/A/creepy_nurse_lower_body.glb b/models/wearables/second_floor/A/creepy_nurse_lower_body.glb
diff --git a/models/wearables/second_floor/A/spy_suit_lower_body b/models/wearables/second_floor/A/spy_suit_lower_body
diff --git a/models/wearables/second_floor/B/Helmet_of_the_barbaria.png b/models/wearables/second_floor/B/Helmet_of_the_barbaria.png
diff --git a/models/wearables/second_floor/B/T_Fox001.png b/models/wearables/second_floor/B/T_Fox001.png
diff --git a/models/wearables/second_floor/B/Xmas_Emissive_TX.png b/models/wearables/second_floor/B/Xmas_Emissive_TX.png
diff --git a/models/wearables/second_floor/B/Xmas_TX.png b/models/wearables/second_floor/B/Xmas_TX.png
diff --git a/models/wearables/second_floor/B/cw_fox_top_head.glb b/models/wearables/second_floor/B/cw_fox_top_head.glb
diff --git a/models/wearables/second_floor/B/m_barbarian_helmet_hat.glb b/models/wearables/second_floor/B/m_barbarian_helmet_hat.glb
diff --git a/models/wearables/second_floor/B/xmas_snowman_helmet.glb b/models/wearables/second_floor/B/xmas_snowman_helmet.glb
diff --git a/models/wearables/second_floor/C/Genesis_TX.png b/models/wearables/second_floor/C/Genesis_TX.png
diff --git a/models/wearables/second_floor/C/asian_fox.glb b/models/wearables/second_floor/C/asian_fox.glb
diff --git a/models/wearables/second_floor/C/muzzle_mask.glb b/models/wearables/second_floor/C/muzzle_mask.glb
diff --git a/models/wearables/second_floor/C/tropical_mask.glb b/models/wearables/second_floor/C/tropical_mask.glb
diff --git a/models/wearables/second_floor/D/DCL_Black.png b/models/wearables/second_floor/D/DCL_Black.png
diff --git a/models/wearables/second_floor/D/Genesis_TX.png b/models/wearables/second_floor/D/Genesis_TX.png
diff --git a/models/wearables/second_floor/D/cw_city_sneakers_feet.glb b/models/wearables/second_floor/D/cw_city_sneakers_feet.glb
diff --git a/models/wearables/second_floor/D/razor_blade_feet.glb b/models/wearables/second_floor/D/razor_blade_feet.glb
diff --git a/models/wearables/second_floor/D/razorblade_shoes.png b/models/wearables/second_floor/D/razorblade_shoes.png
diff --git a/models/wearables/second_floor/D/razorblade_shoes_emissive.png b/models/wearables/second_floor/D/razorblade_shoes_emissive.png
diff --git a/models/wearables/second_floor/D/sad_clown_feet.glb b/models/wearables/second_floor/D/sad_clown_feet.glb
diff --git a/models/wearables/second_floor/E/AvatarWearables_TX.png b/models/wearables/second_floor/E/AvatarWearables_TX.png
diff --git a/models/wearables/second_floor/E/Genesis_TX.png b/models/wearables/second_floor/E/Genesis_TX.png
diff --git a/models/wearables/second_floor/E/M_EyeWear_ThugLife.glb b/models/wearables/second_floor/E/M_EyeWear_ThugLife.glb
diff --git a/models/wearables/second_floor/E/Razorblade_goggles.png b/models/wearables/second_floor/E/Razorblade_goggles.png
diff --git a/models/wearables/second_floor/E/Razorblade_goggles_emissive.png b/models/wearables/second_floor/E/Razorblade_goggles_emissive.png
diff --git a/models/wearables/second_floor/E/cw_bitcoinglasses_eyewear.glb b/models/wearables/second_floor/E/cw_bitcoinglasses_eyewear.glb
diff --git a/models/wearables/second_floor/E/razor_blade_eyewear.glb b/models/wearables/second_floor/E/razor_blade_eyewear.glb
diff --git a/models/wearables/second_floor/F/F_Feet_Shoes_01.glb b/models/wearables/second_floor/F/F_Feet_Shoes_01.glb
diff --git a/models/wearables/second_floor/F/Genesis_TX.png b/models/wearables/second_floor/F/Genesis_TX.png
diff --git a/models/wearables/second_floor/F/M_Feet_BearSlippers.glb b/models/wearables/second_floor/F/M_Feet_BearSlippers.glb
diff --git a/models/wearables/second_floor/F/M_Feet_ClassiShoes.glb b/models/wearables/second_floor/F/M_Feet_ClassiShoes.glb
diff --git a/models/wearables/second_floor/G/AvatarWearables_TX.png b/models/wearables/second_floor/G/AvatarWearables_TX.png
diff --git a/models/wearables/second_floor/G/F_Earrings_PunkPiercing.glb b/models/wearables/second_floor/G/F_Earrings_PunkPiercing.glb
diff --git a/models/wearables/second_floor/G/F_Earrings_Skull.glb b/models/wearables/second_floor/G/F_Earrings_Skull.glb
diff --git a/models/wearables/second_floor/G/Genesis_TX.png b/models/wearables/second_floor/G/Genesis_TX.png
diff --git a/models/wearables/second_floor/G/dcl_mana_earring.glb b/models/wearables/second_floor/G/dcl_mana_earring.glb
diff --git a/models/wearables/second_floor/J/Xmas_Emissive_TX.png b/models/wearables/second_floor/J/Xmas_Emissive_TX.png
diff --git a/models/wearables/second_floor/J/Xmas_TX.png b/models/wearables/second_floor/J/Xmas_TX.png
diff --git a/models/wearables/second_floor/J/cw_tuxedo_tshirt_upper_body.glb b/models/wearables/second_floor/J/cw_tuxedo_tshirt_upper_body.glb
diff --git a/models/wearables/second_floor/J/dcl-20.20.20.png b/models/wearables/second_floor/J/dcl-20.20.20.png
diff --git a/models/wearables/second_floor/J/f_cw_trendy_jacket_upper_body.glb b/models/wearables/second_floor/J/f_cw_trendy_jacket_upper_body.glb
diff --git a/models/wearables/second_floor/J/fancy_jacket.png b/models/wearables/second_floor/J/fancy_jacket.png
diff --git a/models/wearables/second_floor/J/female_razorblade_jacket.png b/models/wearables/second_floor/J/female_razorblade_jacket.png
diff --git a/models/wearables/second_floor/J/female_razorblade_jacket_emissive.png b/models/wearables/second_floor/J/female_razorblade_jacket_emissive.png
diff --git a/models/wearables/second_floor/J/m_cyber_suit_upper_body.glb b/models/wearables/second_floor/J/m_cyber_suit_upper_body.glb
diff --git a/models/wearables/second_floor/J/mana_hoodie_upper_body.glb b/models/wearables/second_floor/J/mana_hoodie_upper_body.glb
diff --git a/models/wearables/second_floor/J/mch_fukuzawa_upper_body.glb b/models/wearables/second_floor/J/mch_fukuzawa_upper_body.glb
diff --git a/models/wearables/second_floor/J/razor_blade_upper_body.glb b/models/wearables/second_floor/J/razor_blade_upper_body.glb
diff --git a/models/wearables/second_floor/J/tuxedo-tx.png b/models/wearables/second_floor/J/tuxedo-tx.png
diff --git a/models/wearables/second_floor/J/xmas_cyberpunk_upper_body.glb b/models/wearables/second_floor/J/xmas_cyberpunk_upper_body.glb
diff --git a/models/wearables/second_floor/J/福沢諭吉.png b/models/wearables/second_floor/J/福沢諭吉.png
diff --git a/models/wearables/second_floor/SecondFloor.png b/models/wearables/second_floor/SecondFloor.png
diff --git a/models/wearables/xmas_pullover.png b/models/wearables/xmas_pullover.png
diff --git a/models/wearables/xmas_stand.glb b/models/wearables/xmas_stand.glb
diff --git a/models/whale.glb b/models/whale.glb
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "@dcl-sdk/utils": "latest",
     "cannon": "latest",
     "colyseus.js": "^0.14.15-alpha.0",
-    "dcl-npc-toolkit": "latest",
+    "dcl-npc-toolkit": "^1.2.2",
     "dcl-ui-toolkit": "latest"
   },
   "bundleDependencies": [

diff --git a/sounds/zenquencer/a3.mp3 b/sounds/zenquencer/a3.mp3
diff --git a/sounds/zenquencer/a4.mp3 b/sounds/zenquencer/a4.mp3
diff --git a/sounds/zenquencer/c3.mp3 b/sounds/zenquencer/c3.mp3
diff --git a/sounds/zenquencer/e4.mp3 b/sounds/zenquencer/e4.mp3
diff --git a/sounds/zenquencer/f3.mp3 b/sounds/zenquencer/f3.mp3
diff --git a/sounds/zenquencer/f4.mp3 b/sounds/zenquencer/f4.mp3
diff --git a/sounds/zenquencer/g4.mp3 b/sounds/zenquencer/g4.mp3
diff --git a/src/connection/onConnect.ts b/src/connection/onConnect.ts
@@ -329,9 +329,10 @@ function onLevelConnect(room: Room<clientState.NpcGameRoomState>) {
       streamedMsgs.started = true
       streamedMsgs.waitingForMore = false
 
-      streamedMsgsUiControl.start()
-      streamedMsgsUiControl.showNextText(nextPart)
-
+      utils.timers.setTimeout(() => {
+        streamedMsgsUiControl.start()
+        streamedMsgsUiControl.showNextText(nextPart)
+      }, 500)
     //   const dialog = createDialog(nextPart)
     //   let hasEmotion = nextPart.emotion ? true : false
     //   console.log("Emotions", "Do we have emotions?", hasEmotion, ":", nextPart);

diff --git a/src/index.ts b/src/index.ts
@@ -9,7 +9,7 @@ import * as sceneDataHelper from './utils/sceneDataHelper'
 import { lowerVolume, outOfBar, placeJukeBox, setBarMusicOff, setBarMusicOn } from './modules/bar/jukebox'
 import { addRepeatTrigger } from './modules/Utils'
 import { log } from './back-ports/backPorts'
-import { TRIGGER_LAYER_REGISTER_WITH_NO_LAYERS, barOffset, coreBuildingOffset } from './lobby/resources/globals'
+import { TRIGGER_LAYER_REGISTER_WITH_NO_LAYERS, barOffset, basketballOffset, coreBuildingOffset, lobbyCenter } from './lobby/resources/globals'
 import { initBarNpcs, initOutsideNpcs } from './modules/bar/npcs/barNpcs'
 import { setupUi } from './ui'
 import { placeDoors } from './modules/bar/doors'
@@ -30,6 +30,17 @@ import { isMovePlayerInProgress } from './back-ports/movePlayer'
 import * as resources from './lobby/resources/resources'
 import { getAndSetUserData, getAndSetUserDataIfNullNoWait, getUserDataFromLocal } from './utils/userData'
 import { loadBeamMesh } from './lobby/beamPortal'
+import { placeMuseumPieces } from './modules/museumItems'
+import { addNFTs } from './modules/nftBuilder'
+import { addRobots } from './modules/npcRobotBuilder'
+import { addBarVideo } from './modules/barVideoScreen'
+import { addAuditoriumVideo } from './modules/auditoriumScreen'
+import { startArtichoke } from './modules/artichoke'
+import { addWearables } from './modules/wearables'
+import { addZenquencer } from './modules/zenquencer/zenquencer'
+// import { addNFTs } from './modules/nftBuilder'
+// import { placeMuseumPieces } from './modules/museumItems'
+//import { placeMuseumPieces } from './modules/museumItems'
 
 // export all the functions required to make the scene work
 export * from '@dcl/sdk'
@@ -52,14 +63,9 @@ function insideBar() {
   }
 
   placeJukeBox()
+  addBarVideo()
 
-  if (!isBasketballAdded) {
-
-    // ADD BASKETBALL GAME
-
-    let physicsManager = new PhysicsManager(3)
-    isBasketballAdded = true
-  }
+
 }
 
 function exitBar() {
@@ -71,14 +77,29 @@ function exitBar() {
 function addOutsideOfIfPlayerOutsideOnGround(){
   const doIt = ()=>{
     const playerPos = Transform.getOrNull(engine.PlayerEntity)
-    if(playerPos.position.y < 10){
+   // if(playerPos.position.y < 10){
       console.log("index.ts", "addOutsideOfIfPlayerOutsideOnGround", "player on ground, init anything outside ground level")
       const spawnDealy = 1000
       initOutsideNpcs(spawnDealy)
       placePlatforms()
-    }else{
-      console.log("index.ts", "addOutsideOfIfPlayerOutsideOnGround", "player not on ground")
-    }  
+      placeMuseumPieces()
+      addNFTs() 
+      addRobots()
+      addAuditoriumVideo()
+      startArtichoke()
+      addWearables()
+      addZenquencer()
+
+      if (!isBasketballAdded) {
+
+        // ADD BASKETBALL GAME
+
+        let physicsManager = new PhysicsManager(1)
+        isBasketballAdded = true
+      }
+  //  }else{
+   //   console.log("index.ts", "addOutsideOfIfPlayerOutsideOnGround", "player not on ground")
+  //  }  
   }
   //use timer to wait for player data
   const timerId = utils.timers.setInterval(() => {

diff --git a/src/lobby/beamPortal.ts b/src/lobby/beamPortal.ts
@@ -129,27 +129,27 @@ export class TeleportController {
 
       getRealm({}).then(
         (value:GetRealmResponse) => {
-          if(value.realmInfo?.isPreview){
-              console.log("beamPortal.ts","temp.planes","getRealm is preview, adding planes for spawn and ceiling")
-              //START find the max height, help with visualizing how high we can go
-              let spawnAreaPlane = engine.addEntity()
-              //PUT PARCEL SIZE HERE 4X5 FOR EXAMPLE
-              const parcelMaxHeight = (Math.log((ParcelCountX*ParcelCountZ)) * Math.LOG2E) * 20
-              Transform.create(spawnAreaPlane,{
-                position: { x: triggerUpSpawnArea.x + (spawnRandomX/2) , y: lobbyHeight, z: triggerUpSpawnArea.z + (spawnRandomZ/2)},
-                scale: Vector3.create(spawnRandomX,spawnRandomZ,.1),
-                rotation: Quaternion.fromEulerDegrees(90,0,0)
-              })
-              //MeshCollider.setPlane(findCeilingPlane)
-              MeshRenderer.setPlane(spawnAreaPlane)
-              Material.setPbrMaterial(spawnAreaPlane, {
-                //texture: Material.Texture.,
-                albedoColor: Color4.fromHexString("#00000088"),
-                specularIntensity: 0,
-                metallic: 0,
-                roughness: 1
-              })
-          }
+          // if(value.realmInfo?.isPreview){
+          //     console.log("beamPortal.ts","temp.planes","getRealm is preview, adding planes for spawn and ceiling")
+          //     //START find the max height, help with visualizing how high we can go
+          //     let spawnAreaPlane = engine.addEntity()
+          //     //PUT PARCEL SIZE HERE 4X5 FOR EXAMPLE
+          //     const parcelMaxHeight = (Math.log((ParcelCountX*ParcelCountZ)) * Math.LOG2E) * 20
+          //     Transform.create(spawnAreaPlane,{
+          //       position: { x: triggerUpSpawnArea.x + (spawnRandomX/2) , y: lobbyHeight, z: triggerUpSpawnArea.z + (spawnRandomZ/2)},
+          //       scale: Vector3.create(spawnRandomX,spawnRandomZ,.1),
+          //       rotation: Quaternion.fromEulerDegrees(90,0,0)
+          //     })
+          //     //MeshCollider.setPlane(findCeilingPlane)
+          //     MeshRenderer.setPlane(spawnAreaPlane)
+          //     Material.setPbrMaterial(spawnAreaPlane, {
+          //       //texture: Material.Texture.,
+          //       albedoColor: Color4.fromHexString("#00000088"),
+          //       specularIntensity: 0,
+          //       metallic: 0,
+          //       roughness: 1
+          //     })
+          // }
         }
       )
 

diff --git a/src/lobby/cloudLobby.ts b/src/lobby/cloudLobby.ts
@@ -56,55 +56,55 @@ export function addCloudLobby(){
 
 
 
-  getRealm({}).then(
-    (value:GetRealmResponse) => {
-      if(value.realmInfo?.isPreview){
-        console.log("cloudLobby.ts","temp.planes","getRealm is preview, adding planes for spawn and ceiling")
-        //START find the max height, help with visualizing how high we can go
-        let findCeilingPlane = engine.addEntity()
-        //PUT PARCEL SIZE HERE 4X5 FOR EXAMPLE
-        const parcelMaxHeight = (Math.log((ParcelCountX*ParcelCountZ)) * Math.LOG2E) * 20
-        Transform.create(findCeilingPlane,{
-          position: Vector3.create(lobbyCenter.x - coreBuildingOffset.x, parcelMaxHeight-.1, lobbyCenter.z - coreBuildingOffset.z),
-          scale: Vector3.create(30,30,.1),
-          rotation: Quaternion.fromEulerDegrees(90,0,0)
-        })
-        //MeshCollider.setPlane(findCeilingPlane)
-        MeshRenderer.setPlane(findCeilingPlane)
-        Material.setPbrMaterial(findCeilingPlane, {
-          //texture: Material.Texture.,
-          albedoColor: Color4.fromHexString("#00000088"),
-          specularIntensity: 0,
-          metallic: 0,
-          roughness: 1
-      })
-      //END find the max height, help with visualizing how high we can go
-
-      //START temporary spawn area
-      let cloudSpawnTempPlane = engine.addEntity()
-      //PUT PARCEL SIZE HERE 4X5 FOR EXAMPLE 
-      //const parcelMaxHeight = lobbyHeight//(Math.log((4*5) + 1) * Math.LOG2E) * 20
-      Transform.create(cloudSpawnTempPlane,{
-        //taken from scene.json spawn to make sure is good spot
-        position: Vector3.create((36.5+27.5)/2, lobbyHeight, (30+26)/2),
-        scale: Vector3.create(30-26,36.5-27.5,.1),
-        rotation: Quaternion.fromEulerDegrees(90,0,90)
-      })
-      //MeshCollider.setPlane(cloudSpawnTempPlane)
-      MeshRenderer.setPlane(cloudSpawnTempPlane)
-      Material.setPbrMaterial(cloudSpawnTempPlane, {
-          //texture: Material.Texture.,
-          albedoColor: Color4.fromHexString("#00000088"),
-          specularIntensity: 0,
-          metallic: 0,
-          roughness: 1
-      })
-      //END temporary spawn
-      }else{
-        console.log("cloudLobby.ts","temp.planes","getRealm is NOT preview, NO temp planes for spawn and ceiling")
-      }
-    }
-  )
+  // getRealm({}).then(
+  //   (value:GetRealmResponse) => {
+  //     if(value.realmInfo?.isPreview){
+  //       console.log("cloudLobby.ts","temp.planes","getRealm is preview, adding planes for spawn and ceiling")
+  //       //START find the max height, help with visualizing how high we can go
+  //       let findCeilingPlane = engine.addEntity()
+  //       //PUT PARCEL SIZE HERE 4X5 FOR EXAMPLE
+  //       const parcelMaxHeight = (Math.log((ParcelCountX*ParcelCountZ)) * Math.LOG2E) * 20
+  //       Transform.create(findCeilingPlane,{
+  //         position: Vector3.create(lobbyCenter.x - coreBuildingOffset.x, parcelMaxHeight-.1, lobbyCenter.z - coreBuildingOffset.z),
+  //         scale: Vector3.create(30,30,.1),
+  //         rotation: Quaternion.fromEulerDegrees(90,0,0)
+  //       })
+  //       //MeshCollider.setPlane(findCeilingPlane)
+  //       MeshRenderer.setPlane(findCeilingPlane)
+  //       Material.setPbrMaterial(findCeilingPlane, {
+  //         //texture: Material.Texture.,
+  //         albedoColor: Color4.fromHexString("#00000088"),
+  //         specularIntensity: 0,
+  //         metallic: 0,
+  //         roughness: 1
+  //     })
+  //     //END find the max height, help with visualizing how high we can go
+
+  //     //START temporary spawn area
+  //     let cloudSpawnTempPlane = engine.addEntity()
+  //     //PUT PARCEL SIZE HERE 4X5 FOR EXAMPLE 
+  //     //const parcelMaxHeight = lobbyHeight//(Math.log((4*5) + 1) * Math.LOG2E) * 20
+  //     Transform.create(cloudSpawnTempPlane,{
+  //       //taken from scene.json spawn to make sure is good spot
+  //       position: Vector3.create((36.5+27.5)/2, lobbyHeight, (30+26)/2),
+  //       scale: Vector3.create(30-26,36.5-27.5,.1),
+  //       rotation: Quaternion.fromEulerDegrees(90,0,90)
+  //     })
+  //     //MeshCollider.setPlane(cloudSpawnTempPlane)
+  //     MeshRenderer.setPlane(cloudSpawnTempPlane)
+  //     Material.setPbrMaterial(cloudSpawnTempPlane, {
+  //         //texture: Material.Texture.,
+  //         albedoColor: Color4.fromHexString("#00000088"),
+  //         specularIntensity: 0,
+  //         metallic: 0,
+  //         roughness: 1
+  //     })
+  //     //END temporary spawn
+  //     }else{
+  //       console.log("cloudLobby.ts","temp.planes","getRealm is NOT preview, NO temp planes for spawn and ceiling")
+  //     }
+  //   }
+  // )
 
 
   /*
@@ -231,7 +231,7 @@ export function addCloudLobby(){
       Quaternion.fromEulerDegrees(0,46,0), 
       getRegisteredAnalyticsEntity(ANALYTICS_ELEMENTS_IDS.eventsSlider),
       menuManager,
-      1
+      2
       )  
     crowdsMenu.updateCrowdsMenu(10)
 

diff --git a/src/lobby/clouds.ts b/src/lobby/clouds.ts
@@ -53,8 +53,8 @@ function addCloudRotate(entity:Entity,left: boolean, speed: number) {
 
 export function initClouds(){
       addClouds(
-        16, 
-        20, 
+        8, 
+        25, 
         Vector3.create(lobbyCenter.x - coreBuildingOffset.x, lobbyHeight, lobbyCenter.z - coreBuildingOffset.z)
       )
 

diff --git a/src/lobby/eventDetailsUI.tsx b/src/lobby/eventDetailsUI.tsx
@@ -15,11 +15,19 @@ let eventAnimFactor: number = 0
 let tieredModalScale = 1
 let tieredFontScale = 1
 let tieredModalTextWrapScale = 1
+let textWarpLimit = 43
 
 export function setupEventDetailsUIScaling(inModalScale: number, inFontScale: number, inModalTextWrapScale: number) {
   tieredModalScale = inModalScale
   tieredFontScale = inFontScale
-  tieredModalTextWrapScale = inModalTextWrapScale
+  tieredModalTextWrapScale = inModalTextWrapScale 
+  // textWarpLimit = 20
+
+   console.log("FONT SCALE: " + tieredFontScale ) 
+
+  // if(inModalScale > 1.0){
+  //   textWarpLimit = 43 
+  // }
 }
 
 export const uiEventDettails = () => (
@@ -178,11 +186,11 @@ export function displayEventUI(event: any) {
 
   let rawTitle: string = event.name
   rawTitle = cleanString(rawTitle)
-  rawTitle = wordWrap(rawTitle, 32 * tieredModalTextWrapScale, 2)
+  rawTitle = wordWrap(rawTitle, 28 , 2) 
 
   eventTitleText = rawTitle
 
-  eventDetailText = '\n\n' + wordWrap(cleanString(event.description), 43 * tieredModalTextWrapScale, 18) + '</cspace>'
+  eventDetailText = '\n\n' + wordWrap(cleanString(event.description), textWarpLimit , 18) + '</cspace>'
 
   eventThumbnail = event.image
 
@@ -201,7 +209,7 @@ export function hideEventUI() {
 let factor = 0
 engine.addSystem((dt: number) => {
   // hide event card ui if player is furhter from the slider menu
-  if (Transform.get(engine.PlayerEntity).position.z > 40) {
+  if (Transform.get(engine.PlayerEntity).position.z > 150) {
     if (factor < 1) {
       factor += dt * 4
       if (factor > 1) {