Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rodent Raiding #713

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,36 @@
prototypes:
- N14MobRaiderPsychoRanged

- type: entity
name: Raider Ranged Psycho Spawner
id: N14SpawnMobRaiderPsychoHunter
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- sprite: _Nuclear14/Mobs/RaidersSimpleMob/Raiders.rsi
state: raider_ranged
- state: ai
- type: ConditionalSpawner
prototypes:
- N14MobRaiderHunter

- type: entity
name: Raider Ranged Psycho Spawner
id: N14SpawnMobRaiderPsychoSkrimisher
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- sprite: _Nuclear14/Mobs/RaidersSimpleMob/Raiders.rsi
state: raider_ranged
- state: ai
- type: ConditionalSpawner
prototypes:
- N14MobRaiderSkrimisher

- type: entity
name: Raider Psycho Boss Spawner
id: N14SpawnMobRaiderBoss
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,14 @@
- type: entity
parent: [ N14MobRaiderPsycho, N14MobDespawning ]
id: N14MobRaiderPsychoDespawning
noSpawn: true

- type: entity
parent: [ N14MobRaiderHunter, N14MobDespawning ]
id: N14MobRRaiderPsychoHunterDespawning
noSpawn: true

- type: entity
parent: [ N14MobRaiderSkrimisher, N14MobDespawning ]
id: N14MobRRaiderPsychoSkrimisherDespawning
noSpawn: true
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,56 @@
prototypes:
- RaiderBossGear

- type: entity
name: Psycho Raider Hunter
parent: N14MobRaiderPsychoRanged
id: N14MobRaiderHunter
description: Psychopatic raider armed with a long rifle. Dangerous at a distance.
suffix: AI
components:
- type: Gun
fireRate: 0.5
soundGunshot: /Audio/_Nuclear14/Weapons/Guns/Snipers/N14WeaponPipeRifle/shot1.ogg
useKey: false
selectedMode: SemiAuto
availableModes:
- SemiAuto
- type: CombatMode
- type: BasicEntityAmmoProvider
proto: N14Cartridge308Rifle
capacity: 3
count: 3
- type: RechargeBasicEntityAmmo
rechargeCooldown: 2
rechargeSound:
path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
- type: Loadout
prototypes:
- RaiderHunterGear

- type: entity
name: Psycho Raider Skrimisher
parent: N14MobRaiderPsychoRanged
id: N14MobRaiderSkrimisher
description: Psychopatic raider armed with a scattergun. Deadly at close range.
suffix: AI
components:
- type: Gun
fireRate: 0.5
soundGunshot: /Audio/_Nuclear14/Weapons/Guns/Shotguns/N14WeaponCaravanShotgun/shot1.ogg
useKey: false
selectedMode: SemiAuto
availableModes:
- SemiAuto
- type: CombatMode
- type: BasicEntityAmmoProvider
proto: N14ShellShotgun20
capacity: 6
count: 6
- type: RechargeBasicEntityAmmo
rechargeCooldown: 2
rechargeSound:
path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg
- type: Loadout
prototypes:
- RaiderSkrimisherGear
44 changes: 34 additions & 10 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/NPC/raider_pistol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,42 @@
equipment:
jumpsuit: N14ClothingUniformJumpsuitRags
shoes: N14ClothingShoesRaider
head: N14ClothingHeadHatBandit
mask: ClothingMaskBandSkull
gloves: N14ClothingHandsGlovesBlackBiker
back: N14ClothingBackpackRandomFill
outerClothing: N14ClothingOuterRaiderCombat1

mask: N14ClothingMaskBrownMask
outerClothing: N14ClothingOuterLightMetalArmor
pocket1: Gauze1
pocket2: N14MagazinePistol9mm

- type: startingGear
id: RaiderBossGear
id: RaiderHunterGear
equipment:
jumpsuit: N14ClothingUniformJumpsuitBrahminFarmer
shoes: N14ClothingBootsCowboy
head: N14ClothingHeadHatCowboyBrown
mask: N14ClothingMaskRedMask
outerClothing: N14ClothingOuterRaiderBadlands
pocket1: N14Cartridge308Rifle
pocket2: N14HealingPowder

- type: startingGear
id: RaiderSkrimisherGear
equipment:
jumpsuit: N14ClothingUniformJumpsuitRags
shoes: N14ClothingShoesRaider
shoes: N14ClothingBootsLeather
head: ClothingHeadHelmetBone
gloves: ClothingClothWrap
outerClothing: N14ClothingOuterRaiderBlastmaster
pocket1: N14ShellShotgun20
pocket2: N14Jet

- type: startingGear
id: RaiderBossGear
equipment:
jumpsuit: N14ClothingUniformJumpsuitWastelandDoc
shoes: N14ClothingBootsLeather
head: N14ClothingHeadHatBeanie
mask: N14ClothingMaskBrownMask
eyes: N14ClothingEyesGlassesWelding
gloves: N14ClothingHandsGlovesBlackBiker
back: N14ClothingBackpackRandomFill
outerClothing: N14ClothingOuterCombatRaider
outerClothing: N14ClothingOuterRaiderCombat1
pocket1: N14Stimpak
pocket2: N14RadAwayInhaler
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading