Skip to content

[fix] Noosphere Events #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kekoven1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] Noosphere Events #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/_White/Abilities/Psionics/Abilities/ClonePowerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private void OnDispelled(EntityUid uid, PsionicCloneComponent component, Dispell
StripCloneEquipment(uid);

QueueDel(uid);
Spawn("Ectoplasm", Transform(uid).Coordinates);
Spawn(component.SpawnOnDeathPrototype, Transform(uid).Coordinates);

_popup.PopupCoordinates(Loc.GetString("psionic-burns-up", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.MediumCaution);
_audio.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true);
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/_White/Psionics/Abilities/Clone/PsionicCloneComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ public sealed partial class PsionicCloneComponent : Component
public EntityUid? OriginalUid;

[DataField]
public ProtoId<EntityPrototype> SpawnOnDeathPrototype { get; set; } = "Ectoplasm";
public ProtoId<EntityPrototype> SpawnOnDeathPrototype { get; set; } = "Ash";
}
30 changes: 30 additions & 0 deletions Resources/Prototypes/_White/GameRules/events.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,33 @@
- MindRoleXenomorph
- type: DynamicRuleCost # WD edit
cost: 24

- type: entityTable
id: BasicNoosphereEventsTable
table: !type:AllSelector
children:
- id: NoosphericZap
- id: NoosphericStorm
- id: MundaneDischarge
- id: NoosphericFry
- id: PsionicCatGotYourTongue
- id: MassMindSwap
- id: GlimmerWispSpawn
- id: GlimmerRandomSentience
- id: FreeProber
- id: GlimmerRevenantSpawn
- id: GlimmerMiteSpawn


- type: entity
parent: BaseGameRule
id: NoosphereEventsScheduler
components:
- type: GameRule
- type: BasicStationEventScheduler
minimumTimeUntilFirstEvent: 300
minMaxEventTiming:
min: 400
max: 600
scheduledGameRules: !type:NestedSelector
tableId: BasicNoosphereEventsTable
21 changes: 21 additions & 0 deletions Resources/Prototypes/game_presets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: KesslerSyndrome
Expand All @@ -28,6 +29,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: SurvivalHellshift
Expand All @@ -43,6 +45,7 @@
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: SurvivalIrregular
Expand All @@ -57,6 +60,7 @@
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: SurvivalIrregularExtended
Expand All @@ -71,6 +75,7 @@
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: AllAtOnce
Expand All @@ -91,6 +96,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: AllerAtOnce
Expand Down Expand Up @@ -120,6 +126,7 @@
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- Shadowling
- NoosphereEventsScheduler

- type: gamePreset
id: Extended
Expand All @@ -134,6 +141,7 @@
- MeteorSwarmScheduler
- SpaceTrafficControlEventScheduler
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Greenshift
Expand All @@ -147,6 +155,7 @@
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Dynamic
Expand All @@ -164,6 +173,7 @@
- MeteorSwarmScheduler
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- NoosphereEventsScheduler

- type: gamePreset
id: Secret
Expand All @@ -176,6 +186,7 @@
rules:
- Secret
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: SecretExtended #For Admin Use: Runs Extended but shows "Secret" in lobby.
Expand All @@ -189,6 +200,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: SecretGreenshift #For Admin Use: Runs Greenshift but shows "Secret" in lobby.
Expand All @@ -201,6 +213,7 @@
- SpaceTrafficControlFriendlyEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Sandbox
Expand All @@ -213,6 +226,7 @@
rules:
- Sandbox
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Traitor
Expand All @@ -230,6 +244,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Deathmatch
Expand Down Expand Up @@ -259,6 +274,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Revolutionary
Expand All @@ -277,6 +293,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Wizard
Expand All @@ -292,6 +309,7 @@
- MeteorSwarmScheduler
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- NoosphereEventsScheduler

- type: gamePreset
id: Zombie
Expand All @@ -311,6 +329,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Zombieteors
Expand All @@ -328,6 +347,7 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler

- type: gamePreset
id: Changeling
Expand All @@ -347,3 +367,4 @@
- SpaceTrafficControlEventScheduler
- BasicRoundstartVariation
- LavalandStormScheduler # Lavaland Change
- NoosphereEventsScheduler
Loading