Added 18 new bounties to cargo (#26160)

* Added 18 new bounties + tags, couple of balance tweaks * Oops, 2 corn tags. * Fixed another duplicate from merge conflict * Fixed all arbitrage issues * Removed metamorphic glass/manly dorf bounty * Removed manly dorf bounty * Removed manly dorf bounty * Removed manly dorf bounty * Changed hiviz tag, removed commented out bounty * Removed extra line * Change HiViz tag * Removed unused tag * Removed LaceupShoes, changed HiViz * Changed flavor text for fruit bounty * Removed live mouse bounty
2024-03-17 12:06:16 -05:00
parent f259f2f3a2
commit 4357b9ef08
19 changed files with 373 additions and 22 deletions
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -347,11 +347,11 @@

 - type: cargoBounty
  id: BountyRadio
-  reward: 7500
+  reward: 6500
  description: bounty-description-radio
  entries:
  - name: bounty-item-radio
-    amount: 12
+    amount: 7
    whitelist:
      components:
      - Headset
@@ -536,7 +536,7 @@
  description: bounty-description-lasergun
  idPrefix: IV
  entries:
-  - name: bounty-lasergun
+  - name: bounty-item-lasergun
    amount: 6
    whitelist:
      components:
@@ -548,8 +548,185 @@
  description: bounty-description-food
  idPrefix: UNTH
  entries:
-  - name: bounty-food
+  - name: bounty-item-food
    amount: 30
    whitelist:
      tags:
      - Meat
+
+- type: cargoBounty
+  id: BountyFruit
+  reward: 5000
+  description: bounty-description-fruit
+  entries:
+  - name: bounty-item-fruit
+    amount: 12
+    whitelist:
+      tags:
+      - Fruit
+
+- type: cargoBounty
+  id: BountyVegetable
+  reward: 6000
+  description: bounty-description-vegetable
+  entries:
+  - name: bounty-item-vegetable
+    amount: 14
+    whitelist:
+      tags:
+      - Vegetable
+
+- type: cargoBounty
+  id: BountyChili
+  reward: 5555
+  description: bounty-description-chili
+  entries:
+  - name: bounty-item-chili
+    amount: 3
+    whitelist:
+      tags:
+      - ChiliBowl
+
+- type: cargoBounty
+  id: BountyRollerskates
+  reward: 6500
+  description: bounty-description-rollerskates
+  entries:
+  - name: bounty-item-rollerskates
+    amount: 2
+    whitelist:
+      components:
+      - Skates
+
+- type: cargoBounty
+  id: BountyBedsheet
+  reward: 4100
+  description: bounty-description-bedsheet
+  entries:
+  - name: bounty-item-bedsheet
+    amount: 5
+    whitelist:
+      tags:
+      - Bedsheet
+
+- type: cargoBounty
+  id: BountyBandana
+  reward: 4000
+  description: bounty-description-bandana
+  entries:
+  - name: bounty-item-bandana
+    amount: 7
+    whitelist:
+      tags:
+      - Bandana
+
+- type: cargoBounty
+  id: BountySteak
+  reward: 3200
+  description: bounty-description-steak
+  entries:
+  - name: bounty-item-steak
+    amount: 4
+    whitelist:
+      tags:
+      - Steak
+
+- type: cargoBounty
+  id: BountyBanana
+  reward: 6009
+  description: bounty-description-banana
+  entries:
+  - name: bounty-item-banana
+    amount: 9
+    whitelist:
+      tags:
+      - Banana
+
+- type: cargoBounty
+  id: BountyBeer
+  reward: 3100
+  description: bounty-description-beer
+  entries:
+  - name: bounty-item-beer
+    amount: 6
+    whitelist:
+      tags:
+      - Beer
+
+- type: cargoBounty
+  id: BountyHiVizVest
+  reward: 3030
+  description: bounty-description-hi-viz-vest
+  entries:
+  - name: bounty-item-hi-viz-vest
+    amount: 3
+    whitelist:
+      tags:
+      - HiViz
+
+- type: cargoBounty
+  id: BountyTorch
+  reward: 2220
+  description: bounty-description-torch
+  entries:
+  - name: bounty-item-torch
+    amount: 6
+    whitelist:
+      tags:
+      - Torch
+
+- type: cargoBounty
+  id: BountyMedkitBox
+  reward: 2300
+  description: bounty-description-medkit-box
+  entries:
+  - name: bounty-item-medkit-box
+    amount: 4
+    whitelist:
+      tags:
+      - Medkit
+
+- type: cargoBounty
+  id: BountyCardboardBox
+  reward: 1500
+  description: bounty-description-cardobard-box
+  entries:
+  - name: bounty-item-cardboard-box
+    amount: 12
+    whitelist:
+      tags:
+      - BoxCardboard
+
+- type: cargoBounty
+  id: BountyWine
+  reward: 3000
+  description: bounty-description-wine
+  entries:
+  - name: bounty-item-wine
+    amount: 2
+    whitelist:
+      tags:
+      - Wine
+
+- type: cargoBounty
+  id: BountyCottonBoll
+  reward: 8600
+  description: bounty-description-cotton-boll
+  entries:
+  - name: bounty-item-cotton-boll
+    amount: 9
+    whitelist:
+      tags:
+      - CottonBoll
+
+- type: cargoBounty
+  id: BountyMicrowaveMachineBoard
+  reward: 4000
+  description: bounty-description-microwave-machine-board
+  entries:
+  - name: bounty-item-microwave-machine-board
+    amount: 2
+    whitelist:
+      tags:
+      - MicrowaveMachineBoard
+
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -14,6 +14,9 @@
    - 0,0,2,2
  - type: Sprite
    state: box
+  - type: Tag
+    tags:
+    - BoxCardboard

 - type: entity
  name: mousetrap box
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -20,6 +20,9 @@
    - state: icon_mask
      map: [ "unfoldedLayer" ]
      visible: false
+  - type: Tag
+    tags:
+    - Bandana

 - type: entity
  parent: [ClothingHeadBandBase, ClothingMaskBandBlack]
@@ -69,4 +72,4 @@
 - type: entity
  parent: [ClothingHeadBandBase, ClothingMaskBandBrown]
  id: ClothingHeadBandBrown
-  name: brown bandana
+  name: brown bandana
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -24,6 +24,7 @@
      visible: false
  - type: Tag
    tags:
+    - Bandana
    - HidesNose

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -63,6 +63,9 @@
    sprite: Clothing/OuterClothing/Vests/hazard.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Vests/hazard.rsi
+  - type: Tag
+    tags:
+    - HiViz

 #(Bartender) vest
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -202,7 +202,7 @@
  - type: FootstepModifier
    footstepSoundCollection:
      collection: FootstepSpurs
-      
+
 - type: entity
  parent: ClothingShoesBootsCowboyBrown
  id: ClothingShoesBootsCowboyBlack
@@ -212,7 +212,7 @@
    sprite: Clothing/Shoes/Boots/cowboybootsblack.rsi
  - type: Clothing
    sprite: Clothing/Shoes/Boots/cowboybootsblack.rsi
-    
+
 - type: entity
  parent: ClothingShoesBootsCowboyBrown
  id: ClothingShoesBootsCowboyWhite
@@ -222,7 +222,7 @@
    sprite: Clothing/Shoes/Boots/cowboybootswhite.rsi
  - type: Clothing
    sprite: Clothing/Shoes/Boots/cowboybootswhite.rsi
-    
+
 - type: entity
  parent: ClothingShoesBootsCowboyBrown
  id: ClothingShoesBootsCowboyFancy
@@ -231,4 +231,4 @@
  - type: Sprite
    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
  - type: Clothing
-    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
+    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -369,6 +369,9 @@
  - type: Icon
    sprite: Objects/Consumable/Drinks/beerglass.rsi
    state: icon
+  - type: Tag
+    tags:
+    - Beer

 - type: entity
  parent: DrinkGlass
@@ -943,6 +946,9 @@
  - type: Icon
    sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
    state: icon
+  - type: Tag
+    tags:
+    - Beer

 - type: entity
  parent: DrinkGlass
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -355,6 +355,9 @@
  - type: Sprite
    sprite: Objects/Consumable/Drinks/pwinebottle.rsi
  - type: Sealable
+  - type: Tag
+    tags:
+    - Wine

 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -501,6 +504,9 @@
  - type: Sprite
    sprite: Objects/Consumable/Drinks/winebottle.rsi
  - type: Sealable
+  - type: Tag
+    tags:
+    - Wine

 # Small Bottles

@@ -523,6 +529,9 @@
    sprite: Objects/Consumable/Drinks/beer.rsi
  - type: Openable
    closeable: false
+  - type: Tag
+    tags:
+    - Beer

 - type: entity
  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -543,6 +552,9 @@
    sprite: Objects/Consumable/Drinks/beer.rsi
  - type: Openable
    closeable: false
+  - type: Tag
+    tags:
+    - Beer


 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -182,6 +182,9 @@
    sprite: Objects/Consumable/Drinks/rootbeer.rsi
  - type: Item
    sprite: Objects/Consumable/Drinks/rootbeer.rsi
+  - type: Tag
+    tags:
+    - Beer

 - type: entity
  parent: DrinkCanBaseFull
@@ -480,6 +483,9 @@
    sprite: Objects/Consumable/Drinks/beer_can.rsi
  - type: Item
    sprite: Objects/Consumable/Drinks/beer_can.rsi
+  - type: Tag
+    tags:
+    - Beer

 - type: entity
  parent: DrinkCanBaseFull
@@ -499,3 +505,6 @@
    sprite: Objects/Consumable/Drinks/wine_can.rsi
  - type: Item
    sprite: Objects/Consumable/Drinks/wine_can.rsi
+  - type: Tag
+    tags:
+    - Wine
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -718,6 +718,7 @@
    tags:
    - Cooked
    - Meat
+    - Steak
  - type: Sprite
    layers:
    - state: plain-cooked
@@ -777,6 +778,7 @@
    tags:
    - Cooked
    - Meat
+    - Steak
  - type: Sprite
    layers:
    - state: product-cooked
@@ -945,6 +947,7 @@
    tags:
    - Cooked
    - Meat
+    - Steak
  - type: Sprite
    layers:
    - state: goliath-cooked
@@ -974,6 +977,7 @@
    tags:
    - Cooked
    - Meat
+    - Steak
  - type: Sprite
    layers:
    - state: rouny-cooked
@@ -999,6 +1003,7 @@
    tags:
    - Cooked
    - Meat
+    - Steak
  - type: Sprite
    layers:
    - state: lizard-cooked
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -124,6 +124,9 @@
    sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
  - type: Produce
    seedId: laughinPea
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: tower-cap log
@@ -258,6 +261,7 @@
  - type: Tag
    tags:
    - Fruit
+    - Banana

 - type: entity
  name: mimana
@@ -413,6 +417,7 @@
  - type: Tag
    tags:
    - Carrot
+    - Vegetable
  - type: SolutionContainerManager
    solutions:
      food:
@@ -458,6 +463,9 @@
    sprite: Objects/Specific/Hydroponics/cabbage.rsi
  - type: Produce
    seedId: cabbage
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: garlic
@@ -483,6 +491,9 @@
    sprite: Objects/Specific/Hydroponics/garlic.rsi
  - type: Produce
    seedId: garlic
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: lemon
@@ -658,6 +669,8 @@
  - type: Tag
    tags:
    - Potato
+    - Vegetable
+

 - type: entity
  name: tomato
@@ -712,6 +725,7 @@
  - type: Tag
    tags:
    - Fruit
+    - Vegetable

 - type: entity
  name: blue tomato
@@ -756,6 +770,7 @@
  - type: Tag
    tags:
    - Fruit
+    - Vegetable

 - type: entity
  name: blood tomato
@@ -798,6 +813,7 @@
  - type: Tag
    tags:
    - Fruit # Fuck you they're a fruit
+    - Vegetable

 - type: entity
  name: eggplant
@@ -824,6 +840,7 @@
  - type: Tag
    tags:
    - Fruit
+    - Vegetable

 - type: entity
  name: apple
@@ -912,6 +929,7 @@
  - type: Tag
    tags:
    - Corn
+    - Vegetable
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/corn.rsi
  - type: Produce
@@ -974,6 +992,9 @@
  - type: SliceableFood
    count: 5
    slice: FoodOnionSlice
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: red onion
@@ -1002,6 +1023,9 @@
  - type: SliceableFood
    count: 5
    slice: FoodOnionRedSlice
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: chanterelle cluster
@@ -1019,6 +1043,9 @@
    sprite: Objects/Specific/Hydroponics/chanterelle.rsi
  - type: Produce
    seedId: chanterelle
+  - type: Tag
+    tags:
+    - Vegetable

 # Slices

@@ -1129,6 +1156,9 @@
      sprite: Objects/Specific/Hydroponics/chili.rsi
    - type: Produce
      seedId: chili
+    - type: Tag
+      tags:
+      - Vegetable

 - type: entity
  name: chilly pepper
@@ -1180,6 +1210,9 @@
    seedId: aloe
  - type: Extractable
    grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: poppy
@@ -1459,6 +1492,9 @@
      reagents:
      - ReagentId: MilkSoy
        Quantity: 5
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: spaceman's trumpet
@@ -1512,6 +1548,9 @@
      reagents:
      - ReagentId: CarpoToxin
        Quantity: 2
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: watermelon
@@ -1604,9 +1643,6 @@
      reagents:
      - ReagentId: JuiceWatermelon
        Quantity: 4
-  - type: Tag
-    tags:
-    - Fruit

 - type: entity
  name: grapes
@@ -1635,6 +1671,9 @@
      reagents:
      - ReagentId: JuiceGrape
        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit

 - type: entity
  name: berries
@@ -1707,7 +1746,6 @@
    tags:
    - Recyclable
    - Trash
-    - Fruit
  - type: SolutionContainerManager
    solutions:
      food:
@@ -1746,6 +1784,9 @@
    sprite: Objects/Specific/Hydroponics/pea.rsi
  - type: Produce
    seedId: pea
+  - type: Tag
+    tags:
+    - Vegetable

 - type: entity
  name: pumpkin
@@ -1794,6 +1835,7 @@
  - type: Tag
    tags:
    - Fruit
+    - Vegetable

 - type: entity
  name: cotton boll
@@ -1822,3 +1864,4 @@
  - type: Tag
    tags:
    - ClothMade
+    - CottonBoll
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -806,6 +806,10 @@
            Quantity: 4
          - ReagentId: Allicin
            Quantity: 3
+  - type: Tag
+    tags:
+    - ChiliBowl
+

 - type: entity
  name: cold chili
@@ -830,6 +834,9 @@
            Quantity: 8
          - ReagentId: Vitamin
            Quantity: 4
+  - type: Tag
+    tags:
+    - ChiliBowl

 - type: entity
  name: chili con carnival
@@ -860,6 +867,9 @@
            Quantity: 4
          - ReagentId: Allicin
            Quantity: 3
+  - type: Tag
+    tags:
+    - ChiliBowl

 - type: entity
  name: monkey's delight
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1067,6 +1067,9 @@
      materialRequirements:
        Glass: 2
        Cable: 2
+    - type: Tag
+      tags:
+      - MicrowaveMachineBoard

 - type: entity
  id: FatExtractorMachineCircuitboard
@@ -1285,7 +1288,7 @@
    materialRequirements:
      Steel: 5
      CableHV: 5
-      
+
 - type: entity
  id: ShuttleGunPerforatorCircuitboard
  parent: BaseMachineCircuitboard
@@ -1302,7 +1305,7 @@
    materialRequirements:
      Steel: 10
      CableHV: 5
-      
+
 - type: entity
  id: ShuttleGunFriendshipCircuitboard
  parent: BaseMachineCircuitboard
@@ -1318,8 +1321,8 @@
      Manipulator: 2
    materialRequirements:
      Steel: 7
-      CableHV: 5  
-      
+      CableHV: 5
+
 - type: entity
  id: ShuttleGunDusterCircuitboard
  parent: BaseMachineCircuitboard
@@ -1337,7 +1340,7 @@
      Steel: 10
      CableHV: 5
      Uranium: 2
-      
+
 - type: entity
  id: ShuttleGunKineticCircuitboard
  parent: BaseMachineCircuitboard
@@ -1354,4 +1357,3 @@
    materialRequirements:
      Steel: 5
      CableHV: 2
-      
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1422,6 +1422,9 @@
        reagents:
        - ReagentId: Nothing
          Quantity: 100
+  - type: Tag
+    tags:
+    - Banana

 - type: entity
  parent: DrinkBase
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -20,6 +20,9 @@
    - neck
  - type: StaticPrice
    price: 100
+  - type: Tag
+    tags:
+    - Bedsheet

 - type: entity
  id: BedsheetBlack
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -117,3 +117,6 @@
    - id: TrashBananaPeelExplosive
    sound:
      path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - Banana
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -33,18 +33,30 @@
 - type: Tag
  id: Balloon

+- type: Tag
+  id: Banana
+
 - type: Tag
  id: BananaPeel

+- type: Tag
+  id: Bandana
+
 - type: Tag
  id: BaseballBat

 - type: Tag
  id: BBQsauce

+- type: Tag
+  id: Bedsheet
+
 - type: Tag
  id: Bee

+- type: Tag
+  id: Beer
+
 - type: Tag
  id: BikeHorn

@@ -204,6 +216,9 @@
 - type: Tag
  id: Bottle

+- type: Tag
+  id: BoxCardboard
+
 - type: Tag
  id: BoxHug

@@ -349,6 +364,9 @@
 - type: Tag
  id: ChemDispensable # container that can go into the chem dispenser

+- type: Tag
+  id: ChiliBowl
+
 - type: Tag
  id: Cigarette

@@ -403,6 +421,9 @@
 - type: Tag #Ohioans die happy
  id: Corn

+- type: Tag
+  id: CottonBoll
+
 - type: Tag
  id: Cow

@@ -676,6 +697,9 @@
 - type: Tag
  id: HighSecDoor

+- type: Tag
+  id: HiViz
+
 - type: Tag
  id: Hoe

@@ -839,6 +863,9 @@
 - type: Tag
  id: MicroBomb

+- type: Tag
+  id: MicrowaveMachineBoard
+
 - type: Tag
  id: MimeBelt

@@ -1136,6 +1163,9 @@
 - type: Tag
  id: StationMapElectronics

+- type: Tag
+  id: Steak
+
 - type: Tag
  id: StringInstrument

@@ -1205,6 +1235,9 @@
 - type: Tag
  id: UraniumGlassShard

+- type: Tag
+  id: Vegetable
+
 - type: Tag
  id: VimPilot

@@ -1244,6 +1277,9 @@
 - type: Tag
  id: Window

+- type: Tag
+  id: Wine
+
 - type: Tag
  id: Wirecutter