Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Caravan Update: Prices, Stock, and Intention #778

Merged
merged 5 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Head/welding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Steel: 200
Glass: 100
- type: StaticPrice
price: 50
price: 5 #N14
- type: Tag
tags:
- WhitelistChameleon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
enum.StorageUiKey.Key:
type: StorageBoundUserInterface
- type: StaticPrice
price: 70
price: 20 #N14

- type: entity
abstract: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
- type: Damageable
damageContainer: Inorganic
- type: StaticPrice
price: 50
price: 5 #N14

- type: entity
abstract: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- Trash
- type: SpaceGarbage
- type: StaticPrice
price: 5
price: 0 #N14
- type: InjectableSolution
solution: smokable

Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Objects/Fun/crayons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
- ReagentId: MindbreakerToxin
Quantity: 2
- type: StaticPrice
price: 5
price: 0 #N14

- type: entity
parent: Crayon
Expand Down Expand Up @@ -287,3 +287,5 @@
tags:
- CrayonWhite
- type: Appearance
- type: StaticPrice
price: 0
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Materials/parts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
- type: StaticPrice
price: 0
- type: StackPrice
price: 5
price: 0
- type: Extractable
grindableSolutionName: rod
- type: SolutionContainerManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
stackType: Bloodpack
count: 15 #Was 10, Buffed due to limb damage changes
- type: StackPrice
price: 20 #Was 10, Buffed due to limb damage changes
price: 0 #N14

- type: entity
parent: Bloodpack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
True: {visible: false}
False: {visible: true}
- type: StaticPrice
price: 120
price: 20 #N14

- type: entity
parent: RollerBed
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Reagents/Consumable/Food/food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
amount: 1.5
- !type:PlantAdjustHealth
amount: 0.75
pricePerUnit: 2
pricePerUnit: 0 #N14

- type: reagent
id: Vitamin #Anything "healthy"
Expand Down Expand Up @@ -45,7 +45,7 @@
amount: 0.5
- !type:PlantAdjustHealth
amount: 1.5
pricePerUnit: 2.5
pricePerUnit: .625

- type: reagent
id: Protein #Meat and beans
Expand All @@ -66,7 +66,7 @@
- !type:ModifyBloodLevel
amount: 1 # weaker than iron but pretty good all things considered
- !type:SatiateHunger
pricePerUnit: 3
pricePerUnit: 0

- type: reagent
id: Sugar #Candy and grains
Expand Down
191 changes: 186 additions & 5 deletions Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,190 @@

- type: cargoProduct
id: SmallGameRifleCrate
id: WebleyPistolCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi
sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/webleypistol.rsi
state: base
product: N14CrateArmyFilledSmallGameRifle
cost: 100
product: N14CrateBreakPlainFilledWebley9mmPistol
cost: 70
category: Armory
group: market
group: market

- type: cargoProduct
id: WebleyRevolverCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/webley_revolver.rsi
state: base
product: N14CrateBreakPlainFilledWebley44revolver
cost: 280
category: Armory
group: market

- type: cargoProduct
id: C70RifleCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/canadianrifle.rsi
state: base
product: N14CrateBreakPlainFilledC70
cost: 600
category: Armory
group: market

- type: cargoProduct
id: F2RifleCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/canadianmarksman.rsi
state: base
product: N14CrateBreakPlainFilledF2
cost: 600
category: Armory
group: market

- type: cargoProduct
id: F1RifleCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/canadiansniper.rsi
state: base
product: N14CrateRedFilledF1
cost: 375
category: Armory
group: market

- type: cargoProduct
id: RossRifleCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/ross.rsi
state: base
product: N14CrateRedFilledRoss
cost: 340
category: Armory
group: market

- type: cargoProduct
id: FrenchiShotgunCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Shotguns/canadian_shotgun.rsi
state: icon
product: N14CrateBreakPlainFilledFrenchi
cost: 550
category: Armory
group: market

- type: cargoProduct
id: StenSMGCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/canadianSMG.rsi
state: base
product: N14CrateBreakPlainFilledSten
cost: 190
category: Armory
group: market

- type: cargoProduct
id: DouglasSMGCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/canadianadvanceSMG.rsi
state: base
product: N14CrateBreakPlainFilledDouglas
cost: 500
category: Armory
group: market

- type: cargoProduct
id: CanadianHMGCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/canadianhmg.rsi
state: base
product: N14CrateBreakPlainFilledHMG
cost: 775
category: Armory
group: market

- type: cargoProduct
id: BrenHMGCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/bren.rsi
state: base
product: N14CrateBreakPlainFilledBren
cost: 750
category: Armory
group: market

- type: cargoProduct
id: C4Crate
icon:
sprite: Objects/Weapons/Bombs/c4.rsi
state: icon
product: N14CrateBreakPlainFilledC4
cost: 400
category: Armory
group: market

- type: cargoProduct
id: EnergyCellCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/EC.rsi
state: o2
product: N14CrateBreakPlainFilledEnergyCell
cost: 230
category: Armory
group: market

- type: cargoProduct
id: MFCellCrate
icon:
sprite: _Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi
state: empty
product: N14CrateBreakPlainFilledMFCell
cost: 260
category: Armory
group: market

- type: cargoProduct
id: CombatArmorMK1Crate
icon:
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutcombat.rsi
state: icon
product: N14CrateRedFilledMk1
cost: 500
category: Armory
group: market

- type: cargoProduct
id: CombatArmorMK2Crate
icon:
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutcombatmk2.rsi
state: icon
product: N14CrateRedFilledMk2
cost: 700
category: Armory
group: market

- type: cargoProduct
id: PoliceVestCrate
icon:
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi
state: icon
product: N14CrateBreakPlainFilledPoliceVest
cost: 400
category: Armory
group: market

- type: cargoProduct
id: CarrierCrate
icon:
sprite: Clothing/Belt/salvagewebbing.rsi
state: icon
product: N14CrateRedFilledCarrier
cost: 160
category: Armory
group: market

- type: cargoProduct
id: GrenadierCrate
icon:
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
state: frag
product: N14CrateBreakPlainFilledGrenadier
cost: 150
category: Armory
group: market
Loading
Loading