1.0.10f

- FIXED ENTITIES DROPS NOT SPAWNING
- FIXED SERVER CONTENT-PACK�AUTO EXTRACTION
- ADDED VZ.68 SKORPION

build.gradle

@@ -23,6 +23,12 @@ archivesBaseName = 'modularwarfare'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
+compileJava.options.encoding = 'UTF-8'
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
 configurations {
     embed
     compile.extendsFrom(embed)

run/ModularWarfare/mod_config.json

@@ -17,15 +17,14 @@
   "autoExtractContentpack": true,
   "killFeed": {
     "enableKillFeed": true,
-    "universalDeathsMessage": false,
     "sendDefaultKillMessage": false,
     "messageDuration": 10,
     "messageList": [
-      "§a{killer} §7killed §c{victim}",
-      "§a{killer} §fdestroyed §c{victim}",
-      "§a{killer} §fshoted §c{victim}"
+      "\u0026a{killer} \u00267killed \u0026c{victim}",
+      "\u0026a{killer} \u0026fdestroyed \u0026c{victim}",
+      "\u0026a{killer} \u0026fshoted \u0026c{victim}"
     ]
   },
-  "dev_mode": false,
-  "version": "1.0.9f"
+  "dev_mode": true,
+  "version": "1.0.10f"
 }

run/ModularWarfare/prototype/ammo/prototype.vz68ammo.json

@@ -0,0 +1,10 @@
+{
+    "internalName": "prototype.vz68ammo",
+    "displayName": "VZ.68 Mag 24rnd",
+    "ammoCapacity": 24,
+    "magazineCount": 1,
+    "allowEmptyMagazines": true,
+    "subAmmo": [
+        "prototype.9x19"
+    ]
+}

run/ModularWarfare/prototype/assets/modularwarfare/lang/en_US.lang

@@ -16,6 +16,7 @@ item.prototype.spas12.name=SPAS12
 item.prototype.taurus.name=Taurus Raging Bull
 item.prototype.uzi.name=Mini-Uzi
 item.prototype.vss.name=VSS Vintorez
+item.prototype.vz68.name=VZ.68 Skorpion
 item.prototype.ak47ammo.name=AK47 Mag 30rnd
 item.prototype.ak74uammo.name=AK74u Mag 30rnd 
 item.prototype.ak74ufastmag.name=AK74u Fast Mag 30rnd x2
@@ -32,6 +33,7 @@ item.prototype.p88ammo.name=P88 Mag 15rnd
 item.prototype.sksammo.name=SKS Stripper Clip 10rnd
 item.prototype.uziammo.name=UZI Mag 25rnd
 item.prototype.vssammo.name=VSS Mag 10rnd
+item.prototype.vz68ammo.name=VZ.68 Mag 24rnd
 item.prototype.acog_scope.name=Acog Scope
 item.prototype.ak47_suppressor.name=Mono. AK Suppressor
 item.prototype.ak74u_flashlight.name=AK47u Flashlight
@@ -57,8 +59,8 @@ 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_legs.name=Uniform Pants
-item.prototype.uniform_feet.name=Uniform Boots
 item.prototype.uniform_chest.name=Uniform Chest
+item.prototype.uniform_feet.name=Uniform Boots
 item.prototype.vest.name=Vest
 item.prototype.12gauge.name=12 Gauge Shell
 item.prototype.12sluggauge.name=12 Slug Gauge Shot

run/ModularWarfare/prototype/assets/modularwarfare/models/item/prototype.vz68.json

@@ -0,0 +1,22 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "modularwarfare:items/guns/prototype.vz68"
+  },
+  "display": {
+    "thirdperson_lefthand": {
+      "scale": [
+        0.0,
+        0.0,
+        0.0
+      ]
+    },
+    "thirdperson_righthand": {
+      "scale": [
+        0.0,
+        0.0,
+        0.0
+      ]
+    }
+  }
+}

run/ModularWarfare/prototype/assets/modularwarfare/models/item/prototype.vz68ammo.json

@@ -0,0 +1,22 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "modularwarfare:items/ammo/prototype.vz68ammo"
+  },
+  "display": {
+    "thirdperson_lefthand": {
+      "scale": [
+        0.4,
+        0.4,
+        0.4
+      ]
+    },
+    "thirdperson_righthand": {
+      "scale": [
+        0.4,
+        0.4,
+        0.4
+      ]
+    }
+  }
+}

run/ModularWarfare/prototype/assets/modularwarfare/sounds.json

@@ -382,5 +382,20 @@
     "sounds": [
       "modularwarfare:taurus/click"
     ]
+  },
+  "prototype.vz68.shoot": {
+    "category": "player",
+    "sounds": [
+      "modularwarfare:vz68/shoot1",
+      "modularwarfare:vz68/shoot2",
+      "modularwarfare:vz68/shoot3",
+      "modularwarfare:vz68/shoot4"
+    ]
+  },
+  "prototype.vz68.shoot.distant": {
+    "category": "player",
+    "sounds": [
+      "modularwarfare:vz68/distant"
+    ]
   }
 }

run/ModularWarfare/prototype/guns/prototype.vz68.json

