New belt controls (#1298)

* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>

Content.Client/Clothing/ClientClothingSystem.cs

@@ -40,7 +40,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         {Jumpsuit, "INNERCLOTHING"},
         {"neck", "NECK"},
         {"back", "BACKPACK"},
-        {"belt1", "BELT1"},
+        {"belt", "BELT"},
         {"belt2", "BELT2"},
         {"gloves", "HAND"},
         {"shoes", "FEET"},

Content.Client/Entry/EntryPoint.cs

@@ -1,5 +1,6 @@
 using Content.Client._CP14.Discord;
 using Content.Client._CP14.JoinQueue;
+using Content.Client._CP14.Input;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -171,6 +172,7 @@ namespace Content.Client.Entry
             _parallaxManager.LoadDefaultParallax();
 
             //CP14
+            CP14ContentContexts.SetupContexts(_inputManager.Contexts);
             _overlayManager.AddOverlay(new CP14BasePostProcessOverlay());
             _discordAuth.Initialize();
             _joinQueueManager.Initialize();

Content.Client/Input/ContentContexts.cs

@@ -85,9 +85,6 @@ namespace Content.Client.Input
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
-            //CP14 Keys
-            human.AddFunction(ContentKeyFunctions.CP14OpenSkillMenu);
-            //CP14 Keys end
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -1,3 +1,4 @@
+using Content.Shared._CP14.Input;
 using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
@@ -313,7 +314,9 @@ namespace Content.Client.Options.UI.Tabs
 
             //CP14
             AddHeader("ui-options-header-cp14");
-            AddButton(ContentKeyFunctions.CP14OpenSkillMenu);
+            AddButton(CP14ContentKeyFunctions.CP14OpenSkillMenu);
+            AddButton(CP14ContentKeyFunctions.OpenBelt2);
+            AddButton(CP14ContentKeyFunctions.SmartEquipBelt2);
             //CP14 end
 
             foreach (var control in _keyControls.Values)

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -3,6 +3,7 @@
            xmlns:style="clr-namespace:Content.Client.Stylesheets"
            xmlns:ic="clr-namespace:Robust.Shared.Input;assembly=Robust.Shared"
            xmlns:is="clr-namespace:Content.Shared.Input;assembly=Content.Shared"
+           xmlns:isc="clr-namespace:Content.Shared._CP14.Input;assembly=Content.Shared"
            xmlns:xe="clr-namespace:Content.Client.UserInterface.XamlExtensions"
            xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
            xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.MenuBar.Widgets"
@@ -39,7 +40,7 @@
         Access="Internal"
         Icon="{xe:Tex '/Textures/Interface/students-cap.svg.192dpi.png'}"
         ToolTip="{Loc 'cp14-game-hud-open-skill-menu-button-tooltip'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.CP14OpenSkillMenu}"
+        BoundKey = "{x:Static isc:CP14ContentKeyFunctions.CP14OpenSkillMenu}"
         MinSize="42 64"
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"

Content.Client/_CP14/Input/CP14ContentContexts.cs

@@ -0,0 +1,16 @@
+using Content.Shared._CP14.Input;
+using Robust.Shared.Input;
+
+namespace Content.Client._CP14.Input
+{
+    public static class CP14ContentContexts
+    {
+        public static void SetupContexts(IInputContextContainer contexts)
+        {
+            var human = contexts.GetContext("human");
+            human.AddFunction(CP14ContentKeyFunctions.OpenBelt2);
+            human.AddFunction(CP14ContentKeyFunctions.SmartEquipBelt2);
+            human.AddFunction(CP14ContentKeyFunctions.CP14OpenSkillMenu);
+        }
+    }
+}

Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs

@@ -11,6 +11,7 @@ using Content.Shared._CP14.Skill.Components;
 using Content.Shared._CP14.Skill.Prototypes;
 using Content.Shared._CP14.Skill.Restrictions;
 using Content.Shared.Input;
+using Content.Shared._CP14.Input;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -53,7 +54,7 @@ public sealed class CP14SkillUIController : UIController, IOnStateEntered<Gamepl
         LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
 
         CommandBinds.Builder
-            .Bind(ContentKeyFunctions.CP14OpenSkillMenu,
+            .Bind(CP14ContentKeyFunctions.CP14OpenSkillMenu,
                 InputCmdHandler.FromDelegate(_ => ToggleWindow()))
             .Register<CP14SkillUIController>();
 

Content.Shared/Input/ContentKeyFunctions.cs

@@ -128,9 +128,5 @@ namespace Content.Shared.Input
         public static readonly BoundKeyFunction MappingRemoveDecal = "MappingRemoveDecal";
         public static readonly BoundKeyFunction MappingCancelEraseDecal = "MappingCancelEraseDecal";
         public static readonly BoundKeyFunction MappingOpenContextMenu = "MappingOpenContextMenu";
-
-        //CP14 keys
-        public static readonly BoundKeyFunction CP14OpenSkillMenu = "CP14OpenSkillMenu";
-        //CP14 keys end
     }
 }

Content.Shared/Interaction/SmartEquipSystem.cs

