From 4c7b035c9c8a5a7f43d098139dc33feeb4e3ec41 Mon Sep 17 00:00:00 2001 From: TheKittehJesus <29379890+TheKittehJesus@users.noreply.github.com> Date: Tue, 3 Jun 2025 06:39:39 -0500 Subject: [PATCH] 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> --- .../Clothing/ClientClothingSystem.cs | 2 +- Content.Client/Entry/EntryPoint.cs | 2 ++ Content.Client/Input/ContentContexts.cs | 3 -- .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 5 +++- .../MenuBar/Widgets/GameTopMenuBar.xaml | 3 +- .../_CP14/Input/CP14ContentContexts.cs | 16 +++++++++++ .../Systems/Skill/CP14SkillUIController.cs | 3 +- Content.Shared/Input/ContentKeyFunctions.cs | 4 --- .../Interaction/SmartEquipSystem.cs | 9 ++++++ .../EntitySystems/SharedStorageSystem.cs | 10 +++++++ .../_CP14/Input/CP14ContentKeyFunctions.cs | 13 +++++++++ .../_CP14/escape-menu/ui/options-menu.ftl | 6 ++-- Resources/Maps/_CP14/Frigid_Coast.yml | 26 +++++++++--------- Resources/Maps/_CP14/comoss.yml | 2 +- Resources/Maps/_CP14/comoss_d.yml | 10 +++---- .../_CP14/Entities/Mobs/Species/base.yml | 6 ++-- .../_CP14/Entities/Mobs/Species/goblin.yml | 2 +- .../_CP14/Entities/Mobs/Species/silva.yml | 4 +-- .../_CP14/Entities/Mobs/Species/skeleton.yml | 2 +- .../_CP14/Entities/Mobs/Species/zombie.yml | 2 +- .../Structures/Furniture/mannequin.yml | 4 +-- .../carcat_inventory_template.yml | 2 +- .../human_inventory_template.yml | 2 +- .../partial_inventory_template.yml | 2 +- .../Loadouts/Misc/skeleton_startinggear.yml | 18 ++++++------ .../_CP14/Roles/Jobs/Artisan/alchemist.yml | 2 +- .../_CP14/Roles/Jobs/Artisan/apprentice.yml | 3 +- .../_CP14/Roles/Jobs/Artisan/blacksmith.yml | 3 +- .../_CP14/Roles/Jobs/Artisan/innkeeper.yml | 3 +- .../_CP14/Roles/Jobs/Guard/guard.yml | 2 +- .../Roles/Jobs/Guard/guard_commander.yml | 3 +- .../_CP14/Roles/Jobs/Mercenary/adventurer.yml | 3 +- .../Roles/Jobs/Mercenary/guildmaster.yml | 2 +- .../_CP14/Roles/Jobs/Traders/merchant.yml | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Clothing/Belt/potions_pouch.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../_CP14/Clothing/Belt/quiver.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Axe/metall_axe.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Dagger/metall_dagger.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Hammer/metall_hammer.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Hoe/metall_hoe.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Mace/metall_mace.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Pickaxe/metall_pickaxe.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Rapier/metall_rapier.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Shovel/metall_shovel.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Sickle/metall_sickle.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Skimitar/metall_skimitar.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Spear/metall_spear.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Sword/bone_sword.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Blade/Sword/metall_sword.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Garde/guildmaster_garde.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Garde/metall_sharp.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Garde/metall_sturdy.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Grip/guildmaster_grip.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Grip/metall_grip.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Grip/wooden_grip.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin ...pped-BELT1.png => light_equipped-BELT.png} | Bin .../Objects/Tools/crystal_lamp.rsi/meta.json | 4 +-- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Weapons/Melee/ice_dagger.rsi/meta.json | 2 +- .../{equipped-BELT1.png => equipped-BELT.png} | Bin .../Ranged/light_crossbow.rsi/meta.json | 2 +- Resources/keybinds.yml | 7 +++++ 84 files changed, 145 insertions(+), 93 deletions(-) create mode 100644 Content.Client/_CP14/Input/CP14ContentContexts.cs create mode 100644 Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs rename Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/{light_equipped-BELT1.png => light_equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) rename Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/{equipped-BELT1.png => equipped-BELT.png} (100%) diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 0ed281f317..ad2de7ef5d 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/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"}, diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 3ea4ecb612..d75642136a 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/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(); diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 97965913ee..5b7614780b 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/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); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 43169fc561..fe12016b5e 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/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) diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml index 9bcf64cf0e..8b58293c3d 100644 --- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml +++ b/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}" diff --git a/Content.Client/_CP14/Input/CP14ContentContexts.cs b/Content.Client/_CP14/Input/CP14ContentContexts.cs new file mode 100644 index 0000000000..1ae01a68a9 --- /dev/null +++ b/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); + } + } +} diff --git a/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs b/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs index 28f90a4d2f..3dfd6f5667 100644 --- a/Content.Client/_CP14/UserInterface/Systems/Skill/CP14SkillUIController.cs +++ b/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 ToggleWindow())) .Register(); diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index b9eb91ca60..f10c99af2f 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/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 } } diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs index 746bc994ee..55d20f202f 100644 --- a/Content.Shared/Interaction/SmartEquipSystem.cs +++ b/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(); } @@ -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) diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 4e0aa2f949..13f62e88ce 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/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(); 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) { diff --git a/Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs b/Content.Shared/_CP14/Input/CP14ContentKeyFunctions.cs new file mode 100644 index 0000000000..3a5442f181 --- /dev/null +++ b/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"; + } +} \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl index c0c4375045..786cebd4df 100644 --- a/Resources/Locale/en-US/_CP14/escape-menu/ui/options-menu.ftl +++ b/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. \ No newline at end of file +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 \ No newline at end of file diff --git a/Resources/Maps/_CP14/Frigid_Coast.yml b/Resources/Maps/_CP14/Frigid_Coast.yml index ad9f3d733b..cefec82fb2 100644 --- a/Resources/Maps/_CP14/Frigid_Coast.yml +++ b/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 diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 6827a7ebe2..23f5419949 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/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 diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml index 9d7e15bf70..0188f5c009 100644 --- a/Resources/Maps/_CP14/comoss_d.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index 6a5e0f8f32..b7c92bfd61 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/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" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 97562ed48b..7add9ee392 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/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" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index 7f77825451..f880521dcd 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/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" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml index 1d9e596b7d..becd0b64d2 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml +++ b/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" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index cfb5210a03..3f57ff36f3 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/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" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml index 404576cfaf..e5951deeb2 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml index 8744ef7de5..8eedb4f3ef 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index 8f299476a4..46a24d1d37 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml index 8e108bac5d..c5274ea95e 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml index 1a7bb314f6..344ca979c9 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml index c7539dea05..bc03f5a4f3 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml @@ -26,7 +26,7 @@ - CP14EnergyCrystalMedium - CP14EnergyCrystalMedium equipment: - belt1: CP14WalletFilledTest + belt: CP14WalletFilledTest keys: CP14KeyRingAlchemist neck: CP14MagicHealingStaff diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml index 09d67f3627..be68284c3e 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml @@ -20,5 +20,4 @@ - CP14EnergyCrystalMedium equipment: keys: CP14BaseKeyRing - belt1: CP14WalletFilledTest - + belt: CP14WalletFilledTest diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml index 13086a9b8b..cdc121f474 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml @@ -26,6 +26,5 @@ - CP14EnergyCrystalMedium - CP14EnergyCrystalMedium equipment: - belt1: CP14WalletFilledTest + belt: CP14WalletFilledTest keys: CP14KeyRingBlacksmith - diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml index 942cf6c469..a43046c7eb 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml @@ -13,6 +13,5 @@ back: - CP14EnergyCrystalMedium equipment: - belt1: CP14WalletFilledTest + belt: CP14WalletFilledTest keys: CP14KeyRingInnkeeper - diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml index f0fc2a714d..f81a879190 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml @@ -15,5 +15,5 @@ id: CP14GuardGear equipment: keys: CP14KeyRingGuard - belt1: CP14WalletFilledTest + belt: CP14WalletFilledTest diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml index 6371e83d5e..5f848b2975 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml @@ -24,5 +24,4 @@ id: CP14GuardCommanderGear equipment: keys: CP14KeyRingGuardCommander - belt1: CP14WalletFilledTest - + belt: CP14WalletFilledTest \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml index 0f66c09a5f..978cd0a483 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml @@ -15,5 +15,4 @@ - CP14EnergyCrystalMedium equipment: keys: CP14BaseKeyRing - belt1: CP14WalletFilledTest - + belt: CP14WalletFilledTest diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml index 04c998844f..5800f6f78f 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml @@ -32,7 +32,7 @@ back: - CP14EnergyCrystalMedium equipment: - belt1: CP14WalletFilledTest + belt: CP14WalletFilledTest keys: CP14KeyRingGuildmaster belt2: CP14ModularGuildmasterRapier diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml index ec35c552b7..b9360edf23 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml @@ -18,6 +18,6 @@ - CP14EnergyCrystalMedium - CP14EnergyCrystalMedium equipment: - belt1: CP14WalletFilledMerchant + belt: CP14WalletFilledTest keys: CP14KeyRingMerchant diff --git a/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json index 6a97a4146c..18f8c847b4 100644 --- a/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Belt/potions_pouch.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-BELT1", + "name": "equipped-BELT", "directions": 4 }, { diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json index 6619325526..2e5060139c 100644 --- a/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Belt/quiver.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-BELT1", + "name": "equipped-BELT", "directions": 4 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json index bf596b0ec3..52baa4ce56 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json index bf596b0ec3..52baa4ce56 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json index 0103caf9e3..55c514f983 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json index bf596b0ec3..52baa4ce56 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json index 8a6dedae1a..56da788355 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json index 2239e3ce26..a85319c765 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json index 0103caf9e3..55c514f983 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json index be51eceff7..80763a737c 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json index 2a39519ae5..93aff700bd 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json index 0d7bf1d8d4..2b67e71db0 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json index 863d13c314..84f19afffb 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json index 863d13c314..84f19afffb 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/light_equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json index b075d72d4c..1026a90f27 100644 --- a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json index e5f88b24fb..5db2da0ce0 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json +++ b/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 }, { diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json index 5d324b239e..d1dc463ccb 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json +++ b/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 }, { diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 1e2eec7302..7087224474 100644 --- a/Resources/keybinds.yml +++ b/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