New head of security weapon:Energy Shotgun (#30643)

* Reset hopefully?

* removes the emergency security orders

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>

* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
This commit is contained in:
Boaz1111
2024-08-19 13:14:30 +02:00
committed by GitHub
parent 972bd566f5
commit 2f923d88e4
24 changed files with 220 additions and 31 deletions

View File

@@ -308,7 +308,7 @@
id: LockerFillHeadOfSecurityNoHardsuit
table: !type:AllSelector
children:
- id: BookSecretDocuments
- id: WeaponEnergyShotgun
- id: BookSpaceLaw
- id: BoxEncryptionKeySecurity
- id: CigarGoldCase

View File

@@ -1,16 +0,0 @@
- type: entity
parent: [BaseItem, BaseGrandTheftContraband]
id: BookSecretDocuments
name: "emergency security orders"
description: TOP SECRET. These documents specify the Emergency Orders that the HoS must carry out when ordered by Central Command.
components:
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
layers:
- state: folder-sec-doc
- type: Tag
tags:
- Book
- HighRiskItem
- type: StealTarget
stealGroup: BookSecretDocuments

View File

@@ -717,3 +717,53 @@
- type: Appearance
- type: StaticPrice
price: 750
- type: entity
name: energy shotgun
parent: [BaseWeaponBattery, BaseGunWieldable]
id: WeaponEnergyShotgun
description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Clothing
sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
- type: Gun
fireRate: 2
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
- type: ProjectileBatteryAmmoProvider
proto: BulletLaserSpread
fireCost: 150
- type: BatteryWeaponFireModes
fireModes:
- proto: BulletLaserSpread
fireCost: 150
- proto: BulletLaserHeavySpread
fireCost: 150
- proto: BulletDisablerSmgSpread
fireCost: 150
- type: Item
size: Large
shape:
- 0,0,3,1
sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
heldPrefix: energy
- type: Tag
tags:
- HighRiskItem
- type: StealTarget
stealGroup: WeaponEnergyShotgun
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: Battery
maxCharge: 1050
startingCharge: 1050
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 25 #takes 42 seconds to fully recharge, the answer to life, the universe and everything

View File

@@ -981,3 +981,88 @@
- type: Tag
tags:
- HideContextMenu
- type: entity
name: laser bolt
id: BulletLaser
parent: BaseBullet
categories: [ HideSpawnMenu ]
components:
- type: Reflective
reflective:
- Energy
- type: FlyBySound
sound:
collection: EnergyMiss
params:
volume: 5
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
layers:
- state: heavylaser
shader: unshaded
- type: Physics
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.15,-0.3,0.15,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
fly-by: *flybyfixture
- type: Ammo
- type: Projectile
impactEffect: BulletImpactEffectOrangeDisabler
damage:
types:
Heat: 10
soundHit:
collection: WeakHit
forceSound: true
- type: entity
name: wide laser barrage
id: BulletLaserSpread
noSpawn: true
parent: BulletLaser
components:
- type: ProjectileSpread
proto: BulletLaser
count: 5 #50 heat damage if you hit all your shots, but wide spread
spread: 30
- type: entity
name : heavy laser bolt
id: BulletLaserHeavy
parent: BulletLaser
categories: [ HideSpawnMenu ]
components:
- type: Projectile
damage:
types:
Heat: 15
- type: entity
name: narrow laser barrage
id: BulletLaserHeavySpread
noSpawn: true
parent: BulletLaser
components:
- type: ProjectileSpread
proto: BulletLaser
count: 3 #45 heat damage if you hit all your shots, but narrower spread
spread: 10
- type: entity
name: disabling laser barrage
id: BulletDisablerSmgSpread
noSpawn: true
parent: BulletDisablerSmg
components:
- type: ProjectileSpread
proto: BulletDisablerSmg
count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
spread: 9

View File

@@ -21,7 +21,7 @@
CaptainGunStealObjective: 0.5
CaptainJetpackStealObjective: 0.5
HandTeleporterStealObjective: 0.5
SecretDocumentsStealObjective: 0.5
EnergyShotgunStealObjective: 0.5
- type: weightedRandom
id: TraitorObjectiveGroupKill

View File

@@ -28,13 +28,6 @@
sprite: Objects/Devices/hand_teleporter.rsi
state: icon
- type: stealTargetGroup
id: BookSecretDocuments
name: "emergency security orders"
sprite:
sprite: Objects/Misc/bureaucracy.rsi
state: folder-sec-doc
- type: stealTargetGroup
id: ClothingShoesBootsMagAdv
name: advanced magboots
@@ -84,6 +77,13 @@
sprite: Objects/Misc/nukedisk.rsi
state: icon
- type: stealTargetGroup
id: WeaponEnergyShotgun
name: energy shotgun
sprite:
sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
state: base
# Thief Collection
- type: stealTargetGroup
@@ -406,3 +406,5 @@
sprite:
sprite: Mobs/Animals/crab.rsi
state: crab

View File

@@ -195,16 +195,17 @@
## hos
- type: entity
noSpawn: true
parent: BaseTraitorStealObjective
id: SecretDocumentsStealObjective
id: EnergyShotgunStealObjective
components:
- type: Objective
# hos has a gun ce does not, higher difficulty than most
# HoS will have this on them a lot of the time so..
difficulty: 3
- type: NotJobRequirement
job: HeadOfSecurity
- type: StealCondition
stealGroup: BookSecretDocuments
stealGroup: WeaponEnergyShotgun
owner: job-name-hos
## ce

View File

@@ -86,9 +86,9 @@
<GuideEntityEmbed Entity="ClothingOuterHardsuitRd" Caption=""/>
<GuideEntityEmbed Entity="HandTeleporter" Caption=""/>
</Box>
- Stealing the [color=#cb0000]Head of Security[/color]'s [bold]secret documents[/bold].
- Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold].
<Box>
<GuideEntityEmbed Entity="BookSecretDocuments" Caption=""/>
<GuideEntityEmbed Entity="WeaponEnergyShotgun" Caption=""/>
</Box>
- Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold].
<Box>

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 807 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

View File

@@ -0,0 +1,37 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "mag-unshaded-1"
},
{
"name": "mag-unshaded-2"
},
{
"name": "mag-unshaded-3"
},
{
"name": "mag-unshaded-4"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 979 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

View File

@@ -0,0 +1,27 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "energy-inhand-left",
"directions": 4
},
{
"name": "energy-inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 B

View File

@@ -46,6 +46,9 @@
0.05
]
]
},
{
"name": "heavylaser"
}
]
}