base vs. concrete wallet

new-frontiers-14 · Mar 10, 2025 · e213969 · e213969
1 parent c39319e
commit e213969
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 82 deletions.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Wallet/base_wallet.yml b/Resources/Prototypes/_NF/Entities/Clothing/Wallet/base_wallet.yml
@@ -1,12 +1,11 @@
 - type: entity
   parent: [BaseStorageItem, Clothing, RecyclableItemClothBasic]
-  id: NFWalletLeatherBrown
-  name: leather wallet
-  description: Surprisingly thick. Careful not to lose it, and don't sit on it.
+  id: NFBaseWallet
+  abstract: true
+  name: wallet
+  description: If somebody dropped this, you should really return it.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Wallet/leather.rsi
-    state: closed
     layers:
     - state: closed
       map: ["closeLayer"]
@@ -25,13 +24,16 @@
   - type: Storage
     maxItemSize: Small
     grid:
-    - 0,0,1,2
+    - 0,0,3,1
     whitelist:
       components:
       - Cash
       - Paper
+      - NFCoin
+    blacklist:
+      tags:
+      - Book
   - type: Item
-    sprite: _NF/Clothing/Wallet/leather.rsi
     size: Small
   - type: Clothing
     slots: [wallet]
@@ -42,20 +44,19 @@
       amount: 1
   - type: Appearance
   - type: ItemMapper
-    sprite: _NF/Clothing/Wallet/leather.rsi
     mapLayers:
       closed-paper:
         whitelist:
           components:
-            - Paper
+          - Paper
       closed-cash:
         whitelist:
           components:
-            - Cash
+          - Cash
       closed-coin:
         whitelist:
           components:
-            - NFCoin
+          - NFCoin
   - type: GenericVisualizer
     visuals:
       enum.SharedBagOpenVisuals.BagState:
@@ -74,74 +75,3 @@
         closed-coin:
           Open: { state: open-coin }
           Closed: { state: closed-coin }
-
-- type: entity
-  parent: NFWalletLeatherBrown
-  id: NFWalletLeatherBlack
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Wallet/leather.rsi
-    state: closed-black
-    layers:
-    - state: closed-black
-      map: ["closeLayer"]
-    - state: open-black
-      map: ["openLayer"]
-      visible: false
-    - state: closed-paper
-      map: ["closed-paper"]
-      visible: false
-    - state: closed-cash
-      map: ["closed-cash"]
-      visible: false
-    - state: closed-coin
-      map: ["closed-coin"]
-      visible: false
-
-- type: entity
-  parent: NFWalletLeatherBrown
-  id: NFWalletLeatherMail
-  description: On the inside is an embroidered picture of a cat along with a heart and the word "CLIPPY".
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Wallet/leather.rsi
-    state: closed-mail
-    layers:
-    - state: closed-mail
-      map: ["closeLayer"]
-    - state: open-mail
-      map: ["openLayer"]
-      visible: false
-    - state: closed-paper
-      map: ["closed-paper"]
-      visible: false
-    - state: closed-cash
-      map: ["closed-cash"]
-      visible: false
-    - state: closed-coin
-      map: ["closed-coin"]
-      visible: false
-
-- type: entity
-  parent: NFWalletLeatherBrown
-  id: NFWalletLeatherBlack
-  description: There's an old picture of a cat with a beard inside.
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Wallet/leather.rsi
-    state: closed-pirate
-    layers:
-    - state: closed-pirate
-      map: ["closeLayer"]
-    - state: open-pirate
-      map: ["openLayer"]
-      visible: false
-    - state: closed-paper
-      map: ["closed-paper"]
-      visible: false
-    - state: closed-cash
-      map: ["closed-cash"]
-      visible: false
-    - state: closed-coin
-      map: ["closed-coin"]
-      visible: false
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Wallet/leather.yml b/Resources/Prototypes/_NF/Entities/Clothing/Wallet/leather.yml
@@ -0,0 +1,98 @@
+- type: entity
+  parent: NFBaseWallet
+  id: NFWalletLeatherBrown
+  name: leather wallet
+  description: Surprisingly thick. Careful not to lose it, and don't sit on it.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Wallet/leather.rsi
+    layers:
+    - state: closed
+      map: ["closeLayer"]
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: closed-paper
+      map: ["closed-paper"] # scuffed values to deal with ItemMapper complaining
+      visible: false
+    - state: closed-cash
+      map: ["closed-cash"]
+      visible: false
+    - state: closed-coin
+      map: ["closed-coin"]
+      visible: false
+  - type: Item
+    sprite: _NF/Clothing/Wallet/leather.rsi
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: MaterialCloth1
+      amount: 1
+  - type: Appearance
+  - type: ItemMapper
+    sprite: _NF/Clothing/Wallet/leather.rsi
+
+- type: entity
+  parent: NFWalletLeatherBrown
+  id: NFWalletLeatherBlack
+  components:
+  - type: Sprite
+    layers:
+    - state: closed-black
+      map: ["closeLayer"]
+    - state: open-black
+      map: ["openLayer"]
+      visible: false
+    - state: closed-paper
+      map: ["closed-paper"]
+      visible: false
+    - state: closed-cash
+      map: ["closed-cash"]
+      visible: false
+    - state: closed-coin
+      map: ["closed-coin"]
+      visible: false
+
+- type: entity
+  parent: NFWalletLeatherBrown
+  id: NFWalletLeatherMail
+  description: On the inside is an embroidered picture of a cat, a heart, and the word "CLIPPY".
+  components:
+  - type: Sprite
+    layers:
+    - state: closed-mail
+      map: ["closeLayer"]
+    - state: open-mail
+      map: ["openLayer"]
+      visible: false
+    - state: closed-paper
+      map: ["closed-paper"]
+      visible: false
+    - state: closed-cash
+      map: ["closed-cash"]
+      visible: false
+    - state: closed-coin
+      map: ["closed-coin"]
+      visible: false
+
+- type: entity
+  parent: NFWalletLeatherBrown
+  id: NFWalletLeatherPirate
+  description: There's an old picture of a cat with a beard inside.
+  components:
+  - type: Sprite
+    layers:
+    - state: closed-pirate
+      map: ["closeLayer"]
+    - state: open-pirate
+      map: ["openLayer"]
+      visible: false
+    - state: closed-paper
+      map: ["closed-paper"]
+      visible: false
+    - state: closed-cash
+      map: ["closed-cash"]
+      visible: false
+    - state: closed-coin
+      map: ["closed-coin"]
+      visible: false