Chill bounties + fixes (#23411)

* Chill bounties + fixes * localize * fix arbitage
2024-01-03 19:34:47 -05:00
parent 9d8ac7846a
commit 4662d463b8
22 changed files with 284 additions and 182 deletions
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -11,8 +11,9 @@

 - type: cargoBounty
  id: BountyBaseballBat
-  reward: 8000
+  reward: 4000
  description: bounty-description-baseball-bat
+  idPrefix: CC
  entries:
  - name: bounty-item-baseball-bat
    amount: 5
@@ -22,7 +23,7 @@

 - type: cargoBounty
  id: BountyBoxHug
-  reward: 6000
+  reward: 3000
  description: bounty-description-box-hugs
  entries:
  - name: bounty-item-box-hugs
@@ -33,7 +34,7 @@

 - type: cargoBounty
  id: BountyBrain
-  reward: 25000
+  reward: 12500
  description: bounty-description-brain
  entries:
  - name: bounty-item-brain
@@ -44,7 +45,7 @@

 - type: cargoBounty
  id: BountyBread
-  reward: 4000
+  reward: 2000
  description: bounty-description-bread
  entries:
  - name: bounty-item-bread
@@ -55,8 +56,9 @@

 - type: cargoBounty
  id: BountyBriefcase
-  reward: 15000
+  reward: 7500
  description: bounty-description-briefcase
+  idPrefix: CC
  entries:
  - name: bounty-item-briefcase
    amount: 5
@@ -66,8 +68,9 @@

 - type: cargoBounty
  id: BountyCarrot
-  reward: 15000
+  reward: 7500
  description: bounty-description-carrot
+  idPrefix: SS15-
  entries:
  - name: bounty-item-carrot
    amount: 10
@@ -77,7 +80,7 @@

 - type: cargoBounty
  id: BountyCarrotFries
-  reward: 14000
+  reward: 7000
  description: bounty-description-carrot-fries
  entries:
  - name: bounty-item-carrot-fries
@@ -88,8 +91,9 @@

 - type: cargoBounty
  id: BountyCarp
-  reward: 25000
+  reward: 12500
  description: bounty-description-carp
+  idPrefix: CC
  entries:
  - name: bounty-item-carp
    amount: 1
@@ -115,7 +119,7 @@

 - type: cargoBounty
  id: BountyCorn
-  reward: 20000
+  reward: 10000
  description: bounty-description-corn
  entries:
  - name: bounty-item-corn
@@ -126,7 +130,7 @@

 - type: cargoBounty
  id: BountyCrayon
-  reward: 8000
+  reward: 4000
  description: bounty-description-crayon
  entries:
  - name: bounty-item-crayon
@@ -137,8 +141,9 @@

 - type: cargoBounty
  id: BountyCubanCarp
-  reward: 32000
+  reward: 16000
  description: bounty-description-cuban-carp
+  idPrefix: CC
  entries:
  - name: bounty-item-cuban-carp
    amount: 1
@@ -148,8 +153,9 @@

 - type: cargoBounty
  id: BountyDonkPocket
-  reward: 12000
+  reward: 6000
  description: bounty-description-donk-pocket
+  idPrefix: CC
  entries:
  - name: bounty-item-donk-pocket
    amount: 12
@@ -159,8 +165,9 @@

 - type: cargoBounty
  id: BountyDonut
-  reward: 12000
+  reward: 6000
  description: bounty-description-donut
+  idPrefix: CC
  entries:
  - name: bounty-item-donut
    amount: 10
@@ -170,7 +177,7 @@

 - type: cargoBounty
  id: BountyFigurine
-  reward: 16000
+  reward: 8000
  description: bounty-description-figurine
  entries:
  - name: bounty-item-figurine
@@ -179,21 +186,11 @@
      tags:
      - Figurine

- type: cargoBounty
-  id: BountyFleshMonster
-  reward: 30000
-  description: bounty-description-flesh-monster
-  entries:
-  - name: bounty-item-flesh-monster
-    amount: 3
-    whitelist:
-      tags:
-      - Flesh
-
 - type: cargoBounty
  id: BountyFlower
-  reward: 4000
+  reward: 2000
  description: bounty-description-flower
+  idPrefix: CC
  entries:
  - name: bounty-item-flower
    amount: 3
@@ -203,7 +200,7 @@

 - type: cargoBounty
  id: BountyGalaxyThistle
-  reward: 24000
+  reward: 12000
  description: bounty-description-galaxythistle
  entries:
  - name: bounty-item-galaxythistle
@@ -214,8 +211,9 @@

 - type: cargoBounty
  id: BountyHandcuffs
-  reward: 4000
+  reward: 1000
  description: bounty-description-handcuffs
+  idPrefix: CC
  entries:
  - name: bounty-item-handcuffs
    amount: 5
@@ -236,7 +234,7 @@

 - type: cargoBounty
  id: BountyKnife
-  reward: 12000
+  reward: 6000
  description: bounty-description-knife
  entries:
  - name: bounty-item-knife
@@ -247,7 +245,7 @@

 - type: cargoBounty
  id: BountyLemon
-  reward: 20000
+  reward: 10000
  description: bounty-description-lemon
  entries:
  - name: bounty-item-lemon
@@ -258,8 +256,9 @@

 - type: cargoBounty
  id: BountyLime
-  reward: 20000
+  reward: 10000
  description: bounty-description-lime
+  idPrefix: CC
  entries:
  - name: bounty-item-lime
    amount: 7
@@ -269,7 +268,7 @@

 - type: cargoBounty
  id: BountyLung
-  reward: 35000
+  reward: 2000
  description: bounty-description-lung
  entries:
  - name: bounty-item-lung
@@ -280,8 +279,9 @@

 - type: cargoBounty
  id: BountyMonkeyCube
-  reward: 8000
+  reward: 2000
  description: bounty-description-monkey-cube
+  idPrefix: CC
  entries:
  - name: bounty-item-monkey-cube
    amount: 3
@@ -293,6 +293,7 @@
  id: BountyMouse
  reward: 2400
  description: bounty-description-mouse
+  idPrefix: SS13-
  entries:
  - name: bounty-item-mouse
    amount: 5
@@ -302,7 +303,7 @@

 - type: cargoBounty
  id: BountyPancake
-  reward: 20000
+  reward: 10000
  description: bounty-description-pancake
  entries:
  - name: bounty-item-pancake
@@ -317,14 +318,14 @@
  description: bounty-description-pen
  entries:
  - name: bounty-item-pen
-    amount: 10
+    amount: 5
    whitelist:
      tags:
-      - Write
+      - Pen

 - type: cargoBounty
  id: BountyPercussion
-  reward: 25000
+  reward: 15000
  description: bounty-description-percussion
  entries:
  - name: bounty-item-percussion
@@ -335,7 +336,7 @@

 - type: cargoBounty
  id: BountyPie
-  reward: 31415
+  reward: 3141
  description: bounty-description-pie
  entries:
  - name: bounty-item-pie
@@ -348,6 +349,7 @@
  id: BountyPrisonUniform
  reward: 8000
  description: bounty-description-prison-uniform
+  idPrefix: TG
  entries:
  - name: bounty-item-prison-uniform
    amount: 4
@@ -357,7 +359,7 @@

 - type: cargoBounty
  id: BountyRadio
-  reward: 10000
+  reward: 7500
  description: bounty-description-radio
  entries:
  - name: bounty-item-radio
@@ -369,21 +371,11 @@
      tags:
      - Radio

- type: cargoBounty
-  id: BountyResearchDisk
-  reward: 12000
-  description: bounty-description-research-disk
-  entries:
-  - name: bounty-item-research-disk
-    amount: 1
-    whitelist:
-      components:
-      - ResearchDisk
-
 - type: cargoBounty
  id: BountyShiv
-  reward: 8000
+  reward: 4000
  description: bounty-description-shiv
+  idPrefix: SYN
  entries:
  - name: bounty-item-shiv
    amount: 5
@@ -393,7 +385,7 @@

 - type: cargoBounty
  id: BountySoap
-  reward: 8000
+  reward: 4000
  description: bounty-description-soap
  entries:
  - name: bounty-item-soap
@@ -404,7 +396,7 @@

 - type: cargoBounty
  id: BountySoup
-  reward: 12000
+  reward: 6000
  description: bounty-description-soup
  entries:
  - name: bounty-item-soup
@@ -426,7 +418,7 @@

 - type: cargoBounty
  id: BountySyringe
-  reward: 10000
+  reward: 5000
  description: bounty-description-syringe
  entries:
  - name: bounty-item-syringe
@@ -439,6 +431,7 @@
  id: BountyTechDisk
  reward: 25000
  description: bounty-description-tech-disk
+  idPrefix: SS13-
  entries:
  - name: bounty-item-tech-disk
    amount: 5
@@ -450,6 +443,7 @@
  id: BountyToolbox
  reward: 8000
  description: bounty-description-toolbox
+  idPrefix: CC
  entries:
  - name: bounty-item-toolbox
    amount: 6
@@ -459,7 +453,7 @@

 - type: cargoBounty
  id: BountyTrash
-  reward: 700
+  reward: 500
  description: bounty-description-trash
  entries:
  - name: bounty-item-trash
@@ -503,8 +497,9 @@

 - type: cargoBounty
  id: BountyOrgans
-  reward: 3500
+  reward: 2000
  description: bounty-description-organs
+  idPrefix: UNTH
  entries:
  - name: bounty-item-organs
    amount: 8
@@ -522,22 +517,24 @@
    whitelist:
      components:
      - HandLabeler
-      
+
 - type: cargoBounty
  id: BountyWarmCloth
-  reward: 6000
+  reward: 2000
  description: bounty-description-warm-cloth
+  idPrefix: UNTH
  entries:
  - name: bounty-item-warm-cloth
    amount: 8
    whitelist:
      components:
      - TemperatureProtection
-      
+
 - type: cargoBounty
  id: BountyBattery
-  reward: 24500
+  reward: 15000
  description: bounty-description-battery
+  idPrefix: UNTH
  entries:
  - name: bounty-item-battery
    amount: 15
@@ -549,6 +546,7 @@
  id: BountyLaserGun
  reward: 28500
  description: bounty-description-lasergun
+  idPrefix: IV
  entries:
  - name: bounty-lasergun
    amount: 6
@@ -558,11 +556,12 @@

 - type: cargoBounty
  id: BountyFood
-  reward: 9500
+  reward: 4000
  description: bounty-description-food
+  idPrefix: UNTH
  entries:
  - name: bounty-food
    amount: 30
    whitelist:
      tags:
-      - Meat
+      - Meat
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -239,6 +239,7 @@
  - type: Tag
    tags:
    - Write
+    - Pen
  - type: Sprite
    sprite: Objects/Misc/bureaucracy.rsi
    state: pen
@@ -647,4 +648,4 @@
      types:
        Blunt: 10
  - type: StealTarget
-    stealGroup: BoxFolderQmClipboard
+    stealGroup: BoxFolderQmClipboard
--- a/Resources/Prototypes/name_identifier_groups.yml
+++ b/Resources/Prototypes/name_identifier_groups.yml
@@ -35,3 +35,8 @@
 # Used to suffix a number to any mob to identify player controlled mob griefing.
 - type: nameIdentifierGroup
  id: GenericNumber
+
+- type: nameIdentifierGroup
+  id: Bounty
+  minValue: 0
+  maxValue: 999
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -830,6 +830,9 @@
 - type: Tag
  id: Pancake

+- type: Tag
+  id: Pen
+
 - type: Tag
  id: PepperShaker