Skip to content

Commit

Permalink
Нормальные папочки Corvax
Browse files Browse the repository at this point in the history
  • Loading branch information
Succuberry committed Aug 10, 2024
1 parent 83ec93c commit d43ef0d
Show file tree
Hide file tree
Showing 119 changed files with 37 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 50base
map: ["enum.GunVisualLayers.Base"]
Expand Down Expand Up @@ -68,7 +68,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 35base
map: ["enum.GunVisualLayers.Base"]
Expand Down Expand Up @@ -109,7 +109,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 30base
map: ["enum.GunVisualLayers.Base"]
Expand Down Expand Up @@ -150,7 +150,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 45base
map: ["enum.GunVisualLayers.Base"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector45.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector45.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
Expand All @@ -37,7 +37,7 @@
proto: CartridgeVector45Incendiary
- type: Sprite
layers:
- state: base
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
Expand Down Expand Up @@ -106,7 +106,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
Expand Down Expand Up @@ -108,7 +108,7 @@
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector45mag.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector45mag.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,4 @@
types:
Piercing: 6
Blunt: 3
Radiation: 14

- type: entity
id: BulletVector45AP
name: bullet (.45 ACP AP)
parent: BaseBulletAP
noSpawn: true
components:
- type: Projectile
damage:
types:
Piercing: 12
Blunt: 3 # 20% decrease
penetrationScore: 1
ignoreResistances: true
Radiation: 14
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description: Version of the legendary submachine gun for sport shooting. He might even be able to shoot a squirrel. Uses .22lr ammunition.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/SMGs/vector22.rsi
sprite: Corvax/Objects/Weapons/Guns/SMGs/vector22.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
Expand All @@ -14,7 +14,7 @@
- type: Item
size: Huge
- type: Clothing
sprite: _Corvax/Objects/Weapons/Guns/SMGs/vector22.rsi
sprite: Corvax/Objects/Weapons/Guns/SMGs/vector22.rsi
quickEquip: false
slots:
- suitStorage
Expand All @@ -23,7 +23,7 @@
fireRate: 18
selectedMode: FullAuto
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/Vector22.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/Vector22.ogg
availableModes:
- FullAuto
- type: ItemSlots
Expand Down Expand Up @@ -59,12 +59,12 @@
description: A civilian version of the already legendary and forgotten submachine gun. Uses caliber cartridges .45 ACP. Automatic fire is not included in the package.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/SMGs/vector45.rsi
sprite: Corvax/Objects/Weapons/Guns/SMGs/vector45.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Clothing
sprite: _Corvax/Objects/Weapons/Guns/SMGs/vector45.rsi
sprite: Corvax/Objects/Weapons/Guns/SMGs/vector45.rsi
quickEquip: false
slots:
- suitStorage
Expand All @@ -75,7 +75,7 @@
fireRate: 4.2
selectedMode: SemiAuto
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/Vector45.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/Vector45.ogg
availableModes:
- SemiAuto
- type: ItemSlots
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description: A stationary shuttle gun that fires a .50 caliber. Designed to suppress the enemy.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi
sprite: Corvax/Objects/Weapons/Guns/Shuttles/shotgunrifle.rsi
layers:
- state: shotgun
- state: mag-1
Expand Down Expand Up @@ -33,11 +33,11 @@
maxAngle: 17
selectedMode: FullAuto
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/shuttleshotgun.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/shuttleshotgun.ogg
params:
pitch: 0.5
soundEmpty:
path: /Audio/_Corvax/Weapons/Guns/Empty/EmptySHR.ogg
path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg
- type: MagazineAmmoProvider
- type: MagazineVisuals
magState: mag
Expand All @@ -52,7 +52,7 @@
tags:
- ShuttleShotgunShellsBox
insertSound:
path: /Audio/_Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
params:
pitch: 1
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
Expand All @@ -66,7 +66,7 @@
description: An impressive - sized shuttle weapon, firing a large caliber .60. Breaks through most types of armored walls.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi
sprite: Corvax/Objects/Weapons/Guns/Shuttles/amrifle.rsi
layers:
- state: amrifle
- type: ContainerContainer
Expand All @@ -90,18 +90,18 @@
minAngle: 0
maxAngle: 6
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/amrifle.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/amrifle.ogg
params:
pitch: 0.5
soundEmpty:
path: /Audio/_Corvax/Weapons/Guns/Empty/EmptySHR.ogg
path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg
- type: BallisticAmmoProvider
whitelist:
tags:
- CartridgeAntiMateriel
capacity: 16
soundInsert:
path: /Audio/_Corvax/Weapons/Guns/MagIn/Reload60Cartridge.ogg
path: /Audio/Corvax/Weapons/Guns/MagIn/Reload60Cartridge.ogg
params:
pitch: 0.91
- type: Machine
Expand All @@ -114,7 +114,7 @@
description: A stationary shuttle rifle on .30 rifle cartridges with a VERY large supply of ammunition.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi
sprite: Corvax/Objects/Weapons/Guns/Shuttles/arifle.rsi
layers:
- state: arifle
- state: mag-1
Expand All @@ -141,11 +141,11 @@
minAngle: 0
maxAngle: 11
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/LightSHR.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/LightSHR.ogg
params:
pitch: 0.5
soundEmpty:
path: /Audio/_Corvax/Weapons/Guns/Empty/EmptySHR.ogg
path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg
- type: MagazineAmmoProvider
- type: MagazineVisuals
magState: mag
Expand All @@ -160,7 +160,7 @@
tags:
- ShuttleRifleAmmoBox
insertSound:
path: /Audio/_Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
params:
pitch: 1
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
Expand All @@ -174,7 +174,7 @@
description: A stationary small-caliber weapon with an increased rate of fire, unlike other shuttle`s weapons.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi
sprite: Corvax/Objects/Weapons/Guns/Shuttles/smgrifle.rsi
layers:
- state: smgrifle
- state: mag-1
Expand All @@ -201,11 +201,11 @@
minAngle: 0
maxAngle: 12
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/35SHR.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/35SHR.ogg
params:
pitch: 0.5
soundEmpty:
path: /Audio/_Corvax/Weapons/Guns/Empty/EmptySHR.ogg
path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg
- type: MagazineAmmoProvider
- type: MagazineVisuals
magState: mag
Expand All @@ -220,7 +220,7 @@
tags:
- ShuttleSmgRifleAmmoBox
insertSound:
path: /Audio/_Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
params:
pitch: 1
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
Expand All @@ -234,7 +234,7 @@
description: The nightmare of the syndicate that liked to hide behind doors. Double-barreled .45 caliber gun.
components:
- type: Sprite
sprite: _Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi
sprite: Corvax/Objects/Weapons/Guns/Shuttles/magnumrifle.rsi
layers:
- state: magnumrifle
- state: mag-1
Expand All @@ -261,11 +261,11 @@
minAngle: 1
maxAngle: 10
soundGunshot:
path: /Audio/_Corvax/Weapons/Guns/Gunshots/45SHR.ogg
path: /Audio/Corvax/Weapons/Guns/Gunshots/45SHR.ogg
params:
pitch: 0.5
soundEmpty:
path: /Audio/_Corvax/Weapons/Guns/Empty/EmptySHR.ogg
path: /Audio/Corvax/Weapons/Guns/Empty/EmptySHR.ogg
- type: MagazineAmmoProvider
- type: MagazineVisuals
magState: mag
Expand All @@ -280,7 +280,7 @@
tags:
- ShuttleMagnumRifleAmmoBox
insertSound:
path: /Audio/_Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
path: /Audio/Corvax/Weapons/Guns/MagIn/MagInSHR.ogg
params:
pitch: 1
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
id: VariousShuttleWeapons
name: research-technology-various-shuttle-weapons
icon:
sprite: _Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
state: 35base
discipline: Arsenal
tier: 3
Expand Down

0 comments on commit d43ef0d

Please sign in to comment.