From 3d6b8fce3386107ac4c46543252fc31764a0c1c7 Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Sun, 2 Feb 2025 14:47:36 -0700 Subject: [PATCH 1/8] Added da pills --- .../Objects/Specific/Medical/randompill.yml | 62 ++++++++++++------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index cdff0cdbe4a0..ae17fedcc8a0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -1,34 +1,34 @@ - type: weightedRandomFillSolution id: RandomFillStrangePill fills: - # 5 groups for a total weight of 100 - # Very Good - weight: 15 + # 5 groups for a total weight of 1000 + # Very Good - weight: 150 - quantity: 15 - weight: 5 + weight: 50 reagents: - Stimulants - quantity: 10 - weight: 5 + weight: 50 reagents: - Ichor - quantity: 5 - weight: 5 + weight: 50 reagents: - Cognizine - # Good - weight: 25 + # Good - weight: 250 - quantity: 20 - weight: 25 + weight: 250 reagents: - Desoxyephedrine - Ephedrine - Omnizine - Tricordrazine - Vitamin - # Neutral - weight: 20 + # Neutral - weight: 200 - quantity: 20 - weight: 17.5 + weight: 175 reagents: - - Ipecac + - Ipecac - SodiumPolyacrylate - SpaceDrugs - SpaceGlue @@ -36,42 +36,58 @@ - JuiceThatMakesYouWeh - Lipozine - quantity: 5 - weight: 2.5 + weight: 25 reagents: - - Honk - # Bad - weight: 25 + - Honk + # Bad - weight: 250 - quantity: 20 - weight: 10.5 + weight: 105 reagents: - MuteToxin - Pax - Fresium - quantity: 10 - weight: 10.5 + weight: 105 reagents: - Uranium - Licoxide - Razorium - quantity: 5 - weight: 4 + weight: 40 reagents: - Toxin - # Very Bad - weight: 15 - - quantity: 20 - weight: 2.5 - reagents: - - ChloralHydrate + # Very Bad - weight: 150 - quantity: 10 - weight: 10 + weight: 80 reagents: - Bleach - CarpoToxin - BuzzochloricBees - Amatoxin + - quantity: 20 + weight: 25 + reagents: + - Nocturine - quantity: 5 - weight: 2.5 + weight: 21 reagents: - Lexorin + - quantity: 10 + weight: 20 + reagents: + - Tazinide + - quantity: 20 + weight: 3 + reagents: + - Potassium + - quantity: 15 + weight: 1 + reagents: + - Romerol + - quantity: 10 + weight: 1 + reagents: + - Vestine - type: entity name: strange pill From e6e29a931d7f2499bc897daf4d365afa2c68bfdd Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Sun, 2 Feb 2025 17:21:25 -0700 Subject: [PATCH 2/8] Revert "Added da pills" This reverts commit 3d6b8fce3386107ac4c46543252fc31764a0c1c7. --- .../Objects/Specific/Medical/randompill.yml | 62 +++++++------------ 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index ae17fedcc8a0..cdff0cdbe4a0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -1,34 +1,34 @@ - type: weightedRandomFillSolution id: RandomFillStrangePill fills: - # 5 groups for a total weight of 1000 - # Very Good - weight: 150 + # 5 groups for a total weight of 100 + # Very Good - weight: 15 - quantity: 15 - weight: 50 + weight: 5 reagents: - Stimulants - quantity: 10 - weight: 50 + weight: 5 reagents: - Ichor - quantity: 5 - weight: 50 + weight: 5 reagents: - Cognizine - # Good - weight: 250 + # Good - weight: 25 - quantity: 20 - weight: 250 + weight: 25 reagents: - Desoxyephedrine - Ephedrine - Omnizine - Tricordrazine - Vitamin - # Neutral - weight: 200 + # Neutral - weight: 20 - quantity: 20 - weight: 175 + weight: 17.5 reagents: - - Ipecac + - Ipecac - SodiumPolyacrylate - SpaceDrugs - SpaceGlue @@ -36,58 +36,42 @@ - JuiceThatMakesYouWeh - Lipozine - quantity: 5 - weight: 25 + weight: 2.5 reagents: - - Honk - # Bad - weight: 250 + - Honk + # Bad - weight: 25 - quantity: 20 - weight: 105 + weight: 10.5 reagents: - MuteToxin - Pax - Fresium - quantity: 10 - weight: 105 + weight: 10.5 reagents: - Uranium - Licoxide - Razorium - quantity: 5 - weight: 40 + weight: 4 reagents: - Toxin - # Very Bad - weight: 150 + # Very Bad - weight: 15 + - quantity: 20 + weight: 2.5 + reagents: + - ChloralHydrate - quantity: 10 - weight: 80 + weight: 10 reagents: - Bleach - CarpoToxin - BuzzochloricBees - Amatoxin - - quantity: 20 - weight: 25 - reagents: - - Nocturine - quantity: 5 - weight: 21 + weight: 2.5 reagents: - Lexorin - - quantity: 10 - weight: 20 - reagents: - - Tazinide - - quantity: 20 - weight: 3 - reagents: - - Potassium - - quantity: 15 - weight: 1 - reagents: - - Romerol - - quantity: 10 - weight: 1 - reagents: - - Vestine - type: entity name: strange pill From a6e7a4fce699c233b49087f633afcfcdca7fc105 Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Sun, 2 Feb 2025 18:31:26 -0700 Subject: [PATCH 3/8] Updated to use existing weights, added larger chem variety --- .../Objects/Specific/Medical/randompill.yml | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index cdff0cdbe4a0..980b6f127d66 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -11,10 +11,15 @@ weight: 5 reagents: - Ichor + - Necrosol - quantity: 5 weight: 5 reagents: - Cognizine + - quantity: 10 + weight: 0.1 #It goes over the hundred limit for simplicity sake + reagents: + - Vestine # Good - weight: 25 - quantity: 20 weight: 25 @@ -24,21 +29,29 @@ - Omnizine - Tricordrazine - Vitamin + - PolypyryliumOligomers # Neutral - weight: 20 - quantity: 20 weight: 17.5 reagents: - - Ipecac + - Ipecac - SodiumPolyacrylate - SpaceDrugs - SpaceGlue - Laughter - JuiceThatMakesYouWeh - Lipozine + - Carpetium + - Bananadine + - THC + - MindbreakerToxin + - Mustard + - HorseradishSauce + - Charcoal - quantity: 5 weight: 2.5 reagents: - - Honk + - Honk # Bad - weight: 25 - quantity: 20 weight: 10.5 @@ -46,12 +59,15 @@ - MuteToxin - Pax - Fresium + - Cryptobiolin - quantity: 10 weight: 10.5 reagents: - Uranium - Licoxide - Razorium + - Potassium + - Phlogiston - quantity: 5 weight: 4 reagents: @@ -60,7 +76,7 @@ - quantity: 20 weight: 2.5 reagents: - - ChloralHydrate + - Nocturine - quantity: 10 weight: 10 reagents: @@ -68,10 +84,13 @@ - CarpoToxin - BuzzochloricBees - Amatoxin + - Tazinide + - GreyMatter - quantity: 5 weight: 2.5 reagents: - Lexorin + - Lead - type: entity name: strange pill From 12d69f51fb1c005fa98c11418c63afb5afb8054e Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Sun, 2 Feb 2025 18:32:18 -0700 Subject: [PATCH 4/8] Reweighed charcoal --- .../Prototypes/Entities/Objects/Specific/Medical/randompill.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 980b6f127d66..837c0191d42d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -30,6 +30,7 @@ - Tricordrazine - Vitamin - PolypyryliumOligomers + - Charcoal # Neutral - weight: 20 - quantity: 20 weight: 17.5 @@ -47,7 +48,6 @@ - MindbreakerToxin - Mustard - HorseradishSauce - - Charcoal - quantity: 5 weight: 2.5 reagents: From d9938077c5a4059726c502f86fea1c16b79405a0 Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Sun, 2 Feb 2025 19:52:06 -0700 Subject: [PATCH 5/8] Rebalance of certain quantities --- .../Entities/Objects/Specific/Medical/randompill.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 837c0191d42d..7ed77e0ed432 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -68,6 +68,7 @@ - Razorium - Potassium - Phlogiston + - GreyMatter - quantity: 5 weight: 4 reagents: @@ -85,12 +86,11 @@ - BuzzochloricBees - Amatoxin - Tazinide - - GreyMatter + - Lead - quantity: 5 weight: 2.5 reagents: - Lexorin - - Lead - type: entity name: strange pill From 7f0e32329aaba9dc0012f1d8603023c5aefb9ec5 Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Mon, 3 Feb 2025 00:03:12 -0700 Subject: [PATCH 6/8] Removed grey matter, weight balancing changes --- .../Entities/Objects/Specific/Medical/randompill.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 7ed77e0ed432..ef63a708db06 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -13,11 +13,11 @@ - Ichor - Necrosol - quantity: 5 - weight: 5 + weight: 4 reagents: - Cognizine - quantity: 10 - weight: 0.1 #It goes over the hundred limit for simplicity sake + weight: 1 #It goes over the hundred limit for simplicity sake reagents: - Vestine # Good - weight: 25 @@ -68,7 +68,6 @@ - Razorium - Potassium - Phlogiston - - GreyMatter - quantity: 5 weight: 4 reagents: From fcd9a2cc1dae9b6be3d323b198a76270a5025991 Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Mon, 3 Feb 2025 00:05:21 -0700 Subject: [PATCH 7/8] corrected comment --- .../Prototypes/Entities/Objects/Specific/Medical/randompill.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index ef63a708db06..fab1e89c3b7c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -17,7 +17,7 @@ reagents: - Cognizine - quantity: 10 - weight: 1 #It goes over the hundred limit for simplicity sake + weight: 1 reagents: - Vestine # Good - weight: 25 From c9db8adc0cf72c039dfc3d1be6e8a470f0cf66df Mon Sep 17 00:00:00 2001 From: DuckManZach Date: Tue, 4 Feb 2025 16:02:07 -0700 Subject: [PATCH 8/8] adjusted balance for lead --- .../Prototypes/Entities/Objects/Specific/Medical/randompill.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index fab1e89c3b7c..941abd1a4301 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -85,11 +85,11 @@ - BuzzochloricBees - Amatoxin - Tazinide - - Lead - quantity: 5 weight: 2.5 reagents: - Lexorin + - Lead - type: entity name: strange pill