diff --git a/Resources/Locale/en-US/_CP14/trading/factions.ftl b/Resources/Locale/en-US/_CP14/trading/factions.ftl index 1c87e2518b..bbbadb22a6 100644 --- a/Resources/Locale/en-US/_CP14/trading/factions.ftl +++ b/Resources/Locale/en-US/_CP14/trading/factions.ftl @@ -2,4 +2,5 @@ cp14-trade-faction-contracts = Zellasian Trade Guild cp14-trade-faction-victoria-gardens = Victoria Gardens cp14-trade-faction-brad-potions = Brad's marvelous potions cp14-trade-faction-dwarf-mining = 'Dwarf Steel' mining branch -cp14-trade-faction-thaumaturgy = Academy of Thaumaturgy \ No newline at end of file +cp14-trade-faction-thaumaturgy = Academy of Thaumaturgy +cp14-trade-faction-home-decor = Cozy home \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl index 08d43d00c3..51995ca5e4 100644 --- a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl +++ b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl @@ -2,4 +2,5 @@ cp14-trade-faction-contracts = Торговая гильдия Зелласиа cp14-trade-faction-victoria-gardens = Сады Виктории cp14-trade-faction-brad-potions = Великолепные зелья Брада cp14-trade-faction-dwarf-mining = Шахтерский филиал 'Дворфийская сталь' -cp14-trade-faction-thaumaturgy = Тауматургическая академия \ No newline at end of file +cp14-trade-faction-thaumaturgy = Тауматургическая академия +cp14-trade-faction-home-decor = Уютный дом \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml index 3996190316..67a7591969 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml @@ -61,3 +61,14 @@ - type: CP14TradingContract faction: Thaumaturgy +- type: entity + parent: CP14TradeContractBase + id: CP14TradeContractHomeDecor + description: Trading contract with the "Cozy House" store. Allows you to buy various decorations and nice things to furnish your home. + suffix: Home Decor + components: + - type: Sprite + state: house + - type: CP14TradingContract + faction: HomeDecor + diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml index 65c630a8c0..3afc029b2e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml @@ -11,6 +11,8 @@ - type: Tag tags: - Payload + - type: StaticPrice + price: 5 - type: InteractionPopup successChance: 1 interactSuccessSound: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml b/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml index f87dec2bdd..0c2066f386 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml @@ -11,6 +11,8 @@ sprite: _CP14/Structures/Wallpaper/icons.rsi - type: Stack count: 30 + - type: StackPrice + price: 0.5 - type: entity id: CP14WallpaperBlack diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml index e0f8094483..34668159a8 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml @@ -49,6 +49,8 @@ - !type:PlaySoundBehavior sound: path: /Audio/Effects/plant_rustle.ogg + - type: StaticPrice + price: 15 - type: entity id: CP14PottedPlant1 diff --git a/Resources/Prototypes/_CP14/Trading/contracts.yml b/Resources/Prototypes/_CP14/Trading/contracts.yml index b75acbe978..a357cc77a5 100644 --- a/Resources/Prototypes/_CP14/Trading/contracts.yml +++ b/Resources/Prototypes/_CP14/Trading/contracts.yml @@ -41,3 +41,14 @@ service: !type:CP14BuyItemsService product: CP14TradeContractThaumaturgy count: 1 + +- type: cp14TradingPosition + id: CP14TradeContractHomeDecor + faction: ContractGuild + uiPosition: 4 + icon: + sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi + state: house + service: !type:CP14BuyItemsService + product: CP14TradeContractHomeDecor + count: 1 diff --git a/Resources/Prototypes/_CP14/Trading/cozy_house.yml b/Resources/Prototypes/_CP14/Trading/cozy_house.yml new file mode 100644 index 0000000000..a1bf3d4f8a --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/cozy_house.yml @@ -0,0 +1,287 @@ + +# Rep 0 + +- type: cp14TradingPosition + id: CP14Candle + faction: HomeDecor + uiPosition: 0 + icon: + sprite: Objects/Misc/candles.rsi + state: candle-big + service: !type:CP14BuyItemsService + product: CP14Candle + +- type: cp14TradingPosition + id: CP14Bell + faction: HomeDecor + uiPosition: 1 + icon: + sprite: _CP14/Objects/Misc/bell.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14Bell + +- type: cp14TradingPosition + id: CP14KeyCopperBlank + faction: HomeDecor + uiPosition: 3 + icon: + sprite: _CP14/Objects/keys.rsi + state: key_copper + service: !type:CP14BuyItemsService + product: CP14KeyCopperBlank + +- type: cp14TradingPosition + id: CP14LockCopper + faction: HomeDecor + uiPosition: 4 + icon: + sprite: _CP14/Objects/keys.rsi + state: lock_copper + service: !type:CP14BuyItemsService + product: CP14LockCopper + + + +- type: cp14TradingPosition + id: CP14WallpaperBlack + faction: HomeDecor + reputationLevel: 0 + uiPosition: 6 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: black + service: !type:CP14BuyItemsService + product: CP14WallpaperBlack + +- type: cp14TradingPosition + id: CP14WallpaperGreen + faction: HomeDecor + reputationLevel: 0 + uiPosition: 7 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: green + service: !type:CP14BuyItemsService + product: CP14WallpaperGreen + +- type: cp14TradingPosition + id: CP14WallpaperPurple + faction: HomeDecor + reputationLevel: 0 + uiPosition: 8 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: purple + service: !type:CP14BuyItemsService + product: CP14WallpaperPurple + +- type: cp14TradingPosition + id: CP14WallpaperRed + faction: HomeDecor + reputationLevel: 0 + uiPosition: 9 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: red + service: !type:CP14BuyItemsService + product: CP14WallpaperRed + +- type: cp14TradingPosition + id: CP14WallpaperWhite + faction: HomeDecor + reputationLevel: 0 + uiPosition: 10 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: white + service: !type:CP14BuyItemsService + product: CP14WallpaperWhite + +- type: cp14TradingPosition + id: CP14WallpaperWhite2 + faction: HomeDecor + reputationLevel: 0 + uiPosition: 11 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: white2 + service: !type:CP14BuyItemsService + product: CP14WallpaperWhite2 + +- type: cp14TradingPosition + id: CP14WallpaperYellow + faction: HomeDecor + reputationLevel: 0 + uiPosition: 12 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: yellow + service: !type:CP14BuyItemsService + product: CP14WallpaperYellow + +- type: cp14TradingPosition + id: CP14PottedPlant1 + faction: HomeDecor + reputationLevel: 0 + uiPosition: 14 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant1 + service: !type:CP14BuyItemsService + product: CP14PottedPlant1 + +- type: cp14TradingPosition + id: CP14PottedPlant3 + faction: HomeDecor + reputationLevel: 0 + uiPosition: 15 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant3 + service: !type:CP14BuyItemsService + product: CP14PottedPlant3 + +# Rep 1 + +- type: cp14TradingPosition + id: CP14CandleRed + faction: HomeDecor + reputationLevel: 1 + uiPosition: 0 + icon: + sprite: Objects/Misc/candles.rsi + state: candle-big + service: !type:CP14BuyItemsService + product: CP14CandleRed + +- type: cp14TradingPosition + id: CP14CandleBlack + faction: HomeDecor + reputationLevel: 1 + uiPosition: 1 + icon: + sprite: Objects/Misc/candles.rsi + state: candle-big + service: !type:CP14BuyItemsService + product: CP14CandleBlack + +- type: cp14TradingPosition + id: CP14KeyIronBlank + faction: HomeDecor + reputationLevel: 1 + uiPosition: 3 + icon: + sprite: _CP14/Objects/keys.rsi + state: key_iron + service: !type:CP14BuyItemsService + product: CP14KeyIronBlank + +- type: cp14TradingPosition + id: CP14LockIron + faction: HomeDecor + reputationLevel: 1 + uiPosition: 4 + icon: + sprite: _CP14/Objects/keys.rsi + state: lock_iron + service: !type:CP14BuyItemsService + product: CP14LockIron + + + +- type: cp14TradingPosition + id: CP14WallpaperBank + faction: HomeDecor + priceMarkup: 5 + reputationLevel: 1 + uiPosition: 6 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: bank + service: !type:CP14BuyItemsService + product: CP14WallpaperBank + +- type: cp14TradingPosition + id: CP14WallpaperBank2 + faction: HomeDecor + priceMarkup: 5 + reputationLevel: 1 + uiPosition: 7 + icon: + sprite: _CP14/Structures/Wallpaper/icons.rsi + state: bank2 + service: !type:CP14BuyItemsService + product: CP14WallpaperBank2 + + + +- type: cp14TradingPosition + id: CP14PottedPlant2 + faction: HomeDecor + reputationLevel: 1 + uiPosition: 14 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant2 + service: !type:CP14BuyItemsService + product: CP14PottedPlant2 + +- type: cp14TradingPosition + id: CP14PottedPlant4 + faction: HomeDecor + reputationLevel: 1 + uiPosition: 15 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant4 + service: !type:CP14BuyItemsService + product: CP14PottedPlant4 + +# Rep 2 + +- type: cp14TradingPosition + id: CP14KeyGoldBlank + faction: HomeDecor + reputationLevel: 2 + uiPosition: 3 + icon: + sprite: _CP14/Objects/keys.rsi + state: key_gold + service: !type:CP14BuyItemsService + product: CP14KeyGoldBlank + +- type: cp14TradingPosition + id: CP14LockGold + faction: HomeDecor + reputationLevel: 2 + uiPosition: 4 + icon: + sprite: _CP14/Objects/keys.rsi + state: lock_gold + service: !type:CP14BuyItemsService + product: CP14LockGold + +# Rep 3 + +- type: cp14TradingPosition + id: CP14KeyMithrilBlank + faction: HomeDecor + reputationLevel: 3 + uiPosition: 3 + icon: + sprite: _CP14/Objects/keys.rsi + state: key_mithril + service: !type:CP14BuyItemsService + product: CP14KeyMithrilBlank + +- type: cp14TradingPosition + id: CP14LockMithril + faction: HomeDecor + reputationLevel: 3 + uiPosition: 4 + icon: + sprite: _CP14/Objects/keys.rsi + state: lock_mithril + service: !type:CP14BuyItemsService + product: CP14LockMithril diff --git a/Resources/Prototypes/_CP14/Trading/factions.yml b/Resources/Prototypes/_CP14/Trading/factions.yml index f25c2740c6..17d5141cf3 100644 --- a/Resources/Prototypes/_CP14/Trading/factions.yml +++ b/Resources/Prototypes/_CP14/Trading/factions.yml @@ -22,3 +22,8 @@ id: Thaumaturgy color: "#a43ae0" name: cp14-trade-faction-thaumaturgy + +- type: cp14TradingFaction + id: HomeDecor + color: "#95f542" + name: cp14-trade-faction-home-decor diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/house.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/house.png new file mode 100644 index 0000000000..21989b7938 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/house.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json index 7d3c5b2c3b..52f084133e 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json @@ -21,6 +21,9 @@ }, { "name": "magic" + }, + { + "name": "house" } ] } \ No newline at end of file