diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index c87ca6a983..7f30df98d8 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -42,6 +42,17 @@ - id: CP14ModularIronArrow amount: 16 +- type: entity + parent: CP14ClothingBeltQuiver + id: CP14ClothingBeltQuiverCopperArrow + categories: [ ForkFiltered ] + suffix: Full. Copper. Arrow + components: + - type: StorageFill + contents: + - id: CP14ModularCopperArrow + amount: 16 + - type: entity parent: CP14ClothingBeltQuiver id: CP14ClothingBeltQuiverMithrilArrow diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml index 8d3cadc6cb..488878a542 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml @@ -28,6 +28,29 @@ spells: - CP14ActionSpellIceShards +- type: entity + id: CP14ClothingRingSkeletonWizard + parent: CP14ClothingRingBase + name: skeleton wizard conductive ring + suffix: Skeleton, Unremoveable + description: A mana conuctive ring for the true wizards + categories: [ HideSpawnMenu ] + components: + - type: Unremoveable + - type: CP14SpellStorageRequireAttune + - type: CP14MagicAttuningItem + - type: CP14SpellStorageAccessWearing + - type: CP14SpellStorage + spells: + - CP14ActionSpellIceShards + - CP14ActionSpellSphereOfLight + - CP14ActionSpellCureWounds + - CP14ActionSpellFlameCreation + - type: Sprite + layers: + - state: brass_ring + - state: berill_stone_small + - type: entity id: CP14ClothingRingFireball parent: CP14ClothingRingBase diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml index e36beb5584..5c7bc25e3c 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml @@ -1,22 +1,103 @@ - type: entity - id: CP14MobUndeadSkeleton + id: CP14MobUndeadSkeletonHalberd 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. categories: [ ForkFiltered ] + suffix: Halebard components: - type: NpcFactionMember factions: - CP14Monster - type: Loadout prototypes: - - CP14MobSkeleton + - CP14MobSkeletonHalberd + +- type: entity + id: CP14MobUndeadSkeletonSword + parent: CP14MobUndeadSkeletonHalberd + name: skeleton + description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul. + categories: [ ForkFiltered ] + suffix: Sword + components: + - type: Loadout + prototypes: + - CP14MobSkeletonSword + +- type: entity + id: CP14MobUndeadSkeletonDodger + parent: CP14MobUndeadSkeletonHalberd + name: skeleton + description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul. + categories: [ ForkFiltered ] + suffix: Dodger + components: + - type: Loadout + prototypes: + - CP14MobSkeletonDodger + +- type: entity + id: CP14MobUndeadSkeletonArcher + parent: CP14MobUndeadSkeletonHalberd + name: skeleton + description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul. + categories: [ ForkFiltered ] + suffix: Archer + components: + - type: Loadout + prototypes: + - CP14MobSkeletonArcher + +- type: entity + id: CP14MobUndeadSkeletonWizard + parent: CP14MobUndeadSkeletonHalberd + name: skeleton + description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul. + categories: [ ForkFiltered ] + suffix: Wizard + components: + - type: Loadout + prototypes: + - CP14MobSkeletonWizard - type: entity id: SpawnPointGhostDemiplaneSkeleton name: ghost role spawn point description: A ghost role for a bloodthirsty and cunning skeleton. - suffix: skeleton + suffix: skeleton random + categories: [ ForkFiltered ] + parent: MarkerBase + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 10 + children: + - id: SpawnPointGhostDemiplaneSkeletonWizard + - !type:GroupSelector + weight: 25 + children: + - id: SpawnPointGhostDemiplaneSkeletonHalberd + - !type:GroupSelector + weight: 60 + children: + - id: SpawnPointGhostDemiplaneSkeletonSword + - id: SpawnPointGhostDemiplaneSkeletonDodger + - id: SpawnPointGhostDemiplaneSkeletonArcher + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi + state: full + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonHalberd + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Halebard categories: [ ForkFiltered ] parent: MarkerBase components: @@ -30,10 +111,54 @@ raffle: settings: default - type: GhostRoleMobSpawner - prototype: CP14MobUndeadSkeleton + prototype: CP14MobUndeadSkeletonHalberd - type: Sprite sprite: Markers/jobs.rsi layers: - state: green - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi - state: full \ No newline at end of file + state: full + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonSword + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Sword + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberd + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonSword + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonDodger + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Dodger + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberd + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonDodger + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonArcher + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Archer + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberd + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonArcher + +- type: entity + id: SpawnPointGhostDemiplaneSkeletonWizard + name: ghost role spawn point + description: A ghost role for a bloodthirsty and cunning skeleton. + suffix: skeleton Wizard + categories: [ ForkFiltered ] + parent: SpawnPointGhostDemiplaneSkeletonHalberd + components: + - type: GhostRoleMobSpawner + prototype: CP14MobUndeadSkeletonWizard \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml index 47ffda7e2e..aaabeeb755 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml @@ -31,3 +31,20 @@ - type: CP14ModularCraftAutoAssemble details: - TipMithrilArrow + +- type: entity + id: CP14ModularCopperArrow + parent: CP14ModularRodLucens + name: copper arrow + description: It's the cheapest and weakest arrow you've ever seen, but it's better than nothing. + components: + - type: Sprite + layers: + - state: icon + - state: tail + - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi + state: icon + color: "#bd712f" + - type: CP14ModularCraftAutoAssemble + details: + - TipCopperArrow \ 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 d9c3c8bd76..c195226313 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml @@ -37,6 +37,21 @@ name: bone halberd 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 + +- type: entity + id: CP14ModularSkeletonSword + parent: CP14ModularGripWooden + name: bone sword + description: Monstrous weapons of bone. + components: - type: Sprite layers: - state: icon diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml index 1ded128f40..e7cfe0570f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml @@ -17,13 +17,56 @@ mask: CP14ClothingMaskSinner - type: startingGear - id: CP14MobSkeleton + id: CP14MobSkeletonHalberd equipment: + shirt: CP14ClothingWarriorsGarbDress pants: CP14ClothingPantsLoincloth neck: CP14ModularSkeletonHalberd + shoes: CP14ClothingShoesSandals inhand: - CP14TorchIgnited +- type: startingGear + id: CP14MobSkeletonSword + equipment: + pants: CP14ClothingPantsLoincloth + belt1: CP14ModularSkeletonSword + shoes: CP14ClothingShoesSandals + head: CP14ClothingHeadMetalHeadband + inhand: + - CP14TorchIgnited + +- type: startingGear + id: CP14MobSkeletonDodger + equipment: + mask: CP14ClothingMaskSinner + pants: CP14ClothingPantsLoincloth + belt1: CP14ModularIronDagger + belt2: CP14ModularIronDagger + inhand: + - CP14TorchIgnited + +- type: startingGear + id: CP14MobSkeletonArcher + equipment: + shirt: CP14ClothingWarriorsGarbDress + pants: CP14ClothingPantsLoincloth + neck: CP14BowCombat + belt1: CP14ClothingBeltQuiverCopperArrow + pocket1: CP14SpellScrollSphereOfLight + #inhand: + # - CP14SpellScrollSphereOfLight + +- type: startingGear + id: CP14MobSkeletonWizard + equipment: + head: CP14ClothingHeadTriangularHat + shirt: CP14ClothingShirtCottonBlack + pants: CP14ClothingPantsBrown + shoes: CP14LongLeatherBoots + cloak: CP14ClothingCloakWhite + ring2: CP14ClothingRingSkeletonWizard + - type: startingGear id: CP14MobSkeletonCloset equipment: