diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index 9797b6611d..c521600c8a 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -26,6 +26,20 @@ - state: green - state: zookeeper #TODO Replace +- type: entity + id: CP14SpawnPointInnkeeper + parent: SpawnPointJobBase + name: innkeeper + categories: + - Spawner + components: + - type: SpawnPoint + job_id: CP14Innkeeper + - type: Sprite + layers: + - state: green + - state: zookeeper #TODO Replace + - type: entity id: CP14SpawnPointCaptain parent: SpawnPointJobBase @@ -35,6 +49,34 @@ components: - type: SpawnPoint job_id: CP14Captain + - type: Sprite + layers: + - state: green + - state: zookeeper #TODO Replace + +- type: entity + id: CP14SpawnPointGuardCommander + parent: SpawnPointJobBase + name: guard commander + categories: + - Spawner + components: + - type: SpawnPoint + job_id: CP14GuardCommander + - type: Sprite + layers: + - state: green + - state: zookeeper #TODO Replace + +- type: entity + id: CP14SpawnPointHouseKeeper + parent: SpawnPointJobBase + name: house keeper + categories: + - Spawner + components: + - type: SpawnPoint + job_id: CP14HouseKeeper - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index 4abd5ad163..f2da075a26 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml @@ -29,6 +29,7 @@ acts: [ "Destruction" ] - type: Climbable - type: Sprite + snapCardinals: true drawdepth: Mobs layers: - map: [ base ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml index fc9e5f67f4..76b4540c33 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml @@ -154,6 +154,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml index 6e1ba2c161..d878415a50 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml @@ -195,6 +195,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: @@ -331,6 +333,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: diff --git a/Resources/Prototypes/_CP14/Entities/keys.yml b/Resources/Prototypes/_CP14/Entities/keys.yml index 64ac88f670..6d78399901 100644 --- a/Resources/Prototypes/_CP14/Entities/keys.yml +++ b/Resources/Prototypes/_CP14/Entities/keys.yml @@ -2,8 +2,8 @@ parent: BaseItem id: CP14BaseKey abstract: true - name: ключ - description: Небольшая заковыристая железяка, открывающая определенные замки. Не отдавайте кому попало! + name: key + description: A small, intricate piece of iron that opens certain locks. Don't give it to just anyone! components: - type: Tag tags: @@ -23,8 +23,8 @@ - type: entity parent: BaseItem id: CP14BaseLockpick - name: отмычка - description: Воровской инструмент, при должном умении и сноровке позволяющий взламывать любые замки. + name: lockpick + description: A thief's tool that, with proper skill and skill, allows you to pick any lock. components: - type: Sprite sprite: _CP14/Objects/keys.rsi @@ -34,7 +34,7 @@ - type: entity parent: CP14BaseKey id: CP14KeyTavern - name: ключ от таверны + name: captain key components: - type: Sprite state: key1 diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 3dc479f729..fd894bc242 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -23,7 +23,7 @@ - CP14BasicShoes - type: roleLoadout - id: CP14JobInnkeeper + id: JobCP14Innkeeper groups: - CP14BasicHead - CP14BasicEyes @@ -47,24 +47,24 @@ - CP14BasicShoes - type: roleLoadout - id: CP14JobGuardCommander + id: JobCP14GuardCommander groups: - CP14BasicHead - CP14BasicEyes - CP14BasicMask - - CP14BasicCloak + - CP14CaptainCloak - CP14BasicGloves - CP14BasicShirt - CP14BasicPants - CP14BasicShoes - type: roleLoadout - id: CP14JobHouseKeeper + id: JobCP14HouseKeeper groups: - CP14BasicHead - CP14BasicEyes - CP14BasicMask - - CP14BasicCloak + - CP14CaptainCloak - CP14BasicGloves - CP14BasicShirt - CP14BasicPants diff --git a/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml b/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml index ea356f22e3..419504a843 100644 --- a/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml +++ b/Resources/Prototypes/_CP14/Objectives/personal_objectives.yml @@ -30,31 +30,31 @@ id: CP14PersonalCurrencyCollectObjectiveSmall components: - type: Objective - difficulty: 0.5 + difficulty: 0.25 - type: CP14CurrencyCollectCondition - currency: 500 + currency: 250 - type: entity parent: CP14BasePersonalCurrencyCollectObjective id: CP14PersonalCurrencyCollectObjectiveMedium components: - type: Objective - difficulty: 1 + difficulty: 0.5 - type: CP14CurrencyCollectCondition - currency: 1000 + currency: 500 - type: entity parent: CP14BasePersonalCurrencyCollectObjective id: CP14PersonalCurrencyCollectObjectiveBig components: - type: Objective - difficulty: 3 + difficulty: 1 - type: CP14CurrencyCollectCondition - currency: 3000 + currency: 1000 - type: weightedRandom id: CP14PersonalCurrencyCollectObjectiveGroup weights: - CP14PersonalCurrencyCollectObjectiveSmall: 2 - CP14PersonalCurrencyCollectObjectiveMedium: 1 - CP14PersonalCurrencyCollectObjectiveBig: 0.3 + CP14PersonalCurrencyCollectObjectiveSmall: 1 + CP14PersonalCurrencyCollectObjectiveMedium: 0.5 + CP14PersonalCurrencyCollectObjectiveBig: 0.25