Nomads update 2b (#241)

* fauna wip

* wip animals

* Update from Master (#239)

* TDM update 5 (#213)

* increased boltaction accuracy

* weapon accuracy fixes, spent casings, fixes mgs

* combat knife to dagger, bidirectional barricades

* new tips, more balancing for guns

* arrow direction fix (this time for real)

* medkits

* more tips, medical fix

* Updated Opushka (again) (#212)

* Update base_clothing.yml again

* Lowered base_item.yml to 100g

* updatea yay

* Update opushka.yml

* Added soviet and german gracewall to prevent spawncamping

* Update grace_wall.yml

* Update grace_wall.yml

* Update opushka.yml

* Update opushka.yml

* Update grace_wall.yml

---------

Co-authored-by: 123 <123>

* quick capture fix

* Ww2 tweaks (#216)

* Update base_clothing.yml again

* Lowered base_item.yml to 100g

* small tweaks and changes

---------

Co-authored-by: 123 <123>

* TDM update 6 (#215)

* enables mapvotes, dead chat to discord

* auto-mapvote

* medieval and zoomer accents

* votefix

* heavier mgs, tweaked healing for brute packs and gauze, reduced gracewall timer to 3 mins, ammo for medics, wip permanent gracewalls for spawn points

* lower LMG accuracy, WIP gracewall fix

* wielded sprites fixed

* barbedwire, reworks wielding, smg balancing

* random weather

* permanent gracewall fixes, random times of day, magfix

* quick typo

* maps updated

* Flashlight sprites

* Sprite fixes

* Tdm update 7 (#217)

* smoke grenades, grenade tweaks

* removes unused jobs

* more job removals

* loads of ss14 job-specific stuff removed

* integrations

* missing job stuff

* working mapswap, fixed flashlight sprites, grenade runtimes

* restricted crafting for tdm, adds 10 second timer before capture status switches in area capture

* map updates

* Better names for biome specific tiles (#218)

* Gives biome specific tiles different names

* Removes identical copy of another tile

There are no sprites for this in the files so I assume it was a mistake but made a second commit incase its not

* Fixes two typos

* Tdm update 8 (#219)

* buff shields, grenade tweaks, nerfs lmg damage

* map updates

* TDM stats

* rebalanced smgs, fixed playercount

* new walls, spawn number fixes

* concrete and brick walls

* map tweaks, wall fix

* sprite tweak, map update

* Cold war (#220)

* Update base_clothing.yml again

* Lowered base_item.yml to 100g

* yes

* Update ShowFactionIconsComponent.cs

* sovietCW

* changes sovietcw

* Update usa.yml

* Update Resources/Prototypes/Roles/Jobs/Civ14/TDM/sovietCW.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update Resources/Prototypes/Roles/Jobs/Civ14/TDM/sovietCW.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update sovietCW.yml

* Update sovietCW.yml

---------

Co-authored-by: 123 <123>
Co-authored-by: Taislin <cariosecus@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Tdm update 9b (#221)

* window fix, WIP map

* Adds a LOT of decals, signs, road markings, etc

* even more civ13 sprites to play around with

* more chairs and stuff

* cigs

* Cold war (#220) (#222)

* Update base_clothing.yml again

* Lowered base_item.yml to 100g

* yes

* Update ShowFactionIconsComponent.cs

* sovietCW

* changes sovietcw

* Update usa.yml

* Update Resources/Prototypes/Roles/Jobs/Civ14/TDM/sovietCW.yml



* Update Resources/Prototypes/Roles/Jobs/Civ14/TDM/sovietCW.yml



* Update sovietCW.yml

* Update sovietCW.yml

---------

Co-authored-by: Papiditel <mrharved@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* wardrobes, decorative machines, hesco bastions and jersey barriers

* cold war grenades, loadouts, fixes (hopefully) the capture timer resetting

* Asymmetric capture mechanics

* sprite, code fix

* roles, small fixes

* equipments

* sprite fix, gracewall fix

* map fix

---------

Co-authored-by: Papiditel <mrharved@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* force presets, loadout fix

* Adds mortars (#223)

* Ports RMC mortar files and gets them into a half functional state

At the moment the game can build. The mortar and its ammo exist ingame and the mortar can be deployed. Trying to open the UI will call the open function but the UI does not actually open. Explosions are also entirely commented out and the code to support it have not been ported. Locale files are also not ported. All mortar related sprites have been ported.

* Cleans the UI and unnecessary RMC dependencies

The blue horizontal line was removed as it would require editing base ss14 UI functions which I dont want to fuck with. The camera button on the mortar has been removed and the max dial section was moved above the dial buttons. RMC pop out window related code was removed.

* Comments out a debug assert which should not exist

Goes off because nomad is the name of the fallback job instead of passenger for some reason. Honestly no idea why there is an assert for this.

* Ports the locale file

A few things were removed too such as the ones about the mortar camera and the planet.

* Ports mortar sfx, fixes mortar animation and cleans some code

* Setup mortar sprites and fixed some other issues

New inhands, undeployed and firing sprites my me via editing civ13 mortar sprites. All the sfx are the same as the RMC ones besides the melee hit sfx.

* "old mortar" added

Uses some terrible programmer sprites for the inhands which should honestly be redone.

* Adds navigation tools for aiming the mortars

They all just function like a GPS for now and tell your current location x and y.

* Tweaks some values and disables warning messages

* Takes out the unused RMC sprites

I forgot to take these out after i replaced them

* licence corrections

* QOL patch 1 (#229)

* buffs walls, reverts bug

* fixes setting presets

* job icons, research and mortar tweak

* 📝 Add docstrings to `qol_patch_1` (#230)

Docstrings generation was requested by @taislin.

* https://github.com/Civ13/Civ14/pull/229#issuecomment-2908241025

The following files were modified:

* `Content.Client/Overlays/ShowFactionIconsSystem.cs`
* `Content.Server/GameTicking/GameTicker.GameRule.cs`
* `Content.Server/GameTicking/Rules/RandomWeatherRuleSystem.cs`
* `Content.Shared/Inventory/InventorySystem.Relay.cs`

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix sandals

* squad icons and rank icons

* armor tweaks

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* compasses on spawns

* Radios (#231)

* radios

* channel fix

* typo

* typo

* Fixes showing huds to others, pistol mag

* Sound updates 1: Explosions and Mortars (#233)

* Ports a ton of civ13 sounds and some explosion sound collections

* Sets up custom explosions

Needs lots of work still. Also removed some bad sfx and renamed some

* Some more yml changes

* Changes volume of explosion files

I really wish this could be done in the YML but I cant figure out how to get it working so im moving on before I waste more time on this. The volume is adjusted in by changing the volume of the file its self.

* Deletes dupe sfx

* Mortar sfx

Implements civ13 sfx for firing mortar shells and landing shells

* Fix some file names part 1

* rename some files part 2

has to be done in two parts because the windows file system is stupid like that

* QOL patch 2 (#232)

* trying to fix linter stuff

* destroyable barbwire, WIP ranks

* rank trackers

* rank corrections

* rank typos

* rank descs, fixes playtimetrackers

* more rolefixes

* role reqs

* yml fix

* Qol patch 3 (#235)

* shut up yaml linter

* job requirements

* radio channel tweaks

* barricade tweaking

* nades over barricades

* added mortars to maps, basefloors

* buffs arrows, reduces playtime reqs for now

* good enough for now

* runtime fix

* Dirt tile renames (#234)

* Tdm update 10 (#236)

* desert theme tiles, more barriers, medical loadouts

* factions

* roles and loadouts

* tdm.md

* mapping.md

* valley.md

* update valley.md

* updating valley.md

* mapping.md

* Atualizar o mapping.md

* UN Faction

* wiki stuff

* guidebooks

* Update Resources/Prototypes/game_presets.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update Wiki/src/gamemodes/tdm.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yaml fixes, spawns

* fixes, map upgrades

* palms, containers, decorative cars

* yaml typos

* tunnels

* teleporters

* WIP points system

* mechanics

* final valley tweaks

* map tweaks

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* valley wiki article

* Fixes for Valley

Civvies dont steal stuff anymore.

Added a gracewall around the blugoslavia spawn.

Added an exit from the Insurgent base so you don't need to use the tunnels.

Supply crates now give points.

Lower points per kill for insurgents to 20.

Stasis bed in UN hospital is now powered.

UN hospital and Blugoslavian Base both have defibrilators now.

* Adds looking in the distance (#238)

* alt tab black screen bugfix

* First working version

Detects a key for lookzoom now

* Moves LookZoom to client instead

I moved it to shared before because stoopid

* Some next form of this stupid code

I hate it

* More code for the system

still not really functional

* more commit

* Kinda works now but still bad

* REAL WORKING VERSION

still scuffed but i want to commit it anyways

* Mostly fixes the offset not getting reset when toggled on and off

i should add a check when switching hands or dropping the item though

* Gives these components to humans and some related cleanup

* More yml tweaks

* Changes the delay to press the button

* Key change

* Small namespace correction

* Adds some comments to the code

* Update mapping.md

---------

Co-authored-by: Papiditel <mrharved@gmail.com>
Co-authored-by: dallaszzz <96160322+dallaszzz@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* stone shovel and iron anvil

* more medieval armours

* yaml fixes

* gambeson sprite fix

* Nomads update 2b

---------

Co-authored-by: Papiditel <mrharved@gmail.com>
Co-authored-by: dallaszzz <96160322+dallaszzz@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Content.Client/Commands/AcceptFactionInviteCommand.cs

@@ -26,7 +26,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             var factionName = args[0];
-            var inviterUserIdStr = args[1];
 
             if (string.IsNullOrWhiteSpace(factionName))
             {
@@ -34,21 +33,13 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
-            if (!Guid.TryParse(inviterUserIdStr, out var inviterGuid))
-            {
-                shell.WriteError($"Invalid inviter user ID format: {inviterUserIdStr}");
-                return;
-            }
-
-            var inviterNetId = new NetUserId(inviterGuid);
-
             // Create and raise the network event to the server
             // AcceptFactionInviteEvent is defined in Content.Shared.Civ14.CivFactions
             // The server (CivFactionsSystem) handles this event.
-            var acceptEvent = new AcceptFactionInviteEvent(factionName, inviterNetId);
+            var acceptEvent = new AcceptFactionInviteEvent(factionName);
             _entityManager.RaisePredictiveEvent(acceptEvent);
 
-            shell.WriteLine($"Sent request to join faction: '{factionName}' (invited by: {inviterNetId}).");
+            shell.WriteLine($"Sent request to join faction: '{factionName}'.");
         }
     }
 }

Content.Shared/Civ14/CivFactions/CivFactionsEvents.cs

@@ -69,11 +69,11 @@ public sealed class FactionInviteOfferEvent : EntityEventArgs // Not inheriting
     public string InviterName { get; }
     public string FactionName { get; }
     public NetUserId InviterUserId { get; } /// <summary>
-    /// Initialises a new faction invitation offer with the inviter's name, faction name, and inviter's user ID.
-    /// </summary>
-    /// <param name="inviterName">The display name of the player sending the invitation.</param>
-    /// <param name="factionName">The name of the faction the invitation is for.</param>
-    /// <param name="inviterUserId">The user ID of the player sending the invitation.</param>
+                                            /// Initialises a new faction invitation offer with the inviter's name, faction name, and inviter's user ID.
+                                            /// </summary>
+                                            /// <param name="inviterName">The display name of the player sending the invitation.</param>
+                                            /// <param name="factionName">The name of the faction the invitation is for.</param>
+                                            /// <param name="inviterUserId">The user ID of the player sending the invitation.</param>
 
     public FactionInviteOfferEvent(string inviterName, string factionName, NetUserId inviterUserId)
     {
@@ -97,15 +97,14 @@ public sealed class AcceptFactionInviteEvent : BaseFactionRequestEvent
     /// The NetUserId of the player who originally sent the invite.
     /// </summary>
     public NetUserId InviterUserId { get; } /// <summary>
-    /// Initialises a new event indicating that a player has accepted a faction invitation.
-    /// </summary>
-    /// <param name="factionName">The name of the faction being joined.</param>
-    /// <param name="inviterUserId">The user ID of the player who sent the invitation.</param>
+                                            /// Initialises a new event indicating that a player has accepted a faction invitation.
+                                            /// </summary>
+                                            /// <param name="factionName">The name of the faction being joined.</param>
+                                            /// <param name="inviterUserId">The user ID of the player who sent the invitation.</param>
 
-    public AcceptFactionInviteEvent(string factionName, NetUserId inviterUserId)
+    public AcceptFactionInviteEvent(string factionName)
     {
         FactionName = factionName;
-        InviterUserId = inviterUserId;
     }
 }
 
@@ -121,10 +120,10 @@ public sealed class PlayerFactionStatusChangedEvent : EntityEventArgs
 {
     public bool IsInFaction { get; }
     public string? FactionName { get; } /// <summary>
-    /// Initialises a new event indicating a player's faction membership status and, if applicable, the faction's name.
-    /// </summary>
-    /// <param name="isInFaction">Whether the player is currently in a faction.</param>
-    /// <param name="factionName">The name of the faction if the player is a member; otherwise, null.</param>
+                                        /// Initialises a new event indicating a player's faction membership status and, if applicable, the faction's name.
+                                        /// </summary>
+                                        /// <param name="isInFaction">Whether the player is currently in a faction.</param>
+                                        /// <param name="factionName">The name of the faction if the player is a member; otherwise, null.</param>
 
     public PlayerFactionStatusChangedEvent(bool isInFaction, string? factionName)
     {

Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_armor.yml

@@ -179,9 +179,9 @@
       sprite: Civ14/Clothing/exported/suits/repcommander_armor.rsi
 
 - type: entity
-  name: red guard armor with robe.
+  name: red guard armor with robe
   parent: ClothingOuterBase
-  id: civ13_suit_red_guard_armor_with_robe.
+  id: civ13_suit_red_guard_armor_with_robe
   description: >-
     A thick, extremely expensive plastoid armor with a crimson red robe
     attached.
@@ -202,7 +202,7 @@
 - type: entity
   name: senate guard armor with robe
   parent: ClothingOuterBase
-  id: civ13_suit_senate_guard_armor_with_robe.
+  id: civ13_suit_senate_guard_armor_with_robe
   description: A thick, extremely expensive plastoid armor with a royal blue robe attached.
   components:
     - type: Sprite
@@ -335,7 +335,7 @@
   name: bronze egyptian lamellar
   parent: ClothingOuterBase
   id: civ13_suit_bronze_egyptian_lamellar
-  description: A bronze lamellar armor, used by soldiers of pharoahic dynasties.
+  description: A bronze lamellar armor, used by soldiers of pharaonic dynasties.
   components:
     - type: Sprite
       sprite: Civ14/Clothing/exported/suits/egyptian_lamellar.rsi
@@ -421,9 +421,9 @@
       time: 10
 
 - type: entity
-  name: pharoahic armor of the gods
+  name: pharaonic armor of the gods
   parent: ClothingOuterBase
-  id: civ13_suit_pharoahic_armor_of_the_gods
+  id: civ13_suit_pharaonic_armor_of_the_gods
   description: The armor of the divine gods of the desert
   components:
     - type: Sprite

Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_suit.yml

@@ -4375,9 +4375,9 @@
     - node: end
       entity: civ13_suit_replicant_commander_armor
 - type: construction
-  name: red guard armor with robe.
-  id: civ13_suit_red_guard_armor_with_robe.
-  graph: civ13_suit_red_guard_armor_with_robe.
+  name: red guard armor with robe
+  id: civ13_suit_red_guard_armor_with_robe
+  graph: civ13_suit_red_guard_armor_with_robe
   startNode: start
   targetNode: end
   category: construction-category-clothing
@@ -4389,7 +4389,7 @@
   agemin: 9
   agemax: 9
 - type: constructionGraph
-  id: civ13_suit_red_guard_armor_with_robe.
+  id: civ13_suit_red_guard_armor_with_robe
   start: start
   graph:
     - node: start
@@ -4400,11 +4400,11 @@
               amount: 5
               doAfter: 5
     - node: end
-      entity: civ13_suit_red_guard_armor_with_robe.
+      entity: civ13_suit_red_guard_armor_with_robe
 - type: construction
-  name: senate guard armor with robe.
-  id: civ13_suit_senate_guard_armor_with_robe.
-  graph: civ13_suit_senate_guard_armor_with_robe.
+  name: senate guard armor with robe
+  id: civ13_suit_senate_guard_armor_with_robe
+  graph: civ13_suit_senate_guard_armor_with_robe
   startNode: start
   targetNode: end
   category: construction-category-clothing
@@ -4416,7 +4416,7 @@
   agemin: 9
   agemax: 9
 - type: constructionGraph
-  id: civ13_suit_senate_guard_armor_with_robe.
+  id: civ13_suit_senate_guard_armor_with_robe
   start: start
   graph:
     - node: start
@@ -4427,7 +4427,7 @@
               amount: 5
               doAfter: 5
     - node: end
-      entity: civ13_suit_senate_guard_armor_with_robe.
+      entity: civ13_suit_senate_guard_armor_with_robe
 - type: construction
   name: standard stormtrooper armor
   id: civ13_suit_standard_stormtrooper_armor
@@ -4646,9 +4646,9 @@
     - node: end
       entity: civ13_suit_alligator_scale_armor
 - type: construction
-  name: pharoahic armor of the gods
-  id: civ13_suit_pharoahic_armor_of_the_gods
-  graph: civ13_suit_pharoahic_armor_of_the_gods
+  name: pharaonic armor of the gods
+  id: civ13_suit_pharaonic_armor_of_the_gods
+  graph: civ13_suit_pharaonic_armor_of_the_gods
   startNode: start
   targetNode: end
   category: construction-category-clothing
@@ -4660,7 +4660,7 @@
   agemin: 8
   agemax: 8
 - type: constructionGraph
-  id: civ13_suit_pharoahic_armor_of_the_gods
+  id: civ13_suit_pharaonic_armor_of_the_gods
   start: start
   graph:
     - node: start
@@ -4671,7 +4671,7 @@
               amount: 5
               doAfter: 5
     - node: end
-      entity: civ13_suit_pharoahic_armor_of_the_gods
+      entity: civ13_suit_pharaonic_armor_of_the_gods
 - type: construction
   name: creed armor
   id: civ13_suit_creed_armor