From 00623cd8d049687c9cafcd48f3d771593d8c915d Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 5 Nov 2020 21:42:06 -0800
Subject: Fix 000 slugs and flechettes to be based off 000 shot Add missing
looks-like fields to several items
---
json/items/ammo/000shot.json | 9 ++++++---
json/items/ammo/473.json | 1 +
json/items/generic/casing.json | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
(limited to 'json')
diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
index c90581e..c3a0fed 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/000shot.json
@@ -10,7 +10,7 @@
},
{
"id": "reloaded_shot_000_flechette",
- "copy-from": "shot_flechette",
+ "copy-from": "shot_000_flechette",
"type": "AMMO",
"name": { "str": "000 flechette shell, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
@@ -19,7 +19,7 @@
},
{
"id": "reloaded_shot_000_slug",
- "copy-from": "shot_slug",
+ "copy-from": "shot_000_slug",
"type": "AMMO",
"name": { "str": "000 shotgun slug, reloaded" },
"proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
@@ -29,6 +29,7 @@
{
"id": "shot_000",
"type": "AMMO",
+ "looks-like": "shot_00",
"name": { "str": "000 shot" },
"description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
"weight": "32 g",
@@ -51,6 +52,7 @@
{
"id": "shot_000_flechette",
"copy-from": "shot_000",
+ "looks-like": "shot_flechette",
"type": "AMMO",
"name": { "str": "000 flechette shell" },
"description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
@@ -62,13 +64,14 @@
{
"id": "shot_000_slug",
"copy-from": "shot_000",
+ "looks-like": "shot_slug",
"type": "AMMO",
"name": { "str": "000 shotgun slug" },
"description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
"price": 400,
"price_postapoc": 4500,
"dispersion": 100,
- "relative": { "range": 6, "pierce": 5 },
+ "relative": { "range": 12, "pierce": 8 },
"proportional": { "recoil": 1.4 },
"delete": { "effects": [ "SHOT" ] }
}
diff --git a/json/items/ammo/473.json b/json/items/ammo/473.json
index 37f9af4..4748d8c 100644
--- a/json/items/ammo/473.json
+++ b/json/items/ammo/473.json
@@ -12,6 +12,7 @@
{
"id": "473x33mm",
"type": "AMMO",
+ "looks-like": "8mm_caseless",
"name": { "str": "4.73x33mm" },
"description": "4.73x33mm caseless rounds. Designed for the H&K G11 rifle, these rounds encase the bullet within a block of solid propellant, greatly reducing ammunition mass while reducing metal requirements to manufacture. Being caseless rounds, these cannot be disassembled or reloaded.",
"weight": "3 g",
diff --git a/json/items/generic/casing.json b/json/items/generic/casing.json
index 2f2c6e9..580cab7 100644
--- a/json/items/generic/casing.json
+++ b/json/items/generic/casing.json
@@ -15,6 +15,7 @@
{
"id": "000shot_hull",
"type": "GENERIC",
+ "looks_like": "shot_hull",
"category": "spare_parts",
"name": { "str": "000 shotgun hull" },
"description": "An empty hull from a 000 shotgun shell.",
--
cgit v1.2.1