From 19d63d655ad8a0fb1f7eaf90ad272255c9423bb0 Mon Sep 17 00:00:00 2001 From: Greev <34149568+Greevv@users.noreply.github.com> Date: Wed, 22 May 2019 11:21:16 -0400 Subject: [PATCH 1/4] Changed weight and volume values to be more realistic. --- data/json/items/ammo/metal_rail.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index 69fe4f6e3d3b2..d9d0a06bf02ab 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -4,8 +4,8 @@ "type": "AMMO", "name": "rebar rail", "description": "A short piece of ferromagnetic rebar which has been straightened and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", - "weight": 712, - "volume": 1, + "weight": 160, + "volume": "25ml", "price": 1000, "to_hit": -1, "bashing": 5, @@ -27,7 +27,8 @@ "type": "AMMO", "name": "steel rail", "description": "A short piece of steel which has been forged true and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", - "weight": 520, + "weight": 160, + "volume": "20ml", "price": 1500, "bashing": 4, "cutting": 2, From e1988bdbc24b4d77cd364a223b1a38d42c9ea41d Mon Sep 17 00:00:00 2001 From: Greev <34149568+Greevv@users.noreply.github.com> Date: Wed, 22 May 2019 12:34:51 -0400 Subject: [PATCH 2/4] Fixed silly JSON error. --- data/json/items/ammo/metal_rail.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index d9d0a06bf02ab..7a63065660f4e 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -27,7 +27,6 @@ "type": "AMMO", "name": "steel rail", "description": "A short piece of steel which has been forged true and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", - "weight": 160, "volume": "20ml", "price": 1500, "bashing": 4, From 373a61f8f70da2c8aff04adcc1f6f6433fe1de29 Mon Sep 17 00:00:00 2001 From: Greev <34149568+Greevv@users.noreply.github.com> Date: Wed, 22 May 2019 14:21:53 -0400 Subject: [PATCH 3/4] Linted JSON. --- data/json/items/ammo/metal_rail.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index 7a63065660f4e..857459a3fcaf5 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -27,7 +27,7 @@ "type": "AMMO", "name": "steel rail", "description": "A short piece of steel which has been forged true and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", - "volume": "20ml", + "volume": "20ml", "price": 1500, "bashing": 4, "cutting": 2, @@ -37,4 +37,4 @@ "effects": [ "NEVER_MISFIRES" ], "relative": { "range": 10, "damage": -5, "pierce": 15 } } -] +] \ No newline at end of file From 829967a09afc46e5354863e9e05d3ebbb68501d4 Mon Sep 17 00:00:00 2001 From: Greev Date: Wed, 22 May 2019 23:14:40 -0400 Subject: [PATCH 4/4] Added empty newline at the end of the file to satisfy the JSON linting gods. --- data/json/items/ammo/metal_rail.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index 857459a3fcaf5..6c04defe8ae57 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -37,4 +37,4 @@ "effects": [ "NEVER_MISFIRES" ], "relative": { "range": 10, "damage": -5, "pierce": 15 } } -] \ No newline at end of file +]