From 3bbf692da530e91cca270ff3f91be9b10edc2df6 Mon Sep 17 00:00:00 2001 From: Viator-MV Date: Sat, 3 May 2025 16:51:25 +0300 Subject: [PATCH] Ultraskeletom Revmech Update (#1145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * help me * reinforced swords * skill tree * fix * T2 fix * components * fix 2 * fix * halberd fix * other variant * recheck it please * fix * deskill * deslikk++ * skel physical buffs * bad fix * fix * extended life time * fix * fix * fix * heal from death * sword fix * fix * try to fix * valid crashout? idk * It's not my fault. * fix * fix * fix * review fix * forgot * fix * ашч * meh * reequipment * wrong agony * fix * gripfix * fix * looking for result * coment remove * some fixes * ok * aaaaaaaaaaaaaaaaa --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 55 ---- .../Actions/Spells/Death/cure_dead.yml | 61 +++++ .../Spells/Death/cure_dead_ballade.yml | 92 +++++++ .../Entities/Actions/Spells/Physical/kick.yml | 40 ++- .../Actions/Spells/Physical/sprint.yml | 24 +- .../Entities/Clothing/Cloak/bone_cloak.yml | 21 ++ .../Entities/Clothing/OuterClothing/armor.yml | 13 + .../Player/DemiplaneAntag/Skeletons/T1.yml | 167 ++++++++++++ .../Player/DemiplaneAntag/Skeletons/T2.yml | 256 ++++++++++++++++++ .../Mobs/Player/DemiplaneAntag/skeleton.yml | 201 -------------- .../Entities/Mobs/Player/TownRaids/undead.yml | 2 +- .../_CP14/Entities/Mobs/Species/skeleton.yml | 4 +- .../Weapons/ModularPresets/daggers.yml | 34 ++- .../Objects/Weapons/ModularPresets/sword.yml | 36 ++- .../Loadouts/Misc/skeleton_startinggear.yml | 117 ++++++++ .../Loadouts/Misc/undead_startinggear.yml | 62 +---- .../Demiplane/Modifiers/Danger/mobs.yml | 43 ++- .../Spells/necromancy.rsi/cure_dead.png | Bin 0 -> 580 bytes .../necromancy.rsi/dead_heal_ballade.png | Bin 0 -> 515 bytes .../Actions/Spells/necromancy.rsi/meta.json | 6 + .../Spells/physical.rsi/kick_skull.png | Bin 0 -> 352 bytes .../Actions/Spells/physical.rsi/meta.json | 6 + .../Spells/physical.rsi/sprint_skull.png | Bin 0 -> 235 bytes .../Cloak/bone_cloak.rsi/equipped-CLOAK.png | Bin 0 -> 1018 bytes .../Clothing/Cloak/bone_cloak.rsi/icon.png | Bin 0 -> 578 bytes .../Clothing/Cloak/bone_cloak.rsi/meta.json | 18 ++ .../bone_mage_cloak.rsi/equipped-CLOAK.png | Bin 0 -> 1481 bytes .../Cloak/bone_mage_cloak.rsi/icon.png | Bin 0 -> 788 bytes .../Cloak/bone_mage_cloak.rsi/meta.json | 18 ++ .../bone_armor.rsi/equipped-OUTERCLOTHING.png | Bin 1749 -> 588 bytes .../OuterClothing/bone_armor.rsi/icon.png | Bin 1088 -> 261 bytes 31 files changed, 949 insertions(+), 327 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/bone_cloak.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/skeleton.yml create mode 100644 Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml create mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png create mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/dead_heal_ballade.png create mode 100644 Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick_skull.png create mode 100644 Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint_skull.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index e822753540..ffd033ede6 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -1200,61 +1200,6 @@ ent-CP14MobMonsterMole = хищный крот .desc = Охотится в темноте и любит вкус мяса и крови во рту. .suffix = AI -ent-CP14MobUndeadSkeletonDemiplane = скелет - .desc = Оживленный темной магией хрупкий скелет. Обычно скелеты - чрезвычайно разумные существа, управляемые недавно умершей душой. - -ent-CP14MobUndeadSkeletonHalberd = { ent-CP14MobUndeadSkeletonDemiplane } - .desc = { ent-CP14MobUndeadSkeletonDemiplane.desc } - .suffix = Алебардщик - -ent-CP14MobUndeadSkeletonSword = { ent-CP14MobUndeadSkeletonDemiplane } - .desc = { ent-CP14MobUndeadSkeletonDemiplane.desc } - .suffix = Мечник - -ent-CP14MobUndeadSkeletonDodger = { ent-CP14MobUndeadSkeletonDemiplane } - .desc = { ent-CP14MobUndeadSkeletonDemiplane.desc } - .suffix = Кинжал - -ent-CP14MobUndeadSkeletonArcher = { ent-CP14MobUndeadSkeletonDemiplane } - .desc = { ent-CP14MobUndeadSkeletonDemiplane.desc } - .suffix = Лучник - -ent-CP14MobUndeadSkeletonWizard = { ent-CP14MobUndeadSkeletonDemiplane } - .desc = { ent-CP14MobUndeadSkeletonDemiplane.desc } - .suffix = Маг - -ent-CP14MobUndeadSkeletonBard = { ent-CP14MobUndeadSkeletonDemiplane } - .desc = { ent-CP14MobUndeadSkeletonDemiplane.desc } - .suffix = Бард - -ent-SpawnPointGhostDemiplaneSkeleton = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = случайный скелет - -ent-SpawnPointGhostDemiplaneSkeletonHalberd = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = скелет-алебардщик - -ent-SpawnPointGhostDemiplaneSkeletonSword = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = скелет-мечник - -ent-SpawnPointGhostDemiplaneSkeletonDodger = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = скелет-кинжальщик - -ent-SpawnPointGhostDemiplaneSkeletonArcher = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = скелет-лучник - -ent-SpawnPointGhostDemiplaneSkeletonWizard = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = скелет-маг - -ent-SpawnPointGhostDemiplaneSkeletonBard = точка спавна роли призрака - .desc = { ent-SpawnPointGhostDemiplaneSkeleton.desc } - .suffix = скелет-бард - ent-CP14MobWatcherIce = ледяной наблюдатель .desc = { ent-CP14MobWatcherBase.desc } diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml new file mode 100644 index 0000000000..f85da28a8a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml @@ -0,0 +1,61 @@ +- type: entity + id: CP14ActionSpellCureFromDeath + name: Cure from death + description: You heal the target from all kinds of damage. + components: + - type: Sprite + sprite: _CP14/Actions/Spells/necromancy.rsi + state: cure_dead + - type: CP14MagicEffectCastSlowdown + speedMultiplier: 0.7 + - type: CP14MagicEffectManaCost + manaCost: 4 + - type: CP14MagicEffect + telegraphyEffects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectResurrection + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectResurrection + - !type:CP14SpellResurrectionEffect # TODO заставить работать только на нежить + - !type:CP14SpellApplyEntityEffect + effects: + - !type:HealthChange + damage: + types: + Asphyxiation: -2 + Bloodloss: -2 + Blunt: -2 + Cellular: -1 + Caustic: -2 + Cold: -1 + Heat: -1 + Piercing: -2 + Poison: -2 + Radiation: -2 + Shock: -2 + Slash: -2 + - type: CP14MagicEffectSomaticAspect + - type: CP14MagicEffectVerbalAspect + startSpeech: "Surge, hominem mortuum!" + - type: CP14MagicEffectCastingVisual + proto: CP14RuneResurrection + - type: EntityTargetAction + whitelist: + components: + - MobState + range: 10 + itemIconStyle: BigAction + interactOnMiss: false + sound: !type:SoundPathSpecifier + path: /Audio/Magic/rumble.ogg + icon: + sprite: _CP14/Actions/Spells/necromancy.rsi + state: cure_dead + event: !type:CP14ToggleableEntityTargetActionEvent + cooldown: 2 + castTime: 10 + breakOnMove: false + breakOnDamage: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml new file mode 100644 index 0000000000..6fbfeb3d1c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml @@ -0,0 +1,92 @@ +- type: entity + id: CP14ActionSpellHealFromDeathBallade + name: Healing from death ballade + description: Your music is filled with healing magic, fast healing all the creatures around you. + components: + - type: Sprite + sprite: _CP14/Actions/Spells/necromancy.rsi + state: dead_heal_ballade + - type: CP14MagicEffectCastSlowdown + speedMultiplier: 1.0 + - type: CP14MagicEffectManaCost + manaCost: 1 + - type: CP14MagicEffect + effects: + - !type:CP14SpellSpawnEntityOnTarget # TODO заставить работать только на нежить + spawns: + - CP14AreaEntityEffectDeadHealBallade + - type: CP14MagicEffectRequiredMusicTool + - type: CP14MagicEffectCastingVisual + proto: CP14RuneDeadHealBallade + - type: InstantAction + itemIconStyle: BigAction + sound: !type:SoundPathSpecifier + path: /Audio/Magic/rumble.ogg + icon: + sprite: _CP14/Actions/Spells/necromancy.rsi + state: dead_heal_ballade + event: !type:CP14ToggleableInstantActionEvent + effectFrequency: 1 + cooldown: 15 + castTime: 120 + hidden: true + +- type: entity + id: CP14AreaEntityEffectDeadHealBallade + categories: [ HideSpawnMenu ] + save: false + components: + - type: TimedDespawn + lifetime: 1.6 + - type: CP14AreaEntityEffect + range: 3 + maxTargets: 4 + whitelist: + components: + - MobState + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectDeadHealBallade + - !type:CP14SpellApplyEntityEffect + effects: + - !type:HealthChange + damage: + types: + Slash: -1.0 + Blunt: -1.0 + Piercing: -1.0 + Cold: -0.80 + Heat: -0.80 + Shock: -0.80 + Poison: -1.0 + Bloodloss: -1.5 + Caustic: -0.5 + +- type: entity + id: CP14ImpactEffectDeadHealBallade + parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] + save: false + components: + - type: Sprite + sprite: _CP14/Effects/music.rsi + layers: + - state: notes_5 + color: "#36937b" + shader: unshaded + +- type: entity + id: CP14RuneDeadHealBallade + parent: CP14BaseMagicRune + categories: [ HideSpawnMenu ] + save: false + components: + - type: PointLight + color: "#54e194" + - type: Sprite + sprite: _CP14/Effects/music.rsi + layers: + - state: notes_3 + color: "#54e194" + shader: unshaded \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml index 7e8f779130..2955d17c13 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml @@ -55,4 +55,42 @@ sound: !type:SoundPathSpecifier path: /Audio/Effects/hit_kick.ogg params: - pitch: 1 \ No newline at end of file + pitch: 1 + + +- type: entity + parent: CP14ActionSpellKick + id: CP14ActionSpellKickSkeleton + name: Kick + description: You perform an epic leg kick at your chosen object, pushing it away from you. + components: + - type: Sprite + sprite: _CP14/Actions/Spells/physical.rsi + state: kick_skull + - type: CP14MagicEffectStaminaCost + stamina: 35 + - type: CP14MagicEffect + effects: + - !type:CP14SpellApplyEntityEffect + effects: + - !type:Paralyze + paralyzeTime: 2 + - !type:CP14SpellThrowFromUser + throwPower: 10 + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14DustEffectKickSound + - !type:CP14SpellApplyEntityEffect + effects: + - !type:HealthChange + damage: + types: + Blunt: 10 + - type: EntityTargetAction + itemIconStyle: BigAction + icon: + sprite: _CP14/Actions/Spells/physical.rsi + state: kick_skull + event: !type:CP14DelayedEntityTargetActionEvent + cooldown: 5 + castDelay: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml index 3980b88c43..4603fcdf8a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml @@ -36,4 +36,26 @@ - type: CP14MagicEffectCastSlowdown speedMultiplier: 1.5 - type: CP14MagicEffectStaminaCost - stamina: 5 \ No newline at end of file + stamina: 5 + + +- type: entity + parent: CP14ActionSpellSprint + id: CP14ActionSpellSprintSkeleton + name: Sprint + description: At the cost of heavy stamina expenditure, you accelerate significantly in movement. + components: + - type: Sprite + sprite: _CP14/Actions/Spells/physical.rsi + state: sprint_skull + - type: CP14MagicEffectCastSlowdown + speedMultiplier: 1.4 + - type: CP14MagicEffectStaminaCost + stamina: 2 + - type: InstantAction + itemIconStyle: BigAction + sound: !type:SoundPathSpecifier + path: /Audio/Magic/rumble.ogg + icon: + sprite: _CP14/Actions/Spells/physical.rsi + state: sprint_skull \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/bone_cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/bone_cloak.yml new file mode 100644 index 0000000000..22beb1c200 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/bone_cloak.yml @@ -0,0 +1,21 @@ +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakBone + name: bone cloak + description: a brutal cloak for brutal skeletons. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/bone_cloak.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/bone_cloak.rsi + +- type: entity + parent: CP14ClothingCloakBone + id: CP14ClothingCloakBoneMage + name: bone armor with cloak + description: The leader's cloak, for the leader's skeleton! + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/bone_mage_cloak.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/bone_mage_cloak.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml index 100b1ae70c..c879f5a732 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml @@ -41,3 +41,16 @@ - type: ClothingSpeedModifier walkModifier: 0.98 sprintModifier: 0.98 + +- type: entity + parent: CP14ClothingOuterClothingBoneArmor + id: CP14ClothingOuterClothingBoneArmorUpgrade + name: reinforced bone armor + description: Bone armour... not the best or most attractive defence. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.80 + Piercing: 0.90 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml new file mode 100644 index 0000000000..25a042d352 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml @@ -0,0 +1,167 @@ +- type: entity + id: CP14MobUndeadSkeletonDemiplaneT1 + parent: CP14BaseMobSkeleton + name: skeleton + abstract: true + components: + - type: CP14NightVision + - type: NpcFactionMember + factions: + - CP14Monster + +- type: entity + id: CP14MobUndeadSkeletonHalberdT1 + parent: CP14MobUndeadSkeletonDemiplaneT1 + categories: [ ForkFiltered ] + suffix: Halebard T1 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonHalberdT1 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellKick + +- type: entity + id: CP14MobUndeadSkeletonSwordT1 + parent: CP14MobUndeadSkeletonDemiplaneT1 + categories: [ ForkFiltered ] + suffix: Sword T1 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonSwordT1 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellKick + +- type: entity + id: CP14MobUndeadSkeletonDodgerT1 + parent: CP14MobUndeadSkeletonDemiplaneT1 + categories: [ ForkFiltered ] + suffix: Dodger T1 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonDodgerT1 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellKick + - CP14ActionSpellSprint + +- type: entity + id: CP14MobUndeadSkeletonArcherT1 + parent: CP14MobUndeadSkeletonDemiplaneT1 + categories: [ ForkFiltered ] + suffix: Archer T1 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonArcherT1 + - type: CP14SkillStorage + progress: + Atlethic: 1 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellIceArrow + - CP14ActionSpellSprint + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonT1 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton random T1 + categories: [ ForkFiltered ] + parent: MarkerBase + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 15 + children: + - id: SpawnPointGhostDemiplaneSkeletonArcherT1 + - !type:GroupSelector + weight: 20 + children: + - id: SpawnPointGhostDemiplaneSkeletonHalberdT1 + - !type:GroupSelector + weight: 60 + children: + - id: SpawnPointGhostDemiplaneSkeletonSwordT1 + - id: SpawnPointGhostDemiplaneSkeletonDodgerT1 + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi + state: full + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonHalberdT1 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Halebard T1 + categories: [ ForkFiltered ] + parent: MarkerBase + components: + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + allowMovement: true + description: cp14-ghost-role-information-description-skeleton + rules: cp14-ghost-role-information-rules-demiplane + mindRoles: + - CP14MindRoleDemiplaneAntag + raffle: + settings: default + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonHalberdT1 + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi + state: full + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonSwordT1 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Sword T1 + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberdT1 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonSwordT1 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonDodgerT1 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Dodger T1 + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberdT1 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonDodgerT1 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonArcherT1 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Archer T1 + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberdT1 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonArcherT1 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml new file mode 100644 index 0000000000..b9ce728da0 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml @@ -0,0 +1,256 @@ +- type: entity + id: CP14MobUndeadSkeletonDemiplaneT2 + parent: CP14BaseMobSkeleton + name: skeleton + abstract: true + components: + - type: CP14NightVision + - type: NpcFactionMember + factions: + - CP14Monster + +- type: entity + id: CP14MobUndeadSkeletonHalberdT2 + parent: CP14MobUndeadSkeletonDemiplaneT2 + categories: [ ForkFiltered ] + suffix: Halebard T2 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonHalberdT2 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellKickSkeleton + +- type: entity + id: CP14MobUndeadSkeletonSwordT2 + parent: CP14MobUndeadSkeletonDemiplaneT2 + categories: [ ForkFiltered ] + suffix: Sword T2 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonSwordT2 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellKickSkeleton + +- type: entity + id: CP14MobUndeadSkeletonDodgerT2 + parent: CP14MobUndeadSkeletonDemiplaneT2 + categories: [ ForkFiltered ] + suffix: Dodger T2 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonDodgerT2 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellKickSkeleton + - CP14ActionSpellSprintSkeleton + +- type: entity + id: CP14MobUndeadSkeletonArcherT2 + parent: CP14MobUndeadSkeletonDemiplaneT2 + categories: [ ForkFiltered ] + suffix: Archer T2 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonArcherT2 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellSprint + - CP14ActionSpellShadowStep + - CP14ActionSpellIceArrow + +- type: entity + id: CP14MobUndeadSkeletonWizardT2 + parent: CP14MobUndeadSkeletonDemiplaneT2 + categories: [ ForkFiltered ] + suffix: Wizard T2 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonWizardT2 + - type: CP14MagicEnergyDraw + energy: 1 + delay: 1 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellFreeze + - CP14ActionSpellIceShards + - CP14ActionSpellIceDagger + - CP14ActionSpellCureFromDeath + - CP14ActionSpellShadowStep + - CP14ActionSpellShadowSwap + - CP14ActionSpellShadowGrab + +- type: entity + id: CP14MobUndeadSkeletonBardT2 + parent: CP14MobUndeadSkeletonDemiplaneT2 + categories: [ ForkFiltered ] + suffix: Bard T2 + components: + - type: Loadout + prototypes: + - CP14MobSkeletonBardT2 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellHealFromDeathBallade + - CP14ActionSpellMagicBallade + - CP14ActionSpellSpeedBallade + - CP14ActionSpellPeaceBallade + - CP14ActionSpellHellBallade + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton random T2 + categories: [ ForkFiltered ] + parent: MarkerBase + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 40 + children: + - id: CP14SpawnPointGhostDemiplaneSkeletonWizardT2 + - id: CP14SpawnPointGhostDemiplaneSkeletonBardT2 + - !type:GroupSelector + weight: 60 + children: + - id: CP14SpawnPointGhostDemiplaneSkeletonSwordT2 + - id: CP14SpawnPointGhostDemiplaneSkeletonDodgerT2 + - id: CP14SpawnPointGhostDemiplaneSkeletonArcherT2 + - id: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi + state: full + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonMagicalT2 + parent: MarkerBase + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton random T2 + categories: [ ForkFiltered ] + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 2 + children: + - id: CP14SpawnPointGhostDemiplaneSkeletonWizardT2 + - !type:GroupSelector + weight: 1 + children: + - id: CP14SpawnPointGhostDemiplaneSkeletonBardT2 + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi + state: full + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Halebard T2 + categories: [ ForkFiltered ] + components: + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + allowMovement: true + description: cp14-ghost-role-information-description-skeleton + rules: cp14-ghost-role-information-rules-demiplane + mindRoles: + - CP14MindRoleDemiplaneAntag + raffle: + settings: default + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonHalberdT2 + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi + state: full + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonSwordT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Sword T2 + categories: [ ForkFiltered ] + parent: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonSwordT2 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonDodgerT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Dodger T2 + categories: [ ForkFiltered ] + parent: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonDodgerT2 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonArcherT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Archer T2 + categories: [ ForkFiltered ] + parent: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonArcherT2 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonWizardT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Wizard T2 + categories: [ ForkFiltered ] + parent: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonWizardT2 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton + +- type: entity + id: CP14SpawnPointGhostDemiplaneSkeletonBardT2 + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Bard T2 + categories: [ ForkFiltered ] + parent: CP14SpawnPointGhostDemiplaneSkeletonHalberdT2 + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonBardT2 + - type: GhostRole + name: cp14-ghost-role-information-name-skeleton diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/skeleton.yml deleted file mode 100644 index be7c21ff02..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/skeleton.yml +++ /dev/null @@ -1,201 +0,0 @@ -- type: entity - id: CP14MobUndeadSkeletonDemiplane - parent: CP14BaseMobSkeleton - name: skeleton - description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul. - abstract: true - components: - - type: CP14NightVision - - type: NpcFactionMember - factions: - - CP14Monster - -- type: entity - id: CP14MobUndeadSkeletonHalberd - parent: CP14MobUndeadSkeletonDemiplane - categories: [ ForkFiltered ] - suffix: Halebard - components: - - type: Loadout - prototypes: - - CP14MobSkeletonHalberd - - type: CP14SpellStorage - grantAccessToSelf: true - spells: - - CP14ActionSpellKick - -- type: entity - id: CP14MobUndeadSkeletonSword - parent: CP14MobUndeadSkeletonDemiplane - categories: [ ForkFiltered ] - suffix: Sword - components: - - type: Loadout - prototypes: - - CP14MobSkeletonSword - -- type: entity - id: CP14MobUndeadSkeletonDodger - parent: CP14MobUndeadSkeletonDemiplane - categories: [ ForkFiltered ] - suffix: Dodger - components: - - type: Loadout - prototypes: - - CP14MobSkeletonDodger - - type: CP14SpellStorage - grantAccessToSelf: true - spells: - - CP14ActionSpellSprint - -- type: entity - id: CP14MobUndeadSkeletonArcher - parent: CP14MobUndeadSkeletonDemiplane - categories: [ ForkFiltered ] - suffix: Archer - components: - - type: Loadout - prototypes: - - CP14MobSkeletonArcher - -- type: entity - id: CP14MobUndeadSkeletonWizard - parent: CP14MobUndeadSkeletonDemiplane - categories: [ ForkFiltered ] - suffix: Wizard - components: - - type: Loadout - prototypes: - - CP14MobSkeletonWizard - - type: CP14MagicEnergyDraw - energy: 1 - delay: 1 - - type: CP14SpellStorage - grantAccessToSelf: true - spells: - - CP14ActionSpellIceShards - - CP14ActionSpellFreeze - - CP14ActionSpellFlameCreation - - CP14ActionSpellCureWounds - -- type: entity - id: CP14MobUndeadSkeletonBard - parent: CP14MobUndeadSkeletonDemiplane - categories: [ ForkFiltered ] - suffix: Bard - components: - - type: Loadout - prototypes: - - CP14MobSkeletonBard - - type: CP14SpellStorage - grantAccessToSelf: true - spells: - - CP14ActionSpellHealBallade - - CP14ActionSpellMagicBallade - - CP14ActionSpellSpeedBallade - - CP14ActionSpellPeaceBallade - - CP14ActionSpellHellBallade - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeleton - name: ghost role spawn point - description: A ghost role for a bloodthirsty and cunning skeleton. - suffix: skeleton random - categories: [ ForkFiltered ] - parent: MarkerBase - components: - - type: EntityTableSpawner - table: !type:GroupSelector - children: - - !type:GroupSelector - weight: 15 - children: - - id: CP14SpawnPointGhostDemiplaneSkeletonWizard - - id: CP14SpawnPointGhostDemiplaneSkeletonBard - - !type:GroupSelector - weight: 20 - children: - - id: CP14SpawnPointGhostDemiplaneSkeletonHalberd - - !type:GroupSelector - weight: 60 - children: - - id: CP14SpawnPointGhostDemiplaneSkeletonSword - - id: CP14SpawnPointGhostDemiplaneSkeletonDodger - - id: CP14SpawnPointGhostDemiplaneSkeletonArcher - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green - - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi - state: full - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonHalberd - parent: MarkerBase - name: ghost role spawn point - description: A ghost role for a bloodthirsty and cunning skeleton. - suffix: skeleton Halebard - categories: [ ForkFiltered ] - components: - - type: GhostRole - name: cp14-ghost-role-information-name-skeleton - allowMovement: true - description: cp14-ghost-role-information-description-skeleton - rules: cp14-ghost-role-information-rules-demiplane - mindRoles: - - CP14MindRoleDemiplaneAntag - raffle: - settings: default - - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeletonHalberd - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green - - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi - state: full - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonSword - suffix: skeleton Sword - categories: [ ForkFiltered ] - parent: CP14SpawnPointGhostDemiplaneSkeletonHalberd - components: - - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeletonSword - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonDodger - suffix: skeleton Dodger - categories: [ ForkFiltered ] - parent: CP14SpawnPointGhostDemiplaneSkeletonHalberd - components: - - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeletonDodger - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonArcher - suffix: skeleton Archer - categories: [ ForkFiltered ] - parent: CP14SpawnPointGhostDemiplaneSkeletonHalberd - components: - - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeletonArcher - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonWizard - suffix: skeleton Wizard - categories: [ ForkFiltered ] - parent: CP14SpawnPointGhostDemiplaneSkeletonHalberd - components: - - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeletonWizard - -- type: entity - id: CP14SpawnPointGhostDemiplaneSkeletonBard - suffix: skeleton Bard - categories: [ ForkFiltered ] - parent: CP14SpawnPointGhostDemiplaneSkeletonHalberd - components: - - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeletonBard \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml index d068422334..d8089c63a9 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml @@ -26,7 +26,7 @@ - type: entity id: CP14MobUndeadSkeletonWizardTownRaid - parent: CP14MobUndeadSkeletonWizard + parent: CP14MobUndeadSkeletonWizardT2 categories: [ HideSpawnMenu ] components: - type: RandomSpawner diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml index 8c0a9044d7..1d9e596b7d 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml @@ -74,8 +74,8 @@ 50: Dead - type: SlowOnDamage speedModifierThresholds: - 40: 0.8 - 25: 0.6 + 30: 0.8 + 40: 0.6 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml index 8291a3abb0..1030bc0f89 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml @@ -11,4 +11,36 @@ state: icon - type: CP14ModularCraftAutoAssemble details: - - BladeIronDagger \ No newline at end of file + - BladeIronDagger + +- type: entity + id: CP14ModularIronDaggerTundra + parent: CP14ModularGripWooden + name: Dagger Tundra + description: A small, multi-purpose, sharp blade. You can cut meat or throw it at a goblin. It has "tundra" engraved on it. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronDagger + - InlayQuartzWater + +- type: entity + id: CP14ModularIronDaggerAgony + parent: CP14ModularGripWooden + name: Dagger Agony + description: A small, multi-purpose, sharp blade. You can cut meat or throw it at a goblin. It has "agony" engraved on it. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronDagger + - InlayQuartzElectric \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml index c195226313..a99b9404d7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml @@ -59,4 +59,38 @@ state: icon - type: CP14ModularCraftAutoAssemble details: - - BladeBoneSword \ No newline at end of file + - BladeBoneSword + +- type: entity + id: CP14ModularSkeletonHalberdUpgrade + parent: CP14ModularGripWoodenLong + name: bone halberd + suffix: Reinforced + description: Monstrous weapons of bone. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeBoneSword + - GardeSharpIron + +- type: entity + id: CP14ModularSkeletonSwordUpgrade + parent: CP14ModularGripWooden + name: bone sword + suffix: Reinforced + description: Monstrous weapons of bone. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeBoneSword + - GardeSharpIron \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml new file mode 100644 index 0000000000..3f528b5fc1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml @@ -0,0 +1,117 @@ + +# TIER 0 + +- type: startingGear + id: CP14MobSkeletonCloset + equipment: + pants: CP14ClothingPantsLoincloth + +# TIER 1 + +- type: startingGear + id: CP14MobSkeletonHalberdT1 + equipment: + outerClothing: CP14ClothingOuterClothingBoneArmor + cloak: CP14ClothingCloakBone + shirt: CP14ClothingWarriorsGarbDress + pants: CP14ClothingPantsLoincloth + neck: CP14ModularSkeletonHalberd + shoes: CP14ClothingShoesSandals + +- type: startingGear + id: CP14MobSkeletonSwordT1 + equipment: + outerClothing: CP14ClothingOuterClothingBoneArmor + cloak: CP14ClothingCloakBone + pants: CP14ClothingPantsLoincloth + belt1: CP14ModularSkeletonSword + shoes: CP14ClothingShoesSandals + head: CP14ClothingHeadMetalHeadband + inhand: + - CP14BaseShield + +- type: startingGear + id: CP14MobSkeletonDodgerT1 + equipment: + mask: CP14ClothingMaskSinner + pants: CP14ClothingPantsLoincloth + belt1: CP14ModularIronDagger + belt2: CP14ModularIronDagger + +- type: startingGear + id: CP14MobSkeletonArcherT1 + equipment: + shirt: CP14ClothingWarriorsGarbDress + pants: CP14ClothingPantsLoincloth + neck: CP14BowCombat + belt1: CP14ClothingBeltQuiverCopperArrow + +# TIER 2 + +- type: startingGear + id: CP14MobSkeletonHalberdT2 + equipment: + outerClothing: CP14ClothingOuterClothingBoneArmorUpgrade + cloak: CP14ClothingCloakBone + mask: CP14ClothingMaskSteelMask + shirt: CP14ClothingWarriorsGarbDress + pants: CP14ClothingPantsLoincloth + neck: CP14ModularSkeletonHalberdUpgrade + shoes: CP14ClothingShoesSandals + +- type: startingGear + id: CP14MobSkeletonSwordT2 + equipment: + outerClothing: CP14ClothingOuterClothingBoneArmorUpgrade + cloak: CP14ClothingCloakBone + mask: CP14ClothingMaskSteelMask + pants: CP14ClothingPantsLoincloth + belt1: CP14ModularSkeletonSwordUpgrade + shoes: CP14ClothingShoesSandals + inhand: + - CP14BaseShield + +- type: startingGear + id: CP14MobSkeletonDodgerT2 + equipment: + outerClothing: CP14ClothingOuterClothingBoneArmor + mask: CP14ClothingMaskBoneHornedMask + pants: CP14ClothingPantsLoincloth + belt1: CP14ModularIronDaggerTundra + belt2: CP14ModularIronDaggerAgony + shoes: CP14ClothingShoesSandals + +- type: startingGear + id: CP14MobSkeletonArcherT2 + equipment: + head: CP14ClothingHeadHuntersHat + mask: CP14ClothingMaskNeckerchief + shirt: CP14ClothingShirtCottonBlack + pants: CP14ClothingPantsBrown + neck: CP14BowCombat + belt1: CP14ClothingBeltQuiverIronArrow + belt2: CP14ModularSkeletonSword + shoes: CP14LongLeatherBoots + +- type: startingGear + id: CP14MobSkeletonWizardT2 + equipment: + outerClothing: CP14ClothingOuterClothingBoneArmor + cloak: CP14ClothingCloakBoneMage + head: CP14ClothingHeadTriangularHatGolden + shirt: CP14ClothingShirtCottonBlack + pants: CP14ClothingPantsBrown + shoes: CP14LongLeatherBoots + ring2: CP14ClothingCloakAmuletMana + belt1: CP14ModularSkeletonSword + inhand: + - CP14ManaOperationGlove + +- type: startingGear + id: CP14MobSkeletonBardT2 + equipment: + head: CP14ClothingHeadBeretMercenary + shirt: CP14ClothingShirtMercenary + pants: CP14ClothingPantsMercenaryTrousers + shoes: CP14ClothingShoesAristocraticBlack + neck: SkeletonGuitarInstrument \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml index 043f60e713..ea2409dedf 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml @@ -14,64 +14,4 @@ equipment: pants: CP14ClothingPantsTrouserDarkBlue shoes: CP14ClothingShoesSandals - mask: CP14ClothingMaskSinner - -- type: startingGear - id: CP14MobSkeletonHalberd - equipment: - outerClothing: CP14ClothingOuterClothingBoneArmor - shirt: CP14ClothingWarriorsGarbDress - pants: CP14ClothingPantsLoincloth - neck: CP14ModularSkeletonHalberd - shoes: CP14ClothingShoesSandals - -- type: startingGear - id: CP14MobSkeletonSword - equipment: - outerClothing: CP14ClothingOuterClothingBoneArmor - pants: CP14ClothingPantsLoincloth - belt1: CP14ModularSkeletonSword - shoes: CP14ClothingShoesSandals - head: CP14ClothingHeadMetalHeadband - inhand: - - CP14BaseShield - -- type: startingGear - id: CP14MobSkeletonDodger - equipment: - mask: CP14ClothingMaskSinner - pants: CP14ClothingPantsLoincloth - belt1: CP14ModularIronDagger - belt2: CP14ModularIronDagger - -- type: startingGear - id: CP14MobSkeletonArcher - equipment: - shirt: CP14ClothingWarriorsGarbDress - pants: CP14ClothingPantsLoincloth - neck: CP14BowCombat - belt1: CP14ClothingBeltQuiverCopperArrow - -- type: startingGear - id: CP14MobSkeletonWizard - equipment: - head: CP14ClothingHeadTriangularHat - shirt: CP14ClothingShirtCottonBlack - pants: CP14ClothingPantsBrown - shoes: CP14LongLeatherBoots - cloak: CP14ClothingCloakWhite - inhand: - - CP14ManaOperationGlove - -- type: startingGear - id: CP14MobSkeletonBard - equipment: - shirt: CP14ClothingShirtMercenary - pants: CP14ClothingPantsMercenaryTrousers - shoes: CP14ClothingShoesAristocraticBlack - neck: SkeletonGuitarInstrument - -- type: startingGear - id: CP14MobSkeletonCloset - equipment: - pants: CP14ClothingPantsLoincloth \ No newline at end of file + mask: CP14ClothingMaskSinner \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index d1fd8ac047..803c2c5356 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -73,10 +73,10 @@ maxGroupSize: 3 - type: cp14DemiplaneModifier - id: EnemySkeleton + id: EnemySkeletonT1 levels: min: 3 - max: 10 + max: 5 name: cp14-modifier-skeleton generationWeight: 1.5 generationProb: 0.5 @@ -84,7 +84,7 @@ GhostRoleDanger: 1 layers: - !type:OreDunGen - entity: CP14SpawnPointGhostDemiplaneSkeleton + entity: CP14SpawnPointGhostDemiplaneSkeletonT1 count: 1 minGroupSize: 1 maxGroupSize: 3 @@ -260,3 +260,40 @@ count: 8 minGroupSize: 2 maxGroupSize: 3 + +- type: cp14DemiplaneModifier + id: EnemySkeletonT2 + levels: + min: 6 + max: 10 + name: cp14-modifier-skeleton + generationWeight: 2.0 + categories: + Danger: 0.5 + layers: + - !type:OreDunGen + entity: CP14SpawnPointGhostDemiplaneSkeletonT2 + count: 1 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + entity: CP14SpawnPointGhostDemiplaneSkeletonMagicalT2 + count: 1 + minGroupSize: 0 + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: EnemySkeletonHidenT1 + levels: + min: 6 + max: 10 + name: cp14-modifier-skeleton + generationWeight: 1.0 + categories: + Danger: 0.25 + layers: + - !type:OreDunGen + entity: CP14SpawnPointGhostDemiplaneSkeletonT1 + count: 1 + minGroupSize: 1 + maxGroupSize: 2 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..60dde686856e90e98e5867b151c690daccf97d8a GIT binary patch literal 580 zcmV-K0=xZ*P)Px${z*hZR9J=WS37RPKoFe`5j8C)0&4dl3mWGF93Xcf4WgpJE~pSqxCsqyEF@ck zO8^q)4m3_R$#~h%ED$M0o`k%{yE|{*e7pwu$DQbm#?#JdJiT@O6W2(0IVo;6VuIip z7wu|<_uJvjy5`|BPe~AEi;kueYz27b7vFaJk2^q4{ z&S*T9_n}ZKpfbQQ4gla9`@N{YO~({S+LTiz0$6g*K^;W98krWh-dmAsEW@VQ zl>*H{y>vxj9MRL`>ioSq9lQ34D+0&WxpXy=kU@=e)hrRf5;}YwqGErERM|`aqdB13 zT&E_5Q7&X{DkI%|s=#q|2AxCJDxmUpmy^QQB{3H`Y61W}TiyEEG?vFY;|Pv&>^?v} zx2fRrE-@0&d7#T`Y)H1+FYU#dgzZ({T+V*^*~3DB^)1@fQp+`Y%2h#2K$dtroQdsl zCR8NQn5+mV7qlUuva6(&k7@`xOt#is(LM0|07R`4idrS~`~Vuge%R>s!#qn90DwG8 z6P#1>NV@m@0C0^Hfkv+%;$}z$$=FE9gih;?HW{t0n8w%i#?yrap$mo6u^dU5;z|>b zlMC7qAo46tPU}tV`2k=Bm|~h|Y4Y;+`pM0OU-`(;oeNbeuwF*4(47zdB)$ME>`f71 SrRbml0000Px$y-7qtR9J=WSG#V5FciIRBmN<+lrVRvs@f%AkUvQm#MA*ZFd-K5C;5Xetpq;- z85(u%QYi~vdg;aZfpHpj=#e5wFh1u#eCz<60YMnWs%ICr6Wwl~T6al5U^e8;_c(qp zH|eN%Y4lZ|CF1kZ8L09sY3n1mAxBW*B4#!deMc~e!UdP&4?!5k*Y^*rx7U|v*U7PL zi}f5n-al7YH+LY;Yn1_<6hNO=TB5~z-d&rb8H^qDK$T~StXamA0|3yKvfmwgR}t13 zpunbNzQ^f3KCkjD3Bst0To#ytqoS%aE-!f6?*NOj}H;AXNxrYx997wfsw`9usd zKwZt26d@y51>{r$6=_=^xv3Px$8c9S!R9J=WR?7{8Fbs97P6C%O1Dh}bhG1db`82i}FB z@Uvg+mjGN0lZvR#i>^eh>3KA!cgxfyOJK+>`tPcBHjh*Z0KBW_SAc{|aJd4!>d_m96i|_K9U`2z#BJi`~_YMV4lKD%7eoI00001voBBlSy{e5{n8o69Xihb5rNWjSM%Wz)K;f@TIk7AH6eKU{F4ZHiUbD?Wvzfr}GF gdYS?axH=daw3f8yzm;O_1v;3))78&qol`;+0M~n2kpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..af27e74ddcd4a79a18fa7ec7741c3afde6b7882e GIT binary patch literal 1018 zcmVPx&v`IukRCt{2n!k$^X&A@9Z<<*U$xLxO(c)gx%s((Bwn1b;&}I*Ei(qlL;K6a# z*4JOPVWaWDCQ4O=h@aCS9h9mdhN^V^TnB9L?up*vdn35+`!4bU%pB$-ybKCJD~fb0igXwRrR!sETo(BTG{RVTf2t zefQ5l7S04pe~SD#&r$b%)I1Ndl)4o~I+jvTivl&z!=*+8X_jH4waL_p))?n`Wf{)( z&Z|fJ`tidT`1Q`uxcA^W0GLdemj$HoL~Cpafl-nii@x%WS86^q+EeiaTBuk~f ztw+uCPCbK88onWfDFGMbfs#Ye)UQ$^OHj#fSkM@7h&!ha31(@bR=A_=kFH# zY+x9MVHk#C7=~dOhG7_Hba$U6{j{RUxjkR$fbHEqp@s_6qBs}7 zz*5&(4OQiA0I)!7?AGm@rdzvg6Jp)OQtBWKaeb?eXHQ={=~=meQr~WjuF{EF7j~=6 z*0rjQSNf9bh~@);Stm9O0*sOb07~Zt*3HQY5$X;TzyG!a*_0@oPN`JfPJeqi;r{)< zaOamjBlv4(1x1?zVRx;mRld{Raw-GoGav{!#b$FkYnI?*vuSjps8i%eNrGunAP7UJy__6ClU6jX zk)YZ4qF+T)>^9&2WVpK oTkF9v48t%C!!QiPFwFVkKVe5!%WSy|wg3PC07*qoM6N<$f~Y*}jsO4v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a825ab00ffe7fefb51ba4bd511c7f425bd9df1ca GIT binary patch literal 578 zcmV-I0=@l-P)Px${7FPXR9J=Wlrd=3U=+uHISei5kjs!uJq|(~ZtD~}7J`GDi=s%uN!*-tb#%3p z2o9YDk%M+|C=@9-x7_4XIy6K&G~AGU%ZF)bK8L#t%3X5Tf;gDp_`UDF|NnjOB~VjS z^S`6rG|}sJRa4iIS;p}E{Kj<}Wr5-0t|}AuY+C`yECXQEb(PocsztfiG7tvgOrdGl z=sHZq$ugvrT&5|TuB(QJyDALAW%a8^@b1k^<+^wI@bL>GNyw$7sq087XYMweO{A1; zy?D&)x9^u8N#(_jUQa!Ja-aQ!qv9+MtGjC$21cueND_`uPZt^~9l@0SgCpW7LL>u4mh-VHit&f`5gLUhi5jP*YP=Q}fUH1u%Q%uha~} QXaE2J07*qoM6N<$f}Gq9E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json new file mode 100644 index 0000000000..2124f3278a --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by perzonaz (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..da50be7e9ff3c6ac56f9b4595f68ee30aad3887a GIT binary patch literal 1481 zcmV;)1vdJLP)Px)gGod|RCt{2noVdMM-<2ZBMNJ1jdl<9IyrQa4SVdNiX3Qr2q6SYno9z~6hvra z>Jm~)-9thXN-2esL)sXZ;Dk~)80-?7UW^I(z}6wjLAH9xDHv?Ay;w^RJDd36y=Zz+ z-msD_X;vSVP4@?8zh>us&PeimKuk`2sm;1nJC^0AQ-k+E$h zhlIzq!OG9qXWr|2{sU)KSr&P}k~(y|ns)O8j404fes5#9(2K*qL3 z#b^tc0l;%z6dZ>E zl}MzIo^B|s*_=M-C003}ca1a3CdLELxjy}e)Ed(Cr^9|+hngNBSyCQ8_ z(wJK_KY|1;EZ*NW73sduIXu^eVVX!=mbiB1LgY-K^ry)CoFl30NN5_;mL)Q_Ez*`H z%0YmHrs2TgAY9MGwh%H?w}pVud24$>`sitP`I|4$#~99!kK*E`t1wIx|eFiaDDtm62uzWGM?=Kz3m z5TIG+)qR+@ENPTsnsQRpFyMNg95?glAK?BLu3Y{a8_%EP%~uiGES2z25a91psio8p z>p_OrLYYDIF(#c6UV@FNy9vtm>p0AFT_knA%J|n09>mJp8sq*J^yC{=?>=)J6dZ@O zYdpy>2LXJ}Wf15{#?y7!c-pg?p`;*X17$)|*YPNyXGe}45d#AQ0DwDp?#Q{`8XOdz zFn%{30O0oG0?wW|Dc3$h`;`tYvbM&0VLb3^De{-{dU9^Q>iO-(1%#ig63GF30q$?1=xhQ2ewz7BM!!|| zl>^o{iU0sZ@2|Q~*+9>uu&*2dU`LvNd*fDH^X)qa5abBT2JUaQG>@_au1`%X{Tfpp z7nSQ%)8f!OZ&%$TC(v2@$zRCcPzierpH$vF~h5Twq$3nBn3$NDn3$ND|2_M;Pe4WYroRTm zW$MnT)qOIytz4dO>VQ+{CYV!nDuu>Sb!M+ZRb!{XS-0VVo#Ze+-+ajT9Sbn$ypL1EG@76y*TjBcDw4f@o&pDPKt{|alN^La_ zJw)s1#?9a5J)d)!h9T?r2~F!stq|DRAyV5XaDIFgR?2GFBhXawaQaha*ykM6(?8(T zk0+$y+V+)hLeZu`gsaw6Djz*_Txl6JT>=HiVRN$!04mK9KIa%ca~u~hT}49Euq_0r zf$6_k79_(o3~UP_E5u|x>C&-10I2i@c&;nc{@#PU6bb;Fr4ss6sjmG?JWL_KivCne z>OzK7srcoE&Ahy=k4k?IdIU^>EG*s^kDok^?0lu_uqrpFf9-0KvR;+A9h8;L zX2-<%XP?N93@S3rb5orlf8%oqBgl-dVpdcMpi4?u?2Gi@v j*Rq#&i;0Pe*|Yo$cv&m9k)f;z00000NkvXXu0mjf@b1O3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bb7f347f5c1828cbeebc03088f041628a048b69b GIT binary patch literal 788 zcmV+v1MB>WP)Px%&PhZ;R9J=WR!wLVQ4sz%7#mXC%^sRIe7_zW{EU4OAdLjHV-#}eIAmH&CmWMwWszw?arH- z@0*!7@PJdC;-o|9HBgJkc{msZt5%WP-R(I~!08~BT;oo}nk;hwVAU!BU_w>77LRkU z*scWR^jupayJ`f3K%E@bDi~v^m?kDvm8X(xJg4XU^1F}V+3XBg)iJzy`3{s2Sd1YY z41zJ%<{J)&!5G8z{abkajUmnv5Jgy~iK1!Z zXQAMF56*Nl+KM$r;lJ{ENU>NOd4DX1a@j&a9Bzv@_V+!BT|00X7lwxT*>D)Zzt)P8 z2q+JszdwLzGztKio0|op2Y5Jj14TjbEx>aNeiVyBg)vm>yDvr}FmxRNP%c~0^#Vpm z$D3m0!9hRV031fpNdy2qO}yc%GJ-^66 z-vV6;0BY?AfPsN?P4?FRZs2PTfm(HbNL&59;Hv|6TX(X$@0000__e`dB>4LWLGbW>?ZsglhHp1*nfw@e2HZNO~44p@KabqDzO ztKhHicYxiDn1B4B4d}EJ7kqtr<*xgW!+088LvTLuw+;x;{}ft8H%(2ao#6DxFZbR- zzh`Fi9OLOUc)i$s|53EvS4aN4k!fuvqhaMgz3*B#O+W63Cn6#uA|fIpA|fK9V9`fO zgMQEW=XCy2SsiwjA2cDd8LmV@iGoOiI*+I_tzYHGOn-*}fv3Zk9h9(aApp$Jv$IM& zA=BD)Prd_yn^7n;oDsDFn-d!Lgtji%mscATB0%hL#!fq6e0~vCL?}Ct@XtEnez`=e z`LY9UZtrlvTt*cUnmsC0e@Cqs{k+EU{btDfMIb&Y%WGF5JS}fK>kcFX2tWlG6b8O01CaF zSJj=)2$19D97&|R(Z#;pL@+=h;hs>0M8qrj@tz##&nRXlWH|}yAmGYa2)Q6xC?(0g zkiRx2L1%p!i=>bx93Cm$&;LUOz-T$G1A6FVL0mU*3p%Rb_q0o<{;K;w` z|1UVfy$YWN@=!y0;>;Cu4 z4xC3+_4yUEG~kx{B)0 zJugz(UPHcpw%cQ{TFI6aP5Ru5-umW{nEDU7;!7S=aCdC5Fk1b@;_TDm{_-tiPNsz= z+;B&iT9tR{##>F)^>W8dozbrLnvLF`m+o}%WPgF}aQe*IwC?sFTi#(Y(KS%`sMMmp zM%{3C9?TxS0D?{T2X-29HD0|}w6d}{R)se%ORW-b+)$3o` zhc1&lI)gjaZ}(>@)_mBWy~yflYt#^Z>^$E-%w}h5&?q+WhMj+Y|GV|=U+}jg2AOk{ zi+D}P6I6>^+`31e877WXdwOS;#u7B?M}nX^7@PDxZ; zPqN)sk3OtAr*-YIF!o7|MLhl4Tykg@8%W;y&c&j|+MDo7)5a}>4@&aam-bstKS;5u zGS6I$$(u|4|F>j?*jmf&#NR@Lhn8KgM`P>=4P^u7I!xD`ph@ls9|N1ISw50V%v48M~e&z}7WfaiYQ*5jOk(?(TS#@>A+? z^B(4lBc`=F|J-q)3E7kS<6rACoIf#&a?IRV@%`l{Zwiu`(F0@`XDJQ;ym{YjL8aAM zvVLIo-8+=?1#s>G@3kiPoHcNC4W>1%WY)EC1)5Ca=UNSx`V5|`}=6yQP*N<8z|_jux6y* zN)C-Q#W8iBQ+{?RWs4EAJ2c^bbi1z)(VJx zeDP10HvXd0ymp09IT^vk!qao@uiB-;)B6UL22kwDaOm1WW3(eJaH1|oMZ;Rn^HAk= zK#{}6>ZE6D6FS|6AC~&>M7?1-<(O)-9%L|J*?X=Gv0#VIuGP2xLBV;{f3V*&uLci$ S40r1PErCZv{F;5@a{dbom;E>Z diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png index 5abbd5774a5e174ab19fea5da8d0128884dfb510..de1691fd2e4eaa61818701fdbd96591d959bf191 100644 GIT binary patch delta 220 zcmV<203-jv2!#TWF@L{FL_t(oh3%6u4gw(%MSo%85ws%15sU{=OKz||<(6A=1-yZ^ zou#KR9sxq-9>ES9*xkg91|!|PYM2k1pPvC>7=~dA=(LX3v~f> zJ`Na%jtNZlDh9S2`6U71e6468?*ITymoT4y*@0pjrQW`xHEnE^D*l2D!!QiP0Kf~A WsYeWjH@u7h0000!lvI6;>1s;*b3=Dh+L6~vJ#O${~4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bfQL22q#Lk&u2+GY#Ec6v7Wc_vCJ+@ z*(PsCSrH~H4X@}IDoP%O7Y-imdvuM@)n#H+fJSI$yOoGl$n&f@-t98#tkPCb_B~yE z{lagVS=N)Xi+PWptv>d>`u_Lt)%)uwOq}>}|735rUq@GlObOFah}O;8z5DsQ$^L9g zS+ljZBp2(xnX!y%!dfwgA;Y zczsXbs*mjEk@s(OCHv~v?%K0%@pLba`_GS`^UJEg)TfYCo7|nYxbZ`6%ll%9whLlj zmo(+r9A*6FQq^sFEvAWzKV@g*XjKqly1b2%qxFSPf9Db2%SSe@F@Ar9lX*3Fu~t!z z)UiTm#XfaCF~NQPiIFEa>G524`C&IXcza>qozr(~f2?^PIA_;}T?Wfzwx7H7DBP{B zJ=0|NjJAV~K_bPLQfJfVNOK)LeO-S>e9Yo~d(SQidQv*qfa3-~Q{DTwb5{vY-1Q=2 z+M^d7i(}Yc2Wz9Fk^?^n5j bfK)x>kA-|0s*}7sK-t*S)z4*}Q$iB}GpD#I