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 0000000000..60dde68685 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/dead_heal_ballade.png b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/dead_heal_ballade.png new file mode 100644 index 0000000000..7d7662ecb8 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/dead_heal_ballade.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json index a5593df1a7..485d0522ee 100644 --- a/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json +++ b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json @@ -9,6 +9,12 @@ "states": [ { "name": "resurrection" + }, + { + "name": "cure_dead" + }, + { + "name": "dead_heal_ballade" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick_skull.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick_skull.png new file mode 100644 index 0000000000..04bdab4c52 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick_skull.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json index d75e4ce1c1..968e8fd278 100644 --- a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json +++ b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json @@ -12,6 +12,12 @@ }, { "name": "sprint" + }, + { + "name": "sprint_skull" + }, + { + "name": "kick_skull" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint_skull.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint_skull.png new file mode 100644 index 0000000000..62a38951fb Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint_skull.png differ 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 0000000000..af27e74ddc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/equipped-CLOAK.png differ 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 0000000000..a825ab00ff Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/bone_cloak.rsi/icon.png differ 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 0000000000..da50be7e9f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/equipped-CLOAK.png differ 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 0000000000..bb7f347f5c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_cloak.rsi/meta.json new file mode 100644 index 0000000000..2124f3278a --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/bone_mage_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/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png index d13b5c5b84..d0de06dc92 100644 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png differ 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 5abbd5774a..de1691fd2e 100644 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png differ