Randomized ATV sprite color, storage options for ATV/Bike, Hoverbike (#…

…1212)

* ATV/Bike Inventory

* Update buckleable.yml

* random ATV hull colors, bag slot

* more fixes

* are you proud of me now, yml linter?

* reverted changes to original files and made NF specific version of ATV

* small change to NF ATV meta file

* reverted added motorbike

* more colors

* hoverbike

* void-capable hoverbike

* nfsd and mail carrier hoverbikes

* changed parenting

* tweaked sprites a bit

* updated atv sprite

* updated hoverbike sprites a bt

* adjusted bag sprite position on atv

* added unshaded lights layer, some fixes

* bumped price to 15k

---------

Co-authored-by: Dvir <[email protected]>

Resources/Prototypes/Catalog/Fills/Crates/fun.yml

@@ -191,7 +191,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: VehicleATV
+      - id: VehicleATVNF # Frontier
       - id: VehicleKeyATV
 
 - type: entity

Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml

@@ -38,7 +38,7 @@
         state: keys
   - type: ConditionalSpawner
     prototypes:
-      - VehicleATV
+      - VehicleATVNF # Frontier
 
 - type: entity
   name: Motobike Spawner
@@ -52,7 +52,7 @@
         state: keys
   - type: ConditionalSpawner
     prototypes:
-      - VehicleSkeletonMotorcycle
+      - VehicleSkeletonMotorcycleNF # Frontier
 
 - type: entity
   name: Wheelchair Spawner

Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml

@@ -223,6 +223,7 @@
   id: VehicleATV
   name: ATV
   description: All-Tile Vehicle.
+  noSpawn: true # Frontier, using VehicleATVNF instead
   components:
   - type: Vehicle
     southOver: true
@@ -314,6 +315,7 @@
   id: VehicleSkeletonMotorcycle
   name: skeleton motorcycle
   description: Bad to the Bone.
+  noSpawn: true # Frontier, using VehicleSkeletonMotorcycleNF instead
   components:
     - type: Vehicle
       southOver: true

Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml

@@ -8,3 +8,12 @@
   category: cargoproduct-category-name-fun
   group: market
 
+- type: cargoProduct
+  id: FunHoverbikeNF
+  icon:
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    state: vehicle
+  product: CrateFunHoverbikeNF
+  cost: 15000
+  category: Fun
+  group: market

Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml

@@ -24,3 +24,14 @@
         amount: 30
         prob: 1
         orGroup: FloorTileItemArcadeBlue
+
+- type: entity
+  id: CrateFunHoverbikeNF
+  parent: CrateLivestock
+  name: hoverbike crate
+  description: Harder, better, faster, stronger? No, just faster, faster, faster.
+  components:
+  - type: StorageFill
+    contents:
+      - id: VehicleHoverbikeNF
+      - id: VehicleKeyHoverbikeNF

Resources/Prototypes/_NF/Entities/Markers/Spawners/vehicles.yml

@@ -0,0 +1,13 @@
+- type: entity
+  name: hoverbike spawner
+  id: SpawnVehicleHoverbikeNF
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _NF/Objects/Vehicles/hoverbike.rsi
+      state: vehicle
+  - type: ConditionalSpawner
+    prototypes:
+    - VehicleHoverbikeNF

Resources/Prototypes/_NF/Entities/Objects/Vehicles/keys.yml

@@ -0,0 +1,15 @@
+- type: entity
+  parent: BaseItem
+  id: VehicleKeyHoverbikeNF
+  name: hoverbike keys
+  description: Cute bibelot.
+  components:
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - VehicleKey
+    - HoverbikeKeys
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    state: keys

Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml

