]> git.smokeofanarchy.ru Git - space-station-14.git/commit
THE WIZARD (#35406)
authorkeronshb <54602815+keronshb@users.noreply.github.com>
Wed, 26 Feb 2025 05:34:07 +0000 (00:34 -0500)
committerGitHub <noreply@github.com>
Wed, 26 Feb 2025 05:34:07 +0000 (22:34 -0700)
commit68de58eb6636170c2e0d8f8f856cf5e52db1037d
tree0ae81bd8101ae04b203b4f39793adc328c4e79da
parent6ea742d4b4ca2bfa6ed798206568114b30121136
THE WIZARD (#35406)

* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
28 files changed:
Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs
Content.Server/Objectives/Components/FreeObjectiveComponent.cs [new file with mode: 0644]
Content.Server/Objectives/Systems/FreeObjectiveSystem.cs [new file with mode: 0644]
Content.Server/Roles/WizardRoleComponent.cs [new file with mode: 0644]
Resources/Audio/Lobby/attributions.yml
Resources/Audio/Lobby/the_wizard.ogg [new file with mode: 0644]
Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl
Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Resources/Locale/en-US/guidebook/guides.ftl
Resources/Maps/Shuttles/wizard.yml
Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
Resources/Prototypes/Entities/Mobs/Player/human.yml
Resources/Prototypes/GameRules/events.yml
Resources/Prototypes/GameRules/midround.yml [deleted file]
Resources/Prototypes/GameRules/roundstart.yml
Resources/Prototypes/GameRules/subgamemodes.yml [new file with mode: 0644]
Resources/Prototypes/Guidebook/antagonist.yml
Resources/Prototypes/Objectives/base_objectives.yml
Resources/Prototypes/Objectives/wizard.yml [new file with mode: 0644]
Resources/Prototypes/Roles/Antags/wizard.yml
Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
Resources/Prototypes/Roles/MindRoles/mind_roles.yml
Resources/Prototypes/SoundCollections/lobby.yml
Resources/Prototypes/game_presets.yml
Resources/Prototypes/secret_weights.yml
Resources/ServerInfo/Guidebook/Antagonist/Wizard.xml [new file with mode: 0644]