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

81 add definition 4 gauge shotgun #85

Merged
merged 6 commits into from
Nov 27, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,7 @@ CoavinsFirearms.AddOrReplaceModel(
'Shotgun_20g'
, { 'ShotgunReceiver_20g', 'ShotgunBarrel_20g' }
, 'ShotgunReceiver_20g')
CoavinsFirearms.AddOrReplaceModel(
'Shotgun_4g'
, { 'ShotgunReceiver_4g', 'ShotgunBarrel_4g' }
, 'ShotgunReceiver_4g')
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,29 @@ this.parts.ShotgunBarrel_20g = {}
this.parts.ShotgunBarrel_20g.CombinesWith = 'ShotgunReceiver_20g'
this.parts.ShotgunBarrel_20g.ConditionLowerChance = 3
this.parts.ShotgunBarrel_20g.ConditionMax = 20
this.parts.ShotgunReceiver_4g = {}
this.parts.ShotgunReceiver_4g.CombinesWith = 'ShotgunBarrel_4g'
this.parts.ShotgunReceiver_4g.Holds = { 'ShotgunForend_4g' }
this.parts.ShotgunReceiver_4g.ConditionLowerChance = 1
this.parts.ShotgunReceiver_4g.ConditionMax = 20
this.parts.ShotgunForend_4g = {}
this.parts.ShotgunForend_4g.InsertsInto = 'ShotgunReceiver_4g'
this.parts.ShotgunForend_4g.Holds = { 'ShotgunBoltCarrier_4g' }
this.parts.ShotgunForend_4g.ConditionLowerChance = 2
this.parts.ShotgunForend_4g.ConditionMax = 20
this.parts.ShotgunBoltCarrier_4g = {}
this.parts.ShotgunBoltCarrier_4g.InsertsInto = 'ShotgunForend_4g'
this.parts.ShotgunBoltCarrier_4g.Holds = { 'ShotgunBolt_4g' }
this.parts.ShotgunBoltCarrier_4g.ConditionLowerChance = 4
this.parts.ShotgunBoltCarrier_4g.ConditionMax = 20
this.parts.ShotgunBolt_4g = {}
this.parts.ShotgunBolt_4g.InsertsInto = 'ShotgunBoltCarrier_4g'
this.parts.ShotgunBolt_4g.ConditionLowerChance = 3
this.parts.ShotgunBolt_4g.ConditionMax = 20
this.parts.ShotgunBarrel_4g = {}
this.parts.ShotgunBarrel_4g.CombinesWith = 'ShotgunReceiver_4g'
this.parts.ShotgunBarrel_4g.ConditionLowerChance = 3
this.parts.ShotgunBarrel_4g.ConditionMax = 20

this.getPartModel = function(modelName)
return this.parts[modelName]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,14 @@ ItemName_EN = {
ItemName_coavinsfirearms.ShotgunBolt_20g_Short = "Bolt (20g)",
ItemName_coavinsfirearms.ShotgunBarrel_20g = "Shotgun Barrel (20g)",
ItemName_coavinsfirearms.ShotgunBarrel_20g_Short = "Barrel (20g)",
ItemName_coavinsfirearms.ShotgunReceiver_4g = "Shotgun Receiver (4g)",
ItemName_coavinsfirearms.ShotgunReceiver_4g_Short = "Receiver (4g)",
ItemName_coavinsfirearms.ShotgunForend_4g = "Shotgun Forend (4g)",
ItemName_coavinsfirearms.ShotgunForend_4g_Short = "Forend (4g)",
ItemName_coavinsfirearms.ShotgunBoltCarrier_4g = "Shotgun Bolt Carrier (4g)",
ItemName_coavinsfirearms.ShotgunBoltCarrier_4g_Short = "Bolt Carrier (4g)",
ItemName_coavinsfirearms.ShotgunBolt_4g = "Shotgun Bolt (4g)",
ItemName_coavinsfirearms.ShotgunBolt_4g_Short = "Bolt (4g)",
ItemName_coavinsfirearms.ShotgunBarrel_4g = "Shotgun Barrel (4g)",
ItemName_coavinsfirearms.ShotgunBarrel_4g_Short = "Barrel (4g)",
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
module coavinsfirearms {
imports {
Base
}

fixing Fix ShotgunReceiver_4g Welding
{
Require : ShotgunReceiver_4g,
GlobalItem : BlowTorch=2,
ConditionModifier : 1.2,

Fixer : SmallSheetMetal; MetalWelding=3,
Fixer : ScrapMetal; MetalWelding=1,
}

fixing Fix ShotgunReceiver_4g
{
Require : ShotgunReceiver_4g,
ConditionModifier : 1,

Fixer : DuctTape=2; Aiming=4,
Fixer : Scotchtape=3; Aiming=2,
}

fixing Fix ShotgunForend_4g
{
Require : ShotgunForend_4g,
ConditionModifier : 1,

Fixer : DuctTape=1; Aiming=2,
Fixer : Scotchtape=2; Aiming=1,
}

fixing Fix ShotgunBoltCarrier_4g Welding
{
Require : ShotgunBoltCarrier_4g,
GlobalItem : BlowTorch=1,
ConditionModifier : 1.2,

Fixer : ScrapMetal; MetalWelding=1,
}

fixing Fix ShotgunBolt_4g Welding
{
Require : ShotgunBolt_4g,
GlobalItem : BlowTorch=2,
ConditionModifier : 1.2,

Fixer : SmallSheetMetal; MetalWelding=4,
Fixer : ScrapMetal; MetalWelding=1,
}

fixing Fix ShotgunBarrel_4g Welding
{
Require : ShotgunBarrel_4g,
GlobalItem : BlowTorch=4,
ConditionModifier : 1.2,

Fixer : SheetMetal; MetalWelding=7,
Fixer : SmallSheetMetal; MetalWelding=5,
Fixer : ScrapMetal; MetalWelding=3,
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
module coavinsfirearms {
imports {
Base
}

item ShotgunReceiver_4g {
DisplayName = Shotgun Receiver (4g),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = ShotgunReceiver,
Weight = 2,
ConditionMax = 20,
WorldStaticModel = Paperbag_Ground,
}

item ShotgunForend_4g {
DisplayName = Shotgun Forend (4g),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = ShotgunForend,
Weight = 0.5,
ConditionMax = 20,
WorldStaticModel = CarvingFork_Ground,
}

item ShotgunBoltCarrier_4g {
DisplayName = Shotgun Bolt Carrier (4g),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = ShotgunBoltCarrier,
Weight = 0.3,
ConditionMax = 20,
WorldStaticModel = Staples_Ground,
}

item ShotgunBolt_4g {
DisplayName = Shotgun Bolt (4g),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = ShotgunBolt,
Weight = 0.2,
ConditionMax = 20,
WorldStaticModel = Staples_Ground,
}

item ShotgunBarrel_4g {
DisplayName = Shotgun Barrel (4g),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = ShotgunBarrel,
Weight = 1,
ConditionMax = 20,
WorldStaticModel = PlasticPipe,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,8 @@ CoavinsFirearms.Include('Base.M1936', 'GenericRevolver')
-- SCARSC_Fold

-- SHOTGUN_4G.txt
-- KS23
-- KS23_S_Pistol
CoavinsFirearms.Include('KS23','Shotgun_4g')
CoavinsFirearms.Include('KS23_S_Pistol','Shotgun_4g')

-- SHOTGUN_870.txt
CoavinsFirearms.Include('Base.M870_Wingmaster', 'GenericShotgun')
Expand Down
Loading