diff --git a/Resources/Audio/_CP14/Animals/attributions.yml b/Resources/Audio/_CP14/Animals/attributions.yml index d60ee0e01e..05a9abd3d4 100644 --- a/Resources/Audio/_CP14/Animals/attributions.yml +++ b/Resources/Audio/_CP14/Animals/attributions.yml @@ -2,42 +2,42 @@ license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl2.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl3.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl4.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl5.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl6.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl7.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl8.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/Benboncan/sounds/64544/" - + - files: ["owl9.ogg"] license: "CC-BY-4.0" copyright: 'by Benboncan of Freesound.org. Cropped and mixed from stereo to mono.' @@ -73,7 +73,53 @@ copyright: 'by muckypete7 of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/mucky_pete7/sounds/574208/" +- files: ["fairy1.ogg"] + license: "CC-BY-NC-3.0" + copyright: 'By BristolStories offreesound.org. Cropped and mixed from stereo to mono' + source: "https://freesound.org/people/BristolStories/sounds/51694/" + +- files: ["fairy2.ogg"] + license: "CC-BY-NC-3.0" + copyright: 'By BristolStories offreesound.org. Cropped and mixed from stereo to mono' + source: "https://freesound.org/people/BristolStories/sounds/51698/" + +- files: ["fairy3.ogg"] + license: "CC-BY-NC-3.0" + copyright: 'By BristolStories offreesound.org. Cropped and mixed from stereo to mono' + source: "https://freesound.org/people/BristolStories/sounds/51708/" + +- files: ["fairy4.ogg"] + license: "CC-BY-NC-3.0" + copyright: 'By BristolStories offreesound.org. Cropped and mixed from stereo to mono' + source: "https://freesound.org/people/BristolStories/sounds/51709/" + +- files: ["fairy5.ogg"] + license: "CC-BY-NC-3.0" + copyright: 'By BristolStories offreesound.org. Cropped and mixed from stereo to mono' + source: "https://freesound.org/people/BristolStories/sounds/51711/" + +- files: ["Fairy6.ogg"] + license: "CC-BY-4.0" + copyright: 'By jorickhoofd offreesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/jorickhoofd/sounds/170623/" + +- files: ["fairy_cry.ogg"] #The file consists of 3 sounds + license: "CC-BY-NC-3.0" + copyright: 'By BristolStories offreesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/BristolStories/sounds/51714/" + +- files: ["fairy_cry.ogg"] #The file consists of 3 sounds + license: "CC0-1.0" + copyright: 'By JalynCatbtg offreesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/JalynCatbtg/sounds/618193/" + +- files: ["fairy_cry.ogg"] #The file consists of 3 sounds + license: "CC0-1.0" + copyright: 'By RG2Cents offreesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/RG2Cents/sounds/726867/" + - files: ["bear1.ogg, bear2.ogg"] license: "CC0-1.0" copyright: 'by husky70 of Freesound.org. Cropped and mixed from stereo to mono.' source: "https://freesound.org/people/husky70/sounds/170454/" + diff --git a/Resources/Audio/_CP14/Animals/fairy1.ogg b/Resources/Audio/_CP14/Animals/fairy1.ogg new file mode 100644 index 0000000000..db8171646e Binary files /dev/null and b/Resources/Audio/_CP14/Animals/fairy1.ogg differ diff --git a/Resources/Audio/_CP14/Animals/fairy2.ogg b/Resources/Audio/_CP14/Animals/fairy2.ogg new file mode 100644 index 0000000000..1fe05f8451 Binary files /dev/null and b/Resources/Audio/_CP14/Animals/fairy2.ogg differ diff --git a/Resources/Audio/_CP14/Animals/fairy3.ogg b/Resources/Audio/_CP14/Animals/fairy3.ogg new file mode 100644 index 0000000000..b50ac67da1 Binary files /dev/null and b/Resources/Audio/_CP14/Animals/fairy3.ogg differ diff --git a/Resources/Audio/_CP14/Animals/fairy4.ogg b/Resources/Audio/_CP14/Animals/fairy4.ogg new file mode 100644 index 0000000000..7a2ada3fbb Binary files /dev/null and b/Resources/Audio/_CP14/Animals/fairy4.ogg differ diff --git a/Resources/Audio/_CP14/Animals/fairy5.ogg b/Resources/Audio/_CP14/Animals/fairy5.ogg new file mode 100644 index 0000000000..4916f2c0e6 Binary files /dev/null and b/Resources/Audio/_CP14/Animals/fairy5.ogg differ diff --git a/Resources/Audio/_CP14/Animals/fairy6.ogg b/Resources/Audio/_CP14/Animals/fairy6.ogg new file mode 100644 index 0000000000..ab37ca7d1d Binary files /dev/null and b/Resources/Audio/_CP14/Animals/fairy6.ogg differ diff --git a/Resources/Audio/_CP14/Effects/fairy_cry.ogg b/Resources/Audio/_CP14/Effects/fairy_cry.ogg new file mode 100644 index 0000000000..355348a814 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/fairy_cry.ogg differ diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml index 33ecff8d8e..d901498a5b 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml @@ -205,6 +205,23 @@ prototypes: - CP14MobMonsterFlem +- type: entity + name: fairy spawner + id: CP14SpawnMobFairy + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - sprite: Markers/cross.rsi + state: green + - sprite: _CP14/Mobs/Animals/fairy.rsi + state: fairy + color: "#42AAFF" + - type: ConditionalSpawner + prototypes: + - CP14MobFairy + - type: entity name: big bear spawner id: CP14SpawnMobBigBear diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/fairy.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/fairy.yml new file mode 100644 index 0000000000..572f0852dc --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/fairy.yml @@ -0,0 +1,130 @@ +- type: entity + name: fairy + parent: CP14SimpleMobBase + id: CP14MobFairy + description: It glows, squeaks and considers itself very important. It seems that ordinary weapons are incapable of killing her, and only the dissipation of magic will help. + categories: [ ForkFiltered ] + components: + - type: MovementSpeedModifier + baseWalkSpeed : 2 + baseSprintSpeed : 6 + - type: Sprite + drawdepth: Mobs + color: "#42AAFF" + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: fairy + sprite: _CP14/Mobs/Animals/fairy.rsi + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 7.5 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: MobState + - type: MobThresholds + thresholds: + 0: Alive + 10: Dead + - type: DamageStateVisuals + states: + Alive: + Base: fairy + Dead: + Base: dead + - type: Bloodstream + bloodReagent: CP14BloodAnimal + bloodMaxVolume: 0.1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/_CP14/Effects/fairy_cry.ogg + params: + volume: -2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PointLight + color: "#42AAFF" + radius: 1.35 + - type: SpamEmitSound + minInterval: 1 + maxInterval: 4 + sound: + collection: CP14Fairy + params: + volume: -8 + variation: 0.125 + pitch: 1.1 + - type: SoundWhileAlive + - type: CP14MagicCasterSlowdown + - type: CP14MagicEnergyContainer + magicAlert: CP14MagicEnergy + maxEnergy: 300 + energy: 1 + unsafeSupport: true + - type: CP14MagicEnergyDraw + energy: -10 + delay: 5 + safe: true # infinity mana sucking + - type: CP14MagicUnsafeDamage + - type: HTN + rootTask: + task: CP14ApproachEnemyCompound + blackboard: + VisionRadius: !type:Single + 5 + AggroVisionRadius: !type:Single + 5 + - type: NpcFactionMember + factions: + - CP14Monster + - type: NPCUseActionOnTarget + actionId: CP14ActionFairyManaConsume + - type: Damageable + damageContainer: CP14Spectral + + +- type: entity + id: CP14ActionFairyManaConsume + name: Fairy Mana consume + description: You absorb a small amount of mana from the target. + components: + - type: Sprite + sprite: _CP14/Actions/Spells/meta.rsi + state: mana_consume + - type: CP14MagicEffect + telegraphyEffects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectManaConsume + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectManaConsume + - !type:CP14SpellConsumeManaEffect + safe: false + mana: 0.5 + - type: Action + icon: + sprite: _CP14/Actions/Spells/meta.rsi + state: mana_consume + - type: TargetAction + - type: EntityTargetAction + whitelist: + components: + - CP14MagicEnergyContainer + event: !type:CP14ToggleableEntityTargetActionEvent + cooldown: 5 + castTime: 10 + breakOnMove: false + hidden: true diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index 876398d61b..9ce21ba523 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -55,6 +55,22 @@ minGroupSize: 2 maxGroupSize: 6 +- type: cp14DemiplaneModifier + id: Fairy + levels: + min: 2 + max: 5 + categories: + Danger: 0.20 + requiredTags: + - CP14DemiplaneHerbals + layers: + - !type:CP14OreDunGen + entity: CP14MobFairy + count: 4 + minGroupSize: 2 + maxGroupSize: 3 + - type: cp14DemiplaneModifier id: SmallHydra levels: diff --git a/Resources/Prototypes/_CP14/SoundCollections/animals.yml b/Resources/Prototypes/_CP14/SoundCollections/animals.yml index 247f8dbcb9..945c01f338 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/animals.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/animals.yml @@ -20,6 +20,16 @@ - /Audio/_CP14/Animals/flem3.ogg - /Audio/_CP14/Effects/bubbles.ogg +- type: soundCollection + id: CP14Fairy + files: + - /Audio/_CP14/Animals/fairy1.ogg + - /Audio/_CP14/Animals/fairy2.ogg + - /Audio/_CP14/Animals/fairy3.ogg + - /Audio/_CP14/Animals/fairy4.ogg + - /Audio/_CP14/Animals/fairy5.ogg + - /Audio/_CP14/Animals/fairy6.ogg + - type: soundCollection id: CP14Bear files: diff --git a/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/dead.png new file mode 100644 index 0000000000..fd6ce06c7e Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/dead.png differ diff --git a/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/fairy.png b/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/fairy.png new file mode 100644 index 0000000000..14a6b28058 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/fairy.png differ diff --git a/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/meta.json new file mode 100644 index 0000000000..b32d71ff86 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Animals/fairy.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Modified by Tudi", + "states": [ + { + "name": "dead", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "fairy", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +}