From 7b5a59348109d32aa989e377db4fa7ee2768906c Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 2 Jun 2024 12:34:19 +0300 Subject: [PATCH] fix coins, roles, trackers --- Resources/Prototypes/Maps/arenas.yml | 4 ++-- Resources/Prototypes/Maps/debug.yml | 8 ++++---- .../Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml | 2 +- .../Prototypes/_CP14/Entities/Objects/Economy/coins.yml | 4 ++++ Resources/Prototypes/_CP14/Maps/arenas.yml | 8 ++++---- Resources/Prototypes/_CP14/Roles/play_time_tracker.yml | 2 +- Resources/Prototypes/_CP14/Stacks/coins.yml | 6 +----- Resources/Prototypes/_CP14/Stacks/materials.yml | 4 +--- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/Maps/arenas.yml b/Resources/Prototypes/Maps/arenas.yml index ea72045cff..faa0f5dbba 100644 --- a/Resources/Prototypes/Maps/arenas.yml +++ b/Resources/Prototypes/Maps/arenas.yml @@ -11,6 +11,6 @@ mapNameTemplate: "Meteor Arena" - type: StationJobs overflowJobs: - - Adventurer #CrystallPunk Dev replacement + - CP14Adventurer #CrystallPunk Dev replacement availableJobs: - Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement + CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml index 59d1fe0410..41cfb24628 100644 --- a/Resources/Prototypes/Maps/debug.yml +++ b/Resources/Prototypes/Maps/debug.yml @@ -11,9 +11,9 @@ mapNameTemplate: "Empty" - type: StationJobs overflowJobs: - - Adventurer #CrystallPunk Dev replacement + - CP14Adventurer #CrystallPunk Dev replacement availableJobs: - Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement + CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement - type: gameMap id: Dev @@ -33,9 +33,9 @@ mapNameTemplate: "Dev" - type: StationJobs overflowJobs: - - Adventurer #CrystallPunk Dev replacement + - CP14Adventurer #CrystallPunk Dev replacement availableJobs: - Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement + CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement - type: CP14StationDungeonMap biome: CP14CavesGeneric diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index 7ca3ec48c6..6a723258b7 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -6,7 +6,7 @@ - Spawner components: - type: SpawnPoint - job_id: Adventurer + job_id: CP14Adventurer - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml index b0ace5cf7b..bf6a6ed17f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml @@ -40,6 +40,7 @@ map: ["base"] - type: Stack stackType: CP14CopperCoin + count: 10 - type: entity id: CP14CopperCoin5 @@ -77,6 +78,7 @@ map: ["base"] - type: Stack stackType: CP14SilverCoin + count: 10 - type: entity id: CP14SilverCoin5 @@ -114,6 +116,7 @@ map: ["base"] - type: Stack stackType: CP14GoldCoin + count: 10 - type: entity id: CP14GoldCoin5 @@ -151,6 +154,7 @@ map: ["base"] - type: Stack stackType: CP14PlatinumCoin + count: 10 - type: entity id: CP14PlatinumCoin5 diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml index e07bea5520..76b8e39434 100644 --- a/Resources/Prototypes/_CP14/Maps/arenas.yml +++ b/Resources/Prototypes/_CP14/Maps/arenas.yml @@ -11,9 +11,9 @@ mapNameTemplate: "Cave Arena" - type: StationJobs overflowJobs: - - Adventurer + - CP14Adventurer availableJobs: - Adventurer: [ -1, -1 ] + CP14Adventurer: [ -1, -1 ] - type: gameMap id: AlchemyTest @@ -35,6 +35,6 @@ mapNameTemplate: "Alchemy test" - type: StationJobs overflowJobs: - - Adventurer + - CP14Adventurer availableJobs: - Adventurer: [ -1, -1 ] + CP14Adventurer: [ -1, -1 ] diff --git a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml index 25e1f15288..f2138b65ec 100644 --- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml +++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml @@ -4,4 +4,4 @@ id: CP14JobAdventurer - type: playTimeTracker - id: CP14JobAlchemmist \ No newline at end of file + id: CP14JobAlchemist \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/coins.yml b/Resources/Prototypes/_CP14/Stacks/coins.yml index 202185f78e..0a6188bc82 100644 --- a/Resources/Prototypes/_CP14/Stacks/coins.yml +++ b/Resources/Prototypes/_CP14/Stacks/coins.yml @@ -6,7 +6,6 @@ sprite: /Textures/_CP14/Objects/Economy/cp_coin.rsi state: coin1 maxCount: 10 - itemSize: 1 - type: stack id: CP14SilverCoin @@ -16,7 +15,6 @@ sprite: /Textures/_CP14/Objects/Economy/sp_coin.rsi state: coin1 maxCount: 10 - itemSize: 1 - type: stack id: CP14GoldCoin @@ -26,7 +24,6 @@ sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi state: coin1 maxCount: 10 - itemSize: 1 - type: stack id: CP14PlatinumCoin @@ -35,5 +32,4 @@ icon: sprite: /Textures/_CP14/Objects/Economy/pp_coin.rsi state: coin1 - maxCount: 10 - itemSize: 1 \ No newline at end of file + maxCount: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 8aee29dea1..9f5c181e62 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -4,12 +4,10 @@ spawn: CP14DirtBlock1 icon: { sprite: _CP14/Objects/Materials/dirt_block.rsi, state: dirt_2 } maxCount: 10 - itemSize: 5 - type: stack id: CP14WoodenPlanks name: wooden planks spawn: CP14WoodenPlanks1 icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } - maxCount: 10 - itemSize: 5 \ No newline at end of file + maxCount: 10 \ No newline at end of file