Skip to content

Commit

Permalink
1.0.11f
Browse files Browse the repository at this point in the history
- Added gun movement when near a block
- Added frag grenade explosion
- Added smoke grenades
- Added stun grenades (flashbang)
- Added command to clear the extra slots items "/mwclear"
- Stackable magazines ammo

- Fixed ammo repair in the craft
- Fixed rendering issue on MacOS
- Fixed second skin layer when wearing an armor
  • Loading branch information
Protoxy22 committed Aug 8, 2021
1 parent 30c6c23 commit 96368c8
Show file tree
Hide file tree
Showing 66 changed files with 11,110 additions and 220 deletions.
3 changes: 2 additions & 1 deletion run/ModularWarfare/mod_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"\u0026a{killer} \u0026fshoted \u0026c{victim}"
]
},
"model_optimization": true,
"dev_mode": true,
"version": "1.0.10f"
"version": "1.0.11f"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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_legs.name=Uniform Pants
item.prototype.uniform_chest.name=Uniform Chest
item.prototype.uniform_feet.name=Uniform Boots
item.prototype.uniform_legs.name=Uniform Pants
item.prototype.vest.name=Vest
item.prototype.12gauge.name=12 Gauge Shell
item.prototype.12sluggauge.name=12 Slug Gauge Shot
Expand All @@ -77,3 +77,5 @@ item.prototype.m4a1.blood.name=M4A1 Le Sang de la vigne Spray
item.prototype.spas12.urban.name=SPAS12 Urban Spray
item.prototype.hikingpack.name=Hiking Pack
item.prototype.frag_grenade.name=Frag Grenade
item.prototype.smoke_grenade.name=Smoke Grenade
item.prototype.stun_grenade.name=Stun Grenade
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parent": "item/generated",
"textures": {
"layer0": "modularwarfare:items/grenades/prototype.smoke_grenade"
},
"display": {
"thirdperson_lefthand": {
"scale": [
0.0,
0.0,
0.0
]
},
"thirdperson_righthand": {
"scale": [
0.0,
0.0,
0.0
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parent": "item/generated",
"textures": {
"layer0": "modularwarfare:items/grenades/prototype.stun_grenade"
},
"display": {
"thirdperson_lefthand": {
"scale": [
0.0,
0.0,
0.0
]
},
"thirdperson_righthand": {
"scale": [
0.0,
0.0,
0.0
]
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"displayName": "Frag Grenade",
"internalName": "prototype.frag_grenade",
"grenadeType": "frag",
"fuseTime": 5,
"damageWorld": false,
"explosionPower": 5,
"explosionPower": 8,
"throwStrength": 1.0,
"throwerVulnerable": true
}
11 changes: 11 additions & 0 deletions run/ModularWarfare/prototype/grenades/prototype.smoke_grenade.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"displayName": "Smoke Grenade",
"internalName": "prototype.smoke_grenade",
"grenadeType": "smoke",
"smokeTime": 10,

"fuseTime": 5,
"damageWorld": false,
"explosionPower": 5,
"throwStrength": 1.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"displayName": "Stun Grenade",
"internalName": "prototype.stun_grenade",
"grenadeType": "stun",
"fuseTime": 5,
"throwStrength": 1.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"modelFileName": "smoke_grenade.obj",
"extra": {
"modelScale": 1.0,
"translateAll": {
"x": -5.0,
"y": 4.0,
"z": 0.0
},
"thirdPersonOffset": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"modelFileName": "stun_grenade.obj",
"arms": {
"rightArm": {
"armScale": {
"x": 0.8,
"y": 0.8,
"z": 0.8
},
"armPos": {
"x": 0.26,
"y": -0.65,
"z": 0.0
},
"armRot": {
"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
}
}
},
"extra": {
"modelScale": 1.0,
"thirdPersonOffset": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"translateAll": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@
"rotateHipPosition": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 5.0
},
"translateHipPosition": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"y": 0.05,
"z": -0.15
},
"rotateAimPosition": {
"x": 0.0,
Expand Down
9 changes: 9 additions & 0 deletions run/ModularWarfare/prototype/obj/attachments/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Model Information:
* title: Low-Poly Attachments
* author: TastyTony (https://sketchfab.com/TastyTony)

Model License:
* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
* requirements: Author must be credited. Commercial use is allowed.

If you use this 3D model in your project be sure to copy paste this credit wherever you share it
Loading

0 comments on commit 96368c8

Please sign in to comment.