From 84f41807fcc02409882733850ca073f6dcb483f2 Mon Sep 17 00:00:00 2001 From: Jerimee Richir Date: Sat, 18 Jan 2020 13:50:24 -0500 Subject: [PATCH 1/5] Update JSON_INFO.md --- doc/JSON_INFO.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 829cb00aa9e9c..14cb9bf706e50 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -26,7 +26,7 @@ Use the `Home` key to return to the top. + [Monster Factions](#monster-factions) + [Monsters](#monsters) + [Names](#names) - + [Profession item substitution](#profession_item_substitution) + + [Profession item substitution](#profession-item-substitution) - [`description`](#-description-) - [`name`](#-name-) - [`points`](#-points-) @@ -70,11 +70,11 @@ Use the `Home` key to return to the top. + [Seed Data](#seed-data) + [Artifact Data](#artifact-data) + [Brewing Data](#brewing-data) - - [`Charge_type`](#charge_type) - - [`Effects_carried`](#effects_carried) - - [`effects_worn`](#effects_worn) - - [`effects_wielded`](#effects_wielded) - - [`effects_activated`](#effects_activated) + - [`Charge_type`](#charge-type) + - [`Effects_carried`](#effects-carried) + - [`effects_worn`](#effects-worn) + - [`effects_wielded`](#effects-wielded) + - [`effects_activated`](#effects-activated) + [Software Data](#software-data) + [Fuel data](#fuel-data) + [Use Actions](#use-actions) @@ -541,7 +541,7 @@ There are six -resist parameters: acid, bash, chip, cut, elec, and fire. These a | Identifier | Description |--- |--- -| `monster` | The monster's id. +| `monster` | Unique ID. The monster's id, equivalent to `name` in other object types. | `freq` | Chance of occurrence, x/1000. | `cost_multiplier` | How many monsters each monster in this definition should count as, if spawning a limited number of monsters. | `pack_size` | (_optional_) The minimum and maximum number of monsters in this group that should spawn together. (default: `[1,1]`) @@ -1265,8 +1265,8 @@ See also VEHICLE_JSON.md "price": 100, // Used when bartering with NPCs. For stackable items (ammo, comestibles) this is the price for stack_size charges. Can use string "cent" "USD" or "kUSD". "price_post": "1 USD", // Same as price but represent value post cataclysm. Can use string "cent" "USD" or "kUSD". "material": ["COTTON"], // Material types, can be as many as you want. See materials.json for possible options -"cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon -"bashing": -5, // (Optional, default = 0) Bashing damage caused by using it as a melee weapon +"cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon. Cannot be negative? +"bashing": 0, // (Optional, default = 0) Bashing damage caused by using it as a melee weapon. Cannot be negative? "to_hit": 0, // (Optional, default = 0) To-hit bonus if using it as a melee weapon (whatever for?) "flags": ["VARSIZE"], // Indicates special effects, see JSON_FLAGS.md "magazine_well": 0, // Volume above which the magazine starts to protrude from the item and add extra volume @@ -2943,4 +2943,4 @@ Setting of sprite sheets. Same as `tiles-new` field in `tile_config`. Sprite fil "type": "field_type", // this is a field type "id": "fd_gum_web", // id of the field "immune_mtypes": [ "mon_spider_gum" ], // list of monster immune to this field - } \ No newline at end of file + } From 30b96a17669d2ec32ba2c0686e551f47bac511c6 Mon Sep 17 00:00:00 2001 From: Jerimee Richir Date: Fri, 24 Jan 2020 17:45:26 -0500 Subject: [PATCH 2/5] Update doc/JSON_INFO.md Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- doc/JSON_INFO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 14cb9bf706e50..05b1b03917264 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -541,7 +541,7 @@ There are six -resist parameters: acid, bash, chip, cut, elec, and fire. These a | Identifier | Description |--- |--- -| `monster` | Unique ID. The monster's id, equivalent to `name` in other object types. +| `monster` | The monster's unique ID, eg. `"mon_zombie"`. | `freq` | Chance of occurrence, x/1000. | `cost_multiplier` | How many monsters each monster in this definition should count as, if spawning a limited number of monsters. | `pack_size` | (_optional_) The minimum and maximum number of monsters in this group that should spawn together. (default: `[1,1]`) From 33301fab04c9c78ce443a47fb9f49c67bcf26e8d Mon Sep 17 00:00:00 2001 From: Jerimee Richir Date: Fri, 24 Jan 2020 21:12:07 -0500 Subject: [PATCH 3/5] Update doc/JSON_INFO.md Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- doc/JSON_INFO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 05b1b03917264..7a26f041bc7de 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -1265,7 +1265,7 @@ See also VEHICLE_JSON.md "price": 100, // Used when bartering with NPCs. For stackable items (ammo, comestibles) this is the price for stack_size charges. Can use string "cent" "USD" or "kUSD". "price_post": "1 USD", // Same as price but represent value post cataclysm. Can use string "cent" "USD" or "kUSD". "material": ["COTTON"], // Material types, can be as many as you want. See materials.json for possible options -"cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon. Cannot be negative? +"cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon. "bashing": 0, // (Optional, default = 0) Bashing damage caused by using it as a melee weapon. Cannot be negative? "to_hit": 0, // (Optional, default = 0) To-hit bonus if using it as a melee weapon (whatever for?) "flags": ["VARSIZE"], // Indicates special effects, see JSON_FLAGS.md From d43da32d01b3ba7d9b8fb57e86e3e418913b897f Mon Sep 17 00:00:00 2001 From: Jerimee Richir Date: Fri, 24 Jan 2020 21:14:36 -0500 Subject: [PATCH 4/5] Update JSON_INFO.md --- doc/JSON_INFO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 7a26f041bc7de..893be89aede04 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -1266,7 +1266,7 @@ See also VEHICLE_JSON.md "price_post": "1 USD", // Same as price but represent value post cataclysm. Can use string "cent" "USD" or "kUSD". "material": ["COTTON"], // Material types, can be as many as you want. See materials.json for possible options "cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon. -"bashing": 0, // (Optional, default = 0) Bashing damage caused by using it as a melee weapon. Cannot be negative? +"bashing": 0, // (Optional, default = 0) Bashing damage caused by using it as a melee weapon. This value cannot be negative. "to_hit": 0, // (Optional, default = 0) To-hit bonus if using it as a melee weapon (whatever for?) "flags": ["VARSIZE"], // Indicates special effects, see JSON_FLAGS.md "magazine_well": 0, // Volume above which the magazine starts to protrude from the item and add extra volume From 87feac87f683effc6926de8c5eb05b8cd4c77905 Mon Sep 17 00:00:00 2001 From: Jerimee Richir Date: Sat, 25 Jan 2020 13:12:32 -0500 Subject: [PATCH 5/5] Update JSON_INFO.md --- doc/JSON_INFO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 893be89aede04..e7a7bef0c13a1 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -1265,7 +1265,7 @@ See also VEHICLE_JSON.md "price": 100, // Used when bartering with NPCs. For stackable items (ammo, comestibles) this is the price for stack_size charges. Can use string "cent" "USD" or "kUSD". "price_post": "1 USD", // Same as price but represent value post cataclysm. Can use string "cent" "USD" or "kUSD". "material": ["COTTON"], // Material types, can be as many as you want. See materials.json for possible options -"cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon. +"cutting": 0, // (Optional, default = 0) Cutting damage caused by using it as a melee weapon. This value cannot be negative. "bashing": 0, // (Optional, default = 0) Bashing damage caused by using it as a melee weapon. This value cannot be negative. "to_hit": 0, // (Optional, default = 0) To-hit bonus if using it as a melee weapon (whatever for?) "flags": ["VARSIZE"], // Indicates special effects, see JSON_FLAGS.md