From 9dc730bc106458ad108cff6865d24d7d919214e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 00:51:33 +0300 Subject: [PATCH 01/34] Add spider queen antag --- .../SS220/Actions/Spider_actions.yml | 246 ++++++++ .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 550 ++++++++++++++++++ .../Entities/Objects/Consumable/Food/egg.yml | 25 + .../Objects/Materials/crystal_shard.yml | 23 + .../Entities/Objects/Misc/spider_eggs.yml | 145 +++++ .../Entities/Objects/Misc/spider_implants.yml | 124 ++++ .../Entities/Objects/Misc/spider_web.yml | 123 ++++ .../Weapons/Guns/Projectiles/projectiles.yml | 19 + .../Entities/Structures/Furniture/tables.yml | 55 ++ .../Structures/Specific/spider_structures.yml | 130 +++++ .../Entities/markers/Spawners/ghost_roles.yml | 24 + .../Prototypes/SS220/GameRules/events.yml | 16 + .../SS220/Shitspawn/Spider_Queen.yml | 7 + Resources/Prototypes/SS220/radio_channels.yml | 9 + 14 files changed, 1496 insertions(+) create mode 100644 Resources/Prototypes/SS220/Actions/Spider_actions.yml create mode 100644 Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml create mode 100644 Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml create mode 100644 Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml create mode 100644 Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml new file mode 100644 index 00000000000000..644fc06bc71451 --- /dev/null +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -0,0 +1,246 @@ +- type: entity + id: ActionSpawnMagicarpSpellSpider + name: spider-spawn-egg-guard + description: spider-spawn-egg-guard-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 200 + range: 1 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/eggspider.rsi + state: icon + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggDrone + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderHunter + name: spider-spawn-egg-hunt + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 300 #КД + range: 1 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/eggspider.rsi + state: icon + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggHunter + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderGhost + name: spider-spawn-egg-ghost + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 350 #КД + range: 1 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/eggspider.rsi + state: icon + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggGhost + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderShooter + name: spider-spawn-egg-shooter + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 380 + range: 1 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/eggspider.rsi + state: icon + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggShooter + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderCrystal + name: spider-spawn-kristal + description: spider-spawn-kristal-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 30 + range: 1 + itemIconStyle: BigAction + icon: + sprite: Structures/Decoration/crystal.rsi + state: crystal1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: ShardCrystalBlueXeno + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderLittle + name: spider-spawn-smallspider + description: spider-spawn-smallspider-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 40 + range: 2 + itemIconStyle: BigAction + icon: + sprite: Mobs/Animals/spider.rsi + state: viper_dead + event: !type:WorldSpawnSpellEvent + prototypes: + - id: MobSpiderSpaceLittle + amount: 3 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderWallWeb + name: spider-spawn-wall + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 8 + range: 1.5 + hungerCost: 15 + itemIconStyle: BigAction + icon: + sprite: Structures/Walls/web.rsi + state: full + useDelay: 30 + event: !type:WorldSpawnSpellEvent + useDelay: 25 + prototypes: + - id: FloorTileItemWebSpiders + doAfter: 5 + amount: 1 + useDelay: 25 + offset: 0, 1 + doAfter: 5 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderWallWeb2 + name: spider-spawn-wall3 + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 10 + range: 1.5 + hungerCost: 15 + itemIconStyle: BigAction + icon: + sprite: Structures/Walls/web.rsi + state: full + useDelay: 30 + event: !type:WorldSpawnSpellEvent + useDelay: 25 + prototypes: + - id: FloorTileItemWebSpiders2 + doAfter: 5 + amount: 1 + useDelay: 25 + offset: 0, 1 + doAfter: 5 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderSpiderWeb + name: spider-spawn-web + description: spider-spawn-web-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 2 #КД + range: 1.5 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebUsual + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderSpiderWebHunter + name: spider-spawn-web-hunt + description: spider-spawn-web-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 6 + range: 1.5 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWeb + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderSpiderWebQueen + name: spider-spawn-web-queen + description: spider-spawn-web-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 4 #КД + range: 1.5 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebQueen + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + id: ActionSpawnMagicarpSpellSpiderSpiderWebClown + name: spider-spawn-web-clown + description: spider-spawn-web-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 30 #КД + range: 1.3 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_clown_1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebClown + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml new file mode 100644 index 00000000000000..698a636c030791 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -0,0 +1,550 @@ +#Base +- type: entity + noSpawn: true + name: Probca + parent: + - MobAtmosStandard + - MobSpaceBasic + id: MobSpiderSpaceQueenBase + description: spider dance + components: + - type: Insulated + - type: CombatMode + - type: InputMover + - type: MobMover + - type: HTN + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1.3, 1.3 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: midwife-moving + - type: MobThresholds #HP + thresholds: + 0: Alive + 300: Dead + - type: Stamina + excess: 150 + - type: DamageStateVisuals + states: + Alive: + Base: midwife-moving + Dead: + Base: midwife_dead + - type: Butcherable + spawned: + - id: FoodMeatSpider + amount: 2 + - id: EggSpider + amount: 1 + prob: 0.5 + - type: Bloodstream + bloodMaxVolume: 250 + bloodReagent: Cryoxadone + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 120 + mask: + - MobMask + layer: + - MobLayer + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0. + animation: WeaponArcBite + damage: + types: + Piercing: 12 #Damage + Poison: 4 + Structural: 15 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate #Iad + Quantity: 60 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 3 + - type: InteractionPopup + successChance: 0.20 + interactSuccessString: petting-success-tarantula + interactFailureString: petting-failure-generic + - type: NoSlip + - type: IgnoreSpiderWeb + - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.Самолечение + allowedStates: + - Alive + damageCap: 300 + damage: + types: + Heat: -4.5 + groups: + Brute: -4.5 + Toxin: -7 + Airloss: -4.5 + Burn: -4.5 + - type: Tag + tags: + - CannotSuicide + - DoorBumpOpener + - type: Tool # Open door from xeno.yml. + speed: 1.5 + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: Prying + pryPowered: !type:Bool + true + force: !type:Bool + true + useSound: + path: /Audio/Items/crowbar.ogg + - type: Barotrauma #Damage + damage: + types: + Blunt: 1 + Heat: 1 + - type: Temperature #Damage + heatDamageThreshold: 325 + coldDamageThreshold: 260 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold: 0.1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat: 0.1 #per second, scales with temperature & other constants + - type: Speech #krik + speechVerb: Arachnid + speechSounds: Arachnid + - type: Vocal + sounds: + Male: UnisexArachnid + Female: UnisexArachnid + Unsexed: UnisexArachnid #krik + - type: PointLight + radius: 0 + energy: 0 + color: "#ff4242" + castShadows: false + - type: IntrinsicRadioReceiver + - type: IntrinsicRadioTransmitter + channels: + - HiveRadio + - type: ActiveRadio + channels: + - HiveRadio + +- type: entity + noSpawn: true + name: Ghost role + id: MobSpiderGhost + components: + - type: GhostRole #Ghost role + makeSentient: true + allowSpeech: true + allowMovement: true + requirements: + name: spider-roy-name + description: spider-roy-desc + - type: GhostTakeoverAvailable #Ghost role + +#Spider queen +- type: entity + name: Spider queen + id: MobSpiderSpaceQueen + parent: + - MobSpiderSpaceQueenBase + - MobSpiderGhost + description: spider dance + components: + - type: AutoImplant + implants: + - LightImplantSpiderHunter + - LightImplantSpiderWallWeb2 + - LightImplantSpider + - LightImplantSpiderGhost + - LightImplantSpiderCrystal + - LightImplantSpiderLittle + - LightImplantSpiderSpiderQueen + - LightImplantSpiderShooter + - type: Butcherable + spawned: + - id: FoodMeatSpider + amount: 3 + - id: MobSpiderSpaceLittle + amount: 7 + - type: Spider + webPrototype: SpiderWebAbility + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1.5 + - type: BasicEntityAmmoProvider + proto: PoisonousAcid + capacity: 2 + count: 2 + - type: Gun + fireRate: 1 + useKey: false + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4 + - type: LizardAccent + +#Spiders-servants +- type: entity + name: spider guard + id: MobSpiderSpaceDrone + parent: + - MobSpiderSpaceQueenBase + - MobSpiderGhost + description: spider dance + components: + - type: Sprite #Спрайт + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: guard-moving + - type: MobThresholds + thresholds: + 0: Alive + 85: Dead #HP + - type: Stamina + excess: 150 + - type: DamageStateVisuals + states: + Alive: + Base: guard-moving + Dead: + Base: guard_dead + - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. Самолечение + allowedStates: + - Alive + damageCap: 85 + damage: + types: + Heat: -4 + groups: + Brute: -4 + Toxin: -6 + Airloss: -4 + Burn: -4 + - type: MeleeWeapon #Damage + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 5 #Damage + Structural: 10 + - type: SolutionContainerManager #Iad + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + - type: AutoImplant + implants: + - LightImplantSpiderWallWeb + - LightImplantSpiderCrystal + - LightImplantSpiderSpider + - type: Spider + webPrototype: SpiderWebAbility + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.9 + +- type: entity + name: spider hunt + id: MobSpiderSpaceHunter + parent: + - MobSpiderSpaceQueenBase + - MobSpiderGhost + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: hunter-moving + - type: MobThresholds + thresholds: + 0: Alive + 110: Dead + - type: Stamina + excess: 150 + - type: DamageStateVisuals + states: + Alive: + Base: hunter-moving + Dead: + Base: hunter_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 110 + damage: + types: + Heat: -3 + groups: + Brute: -3 + Toxin: -6 + Airloss: -3 + Burn: -3 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 15 + Structural: 15 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + - type: Spider + webPrototype: SpiderWebAbility + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.9 + - type: AutoImplant + implants: + - LightImplantSpiderSpiderHunter + +- type: entity + name: spider ghost + id: MobSpiderSpaceGhost + parent: + - MobSpiderSpaceQueenBase + - MobSpiderGhost + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: nurse-moving + - type: MobThresholds + thresholds: + 0: Alive + 100: Dead + - type: Stamina + excess: 150 + - type: DamageStateVisuals + states: + Alive: + Base: nurse-moving + Dead: + Base: nurse_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 100 + damage: + types: + Heat: -3 + groups: + Brute: -3 + Toxin: -8 + Airloss: -3 + Burn: -3 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 3 + Poison: 4 + Structural: 10 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 20 + - type: Stealth + - type: StealthOnMove + passiveVisibilityRate: -0.37 + movementVisibilityRate: 0.35 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1.5 + - type: BasicEntityAmmoProvider + proto: PoisonousAcid + capacity: 1 + count: 1 + - type: Gun + fireRate: 0.75 + useKey: false + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MovementSpeedModifier + baseWalkSpeed : 1.5 + baseSprintSpeed : 3.9 + - type: AutoImplant + implants: + - LightImplantSpiderSpiderHunter + +- type: entity + name: spider shooter + id: MobSpiderSpaceShooter + parent: + - MobSpiderSpaceQueenBase + - MobSpiderGhost + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: viper-moving + - type: MobThresholds + thresholds: + 0: Alive + 80: Dead + - type: Stamina + excess: 150 + - type: DamageStateVisuals + states: + Alive: + Base: viper-moving + Dead: + Base: viper_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 80 + damage: + types: + Heat: -1.5 + groups: + Brute: -2.5 + Toxin: -5 + Airloss: -2.5 + Burn: -2.5 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Poison: 5 + Piercing: 2 + Structural: 5 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 35 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1.5 + - type: BasicEntityAmmoProvider + proto: PoisonousAcid + capacity: 3 + count: 3 + - type: Gun + fireRate: 4 + useKey: false + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: AutoImplant + implants: + - LightImplantSpiderSpiderClown + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.7 + +- type: entity + name: small spider + id: MobSpiderSpaceLittle + parent: MobSpiderSpaceQueenBase + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 0.4, 0.4 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: viper-moving + - type: MobThresholds + thresholds: + 0: Alive + 15: Dead + - type: Stamina + excess: 150 + - type: DamageStateVisuals + states: + Alive: + Base: viper-moving + Dead: + Base: viper_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 15 + damage: + types: + Heat: -0.5 + groups: + Brute: -0.5 + Toxin: -0.5 + Airloss: -0.5 + Burn: -0.5 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 5 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + - type: TimedDespawn + lifetime: 20 + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.5 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml new file mode 100644 index 00000000000000..53a0ee9c43ceae --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml @@ -0,0 +1,25 @@ +#Spiders eggs +- type: entity + name: eggshells + parent: Eggshells + id: EggshellsSpider + noSpawn: true + description: You're walkin' on 'em bud. + suffix: FraG + components: + - type: Sprite + sprite: Objects/Consumable/Food/egg.rsi + state: eggshells + shader: unshaded + color: gray + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: PoisonWine + Quantity: 1 + - type: Tag + tags: + - Egg + - Trash diff --git a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml new file mode 100644 index 00000000000000..448c05e2c1aa6a --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml @@ -0,0 +1,23 @@ +- type: entity + id: ShardCrystalBlueXeno + parent: ShardCrystalBlue + name: spider-spawn-crystal + description: spider-spawn-crystal-desc + noSpawn: true + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + MaterialWebSilk: + min: 0 + max: 0 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml new file mode 100644 index 00000000000000..c456679c925b99 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -0,0 +1,145 @@ +#Base +- type: entity + name: "item" + id: BaseItemSpider + abstract: true + components: + - type: Clickable + - type: InteractionOutline + - type: MovedByPressure + - type: EmitSoundOnCollide + sound: + path: /Audio/Effects/wall_bonk.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/drop.ogg + params: + volume: 2 + - type: DamageOnHighSpeedImpact + damage: + types: + Blunt: 5 + soundHit: + path: /Audio/Effects/hit_kick.ogg + - type: CollisionWake + - type: TileFrictionModifier + modifier: 0.5 + - type: Physics + bodyType: Dynamic + fixedRotation: false + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.3 # fite me + friction: 0.2 + - type: Pullable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + +#Spiders +- type: entity + parent: BaseItemSpider + id: SpiderEggHunter + noSpawn: true + name: the-egg-of-the-spider-guard + description: Is it a gemstone? Is it an egg? It looks expensive. + components: + - type: Sprite + sprite: Objects/Misc/eggspider.rsi + state: icon + - type: PointLight + radius: 1.5 + energy: 3 + color: "#4faffb" + - type: StaticPrice + price: 500 + - type: Barotrauma #Урон от разгермы + damage: + types: + Blunt: 0.1 + Heat: 0.1 + - type: DamageOnHighSpeedImpact + minimumSpeed: 0.1 + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:SpawnEntitiesBehavior + spawn: + EggshellsSpider: + min: 1 + max: 1 + # Wow double-yolk you're so lucky! + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: PoisonWine + Quantity: 10 + - type: TimedDespawn #Система цикла + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceHunter #Система цикла + +- type: entity + parent: SpiderEggHunter + id: SpiderEggDrone + noSpawn: true + name: spider hive egg + description: Is this a gem? Is this an egg? It looks expensive. + components: + - type: TimedDespawn + lifetime: 55 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceDrone + +- type: entity + parent: SpiderEggDrone + id: SpiderEggGhost + noSpawn: true + name: spider hive egg + description: Is this a gem? Is this an egg? It looks expensive. + components: + - type: TimedDespawn + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceGhost + +- type: entity + parent: SpiderEggDrone + id: SpiderEggShooter + noSpawn: true + name: spider hive egg + description: Is this a gem? Is this an egg? It looks expensive. + components: + - type: TimedDespawn + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceShooter diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml new file mode 100644 index 00000000000000..186c25ab224da9 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -0,0 +1,124 @@ +- type: entity + parent: BaseSubdermalImplant + id: LightImplantSpider + name: spider-spawn-egg-guard + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpider + - type: PointLight + enabled: false + radius: 2.5 + softness: 5 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + - type: Tag + tags: + - SubdermalImplant + - HideContextMenu + - Flashlight + - type: UnpoweredFlashlight + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderHunter + name: spider-spawn-egg-hunt + description: + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderHunter + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderGhost + name: spider-spawn-egg-ghost + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderGhost + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderShooter + name: spider-spawn-egg-shooter + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderShooter + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderCrystal + name: spider-spawn-kristal + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderCrystal + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderWallWeb + name: spider-spawn-wall + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderWallWeb + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderWallWeb2 + name: spider-spawn-wall2 + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderWallWeb2 + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderLittle + name: spider-spawn-smallspider + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderLittle + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderSpider + name: spider-spawn-web + description: spider-spawn-web-desc + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderSpiderWeb + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderSpiderHunter + name: spider-spawn-web-hunt + description: spider-spawn-web-desc + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderSpiderWebHunter + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderSpiderQueen + name: spider-spawn-web-queen + description: spider-spawn-web-desc + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderSpiderWebQueen + +- type: entity + parent: LightImplantSpider + id: LightImplantSpiderSpiderClown + name: spider-spawn-web-clown + description: spider-spawn-web-desc + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnMagicarpSpellSpiderSpiderWebClown diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml new file mode 100644 index 00000000000000..814f3712d21dde --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml @@ -0,0 +1,123 @@ +#Spider queen webs + +#Base +- type: entity + id: SpiderWebUsual + name: web + description: web + noSpawn: true + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/slash.ogg" + - type: Sprite + sprite: Objects/Misc/spiderweb.rsi + layers: + - state: spider_web_1 + map: ["spiderWebLayer"] + drawdepth: WallMountedItems + - type: Appearance + - type: GenericVisualizer + visuals: + enum.SpiderWebVisuals.Variant: + spiderWebLayer: + 1: {state: spider_web_1} + 2: {state: spider_web_2} + - type: Clickable + - type: Transform + anchored: true + - type: Physics + - type: Fixtures + fixtures: + fix1: + hard: false + density: 7 + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + layer: + - MidImpassable + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Temperature + heatDamage: + types: + Heat: 5 + coldDamage: {} + coldDamageThreshold: 0 + - type: Flammable + fireSpread: true + damage: + types: + Heat: 5 + - type: Reactive + groups: + Flammable: [Touch] + Extinguish: [Touch] + - type: SpiderWebObject + - type: SpeedModifierContacts + walkSpeedModifier: 0.25 + sprintSpeedModifier: 0.25 + ignoreWhitelist: + components: + - IgnoreSpiderWeb + +- type: entity + id: SpiderWebQueen + parent: SpiderWebUsual + name: web + description: web + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SpeedModifierContacts + walkSpeedModifier: 0.15 + sprintSpeedModifier: 0.15 + ignoreWhitelist: + components: + - IgnoreSpiderWeb + +- type: entity + id: SpiderWebAbility + parent: SpiderWebUsual + name: web + description: web + noSpawn: true + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: TimedDespawn + lifetime: 13 + - type: SpeedModifierContacts + walkSpeedModifier: 0.1 + sprintSpeedModifier: 0.1 + ignoreWhitelist: + components: + - IgnoreSpiderWeb + diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 919db404fb9417..1009e9dad8bff4 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -110,3 +110,22 @@ radius: 5.5 color: blue energy: 0.9 + +#Spider queen +- type: entity + id: PoisonousAcid + name: spider-split + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Poison: 6 + Structural: 2 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi + layers: + - state: xeno_toxic + - type: Ammo + muzzleFlash: null diff --git a/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml index 2f8c09d00c2e34..be2d2c3c40cb9f 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml @@ -179,3 +179,58 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepTile + +#Spider tables +- type: entity + id: TableWebSpiders + parent: TableBase + name: web + description: web + noSpawn: true + components: + - type: Damageable + damageModifierSet: Web + - type: Sprite + sprite: Structures/Furniture/Tables/web.rsi + - type: Icon + sprite: Structures/Furniture/Tables/web.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/slash.ogg" + - type: Construction + graph: WebStructures + node: table + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepCarpet + - type: TimedDespawn + lifetime: 5 + - type: SpawnOnDespawn + prototype: WallWeb + + +- type: entity + id: TableWebSpiders2 + parent: TableWebSpiders + name: web + description: web + noSpawn: true + components: + - type: TimedDespawn + lifetime: 8 + - type: SpawnOnDespawn + prototype: WallWebDurable + - type: Sprite + sprite: Structures/Furniture/Tables/web.rsi + shader: unshaded + color: gray diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml new file mode 100644 index 00000000000000..e9a2fee5533c00 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml @@ -0,0 +1,130 @@ +# AT THE BOTTOM IS A TILE MADE OF COBWEBS. +- type: entity + name: web construction + description: Very smooth and surprisingly durable. + parent: FloorTileItemBaseSpiders + id: FloorTileItemWebSpiders + noSpawn: true + components: + - type: Sprite + sprite: Objects/Tiles/web.rsi + state: icon + - type: FloorTile + outputs: + - FloorWebTile + - type: Construction + graph: WebObjects + node: tile + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: TimedDespawn + lifetime: 5 + - type: SpawnOnDespawn + prototype: TableWebSpiders + +- type: entity + parent: BaseItemSpider + id: FloorTileItemBaseSpiders + description: These could work as a pretty decent throwing weapon. + abstract: true + components: + - type: Sprite + sprite: Objects/Tiles/tile.rsi + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -8 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 5 + +- type: entity + name: web + description: Web + parent: FloorTileItemWebSpiders + id: FloorTileItemWebSpiders2 + noSpawn: true + components: + - type: TimedDespawn + lifetime: 6 + - type: SpawnOnDespawn + prototype: TableWebSpiders2 + - type: Sprite + sprite: Objects/Tiles/web.rsi + state: icon + shader: unshaded + color: gray + +- type: entity + parent: BaseWall + id: WallWebDurable + name: web + description: web + components: + - type: Clickable + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/slash.ogg" + - type: Damageable + damageModifierSet: Web + - type: Tag + tags: + - Wall + - type: Sprite + sprite: Structures/Walls/web.rsi + shader: unshaded + color: gray + - type: Icon + sprite: Structures/Walls/web.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 125 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + MaterialWebSilk: + min: 1 + max: 1 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - type: IconSmooth + key: webs + base: wall + - type: Construction + graph: WebStructures + node: wall diff --git a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml new file mode 100644 index 00000000000000..825d47ebd46dfe --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml @@ -0,0 +1,24 @@ +- type: entity + id: SpawnPointGhostSpaceQueen + name: спавнер роли королевы-пауков + suffix: паук-королева + parent: MarkerBase + components: + - type: GhostRole + name: spider-roy-name + description: spider-roy-desc + rules: spider-roy-desc + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 600 + raffle: + settings: default + - type: GhostRoleMobSpawner + prototype: MobSpiderSpaceQueen + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: Mobs/Animals/spider.rsi + state: midwife diff --git a/Resources/Prototypes/SS220/GameRules/events.yml b/Resources/Prototypes/SS220/GameRules/events.yml index a4cb65a8b830f5..866f1b5d32902c 100644 --- a/Resources/Prototypes/SS220/GameRules/events.yml +++ b/Resources/Prototypes/SS220/GameRules/events.yml @@ -19,3 +19,19 @@ specialEntries: - id: TrashBananaPeelExplosive prob: 0.005 + +- type: entity + id: SpiderMigration + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + startDelay: 5 + earliestStart: 15 + minimumPlayers: 35 + weight: 5 + duration: 50 + - type: VentCrittersRule + entries: + - id: SpawnPointGhostSpaceQueen + prob: 0.005 diff --git a/Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml b/Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml new file mode 100644 index 00000000000000..3a30053e64dc8d --- /dev/null +++ b/Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml @@ -0,0 +1,7 @@ +#Wall system +#ABOVE IS A TILE MADE OF COBWEBS. + +#SOLID WALL +# AT THE BOTTOM IS A TILE MADE OF COBWEBS. + +#ABOVE IS A TILE MADE OF COBWEBS. diff --git a/Resources/Prototypes/SS220/radio_channels.yml b/Resources/Prototypes/SS220/radio_channels.yml index 15fa7b1362d2ae..6eb3197e3469c2 100644 --- a/Resources/Prototypes/SS220/radio_channels.yml +++ b/Resources/Prototypes/SS220/radio_channels.yml @@ -191,3 +191,12 @@ color: "#FFB6C1" longRange: true # Admin memes end + +#Spider queen antag +- type: radioChannel #Connection + id: HiveRadio + name: Улей + keycode: 'у' + frequency: 2885 + color: "#cc80ff" + longRange: true From 9ee1a65d69b1b85344a350bcf52c4d827f483ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 01:03:41 +0300 Subject: [PATCH 02/34] Fix gamerule and convert to comment --- .../Prototypes/SS220/GameRules/events.yml | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/SS220/GameRules/events.yml b/Resources/Prototypes/SS220/GameRules/events.yml index 866f1b5d32902c..e568911fb930fe 100644 --- a/Resources/Prototypes/SS220/GameRules/events.yml +++ b/Resources/Prototypes/SS220/GameRules/events.yml @@ -20,18 +20,19 @@ - id: TrashBananaPeelExplosive prob: 0.005 -- type: entity - id: SpiderMigration - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startDelay: 5 - earliestStart: 15 - minimumPlayers: 35 - weight: 5 - duration: 50 - - type: VentCrittersRule - entries: - - id: SpawnPointGhostSpaceQueen - prob: 0.005 +#Temporary in comment +# - type: entity +# id: SpiderMigration +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startDelay: 5 +# earliestStart: 15 +# minimumPlayers: 35 +# weight: 5 +# duration: 50 +# - type: VentCrittersRule +# specialEntries: +# - id: SpawnPointGhostSpaceQueen +# prob: 0.005 From d8a6439f4db8c5657afc6ef5a769eb8ee68b5834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 01:45:28 +0300 Subject: [PATCH 03/34] Actions and implants fixes --- .../SS220/Actions/Spider_actions.yml | 176 ++++++++---------- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 20 +- .../Entities/Objects/Misc/spider_implants.yml | 96 ++++++---- 3 files changed, 145 insertions(+), 147 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 644fc06bc71451..aaba259a4ed63c 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -1,5 +1,6 @@ +#Base - type: entity - id: ActionSpawnMagicarpSpellSpider + id: ActionSpawnSpiderEggBase name: spider-spawn-egg-guard description: spider-spawn-egg-guard-desc noSpawn: true @@ -19,84 +20,89 @@ speech: action-speech-spell-spider - type: entity - id: ActionSpawnMagicarpSpellSpiderHunter - name: spider-spawn-egg-hunt + id: ActionSpawnSingleSpiderWebBase + name: spider-spawn-web + description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 300 #КД - range: 1 + useDelay: 4 + range: 1.5 itemIconStyle: BigAction icon: - sprite: Objects/Misc/eggspider.rsi - state: icon + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_1 event: !type:WorldSpawnSpellEvent prototypes: - - id: SpiderEggHunter + - id: SpiderWebUsual amount: 1 offset: 0, 1 speech: action-speech-spell-spider +#Egg - type: entity - id: ActionSpawnMagicarpSpellSpiderGhost - name: spider-spawn-egg-ghost + parent: ActionSpawnSpiderEggBase + id: ActionSpawnSpiderEggDrone + name: spider-spawn-egg-guard + description: spider-spawn-egg-guard-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 350 #КД - range: 1 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/eggspider.rsi - state: icon event: !type:WorldSpawnSpellEvent prototypes: - - id: SpiderEggGhost + - id: SpiderEggDrone amount: 1 offset: 0, 1 speech: action-speech-spell-spider - type: entity - id: ActionSpawnMagicarpSpellSpiderShooter - name: spider-spawn-egg-shooter + parent: ActionSpawnSpiderEggBase + id: ActionSpawnSpiderEggHunter + name: spider-spawn-egg-hunt noSpawn: true components: - type: WorldTargetAction - useDelay: 380 - range: 1 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/eggspider.rsi - state: icon + useDelay: 300 #КД event: !type:WorldSpawnSpellEvent prototypes: - - id: SpiderEggShooter + - id: SpiderEggHunter amount: 1 offset: 0, 1 speech: action-speech-spell-spider - type: entity - id: ActionSpawnMagicarpSpellSpiderCrystal - name: spider-spawn-kristal - description: spider-spawn-kristal-desc + parent: ActionSpawnSpiderEggBase + id: ActionSpawnSpiderEggGhost + name: spider-spawn-egg-ghost noSpawn: true components: - type: WorldTargetAction - useDelay: 30 - range: 1 - itemIconStyle: BigAction - icon: - sprite: Structures/Decoration/crystal.rsi - state: crystal1 + useDelay: 350 event: !type:WorldSpawnSpellEvent prototypes: - - id: ShardCrystalBlueXeno + - id: SpiderEggGhost + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider + +- type: entity + parent: ActionSpawnSpiderEggBase + id: ActionSpawnSpiderEggShooter + name: spider-spawn-egg-shooter + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 380 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggShooter amount: 1 offset: 0, 1 speech: action-speech-spell-spider +#Spider - type: entity - id: ActionSpawnMagicarpSpellSpiderLittle + id: ActionSpawnSpiderLittle name: spider-spawn-smallspider description: spider-spawn-smallspider-desc noSpawn: true @@ -115,38 +121,35 @@ offset: 0, 1 speech: action-speech-spell-spider +#Cryctal - type: entity - id: ActionSpawnMagicarpSpellSpiderWallWeb - name: spider-spawn-wall + id: ActionSpawnSpiderCrystal + name: spider-spawn-kristal + description: spider-spawn-kristal-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 8 - range: 1.5 - hungerCost: 15 + useDelay: 30 + range: 1 itemIconStyle: BigAction icon: - sprite: Structures/Walls/web.rsi - state: full - useDelay: 30 + sprite: Structures/Decoration/crystal.rsi + state: crystal1 event: !type:WorldSpawnSpellEvent - useDelay: 25 prototypes: - - id: FloorTileItemWebSpiders - doAfter: 5 + - id: ShardCrystalBlueXeno amount: 1 - useDelay: 25 offset: 0, 1 - doAfter: 5 speech: action-speech-spell-spider +#Wall - type: entity - id: ActionSpawnMagicarpSpellSpiderWallWeb2 - name: spider-spawn-wall3 + id: ActionSpawnSpiderWallWeb + name: spider-spawn-wall noSpawn: true components: - type: WorldTargetAction - useDelay: 10 + useDelay: 8 range: 1.5 hungerCost: 15 itemIconStyle: BigAction @@ -157,7 +160,7 @@ event: !type:WorldSpawnSpellEvent useDelay: 25 prototypes: - - id: FloorTileItemWebSpiders2 + - id: FloorTileItemWebSpiders doAfter: 5 amount: 1 useDelay: 25 @@ -166,67 +169,48 @@ speech: action-speech-spell-spider - type: entity - id: ActionSpawnMagicarpSpellSpiderSpiderWeb + parent: ActionSpawnSpiderWallWeb + id: ActionSpawnSpiderWallWebLongDelay + name: spider-spawn-wall3 + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 10 + +#Web +- type: entity + parent: ActionSpawnSingleSpiderWebBase + id: ActionSpawnSingleSpiderWebShortDelay name: spider-spawn-web description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 2 #КД - range: 1.5 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/spiderweb.rsi - state: spider_web_1 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderWebUsual - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider + useDelay: 2 - type: entity - id: ActionSpawnMagicarpSpellSpiderSpiderWebHunter - name: spider-spawn-web-hunt + parent: ActionSpawnSingleSpiderWebBase + id: ActionSpawnSingleSpiderWebMediumDelay + name: spider-spawn-web-queen description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 6 - range: 1.5 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/spiderweb.rsi - state: spider_web_1 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderWeb - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider + useDelay: 4 - type: entity - id: ActionSpawnMagicarpSpellSpiderSpiderWebQueen - name: spider-spawn-web-queen + parent: ActionSpawnSingleSpiderWebBase + id: ActionSpawnSingleSpiderWebLongDelay + name: spider-spawn-web-hunt description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 4 #КД - range: 1.5 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/spiderweb.rsi - state: spider_web_1 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderWebQueen - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider + useDelay: 6 +#Clown web - type: entity - id: ActionSpawnMagicarpSpellSpiderSpiderWebClown + id: ActionSpawnSingleSpiderWebClown name: spider-spawn-web-clown description: spider-spawn-web-desc noSpawn: true diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 698a636c030791..c48baff7d9fb12 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -170,14 +170,14 @@ components: - type: AutoImplant implants: - - LightImplantSpiderHunter - - LightImplantSpiderWallWeb2 - - LightImplantSpider - - LightImplantSpiderGhost + - LightImplantSpiderEggHunter + - LightImplantSpiderWallWebLongDelay + - LightImplantSpiderEggDrone + - LightImplantSpiderEggGhost - LightImplantSpiderCrystal - LightImplantSpiderLittle - - LightImplantSpiderSpiderQueen - - LightImplantSpiderShooter + - LightImplantSingleSpiderWebMediumDelay + - LightImplantSpiderEggShooter - type: Butcherable spawned: - id: FoodMeatSpider @@ -264,7 +264,7 @@ implants: - LightImplantSpiderWallWeb - LightImplantSpiderCrystal - - LightImplantSpiderSpider + - LightImplantSingleSpiderWebShortDelay - type: Spider webPrototype: SpiderWebAbility - type: MovementSpeedModifier @@ -333,7 +333,7 @@ baseSprintSpeed : 3.9 - type: AutoImplant implants: - - LightImplantSpiderSpiderHunter + - LightImplantSingleSpiderWebLongDelay - type: entity name: spider ghost @@ -413,7 +413,7 @@ baseSprintSpeed : 3.9 - type: AutoImplant implants: - - LightImplantSpiderSpiderHunter + - LightImplantSingleSpiderWebLongDelay - type: entity name: spider shooter @@ -486,7 +486,7 @@ soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - type: AutoImplant implants: - - LightImplantSpiderSpiderClown + - LightImplantSingleSpiderWebClown - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.7 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index 186c25ab224da9..0754ceb1bf27ed 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -1,11 +1,11 @@ +#Base - type: entity parent: BaseSubdermalImplant - id: LightImplantSpider + id: LightImplantSpiderBase name: spider-spawn-egg-guard noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpider - type: PointLight enabled: false radius: 2.5 @@ -19,106 +19,120 @@ - Flashlight - type: UnpoweredFlashlight +#Egg - type: entity - parent: LightImplantSpider - id: LightImplantSpiderHunter + parent: LightImplantSpiderBase + id: LightImplantSpiderEggDrone + name: spider-spawn-egg-guard + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderEggDrone + +- type: entity + parent: LightImplantSpiderBase + id: LightImplantSpiderEggHunter name: spider-spawn-egg-hunt description: noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderHunter + implantAction: ActionSpawnSpiderEggHunter - type: entity - parent: LightImplantSpider - id: LightImplantSpiderGhost + parent: LightImplantSpiderBase + id: LightImplantSpiderEggGhost name: spider-spawn-egg-ghost noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderGhost + implantAction: ActionSpawnSpiderEggGhost - type: entity - parent: LightImplantSpider - id: LightImplantSpiderShooter + parent: LightImplantSpiderBase + id: LightImplantSpiderEggShooter name: spider-spawn-egg-shooter noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderShooter + implantAction: ActionSpawnSpiderEggShooter +#Spider - type: entity - parent: LightImplantSpider - id: LightImplantSpiderCrystal - name: spider-spawn-kristal + parent: LightImplantSpiderBase + id: LightImplantSpiderLittle + name: spider-spawn-smallspider noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderCrystal + implantAction: ActionSpawnSpiderLittle +#Cristal - type: entity - parent: LightImplantSpider - id: LightImplantSpiderWallWeb - name: spider-spawn-wall + parent: LightImplantSpiderBase + id: LightImplantSpiderCrystal + name: spider-spawn-kristal noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderWallWeb + implantAction: ActionSpawnSpiderCrystal +#Wall - type: entity - parent: LightImplantSpider - id: LightImplantSpiderWallWeb2 - name: spider-spawn-wall2 + parent: LightImplantSpiderBase + id: LightImplantSpiderWallWeb + name: spider-spawn-wall noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderWallWeb2 + implantAction: ActionSpawnSpiderWallWeb - type: entity - parent: LightImplantSpider - id: LightImplantSpiderLittle - name: spider-spawn-smallspider + parent: LightImplantSpiderBase + id: LightImplantSpiderWallWebLongDelay + name: spider-spawn-wall2 noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderLittle + implantAction: ActionSpawnSpiderWallWebLongDelay +#Web - type: entity - parent: LightImplantSpider - id: LightImplantSpiderSpider + parent: LightImplantSpiderBase + id: LightImplantSingleSpiderWebShortDelay name: spider-spawn-web description: spider-spawn-web-desc noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderSpiderWeb + implantAction: ActionSpawnSingleSpiderWebShortDelay - type: entity - parent: LightImplantSpider - id: LightImplantSpiderSpiderHunter - name: spider-spawn-web-hunt + parent: LightImplantSpiderBase + id: LightImplantSingleSpiderWebMediumDelay + name: spider-spawn-web-queen description: spider-spawn-web-desc noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderSpiderWebHunter + implantAction: ActionSpawnSingleSpiderWebMediumDelay - type: entity - parent: LightImplantSpider - id: LightImplantSpiderSpiderQueen - name: spider-spawn-web-queen + parent: LightImplantSpiderBase + id: LightImplantSingleSpiderWebLongDelay + name: spider-spawn-web-hunt description: spider-spawn-web-desc noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderSpiderWebQueen + implantAction: ActionSpawnSingleSpiderWebLongDelay - type: entity - parent: LightImplantSpider - id: LightImplantSpiderSpiderClown + parent: LightImplantSpiderBase + id: LightImplantSingleSpiderWebClown name: spider-spawn-web-clown description: spider-spawn-web-desc noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnMagicarpSpellSpiderSpiderWebClown + implantAction: ActionSpawnSingleSpiderWebClown From fe0983d401f5aa483ddac70f6646a670a773b3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 01:50:32 +0300 Subject: [PATCH 04/34] Change Base id names --- .../SS220/Actions/Spider_actions.yml | 18 ++++++------- .../Entities/Objects/Misc/spider_implants.yml | 26 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index aaba259a4ed63c..3546f1a41b1dc3 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -1,6 +1,6 @@ #Base - type: entity - id: ActionSpawnSpiderEggBase + id: BaseActionSpawnSpiderEgg name: spider-spawn-egg-guard description: spider-spawn-egg-guard-desc noSpawn: true @@ -20,7 +20,7 @@ speech: action-speech-spell-spider - type: entity - id: ActionSpawnSingleSpiderWebBase + id: BaseActionSpawnSingleSpiderWeb name: spider-spawn-web description: spider-spawn-web-desc noSpawn: true @@ -41,7 +41,7 @@ #Egg - type: entity - parent: ActionSpawnSpiderEggBase + parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggDrone name: spider-spawn-egg-guard description: spider-spawn-egg-guard-desc @@ -56,7 +56,7 @@ speech: action-speech-spell-spider - type: entity - parent: ActionSpawnSpiderEggBase + parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggHunter name: spider-spawn-egg-hunt noSpawn: true @@ -71,7 +71,7 @@ speech: action-speech-spell-spider - type: entity - parent: ActionSpawnSpiderEggBase + parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggGhost name: spider-spawn-egg-ghost noSpawn: true @@ -86,7 +86,7 @@ speech: action-speech-spell-spider - type: entity - parent: ActionSpawnSpiderEggBase + parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggShooter name: spider-spawn-egg-shooter noSpawn: true @@ -179,7 +179,7 @@ #Web - type: entity - parent: ActionSpawnSingleSpiderWebBase + parent: BaseActionSpawnSingleSpiderWeb id: ActionSpawnSingleSpiderWebShortDelay name: spider-spawn-web description: spider-spawn-web-desc @@ -189,7 +189,7 @@ useDelay: 2 - type: entity - parent: ActionSpawnSingleSpiderWebBase + parent: BaseActionSpawnSingleSpiderWeb id: ActionSpawnSingleSpiderWebMediumDelay name: spider-spawn-web-queen description: spider-spawn-web-desc @@ -199,7 +199,7 @@ useDelay: 4 - type: entity - parent: ActionSpawnSingleSpiderWebBase + parent: BaseActionSpawnSingleSpiderWeb id: ActionSpawnSingleSpiderWebLongDelay name: spider-spawn-web-hunt description: spider-spawn-web-desc diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index 0754ceb1bf27ed..bc137936a88a15 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -1,7 +1,7 @@ #Base - type: entity parent: BaseSubdermalImplant - id: LightImplantSpiderBase + id: BaseLightImplantSpider name: spider-spawn-egg-guard noSpawn: true components: @@ -21,7 +21,7 @@ #Egg - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderEggDrone name: spider-spawn-egg-guard noSpawn: true @@ -30,7 +30,7 @@ implantAction: ActionSpawnSpiderEggDrone - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderEggHunter name: spider-spawn-egg-hunt description: @@ -40,7 +40,7 @@ implantAction: ActionSpawnSpiderEggHunter - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderEggGhost name: spider-spawn-egg-ghost noSpawn: true @@ -49,7 +49,7 @@ implantAction: ActionSpawnSpiderEggGhost - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderEggShooter name: spider-spawn-egg-shooter noSpawn: true @@ -59,7 +59,7 @@ #Spider - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderLittle name: spider-spawn-smallspider noSpawn: true @@ -69,7 +69,7 @@ #Cristal - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderCrystal name: spider-spawn-kristal noSpawn: true @@ -79,7 +79,7 @@ #Wall - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderWallWeb name: spider-spawn-wall noSpawn: true @@ -88,7 +88,7 @@ implantAction: ActionSpawnSpiderWallWeb - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSpiderWallWebLongDelay name: spider-spawn-wall2 noSpawn: true @@ -98,7 +98,7 @@ #Web - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebShortDelay name: spider-spawn-web description: spider-spawn-web-desc @@ -108,7 +108,7 @@ implantAction: ActionSpawnSingleSpiderWebShortDelay - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebMediumDelay name: spider-spawn-web-queen description: spider-spawn-web-desc @@ -118,7 +118,7 @@ implantAction: ActionSpawnSingleSpiderWebMediumDelay - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebLongDelay name: spider-spawn-web-hunt description: spider-spawn-web-desc @@ -128,7 +128,7 @@ implantAction: ActionSpawnSingleSpiderWebLongDelay - type: entity - parent: LightImplantSpiderBase + parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebClown name: spider-spawn-web-clown description: spider-spawn-web-desc From 6b435c9212c74a27b8c96f35d9c14299870ab03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 14:14:51 +0300 Subject: [PATCH 05/34] Add abstract attribute --- Resources/Prototypes/SS220/Actions/Spider_actions.yml | 2 ++ .../Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 3546f1a41b1dc3..e47893222602a1 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -3,6 +3,7 @@ id: BaseActionSpawnSpiderEgg name: spider-spawn-egg-guard description: spider-spawn-egg-guard-desc + abstract: true noSpawn: true components: - type: WorldTargetAction @@ -23,6 +24,7 @@ id: BaseActionSpawnSingleSpiderWeb name: spider-spawn-web description: spider-spawn-web-desc + abstract: true noSpawn: true components: - type: WorldTargetAction diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index bc137936a88a15..61b762ef63bf6c 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -3,6 +3,7 @@ parent: BaseSubdermalImplant id: BaseLightImplantSpider name: spider-spawn-egg-guard + abstract: true noSpawn: true components: - type: SubdermalImplant From 9a61b283f392514fc5ecf2eb89505c2d167c1e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 14:31:10 +0300 Subject: [PATCH 06/34] Spider web fixes --- .../SS220/Actions/Spider_actions.yml | 20 ++++++--- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 2 +- .../Entities/Objects/Misc/spider_implants.yml | 16 +++---- .../Entities/Objects/Misc/spider_web.yml | 43 +++++++++++-------- .../SS220/Shitspawn/Spider_Queen.yml | 7 --- 5 files changed, 47 insertions(+), 41 deletions(-) delete mode 100644 Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index e47893222602a1..ef44499937eb40 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -36,7 +36,7 @@ state: spider_web_1 event: !type:WorldSpawnSpellEvent prototypes: - - id: SpiderWebUsual + - id: SpiderWebFragile amount: 1 offset: 0, 1 speech: action-speech-spell-spider @@ -192,23 +192,29 @@ - type: entity parent: BaseActionSpawnSingleSpiderWeb - id: ActionSpawnSingleSpiderWebMediumDelay - name: spider-spawn-web-queen + id: ActionSpawnSingleSpiderWebLongDelay + name: spider-spawn-web-hunt description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 4 + useDelay: 6 - type: entity parent: BaseActionSpawnSingleSpiderWeb - id: ActionSpawnSingleSpiderWebLongDelay - name: spider-spawn-web-hunt + id: ActionSpawnSingleSpiderWebDurable + name: spider-spawn-web-queen description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction - useDelay: 6 + useDelay: 4 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebQueen + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider #Clown web - type: entity diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index c48baff7d9fb12..e2ce7503a7b1a6 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -176,7 +176,7 @@ - LightImplantSpiderEggGhost - LightImplantSpiderCrystal - LightImplantSpiderLittle - - LightImplantSingleSpiderWebMediumDelay + - LightImplantSingleSpiderWebDurable - LightImplantSpiderEggShooter - type: Butcherable spawned: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index 61b762ef63bf6c..e3e92f5404084e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -109,24 +109,24 @@ implantAction: ActionSpawnSingleSpiderWebShortDelay - type: entity - parent: BaseLightImplantSpider - id: LightImplantSingleSpiderWebMediumDelay - name: spider-spawn-web-queen + parent: BaseLightImplantSpider + id: LightImplantSingleSpiderWebLongDelay + name: spider-spawn-web-hunt description: spider-spawn-web-desc noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnSingleSpiderWebMediumDelay + implantAction: ActionSpawnSingleSpiderWebLongDelay - type: entity - parent: BaseLightImplantSpider - id: LightImplantSingleSpiderWebLongDelay - name: spider-spawn-web-hunt + parent: BaseLightImplantSpider + id: LightImplantSingleSpiderWebDurable + name: spider-spawn-web-queen description: spider-spawn-web-desc noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnSingleSpiderWebLongDelay + implantAction: ActionSpawnSingleSpiderWebDurable - type: entity parent: BaseLightImplantSpider diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml index 814f3712d21dde..27b7931550c193 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml @@ -2,9 +2,10 @@ #Base - type: entity - id: SpiderWebUsual + id: BaseSpiderWeb name: web description: web + abstract: true noSpawn: true placement: mode: SnapgridCenter @@ -46,13 +47,6 @@ - type: Damageable damageModifierSet: Wood - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: Temperature heatDamage: types: @@ -70,15 +64,32 @@ Extinguish: [Touch] - type: SpiderWebObject - type: SpeedModifierContacts + +- type: entity + parent: BaseSpiderWeb + id: SpiderWebFragile + name: web + description: web + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SpeedModifierContacts walkSpeedModifier: 0.25 sprintSpeedModifier: 0.25 - ignoreWhitelist: - components: - - IgnoreSpiderWeb - type: entity - id: SpiderWebQueen - parent: SpiderWebUsual + parent: BaseSpiderWeb + id: SpiderWebDurable name: web description: web placement: @@ -97,13 +108,10 @@ - type: SpeedModifierContacts walkSpeedModifier: 0.15 sprintSpeedModifier: 0.15 - ignoreWhitelist: - components: - - IgnoreSpiderWeb - type: entity - id: SpiderWebAbility parent: SpiderWebUsual + id: SpiderWebAbility name: web description: web noSpawn: true @@ -120,4 +128,3 @@ ignoreWhitelist: components: - IgnoreSpiderWeb - diff --git a/Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml b/Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml deleted file mode 100644 index 3a30053e64dc8d..00000000000000 --- a/Resources/Prototypes/SS220/Shitspawn/Spider_Queen.yml +++ /dev/null @@ -1,7 +0,0 @@ -#Wall system -#ABOVE IS A TILE MADE OF COBWEBS. - -#SOLID WALL -# AT THE BOTTOM IS A TILE MADE OF COBWEBS. - -#ABOVE IS A TILE MADE OF COBWEBS. From f2afd15c231e7bc0febd8e68148ae9aeec6bff7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 14:34:03 +0300 Subject: [PATCH 07/34] web fixes 2 --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 6 +++--- .../SS220/Entities/Objects/Misc/spider_web.yml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index e2ce7503a7b1a6..3f643f193f814c 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -185,7 +185,7 @@ - id: MobSpiderSpaceLittle amount: 7 - type: Spider - webPrototype: SpiderWebAbility + webPrototype: SpiderWebDespawned - type: RechargeBasicEntityAmmo rechargeCooldown: 1.5 - type: BasicEntityAmmoProvider @@ -266,7 +266,7 @@ - LightImplantSpiderCrystal - LightImplantSingleSpiderWebShortDelay - type: Spider - webPrototype: SpiderWebAbility + webPrototype: SpiderWebDespawned - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.9 @@ -327,7 +327,7 @@ - ReagentId: ChloralHydrate Quantity: 0 - type: Spider - webPrototype: SpiderWebAbility + webPrototype: SpiderWebDespawned - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.9 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml index 27b7931550c193..898927b506f0e0 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml @@ -64,6 +64,9 @@ Extinguish: [Touch] - type: SpiderWebObject - type: SpeedModifierContacts + ignoreWhitelist: + components: + - IgnoreSpiderWeb - type: entity parent: BaseSpiderWeb @@ -110,8 +113,8 @@ sprintSpeedModifier: 0.15 - type: entity - parent: SpiderWebUsual - id: SpiderWebAbility + parent: BaseSpiderWeb + id: SpiderWebDespawned name: web description: web noSpawn: true @@ -125,6 +128,3 @@ - type: SpeedModifierContacts walkSpeedModifier: 0.1 sprintSpeedModifier: 0.1 - ignoreWhitelist: - components: - - IgnoreSpiderWeb From ca4c7dac73a32f688e46939efa32faa130d1f1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 15:09:34 +0300 Subject: [PATCH 08/34] Strucrures fixes --- .../SS220/Actions/Spider_actions.yml | 8 ++ .../Entities/Structures/Furniture/tables.yml | 55 -------- .../Structures/Specific/spider_structures.yml | 123 ++++++++++++------ 3 files changed, 94 insertions(+), 92 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index ef44499937eb40..a6494d6b39d6b5 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -178,6 +178,14 @@ components: - type: WorldTargetAction useDelay: 10 + event: !type:WorldSpawnSpellEvent + useDelay: 25 + prototypes: + - id: FloorTileItemWebSpidersDurable + doAfter: 5 + amount: 1 + useDelay: 25 + #Web - type: entity diff --git a/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml index be2d2c3c40cb9f..2f8c09d00c2e34 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Furniture/tables.yml @@ -179,58 +179,3 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepTile - -#Spider tables -- type: entity - id: TableWebSpiders - parent: TableBase - name: web - description: web - noSpawn: true - components: - - type: Damageable - damageModifierSet: Web - - type: Sprite - sprite: Structures/Furniture/Tables/web.rsi - - type: Icon - sprite: Structures/Furniture/Tables/web.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: MeleeSound - soundGroups: - Brute: - path: - "/Audio/Weapons/slash.ogg" - - type: Construction - graph: WebStructures - node: table - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepCarpet - - type: TimedDespawn - lifetime: 5 - - type: SpawnOnDespawn - prototype: WallWeb - - -- type: entity - id: TableWebSpiders2 - parent: TableWebSpiders - name: web - description: web - noSpawn: true - components: - - type: TimedDespawn - lifetime: 8 - - type: SpawnOnDespawn - prototype: WallWebDurable - - type: Sprite - sprite: Structures/Furniture/Tables/web.rsi - shader: unshaded - color: gray diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml index e9a2fee5533c00..0258d454179bf1 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml @@ -1,10 +1,12 @@ # AT THE BOTTOM IS A TILE MADE OF COBWEBS. + +#TODO: Сделать нормальную анимацию спавна стены без использования костыля в виде спавна тайлов и столов +#Base - type: entity - name: web construction - description: Very smooth and surprisingly durable. - parent: FloorTileItemBaseSpiders - id: FloorTileItemWebSpiders - noSpawn: true + parent: BaseItemSpider + id: BaseFloorTileItemSpiders + description: These could work as a pretty decent throwing weapon. + abstract: true components: - type: Sprite sprite: Objects/Tiles/web.rsi @@ -12,9 +14,17 @@ - type: FloorTile outputs: - FloorWebTile + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + - type: Damageable + damageContainer: Inorganic - type: Construction graph: WebObjects node: tile + - type: TimedDespawn + - type: SpawnOnDespawn - type: Destructible thresholds: - trigger: @@ -23,33 +33,6 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - - type: TimedDespawn - lifetime: 5 - - type: SpawnOnDespawn - prototype: TableWebSpiders - -- type: entity - parent: BaseItemSpider - id: FloorTileItemBaseSpiders - description: These could work as a pretty decent throwing weapon. - abstract: true - components: - - type: Sprite - sprite: Objects/Tiles/tile.rsi - - type: DamageOtherOnHit - damage: - types: - Blunt: 5 - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 20 @@ -66,23 +49,89 @@ types: Blunt: 5 +#Tile (used to spawn walls) +- type: entity + parent: BaseFloorTileItemSpiders + id: FloorTileItemWebSpiders + name: web construction + description: Very smooth and surprisingly durable. + noSpawn: true + components: + - type: TimedDespawn + lifetime: 5 + - type: SpawnOnDespawn + prototype: TableWebSpiders + - type: entity name: web description: Web - parent: FloorTileItemWebSpiders - id: FloorTileItemWebSpiders2 + parent: BaseFloorTileItemSpiders + id: FloorTileItemWebSpidersDurable noSpawn: true components: - type: TimedDespawn lifetime: 6 - type: SpawnOnDespawn - prototype: TableWebSpiders2 + prototype: TableWebSpidersDurable - type: Sprite - sprite: Objects/Tiles/web.rsi - state: icon shader: unshaded color: gray +#Table (заглушка типо как анимация) +- type: entity + id: TableWebSpiders + parent: TableBase + name: web + description: web + noSpawn: true + components: + - type: Damageable + damageModifierSet: Web + - type: Sprite + sprite: Structures/Furniture/Tables/web.rsi + - type: Icon + sprite: Structures/Furniture/Tables/web.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/slash.ogg" + - type: Construction + graph: WebStructures + node: table + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepCarpet + - type: TimedDespawn + lifetime: 5 + - type: SpawnOnDespawn + prototype: WallWeb + +- type: entity + id: TableWebSpidersDurable + parent: TableWebSpiders + name: web + description: web + noSpawn: true + components: + - type: TimedDespawn + lifetime: 8 + - type: SpawnOnDespawn + prototype: WallWebDurable + - type: Sprite + sprite: Structures/Furniture/Tables/web.rsi + shader: unshaded + color: gray + +#Wall - type: entity parent: BaseWall id: WallWebDurable From 7c4d4fd983c5a9c4471188167335910972551096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 15:22:01 +0300 Subject: [PATCH 09/34] Spider eggs fixes --- .../Prototypes/SS220/Actions/Spider_actions.yml | 1 - .../SS220/Entities/Objects/Misc/spider_eggs.yml | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index a6494d6b39d6b5..cba5e3278ab473 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -186,7 +186,6 @@ amount: 1 useDelay: 25 - #Web - type: entity parent: BaseActionSpawnSingleSpiderWeb diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml index c456679c925b99..1fea9564b28684 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -1,4 +1,5 @@ #Base +#TODO: Когда будет анимация для спавна стен - переделать BaseItemSpider на наследование от BaseItem - type: entity name: "item" id: BaseItemSpider @@ -48,11 +49,10 @@ - !type:DoActsBehavior acts: [ "Destruction" ] -#Spiders - type: entity parent: BaseItemSpider - id: SpiderEggHunter - noSpawn: true + id: BaseSpiderEgg + abstract: true name: the-egg-of-the-spider-guard description: Is it a gemstone? Is it an egg? It looks expensive. components: @@ -103,6 +103,17 @@ reagents: - ReagentId: PoisonWine Quantity: 10 + - type: TimedDespawn #Система цикла + - type: SpawnOnDespawn + +#Spiders +- type: entity + parent: BaseItemSpider + id: SpiderEggHunter + noSpawn: true + name: the-egg-of-the-spider-guard + description: Is it a gemstone? Is it an egg? It looks expensive. + components: - type: TimedDespawn #Система цикла lifetime: 80 - type: SpawnOnDespawn From 33f9a6a0f2594c3a31f54aab20f62f96d6950bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 15:31:34 +0300 Subject: [PATCH 10/34] Mobs fixes --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 45 ++++++++----------- .../Entities/markers/Spawners/ghost_roles.yml | 1 + 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 3f643f193f814c..f9a1fe059d87ec 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -1,11 +1,12 @@ #Base - type: entity - noSpawn: true - name: Probca parent: - MobAtmosStandard - MobSpaceBasic - id: MobSpiderSpaceQueenBase + - MobSpiderGhostRole + id: BaseMobSpiderQueen + abstract: true + name: Probca description: spider dance components: - type: Insulated @@ -148,7 +149,7 @@ - type: entity noSpawn: true name: Ghost role - id: MobSpiderGhost + id: MobSpiderGhostRole components: - type: GhostRole #Ghost role makeSentient: true @@ -157,15 +158,13 @@ requirements: name: spider-roy-name description: spider-roy-desc - - type: GhostTakeoverAvailable #Ghost role + - type: GhostTakeoverAvailable #Ghost role #Spider queen - type: entity - name: Spider queen + parent: BaseMobSpiderQueen id: MobSpiderSpaceQueen - parent: - - MobSpiderSpaceQueenBase - - MobSpiderGhost + name: Spider queen description: spider dance components: - type: AutoImplant @@ -206,11 +205,9 @@ #Spiders-servants - type: entity - name: spider guard + parent: BaseMobSpiderQueen id: MobSpiderSpaceDrone - parent: - - MobSpiderSpaceQueenBase - - MobSpiderGhost + name: spider guard description: spider dance components: - type: Sprite #Спрайт @@ -272,11 +269,9 @@ baseSprintSpeed : 3.9 - type: entity - name: spider hunt + parent: BaseMobSpiderQueen id: MobSpiderSpaceHunter - parent: - - MobSpiderSpaceQueenBase - - MobSpiderGhost + name: spider hunt description: spider dance components: - type: Sprite @@ -336,11 +331,9 @@ - LightImplantSingleSpiderWebLongDelay - type: entity - name: spider ghost + parent: BaseMobSpiderQueen id: MobSpiderSpaceGhost - parent: - - MobSpiderSpaceQueenBase - - MobSpiderGhost + name: spider ghost description: spider dance components: - type: Sprite @@ -416,11 +409,9 @@ - LightImplantSingleSpiderWebLongDelay - type: entity - name: spider shooter + parent: BaseMobSpiderQueen id: MobSpiderSpaceShooter - parent: - - MobSpiderSpaceQueenBase - - MobSpiderGhost + name: spider shooter description: spider dance components: - type: Sprite @@ -492,9 +483,9 @@ baseSprintSpeed : 3.7 - type: entity - name: small spider + parent: BaseMobSpiderQueen id: MobSpiderSpaceLittle - parent: MobSpiderSpaceQueenBase + name: small spider description: spider dance components: - type: Sprite diff --git a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml index 825d47ebd46dfe..41505b88e615af 100644 --- a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml @@ -1,3 +1,4 @@ +#Used by gamerule - type: entity id: SpawnPointGhostSpaceQueen name: спавнер роли королевы-пауков From 57611b2245dbfbfe902d2d0e60f4db652a5ba457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 16:27:54 +0300 Subject: [PATCH 11/34] Add localisation and some fixes --- .../ru-RU/ss220/actions/spider-actions.ftl | 37 +++++++++++++++ .../Locale/ru-RU/ss220/consumable/food.ftl | 3 ++ .../ru-RU/ss220/materials/crystal-shard.ftl | 2 + .../Locale/ru-RU/ss220/misc/spider-eggs.ftl | 15 ++++++ .../ru-RU/ss220/misc/spider-implants.ftl | 34 ++++++++++++++ .../Locale/ru-RU/ss220/misc/spider-web.ftl | 11 +++++ .../Locale/ru-RU/ss220/mobs/spider-queen.ftl | 26 ++++++++++ .../ss220/strucrure/spider-structures.ftl | 19 ++++++++ .../ru-RU/ss220/weapons/projectiles.ftl | 1 + .../SS220/Actions/Spider_actions.yml | 47 ++++++++----------- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 2 +- .../Entities/Objects/Consumable/Food/egg.yml | 2 +- .../Objects/Materials/crystal_shard.yml | 4 +- .../Entities/Objects/Misc/spider_implants.yml | 41 ++++++++-------- .../Entities/Objects/Misc/spider_web.yml | 7 +-- .../Weapons/Guns/Projectiles/projectiles.yml | 2 +- .../Structures/Specific/spider_structures.yml | 4 +- 17 files changed, 197 insertions(+), 60 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/actions/spider-actions.ftl create mode 100644 Resources/Locale/ru-RU/ss220/consumable/food.ftl create mode 100644 Resources/Locale/ru-RU/ss220/materials/crystal-shard.ftl create mode 100644 Resources/Locale/ru-RU/ss220/misc/spider-eggs.ftl create mode 100644 Resources/Locale/ru-RU/ss220/misc/spider-implants.ftl create mode 100644 Resources/Locale/ru-RU/ss220/misc/spider-web.ftl create mode 100644 Resources/Locale/ru-RU/ss220/mobs/spider-queen.ftl create mode 100644 Resources/Locale/ru-RU/ss220/strucrure/spider-structures.ftl create mode 100644 Resources/Locale/ru-RU/ss220/weapons/projectiles.ftl diff --git a/Resources/Locale/ru-RU/ss220/actions/spider-actions.ftl b/Resources/Locale/ru-RU/ss220/actions/spider-actions.ftl new file mode 100644 index 00000000000000..c1402c249b276a --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/actions/spider-actions.ftl @@ -0,0 +1,37 @@ +action-speech-spell-spider = Кссс...!?? + + +ent-ActionSpawnSpiderEggDrone = Яйцо охранного паука + .desc = Он же трутень, может строить кристаллы и стены. + +ent-ActionSpawnSpiderEggHunter = Яйцо паука охотника + +ent-ActionSpawnSpiderEggGhost = Яйцо паука призрака + +ent-ActionSpawnSpiderEggShooter = Яйцо паука стрелка + + +ent-ActionSpawnSpiderLittle = Выпустить паучат + .desc = Выпускает трёх маленьких пауков, которые атакуют вашу добычу. Пауки исчезают через 20 секунд. + + +ent-ActionSpawnSpiderCrystal = Создать осколок кристалла + .desc = Осколок, который служит подсветкой для пауков. + + +ent-ActionSpawnSpiderWallWeb = Создать стену + +ent-ActionSpawnSpiderWallWebDurable = Создать прочную стену + + +ent-ActionSpawnSingleSpiderWebShortDelay = Пустить паутину + .desc = Создаёт паутину, которая замедляет вашу добычу. + +ent-ActionSpawnSingleSpiderWebLongDelay = { ent-ActionSpawnSingleSpiderWebShortDelay } + .desc = { ent-ActionSpawnSingleSpiderWebShortDelay.desc } + +ent-ActionSpawnSingleSpiderWebDurable = Пустить прочную паутину + .desc = { ent-ActionSpawnSingleSpiderWebShortDelay.desc } + +ent-ActionSpawnSingleSpiderWebClown = Пустить клоунскую паутину + .desc = { ent-ActionSpawnSingleSpiderWebShortDelay.desc } diff --git a/Resources/Locale/ru-RU/ss220/consumable/food.ftl b/Resources/Locale/ru-RU/ss220/consumable/food.ftl new file mode 100644 index 00000000000000..b21ac44f2b5f33 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/consumable/food.ftl @@ -0,0 +1,3 @@ +ent-EggshellsSpider = скорлупа + .desc = Ты ходишь по ней, приятель. + .suffix = Улей пауков diff --git a/Resources/Locale/ru-RU/ss220/materials/crystal-shard.ftl b/Resources/Locale/ru-RU/ss220/materials/crystal-shard.ftl new file mode 100644 index 00000000000000..7632aa3a251127 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/materials/crystal-shard.ftl @@ -0,0 +1,2 @@ +ent-ShardCrystalBlueXeno = осколок синего хрусталя + .desc = Маленький кусочек хрусталя. diff --git a/Resources/Locale/ru-RU/ss220/misc/spider-eggs.ftl b/Resources/Locale/ru-RU/ss220/misc/spider-eggs.ftl new file mode 100644 index 00000000000000..b3f5cdc8308350 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/misc/spider-eggs.ftl @@ -0,0 +1,15 @@ +ent-SpiderEggHunter = яйцо паука охотника + .desc = Это драгоценный камень? Это яйцо? Оно выглядит дорогим. + .suffix = Улей пауков + +ent-SpiderEggDrone = яйцо охранного паука + .desc = { ent-SpiderEggHunter.desc } + .suffix = { ent-SpiderEggHunter.suffix } + +ent-SpiderEggGhost = яйцо паука призрака + .desc = { ent-SpiderEggHunter.desc } + .suffix = { ent-SpiderEggHunter.suffix } + +ent-SpiderEggShooter = яйцо паука стрелка + .desc = { ent-SpiderEggHunter.desc } + .suffix = { ent-SpiderEggHunter.suffix } diff --git a/Resources/Locale/ru-RU/ss220/misc/spider-implants.ftl b/Resources/Locale/ru-RU/ss220/misc/spider-implants.ftl new file mode 100644 index 00000000000000..43b6e542e5eb84 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/misc/spider-implants.ftl @@ -0,0 +1,34 @@ +ent-LightImplantSpiderEggDrone = Яйцо охранного паука + .desc = Он же трутень, может строить кристаллы и стены. + +ent-LightImplantSpiderEggHunter = Яйцо паука охотника + +ent-LightImplantSpiderEggGhost = Яйцо паука призрака + +ent-LightImplantSpiderEggShooter = Яйцо паука стрелка + + +ent-LightImplantSpiderLittle = Выпустить паучат + .desc = Выпускает трёх маленьких пауков, которые атакуют вашу добычу. Пауки исчезают через 20 секунд. + + +ent-LightImplantSpiderCrystal = Создать осколок кристалла + .desc = Осколок, который служит подсветкой для пауков. + + +ent-LightImplantSpiderWallWeb = Создать стену + +ent-LightImplantSpiderWallWebDurable = Создать прочную стену + + +ent-LightImplantSingleSpiderWebShortDelay = Пустить паутину + .desc = Создаёт паутину, которая замедляет вашу добычу. + +ent-LightImplantSingleSpiderWebLongDelay = { ent-LightImplantSingleSpiderWebShortDelay } + .desc = { ent-LightImplantSingleSpiderWebShortDelay.desc } + +ent-LightImplantSingleSpiderWebDurable = Пустить прочную паутину + .desc = { ent-LightImplantSingleSpiderWebShortDelay.desc } + +ent-LightImplantSingleSpiderWebClown = Пустить клоунскую паутину + .desc = { ent-LightImplantSingleSpiderWebShortDelay.desc } diff --git a/Resources/Locale/ru-RU/ss220/misc/spider-web.ftl b/Resources/Locale/ru-RU/ss220/misc/spider-web.ftl new file mode 100644 index 00000000000000..af70bee9639e02 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/misc/spider-web.ftl @@ -0,0 +1,11 @@ +ent-SpiderWebFragile = паутина + .desc = Липкая паутина.. Интересно, откуда она? + .suffix = Улей пауков + +ent-SpiderWebDurable = прочная паутина + .desc = { ent-SpiderWebFragile.desc } + .suffix = { ent-SpiderWebFragile.suffix } + +ent-SpiderWebDespawned = паутина + .desc = { ent-SpiderWebFragile.desc } + .suffix = { ent-SpiderWebFragile.suffix } diff --git a/Resources/Locale/ru-RU/ss220/mobs/spider-queen.ftl b/Resources/Locale/ru-RU/ss220/mobs/spider-queen.ftl new file mode 100644 index 00000000000000..f995340ad69987 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/mobs/spider-queen.ftl @@ -0,0 +1,26 @@ +spider-roy-name = Паук улья +spider-roy-desc = Ваша задача — построить максимально большой улей. Защищайте свою королеву всеми возможными способами. Не позволяйте причинить вред потомству. Экипаж - ваша пища. + +ent-MobSpiderSpaceQueen = королева пауков + .desc = Он так светится, что выглядит опасным. + .suffix = Улей пауков + +ent-MobSpiderSpaceDrone = паук охранник + .desc = { ent-MobSpiderSpaceQueen.desc } + .suffix = { ent-MobSpiderSpaceQueen.suffix } + +ent-MobSpiderSpaceHunter = паук охотник + .desc = { ent-MobSpiderSpaceQueen.desc } + .suffix = { ent-MobSpiderSpaceQueen.suffix } + +ent-MobSpiderSpaceGhost = паук призрак + .desc = { ent-MobSpiderSpaceQueen.desc } + .suffix = { ent-MobSpiderSpaceQueen.suffix } + +ent-MobSpiderSpaceShooter = паук стрелок + .desc = { ent-MobSpiderSpaceQueen.desc } + .suffix = { ent-MobSpiderSpaceQueen.suffix } + +ent-MobSpiderSpaceLittle = паучок + .desc = { ent-MobSpiderSpaceQueen.desc } + .suffix = { ent-MobSpiderSpaceQueen.suffix } diff --git a/Resources/Locale/ru-RU/ss220/strucrure/spider-structures.ftl b/Resources/Locale/ru-RU/ss220/strucrure/spider-structures.ftl new file mode 100644 index 00000000000000..0439b9e7682d49 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/strucrure/spider-structures.ftl @@ -0,0 +1,19 @@ +ent-TableWebSpiders = каркас стены из паутины + .desc = Очень гладкий и удивительно прочный. + .suffix = Улей пауков + +ent-FloorTileItemWebSpiders = конструкция из паутины + .desc = { ent-TableWebSpiders.desc } + .suffix = { ent-TableWebSpiders.suffix } + +ent-FloorTileItemWebSpidersDurable = конструкция из паутины + .desc = { ent-TableWebSpiders.desc } + .suffix = { ent-TableWebSpiders.suffix } + +ent-TableWebSpidersDurable = каркас стены из паутины + .desc = { ent-TableWebSpiders.desc } + .suffix = { ent-TableWebSpiders.suffix } + +ent-WallWebDurable = прочная паутинная стена + .desc = Удерживает паучат внутри, а ассистентов снаружи. + .suffix = { ent-TableWebSpiders.suffix } diff --git a/Resources/Locale/ru-RU/ss220/weapons/projectiles.ftl b/Resources/Locale/ru-RU/ss220/weapons/projectiles.ftl new file mode 100644 index 00000000000000..af525be207de7a --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/weapons/projectiles.ftl @@ -0,0 +1 @@ +ent-PoisonousAcid = ядовитый плевой diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index cba5e3278ab473..98361826a6bf4b 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -1,10 +1,7 @@ #Base - type: entity id: BaseActionSpawnSpiderEgg - name: spider-spawn-egg-guard - description: spider-spawn-egg-guard-desc abstract: true - noSpawn: true components: - type: WorldTargetAction useDelay: 200 @@ -22,10 +19,9 @@ - type: entity id: BaseActionSpawnSingleSpiderWeb - name: spider-spawn-web - description: spider-spawn-web-desc + name: spin a web + description: Creates a web that slows down your prey. abstract: true - noSpawn: true components: - type: WorldTargetAction useDelay: 4 @@ -45,8 +41,8 @@ - type: entity parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggDrone - name: spider-spawn-egg-guard - description: spider-spawn-egg-guard-desc + name: guard spider egg + description: He is also a drone and can build crystals and walls. noSpawn: true components: - type: WorldTargetAction @@ -60,7 +56,7 @@ - type: entity parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggHunter - name: spider-spawn-egg-hunt + name: hunter spider egg noSpawn: true components: - type: WorldTargetAction @@ -75,7 +71,7 @@ - type: entity parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggGhost - name: spider-spawn-egg-ghost + name: ghost spider egg noSpawn: true components: - type: WorldTargetAction @@ -90,7 +86,7 @@ - type: entity parent: BaseActionSpawnSpiderEgg id: ActionSpawnSpiderEggShooter - name: spider-spawn-egg-shooter + name: shooter spider egg noSpawn: true components: - type: WorldTargetAction @@ -105,8 +101,8 @@ #Spider - type: entity id: ActionSpawnSpiderLittle - name: spider-spawn-smallspider - description: spider-spawn-smallspider-desc + name: release the spiderlings + description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. noSpawn: true components: - type: WorldTargetAction @@ -126,8 +122,8 @@ #Cryctal - type: entity id: ActionSpawnSpiderCrystal - name: spider-spawn-kristal - description: spider-spawn-kristal-desc + name: create a crystal shard + description: A shard that serves as a backlight for spiders. noSpawn: true components: - type: WorldTargetAction @@ -144,10 +140,10 @@ offset: 0, 1 speech: action-speech-spell-spider -#Wall +#WallLightImplantSpiderWallWebLongDelay - type: entity id: ActionSpawnSpiderWallWeb - name: spider-spawn-wall + name: create a wall noSpawn: true components: - type: WorldTargetAction @@ -172,8 +168,8 @@ - type: entity parent: ActionSpawnSpiderWallWeb - id: ActionSpawnSpiderWallWebLongDelay - name: spider-spawn-wall3 + id: ActionSpawnSpiderWallWebDurable + name: create a durable wall noSpawn: true components: - type: WorldTargetAction @@ -190,8 +186,6 @@ - type: entity parent: BaseActionSpawnSingleSpiderWeb id: ActionSpawnSingleSpiderWebShortDelay - name: spider-spawn-web - description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction @@ -200,8 +194,6 @@ - type: entity parent: BaseActionSpawnSingleSpiderWeb id: ActionSpawnSingleSpiderWebLongDelay - name: spider-spawn-web-hunt - description: spider-spawn-web-desc noSpawn: true components: - type: WorldTargetAction @@ -210,15 +202,14 @@ - type: entity parent: BaseActionSpawnSingleSpiderWeb id: ActionSpawnSingleSpiderWebDurable - name: spider-spawn-web-queen - description: spider-spawn-web-desc + name: spin a durable web noSpawn: true components: - type: WorldTargetAction useDelay: 4 event: !type:WorldSpawnSpellEvent prototypes: - - id: SpiderWebQueen + - id: SpiderWebDurable amount: 1 offset: 0, 1 speech: action-speech-spell-spider @@ -226,8 +217,8 @@ #Clown web - type: entity id: ActionSpawnSingleSpiderWebClown - name: spider-spawn-web-clown - description: spider-spawn-web-desc + name: spin a clown web + description: Creates a web that slows down your prey. noSpawn: true components: - type: WorldTargetAction diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index f9a1fe059d87ec..9c1edf3945f450 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -170,7 +170,7 @@ - type: AutoImplant implants: - LightImplantSpiderEggHunter - - LightImplantSpiderWallWebLongDelay + - LightImplantSpiderWallWebDurable - LightImplantSpiderEggDrone - LightImplantSpiderEggGhost - LightImplantSpiderCrystal diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml index 53a0ee9c43ceae..0d324ef27df0b7 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml @@ -1,9 +1,9 @@ #Spiders eggs - type: entity - name: eggshells parent: Eggshells id: EggshellsSpider noSpawn: true + name: eggshells description: You're walkin' on 'em bud. suffix: FraG components: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml index 448c05e2c1aa6a..4bbdd4c6b17b95 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml @@ -1,8 +1,8 @@ - type: entity id: ShardCrystalBlueXeno parent: ShardCrystalBlue - name: spider-spawn-crystal - description: spider-spawn-crystal-desc + name: shard of blue crystal + description: A small piece of crystal. noSpawn: true components: - type: Destructible diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index e3e92f5404084e..350f7bf08e58b3 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -2,9 +2,7 @@ - type: entity parent: BaseSubdermalImplant id: BaseLightImplantSpider - name: spider-spawn-egg-guard abstract: true - noSpawn: true components: - type: SubdermalImplant - type: PointLight @@ -24,7 +22,8 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderEggDrone - name: spider-spawn-egg-guard + name: guard spider egg + description: He is also a drone and can build crystals and walls. noSpawn: true components: - type: SubdermalImplant @@ -33,7 +32,7 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderEggHunter - name: spider-spawn-egg-hunt + name: hunter spider egg description: noSpawn: true components: @@ -43,7 +42,7 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderEggGhost - name: spider-spawn-egg-ghost + name: ghost spider egg noSpawn: true components: - type: SubdermalImplant @@ -52,7 +51,7 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderEggShooter - name: spider-spawn-egg-shooter + name: shooter spider egg noSpawn: true components: - type: SubdermalImplant @@ -62,7 +61,8 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderLittle - name: spider-spawn-smallspider + name: release the spiderlings + description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. noSpawn: true components: - type: SubdermalImplant @@ -72,7 +72,8 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderCrystal - name: spider-spawn-kristal + name: create a crystal shard + description: A shard that serves as a backlight for spiders. noSpawn: true components: - type: SubdermalImplant @@ -82,7 +83,7 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSpiderWallWeb - name: spider-spawn-wall + name: create a wall noSpawn: true components: - type: SubdermalImplant @@ -90,19 +91,19 @@ - type: entity parent: BaseLightImplantSpider - id: LightImplantSpiderWallWebLongDelay - name: spider-spawn-wall2 + id: LightImplantSpiderWallWebDurable + name: create a durable wall noSpawn: true components: - type: SubdermalImplant - implantAction: ActionSpawnSpiderWallWebLongDelay + implantAction: ActionSpawnSpiderWallWebDurable #Web - type: entity parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebShortDelay - name: spider-spawn-web - description: spider-spawn-web-desc + name: spin a web + description: Creates a web that slows down your prey. noSpawn: true components: - type: SubdermalImplant @@ -111,8 +112,8 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebLongDelay - name: spider-spawn-web-hunt - description: spider-spawn-web-desc + name: spin a web + description: Creates a web that slows down your prey. noSpawn: true components: - type: SubdermalImplant @@ -121,8 +122,8 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebDurable - name: spider-spawn-web-queen - description: spider-spawn-web-desc + name: spin a durable web + description: Creates a web that slows down your prey. noSpawn: true components: - type: SubdermalImplant @@ -131,8 +132,8 @@ - type: entity parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebClown - name: spider-spawn-web-clown - description: spider-spawn-web-desc + name: spin a clown web + description: Creates a web that slows down your prey. noSpawn: true components: - type: SubdermalImplant diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml index 898927b506f0e0..125269cebc6acd 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml @@ -4,7 +4,7 @@ - type: entity id: BaseSpiderWeb name: web - description: web + description: Sticky web.. I wonder where it comes from? abstract: true noSpawn: true placement: @@ -72,7 +72,6 @@ parent: BaseSpiderWeb id: SpiderWebFragile name: web - description: web placement: mode: SnapgridCenter snap: @@ -93,8 +92,7 @@ - type: entity parent: BaseSpiderWeb id: SpiderWebDurable - name: web - description: web + name: durable web placement: mode: SnapgridCenter snap: @@ -116,7 +114,6 @@ parent: BaseSpiderWeb id: SpiderWebDespawned name: web - description: web noSpawn: true placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 1009e9dad8bff4..dc8f86fc3af63e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -114,7 +114,7 @@ #Spider queen - type: entity id: PoisonousAcid - name: spider-split + name: poisonous Spit parent: BaseBullet noSpawn: true components: diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml index 0258d454179bf1..d40dea98086825 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml @@ -79,8 +79,8 @@ #Table (заглушка типо как анимация) - type: entity - id: TableWebSpiders parent: TableBase + id: TableWebSpiders name: web description: web noSpawn: true @@ -116,8 +116,8 @@ prototype: WallWeb - type: entity - id: TableWebSpidersDurable parent: TableWebSpiders + id: TableWebSpidersDurable name: web description: web noSpawn: true From 973590849f9fa04fe3a1ddf2a953384bad02daf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 16:37:03 +0300 Subject: [PATCH 12/34] Some fixes 2 --- .../Entities/Objects/Misc/spider_eggs.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml index 1fea9564b28684..e7ca433c075e3c 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -107,20 +107,8 @@ - type: SpawnOnDespawn #Spiders -- type: entity - parent: BaseItemSpider - id: SpiderEggHunter - noSpawn: true - name: the-egg-of-the-spider-guard - description: Is it a gemstone? Is it an egg? It looks expensive. - components: - - type: TimedDespawn #Система цикла - lifetime: 80 - - type: SpawnOnDespawn - prototype: MobSpiderSpaceHunter #Система цикла - - type: entity - parent: SpiderEggHunter + parent: BaseSpiderEgg id: SpiderEggDrone noSpawn: true name: spider hive egg @@ -131,8 +119,20 @@ - type: SpawnOnDespawn prototype: MobSpiderSpaceDrone +- type: entity + parent: BaseSpiderEgg + id: SpiderEggHunter + noSpawn: true + name: the-egg-of-the-spider-guard + description: Is it a gemstone? Is it an egg? It looks expensive. + components: + - type: TimedDespawn #Система цикла + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceHunter #Система цикла + - type: entity - parent: SpiderEggDrone + parent: BaseSpiderEgg id: SpiderEggGhost noSpawn: true name: spider hive egg @@ -144,7 +144,7 @@ prototype: MobSpiderSpaceGhost - type: entity - parent: SpiderEggDrone + parent: BaseSpiderEgg id: SpiderEggShooter noSpawn: true name: spider hive egg From 352138e96b4e2c94e7afb61713c91b5b4daa64cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 16:53:33 +0300 Subject: [PATCH 13/34] Yaml linter fixes --- Resources/Locale/ru-RU/ss220/headset-component.ftl | 2 ++ Resources/Prototypes/SS220/Actions/Spider_actions.yml | 5 ----- .../Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml | 4 ++-- .../Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml | 2 +- Resources/Prototypes/SS220/radio_channels.yml | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/headset-component.ftl b/Resources/Locale/ru-RU/ss220/headset-component.ftl index 70ae720b26ad5a..980cafc0307f09 100644 --- a/Resources/Locale/ru-RU/ss220/headset-component.ftl +++ b/Resources/Locale/ru-RU/ss220/headset-component.ftl @@ -5,3 +5,5 @@ chat-radio-alpha = Альфа chat-radio-omega = Омега chat-radio-traders = Торговцы chat-radio-honk = Хонк-сквад + +chat-radio-hive = Улей diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 98361826a6bf4b..2033c543b4121a 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -149,19 +149,15 @@ - type: WorldTargetAction useDelay: 8 range: 1.5 - hungerCost: 15 itemIconStyle: BigAction icon: sprite: Structures/Walls/web.rsi state: full useDelay: 30 event: !type:WorldSpawnSpellEvent - useDelay: 25 prototypes: - id: FloorTileItemWebSpiders - doAfter: 5 amount: 1 - useDelay: 25 offset: 0, 1 doAfter: 5 speech: action-speech-spell-spider @@ -175,7 +171,6 @@ - type: WorldTargetAction useDelay: 10 event: !type:WorldSpawnSpellEvent - useDelay: 25 prototypes: - id: FloorTileItemWebSpidersDurable doAfter: 5 diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 9c1edf3945f450..bb9c380e8dd137 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -26,7 +26,7 @@ 0: Alive 300: Dead - type: Stamina - excess: 150 + critThreshold: 150 - type: DamageStateVisuals states: Alive: @@ -97,7 +97,7 @@ - CannotSuicide - DoorBumpOpener - type: Tool # Open door from xeno.yml. - speed: 1.5 + speedModifier: 1.5 qualities: - Prying useSound: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml index e7ca433c075e3c..ea268419408bb0 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -10,7 +10,7 @@ - type: MovedByPressure - type: EmitSoundOnCollide sound: - path: /Audio/Effects/wall_bonk.ogg + collection: WeakHit - type: EmitSoundOnLand sound: path: /Audio/Effects/drop.ogg diff --git a/Resources/Prototypes/SS220/radio_channels.yml b/Resources/Prototypes/SS220/radio_channels.yml index 6eb3197e3469c2..6fae7c288bbdc4 100644 --- a/Resources/Prototypes/SS220/radio_channels.yml +++ b/Resources/Prototypes/SS220/radio_channels.yml @@ -195,7 +195,7 @@ #Spider queen antag - type: radioChannel #Connection id: HiveRadio - name: Улей + name: chat-radio-hive keycode: 'у' frequency: 2885 color: "#cc80ff" From 2557e38c834aa8c37068b85af8715413db2fca74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 16:57:18 +0300 Subject: [PATCH 14/34] Fix comment --- Resources/Prototypes/SS220/Actions/Spider_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 2033c543b4121a..5b06dacf310ef1 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -140,7 +140,7 @@ offset: 0, 1 speech: action-speech-spell-spider -#WallLightImplantSpiderWallWebLongDelay +#Wall - type: entity id: ActionSpawnSpiderWallWeb name: create a wall From cd0730df535bd54066875474fcfd0351941e584f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 17:01:56 +0300 Subject: [PATCH 15/34] Yaml linter fixes 2 --- .../SS220/Actions/Spider_actions.yml | 3 --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 18 ++++-------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 5b06dacf310ef1..5b90a3c22ab486 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -159,7 +159,6 @@ - id: FloorTileItemWebSpiders amount: 1 offset: 0, 1 - doAfter: 5 speech: action-speech-spell-spider - type: entity @@ -173,9 +172,7 @@ event: !type:WorldSpawnSpellEvent prototypes: - id: FloorTileItemWebSpidersDurable - doAfter: 5 amount: 1 - useDelay: 25 #Web - type: entity diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index bb9c380e8dd137..90b84c6ea80125 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -221,8 +221,6 @@ thresholds: 0: Alive 85: Dead #HP - - type: Stamina - excess: 150 - type: DamageStateVisuals states: Alive: @@ -284,9 +282,7 @@ - type: MobThresholds thresholds: 0: Alive - 110: Dead - - type: Stamina - excess: 150 + 110: Dead - type: DamageStateVisuals states: Alive: @@ -346,9 +342,7 @@ - type: MobThresholds thresholds: 0: Alive - 100: Dead - - type: Stamina - excess: 150 + 100: Dead - type: DamageStateVisuals states: Alive: @@ -424,9 +418,7 @@ - type: MobThresholds thresholds: 0: Alive - 80: Dead - - type: Stamina - excess: 150 + 80: Dead - type: DamageStateVisuals states: Alive: @@ -498,9 +490,7 @@ - type: MobThresholds thresholds: 0: Alive - 15: Dead - - type: Stamina - excess: 150 + 15: Dead - type: DamageStateVisuals states: Alive: From a33b6308fb8b5f6877c48725f345bb5ac7957b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Wed, 7 Aug 2024 23:33:00 +0300 Subject: [PATCH 16/34] Try fix checks --- .../Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml index ea268419408bb0..5335c331d321c6 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -48,6 +48,8 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: StaticPrice + price: 100 - type: entity parent: BaseItemSpider From ea5daa790a20876070bffb3c04765357b331cd53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 00:39:15 +0300 Subject: [PATCH 17/34] Try fix checks 2 --- .../Structures/Specific/spider_structures.yml | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml index d40dea98086825..2135e873d21467 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml @@ -60,7 +60,7 @@ - type: TimedDespawn lifetime: 5 - type: SpawnOnDespawn - prototype: TableWebSpiders + prototype: WallWeb - type: entity name: web @@ -72,64 +72,64 @@ - type: TimedDespawn lifetime: 6 - type: SpawnOnDespawn - prototype: TableWebSpidersDurable + prototype: WallWebDurable - type: Sprite shader: unshaded color: gray #Table (заглушка типо как анимация) -- type: entity - parent: TableBase - id: TableWebSpiders - name: web - description: web - noSpawn: true - components: - - type: Damageable - damageModifierSet: Web - - type: Sprite - sprite: Structures/Furniture/Tables/web.rsi - - type: Icon - sprite: Structures/Furniture/Tables/web.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: MeleeSound - soundGroups: - Brute: - path: - "/Audio/Weapons/slash.ogg" - - type: Construction - graph: WebStructures - node: table - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepCarpet - - type: TimedDespawn - lifetime: 5 - - type: SpawnOnDespawn - prototype: WallWeb +# - type: entity +# parent: TableBase +# id: TableWebSpiders +# name: web +# description: web +# noSpawn: true +# components: +# - type: Damageable +# damageModifierSet: Web +# - type: Sprite +# sprite: Structures/Furniture/Tables/web.rsi +# - type: Icon +# sprite: Structures/Furniture/Tables/web.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 10 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: MeleeSound +# soundGroups: +# Brute: +# path: +# "/Audio/Weapons/slash.ogg" +# - type: Construction +# graph: WebStructures +# node: table +# - type: FootstepModifier +# footstepSoundCollection: +# collection: FootstepCarpet +# - type: TimedDespawn +# lifetime: 5 +# - type: SpawnOnDespawn +# prototype: WallWeb -- type: entity - parent: TableWebSpiders - id: TableWebSpidersDurable - name: web - description: web - noSpawn: true - components: - - type: TimedDespawn - lifetime: 8 - - type: SpawnOnDespawn - prototype: WallWebDurable - - type: Sprite - sprite: Structures/Furniture/Tables/web.rsi - shader: unshaded - color: gray +# - type: entity +# parent: TableWebSpiders +# id: TableWebSpidersDurable +# name: web +# description: web +# noSpawn: true +# components: +# - type: TimedDespawn +# lifetime: 8 +# - type: SpawnOnDespawn +# prototype: WallWebDurable +# - type: Sprite +# sprite: Structures/Furniture/Tables/web.rsi +# shader: unshaded +# color: gray #Wall - type: entity From 70c87121c32f155f86b63f53ca110a7518f511d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 10:24:02 +0300 Subject: [PATCH 18/34] Try found corrupt file --- .../SS220/Actions/Spider_actions.yml | 56 ++-- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 28 +- .../Entities/Objects/Misc/spider_implants.yml | 55 ++-- .../Entities/Objects/Misc/spider_web.yml | 242 +++++++++--------- 4 files changed, 191 insertions(+), 190 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 5b90a3c22ab486..fb30451c725d40 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -175,36 +175,36 @@ amount: 1 #Web -- type: entity - parent: BaseActionSpawnSingleSpiderWeb - id: ActionSpawnSingleSpiderWebShortDelay - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 2 +# - type: entity +# parent: BaseActionSpawnSingleSpiderWeb +# id: ActionSpawnSingleSpiderWebShortDelay +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 2 -- type: entity - parent: BaseActionSpawnSingleSpiderWeb - id: ActionSpawnSingleSpiderWebLongDelay - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 6 +# - type: entity +# parent: BaseActionSpawnSingleSpiderWeb +# id: ActionSpawnSingleSpiderWebLongDelay +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 6 -- type: entity - parent: BaseActionSpawnSingleSpiderWeb - id: ActionSpawnSingleSpiderWebDurable - name: spin a durable web - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 4 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderWebDurable - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# parent: BaseActionSpawnSingleSpiderWeb +# id: ActionSpawnSingleSpiderWebDurable +# name: spin a durable web +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 4 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderWebDurable +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider #Clown web - type: entity diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 90b84c6ea80125..617aeb93845e3e 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -175,7 +175,7 @@ - LightImplantSpiderEggGhost - LightImplantSpiderCrystal - LightImplantSpiderLittle - - LightImplantSingleSpiderWebDurable + # - LightImplantSingleSpiderWebDurable - LightImplantSpiderEggShooter - type: Butcherable spawned: @@ -183,8 +183,8 @@ amount: 3 - id: MobSpiderSpaceLittle amount: 7 - - type: Spider - webPrototype: SpiderWebDespawned + # - type: Spider + # webPrototype: SpiderWebDespawned - type: RechargeBasicEntityAmmo rechargeCooldown: 1.5 - type: BasicEntityAmmoProvider @@ -259,9 +259,9 @@ implants: - LightImplantSpiderWallWeb - LightImplantSpiderCrystal - - LightImplantSingleSpiderWebShortDelay - - type: Spider - webPrototype: SpiderWebDespawned + # - LightImplantSingleSpiderWebShortDelay + # - type: Spider + # webPrototype: SpiderWebDespawned - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.9 @@ -317,14 +317,14 @@ reagents: - ReagentId: ChloralHydrate Quantity: 0 - - type: Spider - webPrototype: SpiderWebDespawned + # - type: Spider + # webPrototype: SpiderWebDespawned - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.9 - - type: AutoImplant - implants: - - LightImplantSingleSpiderWebLongDelay + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebLongDelay - type: entity parent: BaseMobSpiderQueen @@ -398,9 +398,9 @@ - type: MovementSpeedModifier baseWalkSpeed : 1.5 baseSprintSpeed : 3.9 - - type: AutoImplant - implants: - - LightImplantSingleSpiderWebLongDelay + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebLongDelay - type: entity parent: BaseMobSpiderQueen diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index 350f7bf08e58b3..e3446883562e06 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -99,36 +99,37 @@ implantAction: ActionSpawnSpiderWallWebDurable #Web -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSingleSpiderWebShortDelay - name: spin a web - description: Creates a web that slows down your prey. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSingleSpiderWebShortDelay +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSingleSpiderWebShortDelay +# name: spin a web +# description: Creates a web that slows down your prey. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSingleSpiderWebShortDelay -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSingleSpiderWebLongDelay - name: spin a web - description: Creates a web that slows down your prey. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSingleSpiderWebLongDelay +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSingleSpiderWebLongDelay +# name: spin a web +# description: Creates a web that slows down your prey. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSingleSpiderWebLongDelay -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSingleSpiderWebDurable - name: spin a durable web - description: Creates a web that slows down your prey. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSingleSpiderWebDurable +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSingleSpiderWebDurable +# name: spin a durable web +# description: Creates a web that slows down your prey. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSingleSpiderWebDurable +#Clown web - type: entity parent: BaseLightImplantSpider id: LightImplantSingleSpiderWebClown diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml index 125269cebc6acd..5ce8c09ffdb8ef 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml @@ -1,127 +1,127 @@ #Spider queen webs #Base -- type: entity - id: BaseSpiderWeb - name: web - description: Sticky web.. I wonder where it comes from? - abstract: true - noSpawn: true - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: MeleeSound - soundGroups: - Brute: - path: - "/Audio/Weapons/slash.ogg" - - type: Sprite - sprite: Objects/Misc/spiderweb.rsi - layers: - - state: spider_web_1 - map: ["spiderWebLayer"] - drawdepth: WallMountedItems - - type: Appearance - - type: GenericVisualizer - visuals: - enum.SpiderWebVisuals.Variant: - spiderWebLayer: - 1: {state: spider_web_1} - 2: {state: spider_web_2} - - type: Clickable - - type: Transform - anchored: true - - type: Physics - - type: Fixtures - fixtures: - fix1: - hard: false - density: 7 - shape: - !type:PhysShapeAabb - bounds: "-0.5,-0.5,0.5,0.5" - layer: - - MidImpassable - - type: Damageable - damageModifierSet: Wood - - type: Destructible - - type: Temperature - heatDamage: - types: - Heat: 5 - coldDamage: {} - coldDamageThreshold: 0 - - type: Flammable - fireSpread: true - damage: - types: - Heat: 5 - - type: Reactive - groups: - Flammable: [Touch] - Extinguish: [Touch] - - type: SpiderWebObject - - type: SpeedModifierContacts - ignoreWhitelist: - components: - - IgnoreSpiderWeb +# - type: entity +# id: BaseSpiderWeb +# name: web +# description: Sticky web.. I wonder where it comes from? +# abstract: true +# noSpawn: true +# placement: +# mode: SnapgridCenter +# snap: +# - Wall +# components: +# - type: MeleeSound +# soundGroups: +# Brute: +# path: +# "/Audio/Weapons/slash.ogg" +# - type: Sprite +# sprite: Objects/Misc/spiderweb.rsi +# layers: +# - state: spider_web_1 +# map: ["spiderWebLayer"] +# drawdepth: WallMountedItems +# - type: Appearance +# - type: GenericVisualizer +# visuals: +# enum.SpiderWebVisuals.Variant: +# spiderWebLayer: +# 1: {state: spider_web_1} +# 2: {state: spider_web_2} +# - type: Clickable +# - type: Transform +# anchored: true +# - type: Physics +# - type: Fixtures +# fixtures: +# fix1: +# hard: false +# density: 7 +# shape: +# !type:PhysShapeAabb +# bounds: "-0.5,-0.5,0.5,0.5" +# layer: +# - MidImpassable +# - type: Damageable +# damageModifierSet: Wood +# - type: Destructible +# - type: Temperature +# heatDamage: +# types: +# Heat: 5 +# coldDamage: {} +# coldDamageThreshold: 0 +# - type: Flammable +# fireSpread: true +# damage: +# types: +# Heat: 5 +# - type: Reactive +# groups: +# Flammable: [Touch] +# Extinguish: [Touch] +# - type: SpiderWebObject +# - type: SpeedModifierContacts +# ignoreWhitelist: +# components: +# - IgnoreSpiderWeb -- type: entity - parent: BaseSpiderWeb - id: SpiderWebFragile - name: web - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: SpeedModifierContacts - walkSpeedModifier: 0.25 - sprintSpeedModifier: 0.25 +# - type: entity +# parent: BaseSpiderWeb +# id: SpiderWebFragile +# name: web +# placement: +# mode: SnapgridCenter +# snap: +# - Wall +# components: +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 30 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: SpeedModifierContacts +# walkSpeedModifier: 0.25 +# sprintSpeedModifier: 0.25 -- type: entity - parent: BaseSpiderWeb - id: SpiderWebDurable - name: durable web - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: SpeedModifierContacts - walkSpeedModifier: 0.15 - sprintSpeedModifier: 0.15 +# - type: entity +# parent: BaseSpiderWeb +# id: SpiderWebDurable +# name: durable web +# placement: +# mode: SnapgridCenter +# snap: +# - Wall +# components: +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 50 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: SpeedModifierContacts +# walkSpeedModifier: 0.15 +# sprintSpeedModifier: 0.15 -- type: entity - parent: BaseSpiderWeb - id: SpiderWebDespawned - name: web - noSpawn: true - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: TimedDespawn - lifetime: 13 - - type: SpeedModifierContacts - walkSpeedModifier: 0.1 - sprintSpeedModifier: 0.1 +# - type: entity +# parent: BaseSpiderWeb +# id: SpiderWebDespawned +# name: web +# noSpawn: true +# placement: +# mode: SnapgridCenter +# snap: +# - Wall +# components: +# - type: TimedDespawn +# lifetime: 13 +# - type: SpeedModifierContacts +# walkSpeedModifier: 0.1 +# sprintSpeedModifier: 0.1 From 24a9702eddc1dbb3961b2dda747cc6518cf1eff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 10:46:28 +0300 Subject: [PATCH 19/34] Try found corrupt file 2 --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 34 +-- .../Entities/Objects/Misc/spider_implants.yml | 194 +++++++++--------- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 617aeb93845e3e..348e40fb729fb4 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -167,16 +167,16 @@ name: Spider queen description: spider dance components: - - type: AutoImplant - implants: - - LightImplantSpiderEggHunter - - LightImplantSpiderWallWebDurable - - LightImplantSpiderEggDrone - - LightImplantSpiderEggGhost - - LightImplantSpiderCrystal - - LightImplantSpiderLittle - # - LightImplantSingleSpiderWebDurable - - LightImplantSpiderEggShooter + # - type: AutoImplant + # implants: + # - LightImplantSpiderEggHunter + # - LightImplantSpiderWallWebDurable + # - LightImplantSpiderEggDrone + # - LightImplantSpiderEggGhost + # - LightImplantSpiderCrystal + # - LightImplantSpiderLittle + # - LightImplantSingleSpiderWebDurable + # - LightImplantSpiderEggShooter - type: Butcherable spawned: - id: FoodMeatSpider @@ -255,10 +255,10 @@ reagents: - ReagentId: ChloralHydrate Quantity: 0 - - type: AutoImplant - implants: - - LightImplantSpiderWallWeb - - LightImplantSpiderCrystal + # - type: AutoImplant + # implants: + # - LightImplantSpiderWallWeb + # - LightImplantSpiderCrystal # - LightImplantSingleSpiderWebShortDelay # - type: Spider # webPrototype: SpiderWebDespawned @@ -467,9 +467,9 @@ availableModes: - FullAuto soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: AutoImplant - implants: - - LightImplantSingleSpiderWebClown + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebClown - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.7 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index e3446883562e06..7b46db3e81faa3 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -1,102 +1,102 @@ #Base -- type: entity - parent: BaseSubdermalImplant - id: BaseLightImplantSpider - abstract: true - components: - - type: SubdermalImplant - - type: PointLight - enabled: false - radius: 2.5 - softness: 5 - mask: /Textures/Effects/LightMasks/cone.png - autoRot: true - - type: Tag - tags: - - SubdermalImplant - - HideContextMenu - - Flashlight - - type: UnpoweredFlashlight +# - type: entity +# parent: BaseSubdermalImplant +# id: BaseLightImplantSpider +# abstract: true +# components: +# - type: SubdermalImplant +# - type: PointLight +# enabled: false +# radius: 2.5 +# softness: 5 +# mask: /Textures/Effects/LightMasks/cone.png +# autoRot: true +# - type: Tag +# tags: +# - SubdermalImplant +# - HideContextMenu +# - Flashlight +# - type: UnpoweredFlashlight -#Egg -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderEggDrone - name: guard spider egg - description: He is also a drone and can build crystals and walls. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderEggDrone +# #Egg +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderEggDrone +# name: guard spider egg +# description: He is also a drone and can build crystals and walls. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderEggDrone -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderEggHunter - name: hunter spider egg - description: - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderEggHunter +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderEggHunter +# name: hunter spider egg +# description: +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderEggHunter -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderEggGhost - name: ghost spider egg - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderEggGhost +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderEggGhost +# name: ghost spider egg +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderEggGhost -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderEggShooter - name: shooter spider egg - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderEggShooter +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderEggShooter +# name: shooter spider egg +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderEggShooter #Spider -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderLittle - name: release the spiderlings - description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderLittle +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderLittle +# name: release the spiderlings +# description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderLittle -#Cristal -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderCrystal - name: create a crystal shard - description: A shard that serves as a backlight for spiders. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderCrystal +# #Cristal +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderCrystal +# name: create a crystal shard +# description: A shard that serves as a backlight for spiders. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderCrystal #Wall -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderWallWeb - name: create a wall - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderWallWeb +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderWallWeb +# name: create a wall +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderWallWeb -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSpiderWallWebDurable - name: create a durable wall - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSpiderWallWebDurable +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSpiderWallWebDurable +# name: create a durable wall +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSpiderWallWebDurable #Web # - type: entity @@ -130,12 +130,12 @@ # implantAction: ActionSpawnSingleSpiderWebDurable #Clown web -- type: entity - parent: BaseLightImplantSpider - id: LightImplantSingleSpiderWebClown - name: spin a clown web - description: Creates a web that slows down your prey. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSpawnSingleSpiderWebClown +# - type: entity +# parent: BaseLightImplantSpider +# id: LightImplantSingleSpiderWebClown +# name: spin a clown web +# description: Creates a web that slows down your prey. +# noSpawn: true +# components: +# - type: SubdermalImplant +# implantAction: ActionSpawnSingleSpiderWebClown From 6899cf623e2b531c9a5d0af5bf7ff88bb6df353f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 11:03:58 +0300 Subject: [PATCH 20/34] Try found corrupt file 3 --- .../SS220/Actions/Spider_actions.yml | 360 +++++++++--------- 1 file changed, 180 insertions(+), 180 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index fb30451c725d40..77ecf5552d98ac 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -1,178 +1,178 @@ #Base -- type: entity - id: BaseActionSpawnSpiderEgg - abstract: true - components: - - type: WorldTargetAction - useDelay: 200 - range: 1 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/eggspider.rsi - state: icon - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderEggDrone - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# id: BaseActionSpawnSpiderEgg +# abstract: true +# components: +# - type: WorldTargetAction +# useDelay: 200 +# range: 1 +# itemIconStyle: BigAction +# icon: +# sprite: Objects/Misc/eggspider.rsi +# state: icon +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderEggDrone +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider -- type: entity - id: BaseActionSpawnSingleSpiderWeb - name: spin a web - description: Creates a web that slows down your prey. - abstract: true - components: - - type: WorldTargetAction - useDelay: 4 - range: 1.5 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/spiderweb.rsi - state: spider_web_1 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderWebFragile - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# id: BaseActionSpawnSingleSpiderWeb +# name: spin a web +# description: Creates a web that slows down your prey. +# abstract: true +# components: +# - type: WorldTargetAction +# useDelay: 4 +# range: 1.5 +# itemIconStyle: BigAction +# icon: +# sprite: Objects/Misc/spiderweb.rsi +# state: spider_web_1 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderWebFragile +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider #Egg -- type: entity - parent: BaseActionSpawnSpiderEgg - id: ActionSpawnSpiderEggDrone - name: guard spider egg - description: He is also a drone and can build crystals and walls. - noSpawn: true - components: - - type: WorldTargetAction - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderEggDrone - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# parent: BaseActionSpawnSpiderEgg +# id: ActionSpawnSpiderEggDrone +# name: guard spider egg +# description: He is also a drone and can build crystals and walls. +# noSpawn: true +# components: +# - type: WorldTargetAction +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderEggDrone +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider -- type: entity - parent: BaseActionSpawnSpiderEgg - id: ActionSpawnSpiderEggHunter - name: hunter spider egg - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 300 #КД - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderEggHunter - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# parent: BaseActionSpawnSpiderEgg +# id: ActionSpawnSpiderEggHunter +# name: hunter spider egg +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 300 #КД +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderEggHunter +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider -- type: entity - parent: BaseActionSpawnSpiderEgg - id: ActionSpawnSpiderEggGhost - name: ghost spider egg - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 350 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderEggGhost - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# parent: BaseActionSpawnSpiderEgg +# id: ActionSpawnSpiderEggGhost +# name: ghost spider egg +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 350 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderEggGhost +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider -- type: entity - parent: BaseActionSpawnSpiderEgg - id: ActionSpawnSpiderEggShooter - name: shooter spider egg - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 380 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderEggShooter - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# parent: BaseActionSpawnSpiderEgg +# id: ActionSpawnSpiderEggShooter +# name: shooter spider egg +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 380 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderEggShooter +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider #Spider -- type: entity - id: ActionSpawnSpiderLittle - name: release the spiderlings - description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 40 - range: 2 - itemIconStyle: BigAction - icon: - sprite: Mobs/Animals/spider.rsi - state: viper_dead - event: !type:WorldSpawnSpellEvent - prototypes: - - id: MobSpiderSpaceLittle - amount: 3 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# id: ActionSpawnSpiderLittle +# name: release the spiderlings +# description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 40 +# range: 2 +# itemIconStyle: BigAction +# icon: +# sprite: Mobs/Animals/spider.rsi +# state: viper_dead +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: MobSpiderSpaceLittle +# amount: 3 +# offset: 0, 1 +# speech: action-speech-spell-spider #Cryctal -- type: entity - id: ActionSpawnSpiderCrystal - name: create a crystal shard - description: A shard that serves as a backlight for spiders. - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 30 - range: 1 - itemIconStyle: BigAction - icon: - sprite: Structures/Decoration/crystal.rsi - state: crystal1 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: ShardCrystalBlueXeno - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# id: ActionSpawnSpiderCrystal +# name: create a crystal shard +# description: A shard that serves as a backlight for spiders. +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 30 +# range: 1 +# itemIconStyle: BigAction +# icon: +# sprite: Structures/Decoration/crystal.rsi +# state: crystal1 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: ShardCrystalBlueXeno +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider #Wall -- type: entity - id: ActionSpawnSpiderWallWeb - name: create a wall - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 8 - range: 1.5 - itemIconStyle: BigAction - icon: - sprite: Structures/Walls/web.rsi - state: full - useDelay: 30 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: FloorTileItemWebSpiders - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# id: ActionSpawnSpiderWallWeb +# name: create a wall +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 8 +# range: 1.5 +# itemIconStyle: BigAction +# icon: +# sprite: Structures/Walls/web.rsi +# state: full +# useDelay: 30 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: FloorTileItemWebSpiders +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider -- type: entity - parent: ActionSpawnSpiderWallWeb - id: ActionSpawnSpiderWallWebDurable - name: create a durable wall - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 10 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: FloorTileItemWebSpidersDurable - amount: 1 +# - type: entity +# parent: ActionSpawnSpiderWallWeb +# id: ActionSpawnSpiderWallWebDurable +# name: create a durable wall +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 10 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: FloorTileItemWebSpidersDurable +# amount: 1 #Web # - type: entity @@ -207,22 +207,22 @@ # speech: action-speech-spell-spider #Clown web -- type: entity - id: ActionSpawnSingleSpiderWebClown - name: spin a clown web - description: Creates a web that slows down your prey. - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 30 #КД - range: 1.3 - itemIconStyle: BigAction - icon: - sprite: Objects/Misc/spiderweb.rsi - state: spider_web_clown_1 - event: !type:WorldSpawnSpellEvent - prototypes: - - id: SpiderWebClown - amount: 1 - offset: 0, 1 - speech: action-speech-spell-spider +# - type: entity +# id: ActionSpawnSingleSpiderWebClown +# name: spin a clown web +# description: Creates a web that slows down your prey. +# noSpawn: true +# components: +# - type: WorldTargetAction +# useDelay: 30 #КД +# range: 1.3 +# itemIconStyle: BigAction +# icon: +# sprite: Objects/Misc/spiderweb.rsi +# state: spider_web_clown_1 +# event: !type:WorldSpawnSpellEvent +# prototypes: +# - id: SpiderWebClown +# amount: 1 +# offset: 0, 1 +# speech: action-speech-spell-spider From 9502eb9de82f75001d015e576f7953a85217c041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 11:23:22 +0300 Subject: [PATCH 21/34] Try found corrupt file 4 --- .../Entities/Objects/Misc/spider_eggs.yml | 300 +++++++++--------- .../Structures/Specific/spider_structures.yml | 232 +++++++------- 2 files changed, 266 insertions(+), 266 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml index 5335c331d321c6..1ac6ffcd78ecb7 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -1,158 +1,158 @@ #Base #TODO: Когда будет анимация для спавна стен - переделать BaseItemSpider на наследование от BaseItem -- type: entity - name: "item" - id: BaseItemSpider - abstract: true - components: - - type: Clickable - - type: InteractionOutline - - type: MovedByPressure - - type: EmitSoundOnCollide - sound: - collection: WeakHit - - type: EmitSoundOnLand - sound: - path: /Audio/Effects/drop.ogg - params: - volume: 2 - - type: DamageOnHighSpeedImpact - damage: - types: - Blunt: 5 - soundHit: - path: /Audio/Effects/hit_kick.ogg - - type: CollisionWake - - type: TileFrictionModifier - modifier: 0.5 - - type: Physics - bodyType: Dynamic - fixedRotation: false - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 20 - mask: - - ItemMask - restitution: 0.3 # fite me - friction: 0.2 - - type: Pullable - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: StaticPrice - price: 100 +# - type: entity +# name: "item" +# id: BaseItemSpider +# abstract: true +# components: +# - type: Clickable +# - type: InteractionOutline +# - type: MovedByPressure +# - type: EmitSoundOnCollide +# sound: +# collection: WeakHit +# - type: EmitSoundOnLand +# sound: +# path: /Audio/Effects/drop.ogg +# params: +# volume: 2 +# - type: DamageOnHighSpeedImpact +# damage: +# types: +# Blunt: 5 +# soundHit: +# path: /Audio/Effects/hit_kick.ogg +# - type: CollisionWake +# - type: TileFrictionModifier +# modifier: 0.5 +# - type: Physics +# bodyType: Dynamic +# fixedRotation: false +# - type: Fixtures +# fixtures: +# fix1: +# shape: +# !type:PhysShapeAabb +# bounds: "-0.25,-0.25,0.25,0.25" +# density: 20 +# mask: +# - ItemMask +# restitution: 0.3 # fite me +# friction: 0.2 +# - type: Pullable +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 1 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: StaticPrice +# price: 100 -- type: entity - parent: BaseItemSpider - id: BaseSpiderEgg - abstract: true - name: the-egg-of-the-spider-guard - description: Is it a gemstone? Is it an egg? It looks expensive. - components: - - type: Sprite - sprite: Objects/Misc/eggspider.rsi - state: icon - - type: PointLight - radius: 1.5 - energy: 3 - color: "#4faffb" - - type: StaticPrice - price: 500 - - type: Barotrauma #Урон от разгермы - damage: - types: - Blunt: 0.1 - Heat: 0.1 - - type: DamageOnHighSpeedImpact - minimumSpeed: 0.1 - damage: - types: - Blunt: 1 - - type: Damageable - damageContainer: Biological - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 5 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: desecration - - !type:SpillBehavior - solution: food - - !type:SpawnEntitiesBehavior - spawn: - EggshellsSpider: - min: 1 - max: 1 - # Wow double-yolk you're so lucky! - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: PoisonWine - Quantity: 10 - - type: TimedDespawn #Система цикла - - type: SpawnOnDespawn +# - type: entity +# parent: BaseItemSpider +# id: BaseSpiderEgg +# abstract: true +# name: the-egg-of-the-spider-guard +# description: Is it a gemstone? Is it an egg? It looks expensive. +# components: +# - type: Sprite +# sprite: Objects/Misc/eggspider.rsi +# state: icon +# - type: PointLight +# radius: 1.5 +# energy: 3 +# color: "#4faffb" +# - type: StaticPrice +# price: 500 +# - type: Barotrauma #Урон от разгермы +# damage: +# types: +# Blunt: 0.1 +# Heat: 0.1 +# - type: DamageOnHighSpeedImpact +# minimumSpeed: 0.1 +# damage: +# types: +# Blunt: 1 +# - type: Damageable +# damageContainer: Biological +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 5 +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: desecration +# - !type:SpillBehavior +# solution: food +# - !type:SpawnEntitiesBehavior +# spawn: +# EggshellsSpider: +# min: 1 +# max: 1 +# # Wow double-yolk you're so lucky! +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: SolutionContainerManager +# solutions: +# food: +# maxVol: 25 +# reagents: +# - ReagentId: PoisonWine +# Quantity: 10 +# - type: TimedDespawn #Система цикла +# - type: SpawnOnDespawn #Spiders -- type: entity - parent: BaseSpiderEgg - id: SpiderEggDrone - noSpawn: true - name: spider hive egg - description: Is this a gem? Is this an egg? It looks expensive. - components: - - type: TimedDespawn - lifetime: 55 - - type: SpawnOnDespawn - prototype: MobSpiderSpaceDrone +# - type: entity +# parent: BaseSpiderEgg +# id: SpiderEggDrone +# noSpawn: true +# name: spider hive egg +# description: Is this a gem? Is this an egg? It looks expensive. +# components: +# - type: TimedDespawn +# lifetime: 55 +# - type: SpawnOnDespawn +# prototype: MobSpiderSpaceDrone -- type: entity - parent: BaseSpiderEgg - id: SpiderEggHunter - noSpawn: true - name: the-egg-of-the-spider-guard - description: Is it a gemstone? Is it an egg? It looks expensive. - components: - - type: TimedDespawn #Система цикла - lifetime: 80 - - type: SpawnOnDespawn - prototype: MobSpiderSpaceHunter #Система цикла +# - type: entity +# parent: BaseSpiderEgg +# id: SpiderEggHunter +# noSpawn: true +# name: the-egg-of-the-spider-guard +# description: Is it a gemstone? Is it an egg? It looks expensive. +# components: +# - type: TimedDespawn #Система цикла +# lifetime: 80 +# - type: SpawnOnDespawn +# prototype: MobSpiderSpaceHunter #Система цикла -- type: entity - parent: BaseSpiderEgg - id: SpiderEggGhost - noSpawn: true - name: spider hive egg - description: Is this a gem? Is this an egg? It looks expensive. - components: - - type: TimedDespawn - lifetime: 80 - - type: SpawnOnDespawn - prototype: MobSpiderSpaceGhost +# - type: entity +# parent: BaseSpiderEgg +# id: SpiderEggGhost +# noSpawn: true +# name: spider hive egg +# description: Is this a gem? Is this an egg? It looks expensive. +# components: +# - type: TimedDespawn +# lifetime: 80 +# - type: SpawnOnDespawn +# prototype: MobSpiderSpaceGhost -- type: entity - parent: BaseSpiderEgg - id: SpiderEggShooter - noSpawn: true - name: spider hive egg - description: Is this a gem? Is this an egg? It looks expensive. - components: - - type: TimedDespawn - lifetime: 80 - - type: SpawnOnDespawn - prototype: MobSpiderSpaceShooter +# - type: entity +# parent: BaseSpiderEgg +# id: SpiderEggShooter +# noSpawn: true +# name: spider hive egg +# description: Is this a gem? Is this an egg? It looks expensive. +# components: +# - type: TimedDespawn +# lifetime: 80 +# - type: SpawnOnDespawn +# prototype: MobSpiderSpaceShooter diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml index 2135e873d21467..12046a9e9d5a8d 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml @@ -2,80 +2,80 @@ #TODO: Сделать нормальную анимацию спавна стены без использования костыля в виде спавна тайлов и столов #Base -- type: entity - parent: BaseItemSpider - id: BaseFloorTileItemSpiders - description: These could work as a pretty decent throwing weapon. - abstract: true - components: - - type: Sprite - sprite: Objects/Tiles/web.rsi - state: icon - - type: FloorTile - outputs: - - FloorWebTile - - type: DamageOtherOnHit - damage: - types: - Blunt: 5 - - type: Damageable - damageContainer: Inorganic - - type: Construction - graph: WebObjects - node: tile - - type: TimedDespawn - - type: SpawnOnDespawn - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - params: - volume: -8 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: DamageOnLand - damage: - types: - Blunt: 5 +# - type: entity +# parent: BaseItemSpider +# id: BaseFloorTileItemSpiders +# description: These could work as a pretty decent throwing weapon. +# abstract: true +# components: +# - type: Sprite +# sprite: Objects/Tiles/web.rsi +# state: icon +# - type: FloorTile +# outputs: +# - FloorWebTile +# - type: DamageOtherOnHit +# damage: +# types: +# Blunt: 5 +# - type: Damageable +# damageContainer: Inorganic +# - type: Construction +# graph: WebObjects +# node: tile +# - type: TimedDespawn +# - type: SpawnOnDespawn +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 1 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - trigger: +# !type:DamageTrigger +# damage: 20 +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: MetalBreak +# params: +# volume: -8 +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: DamageOnLand +# damage: +# types: +# Blunt: 5 #Tile (used to spawn walls) -- type: entity - parent: BaseFloorTileItemSpiders - id: FloorTileItemWebSpiders - name: web construction - description: Very smooth and surprisingly durable. - noSpawn: true - components: - - type: TimedDespawn - lifetime: 5 - - type: SpawnOnDespawn - prototype: WallWeb +# - type: entity +# parent: BaseFloorTileItemSpiders +# id: FloorTileItemWebSpiders +# name: web construction +# description: Very smooth and surprisingly durable. +# noSpawn: true +# components: +# - type: TimedDespawn +# lifetime: 5 +# - type: SpawnOnDespawn +# prototype: WallWeb -- type: entity - name: web - description: Web - parent: BaseFloorTileItemSpiders - id: FloorTileItemWebSpidersDurable - noSpawn: true - components: - - type: TimedDespawn - lifetime: 6 - - type: SpawnOnDespawn - prototype: WallWebDurable - - type: Sprite - shader: unshaded - color: gray +# - type: entity +# name: web +# description: Web +# parent: BaseFloorTileItemSpiders +# id: FloorTileItemWebSpidersDurable +# noSpawn: true +# components: +# - type: TimedDespawn +# lifetime: 6 +# - type: SpawnOnDespawn +# prototype: WallWebDurable +# - type: Sprite +# shader: unshaded +# color: gray #Table (заглушка типо как анимация) # - type: entity @@ -132,48 +132,48 @@ # color: gray #Wall -- type: entity - parent: BaseWall - id: WallWebDurable - name: web - description: web - components: - - type: Clickable - - type: MeleeSound - soundGroups: - Brute: - path: - "/Audio/Weapons/slash.ogg" - - type: Damageable - damageModifierSet: Web - - type: Tag - tags: - - Wall - - type: Sprite - sprite: Structures/Walls/web.rsi - shader: unshaded - color: gray - - type: Icon - sprite: Structures/Walls/web.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 125 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialWebSilk: - min: 1 - max: 1 - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - type: IconSmooth - key: webs - base: wall - - type: Construction - graph: WebStructures - node: wall +# - type: entity +# parent: BaseWall +# id: WallWebDurable +# name: web +# description: web +# components: +# - type: Clickable +# - type: MeleeSound +# soundGroups: +# Brute: +# path: +# "/Audio/Weapons/slash.ogg" +# - type: Damageable +# damageModifierSet: Web +# - type: Tag +# tags: +# - Wall +# - type: Sprite +# sprite: Structures/Walls/web.rsi +# shader: unshaded +# color: gray +# - type: Icon +# sprite: Structures/Walls/web.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 125 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialWebSilk: +# min: 1 +# max: 1 +# - !type:PlaySoundBehavior +# sound: +# collection: WoodDestroy +# - type: IconSmooth +# key: webs +# base: wall +# - type: Construction +# graph: WebStructures +# node: wall From 52ce085bfcbce8363edc577ae955257a80281de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 12:00:27 +0300 Subject: [PATCH 22/34] Try found corrupt file 5 --- .../Entities/Objects/Consumable/Food/egg.yml | 48 +++++++++---------- .../Objects/Materials/crystal_shard.yml | 46 +++++++++--------- .../Entities/markers/Spawners/ghost_roles.yml | 48 +++++++++---------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml index 0d324ef27df0b7..966a4cd280f5d9 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml @@ -1,25 +1,25 @@ #Spiders eggs -- type: entity - parent: Eggshells - id: EggshellsSpider - noSpawn: true - name: eggshells - description: You're walkin' on 'em bud. - suffix: FraG - components: - - type: Sprite - sprite: Objects/Consumable/Food/egg.rsi - state: eggshells - shader: unshaded - color: gray - - type: SolutionContainerManager - solutions: - food: - maxVol: 2 - reagents: - - ReagentId: PoisonWine - Quantity: 1 - - type: Tag - tags: - - Egg - - Trash +# - type: entity +# parent: Eggshells +# id: EggshellsSpider +# noSpawn: true +# name: eggshells +# description: You're walkin' on 'em bud. +# suffix: FraG +# components: +# - type: Sprite +# sprite: Objects/Consumable/Food/egg.rsi +# state: eggshells +# shader: unshaded +# color: gray +# - type: SolutionContainerManager +# solutions: +# food: +# maxVol: 2 +# reagents: +# - ReagentId: PoisonWine +# Quantity: 1 +# - type: Tag +# tags: +# - Egg +# - Trash diff --git a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml index 4bbdd4c6b17b95..38a7f6cbd43046 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml @@ -1,23 +1,23 @@ -- type: entity - id: ShardCrystalBlueXeno - parent: ShardCrystalBlue - name: shard of blue crystal - description: A small piece of crystal. - noSpawn: true - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 5 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - MaterialWebSilk: - min: 0 - max: 0 - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy +# - type: entity +# id: ShardCrystalBlueXeno +# parent: ShardCrystalBlue +# name: shard of blue crystal +# description: A small piece of crystal. +# noSpawn: true +# components: +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 5 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - !type:SpawnEntitiesBehavior +# spawn: +# MaterialWebSilk: +# min: 0 +# max: 0 +# - !type:PlaySoundBehavior +# sound: +# collection: WoodDestroy diff --git a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml index 41505b88e615af..d70b57fbbc9f84 100644 --- a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml @@ -1,25 +1,25 @@ #Used by gamerule -- type: entity - id: SpawnPointGhostSpaceQueen - name: спавнер роли королевы-пауков - suffix: паук-королева - parent: MarkerBase - components: - - type: GhostRole - name: spider-roy-name - description: spider-roy-desc - rules: spider-roy-desc - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 600 - raffle: - settings: default - - type: GhostRoleMobSpawner - prototype: MobSpiderSpaceQueen - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green - - sprite: Mobs/Animals/spider.rsi - state: midwife +# - type: entity +# id: SpawnPointGhostSpaceQueen +# name: спавнер роли королевы-пауков +# suffix: паук-королева +# parent: MarkerBase +# components: +# - type: GhostRole +# name: spider-roy-name +# description: spider-roy-desc +# rules: spider-roy-desc +# requirements: +# - !type:DepartmentTimeRequirement +# department: Security +# time: 600 +# raffle: +# settings: default +# - type: GhostRoleMobSpawner +# prototype: MobSpiderSpaceQueen +# - type: Sprite +# sprite: Markers/jobs.rsi +# layers: +# - state: green +# - sprite: Mobs/Animals/spider.rsi +# state: midwife From b2868f719a2bb717956a0196030b6fa0646cc34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 12:20:49 +0300 Subject: [PATCH 23/34] Try found corrupt file 6 --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 92 +++++++++---------- .../Weapons/Guns/Projectiles/projectiles.yml | 34 +++---- Resources/Prototypes/SS220/radio_channels.yml | 14 +-- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 348e40fb729fb4..0463142254ed4b 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -138,13 +138,13 @@ energy: 0 color: "#ff4242" castShadows: false - - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - HiveRadio - - type: ActiveRadio - channels: - - HiveRadio + # - type: IntrinsicRadioReceiver + # - type: IntrinsicRadioTransmitter + # channels: + # - HiveRadio + # - type: ActiveRadio + # channels: + # - HiveRadio - type: entity noSpawn: true @@ -185,19 +185,19 @@ amount: 7 # - type: Spider # webPrototype: SpiderWebDespawned - - type: RechargeBasicEntityAmmo - rechargeCooldown: 1.5 - - type: BasicEntityAmmoProvider - proto: PoisonousAcid - capacity: 2 - count: 2 - - type: Gun - fireRate: 1 - useKey: false - selectedMode: FullAuto - availableModes: - - FullAuto - soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 2 + # count: 2 + # - type: Gun + # fireRate: 1 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - type: MovementSpeedModifier baseWalkSpeed : 3.5 baseSprintSpeed : 4 @@ -382,19 +382,19 @@ - type: StealthOnMove passiveVisibilityRate: -0.37 movementVisibilityRate: 0.35 - - type: RechargeBasicEntityAmmo - rechargeCooldown: 1.5 - - type: BasicEntityAmmoProvider - proto: PoisonousAcid - capacity: 1 - count: 1 - - type: Gun - fireRate: 0.75 - useKey: false - selectedMode: FullAuto - availableModes: - - FullAuto - soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 1 + # count: 1 + # - type: Gun + # fireRate: 0.75 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - type: MovementSpeedModifier baseWalkSpeed : 1.5 baseSprintSpeed : 3.9 @@ -454,19 +454,19 @@ reagents: - ReagentId: ChloralHydrate Quantity: 35 - - type: RechargeBasicEntityAmmo - rechargeCooldown: 1.5 - - type: BasicEntityAmmoProvider - proto: PoisonousAcid - capacity: 3 - count: 3 - - type: Gun - fireRate: 4 - useKey: false - selectedMode: FullAuto - availableModes: - - FullAuto - soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 3 + # count: 3 + # - type: Gun + # fireRate: 4 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg # - type: AutoImplant # implants: # - LightImplantSingleSpiderWebClown diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index dc8f86fc3af63e..35897ce88827ad 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -112,20 +112,20 @@ energy: 0.9 #Spider queen -- type: entity - id: PoisonousAcid - name: poisonous Spit - parent: BaseBullet - noSpawn: true - components: - - type: Projectile - damage: - types: - Poison: 6 - Structural: 2 - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi - layers: - - state: xeno_toxic - - type: Ammo - muzzleFlash: null +# - type: entity +# id: PoisonousAcid +# name: poisonous Spit +# parent: BaseBullet +# noSpawn: true +# components: +# - type: Projectile +# damage: +# types: +# Poison: 6 +# Structural: 2 +# - type: Sprite +# sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi +# layers: +# - state: xeno_toxic +# - type: Ammo +# muzzleFlash: null diff --git a/Resources/Prototypes/SS220/radio_channels.yml b/Resources/Prototypes/SS220/radio_channels.yml index 6fae7c288bbdc4..d6ed0145b922ef 100644 --- a/Resources/Prototypes/SS220/radio_channels.yml +++ b/Resources/Prototypes/SS220/radio_channels.yml @@ -193,10 +193,10 @@ # Admin memes end #Spider queen antag -- type: radioChannel #Connection - id: HiveRadio - name: chat-radio-hive - keycode: 'у' - frequency: 2885 - color: "#cc80ff" - longRange: true +# - type: radioChannel #Connection +# id: HiveRadio +# name: chat-radio-hive +# keycode: 'у' +# frequency: 2885 +# color: "#cc80ff" +# longRange: true From 536dbb8efa5fe5efcd0d0b76cb46b16bda0b0cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 12:41:46 +0300 Subject: [PATCH 24/34] Try fount corrupt file 7 --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 1042 ++++++++--------- 1 file changed, 521 insertions(+), 521 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 0463142254ed4b..0c32de2b41d965 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -1,531 +1,531 @@ #Base -- type: entity - parent: - - MobAtmosStandard - - MobSpaceBasic - - MobSpiderGhostRole - id: BaseMobSpiderQueen - abstract: true - name: Probca - description: spider dance - components: - - type: Insulated - - type: CombatMode - - type: InputMover - - type: MobMover - - type: HTN - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1.3, 1.3 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: midwife-moving - - type: MobThresholds #HP - thresholds: - 0: Alive - 300: Dead - - type: Stamina - critThreshold: 150 - - type: DamageStateVisuals - states: - Alive: - Base: midwife-moving - Dead: - Base: midwife_dead - - type: Butcherable - spawned: - - id: FoodMeatSpider - amount: 2 - - id: EggSpider - amount: 1 - prob: 0.5 - - type: Bloodstream - bloodMaxVolume: 250 - bloodReagent: Cryoxadone - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 120 - mask: - - MobMask - layer: - - MobLayer - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0. - animation: WeaponArcBite - damage: - types: - Piercing: 12 #Damage - Poison: 4 - Structural: 15 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate #Iad - Quantity: 60 - - type: MeleeChemicalInjector - solution: melee - transferAmount: 3 - - type: InteractionPopup - successChance: 0.20 - interactSuccessString: petting-success-tarantula - interactFailureString: petting-failure-generic - - type: NoSlip - - type: IgnoreSpiderWeb - - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.Самолечение - allowedStates: - - Alive - damageCap: 300 - damage: - types: - Heat: -4.5 - groups: - Brute: -4.5 - Toxin: -7 - Airloss: -4.5 - Burn: -4.5 - - type: Tag - tags: - - CannotSuicide - - DoorBumpOpener - - type: Tool # Open door from xeno.yml. - speedModifier: 1.5 - qualities: - - Prying - useSound: - path: /Audio/Items/crowbar.ogg - - type: Prying - pryPowered: !type:Bool - true - force: !type:Bool - true - useSound: - path: /Audio/Items/crowbar.ogg - - type: Barotrauma #Damage - damage: - types: - Blunt: 1 - Heat: 1 - - type: Temperature #Damage - heatDamageThreshold: 325 - coldDamageThreshold: 260 - currentTemperature: 310.15 - specificHeat: 42 - coldDamage: - types: - Cold: 0.1 #per second, scales with temperature & other constants - heatDamage: - types: - Heat: 0.1 #per second, scales with temperature & other constants - - type: Speech #krik - speechVerb: Arachnid - speechSounds: Arachnid - - type: Vocal - sounds: - Male: UnisexArachnid - Female: UnisexArachnid - Unsexed: UnisexArachnid #krik - - type: PointLight - radius: 0 - energy: 0 - color: "#ff4242" - castShadows: false - # - type: IntrinsicRadioReceiver - # - type: IntrinsicRadioTransmitter - # channels: - # - HiveRadio - # - type: ActiveRadio - # channels: - # - HiveRadio +# - type: entity +# parent: +# - MobAtmosStandard +# - MobSpaceBasic +# - MobSpiderGhostRole +# id: BaseMobSpiderQueen +# abstract: true +# name: Probca +# description: spider dance +# components: +# - type: Insulated +# - type: CombatMode +# - type: InputMover +# - type: MobMover +# - type: HTN +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1.3, 1.3 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: midwife-moving +# - type: MobThresholds #HP +# thresholds: +# 0: Alive +# 300: Dead +# - type: Stamina +# critThreshold: 150 +# - type: DamageStateVisuals +# states: +# Alive: +# Base: midwife-moving +# Dead: +# Base: midwife_dead +# - type: Butcherable +# spawned: +# - id: FoodMeatSpider +# amount: 2 +# - id: EggSpider +# amount: 1 +# prob: 0.5 +# - type: Bloodstream +# bloodMaxVolume: 250 +# bloodReagent: Cryoxadone +# - type: Fixtures +# fixtures: +# fix1: +# shape: +# !type:PhysShapeCircle +# radius: 0.35 +# density: 120 +# mask: +# - MobMask +# layer: +# - MobLayer +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0. +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 12 #Damage +# Poison: 4 +# Structural: 15 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate #Iad +# Quantity: 60 +# - type: MeleeChemicalInjector +# solution: melee +# transferAmount: 3 +# - type: InteractionPopup +# successChance: 0.20 +# interactSuccessString: petting-success-tarantula +# interactFailureString: petting-failure-generic +# - type: NoSlip +# - type: IgnoreSpiderWeb +# - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.Самолечение +# allowedStates: +# - Alive +# damageCap: 300 +# damage: +# types: +# Heat: -4.5 +# groups: +# Brute: -4.5 +# Toxin: -7 +# Airloss: -4.5 +# Burn: -4.5 +# - type: Tag +# tags: +# - CannotSuicide +# - DoorBumpOpener +# - type: Tool # Open door from xeno.yml. +# speedModifier: 1.5 +# qualities: +# - Prying +# useSound: +# path: /Audio/Items/crowbar.ogg +# - type: Prying +# pryPowered: !type:Bool +# true +# force: !type:Bool +# true +# useSound: +# path: /Audio/Items/crowbar.ogg +# - type: Barotrauma #Damage +# damage: +# types: +# Blunt: 1 +# Heat: 1 +# - type: Temperature #Damage +# heatDamageThreshold: 325 +# coldDamageThreshold: 260 +# currentTemperature: 310.15 +# specificHeat: 42 +# coldDamage: +# types: +# Cold: 0.1 #per second, scales with temperature & other constants +# heatDamage: +# types: +# Heat: 0.1 #per second, scales with temperature & other constants +# - type: Speech #krik +# speechVerb: Arachnid +# speechSounds: Arachnid +# - type: Vocal +# sounds: +# Male: UnisexArachnid +# Female: UnisexArachnid +# Unsexed: UnisexArachnid #krik +# - type: PointLight +# radius: 0 +# energy: 0 +# color: "#ff4242" +# castShadows: false +# # - type: IntrinsicRadioReceiver +# # - type: IntrinsicRadioTransmitter +# # channels: +# # - HiveRadio +# # - type: ActiveRadio +# # channels: +# # - HiveRadio -- type: entity - noSpawn: true - name: Ghost role - id: MobSpiderGhostRole - components: - - type: GhostRole #Ghost role - makeSentient: true - allowSpeech: true - allowMovement: true - requirements: - name: spider-roy-name - description: spider-roy-desc - - type: GhostTakeoverAvailable #Ghost role +# - type: entity +# noSpawn: true +# name: Ghost role +# id: MobSpiderGhostRole +# components: +# - type: GhostRole #Ghost role +# makeSentient: true +# allowSpeech: true +# allowMovement: true +# requirements: +# name: spider-roy-name +# description: spider-roy-desc +# - type: GhostTakeoverAvailable #Ghost role #Spider queen -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceQueen - name: Spider queen - description: spider dance - components: - # - type: AutoImplant - # implants: - # - LightImplantSpiderEggHunter - # - LightImplantSpiderWallWebDurable - # - LightImplantSpiderEggDrone - # - LightImplantSpiderEggGhost - # - LightImplantSpiderCrystal - # - LightImplantSpiderLittle - # - LightImplantSingleSpiderWebDurable - # - LightImplantSpiderEggShooter - - type: Butcherable - spawned: - - id: FoodMeatSpider - amount: 3 - - id: MobSpiderSpaceLittle - amount: 7 - # - type: Spider - # webPrototype: SpiderWebDespawned - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 2 - # count: 2 - # - type: Gun - # fireRate: 1 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 4 - - type: LizardAccent +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceQueen +# name: Spider queen +# description: spider dance +# components: +# # - type: AutoImplant +# # implants: +# # - LightImplantSpiderEggHunter +# # - LightImplantSpiderWallWebDurable +# # - LightImplantSpiderEggDrone +# # - LightImplantSpiderEggGhost +# # - LightImplantSpiderCrystal +# # - LightImplantSpiderLittle +# # - LightImplantSingleSpiderWebDurable +# # - LightImplantSpiderEggShooter +# - type: Butcherable +# spawned: +# - id: FoodMeatSpider +# amount: 3 +# - id: MobSpiderSpaceLittle +# amount: 7 +# # - type: Spider +# # webPrototype: SpiderWebDespawned +# # - type: RechargeBasicEntityAmmo +# # rechargeCooldown: 1.5 +# # - type: BasicEntityAmmoProvider +# # proto: PoisonousAcid +# # capacity: 2 +# # count: 2 +# # - type: Gun +# # fireRate: 1 +# # useKey: false +# # selectedMode: FullAuto +# # availableModes: +# # - FullAuto +# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg +# - type: MovementSpeedModifier +# baseWalkSpeed : 3.5 +# baseSprintSpeed : 4 +# - type: LizardAccent #Spiders-servants -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceDrone - name: spider guard - description: spider dance - components: - - type: Sprite #Спрайт - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: guard-moving - - type: MobThresholds - thresholds: - 0: Alive - 85: Dead #HP - - type: DamageStateVisuals - states: - Alive: - Base: guard-moving - Dead: - Base: guard_dead - - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. Самолечение - allowedStates: - - Alive - damageCap: 85 - damage: - types: - Heat: -4 - groups: - Brute: -4 - Toxin: -6 - Airloss: -4 - Burn: -4 - - type: MeleeWeapon #Damage - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 5 #Damage - Structural: 10 - - type: SolutionContainerManager #Iad - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 0 - # - type: AutoImplant - # implants: - # - LightImplantSpiderWallWeb - # - LightImplantSpiderCrystal - # - LightImplantSingleSpiderWebShortDelay - # - type: Spider - # webPrototype: SpiderWebDespawned - - type: MovementSpeedModifier - baseWalkSpeed : 3 - baseSprintSpeed : 3.9 +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceDrone +# name: spider guard +# description: spider dance +# components: +# - type: Sprite #Спрайт +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: guard-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 85: Dead #HP +# - type: DamageStateVisuals +# states: +# Alive: +# Base: guard-moving +# Dead: +# Base: guard_dead +# - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. Самолечение +# allowedStates: +# - Alive +# damageCap: 85 +# damage: +# types: +# Heat: -4 +# groups: +# Brute: -4 +# Toxin: -6 +# Airloss: -4 +# Burn: -4 +# - type: MeleeWeapon #Damage +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 5 #Damage +# Structural: 10 +# - type: SolutionContainerManager #Iad +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 0 +# # - type: AutoImplant +# # implants: +# # - LightImplantSpiderWallWeb +# # - LightImplantSpiderCrystal +# # - LightImplantSingleSpiderWebShortDelay +# # - type: Spider +# # webPrototype: SpiderWebDespawned +# - type: MovementSpeedModifier +# baseWalkSpeed : 3 +# baseSprintSpeed : 3.9 -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceHunter - name: spider hunt - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: hunter-moving - - type: MobThresholds - thresholds: - 0: Alive - 110: Dead - - type: DamageStateVisuals - states: - Alive: - Base: hunter-moving - Dead: - Base: hunter_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 110 - damage: - types: - Heat: -3 - groups: - Brute: -3 - Toxin: -6 - Airloss: -3 - Burn: -3 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 15 - Structural: 15 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 0 - # - type: Spider - # webPrototype: SpiderWebDespawned - - type: MovementSpeedModifier - baseWalkSpeed : 3 - baseSprintSpeed : 3.9 - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebLongDelay +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceHunter +# name: spider hunt +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: hunter-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 110: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: hunter-moving +# Dead: +# Base: hunter_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 110 +# damage: +# types: +# Heat: -3 +# groups: +# Brute: -3 +# Toxin: -6 +# Airloss: -3 +# Burn: -3 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 15 +# Structural: 15 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 0 +# # - type: Spider +# # webPrototype: SpiderWebDespawned +# - type: MovementSpeedModifier +# baseWalkSpeed : 3 +# baseSprintSpeed : 3.9 +# # - type: AutoImplant +# # implants: +# # - LightImplantSingleSpiderWebLongDelay -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceGhost - name: spider ghost - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: nurse-moving - - type: MobThresholds - thresholds: - 0: Alive - 100: Dead - - type: DamageStateVisuals - states: - Alive: - Base: nurse-moving - Dead: - Base: nurse_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 100 - damage: - types: - Heat: -3 - groups: - Brute: -3 - Toxin: -8 - Airloss: -3 - Burn: -3 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 3 - Poison: 4 - Structural: 10 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 20 - - type: Stealth - - type: StealthOnMove - passiveVisibilityRate: -0.37 - movementVisibilityRate: 0.35 - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 1 - # count: 1 - # - type: Gun - # fireRate: 0.75 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: MovementSpeedModifier - baseWalkSpeed : 1.5 - baseSprintSpeed : 3.9 - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebLongDelay +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceGhost +# name: spider ghost +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: nurse-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 100: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: nurse-moving +# Dead: +# Base: nurse_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 100 +# damage: +# types: +# Heat: -3 +# groups: +# Brute: -3 +# Toxin: -8 +# Airloss: -3 +# Burn: -3 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 3 +# Poison: 4 +# Structural: 10 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 20 +# - type: Stealth +# - type: StealthOnMove +# passiveVisibilityRate: -0.37 +# movementVisibilityRate: 0.35 +# # - type: RechargeBasicEntityAmmo +# # rechargeCooldown: 1.5 +# # - type: BasicEntityAmmoProvider +# # proto: PoisonousAcid +# # capacity: 1 +# # count: 1 +# # - type: Gun +# # fireRate: 0.75 +# # useKey: false +# # selectedMode: FullAuto +# # availableModes: +# # - FullAuto +# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg +# - type: MovementSpeedModifier +# baseWalkSpeed : 1.5 +# baseSprintSpeed : 3.9 +# # - type: AutoImplant +# # implants: +# # - LightImplantSingleSpiderWebLongDelay -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceShooter - name: spider shooter - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: viper-moving - - type: MobThresholds - thresholds: - 0: Alive - 80: Dead - - type: DamageStateVisuals - states: - Alive: - Base: viper-moving - Dead: - Base: viper_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 80 - damage: - types: - Heat: -1.5 - groups: - Brute: -2.5 - Toxin: -5 - Airloss: -2.5 - Burn: -2.5 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Poison: 5 - Piercing: 2 - Structural: 5 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 35 - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 3 - # count: 3 - # - type: Gun - # fireRate: 4 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebClown - - type: MovementSpeedModifier - baseWalkSpeed : 3 - baseSprintSpeed : 3.7 +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceShooter +# name: spider shooter +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: viper-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 80: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: viper-moving +# Dead: +# Base: viper_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 80 +# damage: +# types: +# Heat: -1.5 +# groups: +# Brute: -2.5 +# Toxin: -5 +# Airloss: -2.5 +# Burn: -2.5 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Poison: 5 +# Piercing: 2 +# Structural: 5 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 35 +# # - type: RechargeBasicEntityAmmo +# # rechargeCooldown: 1.5 +# # - type: BasicEntityAmmoProvider +# # proto: PoisonousAcid +# # capacity: 3 +# # count: 3 +# # - type: Gun +# # fireRate: 4 +# # useKey: false +# # selectedMode: FullAuto +# # availableModes: +# # - FullAuto +# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg +# # - type: AutoImplant +# # implants: +# # - LightImplantSingleSpiderWebClown +# - type: MovementSpeedModifier +# baseWalkSpeed : 3 +# baseSprintSpeed : 3.7 -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceLittle - name: small spider - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 0.4, 0.4 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: viper-moving - - type: MobThresholds - thresholds: - 0: Alive - 15: Dead - - type: DamageStateVisuals - states: - Alive: - Base: viper-moving - Dead: - Base: viper_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 15 - damage: - types: - Heat: -0.5 - groups: - Brute: -0.5 - Toxin: -0.5 - Airloss: -0.5 - Burn: -0.5 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 5 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 0 - - type: TimedDespawn - lifetime: 20 - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 4.5 +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceLittle +# name: small spider +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 0.4, 0.4 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: viper-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 15: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: viper-moving +# Dead: +# Base: viper_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 15 +# damage: +# types: +# Heat: -0.5 +# groups: +# Brute: -0.5 +# Toxin: -0.5 +# Airloss: -0.5 +# Burn: -0.5 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 5 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 0 +# - type: TimedDespawn +# lifetime: 20 +# - type: MovementSpeedModifier +# baseWalkSpeed : 3.5 +# baseSprintSpeed : 4.5 From 270251386e7621cf0bbddcfbb1135714e350f4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 12:56:21 +0300 Subject: [PATCH 25/34] Restert checks --- Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 0c32de2b41d965..d06f433904b373 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -1,4 +1,5 @@ #Base + # - type: entity # parent: # - MobAtmosStandard From fa789dbc34be781e956b6a9e1029af8be8023baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 13:15:55 +0300 Subject: [PATCH 26/34] Try uncomment base mob --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 293 +++++++++--------- 1 file changed, 146 insertions(+), 147 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index d06f433904b373..78565016d0de09 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -1,151 +1,150 @@ #Base - -# - type: entity -# parent: -# - MobAtmosStandard -# - MobSpaceBasic -# - MobSpiderGhostRole -# id: BaseMobSpiderQueen -# abstract: true -# name: Probca -# description: spider dance -# components: -# - type: Insulated -# - type: CombatMode -# - type: InputMover -# - type: MobMover -# - type: HTN -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1.3, 1.3 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: midwife-moving -# - type: MobThresholds #HP -# thresholds: -# 0: Alive -# 300: Dead -# - type: Stamina -# critThreshold: 150 -# - type: DamageStateVisuals -# states: -# Alive: -# Base: midwife-moving -# Dead: -# Base: midwife_dead -# - type: Butcherable -# spawned: -# - id: FoodMeatSpider -# amount: 2 -# - id: EggSpider -# amount: 1 -# prob: 0.5 -# - type: Bloodstream -# bloodMaxVolume: 250 -# bloodReagent: Cryoxadone -# - type: Fixtures -# fixtures: -# fix1: -# shape: -# !type:PhysShapeCircle -# radius: 0.35 -# density: 120 -# mask: -# - MobMask -# layer: -# - MobLayer -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0. -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 12 #Damage -# Poison: 4 -# Structural: 15 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate #Iad -# Quantity: 60 -# - type: MeleeChemicalInjector -# solution: melee -# transferAmount: 3 -# - type: InteractionPopup -# successChance: 0.20 -# interactSuccessString: petting-success-tarantula -# interactFailureString: petting-failure-generic -# - type: NoSlip -# - type: IgnoreSpiderWeb -# - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.Самолечение -# allowedStates: -# - Alive -# damageCap: 300 -# damage: -# types: -# Heat: -4.5 -# groups: -# Brute: -4.5 -# Toxin: -7 -# Airloss: -4.5 -# Burn: -4.5 -# - type: Tag -# tags: -# - CannotSuicide -# - DoorBumpOpener -# - type: Tool # Open door from xeno.yml. -# speedModifier: 1.5 -# qualities: -# - Prying -# useSound: -# path: /Audio/Items/crowbar.ogg -# - type: Prying -# pryPowered: !type:Bool -# true -# force: !type:Bool -# true -# useSound: -# path: /Audio/Items/crowbar.ogg -# - type: Barotrauma #Damage -# damage: -# types: -# Blunt: 1 -# Heat: 1 -# - type: Temperature #Damage -# heatDamageThreshold: 325 -# coldDamageThreshold: 260 -# currentTemperature: 310.15 -# specificHeat: 42 -# coldDamage: -# types: -# Cold: 0.1 #per second, scales with temperature & other constants -# heatDamage: -# types: -# Heat: 0.1 #per second, scales with temperature & other constants -# - type: Speech #krik -# speechVerb: Arachnid -# speechSounds: Arachnid -# - type: Vocal -# sounds: -# Male: UnisexArachnid -# Female: UnisexArachnid -# Unsexed: UnisexArachnid #krik -# - type: PointLight -# radius: 0 -# energy: 0 -# color: "#ff4242" -# castShadows: false -# # - type: IntrinsicRadioReceiver -# # - type: IntrinsicRadioTransmitter -# # channels: -# # - HiveRadio -# # - type: ActiveRadio -# # channels: -# # - HiveRadio +- type: entity + parent: + - MobAtmosStandard + - MobSpaceBasic + - MobSpiderGhostRole + id: BaseMobSpiderQueen + abstract: true + name: Probca + description: spider dance + components: + - type: Insulated + - type: CombatMode + - type: InputMover + - type: MobMover + - type: HTN + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1.3, 1.3 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: midwife-moving + - type: MobThresholds #HP + thresholds: + 0: Alive + 300: Dead + - type: Stamina + critThreshold: 150 + - type: DamageStateVisuals + states: + Alive: + Base: midwife-moving + Dead: + Base: midwife_dead + - type: Butcherable + spawned: + - id: FoodMeatSpider + amount: 2 + - id: EggSpider + amount: 1 + prob: 0.5 + - type: Bloodstream + bloodMaxVolume: 250 + bloodReagent: Cryoxadone + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 120 + mask: + - MobMask + layer: + - MobLayer + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0. + animation: WeaponArcBite + damage: + types: + Piercing: 12 #Damage + Poison: 4 + Structural: 15 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate #Iad + Quantity: 60 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 3 + - type: InteractionPopup + successChance: 0.20 + interactSuccessString: petting-success-tarantula + interactFailureString: petting-failure-generic + - type: NoSlip + - type: IgnoreSpiderWeb + - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.Самолечение + allowedStates: + - Alive + damageCap: 300 + damage: + types: + Heat: -4.5 + groups: + Brute: -4.5 + Toxin: -7 + Airloss: -4.5 + Burn: -4.5 + - type: Tag + tags: + - CannotSuicide + - DoorBumpOpener + - type: Tool # Open door from xeno.yml. + speedModifier: 1.5 + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: Prying + pryPowered: !type:Bool + true + force: !type:Bool + true + useSound: + path: /Audio/Items/crowbar.ogg + - type: Barotrauma #Damage + damage: + types: + Blunt: 1 + Heat: 1 + - type: Temperature #Damage + heatDamageThreshold: 325 + coldDamageThreshold: 260 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold: 0.1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat: 0.1 #per second, scales with temperature & other constants + - type: Speech #krik + speechVerb: Arachnid + speechSounds: Arachnid + - type: Vocal + sounds: + Male: UnisexArachnid + Female: UnisexArachnid + Unsexed: UnisexArachnid #krik + - type: PointLight + radius: 0 + energy: 0 + color: "#ff4242" + castShadows: false + # - type: IntrinsicRadioReceiver + # - type: IntrinsicRadioTransmitter + # channels: + # - HiveRadio + # - type: ActiveRadio + # channels: + # - HiveRadio # - type: entity # noSpawn: true From fcaf3f2f9735a1f172848a74484939bc1d554de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 13:22:14 +0300 Subject: [PATCH 27/34] Try uncomment ghostrole --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 78565016d0de09..7fa1abf6f92a42 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -146,19 +146,19 @@ # channels: # - HiveRadio -# - type: entity -# noSpawn: true -# name: Ghost role -# id: MobSpiderGhostRole -# components: -# - type: GhostRole #Ghost role -# makeSentient: true -# allowSpeech: true -# allowMovement: true -# requirements: -# name: spider-roy-name -# description: spider-roy-desc -# - type: GhostTakeoverAvailable #Ghost role +- type: entity + noSpawn: true + name: Ghost role + id: MobSpiderGhostRole + components: + - type: GhostRole #Ghost role + makeSentient: true + allowSpeech: true + allowMovement: true + requirements: + name: spider-roy-name + description: spider-roy-desc + - type: GhostTakeoverAvailable #Ghost role #Spider queen # - type: entity From 082f5e15a6db834226fc591e953436e765323302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 13:55:15 +0300 Subject: [PATCH 28/34] Try uncomment spider queen mob --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 7fa1abf6f92a42..46e7c5c89cdae0 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -147,9 +147,9 @@ # - HiveRadio - type: entity - noSpawn: true name: Ghost role id: MobSpiderGhostRole + noSpawn: true components: - type: GhostRole #Ghost role makeSentient: true @@ -161,47 +161,47 @@ - type: GhostTakeoverAvailable #Ghost role #Spider queen -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceQueen -# name: Spider queen -# description: spider dance -# components: -# # - type: AutoImplant -# # implants: -# # - LightImplantSpiderEggHunter -# # - LightImplantSpiderWallWebDurable -# # - LightImplantSpiderEggDrone -# # - LightImplantSpiderEggGhost -# # - LightImplantSpiderCrystal -# # - LightImplantSpiderLittle -# # - LightImplantSingleSpiderWebDurable -# # - LightImplantSpiderEggShooter -# - type: Butcherable -# spawned: -# - id: FoodMeatSpider -# amount: 3 -# - id: MobSpiderSpaceLittle -# amount: 7 -# # - type: Spider -# # webPrototype: SpiderWebDespawned -# # - type: RechargeBasicEntityAmmo -# # rechargeCooldown: 1.5 -# # - type: BasicEntityAmmoProvider -# # proto: PoisonousAcid -# # capacity: 2 -# # count: 2 -# # - type: Gun -# # fireRate: 1 -# # useKey: false -# # selectedMode: FullAuto -# # availableModes: -# # - FullAuto -# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg -# - type: MovementSpeedModifier -# baseWalkSpeed : 3.5 -# baseSprintSpeed : 4 -# - type: LizardAccent +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceQueen + name: Spider queen + description: spider dance + components: + # - type: AutoImplant + # implants: + # - LightImplantSpiderEggHunter + # - LightImplantSpiderWallWebDurable + # - LightImplantSpiderEggDrone + # - LightImplantSpiderEggGhost + # - LightImplantSpiderCrystal + # - LightImplantSpiderLittle + # - LightImplantSingleSpiderWebDurable + # - LightImplantSpiderEggShooter + - type: Butcherable + spawned: + - id: FoodMeatSpider + amount: 3 + - id: MobSpiderSpaceLittle + amount: 7 + # - type: Spider + # webPrototype: SpiderWebDespawned + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 2 + # count: 2 + # - type: Gun + # fireRate: 1 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4 + - type: LizardAccent #Spiders-servants # - type: entity From 6ec1312f23bf876139fa65344128bd3b5d876797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 14:54:23 +0300 Subject: [PATCH 29/34] Try return mobs --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 643 +++++++++--------- 1 file changed, 321 insertions(+), 322 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 46e7c5c89cdae0..274607d70b0efd 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -155,7 +155,6 @@ makeSentient: true allowSpeech: true allowMovement: true - requirements: name: spider-roy-name description: spider-roy-desc - type: GhostTakeoverAvailable #Ghost role @@ -204,328 +203,328 @@ - type: LizardAccent #Spiders-servants -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceDrone -# name: spider guard -# description: spider dance -# components: -# - type: Sprite #Спрайт -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: guard-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 85: Dead #HP -# - type: DamageStateVisuals -# states: -# Alive: -# Base: guard-moving -# Dead: -# Base: guard_dead -# - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. Самолечение -# allowedStates: -# - Alive -# damageCap: 85 -# damage: -# types: -# Heat: -4 -# groups: -# Brute: -4 -# Toxin: -6 -# Airloss: -4 -# Burn: -4 -# - type: MeleeWeapon #Damage -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 5 #Damage -# Structural: 10 -# - type: SolutionContainerManager #Iad -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 0 -# # - type: AutoImplant -# # implants: -# # - LightImplantSpiderWallWeb -# # - LightImplantSpiderCrystal -# # - LightImplantSingleSpiderWebShortDelay -# # - type: Spider -# # webPrototype: SpiderWebDespawned -# - type: MovementSpeedModifier -# baseWalkSpeed : 3 -# baseSprintSpeed : 3.9 +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceDrone + name: spider guard + description: spider dance + components: + - type: Sprite #Спрайт + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: guard-moving + - type: MobThresholds + thresholds: + 0: Alive + 85: Dead #HP + - type: DamageStateVisuals + states: + Alive: + Base: guard-moving + Dead: + Base: guard_dead + - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. Самолечение + allowedStates: + - Alive + damageCap: 85 + damage: + types: + Heat: -4 + groups: + Brute: -4 + Toxin: -6 + Airloss: -4 + Burn: -4 + - type: MeleeWeapon #Damage + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 5 #Damage + Structural: 10 + - type: SolutionContainerManager #Iad + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + # - type: AutoImplant + # implants: + # - LightImplantSpiderWallWeb + # - LightImplantSpiderCrystal + # - LightImplantSingleSpiderWebShortDelay + # - type: Spider + # webPrototype: SpiderWebDespawned + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.9 -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceHunter -# name: spider hunt -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: hunter-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 110: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: hunter-moving -# Dead: -# Base: hunter_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 110 -# damage: -# types: -# Heat: -3 -# groups: -# Brute: -3 -# Toxin: -6 -# Airloss: -3 -# Burn: -3 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 15 -# Structural: 15 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 0 -# # - type: Spider -# # webPrototype: SpiderWebDespawned -# - type: MovementSpeedModifier -# baseWalkSpeed : 3 -# baseSprintSpeed : 3.9 -# # - type: AutoImplant -# # implants: -# # - LightImplantSingleSpiderWebLongDelay +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceHunter + name: spider hunt + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: hunter-moving + - type: MobThresholds + thresholds: + 0: Alive + 110: Dead + - type: DamageStateVisuals + states: + Alive: + Base: hunter-moving + Dead: + Base: hunter_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 110 + damage: + types: + Heat: -3 + groups: + Brute: -3 + Toxin: -6 + Airloss: -3 + Burn: -3 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 15 + Structural: 15 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + # - type: Spider + # webPrototype: SpiderWebDespawned + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.9 + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebLongDelay -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceGhost -# name: spider ghost -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: nurse-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 100: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: nurse-moving -# Dead: -# Base: nurse_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 100 -# damage: -# types: -# Heat: -3 -# groups: -# Brute: -3 -# Toxin: -8 -# Airloss: -3 -# Burn: -3 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 3 -# Poison: 4 -# Structural: 10 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 20 -# - type: Stealth -# - type: StealthOnMove -# passiveVisibilityRate: -0.37 -# movementVisibilityRate: 0.35 -# # - type: RechargeBasicEntityAmmo -# # rechargeCooldown: 1.5 -# # - type: BasicEntityAmmoProvider -# # proto: PoisonousAcid -# # capacity: 1 -# # count: 1 -# # - type: Gun -# # fireRate: 0.75 -# # useKey: false -# # selectedMode: FullAuto -# # availableModes: -# # - FullAuto -# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg -# - type: MovementSpeedModifier -# baseWalkSpeed : 1.5 -# baseSprintSpeed : 3.9 -# # - type: AutoImplant -# # implants: -# # - LightImplantSingleSpiderWebLongDelay +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceGhost + name: spider ghost + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: nurse-moving + - type: MobThresholds + thresholds: + 0: Alive + 100: Dead + - type: DamageStateVisuals + states: + Alive: + Base: nurse-moving + Dead: + Base: nurse_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 100 + damage: + types: + Heat: -3 + groups: + Brute: -3 + Toxin: -8 + Airloss: -3 + Burn: -3 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 3 + Poison: 4 + Structural: 10 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 20 + - type: Stealth + - type: StealthOnMove + passiveVisibilityRate: -0.37 + movementVisibilityRate: 0.35 + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 1 + # count: 1 + # - type: Gun + # fireRate: 0.75 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MovementSpeedModifier + baseWalkSpeed : 1.5 + baseSprintSpeed : 3.9 + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebLongDelay -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceShooter -# name: spider shooter -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: viper-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 80: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: viper-moving -# Dead: -# Base: viper_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 80 -# damage: -# types: -# Heat: -1.5 -# groups: -# Brute: -2.5 -# Toxin: -5 -# Airloss: -2.5 -# Burn: -2.5 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Poison: 5 -# Piercing: 2 -# Structural: 5 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 35 -# # - type: RechargeBasicEntityAmmo -# # rechargeCooldown: 1.5 -# # - type: BasicEntityAmmoProvider -# # proto: PoisonousAcid -# # capacity: 3 -# # count: 3 -# # - type: Gun -# # fireRate: 4 -# # useKey: false -# # selectedMode: FullAuto -# # availableModes: -# # - FullAuto -# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg -# # - type: AutoImplant -# # implants: -# # - LightImplantSingleSpiderWebClown -# - type: MovementSpeedModifier -# baseWalkSpeed : 3 -# baseSprintSpeed : 3.7 +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceShooter + name: spider shooter + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: viper-moving + - type: MobThresholds + thresholds: + 0: Alive + 80: Dead + - type: DamageStateVisuals + states: + Alive: + Base: viper-moving + Dead: + Base: viper_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 80 + damage: + types: + Heat: -1.5 + groups: + Brute: -2.5 + Toxin: -5 + Airloss: -2.5 + Burn: -2.5 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Poison: 5 + Piercing: 2 + Structural: 5 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 35 + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 3 + # count: 3 + # - type: Gun + # fireRate: 4 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebClown + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.7 -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceLittle -# name: small spider -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 0.4, 0.4 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: viper-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 15: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: viper-moving -# Dead: -# Base: viper_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 15 -# damage: -# types: -# Heat: -0.5 -# groups: -# Brute: -0.5 -# Toxin: -0.5 -# Airloss: -0.5 -# Burn: -0.5 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 5 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 0 -# - type: TimedDespawn -# lifetime: 20 -# - type: MovementSpeedModifier -# baseWalkSpeed : 3.5 -# baseSprintSpeed : 4.5 +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceLittle + name: small spider + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 0.4, 0.4 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: viper-moving + - type: MobThresholds + thresholds: + 0: Alive + 15: Dead + - type: DamageStateVisuals + states: + Alive: + Base: viper-moving + Dead: + Base: viper_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 15 + damage: + types: + Heat: -0.5 + groups: + Brute: -0.5 + Toxin: -0.5 + Airloss: -0.5 + Burn: -0.5 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 5 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + - type: TimedDespawn + lifetime: 20 + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.5 From 0e61402b3a3e14cb123f3139c4236f5b4feea576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 15:12:30 +0300 Subject: [PATCH 30/34] Mob drone check --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 604 +++++++++--------- 1 file changed, 302 insertions(+), 302 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 274607d70b0efd..4d6b99a155f2f0 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -160,47 +160,47 @@ - type: GhostTakeoverAvailable #Ghost role #Spider queen -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceQueen - name: Spider queen - description: spider dance - components: - # - type: AutoImplant - # implants: - # - LightImplantSpiderEggHunter - # - LightImplantSpiderWallWebDurable - # - LightImplantSpiderEggDrone - # - LightImplantSpiderEggGhost - # - LightImplantSpiderCrystal - # - LightImplantSpiderLittle - # - LightImplantSingleSpiderWebDurable - # - LightImplantSpiderEggShooter - - type: Butcherable - spawned: - - id: FoodMeatSpider - amount: 3 - - id: MobSpiderSpaceLittle - amount: 7 - # - type: Spider - # webPrototype: SpiderWebDespawned - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 2 - # count: 2 - # - type: Gun - # fireRate: 1 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 4 - - type: LizardAccent +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceQueen +# name: Spider queen +# description: spider dance +# components: +# # - type: AutoImplant +# # implants: +# # - LightImplantSpiderEggHunter +# # - LightImplantSpiderWallWebDurable +# # - LightImplantSpiderEggDrone +# # - LightImplantSpiderEggGhost +# # - LightImplantSpiderCrystal +# # - LightImplantSpiderLittle +# # - LightImplantSingleSpiderWebDurable +# # - LightImplantSpiderEggShooter +# - type: Butcherable +# spawned: +# - id: FoodMeatSpider +# amount: 3 +# - id: MobSpiderSpaceLittle +# amount: 7 +# # - type: Spider +# # webPrototype: SpiderWebDespawned +# # - type: RechargeBasicEntityAmmo +# # rechargeCooldown: 1.5 +# # - type: BasicEntityAmmoProvider +# # proto: PoisonousAcid +# # capacity: 2 +# # count: 2 +# # - type: Gun +# # fireRate: 1 +# # useKey: false +# # selectedMode: FullAuto +# # availableModes: +# # - FullAuto +# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg +# - type: MovementSpeedModifier +# baseWalkSpeed : 3.5 +# baseSprintSpeed : 4 +# - type: LizardAccent #Spiders-servants - type: entity @@ -253,7 +253,7 @@ melee: reagents: - ReagentId: ChloralHydrate - Quantity: 0 + Quantity: 1 # - type: AutoImplant # implants: # - LightImplantSpiderWallWeb @@ -265,266 +265,266 @@ baseWalkSpeed : 3 baseSprintSpeed : 3.9 -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceHunter - name: spider hunt - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: hunter-moving - - type: MobThresholds - thresholds: - 0: Alive - 110: Dead - - type: DamageStateVisuals - states: - Alive: - Base: hunter-moving - Dead: - Base: hunter_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 110 - damage: - types: - Heat: -3 - groups: - Brute: -3 - Toxin: -6 - Airloss: -3 - Burn: -3 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 15 - Structural: 15 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 0 - # - type: Spider - # webPrototype: SpiderWebDespawned - - type: MovementSpeedModifier - baseWalkSpeed : 3 - baseSprintSpeed : 3.9 - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebLongDelay +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceHunter +# name: spider hunt +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: hunter-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 110: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: hunter-moving +# Dead: +# Base: hunter_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 110 +# damage: +# types: +# Heat: -3 +# groups: +# Brute: -3 +# Toxin: -6 +# Airloss: -3 +# Burn: -3 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 15 +# Structural: 15 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 0 +# # - type: Spider +# # webPrototype: SpiderWebDespawned +# - type: MovementSpeedModifier +# baseWalkSpeed : 3 +# baseSprintSpeed : 3.9 +# # - type: AutoImplant +# # implants: +# # - LightImplantSingleSpiderWebLongDelay -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceGhost - name: spider ghost - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: nurse-moving - - type: MobThresholds - thresholds: - 0: Alive - 100: Dead - - type: DamageStateVisuals - states: - Alive: - Base: nurse-moving - Dead: - Base: nurse_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 100 - damage: - types: - Heat: -3 - groups: - Brute: -3 - Toxin: -8 - Airloss: -3 - Burn: -3 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 3 - Poison: 4 - Structural: 10 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 20 - - type: Stealth - - type: StealthOnMove - passiveVisibilityRate: -0.37 - movementVisibilityRate: 0.35 - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 1 - # count: 1 - # - type: Gun - # fireRate: 0.75 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - - type: MovementSpeedModifier - baseWalkSpeed : 1.5 - baseSprintSpeed : 3.9 - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebLongDelay +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceGhost +# name: spider ghost +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: nurse-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 100: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: nurse-moving +# Dead: +# Base: nurse_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 100 +# damage: +# types: +# Heat: -3 +# groups: +# Brute: -3 +# Toxin: -8 +# Airloss: -3 +# Burn: -3 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 3 +# Poison: 4 +# Structural: 10 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 20 +# - type: Stealth +# - type: StealthOnMove +# passiveVisibilityRate: -0.37 +# movementVisibilityRate: 0.35 +# # - type: RechargeBasicEntityAmmo +# # rechargeCooldown: 1.5 +# # - type: BasicEntityAmmoProvider +# # proto: PoisonousAcid +# # capacity: 1 +# # count: 1 +# # - type: Gun +# # fireRate: 0.75 +# # useKey: false +# # selectedMode: FullAuto +# # availableModes: +# # - FullAuto +# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg +# - type: MovementSpeedModifier +# baseWalkSpeed : 1.5 +# baseSprintSpeed : 3.9 +# # - type: AutoImplant +# # implants: +# # - LightImplantSingleSpiderWebLongDelay -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceShooter - name: spider shooter - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 1, 1 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: viper-moving - - type: MobThresholds - thresholds: - 0: Alive - 80: Dead - - type: DamageStateVisuals - states: - Alive: - Base: viper-moving - Dead: - Base: viper_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 80 - damage: - types: - Heat: -1.5 - groups: - Brute: -2.5 - Toxin: -5 - Airloss: -2.5 - Burn: -2.5 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Poison: 5 - Piercing: 2 - Structural: 5 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 35 - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 3 - # count: 3 - # - type: Gun - # fireRate: 4 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebClown - - type: MovementSpeedModifier - baseWalkSpeed : 3 - baseSprintSpeed : 3.7 +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceShooter +# name: spider shooter +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 1, 1 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: viper-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 80: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: viper-moving +# Dead: +# Base: viper_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 80 +# damage: +# types: +# Heat: -1.5 +# groups: +# Brute: -2.5 +# Toxin: -5 +# Airloss: -2.5 +# Burn: -2.5 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Poison: 5 +# Piercing: 2 +# Structural: 5 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 35 +# # - type: RechargeBasicEntityAmmo +# # rechargeCooldown: 1.5 +# # - type: BasicEntityAmmoProvider +# # proto: PoisonousAcid +# # capacity: 3 +# # count: 3 +# # - type: Gun +# # fireRate: 4 +# # useKey: false +# # selectedMode: FullAuto +# # availableModes: +# # - FullAuto +# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg +# # - type: AutoImplant +# # implants: +# # - LightImplantSingleSpiderWebClown +# - type: MovementSpeedModifier +# baseWalkSpeed : 3 +# baseSprintSpeed : 3.7 -- type: entity - parent: BaseMobSpiderQueen - id: MobSpiderSpaceLittle - name: small spider - description: spider dance - components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Animals/spider.rsi - scale: 0.4, 0.4 - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: viper-moving - - type: MobThresholds - thresholds: - 0: Alive - 15: Dead - - type: DamageStateVisuals - states: - Alive: - Base: viper-moving - Dead: - Base: viper_dead - - type: PassiveDamage - allowedStates: - - Alive - damageCap: 15 - damage: - types: - Heat: -0.5 - groups: - Brute: -0.5 - Toxin: -0.5 - Airloss: -0.5 - Burn: -0.5 - - type: MeleeWeapon - hidden: true - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 5 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 0 - - type: TimedDespawn - lifetime: 20 - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 4.5 +# - type: entity +# parent: BaseMobSpiderQueen +# id: MobSpiderSpaceLittle +# name: small spider +# description: spider dance +# components: +# - type: Sprite +# drawdepth: Mobs +# sprite: Mobs/Animals/spider.rsi +# scale: 0.4, 0.4 +# layers: +# - map: [ "enum.DamageStateVisualLayers.Base" ] +# state: viper-moving +# - type: MobThresholds +# thresholds: +# 0: Alive +# 15: Dead +# - type: DamageStateVisuals +# states: +# Alive: +# Base: viper-moving +# Dead: +# Base: viper_dead +# - type: PassiveDamage +# allowedStates: +# - Alive +# damageCap: 15 +# damage: +# types: +# Heat: -0.5 +# groups: +# Brute: -0.5 +# Toxin: -0.5 +# Airloss: -0.5 +# Burn: -0.5 +# - type: MeleeWeapon +# hidden: true +# soundHit: +# path: /Audio/Effects/bite.ogg +# angle: 0 +# animation: WeaponArcBite +# damage: +# types: +# Piercing: 5 +# - type: SolutionContainerManager +# solutions: +# melee: +# reagents: +# - ReagentId: ChloralHydrate +# Quantity: 0 +# - type: TimedDespawn +# lifetime: 20 +# - type: MovementSpeedModifier +# baseWalkSpeed : 3.5 +# baseSprintSpeed : 4.5 From f64e8362085e47b37321fbe4c6b79dae6cfc10cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 15:31:45 +0300 Subject: [PATCH 31/34] Mob hunter check --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 4d6b99a155f2f0..477affff4d6fe8 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -265,65 +265,65 @@ baseWalkSpeed : 3 baseSprintSpeed : 3.9 -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceHunter -# name: spider hunt -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: hunter-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 110: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: hunter-moving -# Dead: -# Base: hunter_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 110 -# damage: -# types: -# Heat: -3 -# groups: -# Brute: -3 -# Toxin: -6 -# Airloss: -3 -# Burn: -3 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 15 -# Structural: 15 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 0 -# # - type: Spider -# # webPrototype: SpiderWebDespawned -# - type: MovementSpeedModifier -# baseWalkSpeed : 3 -# baseSprintSpeed : 3.9 -# # - type: AutoImplant -# # implants: -# # - LightImplantSingleSpiderWebLongDelay +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceHunter + name: spider hunt + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: hunter-moving + - type: MobThresholds + thresholds: + 0: Alive + 110: Dead + - type: DamageStateVisuals + states: + Alive: + Base: hunter-moving + Dead: + Base: hunter_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 110 + damage: + types: + Heat: -3 + groups: + Brute: -3 + Toxin: -6 + Airloss: -3 + Burn: -3 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 15 + Structural: 15 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 0 + # - type: Spider + # webPrototype: SpiderWebDespawned + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.9 + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebLongDelay # - type: entity # parent: BaseMobSpiderQueen From b559cffee81735b8b73c7e0ff44b80c342d101d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 15:40:27 +0300 Subject: [PATCH 32/34] End of pain?... --- Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 477affff4d6fe8..c29fc9acdbd4eb 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -315,7 +315,7 @@ melee: reagents: - ReagentId: ChloralHydrate - Quantity: 0 + Quantity: 1 # - type: Spider # webPrototype: SpiderWebDespawned - type: MovementSpeedModifier From 6eb6828fbbeaf76b2849f5a345204bc5f76a0cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 16:00:21 +0300 Subject: [PATCH 33/34] Try all mobs --- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 502 +++++++++--------- 1 file changed, 242 insertions(+), 260 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index c29fc9acdbd4eb..6f59305fff1dc8 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -65,12 +65,6 @@ Piercing: 12 #Damage Poison: 4 Structural: 15 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate #Iad - Quantity: 60 - type: MeleeChemicalInjector solution: melee transferAmount: 3 @@ -160,47 +154,53 @@ - type: GhostTakeoverAvailable #Ghost role #Spider queen -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceQueen -# name: Spider queen -# description: spider dance -# components: -# # - type: AutoImplant -# # implants: -# # - LightImplantSpiderEggHunter -# # - LightImplantSpiderWallWebDurable -# # - LightImplantSpiderEggDrone -# # - LightImplantSpiderEggGhost -# # - LightImplantSpiderCrystal -# # - LightImplantSpiderLittle -# # - LightImplantSingleSpiderWebDurable -# # - LightImplantSpiderEggShooter -# - type: Butcherable -# spawned: -# - id: FoodMeatSpider -# amount: 3 -# - id: MobSpiderSpaceLittle -# amount: 7 -# # - type: Spider -# # webPrototype: SpiderWebDespawned -# # - type: RechargeBasicEntityAmmo -# # rechargeCooldown: 1.5 -# # - type: BasicEntityAmmoProvider -# # proto: PoisonousAcid -# # capacity: 2 -# # count: 2 -# # - type: Gun -# # fireRate: 1 -# # useKey: false -# # selectedMode: FullAuto -# # availableModes: -# # - FullAuto -# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg -# - type: MovementSpeedModifier -# baseWalkSpeed : 3.5 -# baseSprintSpeed : 4 -# - type: LizardAccent +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceQueen + name: Spider queen + description: spider dance + components: + # - type: AutoImplant + # implants: + # - LightImplantSpiderEggHunter + # - LightImplantSpiderWallWebDurable + # - LightImplantSpiderEggDrone + # - LightImplantSpiderEggGhost + # - LightImplantSpiderCrystal + # - LightImplantSpiderLittle + # - LightImplantSingleSpiderWebDurable + # - LightImplantSpiderEggShooter + - type: Butcherable + spawned: + - id: FoodMeatSpider + amount: 3 + - id: MobSpiderSpaceLittle + amount: 7 + # - type: Spider + # webPrototype: SpiderWebDespawned + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 2 + # count: 2 + # - type: Gun + # fireRate: 1 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate #Iad + Quantity: 60 + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4 + - type: LizardAccent #Spiders-servants - type: entity @@ -248,12 +248,6 @@ types: Piercing: 5 #Damage Structural: 10 - - type: SolutionContainerManager #Iad - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 1 # - type: AutoImplant # implants: # - LightImplantSpiderWallWeb @@ -310,12 +304,6 @@ types: Piercing: 15 Structural: 15 - - type: SolutionContainerManager - solutions: - melee: - reagents: - - ReagentId: ChloralHydrate - Quantity: 1 # - type: Spider # webPrototype: SpiderWebDespawned - type: MovementSpeedModifier @@ -325,206 +313,200 @@ # implants: # - LightImplantSingleSpiderWebLongDelay -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceGhost -# name: spider ghost -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: nurse-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 100: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: nurse-moving -# Dead: -# Base: nurse_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 100 -# damage: -# types: -# Heat: -3 -# groups: -# Brute: -3 -# Toxin: -8 -# Airloss: -3 -# Burn: -3 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 3 -# Poison: 4 -# Structural: 10 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 20 -# - type: Stealth -# - type: StealthOnMove -# passiveVisibilityRate: -0.37 -# movementVisibilityRate: 0.35 -# # - type: RechargeBasicEntityAmmo -# # rechargeCooldown: 1.5 -# # - type: BasicEntityAmmoProvider -# # proto: PoisonousAcid -# # capacity: 1 -# # count: 1 -# # - type: Gun -# # fireRate: 0.75 -# # useKey: false -# # selectedMode: FullAuto -# # availableModes: -# # - FullAuto -# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg -# - type: MovementSpeedModifier -# baseWalkSpeed : 1.5 -# baseSprintSpeed : 3.9 -# # - type: AutoImplant -# # implants: -# # - LightImplantSingleSpiderWebLongDelay +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceGhost + name: spider ghost + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: nurse-moving + - type: MobThresholds + thresholds: + 0: Alive + 100: Dead + - type: DamageStateVisuals + states: + Alive: + Base: nurse-moving + Dead: + Base: nurse_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 100 + damage: + types: + Heat: -3 + groups: + Brute: -3 + Toxin: -8 + Airloss: -3 + Burn: -3 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 3 + Poison: 4 + Structural: 10 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 20 + - type: Stealth + - type: StealthOnMove + passiveVisibilityRate: -0.37 + movementVisibilityRate: 0.35 + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 1 + # count: 1 + # - type: Gun + # fireRate: 0.75 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MovementSpeedModifier + baseWalkSpeed : 1.5 + baseSprintSpeed : 3.9 + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebLongDelay -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceShooter -# name: spider shooter -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 1, 1 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: viper-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 80: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: viper-moving -# Dead: -# Base: viper_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 80 -# damage: -# types: -# Heat: -1.5 -# groups: -# Brute: -2.5 -# Toxin: -5 -# Airloss: -2.5 -# Burn: -2.5 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Poison: 5 -# Piercing: 2 -# Structural: 5 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 35 -# # - type: RechargeBasicEntityAmmo -# # rechargeCooldown: 1.5 -# # - type: BasicEntityAmmoProvider -# # proto: PoisonousAcid -# # capacity: 3 -# # count: 3 -# # - type: Gun -# # fireRate: 4 -# # useKey: false -# # selectedMode: FullAuto -# # availableModes: -# # - FullAuto -# # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg -# # - type: AutoImplant -# # implants: -# # - LightImplantSingleSpiderWebClown -# - type: MovementSpeedModifier -# baseWalkSpeed : 3 -# baseSprintSpeed : 3.7 +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceShooter + name: spider shooter + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 1, 1 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: viper-moving + - type: MobThresholds + thresholds: + 0: Alive + 80: Dead + - type: DamageStateVisuals + states: + Alive: + Base: viper-moving + Dead: + Base: viper_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 80 + damage: + types: + Heat: -1.5 + groups: + Brute: -2.5 + Toxin: -5 + Airloss: -2.5 + Burn: -2.5 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Poison: 5 + Piercing: 2 + Structural: 5 + - type: SolutionContainerManager + solutions: + melee: + reagents: + - ReagentId: ChloralHydrate + Quantity: 35 + # - type: RechargeBasicEntityAmmo + # rechargeCooldown: 1.5 + # - type: BasicEntityAmmoProvider + # proto: PoisonousAcid + # capacity: 3 + # count: 3 + # - type: Gun + # fireRate: 4 + # useKey: false + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + # - type: AutoImplant + # implants: + # - LightImplantSingleSpiderWebClown + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 3.7 -# - type: entity -# parent: BaseMobSpiderQueen -# id: MobSpiderSpaceLittle -# name: small spider -# description: spider dance -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/spider.rsi -# scale: 0.4, 0.4 -# layers: -# - map: [ "enum.DamageStateVisualLayers.Base" ] -# state: viper-moving -# - type: MobThresholds -# thresholds: -# 0: Alive -# 15: Dead -# - type: DamageStateVisuals -# states: -# Alive: -# Base: viper-moving -# Dead: -# Base: viper_dead -# - type: PassiveDamage -# allowedStates: -# - Alive -# damageCap: 15 -# damage: -# types: -# Heat: -0.5 -# groups: -# Brute: -0.5 -# Toxin: -0.5 -# Airloss: -0.5 -# Burn: -0.5 -# - type: MeleeWeapon -# hidden: true -# soundHit: -# path: /Audio/Effects/bite.ogg -# angle: 0 -# animation: WeaponArcBite -# damage: -# types: -# Piercing: 5 -# - type: SolutionContainerManager -# solutions: -# melee: -# reagents: -# - ReagentId: ChloralHydrate -# Quantity: 0 -# - type: TimedDespawn -# lifetime: 20 -# - type: MovementSpeedModifier -# baseWalkSpeed : 3.5 -# baseSprintSpeed : 4.5 +- type: entity + parent: BaseMobSpiderQueen + id: MobSpiderSpaceLittle + name: small spider + description: spider dance + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/spider.rsi + scale: 0.4, 0.4 + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: viper-moving + - type: MobThresholds + thresholds: + 0: Alive + 15: Dead + - type: DamageStateVisuals + states: + Alive: + Base: viper-moving + Dead: + Base: viper_dead + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 15 + damage: + types: + Heat: -0.5 + groups: + Brute: -0.5 + Toxin: -0.5 + Airloss: -0.5 + Burn: -0.5 + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 5 + - type: TimedDespawn + lifetime: 20 + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.5 From a2e1b6b76c3b9786c40603c818514dc8e644e8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?= =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= Date: Thu, 8 Aug 2024 16:17:51 +0300 Subject: [PATCH 34/34] Try all files --- .../SS220/Actions/Spider_actions.yml | 416 +++++++++--------- .../SS220/Entities/Mobs/NPCs/spider_queen.yml | 152 +++---- .../Entities/Objects/Consumable/Food/egg.yml | 50 +-- .../Objects/Materials/crystal_shard.yml | 46 +- .../Entities/Objects/Misc/spider_eggs.yml | 300 ++++++------- .../Entities/Objects/Misc/spider_implants.yml | 244 +++++----- .../Entities/Objects/Misc/spider_web.yml | 243 +++++----- .../Weapons/Guns/Projectiles/projectiles.yml | 34 +- .../Structures/Specific/spider_structures.yml | 232 +++++----- .../Entities/markers/Spawners/ghost_roles.yml | 48 +- Resources/Prototypes/SS220/radio_channels.yml | 14 +- 11 files changed, 890 insertions(+), 889 deletions(-) diff --git a/Resources/Prototypes/SS220/Actions/Spider_actions.yml b/Resources/Prototypes/SS220/Actions/Spider_actions.yml index 77ecf5552d98ac..5b90a3c22ab486 100644 --- a/Resources/Prototypes/SS220/Actions/Spider_actions.yml +++ b/Resources/Prototypes/SS220/Actions/Spider_actions.yml @@ -1,228 +1,228 @@ #Base -# - type: entity -# id: BaseActionSpawnSpiderEgg -# abstract: true -# components: -# - type: WorldTargetAction -# useDelay: 200 -# range: 1 -# itemIconStyle: BigAction -# icon: -# sprite: Objects/Misc/eggspider.rsi -# state: icon -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderEggDrone -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + id: BaseActionSpawnSpiderEgg + abstract: true + components: + - type: WorldTargetAction + useDelay: 200 + range: 1 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/eggspider.rsi + state: icon + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggDrone + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider -# - type: entity -# id: BaseActionSpawnSingleSpiderWeb -# name: spin a web -# description: Creates a web that slows down your prey. -# abstract: true -# components: -# - type: WorldTargetAction -# useDelay: 4 -# range: 1.5 -# itemIconStyle: BigAction -# icon: -# sprite: Objects/Misc/spiderweb.rsi -# state: spider_web_1 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderWebFragile -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + id: BaseActionSpawnSingleSpiderWeb + name: spin a web + description: Creates a web that slows down your prey. + abstract: true + components: + - type: WorldTargetAction + useDelay: 4 + range: 1.5 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebFragile + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider #Egg -# - type: entity -# parent: BaseActionSpawnSpiderEgg -# id: ActionSpawnSpiderEggDrone -# name: guard spider egg -# description: He is also a drone and can build crystals and walls. -# noSpawn: true -# components: -# - type: WorldTargetAction -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderEggDrone -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + parent: BaseActionSpawnSpiderEgg + id: ActionSpawnSpiderEggDrone + name: guard spider egg + description: He is also a drone and can build crystals and walls. + noSpawn: true + components: + - type: WorldTargetAction + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggDrone + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider -# - type: entity -# parent: BaseActionSpawnSpiderEgg -# id: ActionSpawnSpiderEggHunter -# name: hunter spider egg -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 300 #КД -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderEggHunter -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + parent: BaseActionSpawnSpiderEgg + id: ActionSpawnSpiderEggHunter + name: hunter spider egg + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 300 #КД + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggHunter + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider -# - type: entity -# parent: BaseActionSpawnSpiderEgg -# id: ActionSpawnSpiderEggGhost -# name: ghost spider egg -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 350 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderEggGhost -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + parent: BaseActionSpawnSpiderEgg + id: ActionSpawnSpiderEggGhost + name: ghost spider egg + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 350 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggGhost + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider -# - type: entity -# parent: BaseActionSpawnSpiderEgg -# id: ActionSpawnSpiderEggShooter -# name: shooter spider egg -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 380 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderEggShooter -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + parent: BaseActionSpawnSpiderEgg + id: ActionSpawnSpiderEggShooter + name: shooter spider egg + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 380 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderEggShooter + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider #Spider -# - type: entity -# id: ActionSpawnSpiderLittle -# name: release the spiderlings -# description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 40 -# range: 2 -# itemIconStyle: BigAction -# icon: -# sprite: Mobs/Animals/spider.rsi -# state: viper_dead -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: MobSpiderSpaceLittle -# amount: 3 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + id: ActionSpawnSpiderLittle + name: release the spiderlings + description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 40 + range: 2 + itemIconStyle: BigAction + icon: + sprite: Mobs/Animals/spider.rsi + state: viper_dead + event: !type:WorldSpawnSpellEvent + prototypes: + - id: MobSpiderSpaceLittle + amount: 3 + offset: 0, 1 + speech: action-speech-spell-spider #Cryctal -# - type: entity -# id: ActionSpawnSpiderCrystal -# name: create a crystal shard -# description: A shard that serves as a backlight for spiders. -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 30 -# range: 1 -# itemIconStyle: BigAction -# icon: -# sprite: Structures/Decoration/crystal.rsi -# state: crystal1 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: ShardCrystalBlueXeno -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + id: ActionSpawnSpiderCrystal + name: create a crystal shard + description: A shard that serves as a backlight for spiders. + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 30 + range: 1 + itemIconStyle: BigAction + icon: + sprite: Structures/Decoration/crystal.rsi + state: crystal1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: ShardCrystalBlueXeno + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider #Wall -# - type: entity -# id: ActionSpawnSpiderWallWeb -# name: create a wall -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 8 -# range: 1.5 -# itemIconStyle: BigAction -# icon: -# sprite: Structures/Walls/web.rsi -# state: full -# useDelay: 30 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: FloorTileItemWebSpiders -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + id: ActionSpawnSpiderWallWeb + name: create a wall + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 8 + range: 1.5 + itemIconStyle: BigAction + icon: + sprite: Structures/Walls/web.rsi + state: full + useDelay: 30 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: FloorTileItemWebSpiders + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider -# - type: entity -# parent: ActionSpawnSpiderWallWeb -# id: ActionSpawnSpiderWallWebDurable -# name: create a durable wall -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 10 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: FloorTileItemWebSpidersDurable -# amount: 1 +- type: entity + parent: ActionSpawnSpiderWallWeb + id: ActionSpawnSpiderWallWebDurable + name: create a durable wall + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 10 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: FloorTileItemWebSpidersDurable + amount: 1 #Web -# - type: entity -# parent: BaseActionSpawnSingleSpiderWeb -# id: ActionSpawnSingleSpiderWebShortDelay -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 2 +- type: entity + parent: BaseActionSpawnSingleSpiderWeb + id: ActionSpawnSingleSpiderWebShortDelay + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 2 -# - type: entity -# parent: BaseActionSpawnSingleSpiderWeb -# id: ActionSpawnSingleSpiderWebLongDelay -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 6 +- type: entity + parent: BaseActionSpawnSingleSpiderWeb + id: ActionSpawnSingleSpiderWebLongDelay + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 6 -# - type: entity -# parent: BaseActionSpawnSingleSpiderWeb -# id: ActionSpawnSingleSpiderWebDurable -# name: spin a durable web -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 4 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderWebDurable -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + parent: BaseActionSpawnSingleSpiderWeb + id: ActionSpawnSingleSpiderWebDurable + name: spin a durable web + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 4 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebDurable + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider #Clown web -# - type: entity -# id: ActionSpawnSingleSpiderWebClown -# name: spin a clown web -# description: Creates a web that slows down your prey. -# noSpawn: true -# components: -# - type: WorldTargetAction -# useDelay: 30 #КД -# range: 1.3 -# itemIconStyle: BigAction -# icon: -# sprite: Objects/Misc/spiderweb.rsi -# state: spider_web_clown_1 -# event: !type:WorldSpawnSpellEvent -# prototypes: -# - id: SpiderWebClown -# amount: 1 -# offset: 0, 1 -# speech: action-speech-spell-spider +- type: entity + id: ActionSpawnSingleSpiderWebClown + name: spin a clown web + description: Creates a web that slows down your prey. + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 30 #КД + range: 1.3 + itemIconStyle: BigAction + icon: + sprite: Objects/Misc/spiderweb.rsi + state: spider_web_clown_1 + event: !type:WorldSpawnSpellEvent + prototypes: + - id: SpiderWebClown + amount: 1 + offset: 0, 1 + speech: action-speech-spell-spider diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml index 6f59305fff1dc8..921d90042ef64c 100644 --- a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml +++ b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/spider_queen.yml @@ -132,13 +132,13 @@ energy: 0 color: "#ff4242" castShadows: false - # - type: IntrinsicRadioReceiver - # - type: IntrinsicRadioTransmitter - # channels: - # - HiveRadio - # - type: ActiveRadio - # channels: - # - HiveRadio + - type: IntrinsicRadioReceiver + - type: IntrinsicRadioTransmitter + channels: + - HiveRadio + - type: ActiveRadio + channels: + - HiveRadio - type: entity name: Ghost role @@ -160,37 +160,37 @@ name: Spider queen description: spider dance components: - # - type: AutoImplant - # implants: - # - LightImplantSpiderEggHunter - # - LightImplantSpiderWallWebDurable - # - LightImplantSpiderEggDrone - # - LightImplantSpiderEggGhost - # - LightImplantSpiderCrystal - # - LightImplantSpiderLittle - # - LightImplantSingleSpiderWebDurable - # - LightImplantSpiderEggShooter + - type: AutoImplant + implants: + - LightImplantSpiderEggHunter + - LightImplantSpiderWallWebDurable + - LightImplantSpiderEggDrone + - LightImplantSpiderEggGhost + - LightImplantSpiderCrystal + - LightImplantSpiderLittle + - LightImplantSingleSpiderWebDurable + - LightImplantSpiderEggShooter - type: Butcherable spawned: - id: FoodMeatSpider amount: 3 - id: MobSpiderSpaceLittle amount: 7 - # - type: Spider - # webPrototype: SpiderWebDespawned - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 2 - # count: 2 - # - type: Gun - # fireRate: 1 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Spider + webPrototype: SpiderWebDespawned + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1.5 + - type: BasicEntityAmmoProvider + proto: PoisonousAcid + capacity: 2 + count: 2 + - type: Gun + fireRate: 1 + useKey: false + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - type: SolutionContainerManager solutions: melee: @@ -248,13 +248,13 @@ types: Piercing: 5 #Damage Structural: 10 - # - type: AutoImplant - # implants: - # - LightImplantSpiderWallWeb - # - LightImplantSpiderCrystal - # - LightImplantSingleSpiderWebShortDelay - # - type: Spider - # webPrototype: SpiderWebDespawned + - type: AutoImplant + implants: + - LightImplantSpiderWallWeb + - LightImplantSpiderCrystal + - LightImplantSingleSpiderWebShortDelay + - type: Spider + webPrototype: SpiderWebDespawned - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.9 @@ -304,14 +304,14 @@ types: Piercing: 15 Structural: 15 - # - type: Spider - # webPrototype: SpiderWebDespawned + - type: Spider + webPrototype: SpiderWebDespawned - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.9 - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebLongDelay + - type: AutoImplant + implants: + - LightImplantSingleSpiderWebLongDelay - type: entity parent: BaseMobSpiderQueen @@ -369,25 +369,25 @@ - type: StealthOnMove passiveVisibilityRate: -0.37 movementVisibilityRate: 0.35 - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 1 - # count: 1 - # - type: Gun - # fireRate: 0.75 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1.5 + - type: BasicEntityAmmoProvider + proto: PoisonousAcid + capacity: 1 + count: 1 + - type: Gun + fireRate: 0.75 + useKey: false + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - type: MovementSpeedModifier baseWalkSpeed : 1.5 baseSprintSpeed : 3.9 - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebLongDelay + - type: AutoImplant + implants: + - LightImplantSingleSpiderWebLongDelay - type: entity parent: BaseMobSpiderQueen @@ -441,22 +441,22 @@ reagents: - ReagentId: ChloralHydrate Quantity: 35 - # - type: RechargeBasicEntityAmmo - # rechargeCooldown: 1.5 - # - type: BasicEntityAmmoProvider - # proto: PoisonousAcid - # capacity: 3 - # count: 3 - # - type: Gun - # fireRate: 4 - # useKey: false - # selectedMode: FullAuto - # availableModes: - # - FullAuto - # soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - # - type: AutoImplant - # implants: - # - LightImplantSingleSpiderWebClown + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1.5 + - type: BasicEntityAmmoProvider + proto: PoisonousAcid + capacity: 3 + count: 3 + - type: Gun + fireRate: 4 + useKey: false + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: AutoImplant + implants: + - LightImplantSingleSpiderWebClown - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 3.7 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml index 966a4cd280f5d9..ce329b691ce545 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/egg.yml @@ -1,25 +1,25 @@ -#Spiders eggs -# - type: entity -# parent: Eggshells -# id: EggshellsSpider -# noSpawn: true -# name: eggshells -# description: You're walkin' on 'em bud. -# suffix: FraG -# components: -# - type: Sprite -# sprite: Objects/Consumable/Food/egg.rsi -# state: eggshells -# shader: unshaded -# color: gray -# - type: SolutionContainerManager -# solutions: -# food: -# maxVol: 2 -# reagents: -# - ReagentId: PoisonWine -# Quantity: 1 -# - type: Tag -# tags: -# - Egg -# - Trash +# Spiders eggs +- type: entity + parent: Eggshells + id: EggshellsSpider + noSpawn: true + name: eggshells + description: You're walkin' on 'em bud. + suffix: FraG + components: + - type: Sprite + sprite: Objects/Consumable/Food/egg.rsi + state: eggshells + shader: unshaded + color: gray + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: PoisonWine + Quantity: 1 + - type: Tag + tags: + - Egg + - Trash diff --git a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml index 38a7f6cbd43046..4bbdd4c6b17b95 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Materials/crystal_shard.yml @@ -1,23 +1,23 @@ -# - type: entity -# id: ShardCrystalBlueXeno -# parent: ShardCrystalBlue -# name: shard of blue crystal -# description: A small piece of crystal. -# noSpawn: true -# components: -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 5 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - !type:SpawnEntitiesBehavior -# spawn: -# MaterialWebSilk: -# min: 0 -# max: 0 -# - !type:PlaySoundBehavior -# sound: -# collection: WoodDestroy +- type: entity + id: ShardCrystalBlueXeno + parent: ShardCrystalBlue + name: shard of blue crystal + description: A small piece of crystal. + noSpawn: true + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + MaterialWebSilk: + min: 0 + max: 0 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml index 1ac6ffcd78ecb7..5335c331d321c6 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_eggs.yml @@ -1,158 +1,158 @@ #Base #TODO: Когда будет анимация для спавна стен - переделать BaseItemSpider на наследование от BaseItem -# - type: entity -# name: "item" -# id: BaseItemSpider -# abstract: true -# components: -# - type: Clickable -# - type: InteractionOutline -# - type: MovedByPressure -# - type: EmitSoundOnCollide -# sound: -# collection: WeakHit -# - type: EmitSoundOnLand -# sound: -# path: /Audio/Effects/drop.ogg -# params: -# volume: 2 -# - type: DamageOnHighSpeedImpact -# damage: -# types: -# Blunt: 5 -# soundHit: -# path: /Audio/Effects/hit_kick.ogg -# - type: CollisionWake -# - type: TileFrictionModifier -# modifier: 0.5 -# - type: Physics -# bodyType: Dynamic -# fixedRotation: false -# - type: Fixtures -# fixtures: -# fix1: -# shape: -# !type:PhysShapeAabb -# bounds: "-0.25,-0.25,0.25,0.25" -# density: 20 -# mask: -# - ItemMask -# restitution: 0.3 # fite me -# friction: 0.2 -# - type: Pullable -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 1 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: StaticPrice -# price: 100 +- type: entity + name: "item" + id: BaseItemSpider + abstract: true + components: + - type: Clickable + - type: InteractionOutline + - type: MovedByPressure + - type: EmitSoundOnCollide + sound: + collection: WeakHit + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/drop.ogg + params: + volume: 2 + - type: DamageOnHighSpeedImpact + damage: + types: + Blunt: 5 + soundHit: + path: /Audio/Effects/hit_kick.ogg + - type: CollisionWake + - type: TileFrictionModifier + modifier: 0.5 + - type: Physics + bodyType: Dynamic + fixedRotation: false + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.3 # fite me + friction: 0.2 + - type: Pullable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: StaticPrice + price: 100 -# - type: entity -# parent: BaseItemSpider -# id: BaseSpiderEgg -# abstract: true -# name: the-egg-of-the-spider-guard -# description: Is it a gemstone? Is it an egg? It looks expensive. -# components: -# - type: Sprite -# sprite: Objects/Misc/eggspider.rsi -# state: icon -# - type: PointLight -# radius: 1.5 -# energy: 3 -# color: "#4faffb" -# - type: StaticPrice -# price: 500 -# - type: Barotrauma #Урон от разгермы -# damage: -# types: -# Blunt: 0.1 -# Heat: 0.1 -# - type: DamageOnHighSpeedImpact -# minimumSpeed: 0.1 -# damage: -# types: -# Blunt: 1 -# - type: Damageable -# damageContainer: Biological -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 5 -# behaviors: -# - !type:PlaySoundBehavior -# sound: -# collection: desecration -# - !type:SpillBehavior -# solution: food -# - !type:SpawnEntitiesBehavior -# spawn: -# EggshellsSpider: -# min: 1 -# max: 1 -# # Wow double-yolk you're so lucky! -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: SolutionContainerManager -# solutions: -# food: -# maxVol: 25 -# reagents: -# - ReagentId: PoisonWine -# Quantity: 10 -# - type: TimedDespawn #Система цикла -# - type: SpawnOnDespawn +- type: entity + parent: BaseItemSpider + id: BaseSpiderEgg + abstract: true + name: the-egg-of-the-spider-guard + description: Is it a gemstone? Is it an egg? It looks expensive. + components: + - type: Sprite + sprite: Objects/Misc/eggspider.rsi + state: icon + - type: PointLight + radius: 1.5 + energy: 3 + color: "#4faffb" + - type: StaticPrice + price: 500 + - type: Barotrauma #Урон от разгермы + damage: + types: + Blunt: 0.1 + Heat: 0.1 + - type: DamageOnHighSpeedImpact + minimumSpeed: 0.1 + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:SpawnEntitiesBehavior + spawn: + EggshellsSpider: + min: 1 + max: 1 + # Wow double-yolk you're so lucky! + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: PoisonWine + Quantity: 10 + - type: TimedDespawn #Система цикла + - type: SpawnOnDespawn #Spiders -# - type: entity -# parent: BaseSpiderEgg -# id: SpiderEggDrone -# noSpawn: true -# name: spider hive egg -# description: Is this a gem? Is this an egg? It looks expensive. -# components: -# - type: TimedDespawn -# lifetime: 55 -# - type: SpawnOnDespawn -# prototype: MobSpiderSpaceDrone +- type: entity + parent: BaseSpiderEgg + id: SpiderEggDrone + noSpawn: true + name: spider hive egg + description: Is this a gem? Is this an egg? It looks expensive. + components: + - type: TimedDespawn + lifetime: 55 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceDrone -# - type: entity -# parent: BaseSpiderEgg -# id: SpiderEggHunter -# noSpawn: true -# name: the-egg-of-the-spider-guard -# description: Is it a gemstone? Is it an egg? It looks expensive. -# components: -# - type: TimedDespawn #Система цикла -# lifetime: 80 -# - type: SpawnOnDespawn -# prototype: MobSpiderSpaceHunter #Система цикла +- type: entity + parent: BaseSpiderEgg + id: SpiderEggHunter + noSpawn: true + name: the-egg-of-the-spider-guard + description: Is it a gemstone? Is it an egg? It looks expensive. + components: + - type: TimedDespawn #Система цикла + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceHunter #Система цикла -# - type: entity -# parent: BaseSpiderEgg -# id: SpiderEggGhost -# noSpawn: true -# name: spider hive egg -# description: Is this a gem? Is this an egg? It looks expensive. -# components: -# - type: TimedDespawn -# lifetime: 80 -# - type: SpawnOnDespawn -# prototype: MobSpiderSpaceGhost +- type: entity + parent: BaseSpiderEgg + id: SpiderEggGhost + noSpawn: true + name: spider hive egg + description: Is this a gem? Is this an egg? It looks expensive. + components: + - type: TimedDespawn + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceGhost -# - type: entity -# parent: BaseSpiderEgg -# id: SpiderEggShooter -# noSpawn: true -# name: spider hive egg -# description: Is this a gem? Is this an egg? It looks expensive. -# components: -# - type: TimedDespawn -# lifetime: 80 -# - type: SpawnOnDespawn -# prototype: MobSpiderSpaceShooter +- type: entity + parent: BaseSpiderEgg + id: SpiderEggShooter + noSpawn: true + name: spider hive egg + description: Is this a gem? Is this an egg? It looks expensive. + components: + - type: TimedDespawn + lifetime: 80 + - type: SpawnOnDespawn + prototype: MobSpiderSpaceShooter diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml index 7b46db3e81faa3..e5fec988fbea1e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_implants.yml @@ -1,141 +1,141 @@ #Base -# - type: entity -# parent: BaseSubdermalImplant -# id: BaseLightImplantSpider -# abstract: true -# components: -# - type: SubdermalImplant -# - type: PointLight -# enabled: false -# radius: 2.5 -# softness: 5 -# mask: /Textures/Effects/LightMasks/cone.png -# autoRot: true -# - type: Tag -# tags: -# - SubdermalImplant -# - HideContextMenu -# - Flashlight -# - type: UnpoweredFlashlight +- type: entity + parent: BaseSubdermalImplant + id: BaseLightImplantSpider + abstract: true + components: + - type: SubdermalImplant + - type: PointLight + enabled: false + radius: 2.5 + softness: 5 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + - type: Tag + tags: + - SubdermalImplant + - HideContextMenu + - Flashlight + - type: UnpoweredFlashlight # #Egg -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderEggDrone -# name: guard spider egg -# description: He is also a drone and can build crystals and walls. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderEggDrone +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderEggDrone + name: guard spider egg + description: He is also a drone and can build crystals and walls. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderEggDrone -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderEggHunter -# name: hunter spider egg -# description: -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderEggHunter +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderEggHunter + name: hunter spider egg + description: + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderEggHunter -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderEggGhost -# name: ghost spider egg -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderEggGhost +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderEggGhost + name: ghost spider egg + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderEggGhost -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderEggShooter -# name: shooter spider egg -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderEggShooter +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderEggShooter + name: shooter spider egg + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderEggShooter #Spider -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderLittle -# name: release the spiderlings -# description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderLittle +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderLittle + name: release the spiderlings + description: Releases three small spiders that attack your prey. The spiders disappear after 20 seconds. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderLittle # #Cristal -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderCrystal -# name: create a crystal shard -# description: A shard that serves as a backlight for spiders. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderCrystal +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderCrystal + name: create a crystal shard + description: A shard that serves as a backlight for spiders. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderCrystal #Wall -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderWallWeb -# name: create a wall -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderWallWeb +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderWallWeb + name: create a wall + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderWallWeb -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSpiderWallWebDurable -# name: create a durable wall -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSpiderWallWebDurable +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSpiderWallWebDurable + name: create a durable wall + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSpiderWallWebDurable #Web -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSingleSpiderWebShortDelay -# name: spin a web -# description: Creates a web that slows down your prey. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSingleSpiderWebShortDelay +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSingleSpiderWebShortDelay + name: spin a web + description: Creates a web that slows down your prey. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSingleSpiderWebShortDelay -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSingleSpiderWebLongDelay -# name: spin a web -# description: Creates a web that slows down your prey. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSingleSpiderWebLongDelay +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSingleSpiderWebLongDelay + name: spin a web + description: Creates a web that slows down your prey. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSingleSpiderWebLongDelay -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSingleSpiderWebDurable -# name: spin a durable web -# description: Creates a web that slows down your prey. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSingleSpiderWebDurable +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSingleSpiderWebDurable + name: spin a durable web + description: Creates a web that slows down your prey. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSingleSpiderWebDurable #Clown web -# - type: entity -# parent: BaseLightImplantSpider -# id: LightImplantSingleSpiderWebClown -# name: spin a clown web -# description: Creates a web that slows down your prey. -# noSpawn: true -# components: -# - type: SubdermalImplant -# implantAction: ActionSpawnSingleSpiderWebClown +- type: entity + parent: BaseLightImplantSpider + id: LightImplantSingleSpiderWebClown + name: spin a clown web + description: Creates a web that slows down your prey. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSpawnSingleSpiderWebClown diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml index 5ce8c09ffdb8ef..29cc19a8b1b89e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/spider_web.yml @@ -1,127 +1,128 @@ #Spider queen webs #Base -# - type: entity -# id: BaseSpiderWeb -# name: web -# description: Sticky web.. I wonder where it comes from? -# abstract: true -# noSpawn: true -# placement: -# mode: SnapgridCenter -# snap: -# - Wall -# components: -# - type: MeleeSound -# soundGroups: -# Brute: -# path: -# "/Audio/Weapons/slash.ogg" -# - type: Sprite -# sprite: Objects/Misc/spiderweb.rsi -# layers: -# - state: spider_web_1 -# map: ["spiderWebLayer"] -# drawdepth: WallMountedItems -# - type: Appearance -# - type: GenericVisualizer -# visuals: -# enum.SpiderWebVisuals.Variant: -# spiderWebLayer: -# 1: {state: spider_web_1} -# 2: {state: spider_web_2} -# - type: Clickable -# - type: Transform -# anchored: true -# - type: Physics -# - type: Fixtures -# fixtures: -# fix1: -# hard: false -# density: 7 -# shape: -# !type:PhysShapeAabb -# bounds: "-0.5,-0.5,0.5,0.5" -# layer: -# - MidImpassable -# - type: Damageable -# damageModifierSet: Wood -# - type: Destructible -# - type: Temperature -# heatDamage: -# types: -# Heat: 5 -# coldDamage: {} -# coldDamageThreshold: 0 -# - type: Flammable -# fireSpread: true -# damage: -# types: -# Heat: 5 -# - type: Reactive -# groups: -# Flammable: [Touch] -# Extinguish: [Touch] -# - type: SpiderWebObject -# - type: SpeedModifierContacts -# ignoreWhitelist: -# components: -# - IgnoreSpiderWeb +- type: entity + id: BaseSpiderWeb + name: web + description: Sticky web.. I wonder where it comes from? + abstract: true + noSpawn: true + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/slash.ogg" + - type: Sprite + sprite: Objects/Misc/spiderweb.rsi + layers: + - state: spider_web_1 + map: ["spiderWebLayer"] + drawdepth: WallMountedItems + - type: Appearance + - type: GenericVisualizer + visuals: + enum.SpiderWebVisuals.Variant: + spiderWebLayer: + 1: {state: spider_web_1} + 2: {state: spider_web_2} + - type: Clickable + - type: Transform + anchored: true + - type: Physics + - type: Fixtures + fixtures: + fix1: + hard: false + density: 7 + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + layer: + - MidImpassable + - type: Damageable + damageModifierSet: Wood + - type: Destructible + - type: Temperature + heatDamage: + types: + Heat: 5 + coldDamage: {} + coldDamageThreshold: 0 + - type: Flammable + fireSpread: true + damage: + types: + Heat: 5 + - type: Reactive + groups: + Flammable: [Touch] + Extinguish: [Touch] + - type: SpiderWebObject + - type: SpeedModifierContacts + ignoreWhitelist: + components: + - IgnoreSpiderWeb -# - type: entity -# parent: BaseSpiderWeb -# id: SpiderWebFragile -# name: web -# placement: -# mode: SnapgridCenter -# snap: -# - Wall -# components: -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 30 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: SpeedModifierContacts -# walkSpeedModifier: 0.25 -# sprintSpeedModifier: 0.25 +#Web +- type: entity + parent: BaseSpiderWeb + id: SpiderWebFragile + name: web + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SpeedModifierContacts + walkSpeedModifier: 0.25 + sprintSpeedModifier: 0.25 -# - type: entity -# parent: BaseSpiderWeb -# id: SpiderWebDurable -# name: durable web -# placement: -# mode: SnapgridCenter -# snap: -# - Wall -# components: -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 50 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: SpeedModifierContacts -# walkSpeedModifier: 0.15 -# sprintSpeedModifier: 0.15 +- type: entity + parent: BaseSpiderWeb + id: SpiderWebDurable + name: durable web + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SpeedModifierContacts + walkSpeedModifier: 0.15 + sprintSpeedModifier: 0.15 -# - type: entity -# parent: BaseSpiderWeb -# id: SpiderWebDespawned -# name: web -# noSpawn: true -# placement: -# mode: SnapgridCenter -# snap: -# - Wall -# components: -# - type: TimedDespawn -# lifetime: 13 -# - type: SpeedModifierContacts -# walkSpeedModifier: 0.1 -# sprintSpeedModifier: 0.1 +- type: entity + parent: BaseSpiderWeb + id: SpiderWebDespawned + name: web + noSpawn: true + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: TimedDespawn + lifetime: 13 + - type: SpeedModifierContacts + walkSpeedModifier: 0.1 + sprintSpeedModifier: 0.1 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 35897ce88827ad..dc8f86fc3af63e 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -112,20 +112,20 @@ energy: 0.9 #Spider queen -# - type: entity -# id: PoisonousAcid -# name: poisonous Spit -# parent: BaseBullet -# noSpawn: true -# components: -# - type: Projectile -# damage: -# types: -# Poison: 6 -# Structural: 2 -# - type: Sprite -# sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi -# layers: -# - state: xeno_toxic -# - type: Ammo -# muzzleFlash: null +- type: entity + id: PoisonousAcid + name: poisonous Spit + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Poison: 6 + Structural: 2 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi + layers: + - state: xeno_toxic + - type: Ammo + muzzleFlash: null diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml index 12046a9e9d5a8d..2135e873d21467 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Specific/spider_structures.yml @@ -2,80 +2,80 @@ #TODO: Сделать нормальную анимацию спавна стены без использования костыля в виде спавна тайлов и столов #Base -# - type: entity -# parent: BaseItemSpider -# id: BaseFloorTileItemSpiders -# description: These could work as a pretty decent throwing weapon. -# abstract: true -# components: -# - type: Sprite -# sprite: Objects/Tiles/web.rsi -# state: icon -# - type: FloorTile -# outputs: -# - FloorWebTile -# - type: DamageOtherOnHit -# damage: -# types: -# Blunt: 5 -# - type: Damageable -# damageContainer: Inorganic -# - type: Construction -# graph: WebObjects -# node: tile -# - type: TimedDespawn -# - type: SpawnOnDespawn -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 1 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - trigger: -# !type:DamageTrigger -# damage: 20 -# behaviors: -# - !type:PlaySoundBehavior -# sound: -# collection: MetalBreak -# params: -# volume: -8 -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: DamageOnLand -# damage: -# types: -# Blunt: 5 +- type: entity + parent: BaseItemSpider + id: BaseFloorTileItemSpiders + description: These could work as a pretty decent throwing weapon. + abstract: true + components: + - type: Sprite + sprite: Objects/Tiles/web.rsi + state: icon + - type: FloorTile + outputs: + - FloorWebTile + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + - type: Damageable + damageContainer: Inorganic + - type: Construction + graph: WebObjects + node: tile + - type: TimedDespawn + - type: SpawnOnDespawn + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -8 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 5 #Tile (used to spawn walls) -# - type: entity -# parent: BaseFloorTileItemSpiders -# id: FloorTileItemWebSpiders -# name: web construction -# description: Very smooth and surprisingly durable. -# noSpawn: true -# components: -# - type: TimedDespawn -# lifetime: 5 -# - type: SpawnOnDespawn -# prototype: WallWeb +- type: entity + parent: BaseFloorTileItemSpiders + id: FloorTileItemWebSpiders + name: web construction + description: Very smooth and surprisingly durable. + noSpawn: true + components: + - type: TimedDespawn + lifetime: 5 + - type: SpawnOnDespawn + prototype: WallWeb -# - type: entity -# name: web -# description: Web -# parent: BaseFloorTileItemSpiders -# id: FloorTileItemWebSpidersDurable -# noSpawn: true -# components: -# - type: TimedDespawn -# lifetime: 6 -# - type: SpawnOnDespawn -# prototype: WallWebDurable -# - type: Sprite -# shader: unshaded -# color: gray +- type: entity + name: web + description: Web + parent: BaseFloorTileItemSpiders + id: FloorTileItemWebSpidersDurable + noSpawn: true + components: + - type: TimedDespawn + lifetime: 6 + - type: SpawnOnDespawn + prototype: WallWebDurable + - type: Sprite + shader: unshaded + color: gray #Table (заглушка типо как анимация) # - type: entity @@ -132,48 +132,48 @@ # color: gray #Wall -# - type: entity -# parent: BaseWall -# id: WallWebDurable -# name: web -# description: web -# components: -# - type: Clickable -# - type: MeleeSound -# soundGroups: -# Brute: -# path: -# "/Audio/Weapons/slash.ogg" -# - type: Damageable -# damageModifierSet: Web -# - type: Tag -# tags: -# - Wall -# - type: Sprite -# sprite: Structures/Walls/web.rsi -# shader: unshaded -# color: gray -# - type: Icon -# sprite: Structures/Walls/web.rsi -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 125 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - !type:SpawnEntitiesBehavior -# spawn: -# MaterialWebSilk: -# min: 1 -# max: 1 -# - !type:PlaySoundBehavior -# sound: -# collection: WoodDestroy -# - type: IconSmooth -# key: webs -# base: wall -# - type: Construction -# graph: WebStructures -# node: wall +- type: entity + parent: BaseWall + id: WallWebDurable + name: web + description: web + components: + - type: Clickable + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/slash.ogg" + - type: Damageable + damageModifierSet: Web + - type: Tag + tags: + - Wall + - type: Sprite + sprite: Structures/Walls/web.rsi + shader: unshaded + color: gray + - type: Icon + sprite: Structures/Walls/web.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 125 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + MaterialWebSilk: + min: 1 + max: 1 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - type: IconSmooth + key: webs + base: wall + - type: Construction + graph: WebStructures + node: wall diff --git a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml index d70b57fbbc9f84..41505b88e615af 100644 --- a/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/SS220/Entities/markers/Spawners/ghost_roles.yml @@ -1,25 +1,25 @@ #Used by gamerule -# - type: entity -# id: SpawnPointGhostSpaceQueen -# name: спавнер роли королевы-пауков -# suffix: паук-королева -# parent: MarkerBase -# components: -# - type: GhostRole -# name: spider-roy-name -# description: spider-roy-desc -# rules: spider-roy-desc -# requirements: -# - !type:DepartmentTimeRequirement -# department: Security -# time: 600 -# raffle: -# settings: default -# - type: GhostRoleMobSpawner -# prototype: MobSpiderSpaceQueen -# - type: Sprite -# sprite: Markers/jobs.rsi -# layers: -# - state: green -# - sprite: Mobs/Animals/spider.rsi -# state: midwife +- type: entity + id: SpawnPointGhostSpaceQueen + name: спавнер роли королевы-пауков + suffix: паук-королева + parent: MarkerBase + components: + - type: GhostRole + name: spider-roy-name + description: spider-roy-desc + rules: spider-roy-desc + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 600 + raffle: + settings: default + - type: GhostRoleMobSpawner + prototype: MobSpiderSpaceQueen + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: Mobs/Animals/spider.rsi + state: midwife diff --git a/Resources/Prototypes/SS220/radio_channels.yml b/Resources/Prototypes/SS220/radio_channels.yml index d6ed0145b922ef..6fae7c288bbdc4 100644 --- a/Resources/Prototypes/SS220/radio_channels.yml +++ b/Resources/Prototypes/SS220/radio_channels.yml @@ -193,10 +193,10 @@ # Admin memes end #Spider queen antag -# - type: radioChannel #Connection -# id: HiveRadio -# name: chat-radio-hive -# keycode: 'у' -# frequency: 2885 -# color: "#cc80ff" -# longRange: true +- type: radioChannel #Connection + id: HiveRadio + name: chat-radio-hive + keycode: 'у' + frequency: 2885 + color: "#cc80ff" + longRange: true