Yet more playing card fixes. (#2863)

* Remove unused card sprites, make others consistent * card metadata cleanup * NT/Syndie boxes in rare loot pool * separate out base card prototypes, restore price
new-frontiers-14 · Feb 5, 2025 · 44e18d3 · 44e18d3
1 parent 77a4744
commit 44e18d3
Show file tree

Hide file tree

Showing 43 changed files with 95 additions and 161 deletions.
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -158,6 +158,10 @@
           weight: 1
     - !type:NestedSelector
       tableId: RingTableRare
+    - id: CardBoxNanotrasen # Frontier
+      weight: 0.05 # Frontier
+    - id: CardBoxSyndicate # Frontier
+      weight: 0.005 # Frontier
 
 - type: entityTable
   id: SalvageTreasureLegendary

diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/base.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/base.yml
@@ -0,0 +1,79 @@
+- type: entity
+  parent: [ BoxCardboard, BaseBagOpenClose ]
+  id: CardBoxBase
+  name: deck box
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,1
+  - type: Sprite
+    sprite: EstacaoPirata/Objects/Misc/cards.rsi
+    layers:
+    - state: black_box
+    - state: black_box_open
+      map: [ "openLayer" ]
+      visible: false
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,1,1
+    whitelist:
+      components:
+      - CardDeck
+  - type: OpenTriggeredStorageFill
+    contents:
+    - id: CardDeckBase
+      amount: 1
+  - type: Appearance
+  - type: StaticPrice # Frontier
+    price: 200 # Frontier
+
+# Frontier: base stack for card stack component
+- type: entity
+  parent: [BaseItem, RecyclableItemNoMats] # Frontier: added RecyclableItemNoMats
+  id: CardStackBase
+  name: stack of cards
+  abstract: true
+  components:
+  - type: Item
+    size: Small
+  - type: CardStack
+  - type: StripMenuHidden
+  - type: ContainerContainer # Frontier
+    containers: # Frontier
+      cardstack-container: !type:Container # Frontier
+  - type: StaticPrice # Frontier
+    price: 0.01 # Frontier
+# End Frontier
+
+- type: entity
+  parent: CardStackBase
+  id: CardHandBase
+  categories: [ HideSpawnMenu ]
+  name: hand of cards
+  components:
+  - type: CardHand
+  - type: Sprite
+    sprite: EstacaoPirata/Objects/Misc/cards.rsi
+    state: singlecard_down_black
+  - type: UserInterface
+    interfaces:
+      enum.CardUiKey.Key:
+        type: CardHandMenuBoundUserInterface
+  # - type: ActivatableUI # Frontier
+  #   key: enum.CardUiKey.Key # Frontier
+
+- type: entity
+  parent: CardStackBase
+  id: CardDeckBase
+  categories: [ HideSpawnMenu ]
+  name: deck of cards
+  components:
+  - type: Sprite
+    sprite: EstacaoPirata/Objects/Misc/cards.rsi
+    state: deck_black_full
+  - type: Item
+    size: Normal
+  - type: CardDeck
diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/black_cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/black_cards.yml
@@ -1,80 +1,3 @@
-- type: entity
-  parent: [ BoxCardboard, BaseBagOpenClose ]
-  id: CardBoxBase
-  name: deck box
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,1
-  - type: Sprite
-    sprite: EstacaoPirata/Objects/Misc/cards.rsi
-    layers:
-    - state: black_box
-    - state: black_box_open
-      map: [ "openLayer" ]
-      visible: false
-  - type: Storage
-    maxItemSize: Normal
-    grid:
-    - 0,0,1,1
-    whitelist:
-      components:
-      - CardDeck
-  - type: OpenTriggeredStorageFill
-    contents:
-    - id: CardDeckBase
-      amount: 1
-  - type: Appearance
-
-# Frontier: base stack for card stack component
-- type: entity
-  parent: [BaseItem]
-  id: CardStackBase
-  name: stack of cards
-  abstract: true
-  components:
-  - type: Item
-    size: Small
-  - type: CardStack
-  - type: StripMenuHidden
-  - type: ContainerContainer # Frontier
-    containers: # Frontier
-      cardstack-container: !type:Container # Frontier
-# End Frontier
-
-- type: entity
-  parent: CardStackBase
-  id: CardHandBase
-  categories: [ HideSpawnMenu ]
-  name: hand of cards
-  components:
-  - type: CardHand
-  - type: Sprite
-    sprite: EstacaoPirata/Objects/Misc/cards.rsi
-    state: singlecard_down_black
-  - type: UserInterface
-    interfaces:
-      enum.CardUiKey.Key:
-        type: CardHandMenuBoundUserInterface
-  # - type: ActivatableUI # Frontier
-  #   key: enum.CardUiKey.Key # Frontier
-
-- type: entity
-  parent: CardStackBase
-  id: CardDeckBase
-  categories: [ HideSpawnMenu ]
-  name: deck of cards
-  components:
-  - type: Sprite
-    sprite: EstacaoPirata/Objects/Misc/cards.rsi
-    state: deck_black_full
-  - type: Item
-    size: Normal
-  - type: CardDeck
-
-
 - type: entity
   parent: CardBoxBase
   id: CardBoxBlack

diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand1.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand1.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand2.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand2.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand3.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand3.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand4.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand4.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand5.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_hand5.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_joker.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/black_joker.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_black_empty.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_black_empty.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_black_half.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_black_half.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_black_low.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_black_low.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_nanotrasen_empty.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_nanotrasen_empty.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_nanotrasen_half.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_nanotrasen_half.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_nanotrasen_low.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_nanotrasen_low.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_syndicate_empty.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_syndicate_empty.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_syndicate_half.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_syndicate_half.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_syndicate_low.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/deck_syndicate_low.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/meta.json b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/meta.json
@@ -7,72 +7,15 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "black_hand1"
-    },
-    {
-      "name": "black_hand2"
-    },
-    {
-      "name": "black_hand3"
-    },
-    {
-      "name": "black_hand4"
-    },
-    {
-      "name": "black_hand5"
-    },
-    {
-      "name": "deck_black_empty"
-    },
     {
       "name": "deck_black_full"
     },