@@ -3,6 +3,7 @@ using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
+using Content.Shared._CP14.Input;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
@@ -35,6 +36,9 @@ public sealed class SmartEquipSystem : EntitySystem
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.SmartEquipBackpack, InputCmdHandler.FromDelegate(HandleSmartEquipBackpack, handle: false, outsidePrediction: false))
             .Bind(ContentKeyFunctions.SmartEquipBelt, InputCmdHandler.FromDelegate(HandleSmartEquipBelt, handle: false, outsidePrediction: false))
+            //CP14
+            .Bind(CP14ContentKeyFunctions.SmartEquipBelt2, InputCmdHandler.FromDelegate(HandleSmartEquipBelt2, handle: false, outsidePrediction: false))
+            //CP14 end
             .Register<SmartEquipSystem>();
     }
 
@@ -55,6 +59,11 @@ public sealed class SmartEquipSystem : EntitySystem
         HandleSmartEquip(session, "belt");
     }
 
+    private void HandleSmartEquipBelt2(ICommonSession? session)
+    {
+        HandleSmartEquip(session, "belt2");
+    }
+    //CP14 end
     private void HandleSmartEquip(ICommonSession? session, string equipmentSlot)
     {
         if (session is not { } playerSession)

Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

@@ -12,6 +12,7 @@ using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants.Components;
 using Content.Shared.Input;
+using Content.Shared._CP14.Input;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
@@ -172,6 +173,9 @@ public abstract class SharedStorageSystem : EntitySystem
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.OpenBackpack, InputCmdHandler.FromDelegate(HandleOpenBackpack, handle: false))
             .Bind(ContentKeyFunctions.OpenBelt, InputCmdHandler.FromDelegate(HandleOpenBelt, handle: false))
+            //CP14
+            .Bind(CP14ContentKeyFunctions.OpenBelt2, InputCmdHandler.FromDelegate(HandleOpenBelt2, handle: false))
+            //CP14 end
             .Register<SharedStorageSystem>();
 
         Subs.CVar(_cfg, CCVars.NestedStorage, OnNestedStorageCvar, true);
@@ -1832,6 +1836,12 @@ public abstract class SharedStorageSystem : EntitySystem
     {
         HandleToggleSlotUI(session, "belt");
     }
+    //CP14
+    private void HandleOpenBelt2(ICommonSession? session)
+    {
+        HandleToggleSlotUI(session, "belt2");
+    }
+    //CP14 end
 
     private void HandleToggleSlotUI(ICommonSession? session, string slot)
     {

Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.Input;
+
+namespace Content.Shared._CP14.Input
+{
+    [KeyFunctions]
+
+    public static class CP14ContentKeyFunctions
+    {
+        public static readonly BoundKeyFunction OpenBelt2 = "OpenBelt2";
+        public static readonly BoundKeyFunction SmartEquipBelt2 = "SmartEquipBelt2";
+        public static readonly BoundKeyFunction CP14OpenSkillMenu = "CP14OpenSkillMenu";
+    }
+}

Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl

@@ -9,7 +9,7 @@ cp14-ui-options-main-graphics-label = Graphics
 cp14-ui-options-main-graphics-wave-shader = Wave shader
 
 cp14-ui-options-postprocess = Cosmetic Post-processing
-cp14-ui-options-postprocess-tooltip = 
+cp14-ui-options-postprocess-tooltip =
     When enabled, cosmetic post-processing effects such as
     additive lighting will be present. This does not control
     post-process effects that affect the game or otherwise
@@ -19,4 +19,6 @@ cp14-ui-options-postprocess-tooltip =
 ## Controls menu
 
 ui-options-header-cp14 = CrystallEdge
-ui-options-function-cp14-open-knowledge-menu = Open character knowledge menu.
+ui-options-function-cp14-open-skill-menu = Open character knowledge menu.
+ui-options-function-open-belt2 = Open belt 2
+ui-options-function-smart-equip-belt2 = Smart-equip to belt 2

Resources/Maps/_CP14/Frigid_Coast.yml

@@ -38027,7 +38027,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38086,7 +38086,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38146,7 +38146,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38205,7 +38205,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38265,7 +38265,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38325,7 +38325,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38385,7 +38385,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38444,7 +38444,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38503,7 +38503,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38563,7 +38563,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38623,7 +38623,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38682,7 +38682,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -38741,7 +38741,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null

Resources/Maps/_CP14/comoss.yml

@@ -47638,7 +47638,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null

Resources/Maps/_CP14/comoss_d.yml

@@ -104553,7 +104553,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104616,7 +104616,7 @@ entities:
           showEnts: False
           occludes: False
           ent: 19735
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104680,7 +104680,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104745,7 +104745,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null
@@ -104809,7 +104809,7 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-        belt1: !type:ContainerSlot
+        belt: !type:ContainerSlot
           showEnts: False
           occludes: False
           ent: null

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -43,7 +43,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -365,7 +365,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -439,7 +439,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml

@@ -38,7 +38,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml

@@ -42,7 +42,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -154,7 +154,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml

@@ -34,7 +34,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml

@@ -36,7 +36,7 @@
     - map: [ "cloak" ]
     - map: [ "outerClothing" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml

@@ -23,7 +23,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "mask" ]
@@ -90,7 +90,7 @@
         showEnts: False
         occludes: False
         ent: null
-      belt1: !type:ContainerSlot
+      belt: !type:ContainerSlot
         showEnts: False
         occludes: False
         ent: null

Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml

@@ -72,7 +72,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar

Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml

@@ -72,7 +72,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar

Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml

@@ -66,7 +66,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar

Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml

@@ -15,7 +15,7 @@
     shirt: CP14ClothingShirtCottonBlack
     pants: CP14ClothingPantsBrown
     shoes: CP14LongLeatherBoots
-    belt1: CP14ModularSkeletonSwordUpgrade
+    belt: CP14ModularSkeletonSwordUpgrade
     neck: CP14ModularIronPickaxe
 
 # TIER 1
@@ -36,7 +36,7 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     cloak: CP14ClothingCloakBone
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularSkeletonSword
+    belt: CP14ModularSkeletonSword
     shoes: CP14ClothingShoesSandals
     head: CP14ClothingHeadMetalHeadband
   inhand:
@@ -47,7 +47,7 @@
   equipment:
     mask: CP14ClothingMaskSinner
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularCopperSkimitar
+    belt: CP14ModularIronDagger
     belt2: CP14ModularIronDagger
 
 - type: startingGear
@@ -56,7 +56,7 @@
     shirt: CP14ClothingWarriorsGarbDress
     pants: CP14ClothingPantsLoincloth
     neck: CP14BowCombat
-    belt1: CP14ClothingBeltQuiverCopperArrow
+    belt: CP14ClothingBeltQuiverCopperArrow
 
 # TIER 2
 
@@ -78,7 +78,7 @@
     cloak: CP14ClothingCloakBone
     mask: CP14ClothingMaskSteelMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularSkeletonSwordUpgrade
+    belt: CP14ModularSkeletonSwordUpgrade
     shoes: CP14ClothingShoesSandals
   inhand:
     - CP14BaseShield
@@ -89,8 +89,8 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     mask: CP14ClothingMaskBoneHornedMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronSkimitarTundra
-    belt2: CP14ModularGoldSkimitarAgony
+    belt: CP14ModularIronDaggerTundra
+    belt2: CP14ModularIronDaggerAgony
     shoes: CP14ClothingShoesSandals
 
 - type: startingGear
@@ -101,7 +101,7 @@
     shirt: CP14ClothingShirtCottonBlack
     pants: CP14ClothingPantsBrown
     neck: CP14BowCombat
-    belt1: CP14ClothingBeltQuiverIronArrow
+    belt: CP14ClothingBeltQuiverIronArrow
     belt2: CP14ModularSkeletonSword
     shoes: CP14LongLeatherBoots
 
@@ -115,7 +115,7 @@
     pants: CP14ClothingPantsBrown
     shoes: CP14LongLeatherBoots
     ring2: CP14ClothingCloakAmuletMana
-    belt1: CP14ModularSkeletonSword
+    belt: CP14ModularSkeletonSword
 
 - type: startingGear
   id: CP14MobSkeletonBardT2

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml

@@ -26,7 +26,7 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingAlchemist
     neck: CP14MagicHealingStaff
 

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml

@@ -20,5 +20,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     keys: CP14BaseKeyRing
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml

@@ -26,6 +26,5 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingBlacksmith
-

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml

@@ -13,6 +13,5 @@
     back:
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingInnkeeper
-

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml

@@ -15,5 +15,5 @@
   id: CP14GuardGear
   equipment:
     keys: CP14KeyRingGuard
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
 

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml

@@ -24,5 +24,4 @@
   id: CP14GuardCommanderGear
   equipment:
     keys: CP14KeyRingGuardCommander
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml

@@ -15,5 +15,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     keys: CP14BaseKeyRing
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml

@@ -32,7 +32,7 @@
     back:
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingGuildmaster
     belt2: CP14ModularGuildmasterRapier
 

Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml

@@ -18,6 +18,6 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledMerchant
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingMerchant
 

Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by iwordoloni (Discord) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json

@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json

@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json

@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json

@@ -19,7 +19,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
@@ -38,7 +38,7 @@
       "directions": 4
     },
     {
-      "name": "light_equipped-BELT1",
+      "name": "light_equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json

@@ -8,7 +8,7 @@
   "copyright": "Created by TheShuEd (Github) ",
   "states": [
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json

@@ -20,7 +20,7 @@
       "name": "wielded-arrow"
     },
     {
-      "name": "equipped-BELT1",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {

Resources/keybinds.yml

@@ -90,6 +90,13 @@ binds:
 - function: CP14OpenSkillMenu
   type: State
   key: R
+- function: OpenBelt2
+  type: State
+  key: F
+- function: SmartEquipBelt2
+  type: State
+  key: F
+  mod1: Shift
 # CP14 Zone end
 - function: ShowEscapeMenu
   type: State