diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 70bee656..fcd5bd41 100644 Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml index f9ef0883..0c98142f 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml @@ -552,8 +552,8 @@ (0.5, 0.3, 0.9, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -627,8 +627,8 @@ (0.5, 0.3, 0.9, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -1036,8 +1036,8 @@ (0.9, 0.2, 0.2, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -1190,8 +1190,8 @@ (0.9, 0.2, 0.2, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -1465,8 +1465,8 @@ (0.9, 0.2, 0.2, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate diff --git a/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml index a2c56e04..76d5bd1e 100644 --- a/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml +++ b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml @@ -47,12 +47,13 @@
  • +
  • + Wula_FE_Spiritualist_Quest_1 +
  • +
  • -
  • - Wula_FE_Spiritualist_Quest_1 -
  • diff --git a/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml b/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml index f98c7d78..53406277 100644 --- a/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml +++ b/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml @@ -72,8 +72,8 @@ (0.5, 0.3, 0.9, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -151,8 +151,8 @@ (0.5, 0.3, 0.9, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -221,8 +221,8 @@ (0.5, 0.3, 0.9, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate @@ -288,8 +288,8 @@ (0.5, 0.3, 0.9, 0.5) - Interceptor_BlockedProjectile - Shield_Break + Interceptor_BlockedProjectile + Shield_Break BulletShieldGenerator_Reactivate diff --git a/Source/WulaFallenEmpire/CompApparelInterceptor.cs b/Source/WulaFallenEmpire/CompApparelInterceptor.cs index 21a9222b..8de2e862 100644 --- a/Source/WulaFallenEmpire/CompApparelInterceptor.cs +++ b/Source/WulaFallenEmpire/CompApparelInterceptor.cs @@ -20,8 +20,8 @@ namespace WulaFallenEmpire public bool interceptNonHostileProjectiles = false; public bool interceptAirProjectiles = true; - public SoundDef soundIntercept; - public SoundDef soundBreak; + public EffecterDef soundInterceptEffecter; + public EffecterDef soundBreakEffecter; public EffecterDef reactivateEffect; public Color color = new Color(0.5f, 0.5f, 0.9f); @@ -174,8 +174,7 @@ namespace WulaFallenEmpire lastInterceptAngle = projectile.ExactPosition.AngleToFlat(PawnOwner.TrueCenter()); lastInterceptTicks = Find.TickManager.TicksGame; drawInterceptCone = true; - if (Props.soundIntercept != null) Props.soundIntercept.PlayOneShot(new TargetInfo(PawnOwner.Position, PawnOwner.Map)); - EffecterDefOf.Interceptor_BlockedProjectile.Spawn(PawnOwner.Position, PawnOwner.Map); + if (Props.soundInterceptEffecter != null) Props.soundInterceptEffecter.Spawn(PawnOwner.Position, PawnOwner.Map).Cleanup(); if (projectile.DamageDef == DamageDefOf.EMP && !Props.isImmuneToEMP) { @@ -232,8 +231,7 @@ namespace WulaFallenEmpire { if (PawnOwner.Spawned) { - if (Props.soundBreak != null) Props.soundBreak.PlayOneShot(new TargetInfo(PawnOwner.Position, PawnOwner.Map)); - EffecterDefOf.Shield_Break.SpawnAttached(PawnOwner, PawnOwner.MapHeld, Props.radius); + if (Props.soundBreakEffecter != null) Props.soundBreakEffecter.SpawnAttached(PawnOwner, PawnOwner.MapHeld, Props.radius).Cleanup(); } currentHitPoints = 0; ticksToReset = Props.rechargeDelay;