Added new 'Reload Costs' tab for ammo, digit display cleanup

This commit is contained in:
Kevin Chang
2015-10-05 20:08:36 -07:00
parent 0e8e9f5cbc
commit 34dd40bcbf
14 changed files with 304 additions and 137 deletions

View File

@@ -18,7 +18,8 @@
"clip": 5,
"mjdps": 8.13,
"ssdam" : 37.13,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1r",
@@ -38,7 +39,8 @@
"clip": 5,
"mjdps": 10.97,
"ssdam" : 30.94,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1n",
@@ -58,7 +60,8 @@
"clip": 5,
"mjdps": 8.13,
"ssdam" : 22.28,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1o",
@@ -78,7 +81,8 @@
"clip": 5,
"mjdps" : 7.95,
"ssdam" : 21.04,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1p",
@@ -98,7 +102,8 @@
"clip": 5,
"mjdps" : 3.58,
"ssdam" : 12.38,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1k",
@@ -118,7 +123,8 @@
"clip": 5,
"mjdps" : 6.00,
"ssdam" : 15.47,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1l",
@@ -138,7 +144,8 @@
"clip": 5,
"mjdps" : 6.24,
"ssdam" : 15.47,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1m",
@@ -158,7 +165,8 @@
"clip": 5,
"mjdps" : 2.41,
"ssdam" : 7.74,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1h",
@@ -178,7 +186,8 @@
"clip": 5,
"mjdps" : 4.00,
"ssdam" : 9.59,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1i",
@@ -198,7 +207,8 @@
"clip": 5,
"mjdps" : 3.80,
"ssdam" : 8.97,
"ammo": 100
"ammo": 100,
"ammocost": 20
},
{
"id": "1j",
@@ -218,7 +228,8 @@
"clip": 5,
"mjdps" : 1.35,
"ssdam" : 4.13,
"ammo": 100
"ammo": 100,
"ammocost": 20
}
]
}
}

View File

@@ -13,7 +13,8 @@
"armourpen": "F",
"thermload": 2,
"clip": 1,
"ammo": 10
"ammo": 10,
"ammocost": 30
},
{
"id": "01",
@@ -42,7 +43,8 @@
"armourpen": "F",
"thermload": 0,
"clip": 1,
"ammo": 3
"ammo": 3,
"ammocost": 25
},
{
"id": "03",
@@ -57,7 +59,8 @@
"armourpen": "F",
"thermload": 1,
"clip": 50,
"ammo": 10000
"ammo": 10000,
"ammocost": 1
}
]
}
}

View File

@@ -18,7 +18,8 @@
"clip": 3,
"mjdps": 15.19,
"ssdam" : 28.36,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "1u",
@@ -38,7 +39,8 @@
"clip": 3,
"mjdps" : 12.77,
"ssdam" : 23.21,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "1v",
@@ -58,7 +60,8 @@
"clip": 3,
"mjdps" : 6.85,
"ssdam" : 12.89,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "1s",
@@ -78,7 +81,8 @@
"clip": 3,
"mjdps" : 9.50,
"ssdam" : 18.05,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
@@ -97,7 +101,8 @@
"dps": 9,
"thermload": 1,
"clip": 3,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "7f",
@@ -115,7 +120,8 @@
"dps": 9,
"thermload": 1,
"clip": 3,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "20",
@@ -135,7 +141,8 @@
"clip": 3,
"mjdps" : 5.53,
"ssdam" : 10.31,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "21",
@@ -155,7 +162,8 @@
"clip": 3,
"mjdps" : 3.58,
"ssdam" : 6.45,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "22",
@@ -175,7 +183,8 @@
"clip": 3,
"mjdps" : 2.11,
"ssdam" : 3.87,
"ammo": 30
"ammo": 30,
"ammocost": 50
},
{
"id": "pa",
@@ -197,4 +206,4 @@
"ammo": 30
}
]
}
}

View File

@@ -13,7 +13,8 @@
"armourpen": "C",
"thermload": 2,
"clip": 1,
"ammo": 24
"ammo": 24,
"ammocost": 209
},
{
"id": "2k",
@@ -28,7 +29,8 @@
"armourpen": "C",
"thermload": 3,
"clip": 3,
"ammo": 24
"ammo": 24,
"ammocost": 209
}
]
}
}

