Grabbag of coscult fixes (#3627)
* Cosmic conversion converts non-cultists, not cultists * Remove the cosmic blank examine text on ability end * Allow ghosts to see the monument
This commit is contained in:
parent
dede0ac17c
commit
d7ed1595d7
|
|
@ -78,6 +78,7 @@ public sealed class CosmicBlankSystem : EntitySystem
|
|||
mind.PreventGhosting = false;
|
||||
_mind.TransferTo(mindEnt, comp.OriginalBody);
|
||||
RemComp<CosmicBlankComponent>(comp.OriginalBody);
|
||||
RemComp<CosmicCultExamineComponent>(comp.OriginalBody);
|
||||
_popup.PopupEntity(Loc.GetString("cosmicability-blank-return"), comp.OriginalBody, comp.OriginalBody);
|
||||
QueueDel(uid);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public sealed class CosmicConversionSystem : EntitySystem
|
|||
|
||||
private void OnConversionGlyph(Entity<CosmicGlyphConversionComponent> uid, ref TryActivateGlyphEvent args)
|
||||
{
|
||||
var possibleTargets = _cosmicGlyph.GetTargetsNearGlyph(uid, uid.Comp.ConversionRange, entity => !_cosmicCult.EntityIsCultist(entity));
|
||||
var possibleTargets = _cosmicGlyph.GetTargetsNearGlyph(uid, uid.Comp.ConversionRange, entity => _cosmicCult.EntityIsCultist(entity));
|
||||
if (possibleTargets.Count == 0)
|
||||
{
|
||||
_popup.PopupEntity(Loc.GetString("cult-glyph-conditions-not-met"), uid, args.User);
|
||||
|
|
|
|||
|
|
@ -47,5 +47,6 @@ public sealed class CosmicReturnSystem : EntitySystem
|
|||
mind.PreventGhosting = false;
|
||||
QueueDel(uid);
|
||||
RemComp<CosmicBlankComponent>(uid.Comp.OriginalBody);
|
||||
RemComp<CosmicCultExamineComponent>(uid.Comp.OriginalBody);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
- PsionicInvisibility
|
||||
- Ghost
|
||||
- Normal
|
||||
- CosmicCultMonument # DeltaV - Cosmic Cult
|
||||
- type: ContentEye
|
||||
maxZoom: 8.916104, 8.916104
|
||||
- type: Tag
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@
|
|||
- PsionicInvisibility
|
||||
- Ghost
|
||||
- Normal
|
||||
- CosmicCultMonument # DeltaV - Cosmic Cult
|
||||
- type: Input
|
||||
context: "ghost"
|
||||
- type: Examiner
|
||||
|
|
|
|||
Loading…
Reference in New Issue