Add .357 Revolver Model (#9)

* Add model defs for .357 Revolver Signed-off-by: macinsight <[email protected]> * Add Helper Defs for .357 Revolver Signed-off-by: macinsight <[email protected]> * Add Translation for .357 Revolver Signed-off-by: macinsight <[email protected]> * Add fixing defs for .357 Revolver Signed-off-by: macinsight <[email protected]> * Add item defs for .357 Revolver Signed-off-by: macinsight <[email protected]> * Update Items that have .357 Revolver assigned Signed-off-by: macinsight <[email protected]> --------- Signed-off-by: macinsight <[email protected]>
macinsight · Nov 26, 2023 · 202da01 · 202da01
1 parent 92b0613
commit 202da01
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 8 deletions.
diff --git a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/CoavinsModels.lua
@@ -75,3 +75,7 @@ CoavinsFirearms.AddOrReplaceModel(
 	'Rifle_556'
 , { 'RifleUpperReceiver_556', 'RifleLowerReceiver_556' }
 , 'RifleLowerReceiver_556')
+CoavinsFirearms.AddOrReplaceModel(
+	'Revolver_357'
+, { 'RevolverReceiver_357', 'RevolverCylinder_357' }
+, 'RevolverReceiver_357')
diff --git a/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua b/src/Contents/mods/coavinsfirearms/media/lua/client/coavinsfirearms/FirearmsHelper.lua
@@ -308,6 +308,14 @@ this.parts.RifleBolt_556 = {}
 this.parts.RifleBolt_556.InsertsInto = 'RifleBoltCarrier_556'
 this.parts.RifleBolt_556.ConditionLowerChance = 2
 this.parts.RifleBolt_556.ConditionMax = 20
+this.parts.RevolverReceiver_357 = {}
+this.parts.RevolverReceiver_357.CombinesWith = 'RevolverCylinder_357'
+this.parts.RevolverReceiver_357.ConditionLowerChance = 1
+this.parts.RevolverReceiver_357.ConditionMax = 20
+this.parts.RevolverCylinder_357 = {}
+this.parts.RevolverCylinder_357.CombinesWith = 'RevolverReceiver_357'
+this.parts.RevolverCylinder_357.ConditionLowerChance = 3
+this.parts.RevolverCylinder_357.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
@@ -116,4 +116,8 @@ ItemName_EN = {
 	ItemName_coavinsfirearms.RifleFiringPin_556_Short = "Firing Pin (5.56)",
 	ItemName_coavinsfirearms.RifleBolt_556 = "Rifle Bolt (5.56)",
 	ItemName_coavinsfirearms.RifleBolt_556_Short = "Bolt (5.56)",
+	ItemName_coavinsfirearms.RevolverReceiver_357 = "Revolver Frame (.357 MAG)",
+	ItemName_coavinsfirearms.RevolverReceiver_357_Short = "Frame (.357 MAG)",
+	ItemName_coavinsfirearms.RevolverCylinder_357 = "Revolver Cylinder (.357 MAG)",
+	ItemName_coavinsfirearms.RevolverCylinder_357_Short = "Cylinder (.357 MAG)"
 }
diff --git a/...ods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_revolver_357.txt b/...ods/coavinsfirearms/media/scripts/coavinsfirearms/fixings/coavins_fixing_revolver_357.txt
@@ -0,0 +1,33 @@
+module coavinsfirearms {
+	imports {
+		Base
+	}
+
+	fixing Fix RevolverReceiver_357 Welding
+	{
+		Require : RevolverReceiver_357,
+		GlobalItem : BlowTorch=2,
+	  ConditionModifier : 1.2,
+
+		Fixer : SmallSheetMetal; MetalWelding=3,
+		Fixer : ScrapMetal; MetalWelding=1,
+	}
+
+	fixing Fix RevolverReceiver_357
+	{
+		Require : RevolverReceiver_357,
+		ConditionModifier : 1,
+
+		Fixer : DuctTape=2; Aiming=4,
+		Fixer : Scotchtape=3; Aiming=2,
+	}
+
+	fixing Fix RevolverCylinder_357 Welding
+	{
+		Require : RevolverCylinder_357,
+		GlobalItem : BlowTorch=3,
+	  ConditionModifier : 1.2,
+
+		Fixer : SmallSheetMetal=2; MetalWelding=6,
+	}
+}
diff --git a/...mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_revolver_357.txt b/...mods/coavinsfirearms/media/scripts/coavinsfirearms/weapons/coavins_items_revolver_357.txt
@@ -0,0 +1,25 @@
+module coavinsfirearms {
+	imports {
+		Base
+	}
+
+	item RevolverReceiver_357 {
+		DisplayName = Revolver Frame (.357),
+		DisplayCategory = FirearmPart,
+		Type = Normal,
+		Icon = RevolverReceiver,
+		Weight = 0.5,
+		ConditionMax = 20,
+		WorldStaticModel = Paperbag_Ground,
+	}
+
+	item RevolverCylinder_357 {
+		DisplayName = Revolver Cylinder (.357),
+		DisplayCategory = FirearmPart,
+		Type = Normal,
+		Icon = RevolverCylinder,
+		Weight = 0.3,
+		ConditionMax = 20,
+		WorldStaticModel = Paperclip,
+	}
+}
diff --git a/...tents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua b/...tents/mods/coavinssupport2/media/lua/client/coavinssupport2/CoavinsInclude_WeaponPack.lua
@@ -67,19 +67,19 @@
 
 -- 357 COMBO CALIBER.txt
 CoavinsFirearms.Include('Base.GP100_2',     'GenericRevolver')
-CoavinsFirearms.Include('Base.GP100_2_357', 'GenericRevolver')
+CoavinsFirearms.Include('Base.GP100_2_357', 'Revolver_357')
 CoavinsFirearms.Include('Base.GP100_4',     'GenericRevolver')
-CoavinsFirearms.Include('Base.GP100_4_357', 'GenericRevolver')
+CoavinsFirearms.Include('Base.GP100_4_357', 'Revolver_357')
 CoavinsFirearms.Include('Base.GP100_6',     'GenericRevolver')
-CoavinsFirearms.Include('Base.GP100_6_357', 'GenericRevolver')
+CoavinsFirearms.Include('Base.GP100_6_357', 'Revolver_357')
 CoavinsFirearms.Include('Base.K6S',         'GenericRevolver')
-CoavinsFirearms.Include('Base.K6S_357',     'GenericRevolver')
--- Marlin_1894
--- Marlin_1894_357
+CoavinsFirearms.Include('Base.K6S_357',     'Revolver_357')
+-- Marlin_189
+CoavinsFirearms.Include('Marlin_1894_357',  'Revolver_357')
 CoavinsFirearms.Include('Base.Rhino_60DS',     'GenericRevolver')
-CoavinsFirearms.Include('Base.Rhino_60DS_357', 'GenericRevolver')
+CoavinsFirearms.Include('Base.Rhino_60DS_357', 'Revolver_357')
 CoavinsFirearms.Include('Base.SW_327',         'GenericRevolver')
-CoavinsFirearms.Include('Base.SW_327_357',     'GenericRevolver')
+CoavinsFirearms.Include('Base.SW_327_357',     'Revolver_357')
 
 -- 1911.txt
 CoavinsFirearms.Include('Base.AMT1911',        'GenericPistol')