fix: scale cars (#1661)

* scale cars

* merge commit

* piplock update

* piplock update

* comments done

* addressing comments

* addressing comments

aimmo-game/simulation/map_generator.py

@@ -39,8 +39,9 @@ def get_map(self):
         always_empty_location = Location(always_empty_edge_x, always_empty_edge_y)
 
         for cell in shuffled(world_map.all_cells()):
-            if cell.location != always_empty_location and random.random() < self.settings.get(
-                "OBSTACLE_RATIO", 0.1
+            if (
+                cell.location != always_empty_location
+                and random.random() < self.settings.get("OBSTACLE_RATIO", 0.1)
             ):
                 cell.obstacle = Obstacle.make_obstacle()
                 # So long as all habitable neighbours can still reach each other, then the

aimmo/worksheets.py

@@ -189,7 +189,13 @@ def next_turn(world_state, avatar_state):
 #
 #  New commands:
 #       - DropAction(index)
-#       - backpack.find(ARTEFACT)
+#       - backpack.find(ARTEFACT_TYPE)
+#
+#  Previous commands:
+#       - world_state.scan_nearby() -> LIST OF ARTEFACTS
+#       - MoveTowardsAction(ARTEFACT)
+#       - avatar_state.backpack -> LIST OF HELD ARTEFACTS
+#       - artefact.type -> TYPE
 #-------------------------------------------------------------------------------
 
 def next_turn(world_state, avatar_state):
@@ -261,19 +267,11 @@ def next_turn(world_state, avatar_state):
 
 
 def get_complete_worksheets() -> List[Worksheet]:
-    return [
-        worksheet
-        for worksheet in WORKSHEETS.values()
-        if worksheet.thumbnail_text != "Coming Soon"
-    ]
+    return [worksheet for worksheet in WORKSHEETS.values() if worksheet.thumbnail_text != "Coming Soon"]
 
 
 def get_incomplete_worksheets() -> List[Worksheet]:
-    return [
-        worksheet
-        for worksheet in WORKSHEETS.values()
-        if worksheet.thumbnail_text == "Coming Soon"
-    ]
+    return [worksheet for worksheet in WORKSHEETS.values() if worksheet.thumbnail_text == "Coming Soon"]
 
 
 def get_worksheets_excluding_id(id: int) -> List[Worksheet]:

game_frontend/src/babylon/assetPacks/ancient.ts

@@ -6,7 +6,7 @@ import {
   TransformNode,
   AbstractMesh,
   Scene,
-  Color4
+  Color4,
 } from 'babylonjs'
 import AssetPack from './assetPack'
 
@@ -15,12 +15,12 @@ export default class AncientAssetPack extends AssetPack {
 
   backgroundColor = new Color4(0.93, 0.89, 0.82)
 
-  constructor (era: string, scene: Scene) {
+  constructor(era: string, scene: Scene) {
     super(era, scene)
     this.obstacleMaterial = this.makeObstacleMaterial()
   }
 
-  async createInteractable (
+  async createInteractable(
     name: string,
     type: string,
     location: Vector3,
@@ -39,20 +39,20 @@ export default class AncientAssetPack extends AssetPack {
     interactable.position = location
     interactable.scaling = new Vector3(0.4, 0.4, 0.4)
     interactable.metadata = {
-      type: type
+      type: type,
     }
     return interactable
   }
 
-  makeObstacleMaterial (): StandardMaterial {
+  makeObstacleMaterial(): StandardMaterial {
     const material = new StandardMaterial(this.obstacleInfo.materialName, this.scene)
     material.diffuseTexture = new Texture(this.getTextureURL(1), this.scene)
     material.specularColor = new Color3(0, 0, 0)
     material.diffuseColor = new Color3(1, 1, 1)
     return material
   }
 
-  async createObstacle (
+  async createObstacle(
     name: string,
     location: Vector3,
     textureChoice: number,

game_frontend/src/babylon/assetPacks/modern.ts

@@ -69,16 +69,18 @@ export default class ModernAssetPack extends AssetPack {
     const obstacle = await super.createObstacle(name, location, textureChoice, parent)
     obstacle.material = this.obstacleMaterials[textureChoice - 1]
     obstacle.rotate(Axis.Y, this.createRandomRotation(), Space.WORLD)
+    obstacle.scaling = new Vector3(0.75, 1.3, 0.48)
     return obstacle
   }
 
   /**
    * This function returns a random angle in radians
    *
-   * @return {number} a random angle in radians, in increments of a quarter
+   * @return {number} a random angle in radians, in increments of half pi
    *
    */
+
   createRandomRotation(): number {
-    return Math.PI / (Math.floor(Math.random() * Math.floor(4)) + 1)
+    return (Math.PI * Math.floor(Math.random() * 4)) / 2
   }
 }

game_frontend/src/babylon/entities/avatarManager.ts

@@ -8,7 +8,7 @@ import {
   Vector3,
   ShaderMaterial,
   Scene,
-  Color3
+  Color3,
 } from 'babylonjs'
 import { Environment } from '../environment/environment'
 import { DiffItem } from '../diff'
@@ -28,7 +28,7 @@ export default class AvatarManager implements GameNode, DiffHandling {
   importMesh: Function
   shaderMaterial: ShaderMaterial
 
-  constructor (environment: Environment, importMesh: Function = SceneLoader.ImportMeshAsync) {
+  constructor(environment: Environment, importMesh: Function = SceneLoader.ImportMeshAsync) {
     this.importMesh = importMesh
     this.gameStateProcessor = new DiffProcessor(this)
 
@@ -41,7 +41,7 @@ export default class AvatarManager implements GameNode, DiffHandling {
     this.setupShaderMaterial()
   }
 
-  setupMarkerMaterial (): void {
+  setupMarkerMaterial(): void {
     this.markerMaterial = new StandardMaterial('avatar marker', this.scene)
     this.markerMaterial.diffuseTexture = new Texture(
       '/static/babylon/models/avatar_marker_texture.png',
@@ -50,14 +50,14 @@ export default class AvatarManager implements GameNode, DiffHandling {
     this.markerMaterial.specularColor = new Color3(0, 0, 0)
   }
 
-  setupShaderMaterial (): void {
+  setupShaderMaterial(): void {
     this.shaderMaterial = new ShaderMaterial(
       'Avatar shader',
       this.scene,
       '/static/babylon/models/toonshader',
       {
         attributes: ['position', 'normal', 'uv'],
-        uniforms: ['world', 'worldView', 'worldViewProjection', 'view', 'projection']
+        uniforms: ['world', 'worldView', 'worldViewProjection', 'view', 'projection'],
       }
     )
     this.shaderMaterial.setTexture(
@@ -66,14 +66,14 @@ export default class AvatarManager implements GameNode, DiffHandling {
     )
   }
 
-  remove (avatar: DiffItem): void {
+  remove(avatar: DiffItem): void {
     const toDelete = this.avatarNode.getChildMeshes(true, function (node): boolean {
       return node.name === `avatar: ${avatar.value.id}`
     })
     toDelete[0].dispose()
   }
 
-  async add (avatar: DiffItem) {
+  async add(avatar: DiffItem) {
     const { meshes } = await this.importMesh(
       'avatar',
       '/static/babylon/models/',
@@ -95,7 +95,7 @@ export default class AvatarManager implements GameNode, DiffHandling {
     }
   }
 
-  edit (avatar: DiffItem): void {
+  edit(avatar: DiffItem): void {
     const avatarToAnimate = this.avatarNode.getChildMeshes(true, function (node): boolean {
       return node.name === `avatar: ${avatar.value.id}`
     })[0]
@@ -117,7 +117,7 @@ export default class AvatarManager implements GameNode, DiffHandling {
     setOrientation(walkingAvatar, avatar.value.orientation)
   }
 
-  async attachMarker (avatarMesh: any) {
+  async attachMarker(avatarMesh: any) {
     const { meshes } = await this.importMesh(
       'avatar_marker',
       '/static/babylon/models/',
@@ -133,7 +133,7 @@ export default class AvatarManager implements GameNode, DiffHandling {
     marker.position = new Vector3(0, MARKER_HEIGHT, 0)
   }
 
-  setCurrentAvatarID (avatarID: number) {
+  setCurrentAvatarID(avatarID: number) {
     this.currentAvatarID = avatarID
   }
 }