[Cargo]New Bounty: Salvage (#34926)

* uoy

* Fix vague tag names, issues with bounty text

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>

diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index f5705b0e3a2a17d1b097c7e781a5c009a7150427..06012431078b34b91bf721f1ac380832c7c147ca 100644 (file)
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -68,6 +68,9 @@ bounty-item-microwave-machine-board = Microwave machine board
 bounty-item-flash = Flash
 bounty-item-tooth-space-carp = Space Carp Tooth
 bounty-item-tooth-sharkminnow = Sharkminnow Tooth
+bounty-item-ring = Ring
+bounty-item-remains = Hivelord Remains
+bounty-item-plates = Goliath Hide Plates
 
 bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
 bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
@@ -138,3 +141,6 @@ bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny t
 bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal].
 bounty-description-tooth-space-carp = Some lads from "down unda" need some teeth to make their traditional apparel. Send them a few from some space carp.
 bounty-description-tooth-sharkminnow = The chef is claiming that the teeth of sharkminnows are some kind of high-quality knife. I don't know what they're on about, but they want a set. Send it to them.
+bounty-description-ring = On this EXTRAORDINARY day there will be a wedding between the Gelts, but Mr. Gelt has lost the rings, send a pair of rings.
+bounty-description-remains = TWO. HIVELORD REMAINS, please.
+bounty-description-plates = Our club is interested in trophies of majestic creatures such as the Goliath: send a couple of plates. The reward will come quickly.

diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 0d889c48bf7981b7a224400a4c9c5dcc5f8de48a..34be215ffca1ac5cf23dad3801bab0474453f79f 100644 (file)
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -751,7 +751,7 @@
 
 - type: cargoBounty
   id: BountyTeethSpaceCarp
-  reward: 800
+  reward: 7500
   description: bounty-description-tooth-space-carp
   entries:
   - name: bounty-item-tooth-space-carp
@@ -762,7 +762,7 @@
 
 - type: cargoBounty
   id: BountyTeethSharkminnow
-  reward: 1500
+  reward: 15000
   description: bounty-description-tooth-sharkminnow
   entries:
   - name: bounty-item-tooth-sharkminnow
@@ -770,3 +770,36 @@
     whitelist:
       tags:
       - ToothSharkminnow
+
+- type: cargoBounty
+  id: BountyPlates
+  reward: 20000
+  description: bounty-description-plates
+  entries:
+  - name: bounty-item-plates
+    amount: 4
+    whitelist:
+      tags:
+      - GoliathPlate
+
+- type: cargoBounty
+  id: BountyRemains
+  reward: 15000
+  description: bounty-description-remains
+  entries:
+  - name: bounty-item-remains
+    amount: 2
+    whitelist:
+      tags:
+      - HivelordRemains
+
+- type: cargoBounty
+  id: BountyRing
+  reward: 12500
+  description: bounty-description-ring
+  entries:
+  - name: bounty-item-ring
+    amount: 2
+    whitelist:
+      tags:
+      - Ring

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index 849927b2e5f7e7e8c49c9c9073e83d1d28003538..8db0294981c25f4c217e5a4ded86350f7f83b075 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -323,6 +323,9 @@
     stage: 1
   - type: StaticPrice
     price: 5000
+  - type: Tag
+    tags:
+    - HivelordRemains
 
 - type: entity
   id: FoodHivelordRemainsInert
@@ -339,3 +342,6 @@
     size: Normal
   - type: StaticPrice
     price: 500
+  - type: Tag
+    tags:
+    - HivelordRemains

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index f0b3d101ee79a69fe376bde25e6b66f6d8ed109d..b0e3a7e6ed79eda44874474bb335eb955db17eb9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -800,6 +800,9 @@
     sprite: Objects/Materials/hide.rsi
     shape:
     - 0,0,2,2
+  - type: Tag
+    tags:
+    - GoliathPlate
 
 - type: entity
   parent: MaterialGoliathHide

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index e258a4da0f07e4bb83b4dce352b35f338b1afcff..2c01f73ac3f279cefbe0dbeb66c0026691596389 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -609,6 +609,9 @@
 - type: Tag
   id: Goliath
 
+- type: Tag
+  id: GoliathPlate
+
 - type: Tag
   id: GPS
 
@@ -702,6 +705,9 @@
 - type: Tag
   id: HighSecDoor
 
+- type: Tag
+  id: HivelordRemains
+
 - type: Tag
   id: HiViz