1.0.12f

ModularMods · Aug 11, 2021 · 4d6e962 · 4d6e962
1 parent c560a16
commit 4d6e962
Show file tree

Hide file tree

Showing 28 changed files with 24,650 additions and 24,288 deletions.
diff --git a/run/ModularWarfare/mod_config.json b/run/ModularWarfare/mod_config.json
@@ -27,5 +27,5 @@
   },
   "model_optimization": true,
   "dev_mode": true,
-  "version": "1.0.11f"
+  "version": "1.0.12f"
 }
diff --git a/...sources/prototype-1.0.11f-contentpack.zip → ...Warfare/prototype-1.0.12f-contentpack.zip b/...sources/prototype-1.0.11f-contentpack.zip → ...Warfare/prototype-1.0.12f-contentpack.zip
diff --git a/run/ModularWarfare/prototype/assets/modularwarfare/lang/en_US.lang b/run/ModularWarfare/prototype/assets/modularwarfare/lang/en_US.lang
@@ -58,9 +58,9 @@ item.prototype.tactical_vest_lv1_tan.name=Tactical Vest Lv.1
 item.prototype.tactical_vest_lv2_black.name=Tactical Vest Lv.2
 item.prototype.tactical_vest_lv2_green.name=Tactical Vest Lv.2
 item.prototype.tactical_vest_lv2_tan.name=Tactical Vest Lv.2
+item.prototype.uniform_chest.name=Uniform Chest
 item.prototype.uniform_feet.name=Uniform Boots
 item.prototype.uniform_legs.name=Uniform Pants
-item.prototype.uniform_chest.name=Uniform Chest
 item.prototype.vest.name=Vest
 item.prototype.12gauge.name=12 Gauge Shell
 item.prototype.12sluggauge.name=12 Slug Gauge Shot

diff --git a/run/ModularWarfare/prototype/attachments/render/prototype.acog_scope.render.json b/run/ModularWarfare/prototype/attachments/render/prototype.acog_scope.render.json
@@ -5,7 +5,8 @@
   },
   "sight": {
     "fovZoom": 8.0,
-    "mouseSensitivityFactor": 0.6
+    "mouseSensitivityFactor": 0.6,
+    "rectileScale": 1.0
   },
   "grip": {
     "leftArmOffset": {

diff --git a/run/ModularWarfare/prototype/attachments/render/prototype.docter_sight.render.json b/run/ModularWarfare/prototype/attachments/render/prototype.docter_sight.render.json
@@ -6,6 +6,7 @@
   "sight": {
     "DOCTER SIGHT DOES NOT HAVE ZOOM": 0,
     "fovZoom": -1,
-    "mouseSensitivityFactor": 0.8
+    "mouseSensitivityFactor": 0.8,
+    "rectileScale": 1.0
   }
 }
diff --git a/run/ModularWarfare/prototype/attachments/render/prototype.docter_sight_mini.render.json b/run/ModularWarfare/prototype/attachments/render/prototype.docter_sight_mini.render.json
@@ -6,6 +6,7 @@
   "sight": {
     "DOCTER SIGHT DOES NOT HAVE ZOOM": 0,
     "fovZoom": -1,
-    "mouseSensitivityFactor": 0.8
+    "mouseSensitivityFactor": 0.8,
+    "rectileScale": 1.0
   }
 }
diff --git a/run/ModularWarfare/prototype/attachments/render/prototype.long_scope.render.json b/run/ModularWarfare/prototype/attachments/render/prototype.long_scope.render.json
@@ -5,6 +5,7 @@
   },
   "sight": {
     "fovZoom": 14.0,
-    "mouseSensitivityFactor": 0.5
+    "mouseSensitivityFactor": 0.5,
+    "rectileScale": 1.0
   }
 }
diff --git a/run/ModularWarfare/prototype/attachments/render/prototype.obzor_sight.render.json b/run/ModularWarfare/prototype/attachments/render/prototype.obzor_sight.render.json
@@ -5,6 +5,7 @@
   },
   "sight": {
     "fovZoom": 4.0,
-    "mouseSensitivityFactor": 0.8
+    "mouseSensitivityFactor": 0.8,
+    "rectileScale": 1.0
   }
 }
