From 779b633d8da5a809fb6f663c2626cf5068fea623 Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 17:35:16 +0300 Subject: [PATCH 1/8] Create check.yml --- Resources/Prototypes/ADT/Reagents/check.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Resources/Prototypes/ADT/Reagents/check.yml diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml new file mode 100644 index 00000000000..46118fd3684 --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -0,0 +1,8 @@ +- type: reagent + id: ADTCopperNitride + name: reagent-name-absinthe + desc: reagent-desc-absinthe + physicalDesc: reagent-physical-desc-crystalline + color: "#09590a" + boilingPoint: 300 + meltingPoint: 300 From 464fd734079aa0a3a066418d1fb3ec5efa04fe1a Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 17:50:31 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5=D0=BC?= =?UTF-8?q?=20=D0=BB=D0=B5=D1=87=D0=B8=D1=82=D1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/check.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index 46118fd3684..f6a8156fc15 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -6,3 +6,13 @@ color: "#09590a" boilingPoint: 300 meltingPoint: 300 + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -1 + Burn: -1 + types: + Cold: -1 From c2c326d5d4e747a458fc7114b5fb13cf9eadcc9b Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 18:20:02 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=B4=D0=B8=D1=88=D0=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/check.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index f6a8156fc15..eace830ddd7 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -10,6 +10,10 @@ Medicine: effects: - !type:HealthChange + conditions: + - !type:ReagentThreshold + reagent: Bicaridine + min: 0.5 damage: groups: Brute: -1 From da61444edcb02b0482cf0f530cd89d9cfb1721b1 Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 18:34:17 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=B0=D0=B4=D0=B6=D0=B0=D1=81=D1=82=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=B3=D0=B5=D0=BD=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/check.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index eace830ddd7..584b5766779 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -9,14 +9,6 @@ metabolisms: Medicine: effects: - - !type:HealthChange - conditions: - - !type:ReagentThreshold - reagent: Bicaridine - min: 0.5 - damage: - groups: - Brute: -1 - Burn: -1 - types: - Cold: -1 + - !type:AdjustReagent + reagent: Licoxide + amount: -0.5 From 918e99f2a26a61287d04c234b0414938d74cc1bd Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 19:11:47 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B0=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=B4=D0=B8=D1=81=D0=B8=D0=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index 584b5766779..c2e18982ab0 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -1,6 +1,7 @@ - type: reagent id: ADTCopperNitride name: reagent-name-absinthe + group: Medicine desc: reagent-desc-absinthe physicalDesc: reagent-physical-desc-crystalline color: "#09590a" From d533eb5701267c1614e9d9de244fde7b9e06e738 Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 19:24:13 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D0=BC=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B1=D0=B8=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/check.yml | 36 +++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index c2e18982ab0..e4682db63fd 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -1,15 +1,33 @@ - type: reagent id: ADTCopperNitride - name: reagent-name-absinthe + name: reagent-name-bicaridine group: Medicine - desc: reagent-desc-absinthe - physicalDesc: reagent-physical-desc-crystalline - color: "#09590a" - boilingPoint: 300 - meltingPoint: 300 + desc: reagent-desc-bicaridine + physicalDesc: reagent-physical-desc-opaque + flavor: medicine + color: "#ffaa00" metabolisms: Medicine: effects: - - !type:AdjustReagent - reagent: Licoxide - amount: -0.5 + - !type:HealthChange + damage: + groups: + Brute: -2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 15 + damage: + types: + Asphyxiation: 0.5 + Poison: 1.5 + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 30 + probability: 0.02 + - !type:Jitter + conditions: + - !type:ReagentThreshold + min: 15 + - !type:Drunk From 15e8de2098433dad3b75439ec290ecf9458e9f3c Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 20:02:56 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B5=D0=BF=D0=B0=D1=80=D0=B0=D1=82?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D0=BC=D0=B5=D0=B4=20=D0=B0=D0=BF=D0=B4=D0=B5?= =?UTF-8?q?=D0=B9=D1=82=D0=B0=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/check.yml | 40 ++++++++++----------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index e4682db63fd..3f5df365f79 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -1,33 +1,29 @@ - type: reagent - id: ADTCopperNitride - name: reagent-name-bicaridine + id: ADTMDiethamilate #Диэтамилат. Искаверканное и совмещённое название Дициона и Этамзилата. + name: reagent-name-diethamilate group: Medicine - desc: reagent-desc-bicaridine - physicalDesc: reagent-physical-desc-opaque + desc: reagent-desc-diethamilate + physicalDesc: reagent-physical-desc-powdery flavor: medicine - color: "#ffaa00" + color: "#f5c6dc" metabolisms: Medicine: effects: - - !type:HealthChange - damage: - groups: - Brute: -2 + - !type:ModifyBleedAmount + amount: -0.5 + - !type:PopupMessage + conditions: + - !type:TotalDamage + min: 0.5 + type: Local + visualType: Small + messages: [ "medicine-effect-usual" ] + probability: 0.05 - !type:HealthChange conditions: - !type:ReagentThreshold - min: 15 + reagent: DexalinPlus + min: 0.5 damage: types: - Asphyxiation: 0.5 - Poison: 1.5 - - !type:ChemVomit - conditions: - - !type:ReagentThreshold - min: 30 - probability: 0.02 - - !type:Jitter - conditions: - - !type:ReagentThreshold - min: 15 - - !type:Drunk + Bloodloss: -0.5 From 2734580084a28b98abf694cabee80c950564a0f9 Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Sun, 18 Feb 2024 20:08:07 +0300 Subject: [PATCH 8/8] Update check.yml --- Resources/Prototypes/ADT/Reagents/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/ADT/Reagents/check.yml b/Resources/Prototypes/ADT/Reagents/check.yml index 3f5df365f79..79b4802f18d 100644 --- a/Resources/Prototypes/ADT/Reagents/check.yml +++ b/Resources/Prototypes/ADT/Reagents/check.yml @@ -1,8 +1,8 @@ - type: reagent id: ADTMDiethamilate #Диэтамилат. Искаверканное и совмещённое название Дициона и Этамзилата. - name: reagent-name-diethamilate + name: reagent-name-bicaridine group: Medicine - desc: reagent-desc-diethamilate + desc: reagent-desc-bicaridine physicalDesc: reagent-physical-desc-powdery flavor: medicine color: "#f5c6dc" @@ -17,7 +17,7 @@ min: 0.5 type: Local visualType: Small - messages: [ "medicine-effect-usual" ] + messages: [ "" ] probability: 0.05 - !type:HealthChange conditions: