From dbe96f5f92078ef3572617bc3e7d91d2ea3507b5 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 17:56:01 +0100 Subject: [PATCH 1/5] feat(model): Add defs for #79 Signed-off-by: macinsight --- .../media/lua/client/coavinsfirearms/CoavinsModels.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua index 17842133..b986e2ac 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua @@ -91,3 +91,5 @@ CoavinsFirearms.AddOrReplaceModel( 'Shotgun_20g' , { 'ShotgunReceiver_20g', 'ShotgunBarrel_20g' } , 'ShotgunReceiver_20g') +CoavinsFirearms.AddOrReplaceModel( + 'Rifle_308AR',{'RifleUpperReceiver_308AR', 'RifleLowerReceiver_308AR' }, 'RifleUpperReceiver_308AR') From b85f6bda119ae4437c8f1eb8a734de1ddc24d010 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 17:57:49 +0100 Subject: [PATCH 2/5] feat(model): Add helper defs for #79 Signed-off-by: macinsight --- git-conventional-commits.yaml | 34 +++++++++++++++++++ .../client/coavinsfirearms/FirearmsHelper.lua | 22 ++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 git-conventional-commits.yaml diff --git a/git-conventional-commits.yaml b/git-conventional-commits.yaml new file mode 100644 index 00000000..47162f0c --- /dev/null +++ b/git-conventional-commits.yaml @@ -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% diff --git a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua index aba02ecd..1981d3d9 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua @@ -360,6 +360,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.getPartModel = function(modelName) return this.parts[modelName] From db3ba08a6414458e194a897ce9b4826dc7ff70b8 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 17:59:40 +0100 Subject: [PATCH 3/5] feat(model): Add lang defs for #79 Signed-off-by: macinsight --- .../media/lua/shared/Translate/EN/ItemName_EN.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Contents/mods/coavinsfirearms/media/lua/shared/Translate/EN/ItemName_EN.txt b/src/Contents/mods/coavinsfirearms/media/lua/shared/Translate/EN/ItemName_EN.txt index a151bb03..71bb4f46 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/shared/Translate/EN/ItemName_EN.txt +++ b/src/Contents/mods/coavinsfirearms/media/lua/shared/Translate/EN/ItemName_EN.txt @@ -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.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)", } From 316833749f925a59c7fd5a3c6c3ebc1155fe2617 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 18:00:34 +0100 Subject: [PATCH 4/5] feat(model): Add fix defs for #79 Signed-off-by: macinsight --- .../fixings/coavins_fixing_rifle_308ar.txt | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308ar.txt diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308ar.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308ar.txt new file mode 100644 index 00000000..37fa0875 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308ar.txt @@ -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, + } +} From 8a138f5b6b7c3cd36ffeb2ac9b23f2a97a189cd1 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 18:02:33 +0100 Subject: [PATCH 5/5] feat(model): Add item defs for #79 Signed-off-by: macinsight --- .../weapons/coavins_items_rifle_308AR.txt | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308AR.txt diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308AR.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308AR.txt new file mode 100644 index 00000000..87ea907f --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308AR.txt @@ -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, + } +}