Merge pull request #3 from whatston3/rules-v5-suggestions-2

Rules suggestions by whatstone

Content.Client/Guidebook/DocumentParsingManager.cs

@@ -36,7 +36,7 @@ public void Initialize()
             .Assert(_tagControlParsers.ContainsKey, tag => $"unknown tag: {tag}")
             .Bind(tag => _tagControlParsers[tag]);
 
-        _controlParser = OneOf(_tagParser, TryHeaderControl, ListControlParser, TextControlParser)
+        _controlParser = OneOf(_tagParser, TryHeaderControl, TryListControl, TextControlParser) // Frontier: add ListControlParser<TryListControl
             .Before(SkipWhitespaces);
 
         foreach (var typ in _reflectionManager.GetAllChildren<IDocumentTag>())

Content.Client/Guidebook/DocumentParsingManager.static.cs

@@ -14,6 +14,7 @@ namespace Content.Client.Guidebook;
 public sealed partial class DocumentParsingManager
 {
     private const string ListBullet = "  › ";
+    private const string SublistBullet = "      • "; // Frontier
 
     // Parser that consumes a - and then just parses normal rich text with some prefix text (a bullet point).
     private static readonly Parser<char, char> TryEscapedChar = Try(Char('\\')
@@ -123,6 +124,22 @@ public sealed partial class DocumentParsingManager
             .Cast<Control>())
         .Labelled("list");
 
+    // Frontier: sublists - should duplicate ListControlParser but for more hyphens, and print out more spaces before your list character
+    private static readonly Parser<char, Control> SublistControlParser = Try(String("--"))
+        .Then(SkipWhitespaces)
+        .Then(Map(
+                control => new BoxContainer
+                {
+                    Children = { new Label { Text = SublistBullet, VerticalAlignment = VAlignment.Top }, control },
+                    Orientation = LayoutOrientation.Horizontal
+                },
+                TextControlParser)
+            .Cast<Control>())
+        .Labelled("sublist");
+
+    private static readonly Parser<char, Control> TryListControl = OneOf(SublistControlParser, ListControlParser);
+    // End Frontier: sublists
+
     #region Text Parsing
 
     #region Basic Text Parsing

Resources/Locale/en-US/_NF/guidebook/guides.ftl

@@ -21,6 +21,7 @@ guide-entry-expedition-syndicate-naval-forces = Syndicate Naval Forces
 guide-entry-expedition-xenos = Xenos
 
 # Shipyard entries
+guide-entry-shipyard-akupara = Akupara
 guide-entry-shipyard-ambition = Ambition
 guide-entry-shipyard-apothecary = Apothecary
 guide-entry-shipyard-bazaar = Bazaar
@@ -52,10 +53,11 @@ guide-entry-shipyard-pioneer = Pioneer
 guide-entry-shipyard-prospector = Prospector
 guide-entry-shipyard-searchlight = Searchlight
 guide-entry-shipyard-spirit = Spirit
+guide-entry-shipyard-stasis = Stasis
 guide-entry-shipyard-vagabond = Vagabond
 
 # Rules entries
-guide-entry-frontier-rule-zero-tolernace = Zero Tolerance
+guide-entry-frontier-rule-zero-tolerance = Zero Tolerance
 guide-entry-frontier-rule-1 = 1. Community
 guide-entry-frontier-rule-2 = 2. IC Info
 guide-entry-frontier-rule-3 = 3. Escalation
@@ -67,4 +69,3 @@ guide-entry-frontier-rule-8 = 8. Crimes
 guide-entry-frontier-rule-9 = 9. Silicons
 guide-entry-frontier-rule-10 = 10. Security
 guide-entry-frontier-rule-11 = 11. Command
-

Resources/Prototypes/_NF/Guidebook/rules.yml

@@ -21,7 +21,7 @@
 
 - type: guideEntry
   id: FrontierRuleZeroTolerance
-  name: guide-entry-frontier-rule-zero-tolernace
+  name: guide-entry-frontier-rule-zero-tolerance
   text: "/ServerInfo/_NF/Guidebook/Rules/Zero_Tolerance.xml"
   ruleEntry: true
 

Resources/ServerInfo/_NF/Guidebook/Rules/10_Security.xml

@@ -1,16 +1,18 @@
 <Document>
-# 10. Security and Station Staff Standards
+# 10. NFSD and Frontier Staff Standards
 
-You must follow the law and be an example to the rest of the community when playing this roles.
-
-    - Security Forces and Station Staff roles are held to a higher standard of roleplay and are strictly non-antagonists.
-
-    - Security Forces roleplaying as ‘bad cops’ and intentionally violating space law is forbidden. Space Law is not optional for these roles, and strong knowledge is required before taking a security position.
-
-    - Civilian and Security staff are expected to maintain a minimum of competency and performance on their jobs. Security staff must follow NFSD Standard Operating Procedure (see Wiki in the menu for more details).
-
-    - Assets seized from criminals may only be used to make victims whole and to pay for any fines under the law. Any excess financials received from the sale of criminal assets is to be returned to their original owners, and are not to be plundered or extorted by security forces. This is a strict zero-tolerance policy.
-
-    - All players that are hired on as crew to the station as security or service staff, or through other direct jobs working for paychecks from the station, are considered non-antags and official Nanotrasen employees. Engaging in any hostile antagonistic activities, or abuse of the equipment provided while working in these roles, is strictly prohibited.
+You must follow the law and be an example to the rest of the community when playing as security or station staff.
 
+    - Security forces (NFSD) and Frontier Staff roles are held to a higher standard of roleplay.
+    -- These roles are considered as Nanotrasen employees and are strictly non-antagonists.
+    -- Engaging in any antagonistic activities in these roles is strictly prohibited.
+    -- Abuse of the equipment provided to work in these roles is strictly prohibited.
+    - NFSD officers roleplaying as 'bad cops' and intentionally violating space law is forbidden.
+    -- Space Law is not optional for these roles, and strong knowledge is required before taking a security position.
+    - Both NFSD and Frontier Staff are expected to maintain a minimum of competency and performance on their jobs.
+    - NFSD officers must follow NFSD Standard Operating Procedure (see Wiki in the menu for more details).
+    - Assets seized from criminals may only be used to make victims whole and to pay for any fines under the law.
+    -- Excess funds received from the sale of criminal assets are to be returned to their original owners.
+    -- These assets and are not to be plundered or extorted by security forces.
+    -- This is a strict zero-tolerance policy.
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/11_Command.xml

@@ -3,16 +3,23 @@
 
 You are the highest authority on the sector before central command, you have to act as an example for the rest of the community.
 
-    - Sector Command roles such as Station Rep and Sheriff are vital to the operation of the sector and are held to a much higher degree of roleplay and role handling.
-
-    - Sector Command is expected and [color=#ff0000]required [/color] to maintain pay for their respective staff as a part of their job.
-
-    - Payroll should be a minimum of 10,000 for station crew, 20,000 for Station Rep and Sheriff, and 15,000 for security per hour. Embezzlement of station funds is strictly forbidden.
-
-    - Both of these roles have higher access to station resources than should be allowed for most crew members. As such, if you must ever end your shift early, always bring your ID with you, and always return to cryosleep so that your access cannot be stolen and the station funds embezzled. If for any reason you cannot (disconnect, crash, power outage, etc.) Please ping the game admins in Discord and we will handle your in-game character accordingly.
-
-    - Sector Command is permitted and expected to issue and enforce any docking fines related to loitering in the terminal for shuttles that have been idle for more than 10 minutes in the station docks without a valid reason, up to and including forced eviction of shuttles.  Fines collected in this way are permitted to be used as payroll or the acquisition of station supplies. Time spent docked and waiting at the station is to be kept at a minimum.
-
-    - You may not tax, lease, rent, or otherwise reserve the free and fair use of station resources and space to the detriment of the public or for personal gain. This includes, but is not limited to: charging docking fees, granting docking extensions, vending access, and moving station resources behind access locked doors to restrict access.
-
+    - Command roles (e.g. Station Rep, Sheriff) are held to a much higher standard of roleplay.
+    - Command is [color=#ff0000]required[/color] to maintain pay for their respective staff as a part of their job.
+    -- You are expected to maintain pay for roles absent other command positions, within reason.
+    -- Minimum hourly pay rates are $10,000 for station crew, $20,000 for Station Rep and Sheriff, and $15,000 for security.
+    -- Embezzlement of station funds is strictly forbidden.
+    - If ending your shift early:
+    -- Have your ID on your character.
+    -- Reopen your position at the station records computer.
+    -- Return to cryosleep.
+    -- If you cannot (disconnect, crash, power outage, etc.), ping the game admins in Discord.
+    - Command is expected to enforce docking laws and collect any fines related to dock loitering.
+    -- Refer to Space Law for the specific laws on dock loitering.
+    -- Funds collected from this may be used for station payroll or station supplies.
+    -- Traffic to and from traffic-controlled stations should be kept flowing.
+    - You may not tax, lease, rent, or otherwise impede the use of station resources. This includes:
+    -- Charging docking fees.
+    -- Granting docking extensions.
+    -- Restricting vendor access (e.g. placing machines behind locked doors).
+    -- Restricting access to station resources.
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/1_Community.xml

@@ -1,16 +1,11 @@
 <Document>
 # 1. Community Expectations
 
-Everyone here is playing to have a good time and have fun, respect the rest of the players around you the same way you would like to be respected.
-
-    - Follow the community expectations. This includes both in game and elsewhere in our community.
-
-    - Don't be a dick nor harass other players.
-
-    - Do not grief as a non-antagonist; this includes against AFK and SSD/Catatonic Players.
+Everyone here is playing to have a good time and have fun. Respect the rest of the players around you the same way you would like to be respected.
 
+    - Follow these rules, both in-game and elsewhere in our community:
+    -- Don't be a dick or harass other players.
+    -- Do not push political messages of any kind in chat, images, drawings or faxes.
+    - Do not grief as a non-antagonist; this includes against AFK and SSD/catatonic players.
     - Do not respawn to avoid punishment from the NFSD, or respawn as the same character if given a permanent confinement sentence or execution.
-
-    - Do not push political messages of any kind in chat, images, drawings or faxes.
-
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/2_ICInfo.xml

@@ -1,26 +1,22 @@
 <Document>
 # 2. In-context Info
 
-Keep everything on the place it belongs, it hurts the roleplay when your character starts talking about stuff they should not know.
+Keep everything in the place it belongs, it hurts the roleplay when your character starts talking about stuff they should not know.
 
-## 2.1 Meta
+## 2.1 IC/OC and Meta-friending
 
-  - Do not use information gained outside of in-character means, and do not say In Character (IC) things in the Local Out Of Character (LOOC) chat channel.
+  - Do not use information gained outside of in-character means (e.g. as a ghost).
+  - Do not say in character (IC) things in the local out of character (LOOC) chat channel.
+  - Do not say LOOC things in IC, like saying you “need to go afk because your dog wants to go outside,” in the IC chat.
+	- Characters can know everything about in-game mechanics or antagonists.
+  - Characters can keep persistent friendships and relationships with other characters, but this should develop through IC interaction.
 
-  - Do not say LOOC things in IC either, like saying you “need to go afk because your dog wants to go outside,” in the IC chat.
-
-	- Characters are otherwise allowed to know everything about in-game mechanics or antagonists, as well as keep persistent friendships and relationships with other characters when not for the purpose of unfair advantage by teaming up together for little IC reason.
-
-## 2.2 Cloning and revival
-
-  - After cloning, respawning, or taking a ghost role, you must follow the new life rule.
-
-  - If cloned, resuscitated, or respawned, you don't have amnesia, but you can only recall vague details of who or what had killed you.
+## 2.2 Cloning and Revival
 
+  - After cloning, respawning, or taking a ghost role, you must follow the new life rules:
+  -- You can only recall vague details of who or what had killed you.
+  -- You remember anything that happened before being incapacitated.
+  -- When taking a ghost role, you know _nothing_ about your previous characters while playing that role.
   - Do not respawn to avoid punishment from the NFSD, or respawn as the same character if given a permanent confinement sentence or execution.
-
-  - If taking a ghost role, you have no memories from any past lives for the duration of playing as a ghost role.
-
-  - Don't act on anything you saw while ghosted.
-
+  - Don't act on anything you saw while ghosted (see 2.1).
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/3_Escalation.xml

@@ -3,16 +3,11 @@
 
 A fistfight does not suddenly escalate into a gunfight. Use common sense.
 
-    - Antagonistic ghost roles, and pest ghost roles like mice are always fair game for attack. Don't grief nanotrasen-aligned ghost roles like familiars, drones, or pets without provocation.
-
+    - Antagonistic ghost roles and pest ghost roles like mice are always fair game for attack. 
+    - Don't attack Nanotrasen-aligned ghost roles like familiars, drones, or pets without provocation.
     - Do not attack another player without a legitimate, explainable roleplay reason that could be applied in a similar, real-life scenario.
-
     - If a fight results in someone being critically injured or killed, seek medical help for them.
-
-    - If at any point combat is disengaged and both parties leave the area, you cannot skip escalation and plunge back into a fight. What’s done is done.
-
-    - A 15 minute non-aggression period is required after respawning, so you can’t immediately get in a ship and try to go kill whoever killed you.
-
-    - NFSD/Command Forces are expected to resolve situations with non-lethal force and to de-escalate IC confrontation except in cases where there is a reasonable chance of harm/death.
-
+    - If a fight ends and both parties leave the area, you cannot skip escalation and plunge back into a fight. What's done is done.
+    - A 15 minute non-aggression period is required after respawning, so you can't immediately get in a ship and try to go kill whoever killed you.
+    - NFSD and command roles must resolve situations with non-lethal force and to de-escalate IC confrontation except in cases where there is a reasonable chance of harm/death.
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/4_Chat.xml

@@ -1,12 +1,9 @@
 <Document>
 # 4. Chat and Language Guidelines
 
-All staff speaks english and so does the rest of the community, breaking any of this rules might end on a server kick or ban.
-
-    - Only speak in English both OOC and IC.
+All staff speaks English and so does the rest of the community, breaking any of these rules might end in a server kick or ban.
 
+    - Only speak in English, both OOC and IC.
     - Do not spam.
-
     - Do not advertise.
-
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/5_Roleplay.xml

@@ -1,25 +1,19 @@
 <Document>
 # 5. General Roleplay Guidelines
 
-Your IC name must be realistic and fit into the game's setting. This is a roleplay server first and foremost, so give your character the effort it deserves.
+Your IC name must be reasonable and fit into the game's setting. This is a roleplay server first and foremost, so give your character the effort it deserves.
 
 ## 5.1 Naming
 
     - Avoid joke names and names of locations, brands, fictional/real people or names parodying off from them (e.g. Baul Sadman, Tom Ford.)
-
-    - Do not use numbers, symbols, titles, adjectives or honorifics (i.e Mr ,Dr ,Big ,Old).
-
+    - Do not use numbers, symbols, titles, adjectives or honorifics (i.e Mr, Dr, Big, Old).
     - Avoid using character names of other well-known players, do not impersonate players this way.
-
     - All species have a naming convention, be sure to generally follow it.
 
 ## 5.2 Meta/Chat
 
-    - Treat your character as a separate entity from you, the player. Your character's actions, feelings, and knowledge in-game should be based solely on the character's experiences and not your own as the player.
-
+    - Treat your character as a separate entity from you, the player.
+    -- Your character's actions and feelings in-game should be based solely on the experiences of the character, not yours.
     - Low roleplay actions that have no regard for your character or the setting (Memes, silly copy paste spam IC) are not acceptable.
-
     - Do not use Netspeak when talking (i.e. LOL, ROFL, XD, FR).
-
-    - Previous experiences with other characters are allowed to lead to meta-friending, but you may not meta-grudge another character.
 </Document>

Resources/ServerInfo/_NF/Guidebook/Rules/6_Safezone.xml

@@ -1,17 +1,21 @@
 <Document>
 # 6. Frontier Safe Zone
 
-[color=red]The immediate 200 meters around the Frontier and the Frontier itself is considered a safe zone and absolutely no antag activity or griefing is permitted within that zone.[/color]
+[color=red]Frontier Outpost and the 200 meter radius around it is considered a safe zone. Absolutely no antag activity or griefing is permitted within that zone.[/color]
 
-    - Do not destroy, modify, remove, or otherwise restrict the use of any machine or device designed for public use, and the structure of the station itself.
-
-    - For any non-antagonistic or roleplay modifications of the station, Station Rep's approval is always required.
-
-    - Fights and confrontations is completely disallowed on the safezone such as shooting, attacking or any forms of harm.
-
-    - Pirate actions may not begin on the Frontier. This includes stowing away while at the Frontier with intentions to steal the ship, outright stealing the ship or its cargo from the dock, selling someone else’s ship you hadn’t pirated outside the safe zone, or joining the crew under false pretenses with the intention to mutiny and take the ship.
-
-    - Dangerous research like artifacts and anomalies must not be done while inside the safezone boundaries.
-
-    - Do not transport any kind of creature or objects with the intent to cause harm/death, or bait into a conflict inside of the frontier.
+    The following rules apply to the safe zone:
+    - Do not destroy or damage the structure of Frontier Outpost.
+    - Do not destroy, modify, remove, or restrict the use of any machine or device designed for public use on Frontier Outpost.
+    - The Station Rep's approval is required for any modifications of the station.
+    - Player fights and confrontations are not allowed in the safe zone.
+    - Unnecessary violence, such as shooting guns or swinging weapons, is not allowed in the safe zone.
+    -- If a hostile creature (e.g. a space bear) is seen on Frontier Outpost, it can be killed with impunity.
+    - Do not transport any kind of creature or object with the intent to cause harm/death.
+    - Do not wear or use objects with the intent to bait others into conflict inside of Frontier Outpost.
+    - Dangerous research on artifacts and anomalies must not be done while inside the safe zone.
+    - Pirate actions may not occur or start on Frontier Outpost. This includes:
+    -- Stowing away while at Frontier Outpost with intentions to steal a ship.
+    -- Stealing ships or ships' cargo.
+    -- Selling anothers' ship you hadn't pirated outside the safe zone.
+    -- Joining the crew under false pretenses with the intent to mutiny and take the ship.
 </Document>