From 50791db750e884b678ff35b882ff1b4f949ae942 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:48:46 -0700 Subject: [PATCH] Add rings (Salvage loot real)! (#31372) * First commit * I'm silly * Another fix * How could I forget the descriptions! * Forgot * Made textures alligned properly * Removed the stuff! * Opps * Typo fixes --- .../Clothing/Hands/base_clothinghands.yml | 13 +++ .../Entities/Clothing/Hands/rings.yml | 104 ++++++++++++++++++ .../Spawners/Random/Salvage/tables_loot.yml | 8 ++ .../Markers/Spawners/Random/rings.yml | 21 ++++ .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/tags.yml | 3 + .../Clothing/Hands/Rings/basic.rsi/gem.png | Bin 0 -> 132 bytes .../Clothing/Hands/Rings/basic.rsi/meta.json | 17 +++ .../Clothing/Hands/Rings/basic.rsi/ring.png | Bin 0 -> 228 bytes 9 files changed, 167 insertions(+) create mode 100644 Resources/Prototypes/Entities/Clothing/Hands/rings.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index c1a53ccf6e..da0011e1cc 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -48,3 +48,16 @@ - type: Fiber fiberMaterial: fibers-synthetic - type: FingerprintMask + +- type: entity + abstract: true + parent: BaseItem + id: RingBase + components: + - type: Clothing + slots: [ gloves, neck ] + - type: Item + size: Tiny + - type: Tag + tags: + - Ring diff --git a/Resources/Prototypes/Entities/Clothing/Hands/rings.yml b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml new file mode 100644 index 0000000000..e88ee81fee --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml @@ -0,0 +1,104 @@ +- type: entity + parent: RingBase + id: GoldRing + name: gold ring + description: A precious ring. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + color: "#ffc833" + - type: StaticPrice + price: 300 + - type: Appearance + +- type: entity + parent: RingBase + id: SilverRing + name: silver ring + description: Looks slightly less valuable than a gold one. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + - type: StaticPrice + price: 275 + - type: Appearance + +- type: entity + parent: RingBase + id: GoldRingDiamond + name: gold diamond ring + description: Made from ethically mined space diamonds. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + color: "#ffc833" + - state: gem + color: "#c1ffff" + - type: StaticPrice + price: 1500 + - type: Appearance + +- type: entity + parent: RingBase + id: SilverRingDiamond + name: silver diamond ring + description: Made from ethically mined space diamonds. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + - state: gem + color: "#c1ffff" + - type: StaticPrice + price: 1400 + - type: Appearance + +- type: entity + parent: RingBase + id: GoldRingGem + name: gold gem ring + description: Shiny and valuable! + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + color: "#ffc833" + - state: gem + map: [ "gemColor" ] + - type: StaticPrice + price: 2100 + - type: Appearance + - type: RandomSprite + getAllGroups: true + available: + - gemColor: + gem: Rainbow + +- type: entity + parent: RingBase + id: SilverRingGem + name: silver gem ring + description: Shiny and not quite as valuable! + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + - state: gem + map: [ "gemColor" ] + - type: StaticPrice + price: 2000 + - type: Appearance + - type: RandomSprite + getAllGroups: true + available: + - gemColor: + gem: Rainbow diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 61b3d10817..1ee0f123ef 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -114,6 +114,8 @@ range: 4, 7 - id: SpaceCash1000 - id: WristwatchGold + - !type:NestedSelector + tableId: RingTableCommon - type: entityTable id: SalvageTreasureRare @@ -145,6 +147,8 @@ weight: 14 - id: SpaceCash10000 weight: 1 + - !type:NestedSelector + tableId: RingTableRare - type: entityTable id: SalvageTreasureLegendary @@ -157,6 +161,10 @@ - id: TreasureCoinDiamond amount: !type:RangeNumberSelector range: 2, 5 + - !type:NestedSelector + tableId: RingTableRare + rolls: !type:RangeNumberSelector + range: 2, 3 # Equipment: Tools and things used by salvagers. Quote unquote "Gamer Loot" diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml new file mode 100644 index 0000000000..17f83b28a5 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml @@ -0,0 +1,21 @@ +- type: entityTable + id: RingTableCommon + table: !type:GroupSelector + children: + - id: SilverRing + weight: 0.55 + - id: GoldRing + weight: 0.45 + +- type: entityTable + id: RingTableRare + table: !type:GroupSelector + children: + - id: GoldRingDiamond + weight: 0.1 + - id: SilverRingDiamond + weight: 0.1 + - id: GoldRingGem + weight: 0.35 + - id: SilverRingGem + weight: 0.45 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 91ac7b049a..ba20a7b0cd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -200,6 +200,7 @@ - ClothingHeadHatWelding - WetFloorSign - ClothingHeadHatCone + - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index bece1fb479..d823f93d9d 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1090,6 +1090,9 @@ - type: Tag id: RifleStock +- type: Tag + id: Ring + - type: Tag id: RipleyCentralControlModule diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png new file mode 100644 index 0000000000000000000000000000000000000000..fcfbce6b75410ea62dcf11bd3cb4d75e0683f5e3 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzPfr)ekO=p;R}A@p63&5D|DCmS z&Xs1E?6+RHhcVQG>%BggLIVR+KKGh)H9@6!`m^}Y9jajb{;K$$R|69VND4?C5NDD; ax1K|B*Nju`KtmZkUHx3vIVChPFaQ8IYA5Re literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json new file mode 100644 index 0000000000..44edc26823 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by Beck Thompson for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ring" + }, + { + "name": "gem" + } + ] + } diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png new file mode 100644 index 0000000000000000000000000000000000000000..bb8bfac62efd0c1417d2cd6d129373579fe663e4 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJm7Xq+ArbCxrx|iFD+;)#^G}$- z+_87*jjGJ`LX+Z-`01?mb>m3s7UA0+@q|0+Yx=(Yv?IM@>vIe1nivHbK*+FhO3?qh zV_UB+icktXxAVA!`@g8y7ITZ2OqtbZuKQs2e)G!r<+lW!wqLuX!#S}r-t)$tdI^oC z1!v2@%