Refactor SeeingRainbows to new status effect system (#38620)

2025-06-27 21:19:04 +03:00
parent ad2616a53f
commit bb116e3219
14 changed files with 110 additions and 100 deletions
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -27,12 +27,11 @@
      - !type:AdjustReagent
        reagent: Ethanol
        amount: 0.05
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        conditions:
        - !type:ReagentThreshold
          min: 10
-        key: SeeingRainbows
-        component: SeeingRainbows
        type: Add
        time: 5
        refresh: false
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -107,11 +107,10 @@
  metabolisms:
    Narcotic:
      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        time: 5
+        type: Add
        refresh: false
    Drink:
      effects:
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -402,9 +402,8 @@
        damage:
          types:
            Cellular: 1
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        type: Add
        time: 15
        refresh: false
@@ -439,13 +438,12 @@
        damage:
          types:
            Cellular: 0.5
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
        conditions:
        - !type:ReagentThreshold
          reagent: Frezon
          min: 1
-        key: SeeingRainbows
-        component: SeeingRainbows
+        effectProto: StatusEffectSeeingRainbow
        type: Add
        time: 500
        refresh: false
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -749,8 +749,8 @@
        key: KnockedDown
        time: 3.0
        type: Remove
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        time: 15.0
        type: Remove

@@ -1323,12 +1323,11 @@
        damage:
          types:
            Poison: 2
-      - !type:GenericStatusEffect
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        conditions:
        - !type:ReagentThreshold
          min: 30
-        key: SeeingRainbows
-        component: SeeingRainbows
        type: Add
        time: 8
        refresh: false
@@ -1398,8 +1397,8 @@
        key: Jitter
        time: 4.0
        type: Remove
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        time: 10.0
        type: Remove
      - !type:AdjustReagent
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -198,11 +198,10 @@
  metabolisms:
    Narcotic:
      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        time: 16
+        type: Add
        refresh: false

 - type: reagent
@@ -236,11 +235,10 @@
        damage:
          types:
            Poison: 2
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        time: 10
+        type: Add
        refresh: false
      - !type:ChemVomit # Vomiting is a symptom of brain damage
        probability: 0.05
@@ -258,9 +256,8 @@
  metabolisms:
    Narcotic:
      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        type: Add
        time: 5
        refresh: false
@@ -276,9 +273,8 @@
  metabolisms:
    Narcotic:
      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        type: Add
        time: 5
        refresh: false
@@ -467,9 +463,8 @@
        conditions:
        - !type:ReagentThreshold
          max: 20
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        type: Add
        time: 5
        refresh: false
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -339,9 +339,8 @@
  metabolisms:
    Poison:
      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectSeeingRainbow
        type: Add
        time: 10
        refresh: false