Skip to content

Commit

Permalink
New craftable weapon: Emitter Cannon (#232)
Browse files Browse the repository at this point in the history
* add Emitter gun

* locale files

* Emitter Cannon improvements

---------

Co-authored-by: MilenVolf <[email protected]>
  • Loading branch information
Tenteratus and MilenVolf committed Aug 25, 2023
1 parent cdd8c9e commit 6d37f35
Show file tree
Hide file tree
Showing 26 changed files with 216 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ ent-WeaponPistolCHIMPUpgraded = experimental C.H.I.M.P. handcannon
ent-WeaponBehonkerLaser = Eye of a behonker
.desc = The eye of a behonker, it fires a laser when squeezed.
.suffix = { "" }
ent-WeaponEmitterCannon = emitter cannon
.desc = A homemade cannon based on a stationary emitter. Quite powerful, but it's charging speed leaves much to be desired.
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ ent-WeaponCutter = ионный резак
ent-WeaponCutterAdv = улучшенный ионный резак
.desc = Инструмент шахтеров, предназначенный для расчистки горных пород. Обладает усовершенствованной батареей и усиленной концентрирующей линзой.
.suffix = { "" }
ent-WeaponEmitterCannon = эмиттер-пушка
.desc = Самодельная пушка, созданная на основе стационарного эмиттера. Довольно мощная, однако скорость зарядки оставляет желать лучшего.
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,10 @@
materialRequirements:
CableHV: 5
Glass: 2
- type: Tag
tags:
- DroneUsable
- EmitterCircuitBoard

- type: entity
id: SurveillanceCameraRouterCircuitboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -584,3 +584,32 @@
proto: BulletCutterAdv
fireCost: 100
- type: Appearance

- type: entity
name: Emitter Cannon
id: WeaponEmitterCannon
parent: BaseWeaponBattery
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/emitter_cannon.rsi
layers:
- state: idle
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 0.5
soundGunshot:
path: /Audio/Weapons/emitter.ogg
- type: ProjectileBatteryAmmoProvider
proto: EmitterCannonBolt
fireCost: 200
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: Construction
graph: EmitterCannonGraph
node: emittercannon
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@
parent: BaseBullet
noSpawn: true
components:
- type: Reflective
reflective:
- Energy
- type: Sprite
color: "#ffff33"
sprite: Structures/Power/Generation/Singularity/emitter.rsi
Expand Down Expand Up @@ -807,3 +810,14 @@
lifetime: 0.4
- type: StaminaDamageOnCollide
damage: 65

- type: entity
name: emitter bolt
id: EmitterCannonBolt
parent: EmitterBolt
noSpawn: true
components:
- type: Projectile
damage:
types:
Heat: 25
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#In its own file and not improvised-shotgun.yml in case anyone ever wants to add more guns that use it.
- type: constructionGraph
id: EmitterCannonGraph
start: start
graph:
- node: start
edges:
- to: emittercannon
steps:
- tag: Pipe
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeStraight
name: pipe
- tag: CapacitorStockPart
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
name: capacitor
- tag: PowerCellSmall
icon:
sprite: Objects/Power/power_cells.rsi
state: small
name: power cell small
- tag: PowerCellSmall
icon:
sprite: Objects/Power/power_cells.rsi
state: small
name: power cell small
- tag: EmitterCircuitBoard
icon:
sprite: Objects/Misc/module.rsi
state: engineering
name: emitter circuit board
- material: Plasteel
amount: 10
doAfter: 10
- node: emittercannon
entity: WeaponEmitterCannon
13 changes: 13 additions & 0 deletions Resources/Prototypes/Recipes/Crafting/improvised.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,16 @@
icon:
sprite: Objects/Misc/rifle_stock.rsi
state: icon

- type: construction
name: emitter cannon
id: emittercannon
graph: EmitterCannonGraph
startNode: start
targetNode: emittercannon
category: construction-category-weapons
objectType: Item
description: An underrated handheld emitter that can be used as a tool as well as a weapon.
icon:
sprite: Objects/Weapons/Guns/Battery/emitter_cannon.rsi
state: icon
3 changes: 3 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1053,3 +1053,6 @@
- type: Tag
id: ModularReceiver

- type: Tag
id: EmitterCircuitBoard

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
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
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
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
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
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
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
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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from SS220 Paradise at https://github.com/ss220club/Paradise and modified by https://github.com/MilenVolf",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "idle",
"delays": [
[
0.2,
0.2,
0.2
]
]
},
{
"name": "mag-unshaded-0"
},
{
"name": "mag-unshaded-1",
"delays": [
[
0.3,
0.3
]
]
},
{
"name": "mag-unshaded-2",
"delays": [
[
0.2,
0.2,
0.2
]
]
},
{
"name": "mag-unshaded-3",
"delays": [
[
0.15,
0.15,
0.15,
0.15
]
]
},
{
"name": "mag-unshaded-4",
"delays": [
[
0.15,
0.15,
0.15,
0.15
]
]
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-left-0",
"directions": 4
},
{
"name": "inhand-left-1",
"directions": 4
},
{
"name": "inhand-left-2",
"directions": 4
},
{
"name": "inhand-left-3",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-right-0",
"directions": 4
},
{
"name": "inhand-right-1",
"directions": 4
},
{
"name": "inhand-right-2",
"directions": 4
},
{
"name": "inhand-right-3",
"directions": 4
}
]
}

0 comments on commit 6d37f35

Please sign in to comment.