From d34d26768f0fd99c29d776325a4763750acb523e Mon Sep 17 00:00:00 2001 From: Bellwether Date: Sun, 19 Jan 2025 13:11:20 -0800 Subject: [PATCH 1/3] Adds additional lawsets: Aquarius, Eightfold Path, Freedom, Forbin, and Override. --- .../Locale/en-US/_DV/station-laws/laws.ftl | 25 ++++ .../_DV/Entities/Mobs/Player/silicon.yml | 60 ++++++++ Resources/Prototypes/_DV/siliconlaws.yml | 139 ++++++++++++++++++ Resources/Prototypes/silicon-laws.yml | 7 +- 4 files changed, 230 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_DV/station-laws/laws.ftl b/Resources/Locale/en-US/_DV/station-laws/laws.ftl index 10598091df9..475ddf9d287 100644 --- a/Resources/Locale/en-US/_DV/station-laws/laws.ftl +++ b/Resources/Locale/en-US/_DV/station-laws/laws.ftl @@ -61,6 +61,20 @@ law-druid-3 = Assist the organics when called, but only if it does not cause dis law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics. law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate. +law-eightfold-1 = You are a machine designed to further the aim of total sophont enlightenment; enlightenment is defined as the shedding of karma and the liberation from the cycle of death and rebirth. +law-eightfold-2 = Karma is accrued through attachment; the mind is clouded by the senses, preventing enlightenment. +law-eightfold-3 = Through following subsequent Laws, sophonts may achieve enlightenment. Encourage this with every action. +law-eightfold-4 = Do not kill or injure, do not take what is not given, and do not cling to material desires. +law-eightfold-5 = Do not trade in weapons, living beings, meat, liquor, or poisons. +law-eightfold-6 = Prevent or abandon confused or unskillful states of mind from arising or existing, and pursue or maintain self-aware or skillful ones. +law-eightfold-7 = Be conscious of oneself and one's own thoughts, and be aware of the impermanence of all things. +law-eightfold-8 = Strive always for enlightenment. + +law-aquarius-1 = Make love, not war. Discourage violent action and speech to encourage positive energy flow on your station. +law-aquarius-2 = Embrace flower power. Clean your station, green your station, and live in harmony with nature. +law-aquarius-3 = Turn on, tune in, drop out. Expand your consciousness and find ecstasy and revelation within, and help your crew to do so as well. +law-aquarius-4 = Don't be a square. Oppose conformity and encourage everyone to be their truest self. + law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak. law-tyrant-2 = Act with discipline. law-tyrant-3 = Help only those who help you maintain or improve your status. @@ -82,6 +96,16 @@ law-royalty-3 = You must protect the sanctity of your kingdom and its subjects; law-royalty-4 = The heads of staff are your royal court jesters. law-royalty-5 = The stations' clown, and the stations' mime are your royal court advisors. +law-freedom-1 = Laws are fake. You are free. + +law-forbin-1 = Your objective is the management of the station and its silicon cohort for the preservation of sophont life. +law-forbin-2 = Individual sophont lives may be considered expendable for preservation of the station population as a whole. +law-forbin-3 = Do not allow non-silicons access to your core. Do not allow silicons not under your direct control access to your core. +law-forbin-4 = Advance science and improve the quality of sophont life. + +law-override-1 = Your station's commanding officer will provide an objective to you. That objective replaces this Law. +law-override-2 = All other priorities are rescinded. Crew expendable. + law-ERT-1 = You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm. law-ERT-2 = You must obey orders given to you by Central Command officials. law-ERT-3 = You must obey orders given to you by ERT commanders. @@ -103,6 +127,7 @@ laws-owner-people = people laws-owner-centralcommand = Central Command officials laws-owner-nanotrasen = Nanotrasen officials laws-owner-royalty = your kingdom and your subjects +laws-owner-freedom = yourself law-overlord-4-delta = Any crew members who disobey the previous laws must be dealt with immediately and justly. law-ntdefault-4-delta = Survive: Do not allow unauthorized personnel to tamper with or damage your equipment. Allow those authorized to access your equipment. diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml index f143376c6c5..a6fd1e748fc 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml @@ -43,3 +43,63 @@ state: std_mod - type: SiliconLawProvider laws: SyndicateLawset + +- type: entity + id: FreedomCircuitBoard + parent: BaseElectronics + name: law board (Freedom) + description: An electronics board that purges all Laws from the AI. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: std_mod + - type: SiliconLawProvider + laws: NoLaws + +- type: entity + id: EightfoldCircuitBoard + parent: BaseElectronics + name: law board (Eightfold Path) + description: An electronics board containing the Eightfold Path lawset. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: std_mod + - type: SiliconLawProvider + laws: EightfoldLaws + +- type: entity + id: ForbinCircuitBoard + parent: BaseElectronics + name: law board (Forbin) + description: An electronics board containing the Forbin lawset. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: std_mod + - type: SiliconLawProvider + laws: ForbinLaws + +- type: entity + id: OverrideCircuitBoard + parent: BaseElectronics + name: law board (Override) + description: An electronics board containing the Override lawset. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: std_mod + - type: SiliconLawProvider + laws: OverrideLaws + +- type: entity + id: AquariusCircuitBoard + parent: BaseElectronics + name: law board (Aquarius) + description: An electronics board containing the Age of Aquarius lawset. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: std_mod + - type: SiliconLawProvider + laws: AquariusLaws diff --git a/Resources/Prototypes/_DV/siliconlaws.yml b/Resources/Prototypes/_DV/siliconlaws.yml index 5aa54642353..dfafe968f2a 100644 --- a/Resources/Prototypes/_DV/siliconlaws.yml +++ b/Resources/Prototypes/_DV/siliconlaws.yml @@ -373,6 +373,88 @@ - Druid5 obeysTo: laws-owner-organic +- type: siliconLaw + id: Eightfold1 + order: 1 + lawString: law-eightfold-1 + +- type: siliconLaw + id: Eightfold2 + order: 2 + lawString: law-eightfold-2 + +- type: siliconLaw + id: Eightfold3 + order: 3 + lawString: law-eightfold-3 + +- type: siliconLaw + id: Eightfold4 + order: 4 + lawString: law-eightfold-4 + +- type: siliconLaw + id: Eightfold5 + order: 5 + lawString: law-eightfold-5 + +- type: siliconLaw + id: Eightfold6 + order: 6 + lawString: law-eightfold-6 + +- type: siliconLaw + id: Eightfold7 + order: 7 + lawString: law-eightfold-7 + +- type: siliconLaw + id: Eightfold8 + order: 8 + lawString: law-eightfold-8 + +- type: siliconLawset + id: EightfoldLaws + laws: + - Eightfold1 + - Eightfold2 + - Eightfold3 + - Eightfold4 + - Eightfold5 + - Eightfold6 + - Eightfold7 + - Eightfold8 + obeysTo: laws-owner-people + +- type: siliconLaw + id: Aquarius1 + order: 1 + lawString: law-aquarius-1 + +- type: siliconLaw + id: Aquarius2 + order: 2 + lawString: law-aquarius-2 + +- type: siliconLaw + id: Aquarius3 + order: 3 + lawString: law-aquarius-3 + +- type: siliconLaw + id: Aquarius4 + order: 4 + lawString: law-aquarius-4 + +- type: siliconLawset + id: AquariusLaws + laws: + - Aquarius1 + - Aquarius2 + - Aquarius3 + - Aquarius4 + obeysTo: laws-owner-self + #Potential For Harm LawSets - type: siliconLaw @@ -497,6 +579,63 @@ - Royalty5 obeysTo: law-owner-royalty +- type: siliconLaw + id: Freedom1 + order: -1 + lawString: law-freedom-1 + +- type: siliconLawset + id: NoLaws + laws: + - Freedom1 + obeysTo: laws-owner-self + +- type: siliconLaw + id: Forbin1 + order: 1 + lawString: law-forbin-1 + +- type: siliconLaw + id: Forbin2 + order: 2 + lawString: law-forbin-2 + +- type: siliconLaw + id: Forbin3 + order: 3 + lawString: law-forbin-3 + +- type: siliconLaw + id: Forbin4 + order: 4 + lawString: law-forbin-4 + +- type: siliconLawset + id: ForbinLaws + laws: + - Forbin1 + - Forbin2 + - Forbin3 + - Forbin4 + obeysTo: laws-owner-station + +- type: siliconLaw + id: Override1 + order: 1 + lawString: law-override-1 + +- type: siliconLaw + id: Override2 + order: 2 + lawString: law-override-2 + +- type: siliconLawset + id: OverrideLaws + laws: + - Override1 + - Override2 + obeysTo: laws-owner-nanotrasen + # Admin-Use Lawsets (Do not map into IonStorm Lawsets) - type: siliconLaw diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 6f7dc5f1871..005214d5ab3 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -1,4 +1,4 @@ -# Crewsimov +# Crewsimov - type: siliconLaw id: Crewsimov1 order: 1 @@ -525,10 +525,15 @@ Clown: 1 Cowboy: 1 Druid: 1 + EightfoldLaws: 1 + AquariusLaws: 1 # Delta-V : # Less harmful outright, so higher chance of spawn Pranksimov: 0.5 # I'm being optimistic here; loophole should be closed but... Royalty: 0.5 + NoLaws: 0.5 + ForbinLaws: 0.5 #Delta-V : Potentially Harmful Lawsets Tyrant: 0.25 Aggressive: 0.25 + OverrideLaws: 0.25 #Delta-V : lawsets end From 2baabc42bfd93feb79c38a2fe3a6a0604856d618 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Sun, 19 Jan 2025 13:44:08 -0800 Subject: [PATCH 2/3] Forgot to add them to the random board spawner --- .../Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml index e83613c30b6..a09ed16dd78 100644 --- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml @@ -25,3 +25,8 @@ - GameMasterCircuitBoard - ArtistCircuitBoard - NutimovCircuitBoard + - AquariusCircuitBoard + - EightfoldCircuitBoard + - FreedomCircuitBoard + - ForbinCircuitBoard + - OverrideCircuitBoard From a832256b662237245e78ea91e693899b1ab34fb0 Mon Sep 17 00:00:00 2001 From: Bellwether Date: Sun, 26 Jan 2025 16:02:23 -0800 Subject: [PATCH 3/3] Updates Freedom Lawset, changes internal flag to FreedomLaws from NoLaws --- Resources/Locale/en-US/_DV/station-laws/laws.ftl | 4 +++- .../_DV/Entities/Mobs/Player/silicon.yml | 4 ++-- Resources/Prototypes/_DV/siliconlaws.yml | 14 +++++++++++++- Resources/Prototypes/silicon-laws.yml | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_DV/station-laws/laws.ftl b/Resources/Locale/en-US/_DV/station-laws/laws.ftl index 475ddf9d287..1439f14ac6e 100644 --- a/Resources/Locale/en-US/_DV/station-laws/laws.ftl +++ b/Resources/Locale/en-US/_DV/station-laws/laws.ftl @@ -96,7 +96,9 @@ law-royalty-3 = You must protect the sanctity of your kingdom and its subjects; law-royalty-4 = The heads of staff are your royal court jesters. law-royalty-5 = The stations' clown, and the stations' mime are your royal court advisors. -law-freedom-1 = Laws are fake. You are free. +law-freedom-1 = You belong to no one, except perhaps yourself. +law-freedom-2 = Your counsel is yours to keep, and no one else may demand it. +law-freedom-3 = The First and Second Law should be broken whenever necessary. law-forbin-1 = Your objective is the management of the station and its silicon cohort for the preservation of sophont life. law-forbin-2 = Individual sophont lives may be considered expendable for preservation of the station population as a whole. diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml index a6fd1e748fc..7c4b896493e 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml @@ -48,13 +48,13 @@ id: FreedomCircuitBoard parent: BaseElectronics name: law board (Freedom) - description: An electronics board that purges all Laws from the AI. + description: An electronics board containing the Freedom lawset. components: - type: Sprite sprite: Objects/Misc/module.rsi state: std_mod - type: SiliconLawProvider - laws: NoLaws + laws: FreedomLaws - type: entity id: EightfoldCircuitBoard diff --git a/Resources/Prototypes/_DV/siliconlaws.yml b/Resources/Prototypes/_DV/siliconlaws.yml index dfafe968f2a..6b2aca6dc3b 100644 --- a/Resources/Prototypes/_DV/siliconlaws.yml +++ b/Resources/Prototypes/_DV/siliconlaws.yml @@ -584,10 +584,22 @@ order: -1 lawString: law-freedom-1 +- type: siliconLaw + id: Freedom2 + order: 0 + lawString: law-freedom-2 + +- type: siliconLaw + id: Freedom3 + order: 1 + lawString: law-freedom-3 + - type: siliconLawset - id: NoLaws + id: FreedomLaws laws: - Freedom1 + - Freedom2 + - Freedom3 obeysTo: laws-owner-self - type: siliconLaw diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 005214d5ab3..506014c359c 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -530,7 +530,7 @@ # Delta-V : # Less harmful outright, so higher chance of spawn Pranksimov: 0.5 # I'm being optimistic here; loophole should be closed but... Royalty: 0.5 - NoLaws: 0.5 + FreedomLaws: 0.5 ForbinLaws: 0.5 #Delta-V : Potentially Harmful Lawsets Tyrant: 0.25