Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Many changes to loot tables, expandable
Browse files Browse the repository at this point in the history
Fixed gun lockers
Added medical crate
Revamped domestic loot
Made good guns rarer
Fixed TODO compendium with added N14 unreasonably
Fixed triple parented fills
Added basic medical items to loot

Further revamped some numbers and items in fills and timed fills
BlueHNT committed Jul 23, 2024
1 parent faa9001 commit bd7901b
Showing 5 changed files with 1,094 additions and 778 deletions.
890 changes: 521 additions & 369 deletions Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml

Large diffs are not rendered by default.

890 changes: 521 additions & 369 deletions Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -131,62 +131,64 @@
state: Junk_12

# Loot Piles
# Currently the refilling mechanic does NOT work
#TODO: Fix the refilling until the doAfter gets made | change names from Refilling to Loot
- type: entity
parent: [ N14JunkPile1, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile1, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling1
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile2, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile2, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling2
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile3, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile3, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling3
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile4, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile4, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling4
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile5, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile5, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling5
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile6, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile6, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling6
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile7, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile7, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling7
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile8, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile8, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling8
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile9, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile9, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling9
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile10, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile10, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling10
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile11, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile11, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling11
suffix: Refilling,Random
suffix: Loot,Random

- type: entity
parent: [ N14JunkPile12, N14BaseSmallLockerTimedStorageFill ]
parent: [ N14JunkPile12, N14BaseSmallLockerStorageFill ]
id: N14JunkPile1Refilling12
suffix: Refilling,Random
suffix: Loot,Random
Original file line number Diff line number Diff line change
@@ -56,12 +56,12 @@
- type: Weldable

- type: entity
parent: [ N14ClosetGrey1, N14BaseLockerTimedStorageFill, N14TimedStorageFillDomestic ]
parent: [ N14ClosetGrey1, N14TimedStorageFillDomestic ]
id: N14ClosetGrey1Refilling
suffix: Refilling,Domestic,Random

- type: entity
parent: [ N14ClosetGrey1, N14BaseLockerStorageFill, N14StorageFillDomestic ]
parent: [ N14ClosetGrey1, N14StorageFillDomestic ]
id: N14LootClosetGrey1
suffix: Loot,Domestic,Random

@@ -73,12 +73,12 @@
sprite: _Nuclear14/Structures/Storage/Closets/closetgrey2.rsi

- type: entity
parent: [ N14ClosetGrey2, N14BaseLockerTimedStorageFill, N14TimedStorageFillDomestic ]
parent: [ N14ClosetGrey2, N14TimedStorageFillDomestic ]
id: N14ClosetGrey2Refilling
suffix: Refilling,Domestic,Random

- type: entity
parent: [ N14ClosetGrey2, N14BaseLockerStorageFill, N14StorageFillDomestic ]
parent: [ N14ClosetGrey2, N14StorageFillDomestic ]
id: N14LootClosetGrey2
suffix: Loot,Domestic,Random

@@ -92,12 +92,12 @@
sprite: _Nuclear14/Structures/Storage/Closets/closetold.rsi

- type: entity
parent: [ N14ClosetRusty, N14BaseLockerTimedStorageFill, N14TimedStorageFillDomestic ]
parent: [ N14ClosetRusty, N14TimedStorageFillDomestic ]
id: N14ClosetRustyRefilling
suffix: Refilling,Domestic,Random

- type: entity
parent: [ N14ClosetRusty, N14BaseLockerStorageFill, N14StorageFillDomestic ]
parent: [ N14ClosetRusty, N14StorageFillDomestic ]
id: N14LootClosetRusty
suffix: Loot,Domestic,Random

@@ -111,12 +111,12 @@
sprite: _Nuclear14/Structures/Storage/Closets/guncabinet.rsi

- type: entity
parent: [ N14ClosetGunCabinet, N14BaseLockerTimedStorageFill, N14BaseMilitaryTimedStorageFill ]
parent: [ N14ClosetGunCabinet, N14BaseMilitaryTimedStorageFill ]
id: N14ClosetGunCabinetRefilling
suffix: Refilling,Military,Random

- type: entity
parent: [ N14ClosetGunCabinet, N14BaseLockerStorageFill, N14StorageFillDomestic ]
parent: [ N14ClosetGunCabinet, N14StorageFillDomestic ]
id: N14LootClosetGunCabinet
suffix: Loot,Domestic,Random

@@ -158,12 +158,12 @@
- MachineLayer

- type: entity
parent: [ N14ClosetDouble, N14BaseLockerTimedStorageFill, N14TimedStorageFillDomestic ]
parent: [ N14ClosetDouble, N14TimedStorageFillDomestic ]
id: N14ClosetDoubleRefilling
suffix: Refilling,Domestic,Random

- type: entity
parent: [ N14ClosetDouble, N14BaseLockerStorageFill, N14StorageFillDomestic ]
parent: [ N14ClosetDouble, N14StorageFillDomestic ]
id: N14LootClosetDouble
suffix: Loot,Domestic,Random

@@ -201,12 +201,12 @@
- Wooden

- type: entity
parent: [ N14ClosetCabinetWood, N14BaseLockerTimedStorageFill, N14TimedStorageFillDomestic ]
parent: [ N14ClosetCabinetWood, N14TimedStorageFillDomestic ]
id: N14ClosetCabinetWoodRefilling
suffix: Refilling,Domestic,Random

- type: entity
parent: [ N14ClosetCabinetWood, N14BaseLockerStorageFill, N14StorageFillDomestic ]
parent: [ N14ClosetCabinetWood, N14StorageFillDomestic ]
id: N14LootClosetCabinetWood
suffix: Loot,Domestic,Random

Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@
sprite: _Nuclear14/Structures/Storage/Crates/crateenclave.rsi
- type: Sprite
sprite: _Nuclear14/Structures/Storage/Crates/crateenclave.rsi
# N14TODO: Will need an access locked variant.
# TODO: Will need an access locked variant.

- type: entity
parent: [ N14CrateEnclave, N14BaseMilitaryStorageFill ]
@@ -96,6 +96,16 @@
- type: Sprite
sprite: _Nuclear14/Structures/Storage/Crates/medicalcrate.rsi

- type: entity
parent: [ N14CrateMedical, N14StorageFillMedical ]
id: N14LootCrateMedical
suffix: Loot, Medical

- type: entity
parent: [ N14CrateMedical, N14TimedStorageFillMedical ]
id: N14CrateMedicalRefilling
suffix: Refilling, Medical

- type: entity
parent: CrateGenericSteel
id: N14CrateRed
@@ -365,7 +375,7 @@
containers:
storagebase: !type:Container
ents: []
# N14TODO: Add crate deconstruction
# TODO: Add crate deconstruction

- type: entity
parent: N14CrateBreakBase
@@ -389,7 +399,7 @@
suffix: plain damaged
components:
- type: Sprite
state: plain_crate-1 # N14TODO: Make this random between states -1, -2 and -3
state: plain_crate-1 # TODO: Make this random between states -1, -2 and -3

- type: entity
parent: N14CrateBreakBase
@@ -421,4 +431,4 @@
suffix: damaged
components:
- type: Sprite
state: army_crate-1 # N14TODO: Make this random between states -1 and -2
state: army_crate-1 # TODO: Make this random between states -1 and -2

0 comments on commit bd7901b

Please sign in to comment.