From 7c32e1946ab9a190ed58f42ec1d2cadb7a59db09 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Sun, 3 Nov 2024 19:26:53 -0600 Subject: [PATCH 1/4] removes the raise glimmer objective --- .../Nyanotrasen/Objectives/traitor.yml | 28 +++++++++---------- .../Prototypes/Objectives/objectiveGroups.yml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml index eee0f05e364..d24ebecda56 100644 --- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml +++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml @@ -51,17 +51,17 @@ # - BecomePsionicCondition # - type: BecomeGolemCondition -- type: entity - id: RaiseGlimmerObjective - parent: BaseTraitorObjective - name: Raise Glimmer. - description: Get the glimmer above the specified amount. - components: - - type: Objective - difficulty: 2.5 - #unique: false - icon: - sprite: Nyanotrasen/Icons/psi.rsi - state: psi - - type: RaiseGlimmerCondition - target: 500 +#- type: entity +# id: RaiseGlimmerObjective +# parent: BaseTraitorObjective +# name: Raise Glimmer. +# description: Get the glimmer above the specified amount. +# components: +# - type: Objective +# difficulty: 2.5 +# #unique: false +# icon: +# sprite: Nyanotrasen/Icons/psi.rsi +# state: psi +# - type: RaiseGlimmerCondition +# target: 500 diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 05f563c2972..9a9a9e21ce6 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -49,7 +49,7 @@ weights: RandomTraitorAliveObjective: 1 RandomTraitorProgressObjective: 1 - RaiseGlimmerObjective: 0.5 # Nyanotrasen - Raise glimmer to a target amount, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml + #RaiseGlimmerObjective: 0.5 # Nyanotrasen - Raise glimmer to a target amount, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml #Thief groups From e4a8db4dda0729a4abc5c1b40ed7bc2c5e9edf48 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Sun, 10 Nov 2024 13:16:13 -0600 Subject: [PATCH 2/4] 4891 --- .../Prototypes/Nyanotrasen/Objectives/traitor.yml | 15 --------------- .../Prototypes/Objectives/objectiveGroups.yml | 2 -- 2 files changed, 17 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml index d24ebecda56..19832813f03 100644 --- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml +++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml @@ -50,18 +50,3 @@ # components: # - BecomePsionicCondition # - type: BecomeGolemCondition - -#- type: entity -# id: RaiseGlimmerObjective -# parent: BaseTraitorObjective -# name: Raise Glimmer. -# description: Get the glimmer above the specified amount. -# components: -# - type: Objective -# difficulty: 2.5 -# #unique: false -# icon: -# sprite: Nyanotrasen/Icons/psi.rsi -# state: psi -# - type: RaiseGlimmerCondition -# target: 500 diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 9a9a9e21ce6..d870db5d364 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -49,8 +49,6 @@ weights: RandomTraitorAliveObjective: 1 RandomTraitorProgressObjective: 1 - #RaiseGlimmerObjective: 0.5 # Nyanotrasen - Raise glimmer to a target amount, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml - #Thief groups - type: weightedRandom From d25dc87944eddc6027d2680e48d2d8f3d062653b Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Sun, 10 Nov 2024 14:05:07 -0600 Subject: [PATCH 3/4] Update 2_Metagaming.xml --- .../ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml index bc7d7d93f70..7047855e824 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml @@ -116,7 +116,6 @@ - Giving a character additional access or a job because you are friends with the player who is playing that character. - Trusting a character because you are friends with the player who is playing that character. - Not fighting a character because you are friends with the player who is playing that character. - - Ignoring your objective to kill a character because your character and theirs became friends in a previous round. ## Metagrudging Examples These are all examples of things that are prohibited by at least one metashield item that is never revealed IC. From a50a0be97cb9f031c6c797036b0533d173b34bf3 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Sun, 10 Nov 2024 14:05:52 -0600 Subject: [PATCH 4/4] Revert "Update 2_Metagaming.xml" This reverts commit d25dc87944eddc6027d2680e48d2d8f3d062653b. --- .../ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml index 7047855e824..bc7d7d93f70 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Rules/GameRules/2_Metagaming.xml @@ -116,6 +116,7 @@ - Giving a character additional access or a job because you are friends with the player who is playing that character. - Trusting a character because you are friends with the player who is playing that character. - Not fighting a character because you are friends with the player who is playing that character. + - Ignoring your objective to kill a character because your character and theirs became friends in a previous round. ## Metagrudging Examples These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.