Makes Plant-B-Gone available to cargo, and Diona vulnerable. (#19555)

* Adds WeekKiller storage tanks and allows Cargo to purchase them.

* Delete CellMemberRoll.cs

Woops, this template file snuck in after I reset my local. It doesn't do anything, just empty classes.

* Switched from WeedKiller to PlantBeGone because WeedKiller is too deadly. Honestly is probably shouldn't be in Botany so readily.
Made Diona take damage from PlantBeGone and WeedKiller.
Adjusted waterguns to use less reagent per shot.
Added admeme watergun.
Adjusted watergun cargo crate.

* Fixing small .yml formatting hiccups.

* Fixing small .yml formatting.

* Fix Typo.

* watergun min solution match shot size

Makes watergun's minimum solution transfer match shot size (5u).

* I pass tests now, please?

Nothing.

* Lower Diona herbicide damages
Remove slime changes
Lower super water blaster size to 500u (100 shots)
This commit is contained in:
IProduceWidgets
2023-09-02 01:32:08 -04:00
committed by GitHub
parent 600d9753c9
commit bc00a635b9
11 changed files with 125 additions and 10 deletions

View File

@@ -18,7 +18,7 @@ public sealed partial class SolutionAmmoProviderComponent : Component
/// How much reagent it costs to fire once. /// How much reagent it costs to fire once.
/// </summary> /// </summary>
[DataField("fireCost"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] [DataField("fireCost"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
public float FireCost = 10; public float FireCost = 5;
/// <summary> /// <summary>
/// The amount of shots currently available. /// The amount of shots currently available.

View File

@@ -9,3 +9,7 @@ ent-CrateHydroponicsTools = Hydroponics equipment crate
ent-CrateHydroponicsSeeds = Seeds crate ent-CrateHydroponicsSeeds = Seeds crate
.desc = Big things have small beginnings. Contains twelve different seeds. .desc = Big things have small beginnings. Contains twelve different seeds.
ent-CratePlantBGone = Bulk Plant-B-Gone crate
.desc = From Monstano. "Unwanted Weeds, Meet Your Celestial Roundup!"

View File

@@ -0,0 +1 @@
diona-hurt-by-herbicide-popup = The chemical wilts some of your greenery!

View File

@@ -37,3 +37,13 @@
cost: 500 cost: 500
category: Hydroponics category: Hydroponics
group: market group: market
- type: cargoProduct
id: BulkPlantBGone
icon:
sprite: Objects/Specific/Chemistry/jug.rsi
state: jug
product: CratePlantBGone
cost: 750
category: Hydroponics
group: market

View File

@@ -58,3 +58,12 @@
amount: 1 amount: 1
- id: JugSilver - id: JugSilver
amount: 1 amount: 1
- type: entity
id: CratePlantBGone
parent: CrateGenericSteel
components:
- type: StorageFill
contents:
- id: JugPlantBGone
amount: 5

View File

@@ -203,8 +203,9 @@
- type: StorageFill - type: StorageFill
contents: contents:
- id: WeaponWaterBlaster - id: WeaponWaterBlaster
amount: 2
- id: WeaponWaterPistol - id: WeaponWaterPistol
amount: 5 amount: 4
- type: entity - type: entity
id: CrateFunSyndicateSegway id: CrateFunSyndicateSegway

View File

@@ -35,6 +35,44 @@
amount: 5 amount: 5
- type: Bloodstream - type: Bloodstream
bloodReagent: Water bloodReagent: Water
- type: Reactive
groups:
Flammable: [ Touch ]
Extinguish: [ Touch ]
Acidic: [Touch, Ingestion]
reactions:
- reagents: [Water, SpaceCleaner]
methods: [Touch]
effects:
- !type:WashCreamPieReaction
- reagents: [ PlantBGone ]
methods: [ Touch ]
effects:
- !type:HealthChange
scaled: true
damage:
types:
Blunt: 2
Slash: 2
Piercing: 3
- !type:PopupMessage
type: Local
visualType: Large
messages: [ "diona-hurt-by-herbicide-popup" ]
probability: 0.66
- reagents: [ WeedKiller ]
methods: [ Touch ]
effects:
- !type:HealthChange
scaled: true
damage:
types:
Poison: 5
- !type:PopupMessage
type: Local
visualType: Large
messages: [ "diona-hurt-by-herbicide-popup" ]
probability: 0.66
- type: Fixtures - type: Fixtures
fixtures: fixtures:
fix1: fix1:

View File

@@ -378,3 +378,18 @@
reagents: reagents:
- ReagentId: Oxygen - ReagentId: Oxygen
Quantity: 200 Quantity: 200
- type: entity
parent: Jug
name: jug (Plant-B-Gone)
id: JugPlantBGone
noSpawn: true
components:
- type: Label
currentLabel: Plant-B-Gone
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: PlantBGone
Quantity: 200

View File

@@ -14,7 +14,7 @@
- type: Gun - type: Gun
clumsyProof: true clumsyProof: true
cameraRecoilScalar: 0 #no recoil cameraRecoilScalar: 0 #no recoil
fireRate: 1 fireRate: 2
selectedMode: SemiAuto selectedMode: SemiAuto
availableModes: availableModes:
- SemiAuto - SemiAuto
@@ -23,12 +23,12 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
chamber: chamber:
maxVol: 50 #5 shots maxVol: 50 #10 shots
- type: SolutionAmmoProvider - type: SolutionAmmoProvider
solutionId: chamber solutionId: chamber
proto: BulletWaterShot proto: BulletWaterShot
- type: SolutionTransfer - type: SolutionTransfer
transferAmount: 10 transferAmount: 5
maxTransferAmount: 50 maxTransferAmount: 50
minTransferAmount: 5 minTransferAmount: 5
canChangeTransferAmount: true canChangeTransferAmount: true
@@ -75,7 +75,7 @@
components: components:
- type: Gun - type: Gun
cameraRecoilScalar: 0 #no recoil cameraRecoilScalar: 0 #no recoil
fireRate: 2 fireRate: 3
selectedMode: FullAuto selectedMode: FullAuto
availableModes: availableModes:
- FullAuto - FullAuto
@@ -84,7 +84,44 @@
- type: SolutionContainerManager - type: SolutionContainerManager
solutions: solutions:
chamber: chamber:
maxVol: 100 #10 shots maxVol: 100 #20 shots
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
layers:
- state: detail1
- state: detail2
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: icon
map: [ "enum.DamageStateVisualLayers.Base" ]
- type: Item
sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
size: 35
- type: RandomSprite
getAllGroups: true
available:
- enum.DamageStateVisualLayers.Base:
icon: Rainbow
- enum.PowerDeviceVisualLayers.Powered:
detail2: Sixteen
- type: entity
id: WeaponWaterBlasterSuper
parent: WeaponWaterGunBase
name: super water blaster
description: No! No! Not in the eyes!
components:
- type: Gun
cameraRecoilScalar: 0 #no recoil
fireRate: 8
selectedMode: FullAuto
availableModes:
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
- type: SolutionContainerManager
solutions:
chamber:
maxVol: 500 #100 shots
- type: Sprite - type: Sprite
sprite: Objects/Weapons/Guns/Pistols/soaker.rsi sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
layers: layers: