Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Модули для оружия (#222)

Browse Source
This commit is contained in:
CaypenNow
2024-03-30 01:33:08 +05:00
committed by GitHub
parent 3b7f90d729 24a0a41bc1
commit 6f477f32ae
37 changed files with 698 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Audio/White/Gun/Modules/ejectmodule.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/White/Gun/Modules/insertmodule.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/White/Weapons/Modules/silence.ogg Normal file
View File

Binary file not shown.

11
Resources/Locale/ru-RU/locales-new/autotranslate-57.ftl Normal file
View File

@@ -0,0 +1,11 @@
ent-LightModule = модульный фонарик
.desc = Излучает свет.
ent-LaserModule = лазерный модуль
.desc = За счет лазерной обработки пуль, увеличивает их скорость.
ent-FlameHiderModule = пламегаситель
.desc = Скрывает пламя огня во время выстрела.
ent-SilencerModule = глушитель
.desc = Скрывает пламя огня и приглушает звук во время выстрела.
ent-AcceleratorModule = продвинутый модуль
.desc = Разработка NanoTrasen специально для отдела Службы Безопасности. Меняет затворную раму без видимых изменений, за счет этого увеличивает скорострельность оружия.
gun-modules = Установленные модули: [color=cyan]{ $modules }[/color].

4
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View File

@@ -18,6 +18,7 @@
- id: BoxMindshield
- id: ClothingOuterHardsuitWarden
- id: OxygenTankFilled
- id: LightModule
- type: entity
id: LockerWardenFilled
@@ -37,6 +38,7 @@
- id: WeaponPistolMk58Nonlethal
- id: MagazinePistol
- id: BoxMindshield
- id: LightModule
- type: entity
id: LockerSecurityFilled
@@ -66,6 +68,7 @@
- id: WeaponPistolMk58Nonlethal
- id: SurveillanceBodyCamera
- id: MagazinePistol
- id: LightModule
- type: entity
id: LockerBrigmedicFilled
@@ -126,6 +129,7 @@
- id: VoiceRecorder
- id: ClothingEyesGlassesSecurity
- id: BoxZipLocks
- id: LightModule
- type: entity
id: ClosetBombFilled

52
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

@@ -15,6 +15,7 @@
- Back
- suitStorage
- type: AmmoCounter
- type: WeaponModules
- type: Gun
fireRate: 5
selectedMode: FullAuto
@@ -32,7 +33,7 @@
startingItem: MagazineLightRifle
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
priority: 2
priority: 3
whitelist:
tags:
- MagazineLightRifle
@@ -43,10 +44,19 @@
whitelist:
tags:
- CartridgeLightRifle
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
gun_modules: !type:ContainerSlot
- type: StaticPrice
price: 500
@@ -63,6 +73,10 @@
map: [ "enum.GunVisualLayers.Base" ]
- state: mag-0
map: [ "enum.GunVisualLayers.Mag" ]
- state: laser
visible: false
sprite: White/Objects/Weapons/modulesOnWeapon.rsi
map: [ "enum.ModuleVisualState.Module" ]
- type: Gun
fireRate: 5
soundGunshot:
@@ -88,14 +102,26 @@
whitelist:
tags:
- CartridgeLightRifle
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
gun_modules: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: PointLight
enabled: false
autoRot: true
- type: Appearance
- type: entity
@@ -154,6 +180,10 @@
map: [ "enum.GunVisualLayers.Base" ]
- state: mag-0
map: [ "enum.GunVisualLayers.Mag" ]
- state: laser
visible: false
sprite: White/Objects/Weapons/modulesOnWeapon.rsi
map: [ "enum.ModuleVisualState.Module" ]
- type: Clothing
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
- type: Gun
@@ -177,14 +207,26 @@
whitelist:
tags:
- CartridgeRifle
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
gun_modules: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: PointLight
enabled: false
autoRot: true
- type: Appearance
- type: entity
@@ -211,3 +253,11 @@
whitelist:
tags:
- CartridgeRifle
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule

49
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -117,6 +117,10 @@
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- state: laser
visible: false
sprite: White/Objects/Weapons/modulesOnWeapon.rsi
map: [ "enum.ModuleVisualState.Module" ]
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
- type: Gun
@@ -126,6 +130,7 @@
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
availableModes:
- FullAuto
- type: WeaponModules
- type: ItemSlots
slots:
gun_magazine:
@@ -144,10 +149,26 @@
whitelist:
tags:
- CartridgePistol
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
gun_modules: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: PointLight
enabled: false
autoRot: true
- type: Appearance
- type: entity
@@ -216,6 +237,10 @@
- state: mag-unshaded-0
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- state: laser
visible: false
sprite: White/Objects/Weapons/modulesOnWeapon.rsi
map: [ "enum.ModuleVisualState.Module" ]
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
- type: ChamberMagazineAmmoProvider
@@ -225,6 +250,7 @@
selectedMode: FullAuto
availableModes:
- FullAuto
- type: WeaponModules
- type: ItemSlots
slots:
gun_magazine:
@@ -243,10 +269,25 @@
whitelist:
tags:
- CartridgePistol
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 6
zeroVisible: true
- type: PointLight
enabled: false
autoRot: true
- type: Appearance
# Rubber
@@ -274,6 +315,14 @@
whitelist:
tags:
- CartridgePistol
gun_modules:
name: Modules
insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
priority: 2
whitelist:
tags:
- BaseModule
- type: entity
name: Vector

10
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -197,6 +197,11 @@
- MagazineBoxRifle
- MagazineBoxLightRifle
- GrenadeBlast
- LightModuleRecipe
- LaserModuleRecipe
- FlameHiderModuleRecipe
- SilencerModuleRecipe
- AcceleratorModuleRecipe
emagDynamicRecipes:
- CartridgePistolRubber
- CartridgeMagnumRubber
@@ -705,6 +710,11 @@
- ShellShotgunPractice
- WeaponLaserCarbinePractice
- WeaponDisablerPractice
- LightModuleRecipe
- LaserModuleRecipe
- FlameHiderModuleRecipe
- SilencerModuleRecipe
- AcceleratorModuleRecipe
dynamicRecipes:
- CartridgeLightRifleIncendiary
- CartridgeMagnumIncendiary

44
Resources/Prototypes/Recipes/Lathes/security.yml
View File

@@ -665,3 +665,47 @@
Steel: 100
Plastic: 50
Silver: 50
- type: latheRecipe
id: LightModuleRecipe
result: LightModule
completetime: 5
materials:
Steel: 700
Plastic: 700
Glass: 500
- type: latheRecipe
id: LaserModuleRecipe
result: LaserModule
completetime: 10
materials:
Steel: 1500
Plastic: 1000
Glass: 300
- type: latheRecipe
id: FlameHiderModuleRecipe
result: FlameHiderModule
completetime: 15
materials:
Steel: 1000
Plastic: 1000
- type: latheRecipe
id: SilencerModuleRecipe
result: SilencerModule
completetime: 15
materials:
Steel: 1000
Plastic: 1000
- type: latheRecipe
id: AcceleratorModuleRecipe
result: AcceleratorModule
completetime: 30
materials:
Steel: 3500
Plastic: 1000
Glass: 500
Gold: 1000

82
Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml Normal file
View File

@@ -0,0 +1,82 @@
- type: entity
id: BaseModule
parent: BaseItem
abstract: true
components:
- type: Sprite
sprite: White/Objects/Weapons/modules.rsi
- type: Tag
tags:
- BaseModule
- type: Item
sprite: White/Objects/Weapons/modules.rsi
size: Small
shape:
- 0,0,0,0
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: Appearance
# modules
- type: entity
id: LightModule
description: Light module for rifles (lecter, CV, drozd, WT).
name: "light module"
parent: BaseModule
components:
- type: LightModule
value: "light"
- type: Sprite
state: light
- type: Appearance
- type: entity
id: LaserModule
description: Laser module for rifles (lecter, CV, drozd, WT).
name: "laser module"
parent: BaseModule
components:
- type: LaserModule
value: "laser"
- type: Sprite
state: laser
- type: Appearance
- type: entity
id: FlameHiderModule
description: Flame Hider module for rifles (lecter, CV, drozd, WT).
name: "flamehider module"
parent: BaseModule
components:
- type: FlameHiderModule
value: "flamehider"
- type: Sprite
state: flamehider
- type: Appearance
- type: entity
id: SilencerModule
description: Silencer module for rifles (lecter, CV, drozd, WT).
name: "silencer module"
parent: BaseModule
components:
- type: SilencerModule
value: "silencer"
- type: Sprite
state: silencer
- type: Appearance
- type: entity
id: AcceleratorModule
description: Accelerator module for rifles (lecter, CV, drozd, WT).
name: "accelerator module"
parent: BaseModule
components:
- type: AcceleratorModule
value: "accelerator"
- type: Sprite
state: accelerator
- type: Appearance

3
Resources/Prototypes/_White/tags.yml
View File

@@ -54,3 +54,6 @@
- type: Tag
id: MindSlave
- type: Tag
id: BaseModule

BIN
Resources/Textures/Effects/LightMasks/cone.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
Resources/Textures/White/Effects/LightMasks/lightModule.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
Resources/Textures/White/Objects/Weapons/modules.rsi/accelerator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/White/Objects/Weapons/modules.rsi/flamehider.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/White/Objects/Weapons/modules.rsi/laser.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/White/Objects/Weapons/modules.rsi/light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

26
Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json Normal file
View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Maked by CaypenNow",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "light"
},
{
"name": "laser"
},
{
"name": "flamehider"
},
{
"name": "silencer"
},
{
"name": "accelerator"
}
]
}

BIN
Resources/Textures/White/Objects/Weapons/modules.rsi/silencer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/accelerator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 B

BIN
Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/flamehider.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 151 B

BIN
Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/laser.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 152 B

BIN
Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 154 B

26
Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json Normal file
View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by CaypenNow",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "laser"
},
{
"name": "light"
},
{
"name": "flamehider"
},
{
"name": "silencer"
},
{
"name": "accelerator"
}
]
}

BIN
Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/silencer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 B