79 add definition bolt action 308 (#87)

* feat(model): Add Model #79

Signed-off-by: macinsight <gh@macinsight.net>

* feat(model): Add Helper #79

Signed-off-by: macinsight <gh@macinsight.net>

* feat(model): Add Translation #79

Signed-off-by: macinsight <gh@macinsight.net>

* feat(model): Add Fixing #79

Signed-off-by: macinsight <gh@macinsight.net>

* feat(model): Add Items #79

Signed-off-by: macinsight <gh@macinsight.net>

* feat(model): Add Weapons #79

Signed-off-by: macinsight <gh@macinsight.net>

---------

Signed-off-by: macinsight <gh@macinsight.net>

.gitignore

@@ -0,0 +1 @@
+git-conventional-commits.yaml

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(

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

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)",

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,
+	}
+}

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,
+	}
+}

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