Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add marksmen dlc weapons #38

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add marksmen dlc weapons #38

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a452373
Merge pull request #1 from KoffeinFlummi/master
DaTomyz Apr 11, 2015
34a294c
Update weapons.json
DaTomyz Apr 11, 2015
72dc838
Update weapons.json
DaTomyz Apr 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 81 additions & 1 deletion src/app/data/weapons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"ammo": "B_127x108_Ball",
"name": "12.7mm 5Rnd Mag",
"initSpeed": 820,
"airFriction": -0.00056,
"airFriction": -0.00086,
"timeToLive": 6,
"simulationStep": 0.05
},
Expand Down Expand Up @@ -1621,5 +1621,85 @@
"simulationStep": 0.05
}
]
},
{
"type": "srifle_DMR_04_F",
"name": "ASP-1 Kir 12.7mm",
"mod": "Arma3",
"magazines": [
{
"type": "10Rnd_127x54_Mag",
"ammo": "B_127x54_Ball",
"name": "12.7mm 10Rnd Mag",
"initSpeed": 290,
"airFriction": -0.0014,
"timeToLive": 6,
"simulationStep": 0.05
}
]
}
{
"type": "srifle_DMR_05_blk_F",
"name": "Cyrus 9.3mm",
"mod": "Arma3",
"magazines": [
{
"type": "10Rnd_93x64_DMR_05_Mag",
"ammo": "B_93x64_Ball",
"name": "9.3mm 10Rnd Mag",
"initSpeed": 870,
"airFriction": -0.00075,
"timeToLive": 10,
"simulationStep": 0.05
}
]
}
{
"type": "srifle_DMR_02_F",
"name": "MAR-10 .338",
"mod": "Arma3",
"magazines": [
{
"type": "10Rnd_338_Mag",
"ammo": "B_338_Ball",
"name": ".338 LM 10Rnd Mag",
"initSpeed": 915,
"airFriction": -0.00061,
"timeToLive": 10,
"simulationStep": 0.05
}
]
}
{
"type": "srifle_DMR_03_F",
"name": "Mk-I EMR 7.62mm",
"mod": "Arma3",
"magazines": [
{
"type": "20Rnd_762x51_Mag",
"ammo": "AGM_B_762x51_M118LR",
"name": "7.62mm 20Rnd Mag",
"initSpeed": 792,
"airFriction": -0.0008577,
"timeToLive": 6,
"simulationStep": 0.05
}
]
}
{
"type": "srifle_DMR_06_olive_F",
"name": "Mk14 7.62mm",
"mod": "Arma3",
"magazines": [
{
"type": "20Rnd_762x51_Mag",
"ammo": "AGM_B_762x51_M118LR",
"name": "7.62mm 20Rnd Mag",
"initSpeed": 792,
"airFriction": -0.0008577,
"timeToLive": 6,
"simulationStep": 0.05
}
]
}
]