Revert "Refactor Game Modes" oh god oh fuck go back it was too good to be true (#5855)

2021-12-21 19:25:52 +01:00
parent 8831d08229
commit 75721c214c
59 changed files with 1715 additions and 1971 deletions
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-deathmatch.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-deathmatch.ftl
@@ -1,2 +0,0 @@
-death-match-title = DeathMatch
-death-match-description = Kill anything that moves!
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-extended.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-extended.ftl
@@ -1,2 +0,0 @@
-extended-title = Extended
-extended-description = No antagonists, have fun!
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-sandbox.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-sandbox.ftl
@@ -1,2 +0,0 @@
-sandbox-title = Sandbox
-sandbox-description = No stress, build something!
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-suspicion.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-suspicion.ftl
@@ -1,2 +0,0 @@
-suspicion-title = Suspicion
-suspicion-description = Suspicion on the Space Station. There are traitors on board... Can you kill them before they kill you?
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
@@ -25,7 +25,6 @@ traitor-objective-condition-success = {$condition} | [color={$markupColor}]Succe
 traitor-objective-condition-fail = {$condition} | [color={$markupColor}]Failure![/color] ({$progress}%)

 traitor-title = Traitor
-traitor-description = There are traitors among us...
 traitor-not-enough-ready-players = Not enough players readied up for the game! There were {$readyPlayersCount} players readied up out of {$minimumPlayers} needed.
 traitor-no-one-ready = No players readied up! Can't start Traitor.

@@ -41,4 +40,4 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$
 # TraitorRole
 traitor-role-name = Syndicate Agent
 traitor-role-greeting = Hello Agent
-traitor-role-codewords = Your codewords are: {$codewords}
+traitor-role-codewords = Your codewords are: {$codewords}
--- a/Resources/Locale/en-US/game-ticking/game-rules/rule-suspicion.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-rules/rule-suspicion.ftl
@@ -4,5 +4,5 @@ rule-suspicion-check-winner-stalemate = Everybody is dead, it's a stalemate!
 rule-suspicion-check-winner-station-win = The traitors are dead! The innocents win.
 rule-suspicion-check-winner-traitor-win = The innocents are dead! The traitors win.
 rule-suspicion-end-round-innocents-victory = The innocents have won!
-rule-suspicion-end-round-traitors-victory = The traitors have won!
-rule-suspicion-end-round-nobody-victory = Nobody wins!
+rule-suspicion-end-round-trators-victory = The traitors have won!
+rule-suspicion-end-round-nobody-victory = Nobody wins!
--- a/Resources/Locale/en-US/suspicion/roles/suspicion-traitor-role.ftl
+++ b/Resources/Locale/en-US/suspicion/roles/suspicion-traitor-role.ftl
@@ -6,6 +6,6 @@ suspicion-objective = Objective: {$objectiveText}

 # Shown when greeted with the Suspicion role
 suspicion-partners-in-crime = {$partnersCount ->
-    [zero] You're on your own. Good luck!
+    *[zero] You're on your own. Good luck!
    [one] Your partner in crime is {$partnerNames}.
-    [other] Your partners in crime are {$partnerNames}.
+    [other] Your partners in crime are {$partnerNames}.
--- a/Resources/Locale/en-US/voting/managers/vote-manager.ftl
+++ b/Resources/Locale/en-US/voting/managers/vote-manager.ftl
@@ -16,3 +16,8 @@ ui-vote-gamemode-win = { $winner } won the gamemode vote!
 ui-vote-map-title = Next map
 ui-vote-map-tie = Tie for map vote! Picking... { $picked }
 ui-vote-map-win = { $winner } won the map vote!
+
+mode-traitor = Traitor
+mode-extended = Extended
+mode-sandbox = Sandbox
+mode-suspicion = Suspicion
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml
@@ -19,7 +19,7 @@
        - RifleCalico
      chance: 0.75
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Pistol Spawner
@@ -45,7 +45,7 @@
        - PistolPaco
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Melee Spawner
@@ -66,7 +66,7 @@
        - Stunbaton
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Revolver Spawner
@@ -84,7 +84,7 @@
        - RevolverMateba
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Shotgun Spawner
@@ -106,7 +106,7 @@
        - ShotgunSawn
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion SMG Spawner
@@ -126,7 +126,7 @@
        - SmgZoric
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Sniper Spawner
@@ -144,7 +144,7 @@
        - SniperHeavy
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Hitscan Spawner
@@ -166,7 +166,7 @@
        - TaserGun
      chance: 0.85
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Launchers Spawner
@@ -183,7 +183,7 @@
        - LauncherRocket
      chance: 0.75
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Grenades Spawner
@@ -206,7 +206,7 @@
        - SoapSyndie # shhh!
      chance: 0.75
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Rifle Ammo Spawner
@@ -227,7 +227,7 @@
        - MagazinePistolCalicoTopMounted
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Shotgun Ammo Spawner
@@ -243,7 +243,7 @@
        - MagazineShotgun
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Pistol Ammo Spawner
@@ -260,7 +260,7 @@
        - MagazineHCPistol
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Magnum Ammo Spawner
@@ -277,7 +277,7 @@
        - MagazineMagnumSmg
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion

 - type: entity
  name: Suspicion Launcher Ammo Spawner
@@ -294,4 +294,4 @@
        - GrenadeFrag
      chance: 0.95
      gameRules:
-        - Suspicion
+        - RuleSuspicion
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml
@@ -12,4 +12,4 @@
        - TraitorDMRedemptionMachine
      chance: 1.0
      gameRules:
-        - TraitorDeathMatch
+        - RuleTraitorDeathMatch
--- a/Resources/Prototypes/Roles/Antags/Suspicion/suspicion_traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/Suspicion/suspicion_traitor.yml
@@ -1,6 +1,6 @@
 - type: antag
  id: SuspicionTraitor
-  name: "suspect"
+  name: "traitor"
  antagonist: true
  setPreference: true
  objective: "Kill the innocents."
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -1,6 +0,0 @@
- type: antag
-  id: Traitor
-  name: "traitor"
-  antagonist: true
-  setPreference: true
-  objective: "Complete your objectives without being caught."
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -1,60 +0,0 @@
- type: gamePreset
-  id: Extended
-  alias:
-    - extended
-    - shittersafari
-  name: extended-title
-  showInVote: true
-  description: extended-description
-
- type: gamePreset
-  id: Sandbox
-  alias:
-    - sandbox
-  name: sandbox-title
-  description: sandbox-description
-  showInVote: true
-  rules:
-    - Sandbox
-
- type: gamePreset
-  id: Traitor
-  alias:
-    - traitor
-  name: traitor-title
-  description: traitor-description
-  showInVote: true
-  rules:
-    - Traitor
-
- type: gamePreset
-  id: Suspicion
-  alias:
-    - suspicion
-    - sus
-  name: suspicion-title
-  description: suspicion-description
-  showInVote: true
-  rules:
-    - Suspicion
-
- type: gamePreset
-  id: Deathmatch
-  alias:
-    - deathmatch
-    - dm
-  name: death-match-title
-  description: death-match-description
-  rules:
-    - DeathMatch
-
- type: gamePreset
-  id: TraitorDeathMatch
-  alias:
-    - traitordm
-    - traitordeathmatch
-  name: traitor-death-match-title
-  description: traitor-death-match-description
-  rules:
-    - TraitorDeathMatch
-    - MaxTimeRestart
--- a/Resources/Prototypes/game_rules.yml
+++ b/Resources/Prototypes/game_rules.yml
@@ -1,20 +0,0 @@
- type: gameRule
-  id: DeathMatch
-
- type: gameRule
-  id: InactivityTimeRestart
-
- type: gameRule
-  id: MaxTimeRestart
-
- type: gameRule
-  id: Suspicion
-
- type: gameRule
-  id: Traitor
-
- type: gameRule
-  id: TraitorDeathMatch
-
- type: gameRule
-  id: Sandbox