@@ -0,0 +1,63 @@
+{
+    "internalName": "prototype.vz68",
+    "displayName": "VZ.68 Skorpion",
+    "weaponType": "smg",
+
+    "gunDamage": 8,
+    "gunDamageHeadshotBonus": 2,
+
+    "roundsPerMin": 500,
+
+    "allowEmptyMagazines": true,
+
+    "recoilPitch": 3.0,
+    "recoilYaw": 1.0,
+    "randomRecoilPitch": 0.8,
+    "randomRecoilYaw": 0.8,
+    "bulletSpread": 1.25,
+
+    "accuracySneakFactor": 0.5,
+    "moveSpeedModifier": 1.0,
+    "allowSprintFiring": true,
+
+    "dropBulletCasing": true,
+
+    "fireModes": ["full", "semi", "burst"],
+    "acceptedAmmo": ["prototype.vz68ammo"],
+
+    "shellEjectOffsetNormal": {
+        "x": -1.0,
+        "y": 0.0,
+        "z": 1.0
+    },
+    "shellEjectOffsetAiming": {
+        "x": -0.2,
+        "y": 0.12,
+        "z": 0.5
+    },
+    "weaponSoundMap": {
+        "weaponFire": [
+            {
+                "soundEvent": "weaponFire",
+                "soundName": "prototype.vz68.shoot",
+                "soundNameDistant": "prototype.vz68.shoot.distant",
+                "soundRange": 64,
+                "soundMaxRange": 96,
+                "soundFadeMultiplier": 1
+            }
+        ],
+        "weaponUnload": [
+            {
+                "soundEvent": "weaponReload",
+                "soundName": "prototype.generic.reload"
+            }
+        ]
+    },
+    "modelSkins": [
+        {
+            "internalName": "prototype.vz68",
+            "skinAsset": "prototype.vz68",
+            "displayName": "Default"
+        }
+    ]
+}

run/ModularWarfare/prototype/guns/render/prototype.vz68.render.json

@@ -0,0 +1,186 @@
+{
+  "modelFileName": "vz68.obj",
+  "arms": {
+    "leftHandAmmo": true,
+    "actionArm": "Left",
+    "leftArm": {
+      "armScale": {
+        "x": 0.7,
+        "y": 1.0,
+        "z": 0.7
+      },
+      "armPos": {
+        "x": -0.3,
+        "y": -0.95,
+        "z": 0.1
+      },
+      "armRot": {
+        "x": 65.0,
+        "y": 32.0,
+        "z": -46.0
+      },
+      "armReloadPos": {
+        "x": -0.3,
+        "y": -0.95,
+        "z": 0.1
+      },
+      "armReloadRot": {
+        "x": 65.0,
+        "y": 32.0,
+        "z": -46.0
+      }
+    },
+    "rightArm": {
+      "armScale": {
+        "x": 0.7,
+        "y": 1.0,
+        "z": 0.7
+      },
+      "armPos": {
+        "x": 0.3,
+        "y": -0.65,
+        "z": 0.0
+      },
+      "armRot": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": -90.0
+      },
+      "armReloadPos": {
+        "x": 0.3,
+        "y": -0.65,
+        "z": 0.0
+      },
+      "armReloadRot": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": -90.0
+      },
+      "armChargePos": {
+        "x": 0.47,
+        "y": -0.39,
+        "z": 0.14
+      },
+      "armChargeRot": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": -90.0
+      }
+    }
+  },
+  "sprint": {
+    "sprintRotate": {
+      "x": 10.0,
+      "y": 30.0,
+      "z": 0.0
+    },
+    "sprintTranslate": {
+      "x": 0.9,
+      "y": -0.1,
+      "z": -0.7
+    }
+  },
+  "thirdPerson": {
+    "thirdPersonOffset": {
+      "x": 0.0,
+      "y": -0.15,
+      "z": 0.0
+    },
+    "backPersonOffset": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0
+    },
+    "thirdPersonScale": 1.0
+  },
+  "aim": {
+    "rotateHipPosition": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0
+    },
+    "translateHipPosition": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0
+    },
+    "rotateAimPosition": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0
+    },
+    "translateAimPosition": {
+      "x": 0.1,
+      "y": 0.0,
+      "z": 0.0
+    }
+  },
+  "attachments": {
+    "attachmentPointMap": {
+      "barrel": [
+        {
+          "x": -0.4,
+          "y": 0.004,
+          "z": 0.0
+        },
+        {
+          "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": [
+        {
+          "x": 0.0,
+          "y": 0.0,
+          "z": 0.0
+        },
+        {
+          "x": 0.0,
+          "y": 0.0,
+          "z": 0.0
+        }
+      ]
+    },
+    "attachmentModeRotate": {
+      "x": 10.0,
+      "y": 30.0,
+      "z": 0.0
+    }
+  },
+  "itemFrame": {
+    "translate": {
+      "x": 4.0,
+      "y": 0.0,
+      "z": 0.0
+    }
+  },
+  "extra": {
+    "translateAll": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0
+    },
+    "modelScale": 1.2,
+    "reloadAnimation": "pistol",
+    "gunOffsetScoping": 0.0,
+    "crouchZoom": -0.04,
+    "adsSpeed": 0.07,
+    "gunSlideDistance": 0.12,
+    "modelRecoilBackwards": 0.05,
+    "modelRecoilUpwards": 0.05,
+    "modelRecoilShake":  0.05
+  }
+}