-    {
-      "name": "deck_black_half"
-    },
-    {
-      "name": "deck_black_low"
-    },
-    {
-      "name": "deck_nanotrasen_empty"
-    },
     {
       "name": "deck_nanotrasen_full"
     },
-    {
-      "name": "deck_nanotrasen_half"
-    },
-    {
-      "name": "deck_nanotrasen_low"
-    },
-    {
-      "name": "deck_syndicate_empty"
-    },
     {
       "name": "deck_syndicate_full"
     },
-    {
-      "name": "deck_syndicate_half"
-    },
-    {
-      "name": "deck_syndicate_low"
-    },
-    {
-      "name": "nanotrasen_hand1"
-    },
-    {
-      "name": "nanotrasen_hand2"
-    },
-    {
-      "name": "nanotrasen_hand3"
-    },
-    {
-      "name": "nanotrasen_hand4"
-    },
-    {
-      "name": "nanotrasen_hand5"
-    },
     {
       "name": "sc_10_of_Clubs_black"
     },
@@ -550,21 +493,6 @@
     {
       "name": "singlecard_down_syndicate"
     },
-    {
-      "name": "syndicate_hand1"
-    },
-    {
-      "name": "syndicate_hand2"
-    },
-    {
-      "name": "syndicate_hand3"
-    },
-    {
-      "name": "syndicate_hand4"
-    },
-    {
-      "name": "syndicate_hand5"
-    },
     {
       "name": "syndicate_joker",
       "delays": [
@@ -584,31 +512,31 @@
       ]
     },
     {
-          "name": "black_joker",
-          "delays": [
-              [
-                  0.5,
-                  0.5
-              ]
+      "name": "black_joker",
+      "delays": [
+          [
+              0.5,
+              0.5
           ]
+      ]
     },
     {
       "name": "syndicate_box"
     },
     {
-        "name": "syndicate_box_open"
+      "name": "syndicate_box_open"
     },
     {
-        "name": "black_box"
+      "name": "black_box"
     },
     {
-        "name": "black_box_open"
+      "name": "black_box_open"
     },
     {
-        "name": "nanotrasen_box"
+      "name": "nanotrasen_box"
     },
-        {
-        "name": "nanotrasen_box_open"
+    {
+      "name": "nanotrasen_box_open"
     }
   ]
 }
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand1.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand1.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand2.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand2.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand3.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand3.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand4.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand4.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand5.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/nanotrasen_hand5.png
diff --git a/...es/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_10_of_Hearts_nanotrasen.png b/...es/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_10_of_Hearts_nanotrasen.png
diff --git a/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_2_of_Hearts_nanotrasen.png b/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_2_of_Hearts_nanotrasen.png
diff --git a/...rces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_3_of_Clubs_nanotrasen.png b/...rces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_3_of_Clubs_nanotrasen.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_3_of_Diamonds_black.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_3_of_Diamonds_black.png
diff --git a/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_6_of_Hearts_nanotrasen.png b/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_6_of_Hearts_nanotrasen.png
diff --git a/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_7_of_Hearts_nanotrasen.png b/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_7_of_Hearts_nanotrasen.png
diff --git a/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_8_of_Hearts_nanotrasen.png b/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_8_of_Hearts_nanotrasen.png
diff --git a/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_9_of_Hearts_nanotrasen.png b/...ces/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_9_of_Hearts_nanotrasen.png
diff --git a/.../Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Ace_of_Diamonds_syndicate.png b/.../Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Ace_of_Diamonds_syndicate.png
diff --git a/...s/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Ace_of_Hearts_nanotrasen.png b/...s/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Ace_of_Hearts_nanotrasen.png
diff --git a/...es/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Ace_of_Spades_syndicate.png b/...es/Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Ace_of_Spades_syndicate.png
diff --git a/.../Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Jack_of_Hearts_nanotrasen.png b/.../Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Jack_of_Hearts_nanotrasen.png
diff --git a/.../Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_King_of_Hearts_nanotrasen.png b/.../Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_King_of_Hearts_nanotrasen.png
diff --git a/...Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Queen_of_Hearts_nanotrasen.png b/...Textures/EstacaoPirata/Objects/Misc/cards.rsi/sc_Queen_of_Hearts_nanotrasen.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand1.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand1.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand2.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand2.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand3.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand3.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand4.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand4.png
diff --git a/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand5.png b/Resources/Textures/EstacaoPirata/Objects/Misc/cards.rsi/syndicate_hand5.png