@@ -0,0 +1,273 @@
+# Base game vehicles
+- type: entity
+  parent: VehicleATV
+  id: VehicleATVNF
+  name: ATV
+  description: All-Tile Vehicle.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/atv.rsi
+    layers:
+    - state: hull
+      map: [ "enum.DamageStateVisualLayers.Base" ]
+    - state: engine
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+    - state: lights
+      shader: unshaded
+    noRot: true
+  - type: RandomSprite
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          hull: Sixteen # Rainbow, Emagged, Departmental, Advanced
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - ATVKeys
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -3
+      bag:
+        name: stored bag
+        whitelist:
+          components:
+            - Storage
+        priority: 2
+        insertSound:
+          path: /Audio/Items/belt_equip.ogg
+          params:
+            volume: -3
+  - type: ItemMapper
+    mapLayers:
+      bag:
+        whitelist:
+          components:
+            - Storage
+    sprite: _NF/Objects/Vehicles/atv.rsi
+  - type: Appearance
+
+- type: entity
+  parent: VehicleSkeletonMotorcycle
+  id: VehicleSkeletonMotorcycleNF
+  name: skeleton motorcycle
+  description: Bad to the Bone.
+  components:
+    - type: Storage
+      grid:
+      - 0,0,1,3
+      - 3,0,6,3
+      - 8,0,9,3
+      maxItemSize: Large
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+    - type: UserInterface
+      interfaces:
+      - key: enum.StorageUiKey.Key
+        type: StorageBoundUserInterface
+
+# New Frontier vehicles
+- type: entity
+  parent: VehicleATVNF
+  id: VehicleHoverbikeNF
+  name: hoverbike
+  description: A turbine with bike handles. Very safe.
+  components:
+  - type: MovementIgnoreGravity
+  - type: MovementAlwaysTouching
+  - type: CanMoveInAir
+  - type: AmbientSound
+    sound: /Audio/Effects/shuttle_thruster.ogg
+    range: 8
+    volume: 5
+    enabled: false
+  - type: Strap
+    buckleOffset: "0.1, -0.05"
+    maxBuckleDistance: 1
+  - type: MovementSpeedModifier
+    acceleration: 2
+    friction: 1.5
+    baseWalkSpeed: 4.5
+    baseSprintSpeed: 7
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    layers:
+    - state: hull
+      map: [ "enum.DamageStateVisualLayers.Base" ]
+    - state: engine
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+    - state: lights
+      shader: unshaded
+    noRot: true
+  - type: RandomSprite
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          hull: Sixteen # Rainbow, Emagged, Departmental, Advanced
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      bag:
+        name: stored bag
+        whitelist:
+          components:
+            - Storage
+        priority: 2
+        insertSound:
+          path: /Audio/Items/belt_equip.ogg
+          params:
+            volume: -3
+  - type: ItemMapper
+    mapLayers:
+      bag:
+        whitelist:
+          components:
+            - Storage
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+  - type: Appearance
+  - type: PointLight
+    radius: 7
+    energy: 3
+
+# Mail carrier
+- type: entity
+  parent: VehicleSkeletonMotorcycleNF
+  id: VehicleHoverbikeMailcarrier
+  name: mail carrier hoverbike
+  description: You better run, better run, faster than my mail.
+  components:
+  - type: MovementIgnoreGravity
+  - type: MovementAlwaysTouching
+  - type: CanMoveInAir
+  - type: AmbientSound
+    sound: /Audio/Effects/shuttle_thruster.ogg
+    range: 8
+    volume: 5
+    enabled: false
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    layers:
+    - state: hull
+      color: "#8fd3ff"
+    - state: engine
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+    - state: mailtrim
+    - state: lights
+      shader: unshaded
+    noRot: true
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      mailgun:
+        name: rpds
+        whitelist:
+          components:
+            - Gun # Any gun :(, including RPDS
+        priority: 2
+  - type: ItemMapper
+    mapLayers:
+      mailgun:
+        whitelist:
+          components:
+            - Gun
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+  - type: Appearance
+  - type: PointLight
+    enabled: false
+    radius: 6
+    energy: 3
+
+# NFSD
+- type: entity
+  parent: VehicleHoverbikeMailcarrier
+  id: VehicleHoverbikeNfsd
+  name: nfsd hoverbike
+  description: An NFSD issued turbine with bike handles. Very safe.
+  components:
+  - type: Vehicle
+    northOver: true
+    westOver: true
+    eastOver: true
+    northOverride: -0.1
+    southOverride: 0.1
+    hornSound:
+      path: /Audio/Effects/Vehicle/policesiren.ogg
+  - type: MovementSpeedModifier # Very petty on my end
+    acceleration: 1.9
+    friction: 1.4
+    baseWalkSpeed: 4.3
+    baseSprintSpeed: 6.8
+  - type: Sprite
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+    layers:
+    - state: hull
+      color: "#49633d"
+    - state: engine
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+    - state: nfsdstar
+    - state: lights
+      shader: unshaded
+    noRot: true
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - HoverbikeKeys
+        priority: 1
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -5
+      nfsdbaton:
+        name: stunbaton
+        whitelist:
+          components:
+            - Stunbaton
+        priority: 2
+  - type: ItemMapper
+    mapLayers:
+      nfsdbaton:
+        whitelist:
+          components:
+            - Stunbaton
+    sprite: _NF/Objects/Vehicles/hoverbike.rsi
+  - type: Appearance
+  - type: RotatingLight
+    speed: 190
+  - type: PointLight
+    enabled: false
+    radius: 6
+    energy: 2
+    color: "#FF4020"
+    mask: /Textures/Effects/LightMasks/double_cone.png

Resources/Prototypes/_NF/tags.yml

@@ -62,4 +62,7 @@
   id: DroneUsable
 
 - type: Tag
-  id: LightReplacer
+  id: LightReplacer
+
+- type: Tag
+  id: HoverbikeKeys

Resources/Textures/Objects/Vehicles/atv.rsi/meta.json

@@ -41,4 +41,4 @@
       "name": "keys"
     }
   ]
-}
+}