Skip to content

78 add definition automatic 308 rifle #86

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

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
34 changes: 34 additions & 0 deletions git-conventional-commits.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
convention:
commitTypes:
- feat
- fix
- perf
- refactor
- style
- test
- build
- ops
- docs
- merge
commitScopes: []
releaseTagGlobPattern: v[0-9]*.[0-9]*.[0-9]*
changelog:
commitTypes:
- feat
- fix
- perf
- merge
includeInvalidCommits: true
commitScopes: []
commitIgnoreRegexPattern: "^WIP "
headlines:
feat: Features
fix: Bug Fixes
perf: Performance Improvements
merge: Merges
breakingChange: BREAKING CHANGES
commitUrl: https://github.com/qoomon/git-conventional-commits/commit/%commit%
commitRangeUrl: https://github.com/qoomon/git-conventional-commits/compare/%from%...%to%?diff=split
issueRegexPattern: "#[0-9]+"
issueUrl: https://github.com/qoomon/git-conventional-commits/issues/%issue%
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ CoavinsFirearms.AddOrReplaceModel(
'Shotgun_20g'
, { 'ShotgunReceiver_20g', 'ShotgunBarrel_20g' }
, 'ShotgunReceiver_20g')
CoavinsFirearms.AddOrReplaceModel(
'Rifle_308AR',{'RifleUpperReceiver_308AR', 'RifleLowerReceiver_308AR' }, 'RifleUpperReceiver_308AR')
CoavinsFirearms.AddOrReplaceModel(
'Shotgun_4g'
'Shotgun_4g'
, { 'ShotgunReceiver_4g', 'ShotgunBarrel_4g' }
, 'ShotgunReceiver_4g')
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,28 @@ 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.RifleLowerReceiver_308AR = {}
this.parts.RifleLowerReceiver_308AR.CombinesWith = 'RifleUpperReceiver_308AR'
this.parts.RifleLowerReceiver_308AR.ConditionLowerChance = 2
this.parts.RifleLowerReceiver_308AR.ConditionMax = 20
this.parts.RifleUpperReceiver_308AR = {}
this.parts.RifleUpperReceiver_308AR.CombinesWith = 'RifleLowerReceiver_308AR'
this.parts.RifleUpperReceiver_308AR.Holds = { 'RifleBoltCarrier_308AR' }
this.parts.RifleUpperReceiver_308AR.ConditionLowerChance = 2
this.parts.RifleUpperReceiver_308AR.ConditionMax = 20
this.parts.RifleBoltCarrier_308AR = {}
this.parts.RifleBoltCarrier_308AR.InsertsInto = 'RifleUpperReceiver_308AR'
this.parts.RifleBoltCarrier_308AR.Holds = { 'RifleFiringPin_308AR', 'RifleBolt_308AR' }
this.parts.RifleBoltCarrier_308AR.ConditionLowerChance = 3
this.parts.RifleBoltCarrier_308AR.ConditionMax = 20
this.parts.RifleFiringPin_308AR = {}
this.parts.RifleFiringPin_308AR.InsertsInto = 'RifleBoltCarrier_308AR'
this.parts.RifleFiringPin_308AR.ConditionLowerChance = 4
this.parts.RifleFiringPin_308AR.ConditionMax = 20
this.parts.RifleBolt_308AR = {}
this.parts.RifleBolt_308AR.InsertsInto = 'RifleBoltCarrier_308AR'
this.parts.RifleBolt_308AR.ConditionLowerChance = 2
this.parts.RifleBolt_308AR.ConditionMax = 20
this.parts.ShotgunReceiver_4g = {}
this.parts.ShotgunReceiver_4g.CombinesWith = 'ShotgunBarrel_4g'
this.parts.ShotgunReceiver_4g.Holds = { 'ShotgunForend_4g' }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ 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.RifleLowerReceiver_308AR = "Rifle Lower Receiver (.308 AR)",
ItemName_coavinsfirearms.RifleLowerReceiver_308AR_Short = "Lower Receiver (.308 AR)",
ItemName_coavinsfirearms.RifleUpperReceiver_308AR = "Rifle Upper Receiver (.308 AR)",
ItemName_coavinsfirearms.RifleUpperReceiver_308AR_Short = "Upper Receiver (.308 AR)",
ItemName_coavinsfirearms.RifleBoltCarrier_308AR = "Rifle Bolt Carrier (.308 AR)",
ItemName_coavinsfirearms.RifleBoltCarrier_308AR_Short = "Bolt Carrier (.308 AR)",
ItemName_coavinsfirearms.RifleFiringPin_308AR = "Rifle Firing Pin (.308 AR)",
ItemName_coavinsfirearms.RifleFiringPin_308AR_Short = "Firing Pin (.308 AR)",
ItemName_coavinsfirearms.RifleBolt_308AR = "Rifle Bolt (.308 AR)",
ItemName_coavinsfirearms.RifleBolt_308AR_Short = "Bolt (.308 AR)",
ItemName_coavinsfirearms.ShotgunReceiver_4g = "Shotgun Receiver (4g)",
ItemName_coavinsfirearms.ShotgunReceiver_4g_Short = "Receiver (4g)",
ItemName_coavinsfirearms.ShotgunForend_4g = "Shotgun Forend (4g)",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
module coavinsfirearms {
imports {
Base
}

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

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

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

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

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

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

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

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

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

Fixer : ScrapMetal=2; MetalWelding=6,
Fixer : SmallSheetMetal; MetalWelding=4,
}

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

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

item RifleLowerReceiver_308AR {
DisplayName = Rifle Lower Receiver (.308 AR),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = RifleLowerReceiver,
Weight = 2,
ConditionMax = 20,
WorldStaticModel = Paperbag_Ground,
}

item RifleUpperReceiver_308AR {
DisplayName = Rifle Upper Receiver (.308 AR),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = RifleUpperReceiver,
Weight = 2,
ConditionMax = 20,
WorldStaticModel = Paperbag_Ground,
}

item RifleBoltCarrier_308AR {
DisplayName = Rifle Bolt Carrier (.308 AR),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = RifleBoltCarrier,
Weight = 2,
ConditionMax = 20,
WorldStaticModel = Paperbag_Ground,
}

item RifleFiringPin_308AR {
DisplayName = Rifle Firing Pin (.308 AR),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = RifleFiringPin,
Weight = 0.1,
ConditionMax = 20,
WorldStaticModel = Paperbag_Ground,
}

item RifleBolt_308AR {
DisplayName = Rifle Bolt (.308 AR),
DisplayCategory = FirearmPart,
Type = Normal,
Icon = RifleBolt,
Weight = 2,
ConditionMax = 20,
WorldStaticModel = Paperbag_Ground,
}
}