From 1a18e44307e9a46250297303ff1ce784ea2fb95b Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:11:40 +0100 Subject: [PATCH 01/53] 64 add model shotgun 410g (#72) * Add model def for #64 Signed-off-by: macinsight * Add Help defs for #64 Signed-off-by: macinsight * Add lang defs for #64 Signed-off-by: macinsight * Add fix defs for #64 Signed-off-by: macinsight * Add item defs for #64 Signed-off-by: macinsight * Update coavins_fixing_shotgun_410g.txt Adjust item types from shotgun_10g to shotgun_410g where missed * Update coavins_items_shotgun_410g.txt Change types from 4410g to 410g where required --------- Signed-off-by: macinsight --- .../client/coavinsfirearms/CoavinsModels.lua | 4 ++ .../client/coavinsfirearms/FirearmsHelper.lua | 23 +++++++ .../lua/shared/Translate/EN/ItemName_EN.txt | 10 +++ .../fixings/coavins_fixing_shotgun_410g.txt | 63 +++++++++++++++++++ .../weapons/coavins_items_shotgun_410g.txt | 55 ++++++++++++++++ 5 files changed, 155 insertions(+) create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_410g.txt create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_410g.txt 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..22de8757 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua @@ -87,6 +87,10 @@ CoavinsFirearms.AddOrReplaceModel( 'Revolver_38spc' , { 'RevolverReceiver_38spc', 'RevolverCylinder_38spc' } , 'RevolverReceiver_38spc') +CoavinsFirearms.AddOrReplaceModel( + 'Shotgun_410g' +, { 'ShotgunReceiver_410g', 'ShotgunBarrel_410g' } +, 'ShotgunReceiver_410g') CoavinsFirearms.AddOrReplaceModel( 'Shotgun_20g' , { 'ShotgunReceiver_20g', 'ShotgunBarrel_20g' } 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..fc79b86c 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua @@ -337,6 +337,29 @@ this.parts.RevolverCylinder_38spc = {} this.parts.RevolverCylinder_38spc.CombinesWith = 'RevolverReceiver_38spc' this.parts.RevolverCylinder_38spc.ConditionLowerChance = 3 this.parts.RevolverCylinder_38spc.ConditionMax = 20 +this.parts.ShotgunReceiver_410g = {} +this.parts.ShotgunReceiver_410g.CombinesWith = 'ShotgunBarrel_410g' +this.parts.ShotgunReceiver_410g.Holds = { 'ShotgunForend_410g' } +this.parts.ShotgunReceiver_410g.ConditionLowerChance = 1 +this.parts.ShotgunReceiver_410g.ConditionMax = 20 +this.parts.ShotgunForend_410g = {} +this.parts.ShotgunForend_410g.InsertsInto = 'ShotgunReceiver_410g' +this.parts.ShotgunForend_410g.Holds = { 'ShotgunBoltCarrier_410g' } +this.parts.ShotgunForend_410g.ConditionLowerChance = 2 +this.parts.ShotgunForend_410g.ConditionMax = 20 +this.parts.ShotgunBoltCarrier_410g = {} +this.parts.ShotgunBoltCarrier_410g.InsertsInto = 'ShotgunForend_410g' +this.parts.ShotgunBoltCarrier_410g.Holds = { 'ShotgunBolt_410g' } +this.parts.ShotgunBoltCarrier_410g.ConditionLowerChance = 4 +this.parts.ShotgunBoltCarrier_410g.ConditionMax = 20 +this.parts.ShotgunBolt_410g = {} +this.parts.ShotgunBolt_410g.InsertsInto = 'ShotgunBoltCarrier_410g' +this.parts.ShotgunBolt_410g.ConditionLowerChance = 3 +this.parts.ShotgunBolt_410g.ConditionMax = 20 +this.parts.ShotgunBarrel_410g = {} +this.parts.ShotgunBarrel_410g.CombinesWith = 'ShotgunReceiver_410g' +this.parts.ShotgunBarrel_410g.ConditionLowerChance = 3 +this.parts.ShotgunBarrel_410g.ConditionMax = 20 this.parts.ShotgunReceiver_20g = {} this.parts.ShotgunReceiver_20g.CombinesWith = 'ShotgunBarrel_20g' this.parts.ShotgunReceiver_20g.Holds = { 'ShotgunForend_20g' } 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..5b1f59eb 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 @@ -130,6 +130,16 @@ ItemName_EN = { ItemName_coavinsfirearms.RevolverReceiver_38spc_Short = "Frame (.38 SPC)", ItemName_coavinsfirearms.RevolverCylinder_38spc = "Revolver Cylinder (.38 SPC)", ItemName_coavinsfirearms.RevolverCylinder_38spc_Short = "Cylinder (.38 SPC)" + ItemName_coavinsfirearms.ShotgunReceiver_410g = "Shotgun Receiver (410g)", + ItemName_coavinsfirearms.ShotgunReceiver_410g_Short = "Receiver (410g)", + ItemName_coavinsfirearms.ShotgunForend_410g = "Shotgun Forend (410g)", + ItemName_coavinsfirearms.ShotgunForend_410g_Short = "Forend (410g)", + ItemName_coavinsfirearms.ShotgunBoltCarrier_410g = "Shotgun Bolt Carrier (410g)", + ItemName_coavinsfirearms.ShotgunBoltCarrier_410g_Short = "Bolt Carrier (410g)", + ItemName_coavinsfirearms.ShotgunBolt_410g = "Shotgun Bolt (410g)", + ItemName_coavinsfirearms.ShotgunBolt_410g_Short = "Bolt (410g)", + ItemName_coavinsfirearms.ShotgunBarrel_410g = "Shotgun Barrel (410g)", + ItemName_coavinsfirearms.ShotgunBarrel_410g_Short = "Barrel (410g)", ItemName_coavinsfirearms.ShotgunReceiver_20g = "Shotgun Receiver (20g)", ItemName_coavinsfirearms.ShotgunReceiver_20g_Short = "Receiver (20g)", ItemName_coavinsfirearms.ShotgunForend_20g = "Shotgun Forend (20g)", diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_410g.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_410g.txt new file mode 100644 index 00000000..6f69a483 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_410g.txt @@ -0,0 +1,63 @@ +module coavinsfirearms { + imports { + Base + } + + fixing Fix ShotgunReceiver_410g Welding + { + Require : ShotgunReceiver_410g, + GlobalItem : BlowTorch=2, + ConditionModifier : 1.2, + + Fixer : SmallSheetMetal; MetalWelding=3, + Fixer : ScrapMetal; MetalWelding=1, + } + + fixing Fix ShotgunReceiver_410g + { + Require : ShotgunReceiver_410g, + ConditionModifier : 1, + + Fixer : DuctTape=2; Aiming=4, + Fixer : Scotchtape=3; Aiming=2, + } + + fixing Fix ShotgunForend_410g + { + Require : ShotgunForend_410g, + ConditionModifier : 1, + + Fixer : DuctTape=1; Aiming=2, + Fixer : Scotchtape=2; Aiming=1, + } + + fixing Fix ShotgunBoltCarrier_410g Welding + { + Require : ShotgunBoltCarrier_410g, + GlobalItem : BlowTorch=1, + ConditionModifier : 1.2, + + Fixer : ScrapMetal; MetalWelding=1, + } + + fixing Fix ShotgunBolt_410g Welding + { + Require : ShotgunBolt_410g, + GlobalItem : BlowTorch=2, + ConditionModifier : 1.2, + + Fixer : SmallSheetMetal; MetalWelding=4, + Fixer : ScrapMetal; MetalWelding=1, + } + + fixing Fix ShotgunBarrel_410g Welding + { + Require : ShotgunBarrel_410g, + GlobalItem : BlowTorch=4, + ConditionModifier : 1.2, + + Fixer : SheetMetal; MetalWelding=7, + Fixer : SmallSheetMetal; MetalWelding=5, + Fixer : ScrapMetal; MetalWelding=3, + } +} diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_410g.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_410g.txt new file mode 100644 index 00000000..5e05fa14 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_410g.txt @@ -0,0 +1,55 @@ +module coavinsfirearms { + imports { + Base + } + + item ShotgunReceiver_410g { + DisplayName = Shotgun Receiver (410g), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = ShotgunReceiver, + Weight = 2, + ConditionMax = 20, + WorldStaticModel = Paperbag_Ground, + } + + item ShotgunForend_410g { + DisplayName = Shotgun Forend (410g), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = ShotgunForend, + Weight = 0.5, + ConditionMax = 20, + WorldStaticModel = CarvingFork_Ground, + } + + item ShotgunBoltCarrier_410g { + DisplayName = Shotgun Bolt Carrier (410g), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = ShotgunBoltCarrier, + Weight = 0.3, + ConditionMax = 20, + WorldStaticModel = Staples_Ground, + } + + item ShotgunBolt_410g { + DisplayName = Shotgun Bolt (410g), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = ShotgunBolt, + Weight = 0.2, + ConditionMax = 20, + WorldStaticModel = Staples_Ground, + } + + item ShotgunBarrel_410g { + DisplayName = Shotgun Barrel (410g), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = ShotgunBarrel, + Weight = 1, + ConditionMax = 20, + WorldStaticModel = PlasticPipe, + } +} From 81c3b8a5bb87a7b9016e14c11ed582d65046b051 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:12:12 +0100 Subject: [PATCH 02/53] 21 expand models (#83) * set model: 10855_Silver: Shotgun_20g Signed-off-by: macinsight * Update Glock Models Signed-off-by: macinsight * Update H&K Pistols Signed-off-by: macinsight * Update Police Pistols Signed-off-by: macinsight * Update SCAR Models Signed-off-by: macinsight --------- Signed-off-by: macinsight --- .../CoavinsInclude_Gunfighter.lua | 2 +- .../CoavinsInclude_WeaponPack.lua | 62 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua index 805eff13..fc13fd11 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua @@ -65,7 +65,7 @@ CoavinsFirearms.Include('Base.Moss500_20', 'GenericShotgun') CoavinsFirearms.Include('Base.Colt1855', 'GenericRevolver') -- SHOTGUN_20g.txt -CoavinsFirearms.Include('Base.10855_Silver', 'GenericShotgun') +CoavinsFirearms.Include('Base.10855_Silver', 'Shotgun_20g') -- SW_M500.txt CoavinsFirearms.Include('Base.SW_M500', 'GenericRevolver') diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index 429804e8..cfcc0ead 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -263,11 +263,11 @@ CoavinsFirearms.Include('Base.CZ97B', 'GenericPistol') -- Galil_Sniper_Fold -- GLOCK.txt -CoavinsFirearms.Include('Base.G17', 'GenericPistol') -CoavinsFirearms.Include('Base.G18', 'GenericPistol') +CoavinsFirearms.Include('Base.G17', 'Pistol_9mm') +CoavinsFirearms.Include('Base.G18', 'Pistol_9mm') CoavinsFirearms.Include('Base.G21', 'Pistol_45acp') -CoavinsFirearms.Include('Base.G34', 'GenericPistol') -CoavinsFirearms.Include('Base.G42', 'GenericPistol') +CoavinsFirearms.Include('Base.G34', 'Pistol_9mm') +CoavinsFirearms.Include('Base.G42', 'Pistol_380acp') -- H&K_G.txt -- G33 @@ -287,9 +287,9 @@ CoavinsFirearms.Include('Base.G42', 'GenericPistol') -- MSG90 -- H&K_Pistol.txt -CoavinsFirearms.Include('Base.HK_MK23', 'GenericPistol') -CoavinsFirearms.Include('Base.HK_USP', 'GenericPistol') -CoavinsFirearms.Include('Base.HK_USP_Match', 'GenericPistol') +CoavinsFirearms.Include('Base.HK_MK23', 'Pistol_45acp') +CoavinsFirearms.Include('Base.HK_USP', 'Pistol_45acp') +CoavinsFirearms.Include('Base.HK_USP_Match', 'Pistol_45acp') -- HOWA_TYPE.txt -- Type20 @@ -467,40 +467,40 @@ CoavinsFirearms.Include('Base.ColtM16Tape_INC', 'M16Rifle') -- OTS_03_SVU -- POLICE_PISTOLS.txt -CoavinsFirearms.Include('Base.MP9', 'GenericPistol') -CoavinsFirearms.Include('Base.MP45', 'GenericPistol') -CoavinsFirearms.Include('Base.P226', 'GenericPistol') -CoavinsFirearms.Include('Base.P220', 'GenericPistol') -CoavinsFirearms.Include('Base.XD9', 'GenericPistol') -CoavinsFirearms.Include('Base.XD4', 'GenericPistol') +CoavinsFirearms.Include('Base.MP9','Pistol_9mm') +CoavinsFirearms.Include('Base.MP45', 'Pistol_45acp') +CoavinsFirearms.Include('Base.P226', 'Pistol_45acp') +CoavinsFirearms.Include('Base.P220', 'Pistol_9mm') +CoavinsFirearms.Include('Base.XD9', 'Pistol_9mm') +CoavinsFirearms.Include('Base.XD4', 'Pistol_45acp') -- REVOLVER.txt -CoavinsFirearms.Include('Base.Taurus856', 'GenericRevolver') -CoavinsFirearms.Include('Base.Colt_Service38', 'GenericRevolver') -CoavinsFirearms.Include('Base.Colt_Service45', 'GenericRevolver') +CoavinsFirearms.Include('Base.Taurus856', 'Revolver_38spc') +CoavinsFirearms.Include('Base.Colt_Service38', 'Revolver_38spc') +CoavinsFirearms.Include('Base.Colt_Service45', 'Revolver_45LC') CoavinsFirearms.Include('Base.Colt_Navy_1851', 'Revolver_357') CoavinsFirearms.Include('Base.M1936', 'GenericRevolver') -- RUGER.txt --- LCP380 +CoavinsFirearms.Include('Base.LCP380', 'Pistol_380acp') -- SCAR.txt --- SCARL --- SCARL_Melee --- SCARL_HE --- SCARL_INC --- SCARH --- SCARH_Melee --- SCARH_HE --- SCARH_INC --- SCAR20 --- SCAR20_Melee --- SCAR20_HC --- SCAR20_INC +CoavinsFirearms.Include('SCARL','Rifle_556') +CoavinsFirearms.Include('SCARL_Melee','Rifle_556') +CoavinsFirearms.Include('SCARL_HE','Rifle_556') +CoavinsFirearms.Include('SCARL_INC','Rifle_556') +CoavinsFirearms.Include('SCARH','RifleAuto_308') +CoavinsFirearms.Include('SCARH_Melee','RifleAuto_308') +CoavinsFirearms.Include('SCARH_HE','RifleAuto_308') +CoavinsFirearms.Include('SCARH_INC','RifleAuto_308') +CoavinsFirearms.Include('SCAR20','RifleAuto_308') +CoavinsFirearms.Include('SCAR20_Melee','RifleAuto_308') +CoavinsFirearms.Include('SCAR20_HC','RifleAuto_308') +CoavinsFirearms.Include('SCAR20_INC','RifleAuto_308') -- SCARSC.txt --- SCARSC_Stock --- SCARSC_Fold +CoavinsFirearms.Include('SCARSC_Stock','Rifle_556') +CoavinsFirearms.Include('SCARSC_Fold','Rifle_556') -- SHOTGUN_4G.txt -- KS23 From 62cbe0fd9cf99110a41a57c98497a302fbbe0cfe Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:12:35 +0100 Subject: [PATCH 03/53] 81 add definition 4 gauge shotgun (#85) * Add Model Definitions for #81 Signed-off-by: macinsight * Add Helper definitions for #81 Signed-off-by: macinsight * Add Translation definitions for #81 Signed-off-by: macinsight * Add fix definitions for #81 Signed-off-by: macinsight * Add item definitions for #81 Signed-off-by: macinsight * Add firearms to #81 Signed-off-by: macinsight --------- Signed-off-by: macinsight --- .../client/coavinsfirearms/CoavinsModels.lua | 4 ++ .../client/coavinsfirearms/FirearmsHelper.lua | 23 +++++++ .../lua/shared/Translate/EN/ItemName_EN.txt | 10 +++ .../fixings/coavins_fixing_shotgun_4g.txt | 63 +++++++++++++++++++ .../weapons/coavins_items_shotgun_4g.txt | 55 ++++++++++++++++ .../CoavinsInclude_WeaponPack.lua | 4 +- 6 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_4g.txt create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_4g.txt 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 22de8757..996ed909 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua @@ -95,3 +95,7 @@ CoavinsFirearms.AddOrReplaceModel( 'Shotgun_20g' , { 'ShotgunReceiver_20g', 'ShotgunBarrel_20g' } , 'ShotgunReceiver_20g') +CoavinsFirearms.AddOrReplaceModel( + 'Shotgun_4g' +, { 'ShotgunReceiver_4g', 'ShotgunBarrel_4g' } +, 'ShotgunReceiver_4g') 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 fc79b86c..d3477f56 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua @@ -383,6 +383,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] 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 5b1f59eb..4b614ae3 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 @@ -150,4 +150,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)", } diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_4g.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_4g.txt new file mode 100644 index 00000000..4f07c157 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_shotgun_4g.txt @@ -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, + } +} diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_4g.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_4g.txt new file mode 100644 index 00000000..8a340531 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_shotgun_4g.txt @@ -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, + } +} diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index cfcc0ead..e0283cd7 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -503,8 +503,8 @@ CoavinsFirearms.Include('SCARSC_Stock','Rifle_556') CoavinsFirearms.Include('SCARSC_Fold','Rifle_556') -- 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') From edc62c0c74206569393d2a3924a97aee7cc43654 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:14:29 +0100 Subject: [PATCH 04/53] 78 add definition automatic 308 rifle (#86) * feat(model): Add defs for #79 Signed-off-by: macinsight * feat(model): Add helper defs for #79 Signed-off-by: macinsight * feat(model): Add lang defs for #79 Signed-off-by: macinsight * feat(model): Add fix defs for #79 Signed-off-by: macinsight * feat(model): Add item defs for #79 Signed-off-by: macinsight --------- Signed-off-by: macinsight --- git-conventional-commits.yaml | 34 ++++++++++ .../client/coavinsfirearms/CoavinsModels.lua | 4 +- .../client/coavinsfirearms/FirearmsHelper.lua | 22 +++++++ .../lua/shared/Translate/EN/ItemName_EN.txt | 10 +++ .../fixings/coavins_fixing_rifle_308ar.txt | 63 +++++++++++++++++++ .../weapons/coavins_items_rifle_308AR.txt | 55 ++++++++++++++++ 6 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 git-conventional-commits.yaml create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308ar.txt create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308AR.txt 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/CoavinsModels.lua b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua index 996ed909..553182c5 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua @@ -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') 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 d3477f56..e1aacf86 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua @@ -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' } 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 4b614ae3..0c6026ef 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 @@ -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)", 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, + } +} 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, + } +} From 8c216b7be58dc28dda7930b76ef8370f612fe663 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:15:52 +0100 Subject: [PATCH 05/53] 79 add definition bolt action 308 (#87) * feat(model): Add Model #79 Signed-off-by: macinsight * feat(model): Add Helper #79 Signed-off-by: macinsight * feat(model): Add Translation #79 Signed-off-by: macinsight * feat(model): Add Fixing #79 Signed-off-by: macinsight * feat(model): Add Items #79 Signed-off-by: macinsight * feat(model): Add Weapons #79 Signed-off-by: macinsight --------- Signed-off-by: macinsight --- .gitignore | 1 + .../client/coavinsfirearms/CoavinsModels.lua | 4 ++ .../client/coavinsfirearms/FirearmsHelper.lua | 22 +++++++ .../lua/shared/Translate/EN/ItemName_EN.txt | 10 +++ .../fixings/coavins_fixing_rifle_308BA.txt | 63 +++++++++++++++++++ .../weapons/coavins_items_rifle_308BA.txt | 55 ++++++++++++++++ .../CoavinsInclude_WeaponPack.lua | 8 +-- 7 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 .gitignore create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308BA.txt create mode 100644 src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308BA.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..68c8f055 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +git-conventional-commits.yaml 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 553182c5..c7a3571a 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua @@ -95,6 +95,10 @@ CoavinsFirearms.AddOrReplaceModel( 'Shotgun_20g' , { 'ShotgunReceiver_20g', 'ShotgunBarrel_20g' } , 'ShotgunReceiver_20g') +CoavinsFirearms.AddOrReplaceModel( + 'Rifle_308BA' +, { 'RifleUpperReceiver_308BA', 'RifleLowerReceiver_308BA' } +, 'RifleLowerReceiver_308BA') CoavinsFirearms.AddOrReplaceModel( 'Rifle_308AR',{'RifleUpperReceiver_308AR', 'RifleLowerReceiver_308AR' }, 'RifleUpperReceiver_308AR') CoavinsFirearms.AddOrReplaceModel( 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 e1aacf86..5d9a3431 100644 --- a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua +++ b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua @@ -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_308BA = {} +this.parts.RifleLowerReceiver_308BA.CombinesWith = 'RifleUpperReceiver_308BA' +this.parts.RifleLowerReceiver_308BA.ConditionLowerChance = 2 +this.parts.RifleLowerReceiver_308BA.ConditionMax = 20 +this.parts.RifleUpperReceiver_308BA = {} +this.parts.RifleUpperReceiver_308BA.CombinesWith = 'RifleLowerReceiver_308BA' +this.parts.RifleUpperReceiver_308BA.Holds = { 'RifleBoltCarrier_308BA' } +this.parts.RifleUpperReceiver_308BA.ConditionLowerChance = 2 +this.parts.RifleUpperReceiver_308BA.ConditionMax = 20 +this.parts.RifleBoltCarrier_308BA = {} +this.parts.RifleBoltCarrier_308BA.InsertsInto = 'RifleUpperReceiver_308BA' +this.parts.RifleBoltCarrier_308BA.Holds = { 'RifleFiringPin_308BA', 'RifleBolt_308BA' } +this.parts.RifleBoltCarrier_308BA.ConditionLowerChance = 3 +this.parts.RifleBoltCarrier_308BA.ConditionMax = 20 +this.parts.RifleFiringPin_308BA = {} +this.parts.RifleFiringPin_308BA.InsertsInto = 'RifleBoltCarrier_308BA' +this.parts.RifleFiringPin_308BA.ConditionLowerChance = 4 +this.parts.RifleFiringPin_308BA.ConditionMax = 20 +this.parts.RifleBolt_308BA = {} +this.parts.RifleBolt_308BA.InsertsInto = 'RifleBoltCarrier_308BA' +this.parts.RifleBolt_308BA.ConditionLowerChance = 2 +this.parts.RifleBolt_308BA.ConditionMax = 20 this.parts.RifleLowerReceiver_308AR = {} this.parts.RifleLowerReceiver_308AR.CombinesWith = 'RifleUpperReceiver_308AR' this.parts.RifleLowerReceiver_308AR.ConditionLowerChance = 2 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 0c6026ef..d9df45b8 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 @@ -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_308BA = "Rifle Lower Receiver (.308BA)", + ItemName_coavinsfirearms.RifleLowerReceiver_308BA_Short = "Lower Receiver (.308BA)", + ItemName_coavinsfirearms.RifleUpperReceiver_308BA = "Rifle Upper Receiver (.308BA)", + ItemName_coavinsfirearms.RifleUpperReceiver_308BA_Short = "Upper Receiver (.308BA)", + ItemName_coavinsfirearms.RifleBoltCarrier_308BA = "Rifle Bolt Carrier (.308BA)", + ItemName_coavinsfirearms.RifleBoltCarrier_308BA_Short = "Bolt Carrier (.308BA)", + ItemName_coavinsfirearms.RifleFiringPin_308BA = "Rifle Firing Pin (.308BA)", + ItemName_coavinsfirearms.RifleFiringPin_308BA_Short = "Firing Pin (.308BA)", + ItemName_coavinsfirearms.RifleBolt_308BA = "Rifle Bolt (.308BA)", + ItemName_coavinsfirearms.RifleBolt_308BA_Short = "Bolt (.308BA)", 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)", diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308BA.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308BA.txt new file mode 100644 index 00000000..0188a1e3 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_rifle_308BA.txt @@ -0,0 +1,63 @@ +module coavinsfirearms { + imports { + Base + } + + fixing Fix RifleLowerReceiver_308BA Welding + { + Require : RifleLowerReceiver_308BA, + GlobalItem : BlowTorch=2, + ConditionModifier : 1.2, + + Fixer : SmallSheetMetal; MetalWelding=3, + Fixer : ScrapMetal; MetalWelding=1, + } + + fixing Fix RifleLowerReceiver_308BA + { + Require : RifleLowerReceiver_308BA, + ConditionModifier : 1, + + Fixer : DuctTape=2; Aiming=4, + Fixer : Scotchtape=3; Aiming=2, + } + + fixing Fix RifleUpperReceiver_308BA + { + Require : RifleUpperReceiver_308BA, + ConditionModifier : 1, + + Fixer : DuctTape=2; Aiming=4, + Fixer : Scotchtape=3; Aiming=2, + } + + fixing Fix RifleBoltCarrier_308BA Welding + { + Require : RifleBoltCarrier_308BA, + GlobalItem : BlowTorch=1, + ConditionModifier : 1.2, + + Fixer : SmallSheetMetal; MetalWelding=3, + Fixer : ScrapMetal; MetalWelding=1, + } + + fixing Fix RifleFiringPin_308BA Welding + { + Require : RifleFiringPin_308BA, + GlobalItem : BlowTorch=2, + ConditionModifier : 1.2, + + Fixer : ScrapMetal=2; MetalWelding=6, + Fixer : SmallSheetMetal; MetalWelding=4, + } + + fixing Fix RifleBolt_308BA Welding + { + Require : RifleBolt_308BA, + GlobalItem : BlowTorch=2, + ConditionModifier : 1.2, + + Fixer : SmallSheetMetal; MetalWelding=4, + Fixer : ScrapMetal; MetalWelding=1, + } +} diff --git a/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308BA.txt b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308BA.txt new file mode 100644 index 00000000..30a47800 --- /dev/null +++ b/src/Contents/mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_rifle_308BA.txt @@ -0,0 +1,55 @@ +module coavinsfirearms { + imports { + Base + } + + item RifleLowerReceiver_308BA { + DisplayName = Rifle Lower Receiver (.308 BA), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = RifleLowerReceiver, + Weight = 2, + ConditionMax = 20, + WorldStaticModel = Paperbag_Ground, + } + + item RifleUpperReceiver_308BA { + DisplayName = Rifle Upper Receiver (.308 BA), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = RifleUpperReceiver, + Weight = 2, + ConditionMax = 20, + WorldStaticModel = Paperbag_Ground, + } + + item RifleBoltCarrier_308BA { + DisplayName = Rifle Bolt Carrier (.308 BA), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = RifleBoltCarrier, + Weight = 2, + ConditionMax = 20, + WorldStaticModel = Paperbag_Ground, + } + + item RifleFiringPin_308BA { + DisplayName = Rifle Firing Pin (.308 BA), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = RifleFiringPin, + Weight = 0.1, + ConditionMax = 20, + WorldStaticModel = Paperbag_Ground, + } + + item RifleBolt_308BA { + DisplayName = Rifle Bolt (.308 BA), + DisplayCategory = FirearmPart, + Type = Normal, + Icon = RifleBolt, + Weight = 2, + ConditionMax = 20, + WorldStaticModel = Paperbag_Ground, + } +} diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index e0283cd7..11ee7127 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -405,10 +405,10 @@ CoavinsFirearms.Include('Base.ColtM16Tape_HE', 'M16Rifle') CoavinsFirearms.Include('Base.ColtM16Tape_INC', 'M16Rifle') -- M40A1.txt --- M40 --- M40A1 --- M40A2 --- M40A3 +CoavinsFirearms.Include('M40','Rifle_308BA') +CoavinsFirearms.Include('M40A1','Rifle_308BA') +CoavinsFirearms.Include('M40A2','Rifle_308BA') +CoavinsFirearms.Include('M40A3','Rifle_308BA') -- MAC10.txt -- MAC10_Fold From 8ea2c7e2b59a4ded16072a129b8af0b641394dbe Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:16:17 +0100 Subject: [PATCH 06/53] fix(model): Update weapon type for Colt 1855 (#88) [#62] Signed-off-by: macinsight [#62] --- .../lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua index fc13fd11..ff087040 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_Gunfighter.lua @@ -62,7 +62,7 @@ CoavinsFirearms.Include('Base.Moss500_20', 'GenericShotgun') -- SHOTGUN_10g.txt -- ROYAL_SXS -CoavinsFirearms.Include('Base.Colt1855', 'GenericRevolver') +CoavinsFirearms.Include('Base.Colt1855', 'Shotgun_10g') -- SHOTGUN_20g.txt CoavinsFirearms.Include('Base.10855_Silver', 'Shotgun_20g') From 196d0f5c604bd3c88d9e53ad3bc6d4616d05506e Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:42:33 +0100 Subject: [PATCH 07/53] fix(model): Assign correct types to SCAR Series --- .../CoavinsInclude_WeaponPack.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index 11ee7127..1c6fa37b 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -489,14 +489,14 @@ CoavinsFirearms.Include('SCARL','Rifle_556') CoavinsFirearms.Include('SCARL_Melee','Rifle_556') CoavinsFirearms.Include('SCARL_HE','Rifle_556') CoavinsFirearms.Include('SCARL_INC','Rifle_556') -CoavinsFirearms.Include('SCARH','RifleAuto_308') -CoavinsFirearms.Include('SCARH_Melee','RifleAuto_308') -CoavinsFirearms.Include('SCARH_HE','RifleAuto_308') -CoavinsFirearms.Include('SCARH_INC','RifleAuto_308') -CoavinsFirearms.Include('SCAR20','RifleAuto_308') -CoavinsFirearms.Include('SCAR20_Melee','RifleAuto_308') -CoavinsFirearms.Include('SCAR20_HC','RifleAuto_308') -CoavinsFirearms.Include('SCAR20_INC','RifleAuto_308') +CoavinsFirearms.Include('SCARH','Rifle_308AR') +CoavinsFirearms.Include('SCARH_Melee','Rifle_308AR') +CoavinsFirearms.Include('SCARH_HE','Rifle_308AR') +CoavinsFirearms.Include('SCARH_INC','Rifle_308AR') +CoavinsFirearms.Include('SCAR20','Rifle_308AR') +CoavinsFirearms.Include('SCAR20_Melee','Rifle_308AR') +CoavinsFirearms.Include('SCAR20_HC','Rifle_308AR') +CoavinsFirearms.Include('SCAR20_INC','Rifle_308AR') -- SCARSC.txt CoavinsFirearms.Include('SCARSC_Stock','Rifle_556') From 05d3400e926d3997ed086140fb68392774a9f510 Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:46:01 +0100 Subject: [PATCH 08/53] feat(model): Add Type for BodyGuard380 --- .../lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index 1c6fa37b..255c89a8 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -612,7 +612,7 @@ CoavinsFirearms.Include('Base.SKS30_PARA_Melee', 'SKS') CoavinsFirearms.Include('Base.SKS30_PARA_Bayo_Melee', 'SKS') -- SMITH.txt -CoavinsFirearms.Include('Base.BodyGuard380', 'GenericPistol') +CoavinsFirearms.Include('Base.BodyGuard380', 'Pistol_380acp') CoavinsFirearms.Include('Base.M5238', 'GenericPistol') CoavinsFirearms.Include('Base.M5906', 'GenericPistol') CoavinsFirearms.Include('Base.M4506', 'GenericPistol') From 2e1914c0b7d4afc25e676c06671a4250cb0db82d Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 22:48:48 +0100 Subject: [PATCH 09/53] feat(model): Add type for S&W M52 .38cal --- .../lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index 255c89a8..c02fc0ef 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -613,7 +613,7 @@ CoavinsFirearms.Include('Base.SKS30_PARA_Bayo_Melee', 'SKS') -- SMITH.txt CoavinsFirearms.Include('Base.BodyGuard380', 'Pistol_380acp') -CoavinsFirearms.Include('Base.M5238', 'GenericPistol') +CoavinsFirearms.Include('Base.M5238', 'Pistol_380acp') CoavinsFirearms.Include('Base.M5906', 'GenericPistol') CoavinsFirearms.Include('Base.M4506', 'GenericPistol') From f8b7358b5ad693e14ffac46b92b35d17c35d9bba Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 23:00:12 +0100 Subject: [PATCH 10/53] feat(model): Add type for 1911 family --- .../CoavinsInclude_WeaponPack.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua index c02fc0ef..57786aae 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua @@ -82,14 +82,14 @@ CoavinsFirearms.Include('Base.SW_327', 'GenericRevolver') CoavinsFirearms.Include('Base.SW_327_357', 'Revolver_357') -- 1911.txt -CoavinsFirearms.Include('Base.AMT1911', 'GenericPistol') -CoavinsFirearms.Include('Base.AMT1911_Long', 'GenericPistol') -CoavinsFirearms.Include('Base.M1911_Carbine', 'GenericPistol') -CoavinsFirearms.Include('Base.Colt1911', 'GenericPistol') -CoavinsFirearms.Include('Base.Colt_Kimber', 'GenericPistol') -CoavinsFirearms.Include('Base.Colt_Commander', 'GenericPistol') -CoavinsFirearms.Include('Base.PARA1911', 'GenericPistol') -CoavinsFirearms.Include('Base.PULP_1911', 'GenericPistol') +CoavinsFirearms.Include('Base.AMT1911', 'Pistol_45acp') +CoavinsFirearms.Include('Base.AMT1911_Long', 'Pistol_45acp') +CoavinsFirearms.Include('Base.M1911_Carbine', 'Pistol_45acp') +CoavinsFirearms.Include('Base.Colt1911', 'Pistol_45acp') +CoavinsFirearms.Include('Base.Colt_Kimber', 'Pistol_45acp') +CoavinsFirearms.Include('Base.Colt_Commander', 'Pistol_45acp') +CoavinsFirearms.Include('Base.PARA1911', 'Pistol_45acp') +CoavinsFirearms.Include('Base.PULP_1911', 'Pistol_45acp') -- AK_PATTERN.txt CoavinsFirearms.Include('Base.AK47', 'AK47') From d2349f86d4431ac5c878c22d699a81a32c999efb Mon Sep 17 00:00:00 2001 From: macinsight Date: Mon, 27 Nov 2023 23:02:47 +0100 Subject: [PATCH 11/53] feat(model): Add types to AR Variants --- .../coavinssupport2/CoavinsInclude_New.lua | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_New.lua b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_New.lua index 4bb04075..11ff1182 100644 --- a/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_New.lua +++ b/src/Contents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_New.lua @@ -8,46 +8,46 @@ CoavinsFirearms.Include('Base.AK74_Custom', 'AK47') CoavinsFirearms.Include('Base.AK74_Custom_Melee', 'AK47') -- AR_VARIANT.txt -CoavinsFirearms.Include('Base.LVOA_C', 'M16Rifle') -CoavinsFirearms.Include('Base.LVOA_C_Melee', 'M16Rifle') -CoavinsFirearms.Include('Base.LVOA_C_Melee', 'M16Rifle') -CoavinsFirearms.Include('Base.LVOA_C_INC', 'M16Rifle') -CoavinsFirearms.Include('Base.ADAR', 'M16Rifle') -CoavinsFirearms.Include('Base.ADAR_Melee', 'M16Rifle') -CoavinsFirearms.Include('Base.MK47', 'M16Rifle') -CoavinsFirearms.Include('Base.AAC_Honey', 'M16Rifle') -CoavinsFirearms.Include('Base.AAC_Honey_Fold', 'M16Rifle') -CoavinsFirearms.Include('Base.AAC_HoneySD', 'M16Rifle') -CoavinsFirearms.Include('Base.AAC_HoneySD_Fold', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_AR15_MOE', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_AR15_MOE_Melee', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_AR15_MOE_HE', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_AR15_MOE_INC', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_Melee', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_HE', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_INC', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_Custom', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_Custom_Melee', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_Custom_HE', 'M16Rifle') -CoavinsFirearms.Include('Base.Bush_XM15_Custom_INC', 'M16Rifle') -CoavinsFirearms.Include('Base.TR1_UltraLight', 'M16Rifle') +CoavinsFirearms.Include('Base.LVOA_C', 'Rifle_556') +CoavinsFirearms.Include('Base.LVOA_C_Melee', 'Rifle_556') +CoavinsFirearms.Include('Base.LVOA_C_Melee', 'Rifle_556') +CoavinsFirearms.Include('Base.LVOA_C_INC', 'Rifle_556') +CoavinsFirearms.Include('Base.ADAR', 'Rifle_556') +CoavinsFirearms.Include('Base.ADAR_Melee', 'Rifle_556') +CoavinsFirearms.Include('Base.MK47', 'Rifle_556') +CoavinsFirearms.Include('Base.AAC_Honey', 'Rifle_556') +CoavinsFirearms.Include('Base.AAC_Honey_Fold', 'Rifle_556') +CoavinsFirearms.Include('Base.AAC_HoneySD', 'Rifle_556') +CoavinsFirearms.Include('Base.AAC_HoneySD_Fold', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_AR15_MOE', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_AR15_MOE_Melee', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_AR15_MOE_HE', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_AR15_MOE_INC', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_Melee', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_HE', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_INC', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_Custom', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_Custom_Melee', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_Custom_HE', 'Rifle_556') +CoavinsFirearms.Include('Base.Bush_XM15_Custom_INC', 'Rifle_556') +CoavinsFirearms.Include('Base.TR1_UltraLight', 'Rifle_556') -- SIG_MCX.txt --- MCX_Spear --- MCX_Spear_Melee --- MCX_Spear_HE --- MCX_Spear_INC --- MCX_Virtus --- MCX_Virtus_Melee --- MCX_Virtus_HE --- MCX_Virtus_INC --- MCX_VirtusPatrol --- MCX_VirtusPatrol_Melee --- MCX_VirtusPatrol_HE --- MCX_VirtusPatrol_INC --- MCX_Socom --- MCX_Socom_Melee --- MCX_Socom_HE --- MCX_Socom_INC --- JW3_TTI_MPX \ No newline at end of file +CoavinsFirearms.Include('MCX_Spear','Rifle_556') +CoavinsFirearms.Include('MCX_Spear_Melee','Rifle_556') +CoavinsFirearms.Include('MCX_Spear_HE','Rifle_556') +CoavinsFirearms.Include('MCX_Spear_INC','Rifle_556') +CoavinsFirearms.Include('MCX_Virtus','Rifle_556') +CoavinsFirearms.Include('MCX_Virtus_Melee','Rifle_556') +CoavinsFirearms.Include('MCX_Virtus_HE','Rifle_556') +CoavinsFirearms.Include('MCX_Virtus_INC','Rifle_556') +CoavinsFirearms.Include('MCX_VirtusPatrol','Rifle_556') +CoavinsFirearms.Include('MCX_VirtusPatrol_Melee','Rifle_556') +CoavinsFirearms.Include('MCX_VirtusPatrol_HE','Rifle_556') +CoavinsFirearms.Include('MCX_VirtusPatrol_INC','Rifle_556') +CoavinsFirearms.Include('MCX_Socom','Rifle_556') +CoavinsFirearms.Include('MCX_Socom_Melee','Rifle_556') +CoavinsFirearms.Include('MCX_Socom_HE','Rifle_556') +CoavinsFirearms.Include('MCX_Socom_INC','Rifle_556') +CoavinsFirearms.Include('JW3_TTI_MPX','Rifle_556') From f9f5ac0373879bbb50c13258537c06237a12a1a7 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:38:05 +0100 Subject: [PATCH 12/53] feat(ci): Add Workflow to upate changelogs on PR to develop-branch --- .github/workflows/changelog.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/changelog.md diff --git a/.github/workflows/changelog.md b/.github/workflows/changelog.md new file mode 100644 index 00000000..ef27e948 --- /dev/null +++ b/.github/workflows/changelog.md @@ -0,0 +1,20 @@ +name: Generate changelog +on: + push: + branches + - develop + +jobs: + generate-changelog: +runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: BobAnkh/auto-generate-changelog@v1.2.5 + with: + REPO_NAME: '/' + ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}} + PATH: 'CHANGELOG.md' + COMMIT_MESSAGE: 'docs(CHANGELOG): update release notes' + TYPE: 'feat:Feature,fix:Bug Fixes,docs:Documentation,refactor:Refactor,perf:Performance Improvements' From 65057e596b59ddb80d7717d7b1b628789855a1a7 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:40:08 +0100 Subject: [PATCH 13/53] fix(ci): Change WF rules, add correct repo --- .github/workflows/changelog.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/changelog.md b/.github/workflows/changelog.md index ef27e948..c131a430 100644 --- a/.github/workflows/changelog.md +++ b/.github/workflows/changelog.md @@ -1,8 +1,6 @@ name: Generate changelog on: - push: - branches - - develop + push jobs: generate-changelog: @@ -13,7 +11,7 @@ jobs: fetch-depth: 0 - uses: BobAnkh/auto-generate-changelog@v1.2.5 with: - REPO_NAME: '/' + REPO_NAME: 'coavins/zomboid-coavins-firearms' ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}} PATH: 'CHANGELOG.md' COMMIT_MESSAGE: 'docs(CHANGELOG): update release notes' From 06d9c913cd9e59b1ae739ebe53222077439bdec2 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:41:21 +0100 Subject: [PATCH 14/53] fix(ci): Update Workflow rules --- .github/workflows/changelog.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.md b/.github/workflows/changelog.md index c131a430..aa975a2d 100644 --- a/.github/workflows/changelog.md +++ b/.github/workflows/changelog.md @@ -1,6 +1,8 @@ name: Generate changelog on: - push + push: + branches: + - ci jobs: generate-changelog: From 5357f65ef889cad6db02f4dcb3791f06e7df1b04 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:43:50 +0100 Subject: [PATCH 15/53] fix(ci): Fix file extension for CL workflow --- .github/workflows/{changelog.md => changelog.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{changelog.md => changelog.yml} (100%) diff --git a/.github/workflows/changelog.md b/.github/workflows/changelog.yml similarity index 100% rename from .github/workflows/changelog.md rename to .github/workflows/changelog.yml From d304f047db98370c1c2daa153d118b813a6a6bc2 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:48:01 +0100 Subject: [PATCH 16/53] fix(ci): Fix L workflow --- .github/workflows/changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index aa975a2d..57829806 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -1,14 +1,14 @@ name: Generate changelog on: - push: - branches: - - ci + push: + branches: + - ci jobs: generate-changelog: -runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: BobAnkh/auto-generate-changelog@v1.2.5 From a6050ed4199c965b493126b4d5edeeb77270bacf Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:49:58 +0100 Subject: [PATCH 17/53] fix(ci): FIx linting in glc WF Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 57829806..6370dc21 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,7 +7,7 @@ on: jobs: generate-changelog: runs-on: ubuntu-latest - steps: + steps: - uses: actions/checkout@v4 with: fetch-depth: 0 From 5895aa7a793932491075c6cea2378291e5c7e15a Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:50:57 +0100 Subject: [PATCH 18/53] fix(ci): Fix indent Signed-off-by: macinsight --- .github/workflows/changelog.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 6370dc21..616a6641 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -6,15 +6,15 @@ on: jobs: generate-changelog: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: BobAnkh/auto-generate-changelog@v1.2.5 - with: - REPO_NAME: 'coavins/zomboid-coavins-firearms' - ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}} - PATH: 'CHANGELOG.md' - COMMIT_MESSAGE: 'docs(CHANGELOG): update release notes' - TYPE: 'feat:Feature,fix:Bug Fixes,docs:Documentation,refactor:Refactor,perf:Performance Improvements' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: BobAnkh/auto-generate-changelog@v1.2.5 + with: + REPO_NAME: 'coavins/zomboid-coavins-firearms' + ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}} + PATH: 'CHANGELOG.md' + COMMIT_MESSAGE: 'docs(CHANGELOG): update release notes' + TYPE: 'feat:Feature,fix:Bug Fixes,docs:Documentation,refactor:Refactor,perf:Performance Improvements' From 5872e8ea634a0adef7cb2a7ce0f4daf6e32577cd Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:56:25 +0100 Subject: [PATCH 19/53] fix(ci): Update changelog.yml to new action Signed-off-by: macinsight --- .github/workflows/changelog.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 616a6641..bb6c0294 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -1,20 +1,27 @@ -name: Generate changelog +name: Deploy + on: push: branches: - ci - jobs: - generate-changelog: + deploy: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v4 + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Update CHANGELOG + id: changelog + uses: requarks/changelog-action@v1.9.0 with: - fetch-depth: 0 - - uses: BobAnkh/auto-generate-changelog@v1.2.5 + token: ${{ github.token }} + tag: ${{ github.ref_name }} + + - name: Commit CHANGELOG.md + uses: stefanzweifel/git-auto-commit-action@v4 with: - REPO_NAME: 'coavins/zomboid-coavins-firearms' - ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}} - PATH: 'CHANGELOG.md' - COMMIT_MESSAGE: 'docs(CHANGELOG): update release notes' - TYPE: 'feat:Feature,fix:Bug Fixes,docs:Documentation,refactor:Refactor,perf:Performance Improvements' + branch: ci + commit_message: 'docs(changelog): update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' + file_pattern: CHANGELOG.md From c7477169ca87a225bed74899e61b17c9e13f72dc Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:58:43 +0100 Subject: [PATCH 20/53] fix(ci): Change version for changelog action Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index bb6c0294..b199a4a1 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -14,7 +14,7 @@ jobs: - name: Update CHANGELOG id: changelog - uses: requarks/changelog-action@v1.9.0 + uses: requarks/changelog-action@v1 with: token: ${{ github.token }} tag: ${{ github.ref_name }} From 50bade37b08bd1b519f9bb386a4c2521d1ccbbe5 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 10:08:41 +0100 Subject: [PATCH 21/53] fix(ci): Update changelog.yml with new action Signed-off-by: macinsight --- .github/workflows/changelog.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b199a4a1..26039aaa 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -1,4 +1,4 @@ -name: Deploy +name: changelog on: push: @@ -11,17 +11,21 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get previous tag + id: previousTag + run: | + name=$(git --no-pager tag --sort=creatordate --merged ${{ github.ref_name }} | tail -2 | head -1) + echo "previousTag: $name" + echo "previousTag=$name" >> $GITHUB_ENV - name: Update CHANGELOG id: changelog uses: requarks/changelog-action@v1 with: token: ${{ github.token }} - tag: ${{ github.ref_name }} - - - name: Commit CHANGELOG.md - uses: stefanzweifel/git-auto-commit-action@v4 - with: - branch: ci - commit_message: 'docs(changelog): update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' - file_pattern: CHANGELOG.md + fromTag: ${{ github.ref_name }} + toTag: ${{ env.previousTag }} + writeToFile: false From b3ba37f99c72ac7a0b7e5d7205592e6405207be4 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 10:11:36 +0100 Subject: [PATCH 22/53] fix(ci): Have changelog action write changes to changelog.md Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 26039aaa..381b5ada 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -28,4 +28,4 @@ jobs: token: ${{ github.token }} fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} - writeToFile: false + writeToFile: true From 3280352fb43dca9b4433af20ad1bca5014a786db Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 10:16:50 +0100 Subject: [PATCH 23/53] test(ci): Update changelog.yml with new action Signed-off-by: macinsight --- .github/workflows/changelog.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 381b5ada..faceddd4 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -28,4 +28,10 @@ jobs: token: ${{ github.token }} fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} - writeToFile: true + writeToFile: true + - name: Commit CHANGELOG.md + uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: ci + commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' + file_pattern: CHANGELOG.md From cc202e7ef667b92f36f0fa3fb0959004d56cfe45 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 09:17:09 +0000 Subject: [PATCH 24/53] docs: update CHANGELOG.md for ci [skip ci] --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ddc81ee..02bc41fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +## [ci] - 2023-11-28 +### :sparkles: New Features +- [`05d3400`](https://github.com/coavins/zomboid-coavins-firearms/commit/05d3400e926d3997ed086140fb68392774a9f510) - **model**: Add Type for BodyGuard380 *(commit by [@macinsight](https://github.com/macinsight))* +- [`2e1914c`](https://github.com/coavins/zomboid-coavins-firearms/commit/2e1914c0b7d4afc25e676c06671a4250cb0db82d) - **model**: Add type for S&W M52 .38cal *(commit by [@macinsight](https://github.com/macinsight))* +- [`f8b7358`](https://github.com/coavins/zomboid-coavins-firearms/commit/f8b7358b5ad693e14ffac46b92b35d17c35d9bba) - **model**: Add type for 1911 family *(commit by [@macinsight](https://github.com/macinsight))* +- [`d2349f8`](https://github.com/coavins/zomboid-coavins-firearms/commit/d2349f86d4431ac5c878c22d699a81a32c999efb) - **model**: Add types to AR Variants *(commit by [@macinsight](https://github.com/macinsight))* +- [`f9f5ac0`](https://github.com/coavins/zomboid-coavins-firearms/commit/f9f5ac0373879bbb50c13258537c06237a12a1a7) - **ci**: Add Workflow to upate changelogs on PR to develop-branch *(commit by [@macinsight](https://github.com/macinsight))* + +### :bug: Bug Fixes +- [`8ea2c7e`](https://github.com/coavins/zomboid-coavins-firearms/commit/8ea2c7e2b59a4ded16072a129b8af0b641394dbe) - **model**: Update weapon type for Colt 1855 *(PR [#88](https://github.com/coavins/zomboid-coavins-firearms/pull/88) by [@macinsight](https://github.com/macinsight))* + - :arrow_lower_right: *fixes issue [#62](undefined) opened by [@macinsight](https://github.com/macinsight)* +- [`196d0f5`](https://github.com/coavins/zomboid-coavins-firearms/commit/196d0f5c604bd3c88d9e53ad3bc6d4616d05506e) - **model**: Assign correct types to SCAR Series *(commit by [@macinsight](https://github.com/macinsight))* +- [`65057e5`](https://github.com/coavins/zomboid-coavins-firearms/commit/65057e596b59ddb80d7717d7b1b628789855a1a7) - **ci**: Change WF rules, add correct repo *(commit by [@macinsight](https://github.com/macinsight))* +- [`06d9c91`](https://github.com/coavins/zomboid-coavins-firearms/commit/06d9c913cd9e59b1ae739ebe53222077439bdec2) - **ci**: Update Workflow rules *(commit by [@macinsight](https://github.com/macinsight))* +- [`5357f65`](https://github.com/coavins/zomboid-coavins-firearms/commit/5357f65ef889cad6db02f4dcb3791f06e7df1b04) - **ci**: Fix file extension for CL workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`d304f04`](https://github.com/coavins/zomboid-coavins-firearms/commit/d304f047db98370c1c2daa153d118b813a6a6bc2) - **ci**: Fix L workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`a6050ed`](https://github.com/coavins/zomboid-coavins-firearms/commit/a6050ed4199c965b493126b4d5edeeb77270bacf) - **ci**: FIx linting in glc WF *(commit by [@macinsight](https://github.com/macinsight))* +- [`5895aa7`](https://github.com/coavins/zomboid-coavins-firearms/commit/5895aa7a793932491075c6cea2378291e5c7e15a) - **ci**: Fix indent *(commit by [@macinsight](https://github.com/macinsight))* +- [`5872e8e`](https://github.com/coavins/zomboid-coavins-firearms/commit/5872e8ea634a0adef7cb2a7ce0f4daf6e32577cd) - **ci**: Update changelog.yml to new action *(commit by [@macinsight](https://github.com/macinsight))* +- [`c747716`](https://github.com/coavins/zomboid-coavins-firearms/commit/c7477169ca87a225bed74899e61b17c9e13f72dc) - **ci**: Change version for changelog action *(commit by [@macinsight](https://github.com/macinsight))* +- [`50bade3`](https://github.com/coavins/zomboid-coavins-firearms/commit/50bade37b08bd1b519f9bb386a4c2521d1ccbbe5) - **ci**: Update changelog.yml with new action *(commit by [@macinsight](https://github.com/macinsight))* +- [`b3ba37f`](https://github.com/coavins/zomboid-coavins-firearms/commit/b3ba37f99c72ac7a0b7e5d7205592e6405207be4) - **ci**: Have changelog action write changes to changelog.md *(commit by [@macinsight](https://github.com/macinsight))* + +### :white_check_mark: Tests +- [`3280352`](https://github.com/coavins/zomboid-coavins-firearms/commit/3280352fb43dca9b4433af20ad1bca5014a786db) - **ci**: Update changelog.yml with new action *(commit by [@macinsight](https://github.com/macinsight))* + + ## v9 * Add models: @@ -12,3 +39,5 @@ * Change Glock 21 to use model: .45 ACP Pistol Contributors: macinsight + +[ci]: https://github.com/coavins/zomboid-coavins-firearms/compare/v7...ci \ No newline at end of file From 164790a3773d7c4e31eb054a4fe96ec186e3f12b Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 10:29:32 +0100 Subject: [PATCH 25/53] 73 add workflow to create branch from issue (#74) * Add CIB template workflow Signed-off-by: macinsight * Add PR Link in comment Signed-off-by: macinsight * Add configuration file Signed-off-by: macinsight * Update configuration for cib Signed-off-by: macinsight * Add label skip for "invalid" and "wontfix" labels Signed-off-by: macinsight * fix(ci): Add missing config to skip CI on PR creation Signed-off-by: macinsight * feat(ci): Let PRs with label 'codebase' have branch 'yaml' as prtarget Signed-off-by: macinsight --------- Signed-off-by: macinsight --- .github/issue-branch.yml | 47 +++++++++++++++++++++++ .github/workflows/create-branch-issue.yml | 33 ++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 .github/issue-branch.yml create mode 100644 .github/workflows/create-branch-issue.yml diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml new file mode 100644 index 00000000..4a3b6f64 --- /dev/null +++ b/.github/issue-branch.yml @@ -0,0 +1,47 @@ +### Configuration file for ./workflows/create-branch-issue.yml +# Have branches be created when issue is assniged +mode: auto +# Use naming scheme of "issue-[id]" +branchName: short +# Auto-close an issue after the corresponding PR has been merged into `develop` +autoCloseIssue: true +branches: + # Prefix based on issue + - label: model + prefix: model/ + - label: bug + prefix: bugfix/ + # Skip based on label + - label: duplicate + skip: true + - label: help wanted + skip: true + - label: question + skip: true + - label: invalid + skip: true + - label: wontfix + skip: true + # Open PR to merge `develop` into `release` when issue has label "release" + - label: release + name: develop + prTarget: release + skipBranch: true + # Let PRs labelled "codebase" have branch "yaml" as prTarget and `develop` as source + - label: codebase + name: develop + prTarget: yaml +# Open a Draft PR on issue creation +openDraftPR: true +# Skip CI workflows on empty commits on PR creation (This "Feature" is a GH requirement) +prSkipCI: true +# Copy attributes from issue into PR +copyIssueDescriptionToPR: true +copyIssueLabelsToPR: true +copyIssueAssigneeToPR: true +copyIssueProjectsToPR: true +copyIssueMilestoneToPR: true +# Create "[Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)" message (See [here](https://github.com/marketplace/actions/create-issue-branch#conventional-pull-request-titles)) +conventionalPrTitles: true +# Use semantic versioning with gitmoji +conventionalStyle: semver diff --git a/.github/workflows/create-branch-issue.yml b/.github/workflows/create-branch-issue.yml new file mode 100644 index 00000000..b927124b --- /dev/null +++ b/.github/workflows/create-branch-issue.yml @@ -0,0 +1,33 @@ +on: + # The issues event below is only needed for the default (auto) mode, + # you can remove it otherwise + issues: + types: [ assigned ] + # The issue_comment event below is only needed for the ChatOps mode, + # you can remove it otherwise + issue_comment: + types: [ created ] + pull_request: + types: [ closed ] + +jobs: + create_issue_branch_job: + runs-on: ubuntu-latest + steps: + - name: Create Issue Branch + uses: robvanderleek/create-issue-branch@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: add pr link in comment + uses: mshick/add-pr-comment@master + if: steps.create-issue-branch.outputs.branchName != '' + env: + PULL_REQUEST_URL: ${{ format('https://github.com/{0}/compare/{1}...{2}?quick_pull=1&template={3}', github.repository, github.event.repository.default_branch, steps.create-issue-branch.outputs.branchName, steps.template.outputs.template-name) }} + TEMPLATE: ${{ steps.template.outputs.template-name }} + with: + message: | + ## Pull Request ![](https://raw.githubusercontent.com/primer/octicons/master/icons/git-pull-request-16.svg) + + [Create a pull request](${{ env.PULL_REQUEST_URL }}) for the issue branch using the `${{ env.TEMPLATE }}` template. + repo-token: ${{ secrets.GITHUB_TOKEN }} + repo-token-user-login: "github-actions[bot]" From b0c5f1d10062a0ef0f2a315aa180c2baf2b3c59b Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 10:52:07 +0100 Subject: [PATCH 26/53] fix(ci): Remove redundant config option Signed-off-by: macinsight --- .github/workflows/create-branch-issue.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/create-branch-issue.yml b/.github/workflows/create-branch-issue.yml index b927124b..d53a64f9 100644 --- a/.github/workflows/create-branch-issue.yml +++ b/.github/workflows/create-branch-issue.yml @@ -3,12 +3,6 @@ on: # you can remove it otherwise issues: types: [ assigned ] - # The issue_comment event below is only needed for the ChatOps mode, - # you can remove it otherwise - issue_comment: - types: [ created ] - pull_request: - types: [ closed ] jobs: create_issue_branch_job: From 6e0bc164ceb3a6591dc836862f0b37e2c6b28f08 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:02:04 +0100 Subject: [PATCH 27/53] fix(ci): Add name to cib workflow Signed-off-by: macinsight --- .github/workflows/create-branch-issue.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/create-branch-issue.yml b/.github/workflows/create-branch-issue.yml index d53a64f9..caa8b9fe 100644 --- a/.github/workflows/create-branch-issue.yml +++ b/.github/workflows/create-branch-issue.yml @@ -1,3 +1,5 @@ +name: cib + on: # The issues event below is only needed for the default (auto) mode, # you can remove it otherwise From 3b3d802cfd0720a8c2d00544d3ea701d09042aa0 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:07:34 +0100 Subject: [PATCH 28/53] feat(ci): Add CIB Workflow Signed-off-by: macinsight --- .github/workflows/create-branch-issue.yml | 29 ----------------------- .github/workflows/create-issue-branch.yml | 17 +++++++++++++ 2 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/create-branch-issue.yml create mode 100644 .github/workflows/create-issue-branch.yml diff --git a/.github/workflows/create-branch-issue.yml b/.github/workflows/create-branch-issue.yml deleted file mode 100644 index caa8b9fe..00000000 --- a/.github/workflows/create-branch-issue.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: cib - -on: - # The issues event below is only needed for the default (auto) mode, - # you can remove it otherwise - issues: - types: [ assigned ] - -jobs: - create_issue_branch_job: - runs-on: ubuntu-latest - steps: - - name: Create Issue Branch - uses: robvanderleek/create-issue-branch@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: add pr link in comment - uses: mshick/add-pr-comment@master - if: steps.create-issue-branch.outputs.branchName != '' - env: - PULL_REQUEST_URL: ${{ format('https://github.com/{0}/compare/{1}...{2}?quick_pull=1&template={3}', github.repository, github.event.repository.default_branch, steps.create-issue-branch.outputs.branchName, steps.template.outputs.template-name) }} - TEMPLATE: ${{ steps.template.outputs.template-name }} - with: - message: | - ## Pull Request ![](https://raw.githubusercontent.com/primer/octicons/master/icons/git-pull-request-16.svg) - - [Create a pull request](${{ env.PULL_REQUEST_URL }}) for the issue branch using the `${{ env.TEMPLATE }}` template. - repo-token: ${{ secrets.GITHUB_TOKEN }} - repo-token-user-login: "github-actions[bot]" diff --git a/.github/workflows/create-issue-branch.yml b/.github/workflows/create-issue-branch.yml new file mode 100644 index 00000000..19176c7b --- /dev/null +++ b/.github/workflows/create-issue-branch.yml @@ -0,0 +1,17 @@ +on: + # The issue.opened event below is only needed for the "immediate" mode. + # The issue.assigned event below is only needed for the default ("auto") mode. + issues: + types: [ assigned ] + # The pull_request events below are only needed for pull-request related features. + pull_request: + types: [ opened, closed ] + +jobs: + create_issue_branch_job: + runs-on: ubuntu-latest + steps: + - name: Create Issue Branch + uses: robvanderleek/create-issue-branch@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f40cf6131d36c4ea448eb7e03dd0820fb586a44b Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:15:57 +0100 Subject: [PATCH 29/53] fix(ci): Update CIB Workflow Signed-off-by: macinsight --- .github/workflows/create-issue-branch.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-issue-branch.yml b/.github/workflows/create-issue-branch.yml index 19176c7b..43845390 100644 --- a/.github/workflows/create-issue-branch.yml +++ b/.github/workflows/create-issue-branch.yml @@ -2,10 +2,13 @@ on: # The issue.opened event below is only needed for the "immediate" mode. # The issue.assigned event below is only needed for the default ("auto") mode. issues: - types: [ assigned ] + types: + - assigned # The pull_request events below are only needed for pull-request related features. pull_request: - types: [ opened, closed ] + types: + - opened + - closed jobs: create_issue_branch_job: From eeab71975346c346c32b6fb0c7bb77f74aa5311d Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:26:07 +0100 Subject: [PATCH 30/53] docs(contrib): Update to CC standard Signed-off-by: macinsight --- CONTRIBUTING.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a370af5c..314e9c71 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,14 +13,15 @@ Please create a pull request targeting the `develop` branch with a clear explana You should create a new branch for each pull request, and rebase/squash it into as few logical commits as possible. -This repository generally follows the [Chris Beams standards](https://cbea.ms/git-commit/) for commit messages: - - Separate subject from body with a blank line - Limit the subject line to 50 characters - Capitalize the subject line - Use the imperative mood in the subject line - Do not end the subject line with a period - Use the body to explain what and why vs. how - Wrap the body at 72 characters +## Commit guidelines + +This repository generally adheres to the "[Conventional Commit](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13)" standards for commit messages to automate various steps i the build process: + +- Format: `(): ` +- Examples: + - **New Model:** `feat(model): implement password recovery` + - **Bug Fix:** `fix(validation): address input validation edge case` + - **Chore:** `chore(docs): update contribution guidelines` + Your commits will be expected to meet these standards before your PR will be merged. From 2db89cf2f315999c2fb892b54b65b68ffb27cd48 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:31:56 +0100 Subject: [PATCH 31/53] fix(ci): Add 'docs' to generated types Signed-off-by: macinsight --- .github/workflows/changelog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index faceddd4..50d3ba3c 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,5 +33,6 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v4 with: branch: ci + excludeTypes: build.other,style commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md From 1f54ebac07c6e6bbb6da9529ef5839d243deb4a2 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:33:18 +0100 Subject: [PATCH 32/53] docs(ci): Change generated CHANGELOG.md from 'oldest first' to 'newest first' Signed-off-by: macinsight --- .github/workflows/changelog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 50d3ba3c..4179b7ef 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -36,3 +36,4 @@ jobs: excludeTypes: build.other,style commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md + reverseOrder: true From fe55681ea0190ba2746767bbb2accaef5ea0a5e8 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:50:19 +0100 Subject: [PATCH 33/53] fix(ci): Add correct arguments to update_changelog action Signed-off-by: macinsight --- .github/workflows/changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 4179b7ef..b0695acb 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,11 +29,11 @@ jobs: fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} writeToFile: true + excludeTypes: build.other,style + reverseOrder: true - name: Commit CHANGELOG.md uses: stefanzweifel/git-auto-commit-action@v4 with: branch: ci - excludeTypes: build.other,style commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md - reverseOrder: true From 0545bbef90a2cbe4326e57b385ad5c8fdee074a1 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 11:51:31 +0100 Subject: [PATCH 34/53] fix(ci): Add permissions to git-auto-commit Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b0695acb..4789fe1a 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,6 +33,8 @@ jobs: reverseOrder: true - name: Commit CHANGELOG.md uses: stefanzweifel/git-auto-commit-action@v4 + permissions: + - contents: write with: branch: ci commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' From 1992e70da5a7cd0cf85160b1748acc8b3b75099d Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 12:06:17 +0100 Subject: [PATCH 35/53] fix(ci): Remove erroring permissons Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 4789fe1a..b0695acb 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,8 +33,6 @@ jobs: reverseOrder: true - name: Commit CHANGELOG.md uses: stefanzweifel/git-auto-commit-action@v4 - permissions: - - contents: write with: branch: ci commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' From 561a187d5c04694a9e2d43f65be56c8d1160121b Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:29:16 +0100 Subject: [PATCH 36/53] fix(ci): Update secret to use GITHUB_TOKEN Signed-off-by: macinsight --- .github/workflows/changelog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b0695acb..47337396 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -25,12 +25,13 @@ jobs: id: changelog uses: requarks/changelog-action@v1 with: - token: ${{ github.token }} + token: ${{ secrets.GITHUB_TOKEN }} fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} writeToFile: true excludeTypes: build.other,style reverseOrder: true + - name: Commit CHANGELOG.md uses: stefanzweifel/git-auto-commit-action@v4 with: From 1034a639e83a3c881eb491d0b5b78275626c1b0e Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:29:48 +0100 Subject: [PATCH 37/53] fix(ci): Update git-auto-commit to v5 Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 47337396..355e0d3f 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,7 +33,7 @@ jobs: reverseOrder: true - name: Commit CHANGELOG.md - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: branch: ci commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' From 6c021ac58535edf961515c300d28c02781dd9990 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:33:10 +0100 Subject: [PATCH 38/53] feat(docs): Update permitted committypes Signed-off-by: macinsight --- git-conventional-commits.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/git-conventional-commits.yaml b/git-conventional-commits.yaml index 47162f0c..8d305854 100644 --- a/git-conventional-commits.yaml +++ b/git-conventional-commits.yaml @@ -11,6 +11,7 @@ convention: - ops - docs - merge + - chore commitScopes: [] releaseTagGlobPattern: v[0-9]*.[0-9]*.[0-9]* changelog: From 74df28f9887bfb211d027858b3e87e5cc33ad425 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:36:35 +0100 Subject: [PATCH 39/53] fix(ci): Fix excludeTypes Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 355e0d3f..765826d8 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,7 +29,7 @@ jobs: fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} writeToFile: true - excludeTypes: build.other,style + excludeTypes: build,other,style reverseOrder: true - name: Commit CHANGELOG.md From 4a0fbadb7b7fbfd0030e1a5d0332c1d087ba66f9 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:48:31 +0100 Subject: [PATCH 40/53] fix(ci): Change source tag for Changelog CI Signed-off-by: macinsight --- .github/workflows/changelog.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 765826d8..b0208a28 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -26,8 +26,7 @@ jobs: uses: requarks/changelog-action@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - fromTag: ${{ github.ref_name }} - toTag: ${{ env.previousTag }} + tag: ${{ github.ref_name }} writeToFile: true excludeTypes: build,other,style reverseOrder: true From 0e623f3c16eebbd58004a7d87534f9425cd19285 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:57:19 +0100 Subject: [PATCH 41/53] fix(ci): Update config for changelog-action, add permissions to token Signed-off-by: macinsight --- .github/workflows/changelog.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b0208a28..13c1235d 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,12 +7,15 @@ on: jobs: deploy: runs-on: ubuntu-latest - + permissions: + contents: write + pull-requests: write steps: - name: Checkout Code uses: actions/checkout@v4 with: fetch-depth: 0 + ref: ${{ github.head_ref }} - name: Get previous tag id: previousTag @@ -25,7 +28,7 @@ jobs: id: changelog uses: requarks/changelog-action@v1 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ github.token }} tag: ${{ github.ref_name }} writeToFile: true excludeTypes: build,other,style From af385f829673477d1ced84ac3f983954f57a69b3 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 14:59:29 +0100 Subject: [PATCH 42/53] chore(ci): Update requarks/changelog-action to latest Signed-off-by: macinsight --- .github/workflows/changelog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 13c1235d..e3b94202 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -26,9 +26,10 @@ jobs: - name: Update CHANGELOG id: changelog - uses: requarks/changelog-action@v1 + uses: requarks/changelog-action@v1.9.0 with: token: ${{ github.token }} + fromTag: tag: ${{ github.ref_name }} writeToFile: true excludeTypes: build,other,style From 05e03828cad88443747af910c076a6c296213d7b Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:04:34 +0100 Subject: [PATCH 43/53] fix(ci): Adjust roof commit range for CHANGELOG CI Signed-off-by: macinsight --- .github/workflows/changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index e3b94202..13a8de91 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,8 +29,8 @@ jobs: uses: requarks/changelog-action@v1.9.0 with: token: ${{ github.token }} - fromTag: - tag: ${{ github.ref_name }} + fromTag: ${{ env.previousTag }} + toTag: v9 writeToFile: true excludeTypes: build,other,style reverseOrder: true From 9f69529fad4dc44a91309e04c4454a8d27d275b1 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:19:31 +0100 Subject: [PATCH 44/53] chore(ci): Set latest tag for changelog CI Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 13a8de91..261d6d6b 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -30,7 +30,7 @@ jobs: with: token: ${{ github.token }} fromTag: ${{ env.previousTag }} - toTag: v9 + toTag: ${{ github.head_ref }} writeToFile: true excludeTypes: build,other,style reverseOrder: true From f4ac1ad384ff6233a7fdee1b87b33070734892a3 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:28:09 +0100 Subject: [PATCH 45/53] fix(ci): Adjust toTag of changelog action Signed-off-by: macinsight --- .github/workflows/changelog.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 261d6d6b..3e1ea7f0 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -30,14 +30,16 @@ jobs: with: token: ${{ github.token }} fromTag: ${{ env.previousTag }} - toTag: ${{ github.head_ref }} + toTag: ${{ github.ref_name }} writeToFile: true excludeTypes: build,other,style reverseOrder: true - name: Commit CHANGELOG.md uses: stefanzweifel/git-auto-commit-action@v5 + if: steps.auto-commit-action.outputs.changes_detected == 'true' with: branch: ci commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md + From 6f90706c830adc835dfcf0b698ea2df763bb15e5 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:34:15 +0100 Subject: [PATCH 46/53] fix(ci): Swap toTag and fromTag to have CI detect new commits Signed-off-by: macinsight --- .github/workflows/changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 3e1ea7f0..fcd06caf 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,8 +29,8 @@ jobs: uses: requarks/changelog-action@v1.9.0 with: token: ${{ github.token }} - fromTag: ${{ env.previousTag }} - toTag: ${{ github.ref_name }} + fromTag: {{ github.ref_name }} + toTag: ${{ env.previousTag }} writeToFile: true excludeTypes: build,other,style reverseOrder: true From be2ea8a58cc1ab0beda27defb04adeb21bca16eb Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:35:04 +0100 Subject: [PATCH 47/53] fix(ci): Fix missing '$' in Workflow Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index fcd06caf..1bbd6d63 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,7 +29,7 @@ jobs: uses: requarks/changelog-action@v1.9.0 with: token: ${{ github.token }} - fromTag: {{ github.ref_name }} + fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} writeToFile: true excludeTypes: build,other,style From 6af14ccaa20a5b21a3bce092f7a47339af5cabce Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:44:43 +0100 Subject: [PATCH 48/53] fix(ci): Change writeToFile Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 1bbd6d63..61c2d91a 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -31,7 +31,7 @@ jobs: token: ${{ github.token }} fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} - writeToFile: true + writeToFile: false excludeTypes: build,other,style reverseOrder: true From 27e728ae9f486defba88391b2fde0bf0c09c74aa Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:46:17 +0100 Subject: [PATCH 49/53] fix(ci): Change writeToFile to 'true' Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 61c2d91a..56a6e793 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -31,7 +31,7 @@ jobs: token: ${{ github.token }} fromTag: ${{ github.ref_name }} toTag: ${{ env.previousTag }} - writeToFile: false + writeToFile: true excludeTypes: build,other,style reverseOrder: true From c5479c93fb6263deb535f9a90c06c65eea82a040 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 16:09:05 +0100 Subject: [PATCH 50/53] docs(ci): Change Changelog.md to see if it regenerates Signed-off-by: macinsight --- CHANGELOG.md => CHANGELOG_old.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGELOG.md => CHANGELOG_old.md (100%) diff --git a/CHANGELOG.md b/CHANGELOG_old.md similarity index 100% rename from CHANGELOG.md rename to CHANGELOG_old.md From 17189109bb6a5e6d76f02fe7e9a383f5033eb0e6 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 16:13:05 +0100 Subject: [PATCH 51/53] fix(ci): CHange order back to default Signed-off-by: macinsight --- .github/workflows/changelog.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 56a6e793..925098fd 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,11 +33,9 @@ jobs: toTag: ${{ env.previousTag }} writeToFile: true excludeTypes: build,other,style - reverseOrder: true - name: Commit CHANGELOG.md uses: stefanzweifel/git-auto-commit-action@v5 - if: steps.auto-commit-action.outputs.changes_detected == 'true' with: branch: ci commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' From c1b22921afcccd09ce5c1223a7cc415e468fab74 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 15:13:25 +0000 Subject: [PATCH 52/53] docs: update CHANGELOG.md for ci [skip ci] --- CHANGELOG.md | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..8ba658e1 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,65 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [ci] - 2023-11-28 +### :sparkles: New Features +- [`05d3400`](https://github.com/coavins/zomboid-coavins-firearms/commit/05d3400e926d3997ed086140fb68392774a9f510) - **model**: Add Type for BodyGuard380 *(commit by [@macinsight](https://github.com/macinsight))* +- [`2e1914c`](https://github.com/coavins/zomboid-coavins-firearms/commit/2e1914c0b7d4afc25e676c06671a4250cb0db82d) - **model**: Add type for S&W M52 .38cal *(commit by [@macinsight](https://github.com/macinsight))* +- [`f8b7358`](https://github.com/coavins/zomboid-coavins-firearms/commit/f8b7358b5ad693e14ffac46b92b35d17c35d9bba) - **model**: Add type for 1911 family *(commit by [@macinsight](https://github.com/macinsight))* +- [`d2349f8`](https://github.com/coavins/zomboid-coavins-firearms/commit/d2349f86d4431ac5c878c22d699a81a32c999efb) - **model**: Add types to AR Variants *(commit by [@macinsight](https://github.com/macinsight))* +- [`f9f5ac0`](https://github.com/coavins/zomboid-coavins-firearms/commit/f9f5ac0373879bbb50c13258537c06237a12a1a7) - **ci**: Add Workflow to upate changelogs on PR to develop-branch *(commit by [@macinsight](https://github.com/macinsight))* +- [`3b3d802`](https://github.com/coavins/zomboid-coavins-firearms/commit/3b3d802cfd0720a8c2d00544d3ea701d09042aa0) - **ci**: Add CIB Workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`6c021ac`](https://github.com/coavins/zomboid-coavins-firearms/commit/6c021ac58535edf961515c300d28c02781dd9990) - **docs**: Update permitted committypes *(commit by [@macinsight](https://github.com/macinsight))* + +### :bug: Bug Fixes +- [`8ea2c7e`](https://github.com/coavins/zomboid-coavins-firearms/commit/8ea2c7e2b59a4ded16072a129b8af0b641394dbe) - **model**: Update weapon type for Colt 1855 *(PR [#88](https://github.com/coavins/zomboid-coavins-firearms/pull/88) by [@macinsight](https://github.com/macinsight))* + - :arrow_lower_right: *fixes issue [#62](undefined) opened by [@macinsight](https://github.com/macinsight)* +- [`196d0f5`](https://github.com/coavins/zomboid-coavins-firearms/commit/196d0f5c604bd3c88d9e53ad3bc6d4616d05506e) - **model**: Assign correct types to SCAR Series *(commit by [@macinsight](https://github.com/macinsight))* +- [`65057e5`](https://github.com/coavins/zomboid-coavins-firearms/commit/65057e596b59ddb80d7717d7b1b628789855a1a7) - **ci**: Change WF rules, add correct repo *(commit by [@macinsight](https://github.com/macinsight))* +- [`06d9c91`](https://github.com/coavins/zomboid-coavins-firearms/commit/06d9c913cd9e59b1ae739ebe53222077439bdec2) - **ci**: Update Workflow rules *(commit by [@macinsight](https://github.com/macinsight))* +- [`5357f65`](https://github.com/coavins/zomboid-coavins-firearms/commit/5357f65ef889cad6db02f4dcb3791f06e7df1b04) - **ci**: Fix file extension for CL workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`d304f04`](https://github.com/coavins/zomboid-coavins-firearms/commit/d304f047db98370c1c2daa153d118b813a6a6bc2) - **ci**: Fix L workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`a6050ed`](https://github.com/coavins/zomboid-coavins-firearms/commit/a6050ed4199c965b493126b4d5edeeb77270bacf) - **ci**: FIx linting in glc WF *(commit by [@macinsight](https://github.com/macinsight))* +- [`5895aa7`](https://github.com/coavins/zomboid-coavins-firearms/commit/5895aa7a793932491075c6cea2378291e5c7e15a) - **ci**: Fix indent *(commit by [@macinsight](https://github.com/macinsight))* +- [`5872e8e`](https://github.com/coavins/zomboid-coavins-firearms/commit/5872e8ea634a0adef7cb2a7ce0f4daf6e32577cd) - **ci**: Update changelog.yml to new action *(commit by [@macinsight](https://github.com/macinsight))* +- [`c747716`](https://github.com/coavins/zomboid-coavins-firearms/commit/c7477169ca87a225bed74899e61b17c9e13f72dc) - **ci**: Change version for changelog action *(commit by [@macinsight](https://github.com/macinsight))* +- [`50bade3`](https://github.com/coavins/zomboid-coavins-firearms/commit/50bade37b08bd1b519f9bb386a4c2521d1ccbbe5) - **ci**: Update changelog.yml with new action *(commit by [@macinsight](https://github.com/macinsight))* +- [`b3ba37f`](https://github.com/coavins/zomboid-coavins-firearms/commit/b3ba37f99c72ac7a0b7e5d7205592e6405207be4) - **ci**: Have changelog action write changes to changelog.md *(commit by [@macinsight](https://github.com/macinsight))* +- [`b0c5f1d`](https://github.com/coavins/zomboid-coavins-firearms/commit/b0c5f1d10062a0ef0f2a315aa180c2baf2b3c59b) - **ci**: Remove redundant config option *(commit by [@macinsight](https://github.com/macinsight))* +- [`6e0bc16`](https://github.com/coavins/zomboid-coavins-firearms/commit/6e0bc164ceb3a6591dc836862f0b37e2c6b28f08) - **ci**: Add name to cib workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`f40cf61`](https://github.com/coavins/zomboid-coavins-firearms/commit/f40cf6131d36c4ea448eb7e03dd0820fb586a44b) - **ci**: Update CIB Workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`2db89cf`](https://github.com/coavins/zomboid-coavins-firearms/commit/2db89cf2f315999c2fb892b54b65b68ffb27cd48) - **ci**: Add 'docs' to generated types *(commit by [@macinsight](https://github.com/macinsight))* +- [`fe55681`](https://github.com/coavins/zomboid-coavins-firearms/commit/fe55681ea0190ba2746767bbb2accaef5ea0a5e8) - **ci**: Add correct arguments to update_changelog action *(commit by [@macinsight](https://github.com/macinsight))* +- [`0545bbe`](https://github.com/coavins/zomboid-coavins-firearms/commit/0545bbef90a2cbe4326e57b385ad5c8fdee074a1) - **ci**: Add permissions to git-auto-commit *(commit by [@macinsight](https://github.com/macinsight))* +- [`1992e70`](https://github.com/coavins/zomboid-coavins-firearms/commit/1992e70da5a7cd0cf85160b1748acc8b3b75099d) - **ci**: Remove erroring permissons *(commit by [@macinsight](https://github.com/macinsight))* +- [`561a187`](https://github.com/coavins/zomboid-coavins-firearms/commit/561a187d5c04694a9e2d43f65be56c8d1160121b) - **ci**: Update secret to use GITHUB_TOKEN *(commit by [@macinsight](https://github.com/macinsight))* +- [`1034a63`](https://github.com/coavins/zomboid-coavins-firearms/commit/1034a639e83a3c881eb491d0b5b78275626c1b0e) - **ci**: Update git-auto-commit to v5 *(commit by [@macinsight](https://github.com/macinsight))* +- [`74df28f`](https://github.com/coavins/zomboid-coavins-firearms/commit/74df28f9887bfb211d027858b3e87e5cc33ad425) - **ci**: Fix excludeTypes *(commit by [@macinsight](https://github.com/macinsight))* +- [`4a0fbad`](https://github.com/coavins/zomboid-coavins-firearms/commit/4a0fbadb7b7fbfd0030e1a5d0332c1d087ba66f9) - **ci**: Change source tag for Changelog CI *(commit by [@macinsight](https://github.com/macinsight))* +- [`0e623f3`](https://github.com/coavins/zomboid-coavins-firearms/commit/0e623f3c16eebbd58004a7d87534f9425cd19285) - **ci**: Update config for changelog-action, add permissions to token *(commit by [@macinsight](https://github.com/macinsight))* +- [`05e0382`](https://github.com/coavins/zomboid-coavins-firearms/commit/05e03828cad88443747af910c076a6c296213d7b) - **ci**: Adjust roof commit range for CHANGELOG CI *(commit by [@macinsight](https://github.com/macinsight))* +- [`f4ac1ad`](https://github.com/coavins/zomboid-coavins-firearms/commit/f4ac1ad384ff6233a7fdee1b87b33070734892a3) - **ci**: Adjust toTag of changelog action *(commit by [@macinsight](https://github.com/macinsight))* +- [`6f90706`](https://github.com/coavins/zomboid-coavins-firearms/commit/6f90706c830adc835dfcf0b698ea2df763bb15e5) - **ci**: Swap toTag and fromTag to have CI detect new commits *(commit by [@macinsight](https://github.com/macinsight))* +- [`be2ea8a`](https://github.com/coavins/zomboid-coavins-firearms/commit/be2ea8a58cc1ab0beda27defb04adeb21bca16eb) - **ci**: Fix missing '$' in Workflow *(commit by [@macinsight](https://github.com/macinsight))* +- [`6af14cc`](https://github.com/coavins/zomboid-coavins-firearms/commit/6af14ccaa20a5b21a3bce092f7a47339af5cabce) - **ci**: Change writeToFile *(commit by [@macinsight](https://github.com/macinsight))* +- [`27e728a`](https://github.com/coavins/zomboid-coavins-firearms/commit/27e728ae9f486defba88391b2fde0bf0c09c74aa) - **ci**: Change writeToFile to 'true' *(commit by [@macinsight](https://github.com/macinsight))* +- [`1718910`](https://github.com/coavins/zomboid-coavins-firearms/commit/17189109bb6a5e6d76f02fe7e9a383f5033eb0e6) - **ci**: CHange order back to default *(commit by [@macinsight](https://github.com/macinsight))* + +### :white_check_mark: Tests +- [`3280352`](https://github.com/coavins/zomboid-coavins-firearms/commit/3280352fb43dca9b4433af20ad1bca5014a786db) - **ci**: Update changelog.yml with new action *(commit by [@macinsight](https://github.com/macinsight))* + +### :memo: Documentation Changes +- [`cc202e7`](https://github.com/coavins/zomboid-coavins-firearms/commit/cc202e7ef667b92f36f0fa3fb0959004d56cfe45) - update CHANGELOG.md for ci [skip ci] *(commit by [@macinsight](https://github.com/macinsight))* +- [`eeab719`](https://github.com/coavins/zomboid-coavins-firearms/commit/eeab71975346c346c32b6fb0c7bb77f74aa5311d) - **contrib**: Update to CC standard *(commit by [@macinsight](https://github.com/macinsight))* +- [`1f54eba`](https://github.com/coavins/zomboid-coavins-firearms/commit/1f54ebac07c6e6bbb6da9529ef5839d243deb4a2) - **ci**: Change generated CHANGELOG.md from 'oldest first' to 'newest first' *(commit by [@macinsight](https://github.com/macinsight))* +- [`c5479c9`](https://github.com/coavins/zomboid-coavins-firearms/commit/c5479c93fb6263deb535f9a90c06c65eea82a040) - **ci**: Change Changelog.md to see if it regenerates *(commit by [@macinsight](https://github.com/macinsight))* + +### :wrench: Chores +- [`af385f8`](https://github.com/coavins/zomboid-coavins-firearms/commit/af385f829673477d1ced84ac3f983954f57a69b3) - **ci**: Update requarks/changelog-action to latest *(commit by [@macinsight](https://github.com/macinsight))* +- [`9f69529`](https://github.com/coavins/zomboid-coavins-firearms/commit/9f69529fad4dc44a91309e04c4454a8d27d275b1) - **ci**: Set latest tag for changelog CI *(commit by [@macinsight](https://github.com/macinsight))* + + +[ci]: https://github.com/coavins/zomboid-coavins-firearms/compare/v7...ci \ No newline at end of file From ee4032e896aad2e51526f54a467df87a657de8d8 Mon Sep 17 00:00:00 2001 From: macinsight Date: Tue, 28 Nov 2023 16:20:25 +0100 Subject: [PATCH 53/53] chore(ci): Change Actions Workflow for generate-changelog Signed-off-by: macinsight --- .github/workflows/changelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 925098fd..00c84ccf 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,11 +33,13 @@ jobs: toTag: ${{ env.previousTag }} writeToFile: true excludeTypes: build,other,style - - - name: Commit CHANGELOG.md - uses: stefanzweifel/git-auto-commit-action@v5 + - name: Commit changelog + uses: EndBug/add-and-commit@v9 with: - branch: ci - commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' - file_pattern: CHANGELOG.md + add: CHANGELOG.md + default_author: github_actions + fetch: true + pathspec_error_handling: exitAtEnd + push: true + message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'