Merge 74541084e8 into fd5b16abb3

Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml

@@ -29,6 +29,10 @@
     cost: 15
   - id: WeaponWaterPistol
     cost: 25
+  - id: SpaceCash1000
+    cost: 100
+  - id: DrinkBeerCan
+    cost: 10
   - id: WeaponWaterBlaster
     cost: 40
   - id: WeaponWaterBlasterSuper

Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml

@@ -1,9 +1,8 @@
 - type: entity
   name: space shrimp
-  parent: [ SimpleMobBase, FlyingMobBase, MobCombat ]
+  parent: [ SimpleMobBase, FlyingMobBase, MobCombat , BaseFishRare ]
   id: MobSpaceShrimp
   description: Shrimply cursed...
-  suffix: METEM MACHINE ONLY #for now, only to be used as a very rare result for the metempsychosis machine. If fishing ever gets added, this suffix can be removed.
   components:
   - type: MeleeWeapon
     soundHit:
@@ -62,7 +61,9 @@
     canBeRemoved: false
   - type: NpcFactionMember
     factions:
-    - Passive
+    - SimpleHostile
+  - type: Body
+    prototype: Animal
   - type: HTN
     rootTask:
       task: SimpleHostileCompound

Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml

@@ -8,20 +8,20 @@
   id: BasicFishingLootTable
   table: !type:GroupSelector
     children:
-    # 75% chance of scrap of some kind
+    # 65% chance of scrap of some kind
     - !type:GroupSelector
-      weight: 75
+      weight: 65 # DeltaV - 75 to 65%
       children:
       - !type:NestedSelector
         tableId: SalvageScrapLowValue
-        weight: 65
+        weight: 90 # DeltaV - 65 to 90%
       - !type:NestedSelector
         tableId: SalvageScrapHighValue
-        weight: 35
-    # 15% chance of some trash
+        weight: 10 # DeltaV - 35 to 10%
+    # 25% chance of some trash
     - !type:NestedSelector
       tableId: GenericTrashItems
-      weight: 15
+      weight: 25 # DeltaV - 15 to 25%
     # 10% chance of low-value treasure or maintenance tools
     - !type:GroupSelector
       weight: 10
@@ -45,6 +45,7 @@
     - id: FishNuker
     - id: FishToxic
     - id: FishIan
+    - id: MobSpaceShrimp # DeltaV - shrimp attack!
 
 # Fish from water
 - type: entityTable
@@ -69,10 +70,10 @@
     children:
       - !type:NestedSelector
         tableId: BasicFishingLootTable
-        weight: 70
+        weight: 40 # DeltaV - 70 to 40
       - !type:NestedSelector
         tableId: WaterFishTable
-        weight: 20
+        weight: 50 # DeltaV - 20 to 50
       - !type:NestedSelector
         tableId: RareFishTable
         weight: 10
@@ -100,10 +101,12 @@
   id: ToiletFishingLootTable
   table: !type:GroupSelector
     children:
-      # like water but no rare fishes
       - !type:NestedSelector
-        tableId: BasicFishingLootTable
-        weight: 80
+        tableId: GenericTrashItems # DeltaV - changed BasicFishingLootTable to just trash to avoid salvage scrap and tools in perma
+        weight: 60 # DeltaV - from 80 to 60
       - !type:NestedSelector
         tableId: WaterFishTable
-        weight: 20
+        weight: 30 # DeltaV - changed from 20 to 30
+      - !type:NestedSelector
+        tableId: RareFishTable # DeltaV - add rare fish
+        weight: 10