Skip to content

Commit

Permalink
Wells, Flags, Dirty Water and other assets (Vault-Overseers#179)
Browse files Browse the repository at this point in the history
* dirty and irradiated water localisation

(cherry picked from commit 95b5614)

# Conflicts:
#	Resources/Locale/en-US/Nuclear14/reagents.ftl

* Adds well variants

boarded, clean, dirty, irradiated wells.

(cherry picked from commit 999fdcd)

* adds bikes and assets for other vehicles / structures

(cherry picked from commit 4e7b42e)

* adds a fire extinguisher cabinet

(cherry picked from commit d04b370)

* adds a well for decoration

(cherry picked from commit b2287fa)

* adds APC, SMES and other sprites to be used later

* updates well sprites and reagent damage

* adds a bunch of new flags

* comments out vehicles and fixes meta file

* fix names / descriptions on wells

* adds wall and floor torches

* adds two vehicle wrecks that can be broken for metal.
  • Loading branch information
Peptide90 authored Apr 24, 2024
1 parent 5557c4a commit aa21575
Show file tree
Hide file tree
Showing 113 changed files with 1,365 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/Nuclear14/reagents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ reagent-name-rad-particle-food = radioactive contamination
reagent-desc-rad-particle-food = Too much will make you sick of living.
# Drinks
reagent-name-water-dirty = dirty water
reagent-desc-water-dirty = Looks murky.
reagent-name-water-irradiated = irradiated water
reagent-desc-water-irradiated = That'll put arms on your chest.
## Soda
reagent-name-nuka-cola = Nuka-Cola
reagent-desc-nuka-cola = Nuka-Cola brand soda from before war. Sugary goodness.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# See Structures/Decoration and wallmounts for non wield flags.
- type: entity
parent: BaseItem
id: N14DecorationFlagpoleNCR
name: NCR flag pole
description: An NCR flag on a wooden pole.
components:
- type: Sprite
sprite: Nuclear14/Objects/Decoration/Flags/ncr_flagpole.rsi
state: icon
noRot: true
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 5
Structural: 10
- type: Item
size: Huge
- type: UseDelay
delay: 1
- type: Damageable
damageModifierSet: Wood
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:PlaySoundBehavior
sound:
collection: WoodDestroy
- !type:DoActsBehavior
acts: [ "Destruction" ]
# N14TODO: Needs inhands sprites
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# - type: entity
# parent: BaseVehicle
# id: N14VehicleBikeGreen
# name: green motorbike
# description: A clean green motorbike.
# components:
# - type: Vehicle
# northOverride: -0.1
# southOverride: 0.1
# - type: Sprite
# sprite: N14/Objects/Vehicles/bikesbuggy.rsi
# layers:
# - state: bike2
# map: ["enum.VehicleVisualLayers.AutoAnimate"]
# netsync: false
# noRot: true
# # - type: RandomMetadata
# # descriptionSegments: [ATVDescriptions]
# - type: MovementSpeedModifier
# acceleration: 1
# friction: 1
# baseWalkSpeed: 4.5
# baseSprintSpeed: 7
# - type: Strap
# buckleOffset: "0.1, -0.05"
# maxBuckleDistance: 1
# - type: UnpoweredFlashlight
# toggleAction:
# name: action-name-toggle-light
# description: action-description-toggle-light
# icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
# iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
# event: !type:ToggleActionEvent
# - type: PointLight
# enabled: false
# radius: 3.5
# softness: 2
# mask: /Textures/Effects/LightMasks/cone.png
# autoRot: true
# - type: ItemSlots
# slots:
# key_slot:
# name: Keys
# whitelist:
# requireAll: true
# tags:
# - VehicleKey
# - ATVKeys # TODO: Change this
# insertSound:
# path: /Audio/Effects/Vehicle/vehiclestartup.ogg
# params:
# volume: -3

# - type: entity
# parent: N14VehicleBikeGreen
# id: N14VehicleBikeFlamey
# name: flamey motorbike
# description: A motorbike with a flame decal.
# components:
# - type: Vehicle
# northOverride: -0.1
# southOverride: 0.1
# - type: Sprite
# layers:
# - state: bike_flamey2
# map: ["enum.VehicleVisualLayers.AutoAnimate"]

# - type: entity
# parent: N14VehicleBikeGreen
# id: N14VehicleBikeGreen2
# name: flamey motorbike
# description: A green motorbike.
# components:
# - type: Vehicle
# northOverride: -0.1
# southOverride: 0.1
# - type: Sprite
# layers:
# - state: bike_green
# map: ["enum.VehicleVisualLayers.AutoAnimate"]

# - type: entity
# parent: N14VehicleBikeGreen
# id: N14VehicleBikeRustLight
# name: rusty motorbike
# description: A rusty motorbike.
# components:
# - type: Vehicle
# northOverride: -0.1
# southOverride: 0.1
# - type: Sprite
# layers:
# - state: bike_rust_light
# map: ["enum.VehicleVisualLayers.AutoAnimate"]

# - type: entity
# parent: N14VehicleBikeGreen
# id: N14VehicleBikeRustMedium
# name: rusty motorbike
# description: A really rusty motorbike.
# components:
# - type: Vehicle
# northOverride: -0.1
# southOverride: 0.1
# - type: Sprite
# layers:
# - state: bike_rust_med
# map: ["enum.VehicleVisualLayers.AutoAnimate"]

# - type: entity
# parent: N14VehicleBikeGreen
# id: N14VehicleBikeScrambler
# name: scrambler motorbike
# description: A scrambler type motorbike.
# components:
# - type: Vehicle
# northOverride: -0.1
# southOverride: 0.1
# - type: Sprite
# layers:
# - state: bike_scrambler2
# map: ["enum.VehicleVisualLayers.AutoAnimate"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
- type: entity
parent: BaseStructure
id: N14VehicleBikeRust1
name: rusted bike
description: Cool bike if it wasn't rusted and missing wheels.
components:
- type: Sprite
sprite: Nuclear14/Objects/Vehicles/bikesbuggy.rsi
state: bike_rust_med_no_wheels
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.8,-1,-0.4,1"
density: 100
mask:
- MachineMask
layer:
- MidImpassable
- LowImpassable
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 2

- type: entity
parent: N14VehicleBikeRust1
id: N14VehicleCarWreck
name: wrecked car
description: Cool bike if it wasn't rusted and missing wheels.
components:
- type: Sprite
state: derelict
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.6,-1,0.2,1"
density: 100
mask:
- MachineMask
layer:
- MidImpassable
- LowImpassable
Loading

0 comments on commit aa21575

Please sign in to comment.