View File

@@ -19,7 +19,8 @@
"ammo": 24,
"mjdps": 1.72,
"ssdam" : 3.87,
"missile": "D"
"missile": "D",
"ammocost": 500
},
{
"id": "2g",
@@ -40,7 +41,8 @@
"ammo": 18,
"mjdps": 0.57,
"ssdam" : 2.58,
"missile": "S"
"missile": "S",
"ammocost": 666.67
},
{
"id": "2d",
@@ -61,7 +63,8 @@
"ammo": 16,
"mjdps": 1.63,
"ssdam" : 3.87,
"missile": "D"
"missile": "D",
"ammocost": 500
},
{
"id": "2e",
@@ -82,7 +85,8 @@
"ammo": 6,
"mjdps": 0.57,
"ssdam" : 2.58,
"missile": "S"
"missile": "S",
"ammocost": 666.67
},
{
"id": "Ph",
@@ -106,4 +110,4 @@
"missile": "S"
}
]
}
}

View File

@@ -18,7 +18,8 @@
"clip": 90,
"mjdps" : 6.02,
"ssdam" : 1.20,
"ammo": 2100
"ammo": 2100,
"ammocost": 1
},
{
"id": "27",
@@ -38,7 +39,8 @@
"clip": 90,
"mjdps" : 5.59,
"ssdam" : 1.03,
"ammo": 2100
"ammo": 2100,
"ammocost": 1
},
{
"id": "28",
@@ -58,7 +60,8 @@
"clip": 90,
"mjdps" : 2.15,
"ssdam" : 0.52,
"ammo": 2100
"ammo": 2100,
"ammocost": 1
},
{
"id": "23",
@@ -78,7 +81,8 @@
"clip": 90,
"mjdps" : 3.75,
"ssdam" : 0.69,
"ammo": 2100
"ammo": 2100,
"ammocost": 1
},
{
"id": "24",
@@ -98,7 +102,8 @@
"clip": 90,
"mjdps" : 2.03,
"ssdam" : 0.34,
"ammo": 2100
"ammo": 2100,
"ammocost": 1
},
{
"id": "25",
@@ -118,7 +123,8 @@
"clip": 90,
"mjdps" : 1.54,
"ssdam" : 0.34,
"ammo": 2100
"ammo": 2100,
"ammocost": 1
},
{
"id": "e0",
@@ -140,4 +146,4 @@
"ammo": 1000
}
]
}
}

View File

@@ -18,7 +18,8 @@
"clip": 5,
"mjdps" : 6.89,
"ssdam" : 27.85,
"ammo": 100
"ammo": 100,
"ammocost": 200
},
{
"id": "2b",
@@ -38,7 +39,8 @@
"clip": 5,
"mjdps" : 20.98,
"ssdam" : 92.82,
"ammo": 100
"ammo": 100,
"ammocost": 200
},
{
"id": "2c",
@@ -58,7 +60,8 @@
"clip": 5,
"mjdps" : 25.55,
"ssdam" : 123.76,
"ammo": 100
"ammo": 100,
"ammocost": 200
},
{
"id": "Ap",
@@ -80,4 +83,4 @@
"ammo": 300
}
]
}
}

View File

@@ -18,7 +18,8 @@
"clip": 1,
"mjdps" : 13.75,
"ssdam" : 24.75,
"ammo": 30
"ammo": 30,
"ammocost": 200
},
{
"id": "2a",
@@ -38,7 +39,8 @@
"clip": 1,
"mjdps" : 21.66,
"ssdam" : 43.32,
"ammo": 30
"ammo": 30,
"ammocost": 200
},
{
"id": "ih",
@@ -60,4 +62,4 @@
"ammo": 90
}
]
}
}

View File

@@ -14,6 +14,8 @@
"grp": "tp",
"clip": 1,
"ammo": 0,
"ammoUnit": 1,
"ammoCost": 15000,
"missile": "S"
},
{
@@ -30,7 +32,9 @@
"grp": "tp",
"clip": 2,
"ammo": 0,
"ammoUnit": 1,
"ammoCost": 15000,
"missile": "S"
}
]
}
}