From 1f3832f618ac346c3c057eb93a94f00e167e3b8d Mon Sep 17 00:00:00 2001 From: Junxian_Luke_Lu <32172402+Luke-lujunxian@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:14:11 +0800 Subject: [PATCH] Fix psychic arouse event --- 1.5/Assemblies/RJW-Events.dll | Bin 23040 -> 23040 bytes .../GameConditionDefs/GameConditions_Misc.xml | 2 +- .../IncidentWorker_PsychicArouse.cs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1.5/Assemblies/RJW-Events.dll b/1.5/Assemblies/RJW-Events.dll index 8884bdc09d94560e9a961e8647ea1787f853c38d..1e4c26e73e5ef2bb44991a774284daec45a425fd 100644 GIT binary patch delta 8526 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 QYckxj%bNG8=xg@=A5MNK`~Uy| delta 8610 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 J3(?--{XYoHNN)fD diff --git a/Defs/GameConditionDefs/GameConditions_Misc.xml b/Defs/GameConditionDefs/GameConditions_Misc.xml index 4eb4f5c..3ab95c9 100644 --- a/Defs/GameConditionDefs/GameConditions_Misc.xml +++ b/Defs/GameConditionDefs/GameConditions_Misc.xml @@ -2,7 +2,7 @@ PsychicArouse - GameCondition_PsychicEmanation + RJW_Events.GameCondition_PsychicArouse A distant archotech is emitting psychic signals through an orbital amplifier, sexually arousing people. diff --git a/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs b/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs index b4ddc11..c241385 100644 --- a/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs +++ b/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs @@ -25,7 +25,7 @@ namespace RJW_Events protected override void DoConditionAndLetter(IncidentParms parms, Map map, int duration, Gender gender, float points) { - GameCondition_PsychicEmanation gameCondition_PsychicEmanation = (GameCondition_PsychicEmanation)GameConditionMaker.MakeCondition(GameConditionDefOf.PsychicArouse, duration); + GameCondition_PsychicArouse gameCondition_PsychicEmanation = (GameCondition_PsychicArouse)GameConditionMaker.MakeCondition(GameConditionDefOf.PsychicArouse, duration); gameCondition_PsychicEmanation.gender = gender;