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>
2025-06-03 06:39:39 -05:00
parent 0558da566a
commit 4c7b035c9c
84 changed files with 145 additions and 93 deletions
--- 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" ]
--- 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" ]
--- 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" ]
--- 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" ]
--- 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" ]
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
-
--- 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
-
--- 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

--- 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
--- 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
--- 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

--- 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