diff --git a/run/ModularWarfare/prototype/attachments/render/prototype.psv_scope.render.json b/run/ModularWarfare/prototype/attachments/render/prototype.psv_scope.render.json
@@ -5,6 +5,7 @@
   },
   "sight": {
     "fovZoom": 5.5,
-    "mouseSensitivityFactor": 0.5
+    "mouseSensitivityFactor": 0.5,
+    "rectileScale": 2.0
   }
 }
diff --git a/run/ModularWarfare/prototype/guns/prototype.mp5.json b/run/ModularWarfare/prototype/guns/prototype.mp5.json
@@ -63,6 +63,9 @@
         ]
     },
     "acceptedAttachments": {
+        "sight": [
+            "prototype.docter_sight_mini"
+        ],
         "flashlight": [
             "prototype.mp5_flashlight"
         ]

diff --git a/run/ModularWarfare/prototype/guns/prototype.mp5sd.json b/run/ModularWarfare/prototype/guns/prototype.mp5sd.json
@@ -53,6 +53,9 @@
         ]
     },
     "acceptedAttachments": {
+        "sight": [
+            "prototype.docter_sight_mini"
+        ],
         "flashlight": [
             "prototype.mp5_flashlight"
         ]

diff --git a/run/ModularWarfare/prototype/guns/render/prototype.mp5.render.json b/run/ModularWarfare/prototype/guns/render/prototype.mp5.render.json
@@ -116,48 +116,33 @@
     }
   },
   "attachments": {
-    "attachmentPointMap": {
-      "barrel": [
+    "positionPointMap": {
+      "prototype.docter_sight_mini": [
         {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 0.0
+          "x": -3.0,
+          "y": -0.2,
+          "z": 0.02
         },
         {
           "x": 0.0,
           "y": 0.0,
           "z": 0.0
         }
-      ],
-      "sight": [
-        {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 0.0
-        },
-        {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 0.0
-        }
-      ],
-      "flashlight": [
+      ]
+    },
+    "aimPointMap": {
+      "prototype.docter_sight_mini": [
         {
           "x": 0.0,
-          "y": 0.0,
+          "y": -0.15,
           "z": 0.0
         },
         {
           "x": 0.0,
           "y": 0.0,
-          "z": 0.0
+          "z": 0.5
         }
       ]
-    },
-    "attachmentModeRotate": {
-      "x": 10.0,
-      "y": 30.0,
-      "z": 0.0
     }
   },
   "itemFrame": {

diff --git a/run/ModularWarfare/prototype/guns/render/prototype.mp5sd.render.json b/run/ModularWarfare/prototype/guns/render/prototype.mp5sd.render.json
@@ -116,48 +116,33 @@
     }
   },
   "attachments": {
-    "attachmentPointMap": {
-      "barrel": [
+    "positionPointMap": {
+      "prototype.docter_sight_mini": [
         {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 0.0
+          "x": -3.0,
+          "y": -0.2,
+          "z": 0.02
         },
         {
           "x": 0.0,
           "y": 0.0,
           "z": 0.0
         }
-      ],
-      "sight": [
-        {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 0.0
-        },
-        {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 0.0
-        }
-      ],
-      "flashlight": [
+      ]
+    },
+    "aimPointMap": {
+      "prototype.docter_sight_mini": [
         {
           "x": 0.0,
-          "y": 0.0,
+          "y": -0.15,
           "z": 0.0
         },
         {
           "x": 0.0,
           "y": 0.0,
-          "z": 0.0
+          "z": 0.5
         }
       ]
-    },
-    "attachmentModeRotate": {
-      "x": 10.0,
-      "y": 30.0,
-      "z": 0.0
     }
   },
   "itemFrame": {

diff --git a/run/ModularWarfare/prototype/obj/guns/mp5.mtl b/run/ModularWarfare/prototype/obj/guns/mp5.mtl
@@ -0,0 +1,72 @@
+# Blender MTL File: 'None'
+# Material Count: 7
+
+newmtl (null).007
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl Material.010
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl Material.011
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl Material.012
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl Material.016
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl Material.017
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl Material.018
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2