From 16ef38b0d2666b3243259e6c9d255ab193dbb9e2 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 18:38:05 +0100 Subject: [PATCH 01/45] Add Military pilot Profession --- data/json/professions.json | 45 +++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index 4b8506e5f7442..049248056fe84 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4054,5 +4054,48 @@ "male": [ "boxer_shorts", "pants", "dress_shoes", "polo_shirt", "socks" ], "female": [ "tank_top", "bra", "panties", "skirt", "heels", "jacket_leather", "stockings" ] } - } + }, + { + "type": "profession", + "ident": "mili_pilot", + "name": "Military Pilot", + "description": "placeholder, if you see this the profession worked!", + "points": 5, + "skills": [ + { "level": 4, "name": "driving" }, + { "level": 3, "name": "pistol" }, + { "level": 3, "name": "mechanics" }, + { "level": 3, "name": "gun" } + ], + "traits": [ + "PROF_HELI_PILOT" + ], + "items": { + "both": { + "items": [ + "pants_army", + "socks", + "undershirt", + "boots_combat", + "wristwatch", + "fancy_sunglasses", + "gloves_tactical", + "helmet_army", + "jacket_army", + "webbing_belt" + ], + "entries": [ + { "group": "charged_two_way_radio" }, + { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, + { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 }, + { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 } + ] + }, + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boy_shorts" ] + }, + "flags": [ + "SCEN_ONLY" + ] +} ] From 8c6ca9a3353183a32bda1b5ea329033494564669 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 18:40:40 +0100 Subject: [PATCH 02/45] Update scenarios.json Military pilot added to the overrun and helicopter crash scenarios --- data/json/scenarios.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 9bd8afd1e6eca..a492047f518fe 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -491,7 +491,7 @@ "description": "While being transported to a different military base, the pilot lost control of the helicopter and crashed in the middle of nowhere. Hopefully some of the soldiers that were with you also survived the accident.", "start_name": "Crash site", "allowed_locs": [ "field", "forest" ], - "professions": [ "soldier", "specops", "bio_soldier", "bio_sniper", "bionic_spy", "national_guard", "politician" ], + "professions": [ "soldier", "specops", "bio_soldier", "bio_sniper", "bionic_spy", "national_guard", "politician", "mili_pilot" ], "map_extra": "mx_helicopter", "flags": [ "HELI_CRASH", "LONE_START" ] }, @@ -525,7 +525,7 @@ "description": "Despite all the soldiers, guns and minefields, the base you were on got overrun by the dead. Everyone was ordered to fall back to the armory, but during all the chaos you got lost and you are now stuck in the warehouse all alone. You are not sure if anyone made it to the armory, or if you are the last man alive.", "start_name": "Military Base Warehouse", "allowed_locs": [ "mil_base_2g" ], - "professions": [ "unemployed", "soldier", "specops", "bio_soldier", "bio_sniper", "labtech", "medic" ], + "professions": [ "unemployed", "soldier", "specops", "bio_soldier", "bio_sniper", "labtech", "medic", "mili_pilot" ], "flags": [ "CHALLENGE", "LONE_START" ] }, { From 72c8669ff3b67b3b676262213405e1eb2a0cc7c8 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 21:34:55 +0100 Subject: [PATCH 03/45] Added new description --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index 049248056fe84..434734de0c253 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4059,7 +4059,7 @@ "type": "profession", "ident": "mili_pilot", "name": "Military Pilot", - "description": "placeholder, if you see this the profession worked!", + "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", "points": 5, "skills": [ { "level": 4, "name": "driving" }, From 19eec8ef5eb40f4ca5be9a1c7853e373a7a17906 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 21:38:36 +0100 Subject: [PATCH 04/45] Update mutations.json --- data/json/mutations/mutations.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index f2c0bcdffb911..dbdf6aa8bfe41 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -6102,6 +6102,16 @@ "purifiable": false, "profession": true }, + { + "type": "mutation", + "id": "MILI_PILOT", + "name": "Military Pilot", + "points": 0, + "description": "You are a trained pilot. You wonder if you will ever have the chance to fly again.", + "valid": false, + "purifiable": false, + "profession": true + }, { "type": "mutation", "id": "PROF_SWAT", From 520b5beb560ac3b8d33e4506932429e9ad073ccc Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 22:16:38 +0100 Subject: [PATCH 05/45] Update professions.json --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index 434734de0c253..877f467d31cd0 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4068,7 +4068,7 @@ { "level": 3, "name": "gun" } ], "traits": [ - "PROF_HELI_PILOT" + "MILI_PILOT" ], "items": { "both": { From 963646e10a791bb514d2b5ee54c16d8e6b6054be Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 22:30:01 +0100 Subject: [PATCH 06/45] Update professions.json --- data/json/professions.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 877f467d31cd0..1c58af0319ec2 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4067,9 +4067,7 @@ { "level": 3, "name": "mechanics" }, { "level": 3, "name": "gun" } ], - "traits": [ - "MILI_PILOT" - ], + "traits": [ "MILI_PILOT" ], "items": { "both": { "items": [ @@ -4094,8 +4092,6 @@ "male": [ "boxer_shorts" ], "female": [ "sports_bra", "boy_shorts" ] }, - "flags": [ - "SCEN_ONLY" - ] + "flags": [ "SCEN_ONLY" ] } ] From 8359bafbdf117033d15506c3738e13cb9f172027 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 23:24:55 +0100 Subject: [PATCH 07/45] Update professions.json Added leg ammo pouch and an additional magazine --- data/json/professions.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 1c58af0319ec2..f309edd677f66 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4080,17 +4080,19 @@ "gloves_tactical", "helmet_army", "jacket_army", - "webbing_belt" + "webbing_belt", + "legpouch_large" ], "entries": [ { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 }, + { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 }, { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 } ] }, - "male": [ "boxer_shorts" ], - "female": [ "sports_bra", "boy_shorts" ] + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boy_shorts" ] }, "flags": [ "SCEN_ONLY" ] } From 966c29cc2e189d97e678b6c32c9602caf48416e4 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sun, 5 Apr 2020 23:43:57 +0100 Subject: [PATCH 08/45] Update professions.json Tidying up --- data/json/professions.json | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index f309edd677f66..7432c715dbe95 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4061,28 +4061,11 @@ "name": "Military Pilot", "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", "points": 5, - "skills": [ - { "level": 4, "name": "driving" }, - { "level": 3, "name": "pistol" }, - { "level": 3, "name": "mechanics" }, - { "level": 3, "name": "gun" } - ], + "skills": [ { "level": 4, "name": "driving" }, { "level": 3, "name": "pistol" }, { "level": 3, "name": "mechanics" }, { "level": 3, "name": "gun" } ], "traits": [ "MILI_PILOT" ], "items": { "both": { - "items": [ - "pants_army", - "socks", - "undershirt", - "boots_combat", - "wristwatch", - "fancy_sunglasses", - "gloves_tactical", - "helmet_army", - "jacket_army", - "webbing_belt", - "legpouch_large" - ], + "items": [ "pants_army", "socks", "undershirt", "boots_combat", "wristwatch", "fancy_sunglasses", "gloves_tactical", "helmet_army", "jacket_army", "webbing_belt", "legpouch_large" ], "entries": [ { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, @@ -4091,8 +4074,8 @@ { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 } ] }, - "male": [ "boxer_shorts" ], - "female": [ "sports_bra", "boy_shorts" ] + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boy_shorts" ] }, "flags": [ "SCEN_ONLY" ] } From 0671b00e4e8930178a8e4338ebdc4ee4154c7c73 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 01:41:08 +0100 Subject: [PATCH 09/45] attempt at functional trait This might make the trait work? --- src/handle_action.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 48222b5d09171..45f61d92bf003 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -96,6 +96,7 @@ static const bionic_id bio_remote( "bio_remote" ); static const trait_id trait_HIBERNATE( "HIBERNATE" ); static const trait_id trait_PROF_CHURL( "PROF_CHURL" ); static const trait_id trait_PROF_HELI_PILOT( "PROF_HELI_PILOT" ); +static const trait_id trait_PROF_MILI_Pilot( "MILI_PILOT" ); static const trait_id trait_SHELL2( "SHELL2" ); static const trait_id trait_WAYFARER( "WAYFARER" ); @@ -471,6 +472,11 @@ static void pldrive( int x, int y, int z = 0 ) if( !remote && z != 0 && !u.has_trait( trait_PROF_HELI_PILOT ) ) { u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); return; + } + } + if( !remote && z != 0 && !u.has_trait( trait_MILI_PILOT ) ) { + u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); + return; } if( z != 0 && !g->m.has_zlevels() ) { u.add_msg_if_player( m_info, _( "This vehicle doesn't look very airworthy." ) ); From 18a6129361e6b5040c59df9dbad6a14cc04f7892 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 01:50:39 +0100 Subject: [PATCH 10/45] Update src/handle_action.cpp Co-Authored-By: anothersimulacrum --- src/handle_action.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 45f61d92bf003..7b9b094d4680e 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -96,7 +96,7 @@ static const bionic_id bio_remote( "bio_remote" ); static const trait_id trait_HIBERNATE( "HIBERNATE" ); static const trait_id trait_PROF_CHURL( "PROF_CHURL" ); static const trait_id trait_PROF_HELI_PILOT( "PROF_HELI_PILOT" ); -static const trait_id trait_PROF_MILI_Pilot( "MILI_PILOT" ); +static const trait_id trait_PROF_MILI_PILOT( "MILI_PILOT" ); static const trait_id trait_SHELL2( "SHELL2" ); static const trait_id trait_WAYFARER( "WAYFARER" ); From 7aef458e57ea8a7fc13ea817055607bb19b29b7e Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 01:51:19 +0100 Subject: [PATCH 11/45] Update src/handle_action.cpp Co-Authored-By: anothersimulacrum --- src/handle_action.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 7b9b094d4680e..539bd9edcc38e 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -472,7 +472,6 @@ static void pldrive( int x, int y, int z = 0 ) if( !remote && z != 0 && !u.has_trait( trait_PROF_HELI_PILOT ) ) { u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); return; - } } if( !remote && z != 0 && !u.has_trait( trait_MILI_PILOT ) ) { u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); From bc2e498c0a77ede80fdfb97cb89317c2d2ca0e83 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 01:51:39 +0100 Subject: [PATCH 12/45] Update src/handle_action.cpp Co-Authored-By: anothersimulacrum --- src/handle_action.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 539bd9edcc38e..7e9cc827b0b92 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -473,7 +473,6 @@ static void pldrive( int x, int y, int z = 0 ) u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); return; } - if( !remote && z != 0 && !u.has_trait( trait_MILI_PILOT ) ) { u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); return; } From 00658362ebcf26aa246a7eebb4e307e84460392f Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 01:51:52 +0100 Subject: [PATCH 13/45] Update src/handle_action.cpp Co-Authored-By: anothersimulacrum --- src/handle_action.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 7e9cc827b0b92..6218670314d54 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -474,7 +474,6 @@ static void pldrive( int x, int y, int z = 0 ) return; } u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); - return; } if( z != 0 && !g->m.has_zlevels() ) { u.add_msg_if_player( m_info, _( "This vehicle doesn't look very airworthy." ) ); From 943652d972d2fec84ba2a40f3da2fb47410fe2bb Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 02:00:49 +0100 Subject: [PATCH 14/45] Update professions.json Hopefully this will pass the test --- data/json/professions.json | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 7432c715dbe95..500e2fba08c61 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4055,17 +4055,36 @@ "female": [ "tank_top", "bra", "panties", "skirt", "heels", "jacket_leather", "stockings" ] } }, - { +{ "type": "profession", "ident": "mili_pilot", "name": "Military Pilot", "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", "points": 5, - "skills": [ { "level": 4, "name": "driving" }, { "level": 3, "name": "pistol" }, { "level": 3, "name": "mechanics" }, { "level": 3, "name": "gun" } ], - "traits": [ "MILI_PILOT" ], + "skills": [ + { "level": 4, "name": "driving" }, + { "level": 3, "name": "pistol" }, + { "level": 3, "name": "mechanics" }, + { "level": 3, "name": "gun" } + ], + "traits": [ + "MILI_PILOT" + ], "items": { "both": { - "items": [ "pants_army", "socks", "undershirt", "boots_combat", "wristwatch", "fancy_sunglasses", "gloves_tactical", "helmet_army", "jacket_army", "webbing_belt", "legpouch_large" ], + "items": [ + "pants_army", + "socks", + "undershirt", + "boots_combat", + "wristwatch", + "fancy_sunglasses", + "gloves_tactical", + "helmet_army", + "jacket_army", + "webbing_belt", + "legpouch_large" + ], "entries": [ { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, @@ -4077,6 +4096,8 @@ "male": [ "boxer_shorts" ], "female": [ "sports_bra", "boy_shorts" ] }, - "flags": [ "SCEN_ONLY" ] + "flags": [ + "SCEN_ONLY" + ] } ] From 1741d8313945871729b6313d266e5fcef8044e5b Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 11:15:01 +0100 Subject: [PATCH 15/45] Update data/json/professions.json Co-Authored-By: Anton Burmistrov --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index 500e2fba08c61..02abce0cd7267 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4059,7 +4059,7 @@ "type": "profession", "ident": "mili_pilot", "name": "Military Pilot", - "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", + "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", "points": 5, "skills": [ { "level": 4, "name": "driving" }, From c0d6ae1aec954e842962d5be67391c0345ad5f6c Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 6 Apr 2020 13:38:48 +0100 Subject: [PATCH 16/45] Update professions.json --- data/json/professions.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 02abce0cd7267..f02e3232b9785 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4044,13 +4044,20 @@ { "type": "profession", "ident": "frat", - "name": { "male": "Frat Boy", "female": "Sorority Girl" }, + "name": { + "male": "Frat Boy", + "female": "Sorority Girl" + }, "description": "You were living the high life, spending your parents money without a care in the world. You were at one of your usual crazy parties when the guests became hungry for more than your drugs. You still have a chance to use the last symbol of your luxurious life - your sport car - and get far away.", "points": 2, - "skills": [ { "level": 1, "name": "speech" }, { "level": 2, "name": "driving" } ], + "skills": [ + { "level": 1, "name": "speech" }, + { "level": 2, "name": "driving" } + ], "vehicle": "car_sports", "items": { - "both": { "items": [ "gold_watch", "water_mineral", "smart_phone", "money_bundle", "cig", "ref_lighter" ] }, + "both": { "items": [ "gold_watch", "water_mineral", "smart_phone", "money_bundle", "cig", + "ref_lighter" ] }, "male": [ "boxer_shorts", "pants", "dress_shoes", "polo_shirt", "socks" ], "female": [ "tank_top", "bra", "panties", "skirt", "heels", "jacket_leather", "stockings" ] } From abe24fb431a84b84f00259eb9e326ae25576da2a Mon Sep 17 00:00:00 2001 From: Competently-Incompetent Date: Sat, 11 Apr 2020 12:56:17 +0100 Subject: [PATCH 17/45] updated scenarios and my godawful spelling --- data/json/scenarios.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 95eab6fde96db..a6dad4a35a9c3 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -441,13 +441,8 @@ "points": -5, "description": "While being transported to a different military base, the pilot lost control of the helicopter and crashed in the middle of nowhere. Hopefully some of the soldiers that were with you also survived the accident.", "start_name": "Crash site", -<<<<<<< HEAD - "allowed_locs": [ "field", "forest" ], - "professions": [ "soldier", "specops", "bio_soldier", "bio_sniper", "bionic_spy", "national_guard", "politician", "mili_pilot" ], -======= "allowed_locs": [ "sloc_field", "sloc_forest" ], - "professions": [ "soldier", "specops", "bio_soldier", "bio_sniper", "bionic_spy", "national_guard", "politician" ], ->>>>>>> upstream/master + "professions": [ "soldier", "specops", "bio_soldier", "bio_sniper", "bionic_spy", "national_guard", "politician", "mili_pilot" ], "map_extra": "mx_helicopter", "flags": [ "HELI_CRASH", "LONE_START" ] }, From 7c8d0c4f52f129e1a9c9d46ebe83ff117294b495 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent Date: Sat, 11 Apr 2020 13:03:34 +0100 Subject: [PATCH 18/45] added the military pilot to DSA --- data/mods/Dark-Skies-Above/overrides/scenarios.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Dark-Skies-Above/overrides/scenarios.json b/data/mods/Dark-Skies-Above/overrides/scenarios.json index 5137a0c07c211..34c289e1c7354 100644 --- a/data/mods/Dark-Skies-Above/overrides/scenarios.json +++ b/data/mods/Dark-Skies-Above/overrides/scenarios.json @@ -293,6 +293,6 @@ "copy-from": "heli_crash", "name": "Helicopter Crash", "description": "While being evacuated from a hot zone, the pilot lost control of the helicopter and crashed in the middle of nowhere. Hopefully some of the soldiers that were with you also survived the accident.", - "professions": [ "soldier", "specops", "national_guard", "politician" ] + "professions": [ "soldier", "specops", "national_guard", "politician", "mili_pilot" ] } ] From a3d08163d788c9ea74bb6cf39a88b31e7bbde3cf Mon Sep 17 00:00:00 2001 From: Competently-Incompetent Date: Sat, 11 Apr 2020 14:36:00 +0100 Subject: [PATCH 19/45] Hopefully successfully lint this file --- data/json/professions.json | 97 +++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 54 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index ddcb584f63d8e..85d6a3f891f7e 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4045,67 +4045,56 @@ { "type": "profession", "ident": "frat", - "name": { - "male": "Frat Boy", - "female": "Sorority Girl" - }, + "name": { "male": "Frat Boy", "female": "Sorority Girl" }, "description": "You were living the high life, spending your parents money without a care in the world. You were at one of your usual crazy parties when the guests became hungry for more than your drugs. You still have a chance to use the last symbol of your luxurious life - your sport car - and get far away.", "points": 2, - "skills": [ - { "level": 1, "name": "speech" }, - { "level": 2, "name": "driving" } - ], + "skills": [ { "level": 1, "name": "speech" }, { "level": 2, "name": "driving" } ], "vehicle": "car_sports", "items": { - "both": { "items": [ "gold_watch", "water_mineral", "smart_phone", "money_bundle", "cig", - "ref_lighter" ] }, + "both": { "items": [ "gold_watch", "water_mineral", "smart_phone", "money_bundle", "cig", "ref_lighter" ] }, "male": [ "boxer_shorts", "pants", "dress_shoes", "polo_shirt", "socks" ], "female": [ "tank_top", "bra", "panties", "skirt", "heels", "jacket_leather", "stockings" ] } }, -{ - "type": "profession", - "ident": "mili_pilot", - "name": "Military Pilot", - "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", - "points": 5, - "skills": [ - { "level": 4, "name": "driving" }, - { "level": 3, "name": "pistol" }, - { "level": 3, "name": "mechanics" }, - { "level": 3, "name": "gun" } - ], - "traits": [ - "MILI_PILOT" - ], - "items": { - "both": { - "items": [ - "pants_army", - "socks", - "undershirt", - "boots_combat", - "wristwatch", - "fancy_sunglasses", - "gloves_tactical", - "helmet_army", - "jacket_army", - "webbing_belt", - "legpouch_large" - ], - "entries": [ - { "group": "charged_two_way_radio" }, - { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, - { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 }, - { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 }, - { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 } - ] + { + "type": "profession", + "ident": "mili_pilot", + "name": "Military Pilot", + "description": "You got to see things fall apart from the sky, transporting soldiers and survivors from one holdout to the next. You knew it was only a matter of time before the horrors patrolling the skies shot you down.", + "points": 5, + "skills": [ + { "level": 4, "name": "driving" }, + { "level": 3, "name": "pistol" }, + { "level": 3, "name": "mechanics" }, + { "level": 3, "name": "gun" } + ], + "traits": [ "MILI_PILOT" ], + "items": { + "both": { + "items": [ + "pants_army", + "socks", + "undershirt", + "boots_combat", + "wristwatch", + "fancy_sunglasses", + "gloves_tactical", + "helmet_army", + "jacket_army", + "webbing_belt", + "legpouch_large" + ], + "entries": [ + { "group": "charged_two_way_radio" }, + { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, + { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 }, + { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 }, + { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 } + ] + }, + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boy_shorts" ] }, - "male": [ "boxer_shorts" ], - "female": [ "sports_bra", "boy_shorts" ] - }, - "flags": [ - "SCEN_ONLY" - ] -} + "flags": [ "SCEN_ONLY" ] + } ] From 34448285a8440d2ebb36d8253064a882589d5e6b Mon Sep 17 00:00:00 2001 From: Competently-Incompetent Date: Sat, 11 Apr 2020 15:18:40 +0100 Subject: [PATCH 20/45] changed profession trait --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index 85d6a3f891f7e..8920f5362dd88 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -4068,7 +4068,7 @@ { "level": 3, "name": "mechanics" }, { "level": 3, "name": "gun" } ], - "traits": [ "MILI_PILOT" ], + "traits": [ "PROF_HELI_PILOT" ], "items": { "both": { "items": [ From aee0168eded54b297b5d63882f79351a022cc950 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent Date: Sat, 11 Apr 2020 15:20:04 +0100 Subject: [PATCH 21/45] edited description of helicopter pilot trait --- data/json/mutations/mutations.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index f492dec1d5111..ae0ed177030fb 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -6097,16 +6097,6 @@ "id": "PROF_HELI_PILOT", "name": "Helicopter Pilot", "points": 0, - "description": "You are a commercial helicopter pilot, there are no paying passengers anymore, yet still you dream of taking your bird for a spin.", - "valid": false, - "purifiable": false, - "profession": true - }, - { - "type": "mutation", - "id": "MILI_PILOT", - "name": "Military Pilot", - "points": 0, "description": "You are a trained pilot. You wonder if you will ever have the chance to fly again.", "valid": false, "purifiable": false, From 8f8227979f021c87cd4f5d7e2b216722d5b381e8 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent Date: Sat, 11 Apr 2020 15:21:51 +0100 Subject: [PATCH 22/45] reverted my changes --- src/handle_action.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index d2b80fc27217d..4d7ad6620e182 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -104,7 +104,6 @@ static const bionic_id bio_remote( "bio_remote" ); static const trait_id trait_HIBERNATE( "HIBERNATE" ); static const trait_id trait_PROF_CHURL( "PROF_CHURL" ); static const trait_id trait_PROF_HELI_PILOT( "PROF_HELI_PILOT" ); -static const trait_id trait_PROF_MILI_PILOT( "MILI_PILOT" ); static const trait_id trait_SHELL2( "SHELL2" ); static const trait_id trait_WAYFARER( "WAYFARER" ); @@ -482,8 +481,6 @@ static void pldrive( int x, int y, int z = 0 ) if( z != 0 && !u.has_trait( trait_PROF_HELI_PILOT ) ) { u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); return; - } - u.add_msg_if_player( m_info, _( "You have no idea how to make the vehicle fly." ) ); } if( z != 0 && !g->m.has_zlevels() ) { u.add_msg_if_player( m_info, _( "This vehicle doesn't look very airworthy." ) ); From 64e26421d3c4cc84b7c7134b811a88d48b5ee15c Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Sat, 11 Apr 2020 16:12:55 +0100 Subject: [PATCH 23/45] Update mutations.json got rid of full stop --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index ae0ed177030fb..4e01f1b2e2c61 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -6097,7 +6097,7 @@ "id": "PROF_HELI_PILOT", "name": "Helicopter Pilot", "points": 0, - "description": "You are a trained pilot. You wonder if you will ever have the chance to fly again.", + "description": "You are a trained pilot, You wonder if you will ever have the chance to fly again.", "valid": false, "purifiable": false, "profession": true From a559707fa28cbc4ea67e64f47162682226717ac3 Mon Sep 17 00:00:00 2001 From: Competently-Incompetent <63202272+Competently-Incompetent@users.noreply.github.com> Date: Mon, 13 Apr 2020 18:57:44 +0100 Subject: [PATCH 24/45] Update data/json/mutations/mutations.json Co-Authored-By: Anton Burmistrov --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 4e01f1b2e2c61..73d72d7a0f76b 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -6097,7 +6097,7 @@ "id": "PROF_HELI_PILOT", "name": "Helicopter Pilot", "points": 0, - "description": "You are a trained pilot, You wonder if you will ever have the chance to fly again.", + "description": "You are a trained pilot, you wonder if you will ever have the chance to fly again.", "valid": false, "purifiable": false, "profession": true From 885bb8b6ab633244e3473b1bb082b32b19052127 Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Wed, 15 Apr 2020 20:01:51 +0200 Subject: [PATCH 25/45] Add grenade belts to loot pool --- data/json/itemgroups/military.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index de3741f23ef20..3cdd70eb8100f 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -364,6 +364,7 @@ { "item": "m2browning", "prob": 15 }, { "item": "mark19", "prob": 15 }, { "item": "556", "prob": 30 }, + { "item": "belt40mm", "prob": 8 }, { "item": "40x46mm_m433", "prob": 10 }, { "item": "40x46mm_m576", "prob": 6 }, { "item": "8mm_hvp", "prob": 4 }, From 6b36c10b273e693617cb161972fb561381a1c778 Mon Sep 17 00:00:00 2001 From: ymber Date: Sat, 11 Jan 2020 09:49:00 +0000 Subject: [PATCH 26/45] Remove modularvest items --- .../itemgroups/Clothing_Gear/clothing.json | 20 +- data/json/itemgroups/Clothing_Gear/gear.json | 3 +- .../Locations_MapExtras/locations.json | 2 +- data/json/itemgroups/military.json | 4 +- data/json/items/armor/ammo_pouch.json | 204 ------------------ data/json/items/obsolete.json | 204 ++++++++++++++++++ data/json/npcs/NC_SOLDIER.json | 4 +- data/json/npcs/items_generic.json | 4 +- .../NPC_scavenger_mercenary.json | 3 +- .../json/npcs/robofac/NPC_ROBOFAC_MERC_1.json | 2 +- .../robofac/NPC_robofac_generic_security.json | 2 +- data/json/professions.json | 6 +- data/json/recipes/armor/legs.json | 2 +- data/json/recipes/armor/suit.json | 22 +- data/json/recipes/armor/torso.json | 89 +------- data/json/recipes/recipe_obsolete.json | 30 +++ data/json/vehicles/helicopters.json | 9 +- 17 files changed, 271 insertions(+), 339 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 5e1ac65c47932..881b3779a5ab6 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -1836,9 +1836,7 @@ [ "winter_gloves_army", 30 ], [ "army_top", 30 ], [ "kevlar", 10 ], - [ "modularvest", 25 ], - [ "modularvestkevlar", 23 ], - [ "modularvestceramic", 30 ], + [ "ballistic_vest_esapi", 30 ], [ "vest", 15 ], [ "mask_gas", 10 ], [ "goggles_nv", 1 ], @@ -1917,9 +1915,7 @@ "id": "mil_armor_torso", "items": [ [ "kevlar", 10 ], - [ "modularvest", 25 ], - [ "modularvestkevlar", 23 ], - [ "modularvestceramic", 30 ], + [ "ballistic_vest_esapi", 30 ], [ "winter_jacket_army", 30 ], [ "vest", 15 ], [ "tacvest", 10 ], @@ -1976,11 +1972,7 @@ [ "sleeveless_duster", 2 ], [ "sleeveless_duster_leather", 5 ], [ "kevlar", 30 ], - [ "modularvest", 12 ], - [ "modularvestkevlar", 10 ], - [ "modularvestceramic", 8 ], - [ "modularveststeel", 5 ], - [ "modularvestsuper", 1 ], + [ "ballistic_vest_esapi", 8 ], [ "dump_pouch", 20 ], [ "mask_bal", 5 ], [ "vest", 15 ], @@ -2206,12 +2198,6 @@ [ "bookplate", 10 ], [ "ballistic_vest_empty", 2 ], [ "ballistic_vest_esapi", 4 ], - [ "modularvest", 4 ], - [ "modularvesthard", 1 ], - [ "modularvestkevlar", 2 ], - [ "modularvestceramic", 2 ], - [ "modularveststeel", 1 ], - [ "modularvestsuper", 1 ], [ "dragonskin", 1 ], [ "corset", 1 ], [ "football_armor", 18 ], diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json index c75899d1fe53b..0dfa98f2ea509 100644 --- a/data/json/itemgroups/Clothing_Gear/gear.json +++ b/data/json/itemgroups/Clothing_Gear/gear.json @@ -25,8 +25,7 @@ [ "legpouch_large", 5 ], [ "mask_bal", 10 ], [ "mask_gas", 10 ], - [ "modularvest", 15 ], - [ "modularvestkevlar", 15 ], + [ "ballistic_vest_esapi", 15 ], [ "smokebomb", 5 ], [ "suppressor", 25 ], [ "suppressor_compact", 20 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 75b464e33c9c9..26cef7fa505e0 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -1387,7 +1387,7 @@ "items": [ [ "helmet_riot", 25 ], [ "mask_gas", 25 ], - [ "modularveststeel", 20 ], + [ "armor_riot", 20 ], [ "gloves_tactical", 10 ], [ "armguard_hard", 20 ], [ "legguard_hard", 20 ], diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index de3741f23ef20..a3ad62f45fded 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -484,9 +484,7 @@ { "item": "gloves_tactical", "prob": 10 }, { "item": "jumpsuit", "prob": 20 }, { "item": "kevlar", "prob": 10 }, - { "item": "modularvest", "prob": 27 }, - { "item": "modularvestkevlar", "prob": 28 }, - { "item": "modularvestceramic", "prob": 34 }, + { "item": "ballistic_vest_esapi", "prob": 40 }, { "item": "kevlar_plate", "prob": 10 }, { "item": "mask_gas", "prob": 10 }, { "item": "helmet_army", "prob": 40 }, diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index 3b61f63766cb8..6a668e2ec84eb 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -238,210 +238,6 @@ }, "flags": [ "WATER_FRIENDLY", "BELTED" ] }, - { - "id": "modularvest", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" }, - "description": "A Modular Bullet Resistant Vest. It has pouches for extra armor inserts, but without them provides little more protection over a regular vest. It has four pouches capable of carrying magazines.", - "weight": "2860 g", - "volume": "6 L", - "price": 29900, - "price_postapoc": 2000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_gray", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 7, - "storage": "2500 ml", - "warmth": 15, - "material_thickness": 4, - "use_action": { - "type": "holster", - "holster_prompt": "Stash ammo", - "holster_msg": "You stash your %s.", - "multi": 4, - "min_volume": "250 ml", - "max_volume": "1 L", - "draw_cost": 60, - "flags": [ "MAG_COMPACT" ] - }, - "flags": [ "STURDY", "OUTER" ] - }, - { - "id": "modularvestceramic", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" }, - "description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection. The ceramic plates cannot be repaired, only replaced. It has four pouches capable of carrying magazines.", - "weight": "4308 g", - "volume": "6 L", - "price": 39900, - "price_postapoc": 4000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar", "ceramic" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_gray", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 15, - "storage": "1 L", - "warmth": 15, - "material_thickness": 9, - "use_action": { - "type": "holster", - "holster_prompt": "Stash ammo", - "holster_msg": "You stash your %s.", - "multi": 4, - "min_volume": "250 ml", - "max_volume": "1 L", - "draw_cost": 60, - "flags": [ "MAG_COMPACT" ] - }, - "flags": [ "STURDY", "OUTER" ] - }, - { - "id": "modularvesthard", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" }, - "description": "A Modular Bullet Resistant Vest. Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility. It has four pouches capable of carrying magazines.", - "weight": "14860 g", - "volume": "6 L", - "price": 39900, - "price_postapoc": 3500, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar", "hardsteel" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_cyan", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 25, - "storage": "1 L", - "warmth": 15, - "material_thickness": 5, - "use_action": { - "type": "holster", - "holster_prompt": "Stash ammo", - "holster_msg": "You stash your %s.", - "multi": 4, - "min_volume": "250 ml", - "max_volume": "1 L", - "draw_cost": 60, - "flags": [ "MAG_COMPACT" ] - }, - "flags": [ "STURDY", "OUTER" ] - }, - { - "id": "modularvestkevlar", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (Kevlar plates)", "str_pl": "MBR vests (Kevlar plates)" }, - "description": "A Modular Bullet Resistant Vest. Kevlar plates have been inserted to improve its protection. It has four pouches capable of carrying magazines.", - "weight": "5721 g", - "volume": "6 L", - "price": 39900, - "price_postapoc": 3000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar", "kevlar_rigid" ], - "symbol": "[", - "looks_like": "vest", - "color": "light_gray", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 12, - "storage": "1 L", - "warmth": 15, - "material_thickness": 6, - "use_action": { - "type": "holster", - "holster_prompt": "Stash ammo", - "holster_msg": "You stash your %s.", - "multi": 4, - "min_volume": "250 ml", - "max_volume": "1 L", - "draw_cost": 60, - "flags": [ "MAG_COMPACT" ] - }, - "flags": [ "STURDY", "OUTER" ] - }, - { - "id": "modularveststeel", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" }, - "description": "A Modular Bullet Resistant Vest. Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering. It has four pouches capable of carrying magazines.", - "weight": "10860 g", - "volume": "6 L", - "price": 39900, - "price_postapoc": 2500, - "to_hit": -3, - "bashing": 8, - "material": [ "kevlar", "steel" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_cyan", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 20, - "storage": "1 L", - "warmth": 15, - "material_thickness": 7, - "use_action": { - "type": "holster", - "holster_prompt": "Stash ammo", - "holster_msg": "You stash your %s.", - "multi": 4, - "min_volume": "250 ml", - "max_volume": "1 L", - "draw_cost": 60, - "flags": [ "MAG_COMPACT" ] - }, - "flags": [ "STURDY", "OUTER" ] - }, - { - "id": "modularvestsuper", - "type": "ARMOR", - "category": "armor", - "name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" }, - "description": "A Modular Bullet Resistant Vest. Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight. It has four pouches capable of carrying magazines.", - "weight": "6460 g", - "volume": "6 L", - "price": 80000, - "price_postapoc": 5000, - "to_hit": -3, - "bashing": 8, - "material": [ "kevlar", "superalloy" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_cyan", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 15, - "storage": "1 L", - "warmth": 15, - "material_thickness": 6, - "use_action": { - "type": "holster", - "holster_prompt": "Stash ammo", - "holster_msg": "You stash your %s.", - "multi": 4, - "min_volume": "250 ml", - "max_volume": "1 L", - "draw_cost": 60, - "flags": [ "MAG_COMPACT" ] - }, - "flags": [ "STURDY", "OUTER" ] - }, { "id": "quiver", "type": "ARMOR", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 22ec1c29e297b..3f353d2c57b44 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1984,5 +1984,209 @@ "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE" ], "freezing_point": -22, "fun": -15 + }, + { + "id": "modularvest", + "type": "ARMOR", + "category": "armor", + "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" }, + "description": "A Modular Bullet Resistant Vest. It has pouches for extra armor inserts, but without them provides little more protection over a regular vest. It has four pouches capable of carrying magazines.", + "weight": "2860 g", + "volume": "6 L", + "price": 29900, + "price_postapoc": 2000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 7, + "storage": "2500 ml", + "warmth": 15, + "material_thickness": 4, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": "250 ml", + "max_volume": "1 L", + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "modularvestceramic", + "type": "ARMOR", + "category": "armor", + "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" }, + "description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection. The ceramic plates cannot be repaired, only replaced. It has four pouches capable of carrying magazines.", + "weight": "4308 g", + "volume": "6 L", + "price": 39900, + "price_postapoc": 4000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "ceramic" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 15, + "storage": "1 L", + "warmth": 15, + "material_thickness": 9, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": "250 ml", + "max_volume": "1 L", + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "modularvesthard", + "type": "ARMOR", + "category": "armor", + "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" }, + "description": "A Modular Bullet Resistant Vest. Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility. It has four pouches capable of carrying magazines.", + "weight": "14860 g", + "volume": "6 L", + "price": 39900, + "price_postapoc": 3500, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "hardsteel" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_cyan", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 25, + "storage": "1 L", + "warmth": 15, + "material_thickness": 5, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": "250 ml", + "max_volume": "1 L", + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "modularvestkevlar", + "type": "ARMOR", + "category": "armor", + "name": { "str": "MBR vest (Kevlar plates)", "str_pl": "MBR vests (Kevlar plates)" }, + "description": "A Modular Bullet Resistant Vest. Kevlar plates have been inserted to improve its protection. It has four pouches capable of carrying magazines.", + "weight": "5721 g", + "volume": "6 L", + "price": 39900, + "price_postapoc": 3000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "kevlar_rigid" ], + "symbol": "[", + "looks_like": "vest", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 12, + "storage": "1 L", + "warmth": 15, + "material_thickness": 6, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": "250 ml", + "max_volume": "1 L", + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "modularveststeel", + "type": "ARMOR", + "category": "armor", + "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" }, + "description": "A Modular Bullet Resistant Vest. Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering. It has four pouches capable of carrying magazines.", + "weight": "10860 g", + "volume": "6 L", + "price": 39900, + "price_postapoc": 2500, + "to_hit": -3, + "bashing": 8, + "material": [ "kevlar", "steel" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_cyan", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 20, + "storage": "1 L", + "warmth": 15, + "material_thickness": 7, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": "250 ml", + "max_volume": "1 L", + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "modularvestsuper", + "type": "ARMOR", + "category": "armor", + "name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" }, + "description": "A Modular Bullet Resistant Vest. Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight. It has four pouches capable of carrying magazines.", + "weight": "6460 g", + "volume": "6 L", + "price": 80000, + "price_postapoc": 5000, + "to_hit": -3, + "bashing": 8, + "material": [ "kevlar", "superalloy" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_cyan", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 15, + "storage": "1 L", + "warmth": 15, + "material_thickness": 6, + "use_action": { + "type": "holster", + "holster_prompt": "Stash ammo", + "holster_msg": "You stash your %s.", + "multi": 4, + "min_volume": "250 ml", + "max_volume": "1 L", + "draw_cost": 60, + "flags": [ "MAG_COMPACT" ] + }, + "flags": [ "STURDY", "OUTER" ] } ] diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index e81bf3a13a23d..4abb8d3099882 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -41,9 +41,7 @@ { "item": "null", "prob": 10 }, { "item": "jacket_army", "prob": 50 }, { "item": "kevlar", "prob": 10 }, - { "item": "modularvest", "prob": 15 }, - { "item": "modularvestkevlar", "prob": 25 }, - { "item": "modularvestceramic", "prob": 25 } + { "item": "ballistic_vest_esapi", "prob": 25 } ] }, { diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 609959db1da90..386f64bb0daa2 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -285,7 +285,7 @@ [ "vest", 10 ], [ "vest_leather", 5 ], [ "kevlar", 10 ], - [ "modularvest", 5 ], + [ "ballistic_vest_esapi", 5 ], [ "waistcoat", 5 ], [ "flotation_vest", 10 ], [ "chainmail_vest", 5 ] @@ -793,7 +793,7 @@ [ "minispeargun", 1 ], [ "mintpatties", 3 ], [ "misc_repairkit", 5 ], - [ "modularvest", 1 ], + [ "ballistic_vest_empty", 1 ], [ "molasses", 3 ], [ "money_bundle", 10 ], [ "moonshine", 5 ], diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json index 40c278309cbe7..913e305681401 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json @@ -45,7 +45,8 @@ "id": "NC_SCAVENGER_MERC_worn", "subtype": "collection", "items": [ - { "item": "modularvestkevlar", "contents-group": "army_mags_m4" }, + { "item": "ballistic_vest_esapi" }, + { "item": "legpouch_large", "contents-group": "army_mags_m4" }, { "item": "boxer_briefs" }, { "item": "pants_army" }, { "item": "duster" }, diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json index 7c0a8ecf4f420..11f4061308b30 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json @@ -37,7 +37,7 @@ "id": "NC_ROBOFAC_MERC_1_worn", "subtype": "collection", "items": [ - { "item": "modularvestkevlar", "contents-group": "army_mags_m4" }, + { "item": "ballistic_vest_esapi" }, { "item": "chestrig", "contents-group": "army_mags_m4" }, { "item": "under_armor" }, { "item": "under_armor_shorts" }, diff --git a/data/json/npcs/robofac/NPC_robofac_generic_security.json b/data/json/npcs/robofac/NPC_robofac_generic_security.json index 3c4392502c166..817ba4c2ebb87 100644 --- a/data/json/npcs/robofac/NPC_robofac_generic_security.json +++ b/data/json/npcs/robofac/NPC_robofac_generic_security.json @@ -38,7 +38,7 @@ { "item": "under_armor_shorts" }, { "item": "robofac_jumpsuit" }, { "item": "tac_helmet" }, - { "item": "modularvestceramic" }, + { "item": "ballistic_vest_esapi" }, { "item": "gloves_tactical" }, { "item": "glasses_bal", "prob": 33 }, { "item": "boots_combat" }, diff --git a/data/json/professions.json b/data/json/professions.json index 100c805120b04..4bc575a948986 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -750,6 +750,7 @@ "pants_army", "undershirt", "jacket_army", + "ballistic_vest_esapi", "helmet_army", "mask_ski", "gloves_liner", @@ -761,7 +762,7 @@ ], "entries": [ { "group": "charged_two_way_radio" }, - { "item": "modularvest", "contents-group": "army_mags_m4" }, + { "item": "legpouch_large", "contents-group": "army_mags_m4" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight" ] } @@ -1976,7 +1977,8 @@ "charges": 30, "contents-item": [ "shoulder_strap", "acog_scope" ] }, - { "item": "modularvestceramic", "contents-group": "army_mags_m4" } + { "item": "ballistic_vest_esapi" }, + { "item": "legpouch_large", "contents-group": "army_mags_m4" } ] }, "male": [ "boxer_shorts" ], diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index a769d54fa514f..1aaed6df39e1f 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -478,7 +478,7 @@ "using": [ [ "sewing_standard", 100 ] ], "components": [ [ [ "pants_army", 1 ], [ "pants_cargo", 1 ], [ "shorts_cargo", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar", 1 ], [ "kevlar_plate", 12 ] ], [ [ "rag", 12 ] ], [ [ "tacvest", 1 ], diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index d4dcd0a6d8b8c..a4295f4551334 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -14,7 +14,7 @@ "components": [ [ [ "cleansuit", 1 ] ], [ [ "duct_tape", 600 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ], [ [ "plastic_sheet", 1 ] ] ] }, @@ -255,7 +255,7 @@ [ [ "fanny", 2 ], [ "dump_pouch", 1 ] ], [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], [ [ "pants_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -426,7 +426,7 @@ [ [ "nomex", 40 ] ], [ [ "kevlar_plate", 8 ] ], [ [ "duct_tape", 200 ], [ "superglue", 5 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -458,7 +458,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 200 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -501,7 +501,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -533,7 +533,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -612,7 +612,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 200 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -668,7 +668,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -812,7 +812,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -844,7 +844,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 48 ] ] + [ [ "kevlar", 2 ], [ "ballistic_vest_empty", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 48 ] ] ] }, { @@ -876,7 +876,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 42 ] ] + [ [ "kevlar", 2 ], [ "ballistic_vest_empty", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 42 ] ] ] }, { diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 98a3300132187..3c051cf2a27e0 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -292,7 +292,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 16 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 16 ] ], [ [ "rag", 19 ] ], [ [ "tacvest", 1 ], @@ -488,7 +488,7 @@ [ "fanny", 1 ] ], [ [ "duct_tape", 150 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 16 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 16 ] ] ] }, { @@ -504,85 +504,6 @@ "components": [ [ [ "ballistic_vest_empty", 1 ] ], [ [ "esapi_plate", 2 ] ], [ [ "esbi_plate", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, - { - "result": "modularvest", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "difficulty": 4, - "time": "30 m", - "reversible": true, - "decomp_learn": 4, - "autolearn": true, - "using": [ [ "sewing_standard", 30 ] ], - "components": [ [ [ "kevlar_plate", 24 ] ] ] - }, - { - "result": "modularvestceramic", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "ceramic_armor", 4 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularvesthard", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "hard_steel_armor", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularvestkevlar", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "kevlar_plate", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularveststeel", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "steel_armor", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularvestsuper", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "alloy_sheet", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, { "result": "dragonskin", "type": "recipe", @@ -777,7 +698,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "sleeveless_duster", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 13 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 13 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], @@ -922,7 +843,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "sleeveless_trenchcoat", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 10 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 10 ] ], [ [ "rag", 11 ] ], [ [ "tacvest", 1 ], @@ -1104,7 +1025,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 12 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index bb65ead165aba..a317ae43b8cdc 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2394,5 +2394,35 @@ "result": "plastic_chunk", "id_suffix": "from_cash_cards", "obsolete": true + }, + { + "type": "recipe", + "result": "modularvest", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestsuper", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularveststeel", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestkevlar", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvesthard", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestceramic", + "obsolete": true } ] diff --git a/data/json/vehicles/helicopters.json b/data/json/vehicles/helicopters.json index 6125d6c4ea9aa..f9769e43c3c80 100644 --- a/data/json/vehicles/helicopters.json +++ b/data/json/vehicles/helicopters.json @@ -1913,8 +1913,7 @@ { "x": -7, "y": 2, "chance": 10, "items": [ "9mmfmj" ] }, { "x": -7, "y": 2, "chance": 20, "ammo": 80, "items": [ "mask_gas" ] }, { "x": -7, "y": 2, "chance": 10, "items": [ "flashlight" ] }, - { "x": -7, "y": 2, "chance": 7, "items": [ "modularvest" ] }, - { "x": -6, "y": 1, "chance": 7, "items": [ "modularvestkevlar" ] }, + { "x": -7, "y": 2, "chance": 7, "items": [ "ballistic_vest_empty" ] }, { "x": -4, "y": -1, "chance": 7, "ammo": 80, "items": [ "mp3" ] }, { "x": -2, "y": 1, "chance": 7, "items": [ "screwdriver" ] }, { "x": -2, "y": 1, "chance": 10, "items": [ "mag_fieldrepair" ] }, @@ -2354,9 +2353,8 @@ { "x": -7, "y": 2, "chance": 10, "items": [ "9mmfmj" ] }, { "x": -7, "y": 2, "chance": 20, "ammo": 80, "items": [ "mask_gas" ] }, { "x": -7, "y": 2, "chance": 10, "items": [ "flashlight" ] }, - { "x": -7, "y": 2, "chance": 7, "items": [ "modularvest" ] }, + { "x": -7, "y": 2, "chance": 7, "items": [ "ballistic_vest_empty" ] }, { "x": -6, "y": -1, "chance": 20, "item_groups": [ "remains_soldier" ] }, - { "x": -6, "y": 1, "chance": 7, "items": [ "modularvestkevlar" ] }, { "x": -5, "y": 1, "chance": 20, "item_groups": [ "remains_soldier" ] }, { "x": -4, "y": -1, "chance": 7, "ammo": 80, "items": [ "mp3" ] }, { "x": -2, "y": -1, "chance": 7, "items": [ "aspirin" ] }, @@ -2730,9 +2728,8 @@ { "x": -7, "y": 2, "chance": 10, "items": [ "9mmfmj" ] }, { "x": -7, "y": 2, "chance": 20, "ammo": 80, "items": [ "mask_gas" ] }, { "x": -7, "y": 2, "chance": 10, "items": [ "flashlight" ] }, - { "x": -7, "y": 2, "chance": 7, "items": [ "modularvest" ] }, + { "x": -7, "y": 2, "chance": 7, "items": [ "ballistic_vest_empty" ] }, { "x": -6, "y": -1, "chance": 20, "item_groups": [ "remains_soldier" ] }, - { "x": -6, "y": 1, "chance": 7, "items": [ "modularvestkevlar" ] }, { "x": -5, "y": 1, "chance": 20, "item_groups": [ "remains_soldier" ] }, { "x": -4, "y": -1, "chance": 7, "ammo": 80, "items": [ "mp3" ] }, { "x": -2, "y": 1, "chance": 7, "items": [ "screwdriver" ] }, From 3f8c6541687ca7ef2b4f632b40327237ac198366 Mon Sep 17 00:00:00 2001 From: Eric Pierce Date: Wed, 15 Apr 2020 16:49:37 -0600 Subject: [PATCH 27/45] Remove table buff/debuff for medicine --- src/consumption.cpp | 3 +- tests/modify_morale_test.cpp | 73 +++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index dfc93306432ed..9b65cff4cb705 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -1102,7 +1102,8 @@ void Character::modify_morale( item &food, const int nutr ) // Morale bonus for eating unspoiled food with chair/table nearby // Does not apply to non-ingested consumables like bandages or drugs - if( !food.rotten() && !food.has_flag( flag_ALLERGEN_JUNK ) && !food.has_flag( "NO_INGEST" ) ) { + if( !food.rotten() && !food.has_flag( flag_ALLERGEN_JUNK ) && !food.has_flag( "NO_INGEST" ) && + food.get_comestible()->comesttype != "MED" ) { if( g->m.has_nearby_chair( pos(), 1 ) && g->m.has_nearby_table( pos(), 1 ) ) { if( has_trait( trait_TABLEMANNERS ) ) { rem_morale( MORALE_ATE_WITHOUT_TABLE ); diff --git a/tests/modify_morale_test.cpp b/tests/modify_morale_test.cpp index d00a2dd8e7d79..29c64acf6ece4 100644 --- a/tests/modify_morale_test.cpp +++ b/tests/modify_morale_test.cpp @@ -87,11 +87,24 @@ TEST_CASE( "dining with table and chair", "[food][modify_morale][table][chair]" REQUIRE( bread.is_fresh() ); REQUIRE_FALSE( bread.has_flag( flag_ALLERGEN_JUNK ) ); - // Table/chair morale effects should not apply to non-ingestibles - item bandage( "bandages" ); - item cig( "cig" ); - REQUIRE( bandage.has_flag( "NO_INGEST" ) ); - REQUIRE( cig.has_flag( "NO_INGEST" ) ); + // Much of the below code is to support the "Rigid Table Manners" trait, notoriously prone to + // causing unexpected morale effects from bandages, aspirin, cigs etc. (#38698, #39580) + // Table-related morale effects should not apply to any of the following items: + const std::vector no_table_eating_bonus = { + { + "aspirin", + "bandages", + "caffeine", + "cig", + "codeine", + "crack", + "dayquil", + "disinfectant", + "joint", + "oxycodone", + "weed" + } + }; GIVEN( "no table or chair are nearby" ) { REQUIRE_FALSE( g->m.has_nearby_table( dummy.pos(), 1 ) ); @@ -111,23 +124,20 @@ TEST_CASE( "dining with table and chair", "[food][modify_morale][table][chair]" dummy.toggle_trait( trait_TABLEMANNERS ); REQUIRE( dummy.has_trait( trait_TABLEMANNERS ) ); - THEN( "they get a morale penalty for eating without a table" ) { + THEN( "they get a morale penalty for eating food without a table" ) { dummy.clear_morale(); dummy.modify_morale( bread ); CHECK( dummy.has_morale( MORALE_ATE_WITHOUT_TABLE ) <= -2 ); } - THEN( "they do not get a morale penalty for applying a bandage without a table" ) { - // Regression test for #38698 - dummy.clear_morale(); - dummy.modify_morale( bandage ); - CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITHOUT_TABLE ) ); - } + for( std::string item_name : no_table_eating_bonus ) { + item test_item( item_name ); - THEN( "they do not get a morale penalty for smoking a cigarette without a table" ) { - dummy.clear_morale(); - dummy.modify_morale( cig ); - CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITHOUT_TABLE ) ); + THEN( "they get no morale penalty for using " + item_name + " at a table" ) { + dummy.clear_morale(); + dummy.modify_morale( test_item ); + CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITHOUT_TABLE ) ); + } } } } @@ -146,6 +156,16 @@ TEST_CASE( "dining with table and chair", "[food][modify_morale][table][chair]" dummy.modify_morale( bread ); CHECK( dummy.has_morale( MORALE_ATE_WITH_TABLE ) >= 1 ); } + + for( std::string item_name : no_table_eating_bonus ) { + item test_item( item_name ); + + THEN( "they get no morale bonus for using " + item_name + " at a table" ) { + dummy.clear_morale(); + dummy.modify_morale( test_item ); + CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITH_TABLE ) ); + } + } } AND_GIVEN( "character has strict table manners" ) { @@ -158,17 +178,14 @@ TEST_CASE( "dining with table and chair", "[food][modify_morale][table][chair]" CHECK( dummy.has_morale( MORALE_ATE_WITH_TABLE ) >= 3 ); } - THEN( "they do not get a morale bonus for applying a bandage with a table" ) { - // Regression test for #38698 - dummy.clear_morale(); - dummy.modify_morale( bandage ); - CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITH_TABLE ) ); - } + for( std::string item_name : no_table_eating_bonus ) { + item test_item( item_name ); - THEN( "they do not get a morale bonus for smoking a cigarette with a table" ) { - dummy.clear_morale(); - dummy.modify_morale( cig ); - CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITH_TABLE ) ); + THEN( "they get no morale bonus for using " + item_name + " at a table" ) { + dummy.clear_morale(); + dummy.modify_morale( test_item ); + CHECK_FALSE( dummy.has_morale( MORALE_ATE_WITH_TABLE ) ); + } } } } @@ -205,12 +222,14 @@ TEST_CASE( "eating hot food", "[food][modify_morale][hot]" ) } } + TEST_CASE( "drugs", "[food][modify_morale][drug]" ) { avatar dummy; std::pair fun; - std::vector drugs_to_test = { + + const std::vector drugs_to_test = { { "gum", "caff_gum", From 63170e9594dddc54f0b8a5884800160c031adaf1 Mon Sep 17 00:00:00 2001 From: Qrox Date: Fri, 17 Apr 2020 01:13:57 +0800 Subject: [PATCH 28/45] Add documentation on interface accessibility --- doc/ACCESSIBILITY.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 doc/ACCESSIBILITY.md diff --git a/doc/ACCESSIBILITY.md b/doc/ACCESSIBILITY.md new file mode 100644 index 0000000000000..5a4c511464d81 --- /dev/null +++ b/doc/ACCESSIBILITY.md @@ -0,0 +1,39 @@ +### Compatibility with screen readers + +There are people who uses screen readers to play Cataclysm DDA. In order for screen +readers to announce the most important information in a UI, the terminal cursor has +to be placed at the correct location. This information may be text such as selected +item names in a list, etc, and the cursor has to be placed exactly at the beginning +of the text for screen readers to announce it. + +`wmove` in `output.h|cpp` is the function to move the cursor to a specific location. +After calling `wmove` with the target `catacurses::window` and cursor position, +`wrefresh` needs to be called immediately afterwards for `wmove` to take effect. + +Here is an example of placing the cursor explicitly at the beginning of a piece +of text: + +```cpp +catacurses::window win = ...; // target window + +... + +// display code +point cursor_position = ...; // default cursor position + +... + +cursor_position = point_zero; // record the start position of the text +fold_and_print( win, cursor_position, getmaxx( win ), c_white, _( "This text is important" ) ); + +... + +// at the end of display code +wmove( win, cursor_position ); +wrefresh( win ); +// no output code should follow as they might change the cursor position +``` + +As shown in the above example, it is preferable to record the intended cursor +position in a variable when the text is printed, and move the cursor later using +the variable to ensure consisitency. From 3d90ccc4f7e6eb2242fd0e99601f68923732072c Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Thu, 16 Apr 2020 22:59:11 +0200 Subject: [PATCH 29/45] more prices --- data/json/items/corpses/inactive_bots.json | 32 ++++++++++++++++++-- data/json/items/generic/bathroom_house.json | 4 +-- data/json/items/generic/bedding.json | 5 +++ data/json/items/generic/casing.json | 1 + data/json/items/generic/spares.json | 27 +++++++++++------ data/json/items/generic/storage.json | 1 + data/json/items/generic/string.json | 1 + data/json/items/generic/toys_and_sports.json | 11 +++++++ data/json/items/gunmod/accessories.json | 5 +++ data/json/items/gunmod/barrel.json | 2 ++ data/json/items/gunmod/bionicmods.json | 1 + data/json/items/gunmod/brass_catcher.json | 1 + data/json/items/gunmod/conversions.json | 1 + data/json/items/gunmod/grip.json | 3 ++ data/json/items/gunmod/laser_gunmods.json | 5 +++ data/json/items/gunmod/loading_port.json | 1 + data/json/items/gunmod/mechanism.json | 4 +++ data/json/items/gunmod/mount.json | 7 +++++ data/json/items/gunmod/muzzle.json | 9 ++++++ data/json/items/gunmod/rail.json | 4 +++ data/json/items/gunmod/sights.json | 11 +++++++ data/json/items/gunmod/sling.json | 1 + data/json/items/gunmod/stock.json | 6 ++++ data/json/items/gunmod/underbarrel.json | 18 +++++++++++ 24 files changed, 148 insertions(+), 13 deletions(-) diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 1c8ce6d575dcd..e366fea6c3d7d 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -7,6 +7,7 @@ "weight": "4700 g", "volume": "750 ml", "price": 64500, + "price_postapoc": 3000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -33,6 +34,7 @@ "weight": "5870 g", "volume": "250 ml", "price": 67500, + "price_postapoc": 3000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -59,6 +61,7 @@ "weight": "4536 g", "volume": "750 ml", "price": 59500, + "price_postapoc": 500, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -85,6 +88,7 @@ "weight": "5360 g", "volume": "750 ml", "price": 60500, + "price_postapoc": 500, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -111,6 +115,7 @@ "weight": "4480 g", "volume": "250 ml", "price": 60000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -137,6 +142,7 @@ "weight": "40750 g", "volume": "30 L", "price": 600000, + "price_postapoc": 12000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -159,6 +165,7 @@ "weight": "172 kg", "volume": "30 L", "price": 500500, + "price_postapoc": 8000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -181,6 +188,7 @@ "weight": "5400 g", "volume": "750 ml", "price": 60000, + "price_postapoc": 500, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -207,6 +215,7 @@ "weight": "25000 g", "volume": "18750 ml", "price": 2677500, + "price_postapoc": 10000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -234,6 +243,7 @@ "volume": "30 L", "price": 500000, "to_hit": -3, + "price_postapoc": 5000, "bashing": 8, "material": [ "steel", "plastic" ], "symbol": ";", @@ -255,6 +265,7 @@ "weight": "172 kg", "volume": "30 L", "price": 500000, + "price_postapoc": 6000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -277,6 +288,7 @@ "weight": "125000 g", "volume": "60 L", "price": 200500, + "price_postapoc": 2000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -299,6 +311,7 @@ "weight": "40750 g", "volume": "30 L", "price": 400000, + "price_postapoc": 3000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -321,6 +334,7 @@ "weight": "40750 g", "volume": "30 L", "price": 750000, + "price_postapoc": 4000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -345,6 +359,7 @@ "weight": "40750 g", "volume": "30 L", "price": 750000, + "price_postapoc": 3000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -369,6 +384,7 @@ "volume": "62500 ml", "weight": "81500 g", "price": 750000, + "price_postapoc": 2000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -393,6 +409,7 @@ "volume": "62500 ml", "weight": "81500 g", "price": 750000, + "price_postapoc": 250, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -417,6 +434,7 @@ "volume": "62500 ml", "weight": "81500 g", "price": 750000, + "price_postapoc": 100, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -442,6 +460,7 @@ "volume": "62500 ml", "//": "It is a disgusting mass of rotting flesh and jagged metal pieces, no one will buy it.", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 8, "material": [ "steel", "flesh" ], @@ -468,6 +487,7 @@ "volume": "62500 ml", "//": "It is an affront to humanity, no one will buy it.", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 8, "material": [ "steel", "flesh" ], @@ -494,6 +514,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 100000, + "price_postapoc": 500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -520,6 +541,7 @@ "weight": "40750 g", "volume": "30 L", "price": 10000, + "price_postapoc": 500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -545,6 +567,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 10000, + "price_postapoc": 500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -571,6 +594,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 25000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -597,6 +621,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 35000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -623,6 +648,7 @@ "weight": "40750 g", "volume": "30 L", "price": 80000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -649,6 +675,7 @@ "weight": "100000 g", "volume": "65000 ml", "price": 80000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -674,6 +701,7 @@ "weight": "120000 g", "volume": "92500 ml", "price": 500000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -699,7 +727,7 @@ "volume": "95 L", "weight": "250 kg", "price": 10000000, - "price_postapoc": 100000, + "price_postapoc": 10000, "to_hit": -3, "bashing": 6, "material": [ "steel" ], @@ -724,7 +752,7 @@ "volume": "95 L", "weight": "300 kg", "price": 100000000, - "price_postapoc": 500000, + "price_postapoc": 25000, "to_hit": -3, "bashing": 6, "material": [ "steel" ], diff --git a/data/json/items/generic/bathroom_house.json b/data/json/items/generic/bathroom_house.json index 7de5093cd91c4..de118f4703746 100644 --- a/data/json/items/generic/bathroom_house.json +++ b/data/json/items/generic/bathroom_house.json @@ -30,7 +30,7 @@ "symbol": "t", "copy-from": "base_toiletries", "price": 800, - "price_postapoc": 1200, + "price_postapoc": 500, "//": "the end of the world doesn't mean everyone is okay with having ZZ Top beards. disposable razors are a hot commodity. The razor also loses the Cutting 1 quality. Don't ask how we confirmed this.", "weight": "110 g", "material": [ "plastic", "steel" ], @@ -125,7 +125,7 @@ "symbol": "p", "color": "red", "price": 800, - "price_postapoc": 50, + "price_postapoc": 10, "weight": "590 g", "volume": "2100 ml", "//": "the volume is pretty bulky, but this is an old fashioned model.", diff --git a/data/json/items/generic/bedding.json b/data/json/items/generic/bedding.json index 17e67cba8d9d3..d92aa43526505 100644 --- a/data/json/items/generic/bedding.json +++ b/data/json/items/generic/bedding.json @@ -7,6 +7,7 @@ "weight": "771 g", "volume": "5 L", "price": 2000, + "price_postapoc": 50, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -27,6 +28,7 @@ "weight": "1123 g", "volume": "15 L", "price": 5500, + "price_postapoc": 50, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -48,6 +50,7 @@ "weight": "3500 g", "volume": "31 L", "price": 5500, + "price_postapoc": 150, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -69,6 +72,7 @@ "weight": "3500 g", "volume": "31 L", "price": 19500, + "price_postapoc": 250, "to_hit": -1, "material": [ "cotton", "fur" ], "symbol": "[", @@ -90,6 +94,7 @@ "weight": "1600 g", "volume": "14 L", "price": 20500, + "price_postapoc": 500, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index 729d87acf6e8f..510b4ba9c1f4a 100644 --- a/data/json/items/generic/casing.json +++ b/data/json/items/generic/casing.json @@ -34,6 +34,7 @@ "type": "GENERIC", "category": "spare_parts", "price": 100, + "price_postapoc": 0, "name": { "str": "unused .22 casing" }, "symbol": "=", "color": "yellow", diff --git a/data/json/items/generic/spares.json b/data/json/items/generic/spares.json index 7eb53acd56aa3..bd47aa388a24a 100644 --- a/data/json/items/generic/spares.json +++ b/data/json/items/generic/spares.json @@ -17,7 +17,8 @@ "material": [ "plastic", "steel" ], "weight": "850 g", "volume": "500 ml", - "price": 1200 + "price": 1200, + "price_postapoc": 500 }, { "id": "drivebelt_makeshift", @@ -28,7 +29,8 @@ "material": [ "cotton", "leather" ], "weight": "1250 g", "volume": "750 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "id": "filter_air", @@ -39,7 +41,8 @@ "material": [ "plastic", "paper" ], "weight": "360 g", "volume": "500 ml", - "price": 1900 + "price": 1900, + "price_postapoc": 200 }, { "id": "filter_air_makeshift", @@ -50,7 +53,8 @@ "material": [ "plastic", "paper" ], "weight": "480 g", "volume": "750 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "id": "filter_liquid", @@ -61,7 +65,8 @@ "material": [ "steel", "paper" ], "weight": "480 g", "volume": "500 ml", - "price": 1900 + "price": 1900, + "price_postapoc": 250 }, { "id": "filter_liquid_makeshift", @@ -72,7 +77,8 @@ "material": [ "steel", "paper" ], "weight": "690 g", "volume": "750 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "id": "glowplug", @@ -83,7 +89,8 @@ "material": [ "plastic", "copper" ], "weight": "260 g", "volume": "250 ml", - "price": 2300 + "price": 2300, + "price_postapoc": 500 }, { "id": "pump_complex", @@ -94,7 +101,8 @@ "material": "iron", "weight": "2800 g", "volume": "1250 ml", - "price": 28900 + "price": 28900, + "price_postapoc": 750 }, { "id": "well_pump", @@ -105,6 +113,7 @@ "material": "iron", "weight": "2400 g", "volume": "1 L", - "price": 1800 + "price": 1800, + "price_postapoc": 500 } ] diff --git a/data/json/items/generic/storage.json b/data/json/items/generic/storage.json index 87f93e39c79f8..44211962c1242 100644 --- a/data/json/items/generic/storage.json +++ b/data/json/items/generic/storage.json @@ -7,6 +7,7 @@ "weight": "100 g", "volume": "150 ml", "price": 100, + "price_postapoc": 0, "material": [ "plastic", "steel" ], "symbol": ";", "color": "brown" diff --git a/data/json/items/generic/string.json b/data/json/items/generic/string.json index d8d5ab3f8a9fe..718999993696a 100644 --- a/data/json/items/generic/string.json +++ b/data/json/items/generic/string.json @@ -26,6 +26,7 @@ "weight": "6 g", "volume": "10ml", "price": 10, + "price_postapoc": 10, "material": "cotton", "symbol": ",", "color": "light_gray", diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index c4148a7296a1a..7e319259ff626 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -7,6 +7,7 @@ "weight": "907 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 0, "to_hit": -1, "material": "plastic", "symbol": "|", @@ -39,6 +40,7 @@ "weight": "907 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 0, "to_hit": -1, "material": "plastic", "symbol": "|", @@ -72,6 +74,7 @@ "weight": "3 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 0, "material": "wood", "symbol": "-", "color": "white" @@ -85,6 +88,7 @@ "weight": "50 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 0, "material": "plastic", "symbol": "*", "color": "white", @@ -116,6 +120,7 @@ "description": "A large, heavy ball. Before the apocalypse, its main purpose was to be rolled along waxed floors.", "category": "other", "price": 3000, + "price_postapoc": 10, "material": "ceramic", "weight": "2000 g", "volume": "2500 ml", @@ -131,6 +136,7 @@ "category": "other", "description": "A baseball, good for throwing at enemies. Getting hit with one of these hurts a lot more than you might think.", "price": 1000, + "price_postapoc": 0, "material": "leather", "weight": "150 g", "volume": "250 ml", @@ -146,6 +152,7 @@ "category": "other", "description": "An oval made of leather and string, it's easily thrown but does little damage. You could take it apart into leather if you wanted.", "price": 1000, + "price_postapoc": 10, "material": "leather", "weight": "400 g", "volume": "750 ml", @@ -161,6 +168,7 @@ "category": "other", "description": "A high-quality indoor basketball. You may throw it at zombies.", "price": 1200, + "price_postapoc": 10, "material": "leather", "weight": "800 g", "volume": "1 L", @@ -176,6 +184,7 @@ "category": "other", "description": "A standard regulation volleyball.", "price": 1000, + "price_postapoc": 10, "material": "leather", "weight": "260 g", "volume": "1 L", @@ -191,6 +200,7 @@ "category": "other", "description": "A brightly colored beach volleyball. It is slightly larger than a regular white one.", "price": 1200, + "price_postapoc": 10, "material": "leather", "weight": "280 g", "volume": "1 L", @@ -206,6 +216,7 @@ "category": "other", "description": "A heavy circular block of solid rubber, normally used for playing hockey. You can throw it to cause some serious harm.", "price": 1000, + "price_postapoc": 0, "material": "plastic", "weight": "170 g", "volume": "250 ml", diff --git a/data/json/items/gunmod/accessories.json b/data/json/items/gunmod/accessories.json index 7a67d9e7ffe53..35d7fad905599 100644 --- a/data/json/items/gunmod/accessories.json +++ b/data/json/items/gunmod/accessories.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 4000, + "price_postapoc": 250, "material": [ "plastic", "aluminum" ], "symbol": ":", "color": "dark_gray", @@ -24,6 +25,7 @@ "weight": "88 g", "volume": "500 ml", "price": 4000, + "price_postapoc": 500, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "brown", @@ -41,6 +43,7 @@ "weight": "300 g", "volume": "500 ml", "price": 15000, + "price_postapoc": 750, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "brown", @@ -59,6 +62,7 @@ "weight": "50 g", "volume": "250 ml", "price": 500, + "price_postapoc": 250, "material": [ "plastic" ], "symbol": ":", "color": "brown", @@ -78,6 +82,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 2000, + "price_postapoc": 50, "material": "steel", "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/barrel.json b/data/json/items/gunmod/barrel.json index 57de0ed937740..080d415e57c6c 100644 --- a/data/json/items/gunmod/barrel.json +++ b/data/json/items/gunmod/barrel.json @@ -6,6 +6,7 @@ "description": "A shortened barrel results in markedly reduced accuracy, and a minor increase in noise, but also greatly improves the ease with which the weapon can be carried and wielded.", "volume": "0 ml", "price": 12000, + "price_postapoc": 250, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -23,6 +24,7 @@ "weight": "450 g", "volume": "500 ml", "price": 20000, + "price_postapoc": 0, "bashing": 5, "material": [ "steel" ], "symbol": ":", diff --git a/data/json/items/gunmod/bionicmods.json b/data/json/items/gunmod/bionicmods.json index bcb02d997a400..91d16c74821c1 100644 --- a/data/json/items/gunmod/bionicmods.json +++ b/data/json/items/gunmod/bionicmods.json @@ -7,6 +7,7 @@ "weight": "1 g", "volume": "0 ml", "price": 85000, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", diff --git a/data/json/items/gunmod/brass_catcher.json b/data/json/items/gunmod/brass_catcher.json index de1dbf3cd58cc..4e71dbf363ee0 100644 --- a/data/json/items/gunmod/brass_catcher.json +++ b/data/json/items/gunmod/brass_catcher.json @@ -7,6 +7,7 @@ "weight": "114 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 50, "material": [ "cotton" ], "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json index 0881b4320b1ff..484d615fa9c13 100644 --- a/data/json/items/gunmod/conversions.json +++ b/data/json/items/gunmod/conversions.json @@ -9,6 +9,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 50000, + "price_postapoc": 1000, "material": "steel", "symbol": ":", "color": "green", diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json index 9a48f6d11a132..5b2fb0b915d6f 100644 --- a/data/json/items/gunmod/grip.json +++ b/data/json/items/gunmod/grip.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 48000, + "price_postapoc": 750, "material": [ "plastic" ], "symbol": ":", "color": "dark_gray", @@ -28,6 +29,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 38000, + "price_postapoc": 750, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", @@ -46,6 +48,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 38000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/laser_gunmods.json b/data/json/items/gunmod/laser_gunmods.json index f1aca26e0474c..7ce7b3c476218 100644 --- a/data/json/items/gunmod/laser_gunmods.json +++ b/data/json/items/gunmod/laser_gunmods.json @@ -7,6 +7,7 @@ "weight": "380 g", "volume": "250 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "380 g", "volume": "250 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -43,6 +45,7 @@ "weight": "380 g", "volume": "1 L", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -63,6 +66,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -80,6 +84,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/loading_port.json b/data/json/items/gunmod/loading_port.json index f513145be08a0..dc8e14cafa6bc 100644 --- a/data/json/items/gunmod/loading_port.json +++ b/data/json/items/gunmod/loading_port.json @@ -8,6 +8,7 @@ "volume": "149 ml", "integral_volume": "149 ml", "price": 15700, + "price_postapoc": 250, "install_time": "8 m", "material": "aluminum", "symbol": ":", diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index beb86f137e5cc..2e6556bc7bfb9 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -9,6 +9,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 1500, + "price_postapoc": 500, "material": [ "steel", "superalloy" ], "symbol": ":", "color": "dark_gray", @@ -28,6 +29,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 65000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "red", @@ -49,6 +51,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 24000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "red", @@ -73,6 +76,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 50000, + "price_postapoc": 750, "material": [ "plastic" ], "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/mount.json b/data/json/items/gunmod/mount.json index d06cfb3831599..12a7655816121 100644 --- a/data/json/items/gunmod/mount.json +++ b/data/json/items/gunmod/mount.json @@ -8,6 +8,7 @@ "volume": "50 ml", "integral_volume": "0 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -26,6 +27,7 @@ "weight": "10 g", "volume": "8 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -44,6 +46,7 @@ "weight": "10 g", "volume": "8 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -62,6 +65,7 @@ "weight": "60 g", "volume": "80 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -80,6 +84,7 @@ "weight": "60 g", "volume": "80 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -99,6 +104,7 @@ "volume": "50 ml", "integral_volume": "0 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -117,6 +123,7 @@ "weight": "10 g", "volume": "8 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/muzzle.json b/data/json/items/gunmod/muzzle.json index 306394b3ea649..7364de1babd42 100644 --- a/data/json/items/gunmod/muzzle.json +++ b/data/json/items/gunmod/muzzle.json @@ -8,6 +8,7 @@ "integral_weight": "0 g", "volume": "0 ml", "price": 72000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -26,6 +27,7 @@ "weight": "380 g", "volume": "250 ml", "price": 84000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -52,6 +54,7 @@ "weight": "880 g", "volume": "750 ml", "price": 480, + "price_postapoc": 250, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -75,6 +78,7 @@ "weight": "880 g", "volume": "750 ml", "price": 480, + "price_postapoc": 250, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -97,6 +101,7 @@ "weight": "202 g", "volume": "2 L", "price": 480, + "price_postapoc": 10, "material": [ "plastic" ], "symbol": ":", "color": "cyan", @@ -118,6 +123,7 @@ "weight": "0 g", "volume": "0 ml", "price": 0, + "price_postapoc": 1500, "material": [ "superalloy", "ceramic" ], "mod_targets": [ "rifle" ], "handling_modifier": 0, @@ -133,6 +139,7 @@ "weight": "968 g", "volume": "1286 ml", "price": 140000, + "price_postapoc": 2000, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -156,6 +163,7 @@ "weight": "490 g", "volume": "247 ml", "price": 77000, + "price_postapoc": 1500, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -195,6 +203,7 @@ "//": "SilencerCo Omega 45K", "volume": "179 ml", "price": 78000, + "price_postapoc": 1500, "material": "steel", "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index e39e843939db3..e81908143eb89 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -7,6 +7,7 @@ "weight": "1450 g", "volume": "500 ml", "price": 50000, + "price_postapoc": 1500, "material": [ "steel", "wood" ], "symbol": ":", "color": "light_red", @@ -61,6 +62,7 @@ "weight": "40 g", "volume": "125ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -86,6 +88,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 12000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -104,6 +107,7 @@ "volume": "750 ml", "integral_volume": "500 ml", "price": 68000, + "price_postapoc": 750, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "blue", diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index 4069a2c333fb1..ef5b1da7ab228 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 5000, + "price_postapoc": 500, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "dark_gray", @@ -26,6 +27,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 3000, + "price_postapoc": 100, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "dark_gray", @@ -43,6 +45,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 20000, + "price_postapoc": 750, "material": [ "aluminum", "plastic", "glass" ], "symbol": ":", "color": "dark_gray", @@ -62,6 +65,7 @@ "weight": "255 g", "volume": "335 ml", "price": 68000, + "price_postapoc": 750, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -82,6 +86,7 @@ "integral_volume": 0, "integral_weight": 0, "price": 72000, + "price_postapoc": 250, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", @@ -100,6 +105,7 @@ "weight": "212 g", "volume": "250 ml", "price": 54000, + "price_postapoc": 500, "material": [ "aluminum", "glass" ], "symbol": ":", "color": "dark_gray", @@ -119,6 +125,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 68000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -138,6 +145,7 @@ "weight": "669 g", "volume": "435 ml", "price": 68000, + "price_postapoc": 750, "material": [ "aluminum", "glass" ], "symbol": ":", "color": "dark_gray", @@ -165,6 +173,7 @@ "weight": "280 g", "volume": "112 ml", "price": 68000, + "price_postapoc": 750, "material": [ "aluminum", "glass" ], "symbol": ":", "color": "dark_gray", @@ -205,6 +214,7 @@ "weight": "300 g", "volume": "250 ml", "price": 30000, + "price_postapoc": 250, "material": [ "plastic", "steel", "glass" ], "symbol": ":", "color": "dark_gray", @@ -226,6 +236,7 @@ "weight": "220 g", "volume": "250 ml", "price": 27000, + "price_postapoc": 500, "material": [ "plastic", "steel", "glass" ], "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/sling.json b/data/json/items/gunmod/sling.json index c90f809627874..4a3c1834a6d24 100644 --- a/data/json/items/gunmod/sling.json +++ b/data/json/items/gunmod/sling.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "250 ml", "price": 480, + "price_postapoc": 10, "material": "cotton", "symbol": ":", "color": "green", diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json index a49377196f865..c3174daf5b775 100644 --- a/data/json/items/gunmod/stock.json +++ b/data/json/items/gunmod/stock.json @@ -9,6 +9,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 38000, + "price_postapoc": 500, "to_hit": 1, "bashing": 6, "material": [ "plastic", "steel" ], @@ -29,6 +30,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 42000, + "price_postapoc": 250, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -47,6 +49,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 30000, + "price_postapoc": 250, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", @@ -64,6 +67,7 @@ "weight": "350 g", "volume": "500 ml", "price": 38000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -82,6 +86,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 400, + "price_postapoc": 500, "to_hit": 1, "bashing": 6, "material": [ "plastic", "steel" ], @@ -101,6 +106,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 4500, + "price_postapoc": 500, "to_hit": 1, "bashing": 2, "material": [ "plastic", "steel" ], diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index fd73f2c267572..e15125307443c 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -7,6 +7,7 @@ "weight": "400 g", "volume": "500 ml", "price": 68000, + "price_postapoc": 500, "to_hit": -1, "bashing": 10, "material": "steel", @@ -35,6 +36,7 @@ "weight": "2600 g", "volume": "0 ml", "price": 95000, + "price_postapoc": 500, "to_hit": -1, "material": [ "steel" ], "symbol": ":", @@ -52,6 +54,7 @@ "weight": "1134 g", "volume": "1 L", "price": 10000, + "price_postapoc": 500, "to_hit": -1, "material": [ "steel" ], "symbol": ":", @@ -70,6 +73,7 @@ "weight": "68 g", "volume": "119 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "brown", @@ -95,6 +99,7 @@ "weight": "1 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 500, "to_hit": -1, "cutting": 10, "material": [ "steel" ], @@ -114,6 +119,7 @@ "weight": "1550 g", "volume": "1750 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -138,6 +144,7 @@ "weight": "1550 g", "volume": "1750 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -163,6 +170,7 @@ "volume": "1750 ml", "integral_volume": "0 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -188,6 +196,7 @@ "volume": "1750 ml", "integral_volume": "0 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -213,6 +222,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 10000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -255,6 +265,7 @@ "weight": "1360 g", "volume": "500 ml", "price": 65000, + "price_postapoc": 1000, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_red", @@ -280,6 +291,7 @@ "weight": "1500 g", "volume": "500 ml", "price": 84000, + "price_postapoc": 1000, "material": "steel", "symbol": ":", "color": "dark_gray", @@ -304,6 +316,7 @@ "description": "The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's irremovable.", "volume": "0 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -333,6 +346,7 @@ "weight": "2600 g", "volume": "500 ml", "price": 95000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -358,6 +372,7 @@ "weight": "2080 g", "volume": "750 ml", "price": 25000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -374,6 +389,7 @@ "weight": "122 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 1000, "to_hit": -4, "cutting": 6, "material": [ "steel" ], @@ -393,6 +409,7 @@ "weight": "1140 g", "volume": "750 ml", "price": 120000, + "price_postapoc": 5000, "material": [ "superalloy", "ceramic" ], "symbol": ":", "color": "dark_gray", @@ -420,6 +437,7 @@ "weight": "1500 g", "volume": "750 ml", "price": 65000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_red", From 6c48f4dc74394621c8e01ea6d2fff574a11f9d31 Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Thu, 16 Apr 2020 23:24:49 +0200 Subject: [PATCH 30/45] Adds postapoc prices to magazines --- data/json/items/magazine/12mm.json | 1 + data/json/items/magazine/20x60mm.json | 3 ++ data/json/items/magazine/22.json | 9 ++++++ data/json/items/magazine/223.json | 8 +++++ data/json/items/magazine/300.json | 1 + data/json/items/magazine/3006.json | 5 +++ data/json/items/magazine/308.json | 17 +++++++++++ data/json/items/magazine/32.json | 4 +++ data/json/items/magazine/357sig.json | 2 ++ data/json/items/magazine/38.json | 3 ++ data/json/items/magazine/380.json | 7 +++++ data/json/items/magazine/38super.json | 2 ++ data/json/items/magazine/40.json | 12 ++++++++ data/json/items/magazine/40mm.json | 1 + data/json/items/magazine/410shot.json | 2 ++ data/json/items/magazine/44.json | 2 ++ data/json/items/magazine/45.json | 12 ++++++++ data/json/items/magazine/454.json | 1 + data/json/items/magazine/46.json | 2 ++ data/json/items/magazine/460.json | 2 ++ data/json/items/magazine/50.json | 3 ++ data/json/items/magazine/500.json | 1 + data/json/items/magazine/545x39.json | 2 ++ data/json/items/magazine/57.json | 2 ++ data/json/items/magazine/5x50.json | 2 ++ data/json/items/magazine/66mm.json | 1 + data/json/items/magazine/762.json | 6 ++++ data/json/items/magazine/762R.json | 1 + data/json/items/magazine/762x25.json | 3 ++ data/json/items/magazine/8x40mm.json | 7 +++++ data/json/items/magazine/9mm.json | 32 ++++++++++++++++++++ data/json/items/magazine/9x18.json | 2 ++ data/json/items/magazine/chemical_spray.json | 1 + data/json/items/magazine/liquid.json | 4 +++ data/json/items/magazine/shot.json | 7 +++++ data/json/items/magazine/weldgas.json | 2 ++ 36 files changed, 172 insertions(+) diff --git a/data/json/items/magazine/12mm.json b/data/json/items/magazine/12mm.json index 0afe2ce868951..e2cd4fb55ead4 100644 --- a/data/json/items/magazine/12mm.json +++ b/data/json/items/magazine/12mm.json @@ -8,6 +8,7 @@ "weight": "168 g", "volume": "250 ml", "price": 8000, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/20x60mm.json b/data/json/items/magazine/20x60mm.json index 561e2ca79ff24..308af560171f3 100644 --- a/data/json/items/magazine/20x60mm.json +++ b/data/json/items/magazine/20x60mm.json @@ -8,6 +8,7 @@ "weight": "210 g", "volume": "250 ml", "price": 40000, + "price_postapoc": 250, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -26,6 +27,7 @@ "weight": "280 g", "volume": "500 ml", "price": 40000, + "price_postapoc": 500, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -44,6 +46,7 @@ "weight": "280 g", "volume": "750 ml", "price": 60000, + "price_postapoc": 1000, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index e311852df09ed..bc25788cd2b17 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -8,6 +8,7 @@ "weight": "64 g", "volume": "250 ml", "price": 600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -24,6 +25,7 @@ "weight": "760 g", "volume": "500 ml", "price": 7300, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -42,6 +44,7 @@ "weight": "180 g", "volume": "250 ml", "price": 1200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -58,6 +61,7 @@ "weight": "60 g", "volume": "250 ml", "price": 1700, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -75,6 +79,7 @@ "weight": "180 g", "volume": "500 ml", "price": 7900, + "price_postapoc": 200, "material": "steel", "symbol": "#", "color": "light_gray", @@ -92,6 +97,7 @@ "weight": "80 g", "volume": "250 ml", "price": 1400, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -110,6 +116,7 @@ "weight": "70 g", "volume": "250 ml", "price": 2100, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -127,6 +134,7 @@ "weight": "55 g", "volume": "27ml", "price": 2800, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -144,6 +152,7 @@ "weight": "25 g", "volume": "126 ml", "price": 3250, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json index 54ee27b2c6043..594c03e350aee 100644 --- a/data/json/items/magazine/223.json +++ b/data/json/items/magazine/223.json @@ -20,6 +20,7 @@ "weight": "340 g", "volume": "480 ml", "price": 115000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -37,6 +38,7 @@ "weight": "60 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -55,6 +57,7 @@ "weight": "100 g", "volume": "250 ml", "price": 5000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -72,6 +75,7 @@ "weight": "360 g", "volume": "500 ml", "price": 8000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -89,6 +93,7 @@ "weight": "360 g", "volume": "500 ml", "price": 8000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -106,6 +111,7 @@ "weight": "600 g", "volume": "1 L", "price": 9000, + "price_postapoc": 500, "to_hit": -2, "bashing": 4, "material": [ "steel", "plastic" ], @@ -126,6 +132,7 @@ "weight": "80 g", "volume": "250 ml", "price": 1200, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", @@ -139,6 +146,7 @@ "id": "ruger_makeshiftmag", "copy-from": "survivor223mag", "type": "MAGAZINE", + "price_postapoc": 50, "name": { "str": "Ruger makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Ruger Mini-14 rifle." } diff --git a/data/json/items/magazine/300.json b/data/json/items/magazine/300.json index dda92f3be0568..57200b20a8f42 100644 --- a/data/json/items/magazine/300.json +++ b/data/json/items/magazine/300.json @@ -8,6 +8,7 @@ "weight": "78 g", "volume": "250 ml", "price": 3500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/3006.json b/data/json/items/magazine/3006.json index 79b0926656b0e..719887baf8417 100644 --- a/data/json/items/magazine/3006.json +++ b/data/json/items/magazine/3006.json @@ -9,6 +9,7 @@ "weight": "40 g", "volume": "50ml", "price": 500, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "40 g", "volume": "250 ml", "price": 5600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -42,6 +44,7 @@ "weight": "30 g", "volume": "250 ml", "price": 600, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", @@ -60,6 +63,7 @@ "weight": "300 g", "volume": "750 ml", "price": 8500, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -79,6 +83,7 @@ "weight": "200 g", "volume": "500 ml", "price": 3600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/308.json b/data/json/items/magazine/308.json index 43c9ba6a59ed0..b54ed0e70b1ed 100644 --- a/data/json/items/magazine/308.json +++ b/data/json/items/magazine/308.json @@ -19,6 +19,7 @@ "weight": "360 g", "volume": "750 ml", "price": 2100, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -36,6 +37,7 @@ "weight": "240 g", "volume": "500 ml", "price": 1200, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -53,6 +55,7 @@ "weight": "80 g", "volume": "250 ml", "price": 1200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -71,6 +74,7 @@ "weight": "650 g", "volume": "1 L", "price": 7900, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -89,6 +93,7 @@ "weight": "120 g", "volume": "500 ml", "price": 1200, + "price_postapoc": 100, "material": "aluminum", "symbol": "#", "color": "light_gray", @@ -113,6 +118,7 @@ "weight": "280 g", "volume": "500 ml", "price": 1700, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -130,6 +136,7 @@ "weight": "60 g", "volume": "250 ml", "price": 2900, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -143,6 +150,7 @@ "id": "m14_makeshiftmag", "copy-from": "fal_makeshiftmag", "type": "MAGAZINE", + "price_postapoc": 50, "name": { "str": "M14 makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with M14 rifle." }, @@ -155,6 +163,7 @@ "weight": "400 g", "volume": "1 L", "price": 8900, + "price_postapoc": 750, "material": "steel", "symbol": "#", "color": "light_gray", @@ -168,6 +177,7 @@ "id": "scarhmag_30rd", "copy-from": "falbigmag", "type": "MAGAZINE", + "price_postapoc": 250, "name": { "str": "FN SCAR-H 30-round magazine" }, "description": "A 30-round steel box magazine for the FN SCAR-H rifle. This one actually seems to be a modified FN FAL magazine." }, @@ -180,6 +190,7 @@ "weight": "300 g", "volume": "500 ml", "price": 5600, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -192,6 +203,7 @@ "id": "scarh_makeshiftmag", "copy-from": "fal_makeshiftmag", "type": "MAGAZINE", + "price_postapoc": 50, "name": { "str": "FN SCAR-H makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with FN SCAR-H rifle." }, @@ -204,6 +216,7 @@ "weight": "160 g", "volume": "500 ml", "price": 5600, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -221,6 +234,7 @@ "weight": "110 g", "volume": "250 ml", "price": 5000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -233,6 +247,7 @@ "id": "hk417_makeshiftmag", "copy-from": "fal_makeshiftmag", "type": "MAGAZINE", + "price_postapoc": 50, "name": { "str": "HK417 makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with HK417 rifle." }, @@ -245,6 +260,7 @@ "weight": "300 g", "volume": "500 ml", "price": 3000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -257,6 +273,7 @@ "id": "ar10_makeshiftmag", "copy-from": "fal_makeshiftmag", "type": "MAGAZINE", + "price_postapoc": 50, "name": { "str": "AR-10 makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with AR-10 rifle." } diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json index dc91e6ad86c3a..122bdad9c4e5c 100644 --- a/data/json/items/magazine/32.json +++ b/data/json/items/magazine/32.json @@ -8,6 +8,7 @@ "weight": "80 g", "volume": "250 ml", "price": 2600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "70 g", "volume": "250 ml", "price": 1900, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -42,6 +44,7 @@ "weight": "120 g", "volume": "250 ml", "price": 2300, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -59,6 +62,7 @@ "weight": "65 g", "volume": "41ml", "price": 2600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/357sig.json b/data/json/items/magazine/357sig.json index 3357733bfe182..b18329cfe8074 100644 --- a/data/json/items/magazine/357sig.json +++ b/data/json/items/magazine/357sig.json @@ -8,6 +8,7 @@ "weight": "150 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "105 g", "volume": "250 ml", "price": 2900, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/38.json b/data/json/items/magazine/38.json index 3ac936326a9c8..db158d5c441de 100644 --- a/data/json/items/magazine/38.json +++ b/data/json/items/magazine/38.json @@ -8,6 +8,7 @@ "weight": "80 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -24,6 +25,7 @@ "weight": "60 g", "volume": "250 ml", "price": 800, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -40,6 +42,7 @@ "weight": "70 g", "volume": "250 ml", "price": 900, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json index 54a8217ea8738..052f11e65de73 100644 --- a/data/json/items/magazine/380.json +++ b/data/json/items/magazine/380.json @@ -8,6 +8,7 @@ "weight": "60 g", "volume": "44 ml", "price": 1900, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "80 g", "volume": "60ml", "price": 3500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -42,6 +44,7 @@ "weight": "65 g", "volume": "60ml", "price": 2200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -59,6 +62,7 @@ "weight": "200 g", "volume": "737ml", "price": 4500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -76,6 +80,7 @@ "weight": "110 g", "volume": "236 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -93,6 +98,7 @@ "weight": "110 g", "volume": "236 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -110,6 +116,7 @@ "weight": "65 g", "volume": "74 ml", "price": 3400, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/38super.json b/data/json/items/magazine/38super.json index 89a56c8b910a7..a39e092adaecb 100644 --- a/data/json/items/magazine/38super.json +++ b/data/json/items/magazine/38super.json @@ -8,6 +8,7 @@ "weight": "140 g", "volume": "500 ml", "price": 10000, + "price_postapoc": 100, "material": [ "plastic", "steel" ], "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "80 g", "volume": "250 ml", "price": 3400, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json index 534407809ed68..2ba3faa69abb4 100644 --- a/data/json/items/magazine/40.json +++ b/data/json/items/magazine/40.json @@ -8,6 +8,7 @@ "weight": "92 g", "volume": "250 ml", "price": 1500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -24,6 +25,7 @@ "weight": "135 g", "volume": "250 ml", "price": 3200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -42,6 +44,7 @@ "weight": "200 g", "volume": "500 ml", "price": 5900, + "price_postapoc": 250, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -60,6 +63,7 @@ "weight": "125 g", "volume": "250 ml", "price": 3200, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -77,6 +81,7 @@ "weight": "135 g", "volume": "250 ml", "price": 3200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -95,6 +100,7 @@ "weight": "90 g", "volume": "250 ml", "price": 3900, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -112,6 +118,7 @@ "weight": "300 g", "volume": "750 ml", "price": 4000, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", @@ -130,6 +137,7 @@ "weight": "120 g", "volume": "185 ml", "price": 4000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -147,6 +155,7 @@ "weight": "80 g", "volume": "200 ml", "price": 4000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -164,6 +173,7 @@ "weight": "80 g", "volume": "200 ml", "price": 4400, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -181,6 +191,7 @@ "weight": "80 g", "volume": "200 ml", "price": 4800, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -198,6 +209,7 @@ "weight": "110 g", "volume": "312 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/40mm.json b/data/json/items/magazine/40mm.json index 1e5b6fd3b4d02..5d8ef0f8aed43 100644 --- a/data/json/items/magazine/40mm.json +++ b/data/json/items/magazine/40mm.json @@ -7,6 +7,7 @@ "description": "An ammo belt consisting of metal linkages which disintegrate upon firing. This one holds 40mm grenades and is too bulky to be worn like other ammo belts.", "volume": "0 ml", "price": 0, + "price_postapoc": 0, "rigid": false, "material": "steel", "symbol": "#", diff --git a/data/json/items/magazine/410shot.json b/data/json/items/magazine/410shot.json index 59e6ce1228c9e..1dba65e14b0e6 100644 --- a/data/json/items/magazine/410shot.json +++ b/data/json/items/magazine/410shot.json @@ -8,6 +8,7 @@ "weight": "210 g", "volume": "500 ml", "price": 4500, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "dark_gray", @@ -25,6 +26,7 @@ "weight": "460 g", "volume": "1 L", "price": 11000, + "price_postapoc": 500, "material": "plastic", "symbol": "#", "color": "dark_gray", diff --git a/data/json/items/magazine/44.json b/data/json/items/magazine/44.json index e9c384d99d04a..9ff2bde38a877 100644 --- a/data/json/items/magazine/44.json +++ b/data/json/items/magazine/44.json @@ -8,6 +8,7 @@ "weight": "98 g", "volume": "250 ml", "price": 1600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -24,6 +25,7 @@ "weight": "90 g", "volume": "250 ml", "price": 6750, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json index 03d1209579696..b16cd00db3f9e 100644 --- a/data/json/items/magazine/45.json +++ b/data/json/items/magazine/45.json @@ -8,6 +8,7 @@ "weight": "210 g", "volume": "500 ml", "price": 1800, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "300 g", "volume": "750 ml", "price": 4000, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", @@ -43,6 +45,7 @@ "weight": "210 g", "volume": "500 ml", "price": 1800, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -60,6 +63,7 @@ "weight": "255 g", "volume": "750 ml", "price": 4000, + "price_postapoc": 200, "material": "steel", "symbol": "#", "color": "light_gray", @@ -78,6 +82,7 @@ "weight": "500 g", "volume": "1 L", "price": 8000, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -96,6 +101,7 @@ "weight": "170 g", "volume": "500 ml", "price": 3000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -109,6 +115,7 @@ "copy-from": "smg_45_mag", "type": "MAGAZINE", "name": { "str": "Thompson makeshift magazine" }, + "price_postapoc": 50, "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Thompson SMG." }, { @@ -120,6 +127,7 @@ "weight": "200 g", "volume": "500 ml", "price": 4950, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -132,6 +140,7 @@ "id": "ump45_makeshiftmag", "copy-from": "smg_45_mag", "type": "MAGAZINE", + "price_postapoc": 50, "name": { "str": "UMP45 makeshift magazine" }, "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the UMP45 SMG." }, @@ -144,6 +153,7 @@ "weight": "60 g", "volume": "250 ml", "price": 5900, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -161,6 +171,7 @@ "weight": "80 g", "volume": "240 ml", "price": 5000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -178,6 +189,7 @@ "weight": "110 g", "volume": "353 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/454.json b/data/json/items/magazine/454.json index 67581f6130944..50cb540233edc 100644 --- a/data/json/items/magazine/454.json +++ b/data/json/items/magazine/454.json @@ -8,6 +8,7 @@ "weight": "108 g", "volume": "250 ml", "price": 2200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/46.json b/data/json/items/magazine/46.json index e89f2224028bd..738b011cc298c 100644 --- a/data/json/items/magazine/46.json +++ b/data/json/items/magazine/46.json @@ -8,6 +8,7 @@ "weight": "240 g", "volume": "500 ml", "price": 6300, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "120 g", "volume": "250 ml", "price": 4700, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/460.json b/data/json/items/magazine/460.json index 4c8d1336f7ee5..ceee415163332 100644 --- a/data/json/items/magazine/460.json +++ b/data/json/items/magazine/460.json @@ -7,6 +7,7 @@ "weight": "100 g", "volume": "500 ml", "price": 3720, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -23,6 +24,7 @@ "weight": "70 g", "volume": "250 ml", "price": 2980, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 8ad819d021db6..636f841dd219c 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -20,6 +20,7 @@ "weight": "727 g", "volume": "500 ml", "price": 10000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -38,6 +39,7 @@ "weight": "750 g", "volume": "500 ml", "price": 12000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "dark_gray", @@ -56,6 +58,7 @@ "weight": "730 g", "volume": "500 ml", "price": 15000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "dark_gray", diff --git a/data/json/items/magazine/500.json b/data/json/items/magazine/500.json index 171666f88769b..f777013d60fb4 100644 --- a/data/json/items/magazine/500.json +++ b/data/json/items/magazine/500.json @@ -8,6 +8,7 @@ "weight": "118 g", "volume": "250 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/545x39.json b/data/json/items/magazine/545x39.json index a590304c7d4ab..3cc2b7df0a939 100644 --- a/data/json/items/magazine/545x39.json +++ b/data/json/items/magazine/545x39.json @@ -8,6 +8,7 @@ "weight": "230 g", "volume": "500 ml", "price": 1500, + "price_postapoc": 100, "material": [ "steel", "plastic" ], "symbol": "#", "color": "light_gray", @@ -26,6 +27,7 @@ "weight": "300 g", "volume": "750 ml", "price": 8500, + "price_postapoc": 250, "material": "plastic", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/57.json b/data/json/items/magazine/57.json index 07bcb22bbb1eb..ae38699134052 100644 --- a/data/json/items/magazine/57.json +++ b/data/json/items/magazine/57.json @@ -8,6 +8,7 @@ "weight": "120 g", "volume": "250 ml", "price": 3700, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "300 g", "volume": "500 ml", "price": 5400, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/5x50.json b/data/json/items/magazine/5x50.json index be5213cdcf7c4..6bc8907f8a047 100644 --- a/data/json/items/magazine/5x50.json +++ b/data/json/items/magazine/5x50.json @@ -8,6 +8,7 @@ "weight": "360 g", "volume": "630ml", "price": 15000, + "price_postapoc": 750, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -26,6 +27,7 @@ "weight": "240 g", "volume": "315ml", "price": 12500, + "price_postapoc": 500, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", diff --git a/data/json/items/magazine/66mm.json b/data/json/items/magazine/66mm.json index 4a39b9755cb7d..26989aff9bb28 100644 --- a/data/json/items/magazine/66mm.json +++ b/data/json/items/magazine/66mm.json @@ -8,6 +8,7 @@ "weight": "200 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json index aac28518aa064..1baac1900e3d2 100644 --- a/data/json/items/magazine/762.json +++ b/data/json/items/magazine/762.json @@ -9,6 +9,7 @@ "weight": "40 g", "volume": "100ml", "price": 1000, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "130 g", "volume": "151 ml", "price": 3000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -42,6 +44,7 @@ "weight": "283 g", "volume": "265 ml", "price": 3000, + "price_postapoc": 150, "material": "steel", "symbol": "#", "color": "light_gray", @@ -59,6 +62,7 @@ "weight": "326 g", "volume": "379 ml", "price": 2800, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -76,6 +80,7 @@ "weight": "424 g", "volume": "493 ml", "price": 4500, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -93,6 +98,7 @@ "weight": "1020 g", "volume": "1142 ml", "price": 12000, + "price_postapoc": 750, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/762R.json b/data/json/items/magazine/762R.json index ab4e086827a4a..a28edcd210603 100644 --- a/data/json/items/magazine/762R.json +++ b/data/json/items/magazine/762R.json @@ -9,6 +9,7 @@ "weight": "40 g", "volume": "50ml", "price": 1000, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json index e66cbd3da88bb..44d7cf80ccea4 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -9,6 +9,7 @@ "weight": "1760 g", "volume": "911 ml", "price": 7000, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -27,6 +28,7 @@ "weight": "470 g", "volume": "500 ml", "price": 2200, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -44,6 +46,7 @@ "weight": "56 g", "volume": "250 ml", "price": 1300, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json index 384d2534fcd23..40d1a426c545e 100644 --- a/data/json/items/magazine/8x40mm.json +++ b/data/json/items/magazine/8x40mm.json @@ -8,6 +8,7 @@ "weight": "150 g", "volume": "750 ml", "price": 40000, + "price_postapoc": 750, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -26,6 +27,7 @@ "weight": "60 g", "volume": "250 ml", "price": 9000, + "price_postapoc": 250, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -44,6 +46,7 @@ "weight": "340 g", "volume": "2 L", "price": 70000, + "price_postapoc": 1000, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -61,6 +64,7 @@ "weight": "90 g", "volume": "500 ml", "price": 12500, + "price_postapoc": 500, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -79,6 +83,7 @@ "weight": "1400 g", "volume": "4 L", "price": 100000, + "price_postapoc": 1000, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -95,6 +100,7 @@ "weight": "110 g", "volume": "500 ml", "price": 25000, + "price_postapoc": 500, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", @@ -113,6 +119,7 @@ "weight": "92 g", "volume": "250 ml", "price": 8000, + "price_postapoc": 250, "material": [ "superalloy", "plastic" ], "symbol": "#", "color": "dark_gray", diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index 7ada9c5691022..1a0f0572e3c9f 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -8,6 +8,7 @@ "weight": "490 g", "volume": "500 ml", "price": 9920, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -26,6 +27,7 @@ "weight": "210 g", "volume": "500 ml", "price": 4700, + "price_postapoc": 500, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -44,6 +46,7 @@ "weight": "105 g", "volume": "250 ml", "price": 2900, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -61,6 +64,7 @@ "weight": "105 g", "volume": "250 ml", "price": 2900, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -79,6 +83,7 @@ "weight": "105 g", "volume": "500 ml", "price": 3500, + "price_postapoc": 200, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -96,6 +101,7 @@ "weight": "100 g", "volume": "500 ml", "price": 2000, + "price_postapoc": 750, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -113,6 +119,7 @@ "weight": "100 g", "volume": "1 L", "price": 3100, + "price_postapoc": 750, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -130,6 +137,7 @@ "weight": "270 g", "volume": "500 ml", "price": 3500, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -148,6 +156,7 @@ "weight": "135 g", "volume": "250 ml", "price": 2300, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -165,6 +174,7 @@ "weight": "350 g", "volume": "750 ml", "price": 6920, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -183,6 +193,7 @@ "weight": "210 g", "volume": "500 ml", "price": 4100, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -200,6 +211,7 @@ "weight": "135 g", "volume": "250 ml", "price": 3600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -217,6 +229,7 @@ "weight": "255 g", "volume": "500 ml", "price": 4000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -234,6 +247,7 @@ "weight": "300 g", "volume": "500 ml", "price": 4000, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -252,6 +266,7 @@ "weight": "220 g", "volume": "500 ml", "price": 3100, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -269,6 +284,7 @@ "weight": "75 g", "volume": "250 ml", "price": 3850, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -286,6 +302,7 @@ "weight": "220 g", "volume": "500 ml", "price": 4100, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -303,6 +320,7 @@ "weight": "60 g", "volume": "65ml", "price": 1900, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -320,6 +338,7 @@ "weight": "105 g", "volume": "250 ml", "price": 2900, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "light_gray", @@ -338,6 +357,7 @@ "weight": "100 g", "volume": "191 ml", "price": 2400, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -355,6 +375,7 @@ "weight": "100 g", "volume": "191 ml", "price": 2700, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -372,6 +393,7 @@ "weight": "70 g", "volume": "228 ml", "price": 1500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -389,6 +411,7 @@ "weight": "80 g", "volume": "207 ml", "price": 2200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -406,6 +429,7 @@ "weight": "80 g", "volume": "207 ml", "price": 2800, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -423,6 +447,7 @@ "weight": "80 g", "volume": "207 ml", "price": 3200, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -440,6 +465,7 @@ "weight": "110 g", "volume": "284 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -457,6 +483,7 @@ "weight": "110 g", "volume": "284 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -474,6 +501,7 @@ "weight": "110 g", "volume": "284 ml", "price": 2500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -491,6 +519,7 @@ "weight": "100 g", "volume": "230 ml", "price": 7500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -508,6 +537,7 @@ "weight": "100 g", "volume": "230 ml", "price": 7500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -525,6 +555,7 @@ "weight": "100 g", "volume": "230 ml", "price": 7500, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -542,6 +573,7 @@ "weight": "75 g", "volume": "176 ml", "price": 7500, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/9x18.json b/data/json/items/magazine/9x18.json index 04d038f175876..e5c6e545f6648 100644 --- a/data/json/items/magazine/9x18.json +++ b/data/json/items/magazine/9x18.json @@ -8,6 +8,7 @@ "weight": "60 g", "volume": "250 ml", "price": 2300, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "170 g", "volume": "500 ml", "price": 2300, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/chemical_spray.json b/data/json/items/magazine/chemical_spray.json index fc67d84f9401e..27c608f10b082 100644 --- a/data/json/items/magazine/chemical_spray.json +++ b/data/json/items/magazine/chemical_spray.json @@ -8,6 +8,7 @@ "weight": "800 g", "volume": "2 L", "price": 5000, + "price_postapoc": 50, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/liquid.json b/data/json/items/magazine/liquid.json index 71f47707731c9..5bb5268cf6d66 100644 --- a/data/json/items/magazine/liquid.json +++ b/data/json/items/magazine/liquid.json @@ -8,6 +8,7 @@ "weight": "600 g", "volume": "3 L", "price": 5000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "100 g", "volume": "500 ml", "price": 3000, + "price_postapoc": 250, "material": "steel", "symbol": "#", "color": "light_gray", @@ -43,6 +45,7 @@ "weight": "400 g", "volume": "2 L", "price": 15000, + "price_postapoc": 500, "material": "steel", "symbol": "#", "color": "light_gray", @@ -60,6 +63,7 @@ "weight": "800 g", "volume": "4 L", "price": 20000, + "price_postapoc": 750, "material": "steel", "symbol": "#", "color": "light_gray", diff --git a/data/json/items/magazine/shot.json b/data/json/items/magazine/shot.json index db50ba655d1c5..e258c5f931877 100644 --- a/data/json/items/magazine/shot.json +++ b/data/json/items/magazine/shot.json @@ -8,6 +8,7 @@ "weight": "210 g", "volume": "500 ml", "price": 4500, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "dark_gray", @@ -25,6 +26,7 @@ "weight": "460 g", "volume": "1 L", "price": 11000, + "price_postapoc": 500, "material": "plastic", "symbol": "#", "color": "dark_gray", @@ -43,6 +45,7 @@ "weight": "750 g", "volume": "360 ml", "price": 4500, + "price_postapoc": 100, "material": "plastic", "symbol": "#", "color": "dark_gray", @@ -60,6 +63,7 @@ "weight": "794 g", "volume": "1742 ml", "price": 11000, + "price_postapoc": 250, "material": "plastic", "symbol": "#", "color": "dark_gray", @@ -78,6 +82,7 @@ "weight": "200 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 50, "material": "cotton", "symbol": "#", "color": "light_gray", @@ -96,6 +101,7 @@ "weight": "480 g", "volume": "1750 ml", "price": 3200, + "price_postapoc": 50, "material": "plastic", "symbol": "/", "color": "light_gray", @@ -112,6 +118,7 @@ "weight": "510 g", "volume": "2 L", "price": 3250, + "price_postapoc": 50, "material": "plastic", "symbol": "/", "color": "light_gray", diff --git a/data/json/items/magazine/weldgas.json b/data/json/items/magazine/weldgas.json index f773450ebd94e..66a93b7ec2517 100644 --- a/data/json/items/magazine/weldgas.json +++ b/data/json/items/magazine/weldgas.json @@ -8,6 +8,7 @@ "weight": "1500 g", "volume": "1 L", "price": 5600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "brown", @@ -26,6 +27,7 @@ "weight": "6000 g", "volume": "3 L", "price": 5600, + "price_postapoc": 100, "material": "steel", "symbol": "#", "color": "brown", From 926a32fd6b72fa182b251715befdd83813bfe5a6 Mon Sep 17 00:00:00 2001 From: Arcangelus <63109290+Arcangelus@users.noreply.github.com> Date: Thu, 16 Apr 2020 17:33:15 -0400 Subject: [PATCH 31/45] Update armor.json Fixed typo --- data/mods/Aftershock/items/armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor.json b/data/mods/Aftershock/items/armor.json index 40d0ee798fd74..5b9a125c1d6f1 100644 --- a/data/mods/Aftershock/items/armor.json +++ b/data/mods/Aftershock/items/armor.json @@ -51,7 +51,7 @@ "charges_per_use": 1, "use_action": "DIRECTIONAL_HOLOGRAM", "artifact_data": { "charge_type": "ARTC_TIME" }, - "flags": [ "OVERSIZEs", "HOOD", "WATERPROOF", "STURDY", "OUTER", "NO_UNLOAD", "NO_RELOAD" ] + "flags": [ "OVERSIZE", "HOOD", "WATERPROOF", "STURDY", "OUTER", "NO_UNLOAD", "NO_RELOAD" ] }, { "id": "afs_sentinel_cloak", From 5c4c85ba39356df7939e900edfc40d39b22ab3e8 Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Thu, 16 Apr 2020 23:40:26 +0200 Subject: [PATCH 32/45] Adds post apoc prices to resources --- data/json/items/resources/alien.json | 2 ++ data/json/items/resources/chemicals.json | 2 ++ data/json/items/resources/fasteners.json | 5 ++++ data/json/items/resources/glass.json | 4 +++ .../items/resources/home_improvement.json | 12 +++++++++ data/json/items/resources/metal.json | 25 +++++++++++++------ data/json/items/resources/misc.json | 17 ++++++++++--- data/json/items/resources/plastic.json | 5 ++++ data/json/items/resources/tailoring.json | 19 ++++++++++++++ data/json/items/resources/wood.json | 12 ++++----- 10 files changed, 87 insertions(+), 16 deletions(-) diff --git a/data/json/items/resources/alien.json b/data/json/items/resources/alien.json index 88bf6e0e96ee0..a655f1125d39c 100644 --- a/data/json/items/resources/alien.json +++ b/data/json/items/resources/alien.json @@ -8,6 +8,7 @@ "weight": "70 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "material": "alien_resin", "symbol": ",", "color": "light_gray", @@ -22,6 +23,7 @@ "weight": "70000 g", "volume": "22000 ml", "price": 10000, + "price_postapoc": 500, "material": "alien_resin", "symbol": "0", "color": "light_blue", diff --git a/data/json/items/resources/chemicals.json b/data/json/items/resources/chemicals.json index b6c8aac3309fa..c04c5f67e37fd 100644 --- a/data/json/items/resources/chemicals.json +++ b/data/json/items/resources/chemicals.json @@ -9,6 +9,7 @@ "weight": "1725 mg", "volume": "250 ml", "price": 2500, + "price_postapoc": 100, "material": "powder_nonflam", "symbol": "=", "color": "dark_gray", @@ -25,6 +26,7 @@ "weight": "1540 mg", "volume": "250 ml", "price": 2500, + "price_postapoc": 50, "material": "powder_nonflam", "symbol": "=", "color": "dark_gray", diff --git a/data/json/items/resources/fasteners.json b/data/json/items/resources/fasteners.json index e84fc0ccf9391..fce9f5ee1b587 100644 --- a/data/json/items/resources/fasteners.json +++ b/data/json/items/resources/fasteners.json @@ -8,6 +8,7 @@ "weight": "24 g", "volume": "5 ml", "price": 100, + "price_postapoc": 0, "material": "steel", "symbol": "=", "color": "dark_gray", @@ -22,6 +23,7 @@ "weight": "1 g", "volume": "20 ml", "price": 100, + "price_postapoc": 0, "material": "plastic", "symbol": "=", "color": "dark_gray", @@ -36,6 +38,7 @@ "description": "A steel button, usually found on clothing.", "weight": "8 g", "price": 300, + "price_postapoc": 0, "material": "steel" }, { @@ -62,6 +65,7 @@ "weight": "2 g", "volume": "2 ml", "price": 100, + "price_postapoc": 0, "material": "cotton", "symbol": "=", "color": "dark_gray", @@ -84,6 +88,7 @@ "weight": "4 g", "volume": "4 ml", "price": 100, + "price_postapoc": 0, "material": [ "plastic", "cotton" ], "symbol": "=", "color": "dark_gray", diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json index d68ef645a6fae..4657e8fc8d243 100644 --- a/data/json/items/resources/glass.json +++ b/data/json/items/resources/glass.json @@ -30,6 +30,7 @@ "description": "A large sheet of glass. Easily shattered. Useful for repairing windows.", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "material": "glass", "weight": "31250 g", "volume": "12500 ml", @@ -52,6 +53,7 @@ "description": "A large sheet of glass strengthened with steel wiring.", "category": "spare_parts", "price": 10000, + "price_postapoc": 250, "material": [ "glass", "steel" ], "weight": "40123 g", "volume": "12500 ml", @@ -67,6 +69,7 @@ "description": "A small pane of glass strengthened with steel wiring.", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "material": [ "glass", "steel" ], "weight": "10040 g", "volume": "3 L", @@ -82,6 +85,7 @@ "description": "A large, durable sheet of tempered glass, approximately six millimeters thick. A common type of safety glass with the curious property of breaking into small, non-lethal pieces upon shattering.", "category": "spare_parts", "price": 10000, + "price_postapoc": 100, "material": "glass", "weight": "22700 g", "volume": "22700 ml", diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json index ef247dd103831..74b6526adc909 100644 --- a/data/json/items/resources/home_improvement.json +++ b/data/json/items/resources/home_improvement.json @@ -4,6 +4,7 @@ "id": "r_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "red paint", "str_pl": "red paint" }, "symbol": "o", "color": "red", @@ -19,6 +20,7 @@ "id": "b_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "blue paint", "str_pl": "blue paint" }, "symbol": "o", "color": "blue", @@ -34,6 +36,7 @@ "id": "w_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "white paint", "str_pl": "white paint" }, "symbol": "o", "color": "white", @@ -49,6 +52,7 @@ "id": "g_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "green paint", "str_pl": "green paint" }, "symbol": "o", "color": "green", @@ -64,6 +68,7 @@ "id": "p_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "purple paint", "str_pl": "purple paint" }, "symbol": "o", "color": "magenta", @@ -79,6 +84,7 @@ "id": "y_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "yellow paint", "str_pl": "yellow paint" }, "symbol": "o", "color": "yellow", @@ -94,6 +100,7 @@ "id": "r_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "red carpet" }, "symbol": "}", "color": "red", @@ -109,6 +116,7 @@ "id": "g_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "green carpet" }, "symbol": "}", "color": "green", @@ -124,6 +132,7 @@ "id": "y_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "yellow carpet" }, "symbol": "}", "color": "yellow", @@ -139,6 +148,7 @@ "id": "p_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "purple carpet" }, "symbol": "}", "color": "magenta", @@ -158,6 +168,7 @@ "category": "spare_parts", "description": "A metal cylinder with a small lens inside intended to be installed on a door.", "price": 12000, + "price_postapoc": 50, "material": [ "aluminum", "glass" ], "weight": "5 g", "volume": "250 ml", @@ -173,6 +184,7 @@ "category": "spare_parts", "description": "A roll of fine mesh screen for bug barriers on porches.", "price": 1200, + "price_postapoc": 50, "material": [ "plastic" ], "weight": "25 g", "volume": "1000 ml", diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 81324a9cb476f..62284d5a5d8f0 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -15,7 +15,7 @@ "volume": "1 L", "bashing": 12, "price": 7500, - "price_postapoc": 300 + "price_postapoc": 10 }, { "id": "scrap", @@ -26,6 +26,7 @@ "weight": "50 g", "volume": "250 ml", "price": 500, + "price_postapoc": 10, "count": 2, "stack_size": 10, "//": "Density 7.60g/cm³ ~ 1.9kg/250ml @ 50g/unit ~ stack 40 but fragments stacks poorly so only 25% of this", @@ -50,7 +51,7 @@ "cutting": 6, "flags": [ "STAB" ], "qualities": [ [ "BUTCHER", -42 ] ], - "price_postapoc": 500 + "price_postapoc": 10 }, { "type": "GENERIC", @@ -67,7 +68,7 @@ "volume": "500 ml", "bashing": 5, "price": 7500, - "price_postapoc": 300 + "price_postapoc": 10 }, { "id": "material_aluminium_ingot", @@ -79,7 +80,7 @@ "//": "Density 2.70g/cm³ = 675g/250ml", "volume": "250 ml", "price": 500, - "price_postapoc": 125, + "price_postapoc": 10, "material": [ "aluminum" ], "symbol": ",", "color": "light_gray", @@ -95,6 +96,7 @@ "//": "Density 9.78g/cm³ ~ 2.4kg/250ml @ stack 1000 = 2g/unit", "volume": "50ml", "price": 6500, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "lead" ], @@ -112,7 +114,7 @@ "//": "Density 19.32g/cm³ ~ 4.8kg/250ml @ stack 1000 = 5g/unit", "volume": "50ml", "price": 100000, - "price_postapoc": 100, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "gold" ], @@ -147,7 +149,7 @@ "weight": "7 g", "volume": "50ml", "price": 3000, - "price_postapoc": 75, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "zinc" ], @@ -165,6 +167,7 @@ "//": "Density 11.34g/cm³ ~ 2.8kg/250ml @ stack 1000 = 3g/unit", "volume": "50ml", "price": 5000, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "lead" ], @@ -182,6 +185,7 @@ "//": "Weight should be 1.12g because magnesium is 64% less dense than aluminum (1.74g/cm³ vs 2.70g/cm³), at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml", "volume": "250 ml", "price": 5000, + "price_postapoc": 50, "count": 100, "stack_size": 100, "container": "bag_plastic", @@ -200,7 +204,7 @@ "//": "Density 10.40g/cm³ ~ 2.6kg/250ml @ stack 1000 = 3g/unit", "volume": "50ml", "price": 100000, - "price_postapoc": 100, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "silver" ], @@ -218,6 +222,7 @@ "weight": "250 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 10, "bashing": 5, "to_hit": -3, "stack_size": 8, @@ -236,6 +241,7 @@ "weight": "250 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 10, "bashing": 8, "to_hit": -2, "stack_size": 4, @@ -255,6 +261,7 @@ "weight": "1000 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 50, "bashing": 12, "to_hit": -4, "stack_size": 2, @@ -274,6 +281,7 @@ "weight": "300 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 10, "bashing": 5, "to_hit": -3, "stack_size": 6, @@ -292,6 +300,7 @@ "category": "spare_parts", "description": "A small chunk of copper, usable for crafting or repairs.", "price": 1000, + "price_postapoc": 10, "material": "copper", "weight": "50 g", "volume": "62 ml", @@ -303,6 +312,7 @@ "id": "tin", "category": "spare_parts", "price": 750, + "price_postapoc": 10, "name": { "str": "tin powder", "str_pl": "tin powder" }, "symbol": "=", "color": "light_gray", @@ -320,6 +330,7 @@ "id": "solder_wire", "category": "spare_parts", "price": 5000, + "price_postapoc": 50, "name": { "str": "solder", "str_pl": "solder" }, "symbol": "=", "color": "light_gray", diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json index 24123cc03e8eb..0c1ca84efcd61 100644 --- a/data/json/items/resources/misc.json +++ b/data/json/items/resources/misc.json @@ -12,7 +12,8 @@ "volume": "250 ml", "cutting": 10, "flags": [ "SPEAR" ], - "price": 3000 + "price": 3000, + "price_postapoc": 0 }, { "type": "GENERIC", @@ -59,7 +60,8 @@ "volume": "250 ml", "cutting": 8, "flags": [ "SPEAR", "SHEATH_KNIFE" ], - "price": 500 + "price": 500, + "price_postapoc": 0 }, { "id": "incendiary", @@ -70,6 +72,7 @@ "weight": "2 g", "volume": "500 ml", "price": 10000, + "price_postapoc": 100, "container": "bag_plastic", "material": [ "powder" ], "symbol": "=", @@ -87,6 +90,7 @@ "weight": "20000 g", "volume": "300000 ml", "price": 1000, + "price_postapoc": 500, "material": [ "cotton", "steel" ], "symbol": "0", "color": "white", @@ -102,6 +106,7 @@ "weight": "6 kg", "volume": "300000 ml", "price": 1000, + "price_postapoc": 750, "material": [ "cotton" ], "symbol": "0", "color": "white", @@ -116,6 +121,7 @@ "weight": "6 g", "volume": "80 ml", "price": 500, + "price_postapoc": 500, "container": "bag_plastic", "material": [ "cotton" ], "symbol": ",", @@ -148,6 +154,7 @@ "weight": "140 g", "volume": "500 ml", "price": 100, + "price_postapoc": 10, "material": "plastic", "symbol": "=", "color": "dark_gray", @@ -162,6 +169,7 @@ "weight": "2500 g", "volume": "1533 ml", "price": 60000, + "price_postapoc": 100, "material": "ceramic", "symbol": ",", "color": "dark_gray" @@ -175,6 +183,7 @@ "weight": "1 kg", "volume": "600 ml", "price": 60000, + "price_postapoc": 100, "material": "ceramic", "symbol": ",", "color": "dark_gray" @@ -188,6 +197,7 @@ "category": "spare_parts", "description": "A collapsible buttstock designed for the M320 grenade launcher. When combined with this stock, the M320 can be used as a standalone weapon", "price": 10000, + "price_postapoc": 250, "material": [ "plastic", "steel" ], "weight": "600 g", "volume": "250 ml", @@ -206,6 +216,7 @@ "volume": "250 ml", "cutting": 8, "flags": [ "SPEAR", "SHEATH_KNIFE" ], - "price": 1000 + "price": 1000, + "price_postapoc": 0 } ] diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 73cd1dd47c633..dd24080256aa7 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -8,6 +8,7 @@ "weight": "50 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "plastic", "symbol": ",", "color": "light_blue", @@ -22,6 +23,7 @@ "weight": "55 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "nylon", "symbol": ",", "color": "white", @@ -36,6 +38,7 @@ "weight": "87 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "lycra", "symbol": ",", "color": "light_blue", @@ -50,6 +53,7 @@ "weight": "1000 g", "volume": "2 L", "price": 0, + "price_postapoc": 25, "material": "plastic", "symbol": ")", "color": "light_blue", @@ -64,6 +68,7 @@ "weight": "14875 g", "volume": "12500 ml", "price": 0, + "price_postapoc": 25, "material": "plastic", "symbol": ")", "color": "light_blue" diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index 3f7fa6451c872..56432e2aa7818 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -8,6 +8,7 @@ "weight": "1 g", "volume": "1 ml", "price": 1, + "price_postapoc": 5, "material": "cotton", "symbol": "=", "color": "dark_gray", @@ -21,6 +22,7 @@ "name": { "str": "faux fur scraps", "str_pl": "faux fur scraps" }, "description": "Oddly-shaped smallish bits of faux fur, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "price_postapoc": 5, "material": "faux_fur" }, { @@ -103,6 +105,7 @@ "weight": "5 g", "volume": "300 ml", "price": 1000, + "price_postapoc": 100, "material": "cotton", "symbol": "=", "color": "dark_gray", @@ -118,6 +121,7 @@ "weight": "100 g", "volume": "60 ml", "price": 200, + "price_postapoc": 50, "count": 1 }, { @@ -129,6 +133,7 @@ "weight": "10 g", "volume": "4500 ml", "price": 5000, + "price_postapoc": 100, "material": "faux_fur", "symbol": "=", "color": "dark_gray", @@ -144,6 +149,7 @@ "weight": "200 g", "volume": "900 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -155,6 +161,7 @@ "weight": "8 g", "volume": "1800 ml", "price": 2500, + "price_postapoc": 250, "material": "wool", "symbol": "=", "color": "dark_gray", @@ -170,6 +177,7 @@ "weight": "160 g", "volume": "360 ml", "price": 500, + "price_postapoc": 100, "count": 1 }, { @@ -181,6 +189,7 @@ "weight": "5 g", "volume": "300 ml", "price": 15000, + "price_postapoc": 500, "material": "kevlar", "symbol": "=", "color": "dark_gray", @@ -196,6 +205,7 @@ "weight": "3 g", "volume": "300 ml", "price": 5000, + "price_postapoc": 100, "material": "lycra", "symbol": "=", "color": "dark_gray", @@ -211,6 +221,7 @@ "weight": "60 g", "volume": "60 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -222,6 +233,7 @@ "weight": "6 g", "volume": "300 ml", "price": 5000, + "price_postapoc": 100, "material": "neoprene", "symbol": "=", "color": "dark_gray", @@ -237,6 +249,7 @@ "weight": "120 g", "volume": "60 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -248,6 +261,7 @@ "weight": "5 g", "volume": "300 ml", "price": 15000, + "price_postapoc": 250, "material": "nomex", "symbol": "=", "color": "dark_gray", @@ -263,6 +277,7 @@ "weight": "100 g", "volume": "60 ml", "price": 3000, + "price_postapoc": 50, "count": 1 }, { @@ -274,6 +289,7 @@ "weight": "3 g", "volume": "300 ml", "price": 5000, + "price_postapoc": 100, "material": "nylon", "symbol": "=", "color": "dark_gray", @@ -289,6 +305,7 @@ "weight": "60 g", "volume": "60 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -296,6 +313,7 @@ "id": "thread_kevlar", "category": "spare_parts", "price": 5000, + "price_postapoc": 250, "name": { "str": "Kevlar thread" }, "symbol": "=", "color": "light_gray", @@ -314,6 +332,7 @@ "id": "thread_nomex", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "name": { "str": "Nomex thread" }, "symbol": "=", "color": "light_gray", diff --git a/data/json/items/resources/wood.json b/data/json/items/resources/wood.json index 81b95894982c1..f737047ff918e 100644 --- a/data/json/items/resources/wood.json +++ b/data/json/items/resources/wood.json @@ -8,7 +8,7 @@ "description": "A large chunk of log, cut from a tree. (a)ctivate a wood axe or wood saw to cut it into planks.", "category": "other", "price": 10000, - "price_postapoc": 100, + "price_postapoc": 10, "material": "wood", "weight": "9071 g", "volume": "10 L", @@ -82,7 +82,7 @@ "bashing": 25, "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE" ], "price": 4000, - "price_postapoc": 8000, + "price_postapoc": 50, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -100,7 +100,7 @@ "volume": "4400 ml", "bashing": 10, "price": 1000, - "price_postapoc": 0, + "price_postapoc": 10, "flags": [ "FIREWOOD" ] }, { @@ -118,7 +118,7 @@ "material": [ "wood" ], "bashing": 16, "price": 40000, - "price_postapoc": 0, + "price_postapoc": 50, "flags": [ "FIREWOOD" ] }, { @@ -138,7 +138,7 @@ "volume": "3 L", "bashing": 8, "price": 8000, - "price_postapoc": 0, + "price_postapoc": 10, "flags": [ "FIREWOOD" ] }, { @@ -157,7 +157,7 @@ "volume": "6250 ml", "bashing": 8, "price": 20000, - "price_postapoc": 0, + "price_postapoc": 10, "flags": [ "FIREWOOD" ] } ] From 3a1e1e959b91577d223ddb95eac6d821f425e8c0 Mon Sep 17 00:00:00 2001 From: Eric Pierce Date: Thu, 16 Apr 2020 18:37:29 -0600 Subject: [PATCH 33/45] Use correct sh syntax for string comparison --- lang/compile_mo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/compile_mo.sh b/lang/compile_mo.sh index adc2da9a3a1cb..1cd7a1519cc04 100755 --- a/lang/compile_mo.sh +++ b/lang/compile_mo.sh @@ -24,7 +24,7 @@ then for n in $@ do f="lang/po/${n}.po" - if [ $n == "en" ]; then + if [ $n = "en" ]; then # English is special: we do not actually need translation for English, # but due to a libintl bug (https://savannah.gnu.org/bugs/index.php?58006), # gettext would be extremely slow on MinGW targets if we do not compile From 4d78463f1b1a9710b5cfc6b7b997239ce72ceef5 Mon Sep 17 00:00:00 2001 From: Drewscriver Date: Thu, 16 Apr 2020 19:59:08 -0700 Subject: [PATCH 34/45] Remove WAIST tag from utility vest Based on the item description, this would not be worn on the waist. --- data/json/items/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index cc80fc0eece58..d28caa1d5d4ae 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -1002,6 +1002,6 @@ "storage": "3 L", "warmth": 5, "material_thickness": 2, - "flags": [ "VARSIZE", "WAIST" ] + "flags": [ "VARSIZE" ] } ] From ee250d0e0ff957859c8f7a5222a71b576da06288 Mon Sep 17 00:00:00 2001 From: Jason Jones Date: Thu, 16 Apr 2020 16:32:41 -0800 Subject: [PATCH 35/45] Fix item_modifier charges when min and max are same --- src/item_group.cpp | 2 +- tests/item_group_test.cpp | 108 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/src/item_group.cpp b/src/item_group.cpp index 4503415c7a30a..92a52c34bf24c 100644 --- a/src/item_group.cpp +++ b/src/item_group.cpp @@ -282,7 +282,7 @@ void Item_modifier::modify( item &new_item ) const int charges_min = charges.first == -1 ? 0 : charges.first; int charges_max = charges.second == -1 ? max_capacity : charges.second; - if( charges_max != -1 ) { + if( charges_min == -1 && charges_max != -1 ) { charges_min = 0; } diff --git a/tests/item_group_test.cpp b/tests/item_group_test.cpp index e35557d45071d..654b4a77723b7 100644 --- a/tests/item_group_test.cpp +++ b/tests/item_group_test.cpp @@ -61,3 +61,111 @@ TEST_CASE( "Item_modifier gun fouling", "[item_group]" ) CHECK( !bow.has_var( "dirt" ) ); } } + +TEST_CASE( "item_modifier modifies charges for item", "[item_group]" ) +{ + GIVEN( "an ammo item that uses charges" ) { + const std::string item_id = "40x46mm_m1006"; + item subject( item_id ); + + const int default_charges = 6; + + REQUIRE( subject.is_ammo() ); + REQUIRE( subject.count_by_charges() ); + REQUIRE( subject.count() == default_charges ); + REQUIRE( subject.charges == default_charges ); + + AND_GIVEN( "a modifier that does not modify charges" ) { + Item_modifier modifier; + + WHEN( "the item is modified" ) { + modifier.modify( subject ); + + THEN( "charges should be unchanged" ) { + CHECK( subject.charges == default_charges ); + } + } + } + + AND_GIVEN( "a modifier that sets min and max charges to 0" ) { + const int min_charges = 0; + const int max_charges = 0; + Item_modifier modifier; + modifier.charges = { min_charges, max_charges }; + + WHEN( "the item is modified" ) { + modifier.modify( subject ); + + THEN( "charges are set to 1" ) { + CHECK( subject.charges == 1 ); + } + } + } + + AND_GIVEN( "a modifier that sets min and max charges to -1" ) { + const int min_charges = -1; + const int max_charges = -1; + Item_modifier modifier; + modifier.charges = { min_charges, max_charges }; + + WHEN( "the item is modified" ) { + modifier.modify( subject ); + + THEN( "charges should be unchanged" ) { + CHECK( subject.charges == default_charges ); + } + } + } + + AND_GIVEN( "a modifier that sets min and max charges to a range [1, 4]" ) { + const int min_charges = 1; + const int max_charges = 4; + Item_modifier modifier; + modifier.charges = { min_charges, max_charges }; + + WHEN( "the item is modified" ) { + // We have to repeat this a bunch because the charges assignment + // actually does rng between min and max, and if we only checked once + // we might get a false success. + std::vector results; + results.reserve( 100 ); + for( int i = 0; i < 100; i++ ) { + modifier.modify( subject ); + results.emplace_back( subject.charges ); + } + + THEN( "charges are set to the expected range of values" ) { + CHECK( std::all_of( results.begin(), results.end(), [&]( int v ) { + return v >= min_charges && v <= max_charges; + } ) ); + } + } + } + + AND_GIVEN( "a modifier that sets min and max charges to 4" ) { + const int expected = 4; + const int min_charges = expected; + const int max_charges = expected; + Item_modifier modifier; + modifier.charges = { min_charges, max_charges }; + + WHEN( "the item is modified" ) { + // We have to repeat this a bunch because the charges assignment + // actually does rng between min and max, and if we only checked once + // we might get a false success. + std::vector results; + results.reserve( 100 ); + for( int i = 0; i < 100; i++ ) { + modifier.modify( subject ); + results.emplace_back( subject.charges ); + } + + THEN( "charges are set to the expected value" ) { + CHECK( std::all_of( results.begin(), results.end(), [&]( int v ) { + return v == expected; + } ) ); + } + } + } + } +} From 00c814233759a49ca1ae64e0383bd29adbb9acfe Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Fri, 17 Apr 2020 06:27:15 +0200 Subject: [PATCH 36/45] Prices for tools --- data/json/items/tool/container.json | 2 + data/json/items/tool/cooking.json | 47 +++++++++++++++ data/json/items/tool/deployable.json | 17 +++++- data/json/items/tool/electronics.json | 20 ++++++- data/json/items/tool/entry_tools.json | 6 ++ data/json/items/tool/explosives.json | 59 ++++++++++++++++++- data/json/items/tool/fire.json | 11 ++++ data/json/items/tool/firefighting.json | 7 ++- data/json/items/tool/fishing.json | 5 ++ data/json/items/tool/handloading.json | 3 + data/json/items/tool/knives.json | 5 ++ data/json/items/tool/landscaping.json | 8 +++ data/json/items/tool/lighting.json | 20 +++++++ data/json/items/tool/med.json | 13 ++++ data/json/items/tool/metalworking.json | 15 +++++ data/json/items/tool/misc.json | 43 ++++++++++++-- data/json/items/tool/musical_instruments.json | 8 +++ data/json/items/tool/pets.json | 8 +++ data/json/items/tool/radio_tools.json | 5 ++ data/json/items/tool/raincatchers.json | 6 ++ data/json/items/tool/science.json | 38 ++++++++++++ data/json/items/tool/shelters.json | 4 ++ data/json/items/tool/smoking.json | 4 ++ data/json/items/tool/stationary.json | 3 + data/json/items/tool/tailoring.json | 13 ++++ data/json/items/tool/toileteries.json | 11 ++++ data/json/items/tool/traps.json | 11 ++++ data/json/items/tool/woodworking.json | 11 +++- data/json/items/tool/workshop.json | 48 +++++++++++++++ 29 files changed, 440 insertions(+), 11 deletions(-) diff --git a/data/json/items/tool/container.json b/data/json/items/tool/container.json index 6acf7c899a4c6..28edb7ff80660 100644 --- a/data/json/items/tool/container.json +++ b/data/json/items/tool/container.json @@ -8,6 +8,7 @@ "weight": "200 g", "volume": "750 ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "bashing": 4, "material": "steel", @@ -27,6 +28,7 @@ "weight": "13 g", "volume": "50 ml", "price": 0, + "price_postapoc": 25, "to_hit": 1, "rigid": false, "material": "plastic", diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index a3d0e1b020583..2ad59cfb07ed0 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -8,6 +8,7 @@ "weight": "6102 g", "volume": "1000 ml", "price": 100000, + "price_postapoc": 3000, "to_hit": -2, "bashing": 5, "material": [ "plastic", "aluminum" ], @@ -25,6 +26,7 @@ "weight": "6464 g", "volume": "9 L", "price": 20000, + "price_postapoc": 100, "to_hit": -2, "bashing": 9, "material": "wood", @@ -42,6 +44,7 @@ "weight": "9800 g", "volume": "5 L", "price": 52500, + "price_postapoc": 2500, "to_hit": -2, "bashing": 8, "material": "steel", @@ -56,6 +59,7 @@ "weight": "1106 g", "volume": "1500 ml", "price": 2000, + "price_postapoc": 50, "bashing": 2, "cutting": 8, "material": [ "steel", "plastic" ], @@ -96,6 +100,7 @@ "weight": "1820 g", "volume": "3750 ml", "price": 4000, + "price_postapoc": 2000, "to_hit": -3, "bashing": 3, "material": [ "wood", "plastic" ], @@ -115,6 +120,7 @@ "weight": "2600 g", "volume": "5 L", "price": 10000, + "price_postapoc": 1500, "to_hit": -2, "bashing": 9, "material": "steel", @@ -132,6 +138,7 @@ "weight": "405 g", "volume": "1250 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -1, "bashing": 4, "material": "steel", @@ -153,6 +160,7 @@ "weight": "480 g", "volume": "2 L", "price": 2500, + "price_postapoc": 10, "bashing": 1, "material": "clay", "symbol": ")", @@ -171,6 +179,7 @@ "weight": "2264 g", "volume": "1500 ml", "price": 3000, + "price_postapoc": 10, "material": "clay", "symbol": ":", "color": "brown" @@ -184,6 +193,7 @@ "weight": "429 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 10, "to_hit": 1, "bashing": 1, "material": "clay", @@ -200,6 +210,7 @@ "weight": "3100 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 50, "to_hit": -5, "bashing": 2, "material": [ "plastic" ], @@ -225,6 +236,7 @@ "weight": "4200 g", "volume": "4500 ml", "price": 6000, + "price_postapoc": 2000, "to_hit": -2, "bashing": 8, "material": [ "plastic" ], @@ -249,6 +261,7 @@ "weight": "52 g", "volume": "250 ml", "price": 10, + "price_postapoc": 10, "bashing": 8, "material": [ "glass", "egg" ], "symbol": "%", @@ -270,6 +283,7 @@ "weight": "180 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 100, "to_hit": -1, "bashing": 2, "material": "aluminum", @@ -291,6 +305,7 @@ "weight": "52 g", "volume": "250 ml", "price": 10, + "price_postapoc": 10, "bashing": 8, "material": [ "glass", "powder" ], "symbol": "%", @@ -317,6 +332,7 @@ "weight": "3000 g", "volume": "2 L", "price": 50, + "price_postapoc": 250, "to_hit": -1, "bashing": 10, "material": [ "iron" ], @@ -340,6 +356,7 @@ "weight": "1944 g", "volume": "1250 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -1, "bashing": 4, "material": "steel", @@ -360,6 +377,7 @@ "weight": "226 g", "volume": "100 ml", "price": 100, + "price_postapoc": 50, "to_hit": 1, "bashing": 1, "cutting": 1, @@ -377,6 +395,7 @@ "weight": "226 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "bashing": 1, "cutting": 1, @@ -392,6 +411,7 @@ "weight": "500 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 2, "material": "steel", @@ -410,6 +430,7 @@ "weight": "2835 g", "volume": "1250 ml", "price": 2500, + "price_postapoc": 250, "to_hit": -1, "bashing": 4, "material": [ "aluminum", "plastic" ], @@ -435,6 +456,7 @@ "weight": "1750 g", "volume": "500 ml", "price": 650, + "price_postapoc": 10, "bashing": 4, "material": [ "glass", "veggy" ], "symbol": "%", @@ -457,6 +479,7 @@ "weight": "1750 g", "volume": "500 ml", "price": 650, + "price_postapoc": 10, "bashing": 4, "material": [ "glass", "veggy" ], "symbol": "%", @@ -479,6 +502,7 @@ "weight": "1750 g", "volume": "500 ml", "price": 650, + "price_postapoc": 10, "bashing": 4, "material": [ "glass", "veggy" ], "symbol": "%", @@ -500,6 +524,7 @@ "weight": "3218 g", "volume": "2 L", "price": 1000, + "price_postapoc": 250, "to_hit": -1, "bashing": 8, "material": [ "aluminum", "plastic" ], @@ -522,6 +547,7 @@ "weight": "1500 g", "volume": "1 L", "price": 5000, + "price_postapoc": 500, "to_hit": -1, "bashing": 4, "material": [ "aluminum", "plastic" ], @@ -549,6 +575,7 @@ "weight": "450 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 50, "to_hit": 2, "bashing": 10, "material": "steel", @@ -567,6 +594,7 @@ "weight": "3461 g", "volume": "3000 ml", "price": 10, + "price_postapoc": 10, "bashing": 8, "material": "glass", "symbol": "%", @@ -581,6 +609,7 @@ "weight": "3461 g", "volume": "3000 ml", "price": 10, + "price_postapoc": 10, "bashing": 8, "material": "glass", "symbol": "%", @@ -603,6 +632,7 @@ "weight": "900 g", "volume": "1 L", "price": 6000, + "price_postapoc": 500, "to_hit": -1, "bashing": 4, "material": [ "superalloy", "ceramic" ], @@ -629,6 +659,7 @@ "weight": "1632 g", "volume": "1 L", "price": 0, + "price_postapoc": 10, "to_hit": -4, "bashing": 3, "material": "stone", @@ -644,6 +675,7 @@ "weight": "11339 g", "volume": "3750 ml", "price": 20000, + "price_postapoc": 250, "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", @@ -676,6 +708,7 @@ "weight": "2264 g", "volume": "1250 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -1, "bashing": 4, "material": "steel", @@ -697,6 +730,7 @@ "weight": "2628 g", "volume": "1 L", "price": 2000, + "price_postapoc": 100, "to_hit": 2, "bashing": 10, "material": "iron", @@ -712,6 +746,7 @@ "weight": "52 g", "volume": "250 ml", "price": 10, + "price_postapoc": 10, "bashing": 8, "material": [ "glass", "veggy" ], "symbol": "%", @@ -735,6 +770,7 @@ "weight": "45 g", "volume": "750 ml", "price": 250, + "price_postapoc": 10, "bashing": 1, "material": "aluminum", "symbol": ";", @@ -755,6 +791,7 @@ "weight": "2200 g", "volume": "2500 ml", "price": 6500, + "price_postapoc": 50, "to_hit": 1, "bashing": 6, "material": "steel", @@ -774,6 +811,7 @@ "weight": "3264 g", "volume": "2 L", "price": 0, + "price_postapoc": 0, "to_hit": -4, "bashing": 5, "material": "stone", @@ -789,6 +827,7 @@ "weight": "1750 g", "volume": "500 ml", "price": 10, + "price_postapoc": 10, "bashing": 4, "material": [ "glass", "veggy" ], "symbol": "%", @@ -812,6 +851,7 @@ "weight": "50 g", "volume": "500 ml", "price": 300, + "price_postapoc": 10, "bashing": 1, "material": [ "paper" ], "symbol": ";", @@ -826,6 +866,7 @@ "volume": "500 ml", "weight": "318 g", "price": 700, + "price_postapoc": 50, "bashing": 2, "material": [ "steel" ], "symbol": ";", @@ -839,6 +880,7 @@ "weight": "10000 g", "volume": "10 L", "price": 30000, + "price_postapoc": 250, "to_hit": -6, "bashing": 10, "material": "copper", @@ -854,6 +896,7 @@ "weight": "2160 g", "volume": "2500 ml", "price": 2000, + "price_postapoc": 100, "to_hit": -1, "bashing": 6, "material": [ "steel", "glass" ], @@ -875,6 +918,7 @@ "weight": "229 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 10, "to_hit": 2, "bashing": 3, "material": "steel", @@ -891,6 +935,7 @@ "weight": "2449 g", "volume": "1250 ml", "price": 2500, + "price_postapoc": 2000, "to_hit": -1, "bashing": 8, "material": [ "aluminum", "plastic" ], @@ -915,6 +960,7 @@ "weight": "2628 g", "volume": "1 L", "price": 2000, + "price_postapoc": 10, "to_hit": 2, "bashing": 10, "material": "iron", @@ -930,6 +976,7 @@ "weight": "1360 g", "volume": "3 L", "price": 10000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 2, "material": [ "plastic", "steel" ], diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json index 5d19d602e0ac8..1dc2e9836c88e 100644 --- a/data/json/items/tool/deployable.json +++ b/data/json/items/tool/deployable.json @@ -7,6 +7,7 @@ "weight": "5000 g", "volume": "2500 ml", "price": 5000, + "price_postapoc": 10, "to_hit": -4, "bashing": 7, "material": [ "steel" ], @@ -23,6 +24,7 @@ "weight": "20000 g", "volume": "200 L", "price": 10000, + "price_postapoc": 10, "to_hit": -5, "bashing": 8, "looks_like": "55gal_drum", @@ -39,6 +41,7 @@ "weight": "12000 g", "volume": "100 L", "price": 5000, + "price_postapoc": 10, "to_hit": -4, "bashing": 7, "looks_like": "30gal_drum", @@ -55,6 +58,7 @@ "weight": "1000 g", "volume": "2500 ml", "price": 5000, + "price_postapoc": 100, "to_hit": -4, "bashing": 3, "looks_like": "rollmat", @@ -71,6 +75,7 @@ "weight": "6164 g", "volume": "2 L", "price": 7500, + "price_postapoc": 500, "to_hit": -1, "bashing": 6, "material": [ "aluminum", "cotton" ], @@ -93,6 +98,7 @@ "weight": "9071 g", "volume": "21500 ml", "price": 35000, + "price_postapoc": 2000, "to_hit": -5, "bashing": 10, "material": "aluminum", @@ -112,6 +118,7 @@ "description": "seeing this is a bug", "volume": "0 ml", "price": 0, + "price_postapoc": 0, "symbol": "/", "color": "light_gray", "use_action": "UNFOLD_GENERIC" @@ -124,6 +131,7 @@ "weight": "5000 g", "volume": "10 L", "price": 5000, + "price_postapoc": 250, "to_hit": -4, "bashing": 7, "material": [ "steel" ], @@ -139,6 +147,7 @@ "name": { "str": "inflatable boat" }, "description": "This rubber rowboat (oars included) is deflated for storage. Activate it (having an air pump in inventory) to inflate and launch.", "price": 350000, + "price_postapoc": 4000, "material": "plastic", "weight": "9071 g", "volume": "21500 ml", @@ -160,6 +169,7 @@ "weight": "5000 g", "volume": "25 L", "price": 5000, + "price_postapoc": 750, "to_hit": -4, "bashing": 7, "material": [ "steel" ], @@ -175,6 +185,7 @@ "weight": "6000 g", "volume": "25 L", "price": 5000, + "price_postapoc": 100, "to_hit": -3, "bashing": 5, "material": [ "steel" ], @@ -190,6 +201,7 @@ "weight": "2000 g", "volume": "2500 ml", "price": 5000, + "price_postapoc": 500, "to_hit": -3, "bashing": 2, "material": [ "leather" ], @@ -205,6 +217,7 @@ "weight": "1000 g", "volume": "2500 ml", "price": 1000, + "price_postapoc": 100, "to_hit": -3, "bashing": 1, "material": [ "veggy" ], @@ -220,7 +233,7 @@ "weight": "6464 g", "volume": "11356 ml", "price": 5000, - "price_postapoc": 45000, + "price_postapoc": 1000, "to_hit": -4, "bashing": 7, "material": [ "wood" ], @@ -238,6 +251,7 @@ "weight": "120000 g", "volume": "22500 ml", "price": 100000, + "price_postapoc": 1500, "to_hit": -5, "bashing": 40, "material": "wood", @@ -253,6 +267,7 @@ "weight": "120000 g", "volume": "22500 ml", "price": 100000, + "price_postapoc": 1500, "to_hit": -5, "bashing": 40, "material": "steel", diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 1887e1ea498b6..08d69e1317f28 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -7,6 +7,7 @@ "weight": "453 g", "volume": "2 L", "price": 560000, + "price_postapoc": 3000, "to_hit": -1, "bashing": 8, "material": [ "aluminum", "plastic" ], @@ -24,6 +25,7 @@ "weight": "907 g", "volume": "250 ml", "price": 20000, + "price_postapoc": 50, "bashing": 1, "material": [ "plastic", "steel" ], "symbol": ";", @@ -55,6 +57,7 @@ "weight": "2268 g", "volume": "1250 ml", "price": 800000, + "price_postapoc": 100, "bashing": 1, "material": [ "plastic", "steel" ], "symbol": ";", @@ -87,7 +90,7 @@ "weight": "226 g", "volume": "100 ml", "price": 9000, - "price_postapoc": 2000, + "price_postapoc": 100, "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "light_gray", @@ -136,6 +139,7 @@ "weight": "2721 g", "volume": "1 L", "price": 10000, + "price_postapoc": 8000, "material": [ "plastic", "aluminum" ], "symbol": ",", "color": "yellow", @@ -158,6 +162,7 @@ "weight": "454 g", "volume": "500 ml", "price": 800, + "price_postapoc": 250, "to_hit": 1, "material": "aluminum", "symbol": ",", @@ -172,6 +177,7 @@ "weight": "2000 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -8, "cutting": 1, "material": [ "plastic", "steel" ], @@ -190,6 +196,7 @@ "weight": "250 g", "volume": "250 ml", "price": 20000, + "price_postapoc": 100, "to_hit": -1, "material": "plastic", "symbol": ";", @@ -223,6 +230,7 @@ "weight": "114 g", "volume": "500 ml", "price": 40000, + "price_postapoc": 500, "to_hit": 1, "bashing": 5, "material": [ "plastic", "aluminum" ], @@ -253,6 +261,7 @@ "weight": "225 g", "volume": "500 ml", "price": 15000, + "price_postapoc": 1000, "bashing": 2, "material": [ "plastic", "aluminum" ], "symbol": ";", @@ -297,6 +306,7 @@ "weight": "2000 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 250, "material": "plastic", "symbol": ":", "color": "light_gray", @@ -329,6 +339,7 @@ "weight": "2721 g", "volume": "2500 ml", "price": 75000, + "price_postapoc": 250, "bashing": 6, "ammo": "battery", "charges_per_use": 1, @@ -371,6 +382,7 @@ "weight": "140 g", "volume": "50 ml", "price": 3000, + "price_postapoc": 100, "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "dark_gray", @@ -413,6 +425,7 @@ "weight": "340 g", "volume": "1 L", "price": 0, + "price_postapoc": 50, "to_hit": -1, "bashing": 6, "material": [ "plastic", "aluminum" ], @@ -456,6 +469,7 @@ "weight": "200 g", "volume": "500 ml", "price": 12000, + "price_postapoc": 100, "material": [ "plastic" ], "symbol": ";", "color": "light_gray", @@ -485,7 +499,7 @@ "weight": "230 g", "volume": "100 ml", "price": 20000, - "price_postapoc": 1900, + "price_postapoc": 200, "material": [ "plastic", "aluminum" ], "looks_like": "cell_phone", "symbol": ";", @@ -543,6 +557,7 @@ "weight": "680 g", "volume": "2500 ml", "price": 280000, + "price_postapoc": 1500, "to_hit": -1, "bashing": 8, "material": [ "aluminum", "plastic" ], @@ -563,6 +578,7 @@ "weight": "453 g", "volume": "500 ml", "price": 5500, + "price_postapoc": 100, "material": [ "aluminum", "plastic" ], "symbol": ";", "color": "dark_gray", diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json index 4478b5e423409..ff8718699ba20 100644 --- a/data/json/items/tool/entry_tools.json +++ b/data/json/items/tool/entry_tools.json @@ -7,6 +7,7 @@ "weight": "500 g", "volume": "1 L", "price": 1300, + "price_postapoc": 500, "to_hit": 2, "bashing": 14, "cutting": 1, @@ -26,6 +27,7 @@ "weight": "23 g", "volume": "5 ml", "price": 0, + "price_postapoc": 0, "material": "steel", "symbol": ";", "color": "light_gray", @@ -39,6 +41,7 @@ "weight": "500 g", "volume": "750 ml", "price": 5000, + "price_postapoc": 500, "to_hit": 2, "bashing": 14, "cutting": 3, @@ -58,6 +61,7 @@ "weight": "1250 g", "volume": "1 L", "price": 0, + "price_postapoc": 10, "to_hit": 2, "bashing": 12, "cutting": 1, @@ -77,6 +81,7 @@ "weight": "544 g", "volume": "100 ml", "price": 20000, + "price_postapoc": 1000, "material": "steel", "symbol": ";", "color": "light_gray", @@ -89,6 +94,7 @@ "description": "this a pseudo item", "volume": "0 ml", "price": 0, + "price_postapoc": 0, "symbol": ";", "color": "light_gray", "initial_charges": 1, diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 83f947fe93afa..ed1f11f253434 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -8,6 +8,7 @@ "weight": "650 g", "volume": "500 ml", "price": 5000, + "price_postapoc": 500, "to_hit": -1, "bashing": 4, "material": "glass", @@ -26,6 +27,7 @@ "weight": "452 g", "volume": "250 ml", "price": 2500, + "price_postapoc": 500, "to_hit": -2, "material": [ "steel", "plastic" ], "symbol": "*", @@ -71,6 +73,7 @@ "weight": "1570 g", "volume": "1 L", "price": 9000, + "price_postapoc": 2000, "to_hit": -4, "material": [ "plastic" ], "symbol": ";", @@ -111,6 +114,7 @@ "weight": "1133 g", "volume": "750 ml", "price": 6000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 4, "material": [ "paper", "powder" ], @@ -138,6 +142,7 @@ "weight": "1133 g", "volume": "750 ml", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 4, "material": [ "paper", "powder" ], @@ -164,6 +169,7 @@ "weight": "2730 g", "volume": "2000 ml", "price": 6000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 4, "material": [ "paper", "powder" ], @@ -192,6 +198,7 @@ "weight": "2730 g", "volume": "2000 ml", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 4, "material": [ "paper", "powder" ], @@ -219,6 +226,7 @@ "weight": "4543 g", "volume": "15500 ml", "price": 60000, + "price_postapoc": 3000, "to_hit": -1, "bashing": 12, "material": [ "steel", "plastic" ], @@ -245,6 +253,7 @@ "weight": "4543 g", "volume": "15500 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 12, "material": [ "steel", "plastic" ], @@ -276,6 +285,7 @@ "weight": "1133 g", "volume": "750 ml", "price": 0, + "price_postapoc": 500, "to_hit": -3, "bashing": 4, "material": [ "plastic", "powder" ], @@ -302,6 +312,7 @@ "weight": "1133 g", "volume": "750 ml", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 4, "material": [ "plastic", "powder" ], @@ -329,6 +340,7 @@ "weight": "3 g", "volume": "25 ml", "price": 4, + "price_postapoc": 10, "to_hit": -3, "bashing": 1, "material": "paper", @@ -344,6 +356,7 @@ "weight": "3 g", "volume": "10 ml", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 1, "material": "paper", @@ -361,6 +374,7 @@ "weight": "75 g", "volume": "50 ml", "price": 100, + "price_postapoc": 100, "to_hit": -3, "bashing": 1, "material": "paper", @@ -379,6 +393,7 @@ "weight": "75 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -3, "material": "paper", "symbol": "*", @@ -396,6 +411,7 @@ "weight": "236 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 250, "to_hit": -1, "bashing": 5, "material": [ "steel", "plastic" ], @@ -420,6 +436,7 @@ "weight": "236 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 5, "material": [ "steel", "plastic" ], @@ -448,6 +465,7 @@ "bashing": 4, "to_hit": 1, "price": 900, + "price_postapoc": 750, "material": [ "aluminum", "iron" ], "symbol": "*", "color": "green", @@ -471,6 +489,7 @@ "name": { "str": "active fragment bomb" }, "description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by small pieces of metal and a fuse. The fuse has been lit, you should throw it.", "price": 0, + "price_postapoc": 0, "initial_charges": 5, "max_charges": 5, "turns_per_charge": 1, @@ -490,6 +509,7 @@ "type": "GENERIC", "name": { "str": "fungicidal gas grenade" }, "price": 3600, + "price_postapoc": 750, "description": "This is a canister grenade filled with fungicidal solution. Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade. In five turns it will begin to expel a volatile spray that is highly toxic to fungal life forms.", "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "fungicidalbomb_act" } }, @@ -512,6 +532,7 @@ "type": "GENERIC", "name": { "str": "makeshift fungicidal gas grenade" }, "price": 3600, + "price_postapoc": 500, "description": "This is a makeshift canister grenade filled with fungicidal solution. Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade. In five turns it will begin to expel a volatile spray that is highly toxic to fungal life forms.", "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "fungicidalbomb_makeshift_act" } }, @@ -536,6 +557,7 @@ "weight": "1264 g", "volume": "250 ml", "price": 500, + "price_postapoc": 250, "to_hit": -1, "bashing": 6, "material": "steel", @@ -560,6 +582,7 @@ "weight": "1264 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 6, "material": "steel", @@ -590,6 +613,7 @@ "weight": "397 g", "volume": "250 ml", "price": 1500, + "price_postapoc": 1000, "to_hit": -1, "bashing": 6, "material": [ "steel", "plastic" ], @@ -614,6 +638,7 @@ "weight": "397 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 6, "material": [ "steel", "plastic" ], @@ -641,7 +666,7 @@ "volume": "250 ml", "price": 6000, "//": "Something this useful doesn't come cheap after the apocalypse", - "price_postapoc": 20000, + "price_postapoc": 4000, "to_hit": -1, "bashing": 5, "material": [ "steel", "plastic" ], @@ -667,6 +692,7 @@ "weight": "400 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 5, "material": [ "steel", "plastic" ], @@ -695,6 +721,7 @@ "weight": "180 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 1500, "to_hit": -1, "bashing": 6, "material": [ "steel" ], @@ -719,6 +746,7 @@ "weight": "180 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 6, "material": [ "steel" ], @@ -751,6 +779,7 @@ "type": "GENERIC", "name": { "str": "tear gas grenade" }, "price": 3600, + "price_postapoc": 250, "description": "This is a canister grenade filled with noxious irritant. Use this item to pull the pin and light the fuse, turning it into an active tear gas grenade. In five turns it will begin to expel a highly toxic gas for some time. This gas damages and slows those who enter it, as well as obscuring vision and scent.", "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "gasbomb_act" } }, @@ -759,6 +788,7 @@ "copy-from": "gasbomb", "type": "GENERIC", "name": { "str": "armed tear gas canister" }, + "price_postapoc": 0, "description": "This smoke bomb has had its pin removed and is expelling highly toxic gas.", "emits": [ "emit_tear_gas_stream" ], "countdown_interval": 50, @@ -772,6 +802,7 @@ "type": "GENERIC", "name": { "str": "insecticidal gas grenade" }, "price": 3600, + "price_postapoc": 750, "description": "This is a canister grenade filled with insecticidal solution. Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade. In five turns it will begin to expel a volatile spray that is highly toxic to insect life forms.", "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_act" } }, @@ -781,6 +812,7 @@ "looks_like": "smokebomb_act", "type": "GENERIC", "name": { "str": "armed insecticidal gas canister" }, + "price_postapoc": 0, "description": "This insecticidal bomb has had its pin removed and is expelling highly toxic haze.", "emits": [ "emit_insecticidal_stream" ], "countdown_interval": 50, @@ -794,6 +826,7 @@ "type": "GENERIC", "name": { "str": "makeshift insecticidal gas grenade" }, "price": 3600, + "price_postapoc": 500, "description": "This is a makeshift canister grenade filled with insecticidal solution. Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade. In five turns it will begin to expel a volatile spray that is highly toxic to insect life forms.", "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_makeshift_act" } }, @@ -803,6 +836,7 @@ "looks_like": "smokebomb_act", "type": "GENERIC", "name": { "str": "armed makeshift insecticidal gas canister" }, + "price_postapoc": 0, "description": "This makeshift insecticidal bomb has had its pin removed and is expelling highly toxic haze.", "emits": [ "emit_small_insecticidal_stream" ], "countdown_interval": 50, @@ -818,6 +852,7 @@ "weight": "2500 g", "volume": "1500 ml", "price": 200000, + "price_postapoc": 4000, "bashing": 6, "material": "aluminum", "symbol": ")", @@ -839,6 +874,7 @@ "description": "An improvised explosive device cobbled together from parts. Use this item to pull the pin and light the fuse. You will then have some amount of time before it explodes; throwing it would be a good idea.", "weight": "350 g", "price": 750, + "price_postapoc": 750, "material": [ "aluminum", "iron" ], "symbol": "*", "color": "green", @@ -861,6 +897,7 @@ "name": { "str": "active makeshift grenade" }, "description": "This is an active grenade, and will explode any second now. Better throw it!", "price": 0, + "price_postapoc": 0, "rand_charges": [ 2, 7 ], "max_charges": 7, "turns_per_charge": 1, @@ -883,6 +920,7 @@ "weight": "23000 g", "volume": "16 L", "price": 180000, + "price_postapoc": 10000, "to_hit": -2, "bashing": 8, "material": [ "steel", "plastic" ], @@ -901,6 +939,7 @@ "weight": "23000 g", "volume": "16 L", "price": 0, + "price_postapoc": 0, "to_hit": -2, "bashing": 8, "material": [ "steel", "plastic" ], @@ -929,6 +968,7 @@ "weight": "742 g", "volume": "750 ml", "price": 500, + "price_postapoc": 500, "to_hit": 1, "bashing": 5, "material": [ "glass", "cotton" ], @@ -957,6 +997,7 @@ "weight": "742 g", "volume": "750 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "bashing": 5, "material": [ "glass", "cotton" ], @@ -979,6 +1020,7 @@ "bashing": 4, "to_hit": 1, "price": 900, + "price_postapoc": 500, "material": [ "aluminum", "iron" ], "symbol": "*", "color": "green", @@ -1002,6 +1044,7 @@ "name": { "str": "active nail bomb" }, "description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by nails and a fuse. The fuse has been lit, you should throw it.", "price": 0, + "price_postapoc": 0, "initial_charges": 5, "max_charges": 5, "turns_per_charge": 1, @@ -1024,6 +1067,7 @@ "//": "Only one third (410 g) of a whole pipe is being used", "volume": "500 ml", "price": 1500, + "price_postapoc": 750, "to_hit": 1, "bashing": 5, "material": "steel", @@ -1049,6 +1093,7 @@ "weight": "1298 g", "volume": "500 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "bashing": 5, "material": "steel", @@ -1076,7 +1121,7 @@ "volume": "250 ml", "price": 6000, "//": "Something this useful doesn't come cheap after the apocalypse", - "price_postapoc": 20000, + "price_postapoc": 5000, "to_hit": -1, "bashing": 5, "material": [ "steel", "plastic" ], @@ -1101,6 +1146,7 @@ "weight": "500 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 5, "material": [ "steel", "plastic" ], @@ -1127,6 +1173,7 @@ "name": { "str": "smoke bomb" }, "description": "This is a canister grenade filled with a variety of pyrotechnic chemicals. Use this item to pull the pin and light the fuse, turning it into an active smoke bomb. Five turns after you do that, it will begin to expel a thick black smoke. This smoke will slow those who enter it, as well as obscuring vision and scent.", "price": 1800, + "price_postapoc": 0, "weight": "569 g", "countdown_action": { "type": "transform", "target": "smokebomb_act" } }, @@ -1150,6 +1197,7 @@ "weight": "77800 g", "volume": "50 L", "price": 75000, + "price_postapoc": 4000, "to_hit": -5, "bashing": 12, "material": [ "steel", "plastic" ], @@ -1181,6 +1229,7 @@ "weight": "77800 g", "volume": "50 L", "price": 0, + "price_postapoc": 0, "to_hit": -5, "bashing": 12, "material": [ "steel", "plastic" ], @@ -1213,6 +1262,7 @@ "weight": "6500 g", "volume": "4 L", "price": 20000, + "price_postapoc": 2500, "to_hit": -2, "material": [ "steel", "plastic" ], "symbol": "*", @@ -1238,6 +1288,7 @@ "weight": "6500 g", "volume": "4 L", "price": 0, + "price_postapoc": 0, "to_hit": -2, "material": [ "steel", "plastic" ], "symbol": "*", @@ -1265,6 +1316,7 @@ "weight": "106600 g", "volume": "50 L", "price": 90000, + "price_postapoc": 4000, "to_hit": -5, "bashing": 20, "material": [ "steel", "plastic" ], @@ -1295,6 +1347,7 @@ "weight": "106600 g", "volume": "50 L", "price": 0, + "price_postapoc": 0, "to_hit": -5, "bashing": 20, "material": [ "steel", "plastic" ], @@ -1327,6 +1380,7 @@ "weight": "250 g", "volume": "250 ml", "price": 100, + "price_postapoc": 100, "to_hit": -2, "bashing": 1, "material": [ "steel", "plastic" ], @@ -1351,6 +1405,7 @@ "weight": "250 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -2, "bashing": 1, "material": [ "steel", "plastic" ], diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json index 58ed43caca423..f6a429ea90672 100644 --- a/data/json/items/tool/fire.json +++ b/data/json/items/tool/fire.json @@ -7,6 +7,7 @@ "weight": "14 g", "volume": "250 ml", "price": 100, + "price_postapoc": 10, "material": "steel", "symbol": ",", "color": "light_gray", @@ -38,6 +39,7 @@ "weight": "240 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "wood", "symbol": ",", "color": "brown", @@ -55,6 +57,7 @@ "weight": "1280 g", "volume": "1250 ml", "price": 0, + "price_postapoc": 10, "material": [ "wood", "stone" ], "symbol": ",", "color": "brown", @@ -72,6 +75,7 @@ "weight": "400 g", "volume": "250 ml", "price": 300, + "price_postapoc": 250, "to_hit": -1, "material": [ "stone", "steel" ], "symbol": ",", @@ -90,6 +94,7 @@ "weight": "14 g", "volume": "14 ml", "price": 100, + "price_postapoc": 100, "material": [ "plastic", "aluminum" ], "symbol": ",", "color": "blue", @@ -107,6 +112,7 @@ "weight": "400 g", "volume": "250 ml", "price": 600, + "price_postapoc": 50, "to_hit": -1, "material": [ "glass", "plastic" ], "symbol": "o", @@ -122,6 +128,7 @@ "weight": "10 g", "volume": "10 ml", "price": 10, + "price_postapoc": 50, "material": "cardboard", "symbol": ",", "color": "blue", @@ -139,6 +146,7 @@ "weight": "20 g", "volume": "31 ml", "price": 3000, + "price_postapoc": 250, "material": "aluminum", "symbol": ",", "color": "light_gray", @@ -168,6 +176,7 @@ "weight": "20 g", "volume": "31 ml", "price": 3000, + "price_postapoc": 250, "material": "aluminum", "symbol": ",", "color": "light_gray", @@ -197,6 +206,7 @@ "weight": "500 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 100, "material": "steel", "symbol": ",", "color": "light_gray", @@ -221,6 +231,7 @@ "weight": "500 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 100, "material": "steel", "symbol": ",", "color": "light_gray", diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json index ba7102c7fe4c9..dd3a059a2ccb9 100644 --- a/data/json/items/tool/firefighting.json +++ b/data/json/items/tool/firefighting.json @@ -9,7 +9,7 @@ "//": "Same stats as a hatchet, except it has prying instead of hammering.", "description": "A short lightweight emergency tool with a quarter circular blade, a short pick opposite the blade and an insulated handle. Used on airplanes to chop down or pry walls or cabinets to gain access in case of fire.", "price": 2500, - "price_postapoc": 5000, + "price_postapoc": 750, "material": [ "steel" ], "techniques": [ "WBLOCK_1" ], "weight": "907 g", @@ -28,6 +28,7 @@ "weight": "13813 g", "volume": "20000 ml", "price": 5000, + "price_postapoc": 100, "to_hit": -4, "bashing": 16, "material": "steel", @@ -46,6 +47,7 @@ "weight": "2520 g", "volume": "2 L", "price": 20000, + "price_postapoc": 1500, "to_hit": 1, "bashing": 20, "cutting": 20, @@ -65,6 +67,7 @@ "weight": "3600 g", "volume": "1250 ml", "price": 7500, + "price_postapoc": 1500, "to_hit": 2, "bashing": 20, "cutting": 5, @@ -84,6 +87,7 @@ "weight": "2267 g", "volume": "2000 ml", "price": 4000, + "price_postapoc": 50, "to_hit": -1, "bashing": 4, "material": [ "steel", "plastic" ], @@ -103,6 +107,7 @@ "weight": "630 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 50, "to_hit": -1, "bashing": 3, "material": "plastic", diff --git a/data/json/items/tool/fishing.json b/data/json/items/tool/fishing.json index 1195a4a043858..1b8f53f9f4d49 100644 --- a/data/json/items/tool/fishing.json +++ b/data/json/items/tool/fishing.json @@ -7,6 +7,7 @@ "weight": "85 g", "volume": "2 L", "price": 500, + "price_postapoc": 50, "to_hit": -2, "material": "plastic", "symbol": ";", @@ -23,6 +24,7 @@ "weight": "1 g", "volume": "1 ml", "price": 25, + "price_postapoc": 25, "cutting": 3, "material": "steel", "symbol": ",", @@ -36,6 +38,7 @@ "weight": "1 g", "volume": "1 ml", "price": 25, + "price_postapoc": 25, "cutting": 3, "material": "bone", "symbol": ",", @@ -49,6 +52,7 @@ "weight": "1700 g", "volume": "1250 ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "bashing": 14, "material": "wood", @@ -66,6 +70,7 @@ "weight": "1000 g", "volume": "1250 ml", "price": 20000, + "price_postapoc": 1500, "to_hit": 1, "bashing": 8, "material": "plastic", diff --git a/data/json/items/tool/handloading.json b/data/json/items/tool/handloading.json index 88731803d70d7..825a518562ded 100644 --- a/data/json/items/tool/handloading.json +++ b/data/json/items/tool/handloading.json @@ -7,6 +7,7 @@ "weight": "6350 g", "volume": "500 ml", "price": 10000, + "price_postapoc": 2000, "to_hit": -2, "bashing": 6, "material": [ "steel", "plastic" ], @@ -21,6 +22,7 @@ "weight": "348 g", "volume": "250 ml", "price": 600, + "price_postapoc": 1500, "to_hit": -2, "bashing": 2, "material": [ "wood", "plastic", "brass" ], @@ -36,6 +38,7 @@ "weight": "489 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 2000, "bashing": 5, "material": "plastic", "symbol": ";", diff --git a/data/json/items/tool/knives.json b/data/json/items/tool/knives.json index afe6ffd4b30b7..a9fccc249bbab 100644 --- a/data/json/items/tool/knives.json +++ b/data/json/items/tool/knives.json @@ -7,6 +7,7 @@ "weight": "650 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 10, "bashing": 2, "cutting": 12, "material": [ "copper" ], @@ -25,6 +26,7 @@ "weight": "226 g", "volume": "250 ml", "price": 14000, + "price_postapoc": 500, "cutting": 12, "material": [ "steel", "plastic" ], "symbol": ";", @@ -41,6 +43,7 @@ "weight": "580 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 100, "bashing": 1, "cutting": 8, "material": [ "steel" ], @@ -57,6 +60,7 @@ "weight": "20 g", "volume": "10 ml", "price": 1000, + "price_postapoc": 100, "to_hit": -2, "cutting": 7, "material": [ "steel", "plastic" ], @@ -73,6 +77,7 @@ "weight": "453 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 2, "cutting": 5, diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index 798cacd7dde3f..9c7440ee077d1 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -8,6 +8,7 @@ "weight": "1133 g", "volume": "1500 ml", "price": 0, + "price_postapoc": 0, "bashing": 8, "material": "wood", "symbol": "/", @@ -23,6 +24,7 @@ "weight": "280 g", "volume": "500 ml", "price": 20, + "price_postapoc": 50, "to_hit": 1, "bashing": 3, "cutting": 5, @@ -39,6 +41,7 @@ "weight": "1088 g", "volume": "3500 ml", "price": 2000, + "price_postapoc": 250, "to_hit": 3, "bashing": 10, "cutting": 6, @@ -57,6 +60,7 @@ "weight": "1581 g", "volume": "4 L", "price": 0, + "price_postapoc": 0, "bashing": 15, "cutting": 1, "material": [ "stone", "wood" ], @@ -72,6 +76,7 @@ "weight": "3013 g", "volume": "3250 ml", "price": 8000, + "price_postapoc": 250, "to_hit": -6, "bashing": 6, "cutting": 14, @@ -90,6 +95,7 @@ "weight": "1315 g", "volume": "3500 ml", "price": 2000, + "price_postapoc": 250, "to_hit": 3, "bashing": 14, "cutting": 3, @@ -108,6 +114,7 @@ "weight": "1432 g", "volume": "1250 ml", "price": 3800, + "price_postapoc": 250, "to_hit": -6, "bashing": 2, "cutting": 16, @@ -126,6 +133,7 @@ "weight": "4500 g", "volume": "2500 ml", "price": 4000, + "price_postapoc": 250, "to_hit": -1, "bashing": 4, "cutting": 8, diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 6252a4db4b816..bc5efbc82a834 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -8,6 +8,7 @@ "weight": "1438 g", "volume": "1 L", "price": 175000, + "price_postapoc": 4000, "to_hit": -2, "bashing": 8, "material": [ "plastic", "aluminum" ], @@ -25,6 +26,7 @@ "weight": "1438 g", "volume": "1 L", "price": 175000, + "price_postapoc": 4000, "to_hit": -2, "bashing": 8, "material": [ "plastic", "aluminum" ], @@ -48,6 +50,7 @@ "weight": "214 g", "volume": "250 ml", "price": 125000, + "price_postapoc": 4000, "to_hit": -2, "bashing": 4, "material": [ "plastic", "aluminum" ], @@ -70,6 +73,7 @@ "weight": "214 g", "volume": "250 ml", "price": 125000, + "price_postapoc": 4000, "to_hit": -2, "bashing": 4, "material": [ "plastic", "aluminum" ], @@ -92,6 +96,7 @@ "weight": "225 g", "volume": "250 ml", "price": 100, + "price_postapoc": 50, "to_hit": -2, "material": "veggy", "symbol": ",", @@ -116,6 +121,7 @@ "weight": "225 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -2, "material": "veggy", "symbol": ",", @@ -138,6 +144,7 @@ "weight": "980 g", "volume": "1 L", "price": 1000, + "price_postapoc": 100, "bashing": 1, "to_hit": 2, "material": [ "plastic" ], @@ -191,6 +198,7 @@ "weight": "400 g", "volume": "500 ml", "price": 500, + "price_postapoc": 100, "charges_per_use": 1, "ammo": "battery", "use_action": { @@ -235,6 +243,7 @@ "weight": "1400 g", "volume": "750 ml", "price": 3000, + "price_postapoc": 100, "to_hit": 2, "bashing": 1, "material": [ "glass", "iron" ], @@ -274,6 +283,7 @@ "weight": "29 g", "volume": "250 ml", "price": 100, + "price_postapoc": 10, "to_hit": -1, "material": "plastic", "symbol": ";", @@ -297,6 +307,7 @@ "weight": "29 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 2, "material": "plastic", @@ -333,6 +344,7 @@ "weight": "128 g", "volume": "250 ml", "price": 400, + "price_postapoc": 100, "max_charges": 300, "initial_charges": 300, "use_action": { @@ -364,6 +376,7 @@ "weight": "650 g", "volume": "750 ml", "price": 950, + "price_postapoc": 200, "bashing": 8, "to_hit": 2, "material": [ "aluminum" ], @@ -417,6 +430,7 @@ "weight": "27 g", "volume": "250 ml", "price": 500, + "price_postapoc": 25, "to_hit": 2, "bashing": 1, "material": [ "plastic", "aluminum" ], @@ -474,6 +488,7 @@ "weight": "1720 g", "volume": "1 L", "price": 1000, + "price_postapoc": 100, "to_hit": 2, "bashing": 1, "material": [ "glass", "iron" ], @@ -513,6 +528,7 @@ "weight": "800 g", "volume": "500 ml", "price": 6500, + "price_postapoc": 100, "symbol": ";", "color": "red", "material": [ "copper", "glass" ], @@ -546,6 +562,7 @@ "weight": "90 g", "volume": "100 ml", "price": 100, + "price_postapoc": 100, "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "white", @@ -581,6 +598,7 @@ "weight": "400 g", "volume": "500 ml", "price": 500, + "price_postapoc": 100, "to_hit": -1, "bashing": 1, "material": [ "plastic", "aluminum" ], @@ -633,6 +651,7 @@ "weight": "831 g", "volume": "750 ml", "price": 0, + "price_postapoc": 50, "to_hit": 1, "bashing": 8, "material": "wood", @@ -659,6 +678,7 @@ "weight": "831 g", "volume": "750 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "bashing": 8, "material": "wood", diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index bbc20d51608d2..ceaf36df6253f 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -7,6 +7,7 @@ "weight": "100 g", "volume": "3250 ml", "price": 1000, + "price_postapoc": 10000, "to_hit": -1, "material": [ "glass" ], "symbol": "!", @@ -14,6 +15,7 @@ "ammo": "anesthetic", "initial_charges": 3000, "max_charges": 3000, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "qualities": [ [ "ANESTHESIA", 1 ] ] }, { @@ -24,6 +26,7 @@ "weight": "34500 g", "volume": "76 L", "price": 162654, + "price_postapoc": 2000, "to_hit": -6, "bashing": 10, "material": "steel", @@ -48,12 +51,14 @@ "weight": "85 g", "volume": "250 ml", "price": 5000, + "price_postapoc": 750, "material": "plastic", "symbol": "!", "color": "light_blue", "max_charges": 100, "initial_charges": 100, "charges_per_use": 1, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "use_action": "INHALER" }, { @@ -64,6 +69,7 @@ "weight": "316 g", "volume": "500 ml", "price": 100000, + "price_postapoc": 1500, "material": [ "ceramic", "superalloy" ], "symbol": ",", "color": "light_gray", @@ -81,6 +87,7 @@ "weight": "23 g", "volume": "15 ml", "price": 1000, + "price_postapoc": 250, "to_hit": -3, "cutting": 7, "material": "steel", @@ -98,6 +105,7 @@ "weight": "1134 g", "volume": "750 ml", "price": 4000, + "price_postapoc": 250, "to_hit": -3, "bashing": 6, "material": [ "aluminum", "plastic" ], @@ -116,6 +124,7 @@ "weight": "10 g", "volume": "10ml", "price": 2500, + "price_postapoc": 10, "material": "plastic", "symbol": ",", "color": "white" @@ -129,6 +138,7 @@ "weight": "1 g", "volume": "250 ml", "price": 100, + "price_postapoc": 10, "to_hit": -3, "material": "plastic", "symbol": ";", @@ -144,6 +154,7 @@ "weight": "2268 g", "volume": "1500 ml", "price": 6000, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -163,6 +174,7 @@ "weight": "13 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 100, "to_hit": -3, "cutting": 6, "material": "plastic", @@ -182,6 +194,7 @@ "weight": "20 g", "volume": "15 ml", "price": 1000, + "price_postapoc": 100, "material": [ "plastic" ], "symbol": ",", "color": "light_blue", diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index 9888a95978576..f780c7a7f4067 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -7,6 +7,7 @@ "weight": "54000 g", "volume": "4 L", "price": 100000, + "price_postapoc": 2000, "to_hit": -5, "bashing": 40, "material": "iron", @@ -23,6 +24,7 @@ "weight": "2180 g", "volume": "2500 ml", "price": 60000, + "price_postapoc": 750, "to_hit": -5, "bashing": 20, "material": "bronze", @@ -39,6 +41,7 @@ "weight": "1224 g", "volume": "750 ml", "price": 3000, + "price_postapoc": 250, "to_hit": -1, "bashing": 7, "cutting": 4, @@ -56,6 +59,7 @@ "weight": "8600 g", "volume": "8 L", "price": 20000, + "price_postapoc": 3000, "to_hit": -2, "bashing": 9, "material": "steel", @@ -75,6 +79,7 @@ "weight": "6400 g", "volume": "7500 ml", "price": 16000, + "price_postapoc": 1000, "to_hit": -2, "bashing": 10, "material": "steel", @@ -90,6 +95,7 @@ "weight": "660 g", "volume": "250 ml", "price": 1600, + "price_postapoc": 250, "to_hit": 2, "bashing": 4, "cutting": 2, @@ -107,6 +113,7 @@ "weight": "1400 g", "volume": "2 L", "price": 100000, + "price_postapoc": 750, "to_hit": -2, "bashing": 10, "material": "ceramic", @@ -122,6 +129,7 @@ "weight": "1642 g", "volume": "2500 ml", "price": 60000, + "price_postapoc": 250, "to_hit": -2, "bashing": 10, "material": "clay", @@ -137,6 +145,7 @@ "weight": "10000 g", "volume": "6 L", "price": 40000, + "price_postapoc": 4000, "to_hit": -2, "bashing": 8, "material": [ "steel", "plastic" ], @@ -158,6 +167,7 @@ "weight": "8142 g", "volume": "10 L", "price": 100, + "price_postapoc": 500, "to_hit": -2, "material": "steel", "symbol": ";", @@ -172,6 +182,7 @@ "weight": "15142 g", "volume": "10 L", "price": 100, + "price_postapoc": 500, "to_hit": -2, "material": [ "steel", "wood" ], "symbol": ";", @@ -195,6 +206,7 @@ "weight": "15142 g", "volume": "10 L", "price": 100, + "price_postapoc": 500, "to_hit": -2, "material": [ "steel", "wood" ], "symbol": ";", @@ -218,6 +230,7 @@ "weight": "1000 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 500, "material": "iron", "symbol": ",", "color": "light_gray", @@ -231,6 +244,7 @@ "weight": "2620 g", "volume": "2 L", "price": 16000, + "price_postapoc": 250, "to_hit": 1, "bashing": 10, "material": "steel", @@ -246,6 +260,7 @@ "weight": "540 g", "volume": "500 ml", "price": 1600, + "price_postapoc": 10, "to_hit": 1, "bashing": 3, "material": "steel", diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 045ae7067326e..51dde0e6f633f 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -7,6 +7,7 @@ "weight": "467 g", "volume": "250 ml", "price": 500, + "price_postapoc": 50, "to_hit": -4, "bashing": 3, "material": [ "plastic", "aluminum" ], @@ -54,6 +55,7 @@ "weight": "420 g", "volume": "500 ml", "price": 1500, + "price_postapoc": 250, "initial_charges": 30, "max_charges": 30, "charges_per_use": 1, @@ -71,10 +73,11 @@ "id": "cow_bell", "type": "TOOL", "name": { "str": "cow bell" }, - "description": "A brass cow bell. Potentially useful in so many ways.", + "description": "A brass cow bell. You feel like you need more of it.", "weight": "566 g", "volume": "1 L", "price": 700, + "price_postapoc": 10, "to_hit": 1, "bashing": 9, "material": [ "brass", "wood" ], @@ -93,6 +96,7 @@ "weight": "20 g", "volume": "100 ml", "price": 2500, + "price_postapoc": 100, "material": "plastic", "ammo": "battery", "magazines": [ @@ -123,6 +127,7 @@ "weight": "20 g", "volume": "100 ml", "price": 2500, + "price_postapoc": 100, "material": "plastic", "ammo": "battery", "power_draw": 9000, @@ -152,6 +157,7 @@ "weight": "628 g", "volume": "1 L", "price": 4000, + "price_postapoc": 500, "to_hit": 1, "bashing": 10, "cutting": 8, @@ -169,6 +175,7 @@ "weight": "311 g", "volume": "750 ml", "price": 300000, + "price_postapoc": 10, "bashing": 6, "material": "bone", "symbol": ";", @@ -183,6 +190,7 @@ "weight": "150 g", "volume": "250 ml", "price": 3500, + "price_postapoc": 10, "bashing": 2, "material": "wood", "symbol": "=", @@ -200,6 +208,7 @@ "weight": "1800 g", "volume": "3 L", "price": 4000, + "price_postapoc": 1250, "to_hit": -1, "material": "fur", "symbol": ";", @@ -221,7 +230,7 @@ "description": "A folding grappling hook attached to a stout 30-foot long piece of lightweight cord. Useful for keeping yourself safe from falls. Can be used in place of a long rope for butchering, in a pinch.", "weight": "760 g", "volume": "750 ml", - "price": 25000, + "price_postapoc": 500, "to_hit": -2, "bashing": 12, "cutting": 6, @@ -249,6 +258,7 @@ "bashing": 2, "cutting": 6, "price": 2000, + "price_postapoc": 250, "qualities": [ [ "HAMMER", 1 ], [ "BUTCHER", -5 ] ] }, { @@ -259,6 +269,7 @@ "name": { "str": "hand pump" }, "description": "This pump is suitable for pumping air into inflatable objects.", "price": 400, + "price_postapoc": 250, "material": [ "aluminum", "plastic" ], "weight": "113 g", "volume": "500 ml", @@ -275,6 +286,7 @@ "weight": "170 g", "volume": "500 ml", "price": 400, + "price_postapoc": 10, "to_hit": -1, "bashing": 1, "material": [ "plastic", "aluminum" ], @@ -301,6 +313,7 @@ "weight": "310 g", "volume": "1500 ml", "price": 12000, + "price_postapoc": 10, "to_hit": -1, "bashing": 3, "material": [ "steel", "plastic" ], @@ -316,6 +329,7 @@ "weight": "270 g", "volume": "500 ml", "price": 9000, + "price_postapoc": 10, "to_hit": -1, "bashing": 2, "material": [ "steel", "plastic" ], @@ -331,6 +345,7 @@ "weight": "300 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 25, "material": "kevlar", "symbol": ",", "color": "green", @@ -344,6 +359,7 @@ "weight": "12000 g", "volume": "7500 ml", "price": 20000, + "price_postapoc": 500, "to_hit": -3, "bashing": 12, "material": "steel", @@ -386,7 +402,7 @@ "weight": "104 g", "volume": "592 ml", "price": 4000, - "price_postapoc": 75000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 1, "material": [ "cotton", "plastic" ], @@ -407,6 +423,7 @@ "weight": "1800 g", "volume": "3 L", "price": 5000, + "price_postapoc": 250, "to_hit": 2, "bashing": 6, "cutting": 20, @@ -426,6 +443,7 @@ "description": "Surgical forceps, cables and a modified smartphone inside a small plastic pouch. Assembled to steal the mind of some poor man, these are tools of the creepy high-tech sandman.", "material": "plastic", "price": 12500, + "price_postapoc": 500, "use_action": "MIND_SPLICER", "volume": "1 L", "weight": "600 g", @@ -443,6 +461,7 @@ "volume": "30 ml", "//": "gasket sizes range from 1in diameter to 6in.", "price": 150, + "price_postapoc": 50, "to_hit": 10, "bashing": 1, "material": "plastic" @@ -455,6 +474,7 @@ "weight": "113 g", "volume": "50 ml", "price": 500, + "price_postapoc": 10, "material": "plastic", "symbol": ",", "color": "dark_gray", @@ -472,6 +492,7 @@ "weight": "238 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 100, "to_hit": -1, "material": "flesh", "symbol": "*", @@ -489,7 +510,7 @@ "weight": "65 g", "volume": "5 ml", "price": 25000, - "price_postapoc": 1000, + "price_postapoc": 100, "to_hit": -3, "material": [ "gold", "glass" ], "symbol": ",", @@ -504,6 +525,7 @@ "weight": "250 g", "volume": "1 L", "price": 4000, + "price_postapoc": 250, "to_hit": -1, "material": "plastic", "symbol": ";", @@ -526,6 +548,7 @@ "weight": "2267 g", "volume": "3750 ml", "price": 8000, + "price_postapoc": 10, "to_hit": -2, "bashing": 10, "material": "steel", @@ -542,6 +565,7 @@ "weight": "5 g", "volume": "4 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 1, "material": "paper", @@ -556,6 +580,7 @@ "weight": "6000 g", "volume": "3750 ml", "price": 5000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 8, "material": "steel", @@ -601,6 +626,7 @@ "weight": "340 g", "volume": "250 ml", "price": 500, + "price_postapoc": 10, "material": "aluminum", "symbol": ";", "color": "light_gray", @@ -618,6 +644,7 @@ "weight": "20000 g", "volume": "50 L", "price": 2000, + "price_postapoc": 100, "to_hit": -3, "bashing": 12, "material": "wood", @@ -633,6 +660,7 @@ "weight": "113 g", "volume": "15 ml", "price": 0, + "price_postapoc": 10, "material": "plastic", "symbol": ",", "color": "dark_gray", @@ -650,6 +678,7 @@ "weight": "500 g", "volume": "250 ml", "price": 600, + "price_postapoc": 750, "to_hit": -1, "material": [ "glass", "plastic" ], "symbol": "o", @@ -707,6 +736,7 @@ "weight": "118 g", "volume": "500 ml", "price": 12000, + "price_postapoc": 100, "to_hit": 1, "bashing": 1, "material": [ "plastic", "aluminum" ], @@ -723,6 +753,7 @@ "weight": "64 g", "volume": "250 ml", "price": 98000, + "price_postapoc": 100, "to_hit": 100, "bashing": 1, "cutting": 1, @@ -740,6 +771,7 @@ "weight": "22 g", "volume": 0, "price": 10000, + "price_postapoc": 1000, "material": "superalloy", "symbol": ";", "color": "yellow", @@ -754,6 +786,7 @@ "weight": "141 g", "volume": "1500 ml", "price": 2400, + "price_postapoc": 50, "to_hit": 1, "bashing": 6, "cutting": 4, @@ -771,6 +804,7 @@ "weight": "1 g", "volume": "250 ml", "price": 300000, + "price_postapoc": 2000, "bashing": 6, "material": "stone", "symbol": ";", @@ -789,6 +823,7 @@ "weight": "7 g", "volume": "25 ml", "price": 200, + "price_postapoc": 250, "to_hit": -3, "material": "plastic", "symbol": ";", diff --git a/data/json/items/tool/musical_instruments.json b/data/json/items/tool/musical_instruments.json index 7af512de92728..81b05f5561fbe 100644 --- a/data/json/items/tool/musical_instruments.json +++ b/data/json/items/tool/musical_instruments.json @@ -8,6 +8,7 @@ "weight": "2000 g", "volume": "3 L", "price": 7500, + "price_postapoc": 500, "to_hit": 2, "bashing": 7, "material": [ "wood", "iron" ], @@ -38,6 +39,7 @@ "weight": "250 g", "volume": "500 ml", "price": 5000, + "price_postapoc": 100, "bashing": 2, "material": "bone", "symbol": "-", @@ -68,6 +70,7 @@ "weight": "550 g", "volume": "1500 ml", "price": 5500, + "price_postapoc": 250, "to_hit": 1, "bashing": 4, "material": [ "wood", "iron" ], @@ -98,6 +101,7 @@ "weight": "250 g", "volume": "500 ml", "price": 5000, + "price_postapoc": 150, "bashing": 2, "material": [ "iron", "silver" ], "symbol": "-", @@ -127,6 +131,7 @@ "weight": "1500 g", "volume": "2500 ml", "price": 7500, + "price_postapoc": 300, "to_hit": 1, "bashing": 7, "material": [ "brass" ], @@ -157,6 +162,7 @@ "weight": "2000 g", "volume": "2500 ml", "price": 7500, + "price_postapoc": 250, "to_hit": 2, "bashing": 5, "material": [ "wood" ], @@ -187,6 +193,7 @@ "weight": "1300 g", "volume": "2500 ml", "price": 7500, + "price_postapoc": 600, "to_hit": 2, "bashing": 5, "material": [ "wood" ], @@ -217,6 +224,7 @@ "weight": "13000 g", "volume": "2500 ml", "price": 1000000, + "price_postapoc": 1000, "to_hit": 2, "bashing": 9, "material": [ "gold" ], diff --git a/data/json/items/tool/pets.json b/data/json/items/tool/pets.json index de5c1e900e800..fd1b5fc9ed146 100644 --- a/data/json/items/tool/pets.json +++ b/data/json/items/tool/pets.json @@ -7,6 +7,7 @@ "weight": "250 g", "volume": "2500 ml", "price": 100, + "price_postapoc": 100, "bashing": 1, "cutting": 1, "material": [ "steel" ], @@ -24,6 +25,7 @@ "weight": "22 g", "volume": "5 ml", "price": 1000, + "price_postapoc": 100, "material": "aluminum", "symbol": ";", "color": "yellow", @@ -37,6 +39,7 @@ "weight": "820 g", "volume": "750 ml", "price": 500, + "price_postapoc": 250, "to_hit": -1, "cutting": 3, "material": [ "steel", "plastic" ], @@ -53,6 +56,7 @@ "weight": "1200 g", "volume": "1200 ml", "price": 2400, + "price_postapoc": 250, "to_hit": -1, "bashing": 2, "material": [ "plastic", "steel" ], @@ -72,6 +76,7 @@ "weight": "2 kg", "volume": "7 L", "price": 0, + "price_postapoc": 1000, "to_hit": -1, "bashing": 5, "material": [ "leather", "steel" ], @@ -87,6 +92,7 @@ "weight": "1000 g", "volume": "5 L", "price": 1000, + "price_postapoc": 100, "bashing": 1, "cutting": 1, "material": [ "steel", "plastic" ], @@ -105,6 +111,7 @@ "weight": "1500 g", "volume": "6250 ml", "price": 800, + "price_postapoc": 50, "material": [ "wood" ], "symbol": "#", "color": "brown", @@ -118,6 +125,7 @@ "weight": "50 g", "volume": "20 ml", "price": 800, + "price_postapoc": 100, "material": "wood", "symbol": ";", "color": "yellow", diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json index 55401e676d67c..1c1deff58a7bb 100644 --- a/data/json/items/tool/radio_tools.json +++ b/data/json/items/tool/radio_tools.json @@ -8,6 +8,7 @@ "weight": "3200 g", "volume": "2 L", "price": 30000, + "price_postapoc": 250, "to_hit": -1, "material": [ "plastic" ], "symbol": ")", @@ -76,6 +77,7 @@ "weight": "142 g", "volume": "250 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -2, "material": "steel", "symbol": ";", @@ -90,6 +92,7 @@ "weight": "295 g", "volume": "1 L", "price": 1000, + "price_postapoc": 500, "to_hit": -1, "bashing": 4, "material": [ "plastic", "aluminum" ], @@ -134,6 +137,7 @@ "weight": "431 g", "volume": "500 ml", "price": 2000, + "price_postapoc": 750, "bashing": 6, "material": [ "plastic", "aluminum" ], "symbol": ";", @@ -165,6 +169,7 @@ "weight": "907 g", "volume": "1 L", "price": 2000, + "price_postapoc": 250, "to_hit": -1, "material": "plastic", "symbol": "#", diff --git a/data/json/items/tool/raincatchers.json b/data/json/items/tool/raincatchers.json index bd815518bb1f7..5c292cd7c55f2 100644 --- a/data/json/items/tool/raincatchers.json +++ b/data/json/items/tool/raincatchers.json @@ -7,6 +7,7 @@ "weight": "3 g", "volume": "250ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "material": "wood", "symbol": ";", @@ -28,6 +29,7 @@ "weight": "606 g", "volume": "500 ml", "price": 500, + "price_postapoc": 100, "to_hit": 1, "bashing": 4, "material": "plastic", @@ -50,6 +52,7 @@ "weight": "4 g", "volume": "250 ml", "price": 0, + "price_postapoc": 100, "to_hit": 1, "material": "leather", "symbol": ";", @@ -71,6 +74,7 @@ "weight": "4 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "material": "plastic", "symbol": ";", @@ -92,6 +96,7 @@ "weight": "4017 g", "volume": "4 L", "price": 1500, + "price_postapoc": 250, "to_hit": 1, "bashing": 4, "material": "steel", @@ -114,6 +119,7 @@ "weight": "3980 g", "volume": "4 L", "price": 6000, + "price_postapoc": 100, "material": [ "wood", "plastic" ], "symbol": ";", "color": "yellow", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 4bc310e29f96a..99f2cb9f1ef6d 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -8,6 +8,7 @@ "weight": "1 g", "volume": "250 ml", "price": 100, + "price_postapoc": 10, "to_hit": -3, "material": "plastic", "symbol": ";", @@ -23,6 +24,7 @@ "weight": "1596 g", "volume": "500 ml", "price": 35000, + "price_postapoc": 1000, "to_hit": 1, "bashing": 4, "material": "aluminum", @@ -41,6 +43,7 @@ "weight": "5200 g", "volume": "4500 ml", "price": 20000, + "price_postapoc": 1000, "to_hit": -5, "bashing": 2, "material": [ "glass", "cotton" ], @@ -68,6 +71,7 @@ "weight": "1884 g", "volume": "2750 ml", "price": 3200, + "price_postapoc": 500, "to_hit": -5, "bashing": 2, "material": [ "glass", "cotton" ], @@ -83,6 +87,7 @@ "weight": "250 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 750, "material": [ "steel", "copper", "plastic" ], "symbol": ";", "ammo": "battery", @@ -102,6 +107,7 @@ "weight": "2268 g", "volume": "1500 ml", "price": 1000, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -121,6 +127,7 @@ "weight": "1 g", "volume": "250 ml", "price": 100, + "price_postapoc": 500, "to_hit": -3, "material": "plastic", "symbol": ";", @@ -136,6 +143,7 @@ "weight": "2268 g", "volume": "1500 ml", "price": 1000, + "price_postapoc": 250, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -154,6 +162,7 @@ "weight": "12888 g", "volume": "2500 ml", "price": 13400, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -172,6 +181,7 @@ "weight": "660 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 100, "to_hit": 1, "bashing": 2, "material": "platinum", @@ -188,6 +198,7 @@ "weight": "1133 g", "volume": "500 ml", "price": 660000, + "price_postapoc": 1000, "to_hit": -1, "bashing": 6, "material": [ "superalloy", "plastic" ], @@ -206,6 +217,7 @@ "weight": "2000 g", "volume": "1 L", "price": 700000, + "price_postapoc": 1000, "to_hit": -4, "bashing": 1, "cutting": 8, @@ -222,6 +234,7 @@ "weight": "1360 g", "volume": "2 L", "price": 600000, + "price_postapoc": 1000, "to_hit": -1, "bashing": 4, "material": [ "plastic", "aluminum" ], @@ -241,6 +254,7 @@ "weight": "10 g", "volume": "2500 ml", "price": 200, + "price_postapoc": 500, "to_hit": -1, "bashing": 1, "material": [ "plastic", "aluminum" ], @@ -275,6 +289,7 @@ "weight": "12500 g", "volume": "5 L", "price": 25000, + "price_postapoc": 1000, "ammo": "battery", "to_hit": -5, "bashing": 2, @@ -299,6 +314,7 @@ "weight": "1000 g", "volume": "2 L", "price": 1600, + "price_postapoc": 100, "to_hit": -5, "bashing": 2, "material": [ "steel" ], @@ -314,6 +330,7 @@ "weight": "5000 g", "volume": "2 L", "price": 8000, + "price_postapoc": 500, "ammo": "battery", "to_hit": -5, "bashing": 2, @@ -337,6 +354,7 @@ "weight": "500 g", "volume": "250 ml", "price": 1200, + "price_postapoc": 250, "to_hit": -5, "bashing": 2, "material": [ "plastic" ], @@ -352,6 +370,7 @@ "weight": "3000 g", "volume": "1500 ml", "price": 6000, + "price_postapoc": 250, "ammo": "battery", "to_hit": -5, "bashing": 2, @@ -383,6 +402,7 @@ "weight": "3000 g", "volume": "1500 ml", "price": 6000, + "price_postapoc": 250, "ammo": "battery", "to_hit": -5, "bashing": 2, @@ -414,6 +434,7 @@ "weight": "5000 g", "volume": "1500 ml", "price": 6000, + "price_postapoc": 250, "ammo": "battery", "to_hit": -5, "bashing": 2, @@ -445,6 +466,7 @@ "weight": "3500 g", "volume": "750 ml", "price": 1000, + "price_postapoc": 500, "to_hit": -5, "bashing": 4, "material": [ "steel", "plastic" ], @@ -460,6 +482,7 @@ "weight": "50 g", "volume": "250 ml", "price": 400, + "price_postapoc": 250, "to_hit": -5, "bashing": 2, "looks_like": "e_scrap", @@ -476,6 +499,7 @@ "weight": "50 g", "volume": "250 ml", "price": 50, + "price_postapoc": 50, "to_hit": -5, "bashing": 2, "material": [ "glass" ], @@ -492,6 +516,7 @@ "volume": "30ml", "//": "Volume here is displacement volume of a corked 25mL test tube.", "price": 10, + "price_postapoc": 10, "to_hit": -5, "bashing": 1, "material": [ "glass" ], @@ -507,6 +532,7 @@ "weight": "2000 g", "volume": "3800ml", "price": 3000, + "price_postapoc": 250, "to_hit": -5, "bashing": 3, "material": [ "steel", "glass" ], @@ -522,6 +548,7 @@ "weight": "2200 g", "volume": "4000ml", "price": 3000, + "price_postapoc": 250, "to_hit": -5, "bashing": 3, "material": [ "steel", "glass" ], @@ -537,6 +564,7 @@ "weight": "200 g", "volume": "700ml", "price": 100, + "price_postapoc": 100, "to_hit": -5, "bashing": 2, "material": [ "glass", "plastic" ], @@ -554,6 +582,7 @@ "weight": "300 g", "volume": "1000ml", "price": 1000, + "price_postapoc": 100, "to_hit": -4, "bashing": 2, "material": [ "glass", "plastic" ], @@ -570,6 +599,7 @@ "weight": "18000 g", "volume": "60000ml", "price": 8000, + "price_postapoc": 500, "to_hit": -5, "bashing": 8, "material": [ "steel", "glass" ], @@ -586,6 +616,7 @@ "weight": "1000 g", "volume": "5000ml", "price": 2000, + "price_postapoc": 750, "to_hit": -5, "bashing": 2, "material": [ "glass" ], @@ -603,6 +634,7 @@ "weight": "1000 g", "volume": "5000ml", "price": 500, + "price_postapoc": 100, "to_hit": -5, "bashing": 2, "material": [ "plastic" ], @@ -619,6 +651,7 @@ "weight": "2000 g", "volume": "1500ml", "price": 1000, + "price_postapoc": 500, "to_hit": -5, "bashing": 2, "material": [ "aluminum", "steel", "plastic" ], @@ -652,6 +685,7 @@ "weight": "5 g", "volume": "1ml", "price": 5, + "price_postapoc": 10, "to_hit": -5, "bashing": 2, "material": [ "plastic" ], @@ -668,6 +702,7 @@ "weight": "90 g", "volume": "250ml", "price": 25, + "price_postapoc": 10, "to_hit": -1, "bashing": 2, "material": [ "plastic" ], @@ -684,6 +719,7 @@ "weight": "70 g", "volume": "150ml", "price": 25, + "price_postapoc": 10, "to_hit": -1, "bashing": 2, "material": [ "plastic" ], @@ -700,6 +736,7 @@ "weight": "900 g", "volume": "550ml", "price": 75, + "price_postapoc": 10, "to_hit": -1, "bashing": 2, "material": [ "steel" ], @@ -716,6 +753,7 @@ "weight": "300 g", "volume": "450ml", "price": 75, + "price_postapoc": 10, "to_hit": -1, "bashing": 2, "material": [ "steel", "plastic" ], diff --git a/data/json/items/tool/shelters.json b/data/json/items/tool/shelters.json index e5b00e285438f..156dd13b968a7 100644 --- a/data/json/items/tool/shelters.json +++ b/data/json/items/tool/shelters.json @@ -7,6 +7,7 @@ "weight": "1360 g", "volume": "7500 ml", "price": 2000, + "price_postapoc": 50, "to_hit": -3, "bashing": 4, "material": [ "wood", "leather" ], @@ -21,6 +22,7 @@ "weight": "2266 g", "volume": "10 L", "price": 50000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 6, "material": [ "plastic", "aluminum" ], @@ -45,6 +47,7 @@ "weight": "1360 g", "volume": "7500 ml", "price": 6500, + "price_postapoc": 500, "to_hit": -3, "bashing": 4, "material": [ "wood", "leather" ], @@ -68,6 +71,7 @@ "weight": "1133 g", "volume": "2500 ml", "price": 15000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 4, "material": [ "plastic", "aluminum" ], diff --git a/data/json/items/tool/smoking.json b/data/json/items/tool/smoking.json index ab914876835c0..4a3fdf6b70b7e 100644 --- a/data/json/items/tool/smoking.json +++ b/data/json/items/tool/smoking.json @@ -8,6 +8,7 @@ "weight": "200 g", "volume": "250 ml", "price": 5000, + "price_postapoc": 100, "to_hit": -1, "material": "steel", "symbol": "!", @@ -40,6 +41,7 @@ "weight": "242 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "to_hit": -10, "material": "glass", "symbol": ",", @@ -54,6 +56,7 @@ "weight": "163 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 100, "to_hit": -10, "bashing": 1, "material": "glass", @@ -69,6 +72,7 @@ "weight": "372 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 100, "to_hit": -10, "bashing": 1, "material": "wood", diff --git a/data/json/items/tool/stationary.json b/data/json/items/tool/stationary.json index 9f325195aced6..506791129a37a 100644 --- a/data/json/items/tool/stationary.json +++ b/data/json/items/tool/stationary.json @@ -8,6 +8,7 @@ "weight": "300 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 10, "material": "steel", "symbol": ";", "color": "light_gray" @@ -21,6 +22,7 @@ "weight": "20 g", "volume": "10 ml", "price": 25, + "price_postapoc": 10, "material": "plastic", "symbol": ";", "color": "light_gray" @@ -33,6 +35,7 @@ "weight": "113 g", "volume": "250 ml", "price": 400, + "price_postapoc": 10, "to_hit": -1, "cutting": 6, "material": [ "aluminum", "plastic" ], diff --git a/data/json/items/tool/tailoring.json b/data/json/items/tool/tailoring.json index c882d2538c137..93afa92b8003c 100644 --- a/data/json/items/tool/tailoring.json +++ b/data/json/items/tool/tailoring.json @@ -8,6 +8,7 @@ "weight": "200 g", "volume": "250 ml", "price": 300, + "price_postapoc": 50, "to_hit": -1, "bashing": 2, "cutting": 5, @@ -25,6 +26,7 @@ "description": "This is a steel awl with a wooden grip, usually used for leatherworking. It can also serve as an improvised stabbing weapon, but will break quickly.", "weight": "170 g", "price": 450, + "price_postapoc": 100, "cutting": 10, "material": [ "steel", "wood" ], "delete": { "qualities": [ [ "LEATHER_AWL", 1 ] ] }, @@ -39,6 +41,7 @@ "weight": "56 g", "volume": "5 ml", "price": 600, + "price_postapoc": 100, "cutting": 1, "material": "wood", "symbol": ",", @@ -55,6 +58,7 @@ "weight": "3804 g", "volume": "6000 ml", "price": 4000, + "price_postapoc": 750, "material": "wood", "symbol": ";", "color": "yellow" @@ -67,6 +71,7 @@ "weight": "85 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "bone", "symbol": ";", "color": "white", @@ -94,6 +99,7 @@ "weight": "85 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "steel", "symbol": ";", "color": "light_gray", @@ -121,6 +127,7 @@ "weight": "85 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "wood", "symbol": ";", "color": "brown", @@ -148,6 +155,7 @@ "weight": "85 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 500, "to_hit": -1, "material": [ "plastic", "steel" ], "symbol": ",", @@ -177,6 +185,7 @@ "weight": "300 g", "volume": "250 ml", "price": 100, + "price_postapoc": 50, "bashing": 2, "material": "wood", "symbol": ";", @@ -191,6 +200,7 @@ "weight": "600 g", "volume": "1 L", "price": 0, + "price_postapoc": 0, "to_hit": -2, "material": [ "flesh", "leather" ], "symbol": ",", @@ -215,6 +225,7 @@ "weight": "684 g", "volume": "1 L", "price": 0, + "price_postapoc": 0, "to_hit": -2, "material": [ "fur", "flesh" ], "symbol": ",", @@ -239,6 +250,7 @@ "weight": "1000 g", "volume": "833 ml", "price": 4000, + "price_postapoc": 500, "material": "paper", "symbol": ";", "color": "yellow" @@ -251,6 +263,7 @@ "weight": "100 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 1000, "to_hit": -2, "material": [ "plastic", "steel" ], "symbol": ";", diff --git a/data/json/items/tool/toileteries.json b/data/json/items/tool/toileteries.json index eaf8f30f9be8f..5bbff872172df 100644 --- a/data/json/items/tool/toileteries.json +++ b/data/json/items/tool/toileteries.json @@ -9,6 +9,7 @@ "weight": "1200 g", "volume": "1 L", "price": 500, + "price_postapoc": 50, "to_hit": -2, "bashing": 6, "material": "steel", @@ -23,6 +24,7 @@ "weight": "70 g", "volume": "250 ml", "price": 200, + "price_postapoc": 10, "to_hit": -1, "bashing": 1, "material": "plastic", @@ -38,6 +40,7 @@ "weight": "138 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 250, "to_hit": -1, "bashing": 1, "material": [ "plastic", "aluminum" ], @@ -57,6 +60,7 @@ "weight": "929 g", "volume": "1750 ml", "price": 1000, + "price_postapoc": 10, "to_hit": -1, "bashing": 6, "material": "wood", @@ -74,6 +78,7 @@ "weight": "80 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "material": "cotton", "symbol": ",", "color": "white", @@ -101,6 +106,7 @@ "weight": "90 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 250, "to_hit": -1, "material": "plastic", "symbol": ";", @@ -119,6 +125,7 @@ "weight": "80 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "plastic", "symbol": "s", "color": "yellow", @@ -133,6 +140,7 @@ "weight": "642 g", "volume": "1 L", "price": 1000, + "price_postapoc": 250, "to_hit": -1, "bashing": 1, "material": [ "leather", "glass" ], @@ -148,6 +156,7 @@ "weight": "540 g", "volume": "750 ml", "price": 1000, + "price_postapoc": 100, "to_hit": -1, "bashing": 1, "material": [ "leather", "glass" ], @@ -166,6 +175,7 @@ "weight": "90 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 50, "to_hit": -1, "material": "wood", "symbol": ";", @@ -181,6 +191,7 @@ "weight": "80 g", "volume": "250 ml", "price": 0, + "price_postapoc": 50, "material": "plastic", "symbol": "%", "color": "yellow", diff --git a/data/json/items/tool/traps.json b/data/json/items/tool/traps.json index 372a2feddbbc6..922de3f4ed80c 100644 --- a/data/json/items/tool/traps.json +++ b/data/json/items/tool/traps.json @@ -7,6 +7,7 @@ "weight": "14000 g", "volume": "1500 ml", "price": 6000, + "price_postapoc": 1000, "to_hit": -2, "bashing": 9, "cutting": 1, @@ -32,6 +33,7 @@ "weight": "2381 g", "volume": "4500 ml", "price": 5000, + "price_postapoc": 1500, "to_hit": -4, "bashing": 4, "cutting": 14, @@ -55,6 +57,7 @@ "weight": "2041 g", "volume": "1500 ml", "price": 0, + "price_postapoc": 25, "to_hit": -3, "bashing": 12, "cutting": 6, @@ -78,6 +81,7 @@ "weight": "586 g", "volume": "750 ml", "price": 5000, + "price_postapoc": 500, "to_hit": -4, "material": [ "steel", "plastic" ], "symbol": ";", @@ -98,6 +102,7 @@ "weight": "6 g", "volume": "250 ml", "price": 50, + "price_postapoc": 10, "material": "plastic", "symbol": ";", "color": "light_cyan", @@ -118,6 +123,7 @@ "weight": "264 g", "volume": "250 ml", "price": 900, + "price_postapoc": 100, "to_hit": -4, "bashing": 1, "cutting": 8, @@ -140,6 +146,7 @@ "weight": "264 g", "volume": "500 ml", "price": 100, + "price_postapoc": 50, "to_hit": -4, "cutting": 6, "material": "glass", @@ -161,6 +168,7 @@ "weight": "1772 g", "volume": "1750 ml", "price": 6000, + "price_postapoc": 1000, "to_hit": -2, "bashing": 4, "material": [ "steel", "wood" ], @@ -182,6 +190,7 @@ "weight": "2360 g", "volume": "500 ml", "price": 5000, + "price_postapoc": 500, "to_hit": -1, "bashing": 6, "material": "steel", @@ -205,6 +214,7 @@ "weight": "2922 g", "volume": "1750 ml", "price": 25000, + "price_postapoc": 1000, "to_hit": -2, "bashing": 12, "material": [ "steel", "wood" ], @@ -226,6 +236,7 @@ "weight": "40 g", "volume": "250 ml", "price": 300, + "price_postapoc": 10, "to_hit": -1, "material": "aluminum", "symbol": ";", diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index ff37f30316d3d..b1d1687e35c95 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -7,6 +7,7 @@ "weight": "2267 g", "volume": "2500 ml", "price": 10500, + "price_postapoc": 750, "to_hit": 1, "bashing": 20, "cutting": 14, @@ -25,6 +26,7 @@ "weight": "6577 g", "volume": "2500 ml", "price": 8000, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -62,6 +64,7 @@ "weight": "2940 g", "volume": "750 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -3, "bashing": 2, "cutting": 4, @@ -104,6 +107,7 @@ "weight": "3700 g", "volume": "3500 ml", "price": 5500, + "price_postapoc": 50, "bashing": 18, "cutting": 12, "material": [ "wood", "copper" ], @@ -121,7 +125,7 @@ "name": { "str": "hatchet" }, "description": "A one-handed hatchet. Makes a great melee weapon, and is useful both for chopping things and for use as a hammer.", "price": 2500, - "price_postapoc": 5000, + "price_postapoc": 500, "material": [ "steel", "wood" ], "techniques": [ "WBLOCK_1" ], "weight": "907 g", @@ -141,6 +145,7 @@ "weight": "6577 g", "volume": "2500 ml", "price": 8000, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -184,6 +189,7 @@ "weight": "453 g", "volume": "500 ml", "price": 0, + "price_postapoc": 50, "to_hit": -1, "bashing": 5, "cutting": 3, @@ -210,6 +216,7 @@ "weight": "1300 g", "volume": "1 L", "price": 1000, + "price_postapoc": 50, "bashing": 8, "cutting": 7, "material": [ "stone", "wood" ], @@ -226,6 +233,7 @@ "weight": "3154 g", "volume": "3500 ml", "price": 0, + "price_postapoc": 50, "bashing": 11, "cutting": 8, "material": [ "wood", "stone" ], @@ -242,6 +250,7 @@ "weight": "283 g", "volume": "1 L", "price": 3000, + "price_postapoc": 100, "to_hit": -2, "cutting": 1, "material": [ "steel", "wood" ], diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index e75c66da0e239..b15a732b33fdd 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -7,6 +7,7 @@ "weight": "35000 g", "volume": "12500 ml", "price": 100, + "price_postapoc": 0, "to_hit": -2, "material": [ "soil", "wood" ], "symbol": "#", @@ -32,6 +33,7 @@ "weight": "30000 g", "volume": "12500 ml", "price": 40000, + "price_postapoc": 250, "to_hit": -3, "material": [ "ceramic", "wood" ], "symbol": "#", @@ -49,6 +51,7 @@ "weight": "8000 g", "volume": "3 L", "price": 3200, + "price_postapoc": 500, "to_hit": -4, "bashing": 12, "material": "steel" @@ -61,6 +64,7 @@ "weight": "2780 g", "volume": "1750 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -3, "bashing": 2, "cutting": 2, @@ -88,6 +92,7 @@ "weight": "9600 g", "volume": "9 L", "price": 25000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 13, "material": "steel", @@ -106,6 +111,7 @@ "weight": "360 g", "volume": "500 ml", "price": 3000, + "price_postapoc": 250, "to_hit": 1, "bashing": 3, "material": [ "wood" ], @@ -120,6 +126,7 @@ "weight": "60 g", "volume": "500 ml", "price": 7000, + "price_postapoc": 100, "to_hit": 1, "cutting": 2, "material": [ "steel", "wood" ], @@ -135,6 +142,7 @@ "weight": "320 g", "volume": "500 ml", "price": 500, + "price_postapoc": 100, "to_hit": -2, "bashing": 1, "cutting": 1, @@ -151,6 +159,7 @@ "weight": "340 g", "volume": "375 ml", "price": 1000, + "price_postapoc": 250, "to_hit": 1, "bashing": 10, "cutting": 1, @@ -169,6 +178,7 @@ "weight": "9071 g", "volume": "5 L", "price": 50000, + "price_postapoc": 500, "to_hit": -6, "bashing": 15, "material": "steel", @@ -194,6 +204,7 @@ "weight": "2721 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 250, "to_hit": -1, "bashing": 3, "cutting": 1, @@ -219,6 +230,7 @@ "weight": "612 g", "volume": "1500 ml", "price": 7000, + "price_postapoc": 100, "to_hit": 1, "bashing": 4, "material": [ "wood" ], @@ -234,6 +246,7 @@ "weight": "40000 g", "volume": "5 L", "price": 40000, + "price_postapoc": 500, "to_hit": -8, "bashing": 14, "cutting": 6, @@ -255,6 +268,7 @@ "weight": "952 g", "volume": "1 L", "price": 2500, + "price_postapoc": 100, "to_hit": -1, "bashing": 1, "cutting": 1, @@ -272,6 +286,7 @@ "weight": "566 g", "volume": "500 ml", "price": 700, + "price_postapoc": 100, "to_hit": 1, "bashing": 9, "material": [ "steel", "wood" ], @@ -289,6 +304,7 @@ "weight": "907 g", "volume": "250 ml", "price": 500, + "price_postapoc": 100, "to_hit": -1, "bashing": 3, "cutting": 1, @@ -305,6 +321,7 @@ "weight": "544 g", "volume": "500 ml", "price": 200, + "price_postapoc": 100, "to_hit": 3, "bashing": 4, "material": [ "plastic" ], @@ -323,6 +340,7 @@ "weight": "5000 g", "volume": "1500 ml", "price": 18000, + "price_postapoc": 500, "bashing": 8, "to_hit": -2, "qualities": [ [ "JACK", 16 ] ] @@ -338,6 +356,7 @@ "weight": "1800 g", "volume": "1 L", "price": 800, + "price_postapoc": 100, "bashing": 4, "to_hit": -2, "qualities": [ [ "JACK", 3 ] ] @@ -353,6 +372,7 @@ "weight": "3000 g", "volume": "750 ml", "price": 5000, + "price_postapoc": 750, "bashing": 4, "to_hit": -2, "qualities": [ [ "JACK", 4 ] ] @@ -365,6 +385,7 @@ "weight": "15875 g", "volume": "5 L", "price": 40000, + "price_postapoc": 1000, "to_hit": -8, "bashing": 14, "cutting": 6, @@ -385,6 +406,7 @@ "weight": "12000 g", "volume": "7500 ml", "price": 50000, + "price_postapoc": 750, "to_hit": -3, "bashing": 12, "material": "steel", @@ -405,6 +427,7 @@ "weight": "9860 g", "volume": "2500 ml", "price": 5000, + "price_postapoc": 1500, "to_hit": -2, "bashing": 8, "material": [ "steel", "aluminum" ], @@ -442,6 +465,7 @@ "weight": "1020 g", "volume": "500 ml", "price": 0, + "price_postapoc": 10, "bashing": 9, "material": [ "steel", "wood" ], "symbol": ";", @@ -458,6 +482,7 @@ "weight": "76 g", "volume": "250 ml", "price": 300, + "price_postapoc": 100, "to_hit": -2, "bashing": 1, "cutting": 1, @@ -474,6 +499,7 @@ "weight": "362 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 50, "bashing": 4, "material": "iron", "symbol": ",", @@ -488,6 +514,7 @@ "weight": "386 g", "volume": "1500 ml", "price": 1000, + "price_postapoc": 500, "to_hit": -1, "bashing": 2, "material": [ "steel", "plastic" ], @@ -518,6 +545,7 @@ "weight": "320 g", "volume": "2500 ml", "price": 1000, + "price_postapoc": 50, "to_hit": 1, "bashing": 3, "material": "plastic", @@ -534,6 +562,7 @@ "weight": "250 g", "volume": "70 ml", "price": 3000, + "price_postapoc": 500, "to_hit": -4, "bashing": 1, "cutting": 4, @@ -551,6 +580,7 @@ "weight": "1600 g", "volume": "1 L", "price": 20000, + "price_postapoc": 750, "material": [ "steel", "plastic" ], "symbol": ";", "color": "red", @@ -569,6 +599,7 @@ "weight": "60 g", "volume": "500 ml", "price": 7000, + "price_postapoc": 10, "to_hit": 1, "material": [ "wood" ], "symbol": ";", @@ -583,6 +614,7 @@ "weight": "4535 g", "volume": "3 L", "price": 16000, + "price_postapoc": 1250, "to_hit": -3, "bashing": 12, "cutting": 8, @@ -601,6 +633,7 @@ "weight": "76 g", "volume": "250 ml", "price": 300, + "price_postapoc": 100, "to_hit": -2, "bashing": 1, "cutting": 1, @@ -617,6 +650,7 @@ "weight": "807 g", "volume": "250 ml", "price": 800, + "price_postapoc": 100, "bashing": 3, "material": "steel", "symbol": ";", @@ -632,6 +666,7 @@ "weight": "1000 g", "volume": "3500 ml", "price": 35000, + "price_postapoc": 250, "to_hit": -2, "bashing": 6, "cutting": 2, @@ -664,6 +699,7 @@ "weight": "1020 g", "volume": "500 ml", "price": 0, + "price_postapoc": 10, "bashing": 9, "material": [ "stone", "wood" ], "symbol": ";", @@ -680,6 +716,7 @@ "weight": "170 g", "volume": "40 ml", "price": 450, + "price_postapoc": 50, "to_hit": -1, "bashing": 2, "cutting": 6, @@ -697,6 +734,7 @@ "weight": "340 g", "volume": "500 ml", "price": 2000, + "price_postapoc": 250, "to_hit": -1, "bashing": 2, "cutting": 6, @@ -714,6 +752,7 @@ "weight": "2420 g", "volume": "1500 ml", "price": 1500, + "price_postapoc": 750, "to_hit": -1, "bashing": 6, "material": [ "steel", "plastic" ], @@ -752,6 +791,7 @@ "weight": "181 g", "volume": "500 ml", "price": 1000, + "price_postapoc": 100, "bashing": 2, "cutting": 6, "material": "iron", @@ -795,6 +835,7 @@ "weight": "3522 g", "volume": "2500 ml", "price": 12999, + "price_postapoc": 3000, "to_hit": -2, "bashing": 8, "material": "steel", @@ -826,6 +867,7 @@ "weight": "3994 g", "volume": "2500 ml", "price": 14099, + "price_postapoc": 3250, "to_hit": -2, "bashing": 8, "material": "steel", @@ -904,6 +946,7 @@ "weight": "4200 g", "volume": "2500 ml", "price": 9000, + "price_postapoc": 750, "to_hit": -1, "bashing": 7, "material": "steel", @@ -940,6 +983,7 @@ "weight": "7250 g", "volume": "3500 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -2, "bashing": 7, "material": "steel", @@ -975,6 +1019,7 @@ "weight": "2000 g", "volume": "3500 ml", "price": 2000, + "price_postapoc": 50, "to_hit": -3, "bashing": 12, "material": "wood", @@ -991,6 +1036,7 @@ "weight": "200 g", "volume": "500 ml", "price": 0, + "price_postapoc": 10, "to_hit": -4, "material": [ "wool" ], "symbol": ",", @@ -1005,6 +1051,7 @@ "weight": "23 g", "volume": "20 ml", "price": 400, + "price_postapoc": 100, "to_hit": -3, "cutting": 6, "material": [ "steel", "plastic" ], @@ -1022,6 +1069,7 @@ "weight": "907 g", "volume": "500 ml", "price": 1200, + "price_postapoc": 100, "to_hit": 1, "bashing": 9, "material": "steel", From 5c6df3d2af00c6db14e3f5d2a1d64c3f193e3161 Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Fri, 17 Apr 2020 07:30:20 +0200 Subject: [PATCH 37/45] Add prices to vehicle parts --- data/json/items/vehicle/alternator.json | 15 ++++++---- data/json/items/vehicle/animals.json | 1 + data/json/items/vehicle/armor.json | 2 ++ data/json/items/vehicle/battery.json | 14 +++++---- data/json/items/vehicle/boat.json | 13 +++++--- data/json/items/vehicle/cables.json | 2 ++ data/json/items/vehicle/cargo.json | 16 +++++++--- data/json/items/vehicle/controls.json | 22 ++++++++++---- data/json/items/vehicle/engine.json | 36 ++++++++++++++++++----- data/json/items/vehicle/engineering.json | 6 ++++ data/json/items/vehicle/farming.json | 3 ++ data/json/items/vehicle/frames.json | 7 ++++- data/json/items/vehicle/fuel_storage.json | 3 +- data/json/items/vehicle/lights.json | 8 ++++- data/json/items/vehicle/manual.json | 3 +- data/json/items/vehicle/mills.json | 6 +++- data/json/items/vehicle/motors.json | 10 +++++-- data/json/items/vehicle/noise.json | 10 +++++-- data/json/items/vehicle/plating.json | 15 ++++++++-- data/json/items/vehicle/rams.json | 1 + data/json/items/vehicle/rigs.json | 1 + data/json/items/vehicle/rotor.json | 2 ++ data/json/items/vehicle/seating.json | 5 ++-- data/json/items/vehicle/solar.json | 7 ++++- data/json/items/vehicle/tables.json | 3 +- data/json/items/vehicle/turrets.json | 3 +- data/json/items/vehicle/utilities.json | 25 +++++++++++----- data/json/items/vehicle/wheel.json | 20 ++++++++++++- 28 files changed, 202 insertions(+), 57 deletions(-) diff --git a/data/json/items/vehicle/alternator.json b/data/json/items/vehicle/alternator.json index 92e5abe212b77..c20b1ffcf6077 100644 --- a/data/json/items/vehicle/alternator.json +++ b/data/json/items/vehicle/alternator.json @@ -16,7 +16,8 @@ "description": "A standard alternator used to power vehicle electrical systems.", "weight": "4000 g", "volume": "2500 ml", - "price": 9000 + "price": 9000, + "price_postapoc": 500 }, { "id": "alternator_motorbike", @@ -26,7 +27,8 @@ "description": "A compact lightweight alternator used to power small vehicle electrical systems.", "weight": "1100 g", "volume": "1 L", - "price": 8000 + "price": 8000, + "price_postapoc": 300 }, { "id": "alternator_bicycle", @@ -36,7 +38,8 @@ "description": "A very lightweight alternator used to power a bicycle's headlights.", "weight": "1100 g", "volume": "1 L", - "price": 8000 + "price": 8000, + "price_postapoc": 250 }, { "id": "alternator_truck", @@ -46,7 +49,8 @@ "description": "A larger and more powerful alternator used to power vehicle electrical systems.", "weight": "5800 g", "volume": "3 L", - "price": 12000 + "price": 12000, + "price_postapoc": 1000 }, { "id": "generator_7500w", @@ -56,6 +60,7 @@ "description": "A bulky but efficient electrical generator designed to be attached to an engine.", "weight": "48000 g", "volume": "7500 ml", - "price": 30000 + "price": 30000, + "price_postapoc": 4500 } ] diff --git a/data/json/items/vehicle/animals.json b/data/json/items/vehicle/animals.json index e461bbe9e4897..8d9abd8f08254 100644 --- a/data/json/items/vehicle/animals.json +++ b/data/json/items/vehicle/animals.json @@ -8,6 +8,7 @@ "weight": "1000 g", "volume": "3750 ml", "price": 48000, + "price_postapoc": 750, "bashing": 3, "to_hit": -1, "material": [ "leather", "wood" ], diff --git a/data/json/items/vehicle/armor.json b/data/json/items/vehicle/armor.json index cad2c353a478f..047df9f50c38b 100644 --- a/data/json/items/vehicle/armor.json +++ b/data/json/items/vehicle/armor.json @@ -8,6 +8,7 @@ "weight": "2200 g", "volume": "3 L", "price": 750, + "price_postapoc": 500, "to_hit": -1, "bashing": 6, "material": [ "steel" ], @@ -23,6 +24,7 @@ "weight": "22540 g", "volume": "3 L", "price": 1300, + "price_postapoc": 750, "to_hit": -1, "bashing": 6, "material": [ "steel" ], diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json index 4065459f08af1..f7c18391db9aa 100644 --- a/data/json/items/vehicle/battery.json +++ b/data/json/items/vehicle/battery.json @@ -8,6 +8,7 @@ "weight": "18000 g", "volume": "6250 ml", "price": 4000, + "price_postapoc": 500, "material": [ "plastic" ], "symbol": ":", "color": "light_cyan", @@ -25,6 +26,7 @@ "weight": "4000 g", "volume": "1250 ml", "price": 2000, + "price_postapoc": 250, "capacity": 500, "//": "12Ah @ 12VDC. Could supply ~140 watts for an hour" }, @@ -37,6 +39,7 @@ "weight": "1500 g", "volume": "750 ml", "price": 20000, + "price_postapoc": 100, "capacity": 150, "//": "~2.4Ah @ 12VDC. Could supply ~140 watts 10 minutes or so" }, @@ -53,7 +56,8 @@ "volume": "2250 ml", "bashing": 1, "category": "veh_parts", - "price": 1000 + "price": 1000, + "price_postapoc": 100 }, { "id": "large_storage_battery", @@ -64,7 +68,7 @@ "weight": "400 kg", "volume": "50 L", "price": 400000, - "price_postapoc": 50000, + "price_postapoc": 2500, "bashing": 40, "capacity": 80000 }, @@ -77,7 +81,7 @@ "weight": "35000 g", "volume": "6250 ml", "price": 50000, - "price_postapoc": 8000, + "price_postapoc": 750, "bashing": 14, "capacity": 7000 }, @@ -90,7 +94,7 @@ "weight": "2500 g", "volume": "500 ml", "price": 5000, - "price_postapoc": 1000, + "price_postapoc": 500, "bashing": 7, "capacity": 500 }, @@ -103,7 +107,7 @@ "weight": "200000 g", "volume": "25 L", "price": 200000, - "price_postapoc": 24000, + "price_postapoc": 1500, "to_hit": -2, "bashing": 20, "material": [ "plastic", "steel" ], diff --git a/data/json/items/vehicle/boat.json b/data/json/items/vehicle/boat.json index a3ed91e721f2a..e5bf62d879bd9 100644 --- a/data/json/items/vehicle/boat.json +++ b/data/json/items/vehicle/boat.json @@ -7,6 +7,7 @@ "name": { "str": "wood boat hull" }, "description": "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle until it floats. Then attach oars or a motor to get the boat to move.", "price": 8000, + "price_postapoc": 100, "material": [ "wood" ], "weight": "3000 g", "volume": "12500 ml", @@ -22,7 +23,7 @@ "name": { "str": "plastic boat hull" }, "description": "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a vehicle until it floats. Then attach oars or a motor to get the boat to move.", "price": 16000, - "price_postapoc": 8000, + "price_postapoc": 250, "material": [ "plastic" ], "weight": "1500 g", "volume": "12500 ml", @@ -38,7 +39,7 @@ "name": { "str": "carbon fiber boat hull" }, "description": "A carbon fiber sheet that keeps the boat afloat. Add boat hulls to a vehicle until it floats. Then attach oars or a motor to get the boat to move.", "price": 40000, - "price_postapoc": 8000, + "price_postapoc": 500, "material": [ "kevlar_rigid" ], "weight": "500 g", "volume": "12500 ml", @@ -59,7 +60,8 @@ "volume": "16 L", "bashing": 10, "category": "veh_parts", - "price": 9000 + "price": 9000, + "price_postapoc": 100 }, { "type": "GENERIC", @@ -74,7 +76,8 @@ "volume": "7500 ml", "bashing": 4, "category": "veh_parts", - "price": 9000 + "price": 9000, + "price_postapoc": 1250 }, { "type": "GENERIC", @@ -84,6 +87,7 @@ "name": { "str": "inflatable section", "str_pl": "inflatable section" }, "description": "An inflatable boat section.", "price": 8000, + "price_postapoc": 100, "material": [ "plastic" ], "weight": "3000 g", "volume": "12500 ml", @@ -99,6 +103,7 @@ "name": { "str": "inflatable airbag", "str_pl": "inflatable airbag" }, "description": "An inflatable airbag.", "price": 8000, + "price_postapoc": 250, "material": [ "plastic" ], "weight": "3000 g", "volume": "12500 ml", diff --git a/data/json/items/vehicle/cables.json b/data/json/items/vehicle/cables.json index 3ab2b4d325e3d..064a534cf4422 100644 --- a/data/json/items/vehicle/cables.json +++ b/data/json/items/vehicle/cables.json @@ -13,6 +13,7 @@ "bashing": 2, "category": "tools", "price": 1, + "price_postapoc": 100, "max_charges": 3, "initial_charges": 3, "use_action": "CABLE_ATTACH", @@ -32,6 +33,7 @@ "bashing": 6, "category": "tools", "price": 80, + "price_postapoc": 500, "max_charges": 6, "initial_charges": 6, "use_action": "TOW_ATTACH", diff --git a/data/json/items/vehicle/cargo.json b/data/json/items/vehicle/cargo.json index 8763b35a20a76..4e32017d349a5 100644 --- a/data/json/items/vehicle/cargo.json +++ b/data/json/items/vehicle/cargo.json @@ -14,6 +14,7 @@ "bashing": 20, "category": "veh_parts", "price": 10000, + "price_postapoc": 50, "qualities": [ [ "COOK", 1 ] ] }, { @@ -24,6 +25,7 @@ "weight": "4000 g", "volume": "6250 ml", "price": 16000, + "price_postapoc": 50, "category": "veh_parts", "material": [ "steel", "plastic" ], "symbol": "]", @@ -42,7 +44,8 @@ "category": "veh_parts", "weight": "500 g", "volume": "250 ml", - "price": 800 + "price": 800, + "price_postapoc": 50 }, { "type": "GENERIC", @@ -60,6 +63,7 @@ "weight": "1200 g", "volume": "5 L", "price": 3500, + "price_postapoc": 50, "copy-from": "basket" }, { @@ -75,7 +79,8 @@ "volume": "50 L", "bashing": 2, "category": "veh_parts", - "price": 40000 + "price": 40000, + "price_postapoc": 500 }, { "id": "cargo_aisle", @@ -89,7 +94,8 @@ "bashing": 2, "material": [ "steel", "plastic" ], "category": "veh_parts", - "price": 20000 + "price": 20000, + "price_postapoc": 500 }, { "id": "livestock_carrier", @@ -99,6 +105,7 @@ "weight": "96000 g", "volume": "62500 ml", "price": 48000, + "price_postapoc": 750, "category": "veh_parts", "material": [ "steel", "plastic" ], "symbol": "]", @@ -119,7 +126,8 @@ "category": "veh_parts", "weight": "27600 g", "volume": "18750 ml", - "price": 37500 + "price": 37500, + "price_postapoc": 750 }, { "id": "animal_locker", diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json index 921a3e8f77807..e6e3569ce7dc8 100644 --- a/data/json/items/vehicle/controls.json +++ b/data/json/items/vehicle/controls.json @@ -11,7 +11,8 @@ "material": [ "plastic" ], "volume": "4 L", "category": "veh_parts", - "price": 10000 + "price": 10000, + "price_postapoc": 1250 }, { "type": "GENERIC", @@ -25,7 +26,8 @@ "material": [ "plastic" ], "volume": "2 L", "category": "veh_parts", - "price": 10000 + "price": 10000, + "price_postapoc": 750 }, { "type": "GENERIC", @@ -40,7 +42,8 @@ "volume": "3 L", "bashing": 2, "category": "veh_parts", - "price": 40000 + "price": 40000, + "price_postapoc": 500 }, { "type": "GENERIC", @@ -54,7 +57,8 @@ "volume": "500 ml", "bashing": 1, "category": "veh_parts", - "price": 80000 + "price": 80000, + "price_postapoc": 750 }, { "id": "reins_tackle", @@ -65,6 +69,7 @@ "weight": "500 g", "volume": "1200 ml", "price": 30000, + "price_postapoc": 1000, "bashing": 1, "to_hit": -2, "material": [ "leather" ], @@ -85,7 +90,8 @@ "volume": "10 L", "bashing": 1, "category": "veh_parts", - "price": 8000 + "price": 8000, + "price_postapoc": 250 }, { "type": "GENERIC", @@ -97,7 +103,8 @@ "to_hit": -4, "material": [ "plastic" ], "volume": "1500 ml", - "price": 4000 + "price": 4000, + "price_postapoc": 250 }, { "type": "GENERIC", @@ -109,6 +116,7 @@ "volume": "3750 ml", "bashing": 1, "price": 200000, + "price_postapoc": 1500, "copy-from": "vehicle_controls" }, { @@ -122,6 +130,7 @@ "volume": "5 L", "bashing": 1, "price": 20000, + "price_postapoc": 1000, "copy-from": "vehicle_controls" }, { @@ -134,6 +143,7 @@ "symbol": "&", "volume": "9 L", "price": 500000, + "price_postapoc": 3000, "copy-from": "vehicle_controls" } ] diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json index 0a0c9f864e2b2..e8ea9822bf265 100644 --- a/data/json/items/vehicle/engine.json +++ b/data/json/items/vehicle/engine.json @@ -56,6 +56,7 @@ "weight": "20000 g", "volume": "1500 ml", "price": 10000, + "price_postapoc": 1000, "displacement": 40, "faults": [ "fault_engine_starter" ] }, @@ -68,6 +69,7 @@ "weight": "40000 g", "volume": "2 L", "price": 10000, + "price_postapoc": 1250, "displacement": 55, "faults": [ "fault_engine_starter" ] }, @@ -80,6 +82,7 @@ "weight": "10000 g", "volume": "750 ml", "price": 6000, + "price_postapoc": 750, "displacement": 20, "faults": [ ] }, @@ -92,6 +95,7 @@ "weight": "130000 g", "volume": "3500 ml", "price": 15000, + "price_postapoc": 1250, "displacement": 160 }, { @@ -103,6 +107,7 @@ "weight": "185000 g", "volume": "7 L", "price": 27000, + "price_postapoc": 1500, "displacement": 600 }, { @@ -114,6 +119,7 @@ "weight": "45000 g", "volume": "2 L", "price": 10000, + "price_postapoc": 1000, "displacement": 100 }, { @@ -125,6 +131,7 @@ "weight": "180000 g", "volume": "4750 ml", "price": 18000, + "price_postapoc": 1500, "displacement": 280 }, { @@ -136,6 +143,7 @@ "weight": "190000 g", "volume": "5 L", "price": 20000, + "price_postapoc": 1500, "displacement": 280 }, { @@ -147,6 +155,7 @@ "weight": "250000 g", "volume": "7500 ml", "price": 25000, + "price_postapoc": 1750, "displacement": 450 }, { @@ -158,6 +167,7 @@ "weight": "255000 g", "volume": "8 L", "price": 26500, + "price_postapoc": 1750, "displacement": 450 }, { @@ -169,6 +179,7 @@ "weight": "300000 g", "volume": "14500 ml", "price": 36000, + "price_postapoc": 2250, "displacement": 700 }, { @@ -180,6 +191,7 @@ "weight": "310000 g", "volume": "15 L", "price": 32000, + "price_postapoc": 2250, "displacement": 700 }, { @@ -191,7 +203,7 @@ "weight": "225000 g", "volume": "62500 ml", "price": 225000, - "price_postapoc": 300000 + "price_postapoc": 5000 }, { "id": "steam_triple_small", @@ -202,7 +214,7 @@ "weight": "180000 g", "volume": "37500 ml", "price": 555000, - "price_postapoc": 1110000 + "price_postapoc": 8000 }, { "id": "steam_triple_medium", @@ -213,7 +225,7 @@ "weight": "280000 g", "volume": "57500 ml", "price": 870000, - "price_postapoc": 1740000 + "price_postapoc": 10000 }, { "id": "engine_block_massive", @@ -224,7 +236,8 @@ "material": "iron", "weight": "280000 g", "volume": "6250 ml", - "price": 30000 + "price": 30000, + "price_postapoc": 500 }, { "id": "engine_block_large", @@ -235,7 +248,8 @@ "material": "iron", "weight": "190000 g", "volume": "5 L", - "price": 20000 + "price": 20000, + "price_postapoc": 500 }, { "id": "engine_block_medium", @@ -246,7 +260,8 @@ "material": "iron", "weight": "90000 g", "volume": "2500 ml", - "price": 10000 + "price": 10000, + "price_postapoc": 250 }, { "id": "engine_block_small", @@ -257,7 +272,8 @@ "material": "iron", "weight": "40000 g", "volume": "1250 ml", - "price": 5000 + "price": 5000, + "price_postapoc": 250 }, { "id": "engine_block_tiny", @@ -268,7 +284,8 @@ "material": "iron", "weight": "8000 g", "volume": "500 ml", - "price": 3500 + "price": 3500, + "price_postapoc": 100 }, { "id": "small_turbine_engine", @@ -279,6 +296,7 @@ "weight": "1130000 g", "volume": "45 L", "price": 96000, + "price_postapoc": 2500, "displacement": 2700 }, { @@ -290,6 +308,7 @@ "weight": "1582000 g", "volume": "63 L", "price": 192000, + "price_postapoc": 5000, "displacement": 3800 }, { @@ -301,6 +320,7 @@ "weight": "3164000 g", "volume": "95 L", "price": 960000, + "price_postapoc": 7500, "displacement": 11995 } ] diff --git a/data/json/items/vehicle/engineering.json b/data/json/items/vehicle/engineering.json index db6cc0c178339..cd8318bd53e1c 100644 --- a/data/json/items/vehicle/engineering.json +++ b/data/json/items/vehicle/engineering.json @@ -6,6 +6,7 @@ "name": { "str": "steel boom" }, "description": "A large rigid steel boom. If attached to a frame it could be used to lift up to 20 metric tonnes.", "price": 23400, + "price_postapoc": 2000, "weight": "31600 g", "volume": "12500 ml", "material": "steel", @@ -19,6 +20,7 @@ "name": { "str": "telescopic cantilever" }, "description": "A small steel telescoping cantilever. If attached to a frame it could be used to lift up to 3.5 metric tonnes.", "price": 7900, + "price_postapoc": 1000, "weight": "12000 g", "volume": "3 L", "material": "steel", @@ -32,6 +34,7 @@ "name": { "str": "pallet lifter" }, "description": "A makeshift pallet lifter. If attached to a frame it could be used to lift up to 0.5 metric tonnes.", "price": 7900, + "price_postapoc": 500, "weight": "12000 g", "volume": "3 L", "material": "steel", @@ -49,6 +52,7 @@ "material": "steel", "category": "veh_parts", "price": 8500, + "price_postapoc": 500, "volume": "7250 ml" }, { @@ -62,6 +66,7 @@ "material": "steel", "category": "veh_parts", "price": 8500, + "price_postapoc": 500, "volume": "8750 ml", "qualities": [ [ "SELF_JACK", 17 ] ] }, @@ -76,6 +81,7 @@ "material": "steel", "category": "veh_parts", "price": 500, + "price_postapoc": 100, "volume": "500 ml", "qualities": [ [ "SELF_JACK", 1 ] ] } diff --git a/data/json/items/vehicle/farming.json b/data/json/items/vehicle/farming.json index 1f342ab4fc63e..3704ca93e7d7d 100644 --- a/data/json/items/vehicle/farming.json +++ b/data/json/items/vehicle/farming.json @@ -11,6 +11,7 @@ "material": "steel", "category": "veh_parts", "price": 3500, + "price_postapoc": 500, "volume": "7 L" }, { @@ -40,6 +41,7 @@ "weight": "25000 g", "material": [ "steel", "plastic" ], "price": 50000, + "price_postapoc": 1500, "volume": "9 L", "copy-from": "v_scoop_item" }, @@ -53,6 +55,7 @@ "weight": "32666 g", "material": [ "steel", "plastic" ], "price": 50000, + "price_postapoc": 1750, "volume": "7250 ml", "copy-from": "v_scoop_item" }, diff --git a/data/json/items/vehicle/frames.json b/data/json/items/vehicle/frames.json index 3378036486a45..4d3ffc7cc799d 100644 --- a/data/json/items/vehicle/frames.json +++ b/data/json/items/vehicle/frames.json @@ -13,7 +13,8 @@ "volume": "10 L", "bashing": 15, "category": "veh_parts", - "price": 4000 + "price": 4000, + "price_postapoc": 100 }, { "type": "GENERIC", @@ -34,6 +35,7 @@ "volume": "15 L", "bashing": 20, "price": 5500, + "price_postapoc": 100, "copy-from": "foldframe" }, { @@ -48,6 +50,7 @@ "volume": "20 L", "bashing": 25, "price": 12000, + "price_postapoc": 250, "qualities": [ [ "ANVIL", 1 ] ], "copy-from": "foldframe" }, @@ -64,6 +67,7 @@ "bashing": 16, "cutting": 4, "price": 3500, + "price_postapoc": 100, "copy-from": "foldframe" }, { @@ -90,6 +94,7 @@ "bashing": 8, "cutting": 1, "price": 1000, + "price_postapoc": 50, "copy-from": "foldframe" } ] diff --git a/data/json/items/vehicle/fuel_storage.json b/data/json/items/vehicle/fuel_storage.json index bc0fd062f712e..e35a2ba39846b 100644 --- a/data/json/items/vehicle/fuel_storage.json +++ b/data/json/items/vehicle/fuel_storage.json @@ -15,6 +15,7 @@ "reliability": 10, "//": "mods will need to expand", "ammo_type": "charcoal", - "price": 3000 + "price": 3000, + "price_postapoc": 100 } ] diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json index 0c6663e59ecd5..f0313e1f5cdbd 100644 --- a/data/json/items/vehicle/lights.json +++ b/data/json/items/vehicle/lights.json @@ -10,7 +10,8 @@ "category": "veh_parts", "weight": "1000 g", "volume": "1 L", - "price": 3000 + "price": 3000, + "price_postapoc": 100 }, { "id": "motorcycle_headlight", @@ -20,6 +21,7 @@ "weight": "500 g", "volume": "250 ml", "price": 5000, + "price_postapoc": 100, "copy-from": "car_headlight" }, { @@ -31,6 +33,7 @@ "weight": "2000 g", "volume": "1250 ml", "price": 4000, + "price_postapoc": 150, "copy-from": "car_headlight" }, { @@ -45,6 +48,7 @@ "material": [ "steel", "plastic" ], "bashing": 4, "price": 40000, + "price_postapoc": 250, "copy-from": "car_headlight" }, { @@ -67,6 +71,7 @@ "material": [ "plastic", "steel" ], "bashing": 1, "price": 40000, + "price_postapoc": 100, "copy-from": "car_headlight" }, { @@ -88,6 +93,7 @@ "volume": "2 L", "bashing": 5, "price": 90000, + "price_postapoc": 500, "copy-from": "car_headlight" }, { diff --git a/data/json/items/vehicle/manual.json b/data/json/items/vehicle/manual.json index 1c6d6db859b9e..9b64f5de689f1 100644 --- a/data/json/items/vehicle/manual.json +++ b/data/json/items/vehicle/manual.json @@ -12,7 +12,8 @@ "volume": "500 ml", "bashing": 10, "category": "veh_parts", - "price": 9000 + "price": 9000, + "price_postapoc": 100 }, { "type": "GENERIC", diff --git a/data/json/items/vehicle/mills.json b/data/json/items/vehicle/mills.json index 0e253a221d617..913f2204f41a0 100644 --- a/data/json/items/vehicle/mills.json +++ b/data/json/items/vehicle/mills.json @@ -12,7 +12,8 @@ "volume": "20 L", "bashing": 1, "category": "veh_parts", - "price": 60000 + "price": 60000, + "price_postapoc": 1000 }, { "type": "GENERIC", @@ -24,6 +25,7 @@ "symbol": "Y", "volume": "60 L", "price": 150000, + "price_postapoc": 1500, "copy-from": "wind_turbine" }, { @@ -38,6 +40,7 @@ "volume": "30 L", "bashing": 3, "price": 120000, + "price_postapoc": 1000, "copy-from": "wind_turbine" }, { @@ -49,6 +52,7 @@ "symbol": "o", "volume": "60 L", "price": 200000, + "price_postapoc": 1500, "copy-from": "water_wheel" } ] diff --git a/data/json/items/vehicle/motors.json b/data/json/items/vehicle/motors.json index bb1156275a2c1..cec854f5df8b4 100644 --- a/data/json/items/vehicle/motors.json +++ b/data/json/items/vehicle/motors.json @@ -11,7 +11,8 @@ "volume": "5 L", "bashing": 4, "category": "veh_parts", - "price": 12000 + "price": 12000, + "price_postapoc": 1500 }, { "type": "GENERIC", @@ -22,6 +23,7 @@ "material": [ "superalloy" ], "volume": "20 L", "price": 68000, + "price_postapoc": 2500, "copy-from": "motor" }, { @@ -32,6 +34,7 @@ "weight": "125 kg", "volume": "25 L", "price": 80000, + "price_postapoc": 3500, "copy-from": "motor" }, { @@ -45,6 +48,7 @@ "volume": "15 L", "bashing": 9, "price": 22000, + "price_postapoc": 1500, "copy-from": "motor" }, { @@ -56,6 +60,7 @@ "volume": "1 L", "bashing": 1, "price": 2000, + "price_postapoc": 500, "copy-from": "motor" }, { @@ -69,6 +74,7 @@ "material": [ "steel", "plastic" ], "volume": "125 ml", "category": "veh_parts", - "price": 2000 + "price": 2000, + "price_postapoc": 100 } ] diff --git a/data/json/items/vehicle/noise.json b/data/json/items/vehicle/noise.json index 3d52b150b2cfb..7157396c7c4e4 100644 --- a/data/json/items/vehicle/noise.json +++ b/data/json/items/vehicle/noise.json @@ -14,6 +14,7 @@ "bashing": 19, "category": "veh_parts", "price": 3000, + "price_postapoc": 100, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -29,7 +30,8 @@ "to_hit": -1, "bashing": 2, "category": "veh_parts", - "price": 6000 + "price": 6000, + "price_postapoc": 100 }, { "type": "GENERIC", @@ -43,7 +45,8 @@ "material": [ "steel" ], "volume": "3500 ml", "category": "veh_parts", - "price": 800 + "price": 800, + "price_postapoc": 100 }, { "type": "GENERIC", @@ -57,6 +60,7 @@ "material": [ "steel" ], "volume": "4 L", "category": "veh_parts", - "price": 5000 + "price": 5000, + "price_postapoc": 250 } ] diff --git a/data/json/items/vehicle/plating.json b/data/json/items/vehicle/plating.json index e9993f7117af0..459208179ee13 100644 --- a/data/json/items/vehicle/plating.json +++ b/data/json/items/vehicle/plating.json @@ -14,6 +14,7 @@ "bashing": 5, "category": "spare_parts", "price": 6000, + "price_postapoc": 100, "qualities": [ [ "COOK", 1 ] ] }, { @@ -29,7 +30,8 @@ "volume": "1250 ml", "bashing": 5, "category": "veh_parts", - "price": 7500 + "price": 7500, + "price_postapoc": 250 }, { "type": "GENERIC", @@ -44,7 +46,8 @@ "volume": "3 L", "bashing": 10, "category": "veh_parts", - "price": 12000 + "price": 12000, + "price_postapoc": 100 }, { "type": "GENERIC", @@ -60,6 +63,7 @@ "bashing": 6, "category": "veh_parts", "price": 12000, + "price_postapoc": 250, "qualities": [ [ "COOK", 1 ] ] }, { @@ -76,6 +80,7 @@ "bashing": 6, "category": "veh_parts", "price": 18500, + "price_postapoc": 500, "qualities": [ [ "COOK", 1 ] ] }, { @@ -91,6 +96,7 @@ "volume": "500 ml", "category": "veh_parts", "price": 8500, + "price_postapoc": 500, "qualities": [ [ "COOK", 1 ] ] }, { @@ -109,6 +115,7 @@ "flags": [ "STAB" ], "category": "veh_parts", "price": 18500, + "price_postapoc": 250, "qualities": [ [ "COOK", 1 ] ] }, { @@ -125,6 +132,7 @@ "bashing": 6, "category": "veh_parts", "price": 16000, + "price_postapoc": 500, "qualities": [ [ "COOK", 1 ], [ "ANVIL", 1 ] ] }, { @@ -141,6 +149,7 @@ "bashing": 8, "category": "veh_parts", "price": 16000, + "price_postapoc": 750, "qualities": [ [ "COOK", 1 ] ] }, { @@ -151,6 +160,7 @@ "name": { "str": "chitin armor kit" }, "description": "Light chitin plating made for a vehicle.", "price": 1200, + "price_postapoc": 250, "material": [ "chitin" ], "weight": "2000 g", "volume": "5500 ml", @@ -175,6 +185,7 @@ "name": { "str": "bone armor kit" }, "description": "Bone plating made for a vehicle.", "price": 1200, + "price_postapoc": 100, "material": [ "bone" ], "weight": "4000 g", "volume": "9500 ml", diff --git a/data/json/items/vehicle/rams.json b/data/json/items/vehicle/rams.json index 91fdb00b5aec0..9b0f241618781 100644 --- a/data/json/items/vehicle/rams.json +++ b/data/json/items/vehicle/rams.json @@ -8,6 +8,7 @@ "weight": "29955 g", "volume": "7500 ml", "price": 10500, + "price_postapoc": 2500, "to_hit": -1, "bashing": 6, "material": [ "steel" ], diff --git a/data/json/items/vehicle/rigs.json b/data/json/items/vehicle/rigs.json index 46d4a97ce02af..00b2631ebecec 100644 --- a/data/json/items/vehicle/rigs.json +++ b/data/json/items/vehicle/rigs.json @@ -7,6 +7,7 @@ "weight": "40000 g", "volume": "20 L", "price": 40000, + "price_postapoc": 2000, "material": "steel", "symbol": "&", "color": "light_cyan" diff --git a/data/json/items/vehicle/rotor.json b/data/json/items/vehicle/rotor.json index 61ccb84a0f1d8..972a2640eef03 100644 --- a/data/json/items/vehicle/rotor.json +++ b/data/json/items/vehicle/rotor.json @@ -7,6 +7,7 @@ "name_plural": "sets of heavy-duty military rotors", "description": "A set of four rotor blades from a military attack helicopter.", "price": 23400, + "price_postapoc": 500, "weight": "452000 g", "volume": "452000 ml", "looks_like": "xl_wind_turbine", @@ -22,6 +23,7 @@ "name_plural": "sets of small civilian helicopter rotors", "description": "A set of four rotor blades from a civilian light helicopter.", "price": 1200, + "price_postapoc": 250, "weight": "251000 g", "volume": "251000 ml", "looks_like": "xl_wind_turbine", diff --git a/data/json/items/vehicle/seating.json b/data/json/items/vehicle/seating.json index 36cdc74857ea8..f61d1c684e84b 100644 --- a/data/json/items/vehicle/seating.json +++ b/data/json/items/vehicle/seating.json @@ -13,7 +13,7 @@ "bashing": 4, "category": "veh_parts", "price": 35000, - "price_postapoc": 3000 + "price_postapoc": 100 }, { "type": "GENERIC", @@ -23,7 +23,7 @@ "description": "A soft car seat covered with leather.", "material": [ "leather", "cotton", "aluminum" ], "price": 60000, - "price_postapoc": 27500 + "price_postapoc": 250 }, { "type": "GENERIC", @@ -35,6 +35,7 @@ "volume": "1250 ml", "bashing": 2, "price": 2500, + "price_postapoc": 250, "copy-from": "seat" } ] diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json index fcd64f81f3dba..7c630af44691d 100644 --- a/data/json/items/vehicle/solar.json +++ b/data/json/items/vehicle/solar.json @@ -13,7 +13,8 @@ "bashing": 1, "flags": [ "NO_REPAIR" ], "category": "veh_parts", - "price": 90000 + "price": 90000, + "price_postapoc": 1000 }, { "type": "GENERIC", @@ -25,6 +26,7 @@ "material": [ "glass", "steel" ], "volume": "6500 ml", "price": 120000, + "price_postapoc": 1500, "copy-from": "solar_panel" }, { @@ -35,6 +37,7 @@ "weight": "18494 g", "volume": "4500 ml", "price": 190000, + "price_postapoc": 3000, "copy-from": "solar_panel" }, { @@ -46,6 +49,7 @@ "to_hit": -5, "volume": "7500 ml", "price": 240000, + "price_postapoc": 3500, "copy-from": "reinforced_solar_panel" }, { @@ -58,6 +62,7 @@ "volume": "250 ml", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "copy-from": "solar_panel" } ] diff --git a/data/json/items/vehicle/tables.json b/data/json/items/vehicle/tables.json index 4edcaa6a68497..7da1fb0c2505f 100644 --- a/data/json/items/vehicle/tables.json +++ b/data/json/items/vehicle/tables.json @@ -13,7 +13,8 @@ "volume": "10500 ml", "bashing": 6, "category": "veh_parts", - "price": 20000 + "price": 20000, + "price_postapoc": 100 }, { "type": "GENERIC", diff --git a/data/json/items/vehicle/turrets.json b/data/json/items/vehicle/turrets.json index cab00f11513c3..07c3acee3f986 100644 --- a/data/json/items/vehicle/turrets.json +++ b/data/json/items/vehicle/turrets.json @@ -10,6 +10,7 @@ "category": "veh_parts", "weight": "10000 g", "volume": "2500 ml", - "price": 5500 + "price": 5500, + "price_postapoc": 2500 } ] diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json index 1ffad91d5083c..b336dd64bf3e8 100644 --- a/data/json/items/vehicle/utilities.json +++ b/data/json/items/vehicle/utilities.json @@ -8,6 +8,7 @@ "weight": "4535 g", "volume": "2 L", "price": 0, + "price_postapoc": 0, "to_hit": -1, "bashing": 4, "material": [ "steel" ], @@ -28,6 +29,7 @@ "bashing": 7, "category": "veh_parts", "price": 90000, + "price_postapoc": 5000, "ammo": "plutonium", "max_charges": 10000 }, @@ -44,7 +46,8 @@ "volume": "7500 ml", "bashing": 12, "category": "veh_parts", - "price": 20000 + "price": 20000, + "price_postapoc": 1500 }, { "type": "GENERIC", @@ -59,7 +62,8 @@ "volume": "7500 ml", "bashing": 12, "category": "veh_parts", - "price": 20000 + "price": 20000, + "price_postapoc": 1500 }, { "type": "GENERIC", @@ -74,7 +78,8 @@ "volume": "2500 ml", "bashing": 4, "category": "veh_parts", - "price": 3000 + "price": 3000, + "price_postapoc": 10 }, { "type": "GENERIC", @@ -89,7 +94,8 @@ "volume": "5 L", "bashing": 5, "category": "veh_parts", - "price": 90000 + "price": 90000, + "price_postapoc": 1000 }, { "type": "GENERIC", @@ -104,7 +110,8 @@ "volume": "125 L", "bashing": 8, "category": "veh_parts", - "price": 60000 + "price": 60000, + "price_postapoc": 500 }, { "type": "GENERIC", @@ -119,7 +126,8 @@ "volume": "10 L", "bashing": 3, "category": "veh_parts", - "price": 90000 + "price": 90000, + "price_postapoc": 2500 }, { "type": "GENERIC", @@ -127,6 +135,7 @@ "name": { "str": "mountable autoclave" }, "description": "This autoclave has been rigged to run off a vehicle power grid.", "price": 162654, + "price_postapoc": 1500, "symbol": "A", "color": "yellow", "weight": "34500 g", @@ -147,6 +156,7 @@ "name": { "str": "minifreezer" }, "description": "Compact version of a chest freezer, designed as a mobile solution for freezing food. Provides insulation from the elements.", "price": 70000, + "price_postapoc": 4000, "insulation": 4, "copy-from": "minifridge" }, @@ -181,6 +191,7 @@ "volume": "750 ml", "bashing": 2, "category": "veh_parts", - "price": 3000 + "price": 3000, + "price_postapoc": 50 } ] diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json index 7fc800ac1474b..7959f16d89153 100644 --- a/data/json/items/vehicle/wheel.json +++ b/data/json/items/vehicle/wheel.json @@ -8,6 +8,7 @@ "weight": "150 g", "volume": "250 ml", "price": 10, + "price_postapoc": 10, "material": [ "steel" ], "symbol": ";", "color": "dark_gray" @@ -21,6 +22,7 @@ "weight": "5 kg", "volume": "6 L", "price": 3000, + "price_postapoc": 500, "bashing": 14, "to_hit": -2, "material": [ "steel" ], @@ -36,6 +38,7 @@ "weight": "6 kg", "volume": "7 L", "price": 5000, + "price_postapoc": 500, "bashing": 14, "to_hit": -2, "material": [ "steel" ], @@ -51,6 +54,7 @@ "weight": "8845 g", "volume": "10 L", "price": 10000, + "price_postapoc": 750, "bashing": 12, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -68,6 +72,7 @@ "weight": "12600 g", "volume": "13750 ml", "price": 24000, + "price_postapoc": 500, "bashing": 14, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -85,6 +90,7 @@ "weight": "24500 g", "volume": "17500 ml", "price": 34000, + "price_postapoc": 750, "bashing": 17, "to_hit": -1, "material": [ "hardsteel", "ceramic" ], @@ -102,6 +108,7 @@ "weight": "2722 g", "volume": "2250 ml", "price": 2000, + "price_postapoc": 250, "bashing": 10, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -119,6 +126,7 @@ "weight": "1500 g", "volume": "7 L", "price": 4000, + "price_postapoc": 250, "bashing": 8, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -143,6 +151,7 @@ "weight": "1500 g", "volume": "1250 ml", "price": 14000, + "price_postapoc": 100, "bashing": 6, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -160,6 +169,7 @@ "weight": "4 kg", "volume": "4 L", "price": 14000, + "price_postapoc": 500, "bashing": 6, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -177,6 +187,7 @@ "weight": "18239 g", "volume": "8750 ml", "price": 1200, + "price_postapoc": 250, "bashing": 8, "to_hit": -4, "material": [ "steel" ], @@ -194,6 +205,7 @@ "weight": "18239 g", "volume": "8750 ml", "price": 1200, + "price_postapoc": 250, "bashing": 8, "to_hit": -4, "material": [ "steel" ], @@ -209,8 +221,8 @@ "description": "A pair of small rail wheels. It fits small railroad rails found in places like amusement parks. Mostly for hobby purposes rather than transportation.", "copy-from": "wheel_rail", "price": 900, + "price_postapoc": 100, "weight": "12239 g", - "price_postapoc": 750, "symbol": "=", "diameter": 10, "width": 3 @@ -224,6 +236,7 @@ "weight": "5443 g", "volume": "8250 ml", "price": 14000, + "price_postapoc": 500, "bashing": 10, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -249,6 +262,7 @@ "weight": "750000 g", "volume": "200 L", "price": 50000, + "price_postapoc": 1500, "bashing": 60, "to_hit": -2, "material": [ "steel" ], @@ -266,6 +280,7 @@ "weight": "2722 g", "volume": "2250 ml", "price": 14000, + "price_postapoc": 100, "bashing": 10, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -283,6 +298,7 @@ "weight": "750 g", "volume": "750 ml", "price": 7000, + "price_postapoc": 100, "bashing": 3, "to_hit": -2, "material": [ "plastic" ], @@ -300,6 +316,7 @@ "weight": "3000 g", "volume": "12500 ml", "price": 8000, + "price_postapoc": 250, "bashing": 8, "to_hit": -1, "material": [ "steel", "plastic" ], @@ -317,6 +334,7 @@ "weight": "22600 g", "volume": "17500 ml", "price": 34000, + "price_postapoc": 750, "bashing": 17, "to_hit": -1, "material": [ "steel", "plastic" ], From 5748d3f66b650974fd66c69d2764443c5254cc0e Mon Sep 17 00:00:00 2001 From: SouP <40143107+Soup-de-Loop@users.noreply.github.com> Date: Fri, 17 Apr 2020 16:50:39 +1000 Subject: [PATCH 38/45] Blazemod re-work preparatory restructure (#39621) --- data/mods/blazemod/blaze_blob.json | 1305 ------------ data/mods/blazemod/blaze_blob_parts.json | 1760 ----------------- data/mods/blazemod/blaze_other.json | 195 -- data/mods/blazemod/blaze_test.json | 973 --------- ..._construct.json => blob_construction.json} | 0 .../blazemod/{ => items/ammo}/blaze_ammo.json | 0 .../blazemod/items/ammo/diamond_ammo.json | 29 + .../mods/blazemod/items/ammo/vortex_ammo.json | 21 + data/mods/blazemod/items/fuel.json | 44 + .../{ => items/guns}/blaze_weapons.json | 0 .../mods/blazemod/items/guns/blob_turret.json | 351 ++++ .../blazemod/items/guns/diamond_turret.json | 55 + .../blazemod/items/guns/vortex_turret.json | 110 ++ .../blazemod/items/tools/blob_container.json | 80 + .../mods/blazemod/items/tools/blob_tools.json | 651 ++++++ .../blazemod/items/tools/diamond_tools.json | 47 + .../blazemod/items/tools/vortex_tools.json | 32 + .../blazemod/items/vehicle/blaze_engine.json | 83 + .../{ => items/vehicle}/blaze_magazines.json | 0 .../blazemod/items/vehicle/blaze_other.json | 33 + .../blazemod/items/vehicle/blaze_solar.json | 47 + .../blazemod/items/vehicle/blaze_treads.json | 53 + .../blazemod/items/vehicle/blob_treads.json | 53 + .../items/vehicle/blob_vehicleparts.json | 31 + .../blazemod/items/vehicle/blob_wheel.json | 83 + .../items/vehicle/diamond_vehicleparts.json | 35 + .../blob_monster.json} | 0 .../{ => recipes}/blaze_ammo_recipes.json | 0 .../{ => recipes}/blaze_magazine_recipes.json | 0 .../{ => recipes}/blaze_other_recipes.json | 14 + .../{ => recipes}/blaze_weapons_recipes.json | 0 .../blob_recipes.json} | 0 .../blazemod/recipes/diamond_recipes.json | 81 + .../mods/blazemod/recipes/vortex_recipes.json | 142 ++ data/mods/blazemod/requirements/blob.json | 8 + .../blaze_autoweapons_parts.json | 0 .../{ => vehicleparts}/blaze_other_parts.json | 111 +- .../blazemod/vehicleparts/blaze_treads.json | 91 + .../blaze_weapons_parts.json | 0 .../blazemod/vehicleparts/blob_boards.json | 325 +++ .../blazemod/vehicleparts/blob_frames.json | 203 ++ .../blazemod/vehicleparts/blob_lights.json | 28 + .../mods/blazemod/vehicleparts/blob_rams.json | 20 + .../blazemod/vehicleparts/blob_treads.json | 39 + .../blazemod/vehicleparts/blob_turret.json | 288 +++ .../vehicleparts/blob_vehicleparts.json | 748 +++++++ .../blazemod/vehicleparts/blob_wheel.json | 123 ++ .../blazemod/vehicleparts/diamond_parts.json | 147 ++ .../blazemod/vehicleparts/diamond_turret.json | 30 + .../blazemod/vehicleparts/vortex_parts.json | 68 + .../blazemod/vehicleparts/vortex_turret.json | 143 ++ data/mods/blazemod/vortex_ammo_types.json | 8 + 52 files changed, 4366 insertions(+), 4322 deletions(-) delete mode 100644 data/mods/blazemod/blaze_blob.json delete mode 100644 data/mods/blazemod/blaze_blob_parts.json delete mode 100644 data/mods/blazemod/blaze_other.json delete mode 100644 data/mods/blazemod/blaze_test.json rename data/mods/blazemod/{blaze_blob_construct.json => blob_construction.json} (100%) rename data/mods/blazemod/{ => items/ammo}/blaze_ammo.json (100%) create mode 100644 data/mods/blazemod/items/ammo/diamond_ammo.json create mode 100644 data/mods/blazemod/items/ammo/vortex_ammo.json create mode 100644 data/mods/blazemod/items/fuel.json rename data/mods/blazemod/{ => items/guns}/blaze_weapons.json (100%) create mode 100644 data/mods/blazemod/items/guns/blob_turret.json create mode 100644 data/mods/blazemod/items/guns/diamond_turret.json create mode 100644 data/mods/blazemod/items/guns/vortex_turret.json create mode 100644 data/mods/blazemod/items/tools/blob_container.json create mode 100644 data/mods/blazemod/items/tools/blob_tools.json create mode 100644 data/mods/blazemod/items/tools/diamond_tools.json create mode 100644 data/mods/blazemod/items/tools/vortex_tools.json create mode 100644 data/mods/blazemod/items/vehicle/blaze_engine.json rename data/mods/blazemod/{ => items/vehicle}/blaze_magazines.json (100%) create mode 100644 data/mods/blazemod/items/vehicle/blaze_other.json create mode 100644 data/mods/blazemod/items/vehicle/blaze_solar.json create mode 100644 data/mods/blazemod/items/vehicle/blaze_treads.json create mode 100644 data/mods/blazemod/items/vehicle/blob_treads.json create mode 100644 data/mods/blazemod/items/vehicle/blob_vehicleparts.json create mode 100644 data/mods/blazemod/items/vehicle/blob_wheel.json create mode 100644 data/mods/blazemod/items/vehicle/diamond_vehicleparts.json rename data/mods/blazemod/{blaze_blob_monster.json => monsters/blob_monster.json} (100%) rename data/mods/blazemod/{ => recipes}/blaze_ammo_recipes.json (100%) rename data/mods/blazemod/{ => recipes}/blaze_magazine_recipes.json (100%) rename data/mods/blazemod/{ => recipes}/blaze_other_recipes.json (89%) rename data/mods/blazemod/{ => recipes}/blaze_weapons_recipes.json (100%) rename data/mods/blazemod/{blaze_blob_recipes.json => recipes/blob_recipes.json} (100%) create mode 100644 data/mods/blazemod/recipes/diamond_recipes.json create mode 100644 data/mods/blazemod/recipes/vortex_recipes.json create mode 100644 data/mods/blazemod/requirements/blob.json rename data/mods/blazemod/{ => vehicleparts}/blaze_autoweapons_parts.json (100%) rename data/mods/blazemod/{ => vehicleparts}/blaze_other_parts.json (75%) create mode 100644 data/mods/blazemod/vehicleparts/blaze_treads.json rename data/mods/blazemod/{ => vehicleparts}/blaze_weapons_parts.json (100%) create mode 100644 data/mods/blazemod/vehicleparts/blob_boards.json create mode 100644 data/mods/blazemod/vehicleparts/blob_frames.json create mode 100644 data/mods/blazemod/vehicleparts/blob_lights.json create mode 100644 data/mods/blazemod/vehicleparts/blob_rams.json create mode 100644 data/mods/blazemod/vehicleparts/blob_treads.json create mode 100644 data/mods/blazemod/vehicleparts/blob_turret.json create mode 100644 data/mods/blazemod/vehicleparts/blob_vehicleparts.json create mode 100644 data/mods/blazemod/vehicleparts/blob_wheel.json create mode 100644 data/mods/blazemod/vehicleparts/diamond_parts.json create mode 100644 data/mods/blazemod/vehicleparts/diamond_turret.json create mode 100644 data/mods/blazemod/vehicleparts/vortex_parts.json create mode 100644 data/mods/blazemod/vehicleparts/vortex_turret.json create mode 100644 data/mods/blazemod/vortex_ammo_types.json diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json deleted file mode 100644 index 3effefca58603..0000000000000 --- a/data/mods/blazemod/blaze_blob.json +++ /dev/null @@ -1,1305 +0,0 @@ -[ - { - "id": "gloopletread", - "type": "WHEEL", - "category": "veh_parts", - "name": "Gelatinous track", - "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368 g", - "volume": "50 L", - "price": 25500, - "to_hit": -3, - "bashing": 30, - "material": [ "plastic", "steel" ], - "symbol": "]", - "color": "white", - "diameter": 30, - "width": 15 - }, - { - "id": "oozletread", - "type": "WHEEL", - "category": "veh_parts", - "name": "Oozing track", - "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368 g", - "volume": "50 L", - "price": 25500, - "to_hit": -3, - "bashing": 30, - "material": [ "plastic", "steel" ], - "symbol": "]", - "color": "white", - "diameter": 50, - "width": 25 - }, - { - "id": "graytread", - "type": "WHEEL", - "category": "veh_parts", - "name": "Gray track", - "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368 g", - "volume": "50 L", - "price": 25500, - "to_hit": -3, - "bashing": 30, - "material": [ "plastic", "steel" ], - "symbol": "]", - "color": "white", - "diameter": 60, - "width": 30 - }, - { - "id": "bfeedfuel", - "type": "AMMO", - "category": "fuel", - "name": "liquified blob feed", - "name_plural": "bfeedfuel", - "description": "Liquified blob feed, useful for fueling certain blob based vehicle parts", - "weight": "1 g", - "volume": "200ml", - "price": 40, - "price_postapoc": 800, - "phase": "liquid", - "container": "jerrycan", - "material": "hydrocarbons", - "fuel": { "energy": 35 }, - "symbol": "=", - "color": "red", - "count": 250, - "stack_size": 200, - "ammo_type": "bfeed", - "range": 4, - "damage": 5, - "pierce": 5 - }, - { - "id": "blobrep", - "type": "requirement", - "//": "Material for fixing parts made from blobs.", - "components": [ [ [ "bfeed", 1 ] ] ] - }, - { - "id": "bfeed", - "type": "AMMO", - "category": "fuel", - "name": "blob feed", - "name_plural": "blob feed", - "description": "An amalgam of various types of organic material, contains everything the blob needs to be healthy. You think…", - "weight": "50 g", - "volume": "250 ml", - "to_hit": -3, - "bashing": 8, - "material": "flesh", - "fuel": { "energy": 1 }, - "symbol": "*", - "color": "red", - "count": 25, - "ammo_type": "bfeed" - }, - { - "id": "bframegrow", - "type": "TOOL", - "category": "tools", - "name": "growing blob frame", - "description": "A growing vehicle frame made of bone. It's coated in a thick layer of ooze, though there's greater amounts on the bindings. It's not quite tough enough to use.", - "weight": "3662 g", - "volume": "10 L", - "price": 100, - "to_hit": -2, - "material": [ "bone", "flesh" ], - "symbol": ";", - "color": "green", - "use_action": { - "target": "gloople", - "msg": "You test the frame; It wiggles, and then collapses into an lump of goo.", - "type": "delayed_transform", - "transform_age": 36000, - "not_ready_msg": "You test the frame; it gives easily, it's still not sturdy enough" - } - }, - { - "id": "biter", - "type": "GUN", - "name": "biting blob", - "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. It has evolved the ability to constantly generate calcified protrusions which are then controlled by sinuous tensile strands. These \"teeth\" can then be used to latch and wound anything unfortunate enough to be nearby. The outer membrane has also become significantly thicker in order to support its more strenuous movement; though it seems pliable enough to pull apart…", - "weight": "18331 g", - "volume": "5500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "blue", - "ammo": "bfeed", - "skill": "launcher", - "range": 1, - "ranged_damage": 15, - "pierce": 15, - "sight_dispersion": 150, - "durability": 10, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], - "clip_size": 50, - "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "bitergrow", - "type": "TOOL", - "category": "tools", - "name": "growing keratinous mass", - "name_plural": "growing keratinous mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12140 g", - "volume": "4500 ml", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "blue", - "use_action": { - "target": "biter", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "clutter", - "type": "GUN", - "name": "gel shooter", - "description": "A living blob turned into an autonomous weapon. It trawls the ground for material, which it then strips of nutrition. The remainder is then expelled out at significant velocity towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it. It seems pliable enough to pull apart…", - "weight": "7252 g", - "volume": "3 L", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh", "bone" ], - "symbol": "&", - "color": "magenta", - "ammo": "bfeed", - "skill": "pistol", - "range": 12, - "ranged_damage": 7, - "dispersion": 450, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 10, - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "cluttergrow", - "type": "TOOL", - "category": "tools", - "name": "growing beaded mass", - "name_plural": "growing beaded mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "5410 g", - "volume": "2500 ml", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "magenta", - "use_action": { - "target": "clutter", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 2400, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "freezie", - "type": "GUN", - "name": "frost lancer", - "description": "A living blob turned into an autonomous weapon. A biological aberration that exists at sub-zero temperatures. After filtering nutrients from the water, it freezes the remainder into an incredibly sharp spear of ice; which it then launches at nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "21331 g", - "volume": "4500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "light_blue", - "ammo": "water", - "skill": "launcher", - "range": 30, - "ranged_damage": 50, - "pierce": 10, - "dispersion": 450, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 100, - "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "FIRE_20" ] - }, - { - "id": "freeziegrow", - "type": "TOOL", - "category": "tools", - "name": "growing icy mass", - "name_plural": "growing icy mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "15140 g", - "volume": "3 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_blue", - "use_action": { - "target": "freezie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "frostie", - "type": "TOOL", - "category": "tools", - "name": "gelacier", - "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It seems pliable enough to pull apart…", - "weight": "6112 g", - "volume": "5 L", - "price": 500, - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "light_blue" - }, - { - "id": "frostie_hull", - "type": "WHEEL", - "category": "veh_parts", - "name": "gelacier wheel", - "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide boat frame.", - "weight": "6112 g", - "volume": "5 L", - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "light_blue", - "diameter": 40, - "width": 4 - }, - { - "id": "frostie_wheel", - "type": "WHEEL", - "category": "veh_parts", - "name": "gelacier wheel", - "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide, crude wheel.", - "weight": "6112 g", - "volume": "5 L", - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "light_blue", - "diameter": 40, - "width": 15 - }, - { - "id": "frostiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing cold mass", - "name_plural": "growing cold mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "3562 g", - "volume": "2 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_blue", - "use_action": { - "target": "frostie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 9600, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "fuzzle", - "type": "GUN", - "name": "snapping ooze", - "description": "A living blob turned into an autonomous weapon. A baffling mutation in an already baffling creature, this blob is encased in a thick coat of fur, which serves as a form of protection. In addition, it is capable of projecting rows of calcified sharp fragments in a manner mimicking the jaw of a more recognizable creature. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "22331 g", - "volume": "6500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "brown", - "ammo": "bfeed", - "skill": "launcher", - "range": 2, - "ranged_damage": 30, - "pierce": 20, - "sight_dispersion": 150, - "durability": 10, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], - "clip_size": 50, - "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "fuzzlegrow", - "type": "TOOL", - "category": "tools", - "name": "growing hairy mass", - "name_plural": "growing hairy mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "18140 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "brown", - "use_action": { - "target": "fuzzle", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "gloople", - "type": "TOOL", - "category": "tools", - "name": "gelatinous mass", - "name_plural": "gelatinous mass", - "description": "An experiment gone horribly right. While the original intent was to combine the structure of a bone frame with the impact absorption of the blob; the blob seems to have completely consumed the bone. Instead, what remains is an amorphous mass of goo with what seems to be numerous thin filaments floating within. With a bit of effort, you can grasp the fibers and stretch the mass into a multitude of shapes. The mass is able to retain the new shape even under force, though the mass yields at your touch. With enough strength, you think you can pull it apart.", - "weight": "6662 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_green", - "ammo": "bfeed", - "max_charges": 250, - "charges_per_use": 250, - "qualities": [ [ "JACK", 2 ] ], - "use_action": { - "target": "gloople_act", - "msg": "You fumble as the blob starts to multiply rapidly!", - "target_charges": 7, - "active": true, - "moves": 250, - "type": "transform" - } - }, - { - "id": "gloople_act", - "type": "TOOL", - "category": "tools", - "name": "multiplying gelatinous mass", - "name_plural": "multiplying gelatinous mass", - "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": "8662 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_green", - "ammo": "bfeed", - "max_charges": 40, - "charges_per_use": 20, - "turns_per_charge": 1, - "revert_to": "gloople", - "use_action": { - "type": "place_monster", - "monster_id": "mon_gloople", - "friendly_msg": "A blob splits and bounces away!", - "hostile_msg": "A blob splits and bounces away!", - "difficulty": 1, - "moves": 250, - "place_randomly": true, - "skill1": "cooking" - }, - "flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE" ] - }, - { - "id": "gloople_tank", - "type": "CONTAINER", - "name": "gelatinous capsule", - "name_plural": "gelatinous capsules", - "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": "6662 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_green", - "contains": "10 L", - "seals": true, - "watertight": true - }, - { - "id": "gloople_tank_large", - "type": "CONTAINER", - "name": "gelatinous tank", - "name_plural": "gelatinous tanks", - "copy-from": "gloople_tank", - "volume": "60 L", - "contains": 240 - }, - { - "id": "gloople_wheel", - "type": "WHEEL", - "category": "veh_parts", - "name": "gelatinous wheel", - "description": "Filling a gelatinous mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": "30062 g", - "volume": "12500 ml", - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "light_green", - "diameter": 15, - "width": 15 - }, - { - "id": "glooplegrow", - "type": "TOOL", - "category": "tools", - "name": "growing gelatinous mass", - "name_plural": "growing gelatinous mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "3562 g", - "volume": "2 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_green", - "use_action": { - "target": "gloople", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 2400, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "glowie", - "type": "MAGAZINE", - "category": "veh_parts", - "name": "gelectrode", - "//": "No Snake, eating it will not refill your batteries.", - "description": "A biological mystery, this blob has evolved the ability to slowly generate electricity through some unknown process. It emits a low phosphorescent glow while doing so. It is also capable of storing electricity from other sources, but doing so renders it inactive. It seems pliable enough to pull apart…", - "weight": "5132 g", - "volume": "5 L", - "price": 500, - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "cyan", - "ammo_type": "battery", - "capacity": 2500 - }, - { - "id": "glowiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing glowing mass", - "name_plural": "growing glowing mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "3562 g", - "volume": "2 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "cyan", - "use_action": { - "target": "glowie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "gray", - "type": "TOOL", - "category": "tools", - "name": "gray mass", - "name_plural": "gray mass", - "description": "This internal structures of this creature have developed significantly. While retaining the resilience and malleability of its once simpler form, it has gained the considerable abilities of perception and stimulus response. When directly threatened, it is able to shift and alter its microfibers, hardening its membrane to an almost steel-hard shell. You can still pull it apart with enough force. It's also really gray.", - "weight": "19120 g", - "volume": "15 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_gray", - "ammo": "bfeed", - "max_charges": 250, - "charges_per_use": 250, - "qualities": [ [ "JACK", 8 ] ], - "use_action": { - "target": "gray_act", - "msg": "You fumble as the blob starts to multiply rapidly!", - "target_charges": 3, - "active": true, - "moves": 250, - "type": "transform" - } - }, - { - "id": "gray_act", - "type": "TOOL", - "category": "tools", - "name": "multiplying gray mass", - "name_plural": "multiplying gray mass", - "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": "19662 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_green", - "ammo": "bfeed", - "max_charges": 10, - "charges_per_use": 20, - "turns_per_charge": 1, - "revert_to": "gray", - "use_action": { - "type": "place_monster", - "monster_id": "mon_gray", - "friendly_msg": "A blob splits and bounces away!", - "hostile_msg": "A blob splits and bounces away!", - "difficulty": 1, - "moves": 100, - "place_randomly": true, - "skill1": "cooking" - }, - "flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE" ] - }, - { - "id": "gray_tank", - "type": "CONTAINER", - "name": "gray cocoon", - "name_plural": "gray cocoons", - "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": "19120 g", - "volume": "10 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_gray", - "contains": "30 L", - "seals": true, - "watertight": true - }, - { - "id": "gray_tank_large", - "type": "CONTAINER", - "name": "gray tank", - "name_plural": "gray tanks", - "copy-from": "gray_tank", - "volume": "100 L", - "contains": 400 - }, - { - "id": "gray_wheel", - "type": "WHEEL", - "category": "veh_parts", - "name": "gray wheel", - "description": "Filling a gray mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": "53262 g", - "volume": "30 L", - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "light_gray", - "diameter": 40, - "width": 40 - }, - { - "id": "graygrow", - "type": "TOOL", - "category": "tools", - "name": "growing gray mass", - "name_plural": "growing gray mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "16335 g", - "volume": "15 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_gray", - "use_action": { - "target": "gray", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 9600, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "grinder", - "type": "WHEEL", - "category": "veh_parts", - "name": "earthen roller", - "description": "A large, spherical blob the size of a large truck tire. The outer layer has compacted itself into a solid shell; offering great resilience. Having grown to full size, it seems content to simply sit there.", - "weight": "204540 g", - "volume": "50 L", - "price": 500, - "to_hit": -3, - "bashing": 9, - "material": [ "stone", "flesh" ], - "symbol": "]", - "color": "light_gray", - "diameter": 60, - "width": 60 - }, - { - "id": "horror", - "type": "GUN", - "name": "blobsaw", - "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. While its simpler cousins have a limit to the number of keratinous protrusions they can project and control; this blob can utilize hundreds of these sharp fangs to shred anything it detects as a threat into unrecognizable ribbons. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "24331 g", - "volume": "7500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "blue", - "ammo": "bfeed", - "skill": "launcher", - "range": 2, - "ranged_damage": 15, - "pierce": 15, - "sight_dispersion": 150, - "durability": 10, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 20 ] ], - "clip_size": 240, - "ammo_effects": [ "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "horrorgrow", - "type": "TOOL", - "category": "tools", - "name": "growing spike-studded mass", - "name_plural": "growing spike-studded mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "20140 g", - "volume": "5500 ml", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "blue", - "use_action": { - "target": "horror", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "inkie", - "type": "GUN", - "name": "fuel puffer", - "//": "God Dangit Blobby.", - "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digestion process turns the result incredibly viscous which, when threats come near, is launched; ensnaring anything it hits. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "15531 g", - "volume": "4 L", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "brown", - "ammo": "gasoline", - "skill": "launcher", - "range": 12, - "ranged_damage": 5, - "dispersion": 450, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 250, - "ammo_effects": [ "JET", "BEANBAG", "BLINDS_EYES", "RECOVER_100", "WIDE", "CUSTOM_EXPLOSION" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] - }, - { - "id": "inkiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing gasoline-laced mass", - "name_plural": "growing gasoline-laced mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12140 g", - "volume": "3 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "brown", - "use_action": { - "target": "inkie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 2400, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "meltie", - "type": "GUN", - "name": "acid puffer", - "description": "A living blob turned into an autonomous weapon. A filter feeder, the digestion process produces highly acidic byproducts; which is then expelled at any nearby enemies. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "15553 g", - "volume": "4500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "light_red", - "ammo": "water", - "skill": "launcher", - "range": 12, - "ranged_damage": 5, - "dispersion": 900, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 250, - "ammo_effects": [ "JET", "ACID_BOMB", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] - }, - { - "id": "meltiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing acidic mass", - "name_plural": "growing acidic mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12140 g", - "volume": "3 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_red", - "use_action": { - "target": "meltie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "oozle", - "type": "TOOL", - "category": "tools", - "name": "oozing mass", - "name_plural": "oozing mass", - "description": "An amorphous mass that has undergone a significant growth. In addition to the increased amount of goo and sinuous filaments, it seems to have started developing other internal structures. Like its smaller counterpart, it can be shaped into various structures; albeit with significantly greater tensile strength due to the increased number of supporting filaments. You believe you can split it apart with enough force.", - "weight": "16262 g", - "volume": "15 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "green", - "ammo": "bfeed", - "max_charges": 250, - "charges_per_use": 250, - "qualities": [ [ "JACK", 4 ] ], - "use_action": { - "target": "oozle_act", - "msg": "You fumble as the blob starts to multiply rapidly!", - "target_charges": 5, - "active": true, - "moves": 250, - "type": "transform" - } - }, - { - "id": "oozle_act", - "type": "TOOL", - "category": "tools", - "name": "multiplying oozing mass", - "name_plural": "multiplying oozing mass", - "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", - "weight": "16662 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_green", - "ammo": "bfeed", - "max_charges": 10, - "turns_per_charge": 1, - "revert_to": "oozle", - "use_action": { - "type": "place_monster", - "monster_id": "mon_oozle", - "friendly_msg": "A blob splits and bounces away!", - "hostile_msg": "A blob splits and bounces away!", - "difficulty": 1, - "moves": 250, - "place_randomly": true, - "skill1": "cooking" - }, - "flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE" ] - }, - { - "id": "oozle_tank", - "type": "CONTAINER", - "name": "oozing pod", - "name_plural": "oozing pods", - "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", - "weight": "16262 g", - "volume": "7500 ml", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "green", - "contains": "20 L", - "seals": true, - "watertight": true - }, - { - "id": "oozle_tank_large", - "type": "CONTAINER", - "name": "oozing tank", - "name_plural": "oozing tanks", - "copy-from": "oozle_tank", - "volume": "80 L", - "contains": 320 - }, - { - "id": "oozle_wheel", - "type": "WHEEL", - "category": "veh_parts", - "name": "oozing wheel", - "description": "Filling an oozing mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", - "weight": "50262 g", - "volume": "30 L", - "to_hit": -3, - "bashing": 9, - "material": [ "flesh" ], - "symbol": "]", - "color": "green", - "diameter": 30, - "width": 30 - }, - { - "id": "oozlegrow", - "type": "TOOL", - "category": "tools", - "name": "growing ooze", - "name_plural": "growing ooze", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12662 g", - "volume": "10 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "green", - "use_action": { - "target": "oozle", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "queen", - "type": "GENERIC", - "name": "amorphous heart", - "description": "This amorphous mass seems to have finished developing; its advanced internal structures testifying to that. It is capable of locomotion through internal hydraulic pressure, capable of moving substantial loads, and, in an astounding display of intelligence, is capable of manipulating anything it's attached to, whether blob-based or otherwise, through extended pseudopods. You think you might be able to manipulate it, and through it, all its attached parts. Though to do so you'll have to position yourself to be in contact with it; and it appears unnervingly willing to accommodate you…", - "weight": "21331 g", - "volume": "20 L", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": ")", - "color": "red" - }, - { - "id": "queengrow", - "type": "TOOL", - "category": "tools", - "name": "growing mass of tendrils", - "name_plural": "growing mass of tendrils", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "25325 g", - "volume": "15 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "red", - "use_action": { - "target": "queen", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 36000, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "razorqueen", - "type": "GUN", - "name": "gel spiker", - "description": "A living blob turned into an autonomous weapon. Capable of calcifying large numbers of fang-like fragments within itself. It hurls groups of these fragments along with a small portion of itself. When it reaches its destination, the detached remains shoot these fragments in all directions, expiring in the process. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "24121 g", - "volume": "6500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "cyan", - "ammo": "bfeed", - "skill": "rifle", - "range": 18, - "ranged_damage": 40, - "pierce": 30, - "dispersion": 900, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 250, - "ammo_effects": [ "FRAG", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] - }, - { - "id": "razorqueengrow", - "type": "TOOL", - "category": "tools", - "name": "growing spiked mass", - "name_plural": "growing spiked mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "18140 g", - "volume": "5 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "cyan", - "use_action": { - "target": "razorqueen", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 9600, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "spouterqueen", - "type": "GUN", - "name": "gel spouter", - "description": "A living blob turned into an autonomous weapon. It can suck in water from a vehicle tank, and forcibly expel it in a wide cone. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "21331 g", - "volume": "20 L", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "looks_like": "razorqueen", - "symbol": ")", - "color": "red", - "ammo": "water", - "skill": "launcher", - "range": 60, - "ranged_damage": 10, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 1000, - "ammo_effects": [ "WIDE", "ACT_ON_RANGED_HIT", "RECOVER_100", "NO_EMBED", "CUSTOM_EXPLOSION" ], - "qualities": [ [ "JACK", 12 ] ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_100" ] - }, - { - "id": "sharp", - "type": "GUN", - "name": "gel lancer", - "description": "A living blob turned into an autonomous weapon. Evolving incredible abilities of perception, it is capable of locating and discerning possible threats within a large radius. When a potential threat is located, it fires a small, calcified projectile with incredible speed and accuracy. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "15103 g", - "volume": "4 L", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "light_blue", - "ammo": "bfeed", - "skill": "pistol", - "range": 16, - "ranged_damage": 8, - "pierce": 5, - "sight_dispersion": 150, - "durability": 10, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], - "clip_size": 36, - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "sharpgrow", - "type": "TOOL", - "category": "tools", - "name": "growing spiny mass", - "name_plural": "growing spiny mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "11140 g", - "volume": "3500 ml", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_blue", - "use_action": { - "target": "sharp", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "gelrazor", - "type": "GUN", - "name": "gel razor", - "description": "A living blob turned into an autonomous weapon. An enhanced metabolism allows it to calcify large, toothy discs which are then launched towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "17121 g", - "volume": "5500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh", "bone" ], - "symbol": "&", - "color": "blue", - "ammo": "bfeed", - "skill": "rifle", - "range": 12, - "ranged_damage": 20, - "pierce": 10, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 20, - "ammo_effects": [ "BOUNCE", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "sicklegrow", - "type": "TOOL", - "category": "tools", - "name": "growing spiky mass", - "name_plural": "growing spiky mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12140 g", - "volume": "4 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "blue", - "use_action": { - "target": "gelrazor", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "sparkie", - "type": "GUN", - "name": "shock bulb", - "description": "A living blob turned into an autonomous weapon. Shockingly, it somehow is able to project electricity, which it then discharges at any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "14321 g", - "volume": "3750 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "cyan", - "skill": "launcher", - "range": 8, - "ranged_damage": 30, - "sight_dispersion": 150, - "durability": 10, - "ups_charges": 19, - "ammo_effects": [ "LIGHTNING", "BEANBAG", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "sparkiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing bright mass", - "name_plural": "growing bright mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "11140 g", - "volume": "3 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "cyan", - "use_action": { - "target": "sparkie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "stickie", - "type": "GUN", - "name": "gel puffer", - "description": "A living blob turned into an autonomous weapon. A filter feeder, it strips any water it processes of nutrients and expels the remainder towards any nearby threats. The process of filter-feeding also makes the remaining liquid viscous, though it also dissipates fairly quickly. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "11331 g", - "volume": "4500 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "yellow", - "ammo": "water", - "skill": "launcher", - "range": 12, - "ranged_damage": 5, - "dispersion": 900, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 500, - "ammo_effects": [ "JET", "BEANBAG", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] - }, - { - "id": "stickiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing viscous mass", - "name_plural": "growing viscous mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "8140 g", - "volume": "3 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "yellow", - "use_action": { - "target": "stickie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 2400, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "torchie", - "type": "GUN", - "name": "fire puffer", - "//": "Need a light?", - "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digested material is still highly flammable, and when launched, also activates an ignition gland located on the outer membrane. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "16331 g", - "volume": "4 L", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "light_red", - "ammo": "gasoline", - "skill": "launcher", - "range": 12, - "ranged_damage": 5, - "dispersion": 450, - "sight_dispersion": 150, - "durability": 10, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], - "clip_size": 180, - "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "STREAM" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] - }, - { - "id": "torchiegrow", - "type": "TOOL", - "category": "tools", - "name": "growing warm mass", - "name_plural": "growing warm mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12140 g", - "volume": "3 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "light_red", - "use_action": { - "target": "torchie", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 4800, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - }, - { - "id": "voideater", - "type": "GUN", - "name": "spark blight", - "description": "A living blob turned into an autonomous weapon. It is capable of storing energy from sunlight inside itself in the form of electricity. Then, in a truly baffling show of force, projects a highly concentrated stream of electricity towards any possible threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", - "weight": "17331 g", - "volume": "5250 ml", - "to_hit": -5, - "bashing": 10, - "material": [ "flesh" ], - "symbol": "&", - "color": "cyan", - "skill": "launcher", - "range": 12, - "ranged_damage": 80, - "sight_dispersion": 150, - "durability": 10, - "ups_charges": 199, - "ammo_effects": [ "LIGHTNING", "EXPLOSIVE", "WIDE" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "voideatergrow", - "type": "TOOL", - "category": "tools", - "name": "growing electrified mass", - "name_plural": "growing electrified mass", - "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "12140 g", - "volume": "4 L", - "price": 100, - "to_hit": -2, - "material": [ "flesh" ], - "symbol": ";", - "color": "cyan", - "use_action": { - "target": "voideater", - "msg": "The blob balloons to full size.", - "type": "delayed_transform", - "transform_age": 2400, - "not_ready_msg": "Whatever it's doing, it's not done yet." - } - } -] diff --git a/data/mods/blazemod/blaze_blob_parts.json b/data/mods/blazemod/blaze_blob_parts.json deleted file mode 100644 index 3a797d6b08e98..0000000000000 --- a/data/mods/blazemod/blaze_blob_parts.json +++ /dev/null @@ -1,1760 +0,0 @@ -[ - { - "id": "gloopletread", - "type": "vehicle_part", - "name": "Gelatinous track", - "item": "gloopletread", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A set of continuous, interlocking tracks made out of blob. They can be used in place of wheels, and provide good traction and off-road performance.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "wheel_type": "treads", - "contact_area": 2500, - "rolling_resistance": 6, - "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED", "FOLDABLE" ] - }, - { - "id": "oozletread", - "type": "vehicle_part", - "copy-from": "gloopletread", - "name": "Oozing track", - "item": "oozletread", - "breaks_into": [ { "item": "oozlegrow" } ] - }, - { - "id": "graytread", - "type": "vehicle_part", - "copy-from": "gloopletread", - "name": "Gray track", - "item": "graytread", - "breaks_into": [ { "item": "graygrow" } ] - }, - { - "id": "biter", - "type": "vehicle_part", - "name": "biting blob", - "item": "biter", - "location": "center", - "symbol": "t", - "broken_symbol": "#", - "color": "blue", - "broken_color": "blue", - "durability": 400, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "bitergrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "description": "A living blob, transformed into a heavy vehicle weapon.", - "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] - }, - { - "id": "clutter", - "type": "vehicle_part", - "name": "gel shooter", - "item": "clutter", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "magenta", - "broken_color": "magenta", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "cluttergrow" } ], - "description": "A living blob, transformed into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - }, - { - "id": "freezie", - "type": "vehicle_part", - "name": "frost lancer", - "item": "freezie", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "light_blue", - "broken_color": "light_blue", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "freeziegrow" } ], - "description": "A living blob, existing in a super-cooled state and transformed into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - }, - { - "id": "frostie_ram", - "type": "vehicle_part", - "name": "ice ram", - "item": "frostie", - "location": "structure", - "symbol": "X", - "broken_symbol": "0", - "color": "light_blue", - "broken_color": "light_blue", - "durability": 1000, - "damage_modifier": 200, - "folded_volume": 1, - "breaks_into": [ { "item": "frostiegrow" } ], - "description": "A living blob, existing in a super-cooled state. It will absorb damage in a vehicle collision and deliver additional damage to the other object in the collision. It should be mounted on the edge of the vehicle, preferably the front.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "PROTRUSION", "SHARP", "FOLDABLE" ] - }, - { - "id": "frostie_trunk", - "type": "vehicle_part", - "name": "ice pack", - "item": "frostie", - "location": "center", - "symbol": "H", - "broken_symbol": "#", - "color": "light_blue", - "broken_color": "light_blue", - "difficulty": 3, - "durability": 100, - "epower": 0, - "size": 400, - "damage_modifier": 80, - "folded_volume": 1, - "breaks_into": [ { "item": "frostiegrow" } ], - "description": "A living blob, existing in a super-cooled state. It will keep items stored in it cold, reducing the speed at which food and drink rots.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "CARGO", "OBSTACLE", "FRIDGE", "COVERED", "FOLDABLE" ] - }, - { - "id": "frostie_wall", - "type": "vehicle_part", - "name": "icy windshield", - "item": "frostie", - "location": "center", - "symbol": "\"", - "broken_symbol": "0", - "color": "light_blue", - "broken_color": "light_blue", - "durability": 500, - "damage_modifier": 80, - "folded_volume": 1, - "breaks_into": [ { "item": "frostiegrow" } ], - "description": "A living blob, existing in a super-cooled state. It is transparent, and can be used to see out of the vehicle.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "WINDOW", "FOLDABLE" ] - }, - { - "id": "frostie_wheel", - "type": "vehicle_part", - "name": "snow slider", - "item": "frostie_wheel", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "light_blue", - "broken_color": "light_blue", - "durability": 500, - "damage_modifier": 200, - "folded_volume": 1, - "breaks_into": [ { "item": "frostiegrow" } ], - "description": "A living blob, existing in a super-cooled state. It acts as a wheel.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "rolling_resistance": 1.5, - "wheel_type": "standard", - "contact_area": 153, - "flags": [ "WHEEL", "FOLDABLE", "EXTRA_DRAG", "SHARP", "TRACKED" ] - }, - { - "id": "frostie_wheel_sea", - "type": "vehicle_part", - "name": "icy sea skimmer", - "item": "frostie_hull", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "light_blue", - "broken_color": "light_blue", - "durability": 500, - "damage_modifier": 200, - "folded_volume": 1, - "breaks_into": [ { "item": "frostiegrow" } ], - "description": "A living blob, existing in a super-cooled state. It acts as a boat hull.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "FLOATS", "FOLDABLE", "EXTRA_DRAG", "SHARP", "TRACKED" ] - }, - { - "id": "fuzzle", - "type": "vehicle_part", - "name": "snapping ooze", - "item": "fuzzle", - "location": "center", - "symbol": "t", - "broken_symbol": "#", - "color": "brown", - "broken_color": "brown", - "durability": 600, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "fuzzlegrow" } ], - "description": "A living blob, transformed into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] - }, - { - "id": "gel_lamp", - "type": "vehicle_part", - "name": "gel lamp", - "item": "glowie", - "fuel_type": "battery", - "symbol": "#", - "broken_symbol": "x", - "color": "cyan", - "broken_color": "cyan", - "durability": 200, - "epower": 0, - "bonus": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glowiegrow" } ], - "description": "A living, glowing blob. It produces a bright light that illuminates a narrow cone outside the vehicle when turned on. During installation, you can choose what direction to point the light, so multiple gel lamps can illuminate the sides or rear, as well as the front.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "CONE_LIGHT", "FOLDABLE" ] - }, - { - "id": "gel_lamp_d", - "type": "vehicle_part", - "copy-from": "gel_lamp", - "name": "directed gel lamp" - }, - { - "id": "gloople_amalgam", - "type": "vehicle_part", - "name": "gel retriever", - "item": "gloople", - "location": "under", - "symbol": "R", - "broken_symbol": ";", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "epower": 0, - "size": 300, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, formed to act as a scoop. Use the vehicle controls to turn it on or off. When turned on, it will scoop up any loose items that it travels over, putting them into the vehicle's storage.", - "breaks_into": [ { "item": "glooplegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SCOOP", "CARGO", "FOLDABLE" ] - }, - { - "id": "gloople_belt", - "type": "vehicle_part", - "name": "gel harness", - "item": "gloople", - "location": "on_seat", - "symbol": ",", - "broken_symbol": ",", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "bonus": 25, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, reformed as a belt and attached to a seat.", - "breaks_into": [ { "item": "glooplegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SEATBELT", "FOLDABLE" ] - }, - { - "id": "gloople_cross", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "c", - "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ] - }, - { - "id": "gloople_tank", - "type": "vehicle_part", - "name": "capsule (10L)", - "item": "gloople_tank", - "location": "fuel_source", - "symbol": "O", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "size": 5000, - "damage_modifier": 10, - "folded_volume": 20, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, formed into a storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "FOLDABLE", "FUEL_TANK" ] - }, - { - "id": "gloople_tank_large", - "type": "vehicle_part", - "copy-from": "gloople_tank", - "name": "gel tank (60L)", - "item": "gloople_tank_large", - "size": 60000, - "folded_volume": 240 - }, - { - "id": "gloople_horizontal", - "type": "vehicle_part", - "name": "gel framework", - "item": "gloople", - "location": "structure", - "symbol": "h", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "FOLDABLE", "MOUNTABLE" ] - }, - { - "id": "gloople_horizontal_2", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "=" - }, - { - "id": "gloople_ne", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "u" - }, - { - "id": "gloople_nw", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "y" - }, - { - "id": "gloople_plate", - "type": "vehicle_part", - "name": "gel reinforcement", - "item": "gloople", - "location": "armor", - "symbol": "X", - "broken_symbol": "*", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, acting as armor plate.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "ARMOR", "FOLDABLE" ] - }, - { - "id": "gloople_roof", - "type": "vehicle_part", - "name": "gel roof", - "item": "gloople", - "location": "roof", - "symbol": "#", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, placed as roof.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "ROOF", "FOLDABLE" ] - }, - { - "id": "gloople_se", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "n" - }, - { - "id": "gloople_seat", - "type": "vehicle_part", - "name": "gel seat", - "item": "gloople", - "location": "center", - "symbol": "#", - "broken_symbol": "*", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, formed into a comfy couch. You can sit here.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SEAT", "BED", "BOARDABLE", "BELTABLE" ] - }, - { - "id": "gloople_sw", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "b" - }, - { - "id": "gloople_trunk", - "type": "vehicle_part", - "name": "gel receptacle", - "item": "gloople", - "location": "center", - "symbol": "H", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "size": 400, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, shaped into a cargo space.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "CARGO", "COVERED", "FOLDABLE" ] - }, - { - "id": "gloople_trunk_u", - "type": "vehicle_part", - "copy-from": "gloople_trunk", - "name": "gel pouch (under)", - "location": "under" - }, - { - "id": "gloople_vertical", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "j" - }, - { - "id": "gloople_vertical_2", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "H" - }, - { - "id": "gloople_wheel", - "type": "vehicle_part", - "name": "gelatinous wheel", - "item": "gloople_wheel", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob. It acts as a wheel.", - "breaks_into": [ { "item": "glooplegrow" }, { "item": "water", "count": [ 50, 100 ] } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "rolling_resistance": 1.75, - "wheel_type": "standard", - "contact_area": 153, - "flags": [ "WHEEL", "FOLDABLE", "TRACKED" ] - }, - { - "id": "gloopleaisle_horizontal", - "type": "vehicle_part", - "name": "gel walkway", - "item": "gloople", - "location": "center", - "symbol": "=", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, formed into a walkway.", - "breaks_into": [ { "item": "glooplegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "AISLE", "BOARDABLE", "FOLDABLE" ] - }, - { - "id": "gloopleaisle_vertical", - "type": "vehicle_part", - "copy-from": "gloopleaisle_horizontal", - "symbol": "H" - }, - { - "id": "gloopleboard_horizontal", - "type": "vehicle_part", - "name": "gel panel", - "item": "gloople", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ] - }, - { - "id": "gloopleboard_ne", - "type": "vehicle_part", - "copy-from": "gloopleboard_horizontal", - "symbol": "u" - }, - { - "id": "gloopleboard_nw", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "y" - }, - { - "id": "gloopleboard_se", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "n" - }, - { - "id": "gloopleboard_sw", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "b" - }, - { - "id": "gloopleboard_vertical", - "type": "vehicle_part", - "copy-from": "gloople_horizontal", - "symbol": "j" - }, - { - "id": "gloopledoor", - "type": "vehicle_part", - "name": "gel hatch", - "item": "gloople", - "location": "center", - "symbol": "+", - "broken_symbol": "&", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, acting as a door. Has a transparent patch so you can see out of it, even when closed.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "FOLDABLE" ] - }, - { - "id": "gloopledoor_opaque", - "type": "vehicle_part", - "name": "opaque gel hatch", - "item": "gloople", - "location": "center", - "symbol": "+", - "broken_symbol": "&", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, acting as a door. Entirely opaque so you can't see through it when closed.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ] - }, - { - "id": "glowie_battery", - "type": "vehicle_part", - "name": "gel battery", - "item": "glowie", - "location": "fuel_source", - "fuel_type": "battery", - "symbol": "#", - "broken_symbol": "x", - "color": "cyan", - "broken_color": "cyan", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glowiegrow" } ], - "description": "A living, glowing blob. Having been filled with electrical power, it stores that power and can release it to power other parts of the vehicle, allowing it to act as a storage battery.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "FOLDABLE" ] - }, - { - "id": "glowie_battery_u", - "type": "vehicle_part", - "copy-from": "glowie_battery", - "name": "gel battery (under)", - "location": "under" - }, - { - "id": "glowie_power", - "type": "vehicle_part", - "name": "gel generator", - "item": "glowie", - "location": "center", - "fuel_type": "bfeed", - "symbol": "#", - "broken_symbol": "x", - "color": "cyan", - "broken_color": "cyan", - "durability": 200, - "//": "Power is a multiplier on power efficiency - 1 unit is 100 units of battery or 100 kJ", - "power": 50, - "epower": 250, - "bonus": 25, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glowiegrow" } ], - "description": "A living, glowing blob. It consumes blob feed and produces electrical power, allowing it to be used as a reactor. It also glows, and can be turned on to illuminate several squares inside the vehicle.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "REACTOR", "FOLDABLE", "ATOMIC_LIGHT", "ENABLED_DRAINS_EPOWER" ] - }, - { - "id": "gray_amalgam", - "type": "vehicle_part", - "name": "gray retriever", - "item": "gray", - "location": "under", - "symbol": "R", - "broken_symbol": ";", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "epower": 0, - "size": 800, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "description": "A living blob, formed to act as a scoop. Use the vehicle controls to turn it on or off. When turned on, it will scoop up any loose items that it travels over, putting them into the vehicle's storage.", - "flags": [ "SCOOP", "CARGO", "FOLDABLE" ] - }, - { - "id": "gray_belt", - "type": "vehicle_part", - "name": "gray harness", - "item": "gray", - "location": "on_seat", - "symbol": ",", - "broken_symbol": ",", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "bonus": 50, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, reformed as a belt and attached to a seat.", - "breaks_into": [ { "item": "graygrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SEATBELT", "FOLDABLE" ] - }, - { - "id": "gray_cross", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "c", - "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ] - }, - { - "id": "gray_tank", - "type": "vehicle_part", - "name": "cocoon (30L)", - "item": "gray_tank", - "location": "fuel_source", - "symbol": "O", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "size": 10000, - "damage_modifier": 10, - "folded_volume": 40, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, formed into a storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "FOLDABLE", "FUEL_TANK" ] - }, - { - "id": "gray_tank_large", - "type": "vehicle_part", - "copy-from": "gray_tank", - "name": "gray tank (100L)", - "item": "gray_tank_large", - "size": 100000, - "folded_volume": 400 - }, - { - "id": "gray_horizontal", - "type": "vehicle_part", - "name": "gray frame", - "item": "gray", - "location": "structure", - "symbol": "h", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "FOLDABLE", "MOUNTABLE" ] - }, - { - "id": "gray_horizontal_2", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "broken_symbol": "#" - }, - { - "id": "gray_ne", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "u" - }, - { - "id": "gray_nw", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "y" - }, - { - "id": "gray_plate", - "type": "vehicle_part", - "name": "gray reinforcement", - "item": "gray", - "location": "armor", - "symbol": "X", - "broken_symbol": "*", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, acting as armor plate.", - "breaks_into": [ { "item": "graygrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "ARMOR", "FOLDABLE" ] - }, - { - "id": "gray_roof", - "type": "vehicle_part", - "name": "gray roof", - "item": "gray", - "location": "roof", - "symbol": "#", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, placed as roof.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "ROOF", "FOLDABLE" ] - }, - { - "id": "gray_se", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "n" - }, - { - "id": "gray_seat", - "type": "vehicle_part", - "name": "gray seat", - "item": "gray", - "location": "center", - "symbol": "#", - "broken_symbol": "*", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, formed into a comfy couch. You can sit here.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SEAT", "BED", "BOARDABLE", "BELTABLE" ] - }, - { - "id": "gray_sw", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "b" - }, - { - "id": "gray_trunk", - "type": "vehicle_part", - "name": "gray receptacle", - "item": "gray", - "location": "center", - "symbol": "H", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "size": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, shaped into a cargo space.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "CARGO", "COVERED", "FOLDABLE" ] - }, - { - "id": "gray_trunk_u", - "type": "vehicle_part", - "copy-from": "gray_trunk", - "name": "gray pouch (under)", - "location": "under" - }, - { - "id": "gray_vertical", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "j" - }, - { - "id": "gray_vertical_2", - "type": "vehicle_part", - "copy-from": "gray_horizontal", - "symbol": "H" - }, - { - "id": "gray_wheel", - "type": "vehicle_part", - "name": "gray wheel", - "item": "gray_wheel", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob. It acts as a wheel.", - "breaks_into": [ { "item": "graygrow" }, { "item": "water", "count": [ 100, 200 ] } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "rolling_resistance": 1.25, - "wheel_type": "standard", - "contact_area": 153, - "flags": [ "WHEEL", "FOLDABLE", "TRACKED" ] - }, - { - "id": "grayaisle_horizontal", - "type": "vehicle_part", - "name": "gray walkway", - "item": "gray", - "location": "center", - "symbol": "=", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, formed into a walkway.", - "breaks_into": [ { "item": "graygrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "AISLE", "BOARDABLE", "FOLDABLE" ] - }, - { - "id": "grayaisle_vertical", - "type": "vehicle_part", - "copy-from": "grayaisle_horizontal", - "symbol": "H" - }, - { - "id": "grayboard_horizontal", - "type": "vehicle_part", - "name": "gray wall", - "item": "gray", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, formed into a vehicle wall. Keeps zombies outside the vehicle and prevents people from seeing through it.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ] - }, - { - "id": "grayboard_ne", - "type": "vehicle_part", - "copy-from": "grayboard_horizontal", - "symbol": "u" - }, - { - "id": "grayboard_nw", - "type": "vehicle_part", - "copy-from": "grayboard_horizontal", - "symbol": "y" - }, - { - "id": "grayboard_se", - "type": "vehicle_part", - "copy-from": "grayboard_horizontal", - "symbol": "n" - }, - { - "id": "grayboard_sw", - "type": "vehicle_part", - "copy-from": "grayboard_horizontal", - "symbol": "b" - }, - { - "id": "grayboard_vertical", - "type": "vehicle_part", - "copy-from": "grayboard_horizontal", - "symbol": "j" - }, - { - "id": "graydoor", - "type": "vehicle_part", - "name": "gray hatch", - "item": "gray", - "location": "center", - "symbol": "+", - "broken_symbol": "&", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, acting as a door. Has a transparent patch so you can see out of it, even when closed.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "FOLDABLE" ] - }, - { - "id": "graydoor_opaque", - "type": "vehicle_part", - "name": "opaque gray hatch", - "item": "gray", - "location": "center", - "symbol": "+", - "broken_symbol": "&", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, acting as a door. Entirely opaque so you can't see through it when closed.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ] - }, - { - "id": "grinder", - "type": "vehicle_part", - "name": "earthen roller", - "item": "grinder", - "location": "structure", - "symbol": "O", - "broken_symbol": "#", - "color": "brown", - "broken_color": "brown", - "durability": 2500, - "damage_modifier": 250, - "folded_volume": 1, - "breaks_into": [ { "item": "gray" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "rolling_resistance": 6, - "wheel_type": "rigid", - "contact_area": 500, - "flags": [ "WHEEL", "FOLDABLE", "PROTRUSION", "STABLE", "TRACKED" ] - }, - { - "id": "halfgloopleboard_horizontal", - "type": "vehicle_part", - "name": "gel quarterpanel", - "item": "gloople", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "light_green", - "broken_color": "light_green", - "durability": 250, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "glooplegrow" } ], - "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ] - }, - { - "id": "halfgloopleboard_horizontal_2", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "=" - }, - { - "id": "halfgloopleboard_ne", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "u" - }, - { - "id": "halfgloopleboard_nw", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "y" - }, - { - "id": "halfgloopleboard_se", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "n" - }, - { - "id": "halfgloopleboard_sw", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "b" - }, - { - "id": "halfgloopleboard_vertical", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "j" - }, - { - "id": "halfgloopleboard_vertical_2", - "type": "vehicle_part", - "copy-from": "halfgloopleboard_horizontal", - "symbol": "H" - }, - { - "id": "halfgrayboard_horizontal", - "type": "vehicle_part", - "name": "gray barricade", - "item": "gray", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "light_gray", - "broken_color": "light_gray", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "graygrow" } ], - "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ] - }, - { - "id": "halfgrayboard_horizontal_2", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "=" - }, - { - "id": "halfgrayboard_ne", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "u" - }, - { - "id": "halfgrayboard_nw", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "y" - }, - { - "id": "halfgrayboard_se", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "n" - }, - { - "id": "halfgrayboard_sw", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "b" - }, - { - "id": "halfgrayboard_vertical", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "j" - }, - { - "id": "halfgrayboard_vertical_2", - "type": "vehicle_part", - "copy-from": "halfgrayboard_horizontal", - "symbol": "H" - }, - { - "id": "halfoozleboard_horizontal", - "type": "vehicle_part", - "name": "ooze screen", - "item": "oozle", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ] - }, - { - "id": "halfoozleboard_horizontal_2", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "=" - }, - { - "id": "halfoozleboard_ne", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "u" - }, - { - "id": "halfoozleboard_nw", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "y" - }, - { - "id": "halfoozleboard_se", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "n" - }, - { - "id": "halfoozleboard_sw", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "b" - }, - { - "id": "halfoozleboard_vertical", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "j" - }, - { - "id": "halfoozleboard_vertical_2", - "type": "vehicle_part", - "copy-from": "halfoozleboard_horizontal", - "symbol": "H" - }, - { - "id": "horror", - "type": "vehicle_part", - "name": "blobsaw", - "item": "horror", - "location": "center", - "symbol": "t", - "broken_symbol": "#", - "color": "blue", - "broken_color": "blue", - "durability": 1000, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "horrorgrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] - }, - { - "id": "inkie", - "type": "vehicle_part", - "name": "fuel puffer", - "item": "inkie", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "brown", - "broken_color": "brown", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "inkiegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] - }, - { - "id": "meltie", - "type": "vehicle_part", - "name": "acid puffer", - "item": "meltie", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "light_red", - "broken_color": "light_red", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "meltiegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] - }, - { - "id": "oozle_amalgam", - "type": "vehicle_part", - "name": "ooze retriever", - "item": "oozle", - "location": "under", - "symbol": "R", - "broken_symbol": ";", - "color": "green", - "broken_color": "green", - "durability": 600, - "epower": 0, - "size": 400, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "description": "A living blob, formed to act as a scoop. Use the vehicle controls to turn it on or off. When turned on, it will scoop up any loose items that it travels over, putting them into the vehicle's storage.", - "flags": [ "SCOOP", "CARGO", "FOLDABLE" ] - }, - { - "id": "oozle_belt", - "type": "vehicle_part", - "name": "ooze harness", - "item": "oozle", - "location": "on_seat", - "symbol": ",", - "broken_symbol": ",", - "color": "green", - "broken_color": "green", - "durability": 500, - "bonus": 35, - "damage_modifier": 10, - "folded_volume": 1, - "description": "A living blob, reformed as a belt and attached to a seat.", - "breaks_into": [ { "item": "oozlegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SEATBELT", "FOLDABLE" ] - }, - { - "id": "oozle_cross", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "c", - "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ] - }, - { - "id": "oozle_tank", - "type": "vehicle_part", - "name": "pod (20L)", - "item": "oozle_tank", - "location": "fuel_source", - "symbol": "O", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "durability": 500, - "size": 7500, - "damage_modifier": 10, - "folded_volume": 30, - "breaks_into": [ { "item": "oozlegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "description": "A living blob, formed into a storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", - "flags": [ "FOLDABLE", "FUEL_TANK" ] - }, - { - "id": "oozle_tank_large", - "type": "vehicle_part", - "copy-from": "oozle_tank", - "name": "ooze tank (80L)", - "item": "oozle_tank_large", - "size": 8000, - "folded_volume": 320 - }, - { - "id": "oozle_horizontal", - "type": "vehicle_part", - "name": "ooze chassis", - "item": "oozle", - "location": "structure", - "symbol": "h", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", - "flags": [ "FOLDABLE", "MOUNTABLE" ] - }, - { - "id": "oozle_horizontal_2", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "=" - }, - { - "id": "oozle_ne", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "u" - }, - { - "id": "oozle_nw", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "y" - }, - { - "id": "oozle_plate", - "type": "vehicle_part", - "name": "ooze reinforcement", - "item": "oozle", - "location": "armor", - "symbol": "X", - "broken_symbol": "*", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, acting as armor plate.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "ARMOR", "FOLDABLE" ] - }, - { - "id": "oozle_roof", - "type": "vehicle_part", - "name": "ooze roof", - "item": "oozle", - "location": "roof", - "symbol": "#", - "broken_symbol": "#", - "color": "green", - "broken_color": "light_green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, placed as roof.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "ROOF", "FOLDABLE" ] - }, - { - "id": "oozle_se", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "n" - }, - { - "id": "oozle_seat", - "type": "vehicle_part", - "name": "ooze seat", - "item": "oozle", - "location": "center", - "symbol": "#", - "broken_symbol": "*", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, formed into a comfy couch. You can sit here.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "SEAT", "BED", "BOARDABLE", "BELTABLE" ] - }, - { - "id": "oozle_sw", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "b" - }, - { - "id": "oozle_trunk", - "type": "vehicle_part", - "name": "ooze receptacle", - "item": "oozle", - "location": "center", - "symbol": "H", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "durability": 500, - "size": 800, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, shaped into a cargo space.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "CARGO", "COVERED", "FOLDABLE" ] - }, - { - "id": "oozle_trunk_u", - "type": "vehicle_part", - "copy-from": "oozle_trunk", - "name": "ooze pouch (under)", - "location": "under" - }, - { - "id": "oozle_vertical", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "j" - }, - { - "id": "oozle_vertical_2", - "type": "vehicle_part", - "copy-from": "oozle_horizontal", - "symbol": "H" - }, - { - "id": "oozle_wheel", - "type": "vehicle_part", - "name": "oozing wheel", - "item": "oozle_wheel", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" }, { "item": "water", "count": [ 100, 200 ] } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "rolling_resistance": 1.5, - "wheel_type": "standard", - "contact_area": 153, - "flags": [ "WHEEL", "FOLDABLE", "TRACKED" ] - }, - { - "id": "oozleaisle_horizontal", - "type": "vehicle_part", - "name": "ooze walkway", - "item": "oozle", - "location": "center", - "symbol": "=", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, formed into a walkway.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "AISLE", "BOARDABLE", "FOLDABLE" ] - }, - { - "id": "oozleaisle_vertical", - "type": "vehicle_part", - "copy-from": "oozleaisle_horizontal", - "symbol": "H" - }, - { - "id": "oozleboard_horizontal", - "type": "vehicle_part", - "name": "ooze barrier", - "item": "oozle", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, formed into a vehicle wall. Keeps zombies outside the vehicle and prevents people from seeing through it.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ] - }, - { - "id": "oozleboard_ne", - "type": "vehicle_part", - "copy-from": "oozleboard_horizontal", - "symbol": "u" - }, - { - "id": "oozleboard_nw", - "type": "vehicle_part", - "copy-from": "oozleboard_horizontal", - "symbol": "y" - }, - { - "id": "oozleboard_se", - "type": "vehicle_part", - "copy-from": "oozleboard_horizontal", - "symbol": "n" - }, - { - "id": "oozleboard_sw", - "type": "vehicle_part", - "copy-from": "oozleboard_horizontal", - "symbol": "b" - }, - { - "id": "oozleboard_vertical", - "type": "vehicle_part", - "copy-from": "oozleboard_horizontal", - "symbol": "j" - }, - { - "id": "oozledoor", - "type": "vehicle_part", - "name": "ooze hatch", - "item": "oozle", - "location": "center", - "symbol": "+", - "broken_symbol": "&", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, acting as a door. Has a transparent patch so you can see out of it, even when closed.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "FOLDABLE" ] - }, - { - "id": "oozledoor_opaque", - "type": "vehicle_part", - "name": "opaque ooze hatch", - "item": "oozle", - "location": "center", - "symbol": "+", - "broken_symbol": "&", - "color": "green", - "broken_color": "green", - "durability": 500, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "oozlegrow" } ], - "description": "A living blob, acting as a door. Entirely opaque so you can't see through it when closed.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ] - }, - { - "id": "queen", - "type": "vehicle_part", - "name": "amorphous core", - "item": "queen", - "location": "center", - "fuel_type": "bfeedfuel", - "symbol": "O", - "broken_symbol": "#", - "color": "red", - "broken_color": "red", - "durability": 1000, - "power": 223800, - "energy_consumption": 600000, - "m2c": 65, - "noise_factor": 5, - "epower": -1, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "queengrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "description": "An amorphous mass, the living heart and brain of a blob vehicle.", - "flags": [ - "BOARDABLE", - "BELTABLE", - "FOLDABLE", - "ENGINE", - "CONTROLS", - "CTRL_ELECTRONIC", - "SEAT", - "BED", - "E_ALTERNATOR", - "E_STARTS_INSTANTLY", - "E_HIGHER_SKILL", - "TURRET_MOUNT" - ] - }, - { - "id": "blob_turret_mount", - "type": "vehicle_part", - "name": "inert core", - "item": "queen", - "looks_like": "turret_mount", - "symbol": "X", - "color": "red", - "broken_symbol": "X", - "broken_color": "red", - "damage_modifier": 8, - "durability": 400, - "folded_volume": 1, - "description": "A sleeping amorphous core, acting as a rotating, universal mount for a weapon. If your hands are empty, you can stand next to a tentacle and 'f'ire the weapon by selecting the tile.", - "breaks_into": [ { "item": "queengrow" } ], - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET_MOUNT", "FOLDABLE" ] - }, - { - "id": "spouterqueen", - "type": "vehicle_part", - "name": "gel spouter", - "item": "spouterqueen", - "location": "on_roof", - "looks_like": "clutter", - "symbol": "t", - "broken_symbol": "#", - "color": "red", - "broken_color": "red", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "queengrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] - }, - { - "id": "razorqueen", - "type": "vehicle_part", - "name": "gel spiker", - "item": "razorqueen", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "cyan", - "broken_color": "cyan", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "razorqueengrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - }, - { - "id": "sharp", - "type": "vehicle_part", - "name": "gel lancer", - "item": "sharp", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "light_blue", - "broken_color": "light_blue", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "sharpgrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - }, - { - "id": "gelrazor", - "type": "vehicle_part", - "name": "gel razor", - "item": "gelrazor", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "blue", - "broken_color": "blue", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "sicklegrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - }, - { - "id": "sparkie", - "type": "vehicle_part", - "name": "shock bulb", - "item": "sparkie", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "cyan", - "broken_color": "cyan", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "sparkiegrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - }, - { - "id": "stickie", - "type": "vehicle_part", - "name": "gel puffer", - "item": "stickie", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "yellow", - "broken_color": "yellow", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "stickiegrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] - }, - { - "id": "torchie", - "type": "vehicle_part", - "name": "fire puffer", - "item": "torchie", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "light_red", - "broken_color": "light_red", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "torchiegrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] - }, - { - "id": "voideater", - "type": "vehicle_part", - "name": "spark blight", - "item": "voideater", - "location": "on_roof", - "symbol": "t", - "broken_symbol": "#", - "color": "cyan", - "broken_color": "cyan", - "durability": 200, - "damage_modifier": 10, - "folded_volume": 1, - "breaks_into": [ { "item": "voideatergrow" } ], - "description": "A living blob turned into a heavy vehicle weapon.", - "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, - "flags": [ "TURRET", "FOLDABLE" ] - } -] diff --git a/data/mods/blazemod/blaze_other.json b/data/mods/blazemod/blaze_other.json deleted file mode 100644 index 53ec86b273209..0000000000000 --- a/data/mods/blazemod/blaze_other.json +++ /dev/null @@ -1,195 +0,0 @@ -[ - { - "id": "steam_triple_large", - "copy-from": "engine_steam", - "type": "ENGINE", - "name": "large steam engine", - "description": "A large steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", - "weight": "280 kg", - "volume": "95 L", - "epower": 0, - "power": 242450, - "energy_consumption": 484890, - "price": 1400000, - "price_postapoc": 2800000 - }, - { - "id": "steam_triple_giant", - "copy-from": "engine_steam", - "type": "ENGINE", - "name": "huge steam engine", - "description": "A huge steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", - "weight": "835 kg", - "volume": "175 L", - "epower": 0, - "power": 447600, - "energy_consumption": 895200, - "price": 2565000, - "price_postapoc": 5130000 - }, - { - "id": "steam_turbine_small", - "copy-from": "engine_steam", - "type": "ENGINE", - "name": "small steam turbine", - "description": "A small steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": "80 kg", - "volume": "18750 ml", - "//": "Steam turbine efficiency sucks - ideally 47% efficient with reheat cycles, versus 55% for a modern gas engine. Going with 33% efficieny for easy math", - "power": 93250, - "energy_consumption": 279750, - "price": 255000, - "price_postapoc": 510000 - }, - { - "id": "steam_turbine_medium", - "copy-from": "engine_steam", - "type": "ENGINE", - "name": "medium steam turbine", - "description": "A medium sized steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": "120 kg", - "volume": "27500 ml", - "power": 149200, - "energy_consumption": 347700, - "price": 380000, - "price_postapoc": 760000 - }, - { - "id": "steam_turbine_large", - "copy-from": "engine_steam", - "type": "ENGINE", - "name": "large steam turbine", - "description": "A large steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": "190 kg", - "volume": "45 L", - "power": 242450, - "energy_consumption": 727350, - "price": 595000, - "price_postapoc": 1190000 - }, - { - "id": "steam_turbine_giant", - "copy-from": "engine_steam", - "type": "ENGINE", - "name": "huge steam turbine", - "description": "A huge steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", - "weight": "345 kg", - "volume": "81250 ml", - "power": 447600, - "energy_consumption": 1342800, - "price": 1060000, - "price_postapoc": 2120000 - }, - { - "id": "solar_array", - "type": "GENERIC", - "category": "veh_parts", - "name": "solar array", - "description": "A dozen solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able track the sun. However, this comes at the cost of being prohibitively heavy.", - "weight": "265400 g", - "volume": "62500 ml", - "price": 120000, - "to_hit": -4, - "bashing": 1, - "material": [ "glass" ], - "symbol": "]", - "color": "yellow" - }, - { - "id": "solar_array2", - "type": "GENERIC", - "category": "veh_parts", - "name": "upgraded solar array", - "description": "A dozen upgraded solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", - "weight": "319328 g", - "volume": "62500 ml", - "price": 150000, - "to_hit": -4, - "bashing": 1, - "material": [ "glass" ], - "symbol": "]", - "color": "yellow" - }, - { - "id": "solar_array2r", - "type": "GENERIC", - "category": "veh_parts", - "name": "upgraded reinforced solar array", - "description": "A dozen upgraded reinforced solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", - "weight": "382736 g", - "volume": "80500 ml", - "price": 150000, - "to_hit": -4, - "bashing": 1, - "material": [ "glass", "steel" ], - "symbol": "]", - "color": "light_blue" - }, - { - "id": "tread1", - "type": "WHEEL", - "category": "veh_parts", - "name": "Rubber Caterpillar Track", - "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368 g", - "volume": "50 L", - "price": 25500, - "to_hit": -3, - "bashing": 30, - "material": [ "plastic", "steel" ], - "symbol": "]", - "color": "white", - "diameter": 30, - "width": 15 - }, - { - "id": "tread2", - "type": "WHEEL", - "category": "veh_parts", - "name": "Steel Caterpillar Track", - "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on large construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is very heavy.", - "weight": "95968 g", - "volume": "75 L", - "price": 45500, - "to_hit": -3, - "bashing": 30, - "material": [ "steel" ], - "symbol": "]", - "color": "white", - "diameter": 50, - "width": 25 - }, - { - "id": "tread3", - "type": "WHEEL", - "category": "veh_parts", - "name": "Reinforced Caterpillar Track", - "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on APCs and armored vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is extremely heavy.", - "weight": "287824 g", - "volume": "87500 ml", - "price": 75500, - "to_hit": -3, - "bashing": 30, - "material": [ "hardsteel", "steel" ], - "symbol": "]", - "color": "white", - "diameter": 60, - "width": 30 - }, - { - "id": "turretframe", - "type": "GENERIC", - "category": "veh_parts", - "name": { "str": "turret chassis", "str_pl": "turret chassis" }, - "description": "A frame capable of rotating a full 360 degrees, capable of mounting multiple weapon systems either welded directly onto it or secured via the straps. It comes with a easily modified container for ammunition storage, a rudimentary ammo feed system for easy access, and a section for a movement system. It is controlled by a targeting AI that can adapt to the usage of whatever weapon that has been loading, with proper programming.", - "weight": "38604 g", - "volume": "20 L", - "price": 8000, - "to_hit": -3, - "bashing": 15, - "material": [ "steel" ], - "symbol": "]", - "color": "light_gray", - "techniques": [ "DEF_DISARM" ] - } -] diff --git a/data/mods/blazemod/blaze_test.json b/data/mods/blazemod/blaze_test.json deleted file mode 100644 index cac2b661b2f60..0000000000000 --- a/data/mods/blazemod/blaze_test.json +++ /dev/null @@ -1,973 +0,0 @@ -[ - { - "result": "diamondplate", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 10, - "skills_required": [ ], - "time": 30000, - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ - [ [ "spiral_matrix", 1 ] ], - [ [ "glass_sheet", 2 ] ], - [ [ "charcoal", 20 ], [ "dshards", 1000 ], [ "dcluster", 40 ] ] - ] - }, - { - "result": "diamondframe", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 10, - "skills_required": [ ], - "time": 30000, - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ - [ [ "spiral_matrix", 1 ] ], - [ [ "xlframe", 1 ], [ "foldframe", 1 ] ], - [ [ "charcoal", 20 ], [ "dshards", 1000 ], [ "dcluster", 40 ] ] - ] - }, - { - "result": "vgen", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 6, - "skills_required": [ [ "mechanics", 6 ] ], - "time": 108000, - "reversible": false, - "autolearn": true, - "using": [ [ "forging_standard", 3 ], [ "steel_standard", 3 ], [ "welding_standard", 6 ] ], - "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ], - "components": [ - [ [ "vortex_stone", 1 ] ], - [ [ "chain", 6 ] ], - [ [ "foot_crank", 6 ] ], - [ [ "metal_tank", 1 ] ], - [ [ "plastic_chunk", 30 ] ] - ] - }, - { - "result": "vgen2", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 5, - "skills_required": [ [ "mechanics", 5 ], [ "electronics", 3 ] ], - "time": 108000, - "autolearn": true, - "using": [ [ "forging_standard", 3 ], [ "steel_standard", 3 ], [ "welding_standard", 6 ] ], - "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ], - "components": [ - [ [ "vortex_stone", 1 ] ], - [ [ "chain", 6 ] ], - [ [ "foot_crank", 3 ] ], - [ [ "metal_tank", 1 ] ], - [ [ "plastic_chunk", 30 ] ], - [ [ "alternator_truck", 6 ], [ "alternator_car", 6 ], [ "alternator_motorbike", 6 ] ] - ] - }, - { - "result": "space_anomaly", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "electronics", - "difficulty": 8, - "skills_required": [ [ "mechanics", 3 ], [ "electronics", 3 ] ], - "time": 144000, - "autolearn": true, - "using": [ [ "welding_standard", 6 ] ], - "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "cargo_rack", 1 ] ], [ [ "teleporter", 1 ] ], [ [ "portal", 1 ] ], [ [ "plut_cell", 5 ] ] ] - }, - { - "result": "diamondnova", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 10, - "skills_required": [ "mechanics", 8 ], - "time": 120000, - "autolearn": true, - "using": [ [ "welding_standard", 10 ] ], - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "metal_tank", 1 ] ], - [ [ "pipe", 12 ] ], - [ [ "steel_chunk", 27 ], [ "steel_lump", 9 ] ], - [ [ "spring", 2 ] ], - [ [ "plastic_chunk", 18 ] ], - [ [ "vortex_stone", 1 ] ], - [ [ "spiral_matrix", 1 ] ] - ] - }, - { - "result": "diamondlance", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 10, - "skills_required": [ "mechanics", 8 ], - "time": 90000, - "autolearn": true, - "using": [ [ "welding_standard", 10 ] ], - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "metal_tank", 1 ] ], - [ [ "2x4", 12 ], [ "stick", 12 ] ], - [ [ "nail", 60 ], [ "adhesive", 5, "LIST" ] ], - [ [ "steel_chunk", 24 ], [ "steel_lump", 6 ] ], - [ [ "string_36", 12 ] ], - [ [ "foot_crank", 1 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "spiral_matrix", 1 ] ] - ] - }, - { - "result": "vortexbolter", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 7, - "skills_required": [ "mechanics", 7 ], - "time": 30000, - "autolearn": true, - "using": [ [ "soldering_standard", 30 ] ], - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "metal_tank_little", 1 ] ], - [ [ "pipe", 2 ] ], - [ [ "helsing", 1 ] ], - [ [ "steel_chunk", 9 ], [ "steel_lump", 3 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "vortex_stone", 1 ] ] - ] - }, - { - "result": "vortexrifle", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 7, - "skills_required": [ "mechanics", 7 ], - "time": 30000, - "autolearn": true, - "using": [ [ "soldering_standard", 30 ] ], - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "metal_tank_little", 1 ] ], - [ [ "pipe", 2 ] ], - [ [ "tihar", 1 ] ], - [ [ "steel_chunk", 9 ], [ "steel_lump", 3 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "vortex_stone", 1 ] ] - ] - }, - { - "result": "vortexaccelerator", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 7, - "skills_required": [ "mechanics", 7 ], - "time": 60000, - "autolearn": true, - "using": [ [ "soldering_standard", 50 ] ], - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "metal_tank_little", 1 ] ], - [ [ "pipe", 4 ] ], - [ [ "steel_chunk", 18 ], [ "steel_lump", 6 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "vortex_stone", 1 ] ] - ] - }, - { - "result": "spiral_matrix", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "difficulty": 10, - "time": 30000, - "autolearn": true, - "using": [ [ "welding_standard", 1 ] ], - "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "components": [ [ [ "charcoal", 50 ] ], [ [ "plasma", 10 ] ], [ [ "spiral_stone", 1 ] ] ] - }, - { - "result": "vortexcannon", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_PARTS", - "skill_used": "fabrication", - "difficulty": 8, - "skills_required": [ "mechanics", 8 ], - "time": 90000, - "autolearn": true, - "using": [ [ "welding_standard", 10 ] ], - "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "metal_tank", 1 ] ], - [ [ "pipe", 10 ] ], - [ [ "steel_chunk", 24 ], [ "steel_lump", 6 ] ], - [ [ "spring", 2 ] ], - [ [ "plastic_chunk", 12 ] ], - [ [ "vortex_stone", 1 ] ] - ] - }, - { - "id": "avortexaccelerator", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "vortex accelerator turret", - "item": "vortexaccelerator", - "color": "pink", - "broken_color": "pink", - "size": 5, - "folded_volume": 10, - "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "avortexacceleratornc", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "automated vortex accelerator", - "item": "vortexaccelerator", - "color": "pink", - "broken_color": "pink", - "folded_volume": 10, - "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "avortexbolter", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "vortex bolter turret", - "item": "vortexbolter", - "color": "pink", - "broken_color": "pink", - "size": 10, - "folded_volume": 10, - "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "avortexbolternc", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "automated vortex bolter", - "item": "vortexbolter", - "color": "pink", - "broken_color": "pink", - "folded_volume": 10, - "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "avortexrifle", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "vortex rifle turret", - "item": "vortexrifle", - "color": "pink", - "broken_color": "pink", - "size": 40, - "folded_volume": 10, - "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "avortexriflenc", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "automated vortex rifle", - "item": "vortexrifle", - "color": "pink", - "broken_color": "pink", - "folded_volume": 10, - "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "charcoal", - "copy-from": "charcoal", - "type": "AMMO", - "category": "spare_parts", - "name": "charcoal", - "casing": "dcluster" - }, - { - "id": "dboard_horizontal", - "type": "vehicle_part", - "name": "diamond barrier", - "item": "diamondplate", - "location": "center", - "symbol": "h", - "broken_symbol": "#", - "color": "white", - "broken_color": "white", - "description": "A transparent, solid sheet of self-sustaining crystals.", - "durability": 5000, - "breaks_into": [ { "item": "spiral_matrix" }, { "item": "dshards", "count": [ 50, 100 ] }, { "item": "dcluster", "count": [ 2, 6 ] } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "OBSTACLE", "WINDOW", "FULL_BOARD" ] - }, - { - "id": "dboard_ne", - "type": "vehicle_part", - "copy-from": "dboard_horizontal", - "symbol": "u" - }, - { - "id": "dboard_nw", - "type": "vehicle_part", - "copy-from": "dboard_horizontal", - "symbol": "y" - }, - { - "id": "dboard_se", - "type": "vehicle_part", - "copy-from": "dboard_horizontal", - "symbol": "n" - }, - { - "id": "dboard_sw", - "type": "vehicle_part", - "copy-from": "dboard_horizontal", - "symbol": "b" - }, - { - "id": "dboard_vertical", - "type": "vehicle_part", - "copy-from": "dboard_horizontal", - "symbol": "j" - }, - { - "id": "dcluster", - "type": "TOOL", - "name": "diamond cluster", - "description": "A cluster of artificial crystals that have broken off of a diamond matrix. While the substance usually decays when separated from the catalyst; this cluster seems to be self-sustaining by some unknown mechanism. ", - "weight": "350 g", - "volume": "250 ml", - "price": 300000, - "to_hit": -5, - "material": "diamond", - "symbol": "*", - "color": "white", - "looks_like": "diamond", - "ammo": "NULL", - "revert_to": "dshards", - "use_action": { - "target": "dshards", - "msg": "The cluster comes apart in your hands.", - "target_charges": 25, - "moves": 0, - "type": "transform" - } - }, - { - "id": "dframe_cover", - "type": "vehicle_part", - "name": "diamond frame", - "item": "diamondframe", - "location": "structure", - "symbol": "^", - "broken_symbol": "#", - "color": "white", - "broken_color": "white", - "description": "A framework of super-strong crystal. Other vehicle components can be mounted on it, and it can be attached to other frames to increase the vehicle's size.", - "durability": 3000, - "breaks_into": [ { "item": "spiral_matrix" }, { "item": "dshards", "count": [ 75, 150 ] }, { "item": "dcluster", "count": [ 4, 8 ] } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "MOUNTABLE" ] - }, - { - "id": "dframe_cross", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "c", - "flags": [ "MOUNTABLE", "INITIAL_PART" ] - }, - { - "id": "dframe_horizontal", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "h" - }, - { - "id": "dframe_horizontal_2", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "=" - }, - { - "id": "dframe_ne", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "u" - }, - { - "id": "dframe_nw", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "y" - }, - { - "id": "dframe_se", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "n" - }, - { - "id": "dframe_sw", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "b" - }, - { - "id": "dframe_vertical", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "j" - }, - { - "id": "dframe_vertical_2", - "type": "vehicle_part", - "copy-from": "dframe_cover", - "symbol": "H" - }, - { - "id": "diamondframe", - "type": "GENERIC", - "category": "veh_parts", - "name": "diamond frame", - "//": "Sempai can't resist me now!", - "description": "A brilliantly sparkling diamond vehicle frame. Incredibly strong for its weight.", - "weight": "9498 g", - "volume": "10 L", - "price": 10000000, - "to_hit": -3, - "bashing": 15, - "material": [ "diamond" ], - "symbol": "]", - "color": "light_gray", - "techniques": [ "DEF_DISARM" ] - }, - { - "id": "diamondlance", - "type": "GUN", - "name": "diamond lance", - "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst; thus a pre-shaped lump of carbon is brought into contact with the matrix, immediately crystallized and launched just as quickly. The launcher requires a specialized chassis in order to be brought to bear on its unfortunate targets.", - "weight": "16050 g", - "volume": "5500 ml", - "price": 60000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "charcoal", - "skill": "launcher", - "range": 30, - "ranged_damage": 100, - "pierce": 100, - "sight_dispersion": 150, - "durability": 8, - "clip_size": 50, - "reload": 20, - "valid_mod_locations": [ ], - "ammo_effects": [ "SHOT" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "diamondlance", - "copy-from": "turret_manual_blaze", - "type": "vehicle_part", - "name": "diamond lance", - "item": "diamondlance", - "color": "white", - "broken_color": "white", - "difficulty": 6, - "size": 10, - "folded_volume": 22, - "breaks_into": [ { "item": "diamondlance", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "diamondnova", - "copy-from": "turret_manual_blaze", - "type": "vehicle_part", - "name": "diamond nova", - "item": "diamondnova", - "color": "white", - "broken_color": "white", - "difficulty": 6, - "size": 10, - "folded_volume": 22, - "breaks_into": [ { "item": "diamondnova", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "diamondnova", - "type": "GUN", - "name": "diamond nova", - "//": "Behold, the bringer of light.", - "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst, and at sizes as large as the projectile used, also rapidly decays when in contact with other matter. Thus the projectile is held and launched by the use of pressurized air from a vortex stone. Upon striking its target, the projectile undergoes explosive decomposition; shattering into a brilliant burst of diamond fragments.", - "weight": "25815 g", - "volume": "5500 ml", - "price": 60000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "charcoal", - "skill": "launcher", - "range": 30, - "ranged_damage": 150, - "pierce": 20, - "sight_dispersion": 150, - "durability": 8, - "clip_size": 50, - "reload": 20, - "valid_mod_locations": [ ], - "ammo_effects": [ "SHOT", "FRAG", "FLASHBANG" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "diamondplate", - "type": "GENERIC", - "category": "veh_parts", - "name": "diamond plating", - "description": "A piece of armor plating made of clear diamond. Incredibly strong for its weight.", - "weight": "6130 g", - "volume": "3 L", - "price": 12000000, - "to_hit": -3, - "bashing": 15, - "material": [ "diamond" ], - "symbol": "]", - "color": "light_gray", - "techniques": [ "DEF_DISARM" ] - }, - { - "id": "dshards", - "type": "AMMO", - "name": "diamond fragments", - "description": "These small fragments of diamond are formed as a byproduct from the crystallization process of a diamond matrix. While the substance usually decays when separated from the catalyst; these fragments are small enough to remain stable.", - "weight": "3 g", - "volume": "250 ml", - "price": 10000, - "bashing": 1, - "material": "diamond", - "symbol": "=", - "color": "white", - "looks_like": "diamond", - "count": 100, - "ammo_type": "BB", - "damage": 1, - "pierce": 1, - "dispersion": 12 - }, - { - "id": "plating_diamond", - "type": "vehicle_part", - "name": "diamond plating", - "item": "diamondplate", - "location": "armor", - "symbol": ")", - "broken_symbol": ")", - "color": "white", - "broken_color": "white", - "description": "Transparent crystal armor plate. Will partially protect other components on the same frame from damage.", - "durability": 5000, - "breaks_into": [ { "item": "spiral_matrix" }, { "item": "dshards", "count": [ 50, 100 ] }, { "item": "dcluster", "count": [ 2, 6 ] } ], - "requirements": { - "install": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "ARMOR", "WINDOW" ] - }, - { - "id": "space_anomaly", - "type": "GENERIC", - "category": "veh_parts", - "name": "stabilized portal", - "description": "As you gaze into the seemingly infinite depths of this portable hole in reality, a phrase from a time forever gone echoes in your mind. \"There are two things that are infinite: the universe and human kleptomania.\"", - "weight": "22813 g", - "volume": "50 L", - "price": 1500000, - "to_hit": -4, - "bashing": 2, - "material": [ "steel", "plastic" ], - "symbol": "]", - "color": "cyan" - }, - { - "id": "space_anomaly", - "type": "vehicle_part", - "name": "cargo dimension", - "//": "Keep away from Svarog detectors!", - "item": "space_anomaly", - "location": "center", - "symbol": "O", - "broken_symbol": "O", - "color": "magenta", - "broken_color": "magenta", - "durability": 400, - "size": 40000, - "cargo_weight_modifier": 0, - "breaks_into": [ ], - "requirements": { - "install": { "skills": [ [ "mechanics", 8 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 6 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 9 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "CARGO", "COVERED", "UNMOUNT_ON_DAMAGE" ] - }, - { - "id": "spiral_matrix", - "type": "TOOL", - "name": "diamond matrix", - "name_plural": "diamond matrices", - "description": "A sparkling diamond with a dazzling spiral pattern. Small pieces of glittering crystal form on the edges as you hold it.", - "weight": "250 g", - "volume": "250 ml", - "price": 5000000, - "to_hit": -5, - "material": "diamond", - "symbol": "*", - "color": "white", - "looks_like": "spiral_stone", - "revert_to": "spiral_matrix", - "use_action": { - "target": "spiral_matrix", - "msg": "Your senses dull as you gaze into the depths of this gemstone's center…", - "moves": 60000, - "type": "transform" - } - }, - { - "id": "vgen", - "type": "TOOL", - "category": "veh_parts", - "name": "vortex engine", - "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allows it to be attached to a vehicle to render it mobile.", - "weight": "62071 g", - "volume": "56250 ml", - "price": 1500000, - "bashing": 4, - "rigid": true, - "material": [ "steel" ], - "symbol": ",", - "color": "magenta" - }, - { - "id": "vgen", - "type": "vehicle_part", - "name": "vortex generator", - "item": "vgen2", - "location": "engine_block", - "fuel_type": "vpower", - "symbol": "8", - "broken_symbol": "x", - "color": "magenta", - "broken_color": "magenta", - "durability": 400, - "//": "Here power is a multiplier on power efficiency, though ignored because of the PERPTUAL flag", - "power": 100, - "epower": 37300, - "size": 100, - "damage_modifier": 10, - "breaks_into": [ - { "item": "spiral_stone" }, - { "item": "foot_crank", "count": [ 0, 2 ] }, - { "item": "chain", "count": [ 0, 4 ] }, - { "item": "hose", "count": [ 0, 4 ] }, - { "item": "scrap", "count": [ 4, 12 ] }, - { "item": "steel_chunk", "count": [ 2, 5 ] }, - { "item": "plastic_chunk", "count": [ 2, 8 ] } - ], - "requirements": { - "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "REACTOR", "PERPETUAL" ] - }, - { - "id": "vgen2", - "type": "vehicle_part", - "name": "vortex engine", - "item": "vgen", - "location": "engine_block", - "fuel_type": "vpower", - "symbol": "8", - "broken_symbol": "x", - "color": "magenta", - "broken_color": "magenta", - "durability": 400, - "power": 37300, - "epower": 1865, - "noise_factor": 25, - "m2c": 90, - "size": 100, - "damage_modifier": 10, - "breaks_into": [ - { "item": "spiral_stone" }, - { "item": "foot_crank", "count": [ 0, 2 ] }, - { "item": "chain", "count": [ 0, 2 ] }, - { "item": "hose", "count": [ 0, 4 ] }, - { "item": "scrap", "count": [ 4, 12 ] }, - { "item": "plastic_chunk", "count": [ 2, 8 ] } - ], - "requirements": { - "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, - "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "ENGINE", "E_STARTS_INSTANTLY", "E_HIGHER_SKILL", "E_ALTERNATOR" ] - }, - { - "id": "vgen2", - "type": "TOOL", - "category": "veh_parts", - "name": "vortex generator", - "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allow it to be hooked up to a battery to store the power generated.", - "weight": "48066 g", - "volume": "50 L", - "price": 1500000, - "bashing": 4, - "rigid": true, - "material": [ "steel" ], - "symbol": ",", - "color": "magenta" - }, - { - "id": "vortexaccelerator", - "type": "GUN", - "name": "vortex accelerator", - "description": "This weapon uses powerful bursts of air to launch sharp fragments at its target at high speed. You'll need some form of platform to mount it on.", - "weight": "10700 g", - "volume": "2500 ml", - "price": 60000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "BB", - "skill": "rifle", - "range": 10, - "ranged_damage": 15, - "pierce": 5, - "dispersion": 300, - "sight_dispersion": 150, - "durability": 10, - "clip_size": 250, - "reload": 10, - "valid_mod_locations": [ ], - "ammo_effects": [ "SHOT" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "vortexaccelerator", - "copy-from": "turret_manual_blaze", - "type": "vehicle_part", - "name": "vortex accelerator", - "item": "vortexaccelerator", - "color": "pink", - "broken_color": "pink", - "size": 1000, - "folded_volume": 10, - "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "vortexbolter", - "copy-from": "turret_manual_blaze", - "type": "vehicle_part", - "name": "vortex bolter", - "item": "vortexbolter", - "color": "pink", - "broken_color": "pink", - "size": 10, - "folded_volume": 10, - "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "vortexbolter", - "type": "GUN", - "name": "vortex bolter", - "description": "This weapon uses powerful bursts of air to launch bolts at its target at high speed. You'll need some form of platform to mount it on.", - "weight": "8310 g", - "volume": "2500 ml", - "price": 90000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "bolt", - "skill": "rifle", - "range": 15, - "ranged_damage": 6, - "pierce": 5, - "dispersion": 300, - "sight_dispersion": 150, - "durability": 8, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], - "clip_size": 30, - "reload": 40, - "valid_mod_locations": [ ], - "ammo_effects": [ "SHOT" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "vortexcannon", - "copy-from": "turret_manual_blaze", - "type": "vehicle_part", - "name": "vortex cannon", - "item": "vortexcannon", - "color": "pink", - "broken_color": "pink", - "size": 10, - "folded_volume": 20, - "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "vortexcannon", - "copy-from": "turret_blaze", - "type": "vehicle_part", - "name": "vortex cannon turret", - "item": "vortexcannon", - "color": "pink", - "broken_color": "pink", - "size": 10, - "folded_volume": 20, - "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "vortexcannon", - "type": "GUN", - "name": "vortex cannon", - "description": "Essentially a large pneumatic gun made to hurl sharpened metal rails. Instead of a mechanical system, you've managed to harness the vortex to power this gun. While powerful for its size, you'll need some form of platform to mount it on.", - "weight": "21831 g", - "volume": "5 L", - "price": 60000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "metal_rail", - "skill": "launcher", - "range": 50, - "ranged_damage": 120, - "sight_dispersion": 150, - "durability": 8, - "clip_size": 12, - "reload": 100, - "valid_mod_locations": [ ], - "ammo_effects": [ "SHOT" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "vortexrifle", - "copy-from": "turret_manual_blaze", - "type": "vehicle_part", - "name": "vortex rifle", - "item": "vortexrifle", - "color": "pink", - "broken_color": "pink", - "difficulty": 4, - "size": 40, - "folded_volume": 10, - "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } - }, - { - "id": "vortexrifle", - "type": "GUN", - "name": "vortex rifle", - "description": "This weapon uses powerful bursts of air to launch small projectiles at its target at high speed. You'll need some form of platform to mount it on.", - "weight": "11759 g", - "volume": "2500 ml", - "price": 90000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "pebble", - "skill": "rifle", - "range": 15, - "ranged_damage": 30, - "pierce": 10, - "dispersion": 300, - "sight_dispersion": 150, - "durability": 8, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], - "clip_size": 250, - "reload": 10, - "valid_mod_locations": [ ], - "ammo_effects": [ "SHOT" ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] - }, - { - "id": "vpower", - "name": "vortex energy", - "default": "vpower", - "type": "ammunition_type" - }, - { - "id": "vpower", - "type": "AMMO", - "category": "chems", - "name": "vortex core", - "name_plural": "vortex core", - "description": "Seeing this is a bug.", - "weight": 0, - "volume": 0, - "bashing": 1, - "phase": "solid", - "material": "diamond", - "flags": [ "PSEUDO", "PERPETUAL" ], - "fuel": { "energy": 1 }, - "symbol": "?", - "color": "magenta", - "count": 1, - "ammo_type": "vpower" - } -] diff --git a/data/mods/blazemod/blaze_blob_construct.json b/data/mods/blazemod/blob_construction.json similarity index 100% rename from data/mods/blazemod/blaze_blob_construct.json rename to data/mods/blazemod/blob_construction.json diff --git a/data/mods/blazemod/blaze_ammo.json b/data/mods/blazemod/items/ammo/blaze_ammo.json similarity index 100% rename from data/mods/blazemod/blaze_ammo.json rename to data/mods/blazemod/items/ammo/blaze_ammo.json diff --git a/data/mods/blazemod/items/ammo/diamond_ammo.json b/data/mods/blazemod/items/ammo/diamond_ammo.json new file mode 100644 index 0000000000000..5244829611f5c --- /dev/null +++ b/data/mods/blazemod/items/ammo/diamond_ammo.json @@ -0,0 +1,29 @@ +[ + { + "id": "charcoal", + "copy-from": "charcoal", + "type": "AMMO", + "category": "spare_parts", + "name": "charcoal", + "casing": "dcluster" + }, + { + "id": "dshards", + "type": "AMMO", + "name": "diamond fragments", + "description": "These small fragments of diamond are formed as a byproduct from the crystallization process of a diamond matrix. While the substance usually decays when separated from the catalyst; these fragments are small enough to remain stable.", + "weight": "3 g", + "volume": "250 ml", + "price": 10000, + "bashing": 1, + "material": "diamond", + "symbol": "=", + "color": "white", + "looks_like": "diamond", + "count": 100, + "ammo_type": "BB", + "damage": 1, + "pierce": 1, + "dispersion": 12 + } +] diff --git a/data/mods/blazemod/items/ammo/vortex_ammo.json b/data/mods/blazemod/items/ammo/vortex_ammo.json new file mode 100644 index 0000000000000..82d233959fb84 --- /dev/null +++ b/data/mods/blazemod/items/ammo/vortex_ammo.json @@ -0,0 +1,21 @@ +[ + { + "id": "vpower", + "type": "AMMO", + "category": "chems", + "name": "vortex core", + "name_plural": "vortex core", + "description": "Seeing this is a bug.", + "weight": 0, + "volume": 0, + "bashing": 1, + "phase": "solid", + "material": "diamond", + "flags": [ "PSEUDO", "PERPETUAL" ], + "fuel": { "energy": 1 }, + "symbol": "?", + "color": "magenta", + "count": 1, + "ammo_type": "vpower" + } +] diff --git a/data/mods/blazemod/items/fuel.json b/data/mods/blazemod/items/fuel.json new file mode 100644 index 0000000000000..f8e49bbe59806 --- /dev/null +++ b/data/mods/blazemod/items/fuel.json @@ -0,0 +1,44 @@ +[ + { + "id": "bfeedfuel", + "type": "AMMO", + "category": "fuel", + "name": "liquified blob feed", + "name_plural": "bfeedfuel", + "description": "Liquified blob feed, useful for fueling certain blob based vehicle parts", + "weight": "1 g", + "volume": "200ml", + "price": 40, + "price_postapoc": 800, + "phase": "liquid", + "container": "jerrycan", + "material": "hydrocarbons", + "fuel": { "energy": 35 }, + "symbol": "=", + "color": "red", + "count": 250, + "stack_size": 200, + "ammo_type": "bfeed", + "range": 4, + "damage": 5, + "pierce": 5 + }, + { + "id": "bfeed", + "type": "AMMO", + "category": "fuel", + "name": "blob feed", + "name_plural": "blob feed", + "description": "An amalgam of various types of organic material, contains everything the blob needs to be healthy. You think…", + "weight": "50 g", + "volume": "250 ml", + "to_hit": -3, + "bashing": 8, + "material": "flesh", + "fuel": { "energy": 1 }, + "symbol": "*", + "color": "red", + "count": 25, + "ammo_type": "bfeed" + } +] diff --git a/data/mods/blazemod/blaze_weapons.json b/data/mods/blazemod/items/guns/blaze_weapons.json similarity index 100% rename from data/mods/blazemod/blaze_weapons.json rename to data/mods/blazemod/items/guns/blaze_weapons.json diff --git a/data/mods/blazemod/items/guns/blob_turret.json b/data/mods/blazemod/items/guns/blob_turret.json new file mode 100644 index 0000000000000..643521f14152d --- /dev/null +++ b/data/mods/blazemod/items/guns/blob_turret.json @@ -0,0 +1,351 @@ +[ + { + "id": "biter", + "type": "GUN", + "name": "biting blob", + "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. It has evolved the ability to constantly generate calcified protrusions which are then controlled by sinuous tensile strands. These \"teeth\" can then be used to latch and wound anything unfortunate enough to be nearby. The outer membrane has also become significantly thicker in order to support its more strenuous movement; though it seems pliable enough to pull apart…", + "weight": "18331 g", + "volume": "5500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "blue", + "ammo": "bfeed", + "skill": "launcher", + "range": 1, + "ranged_damage": 15, + "pierce": 15, + "sight_dispersion": 150, + "durability": 10, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], + "clip_size": 50, + "ammo_effects": [ "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "clutter", + "type": "GUN", + "name": "gel shooter", + "description": "A living blob turned into an autonomous weapon. It trawls the ground for material, which it then strips of nutrition. The remainder is then expelled out at significant velocity towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it. It seems pliable enough to pull apart…", + "weight": "7252 g", + "volume": "3 L", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh", "bone" ], + "symbol": "&", + "color": "magenta", + "ammo": "bfeed", + "skill": "pistol", + "range": 12, + "ranged_damage": 7, + "dispersion": 450, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 10, + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "freezie", + "type": "GUN", + "name": "frost lancer", + "description": "A living blob turned into an autonomous weapon. A biological aberration that exists at sub-zero temperatures. After filtering nutrients from the water, it freezes the remainder into an incredibly sharp spear of ice; which it then launches at nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "21331 g", + "volume": "4500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "light_blue", + "ammo": "water", + "skill": "launcher", + "range": 30, + "ranged_damage": 50, + "pierce": 10, + "dispersion": 450, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 100, + "ammo_effects": [ "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "FIRE_20" ] + }, + { + "id": "fuzzle", + "type": "GUN", + "name": "snapping ooze", + "description": "A living blob turned into an autonomous weapon. A baffling mutation in an already baffling creature, this blob is encased in a thick coat of fur, which serves as a form of protection. In addition, it is capable of projecting rows of calcified sharp fragments in a manner mimicking the jaw of a more recognizable creature. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "22331 g", + "volume": "6500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "brown", + "ammo": "bfeed", + "skill": "launcher", + "range": 2, + "ranged_damage": 30, + "pierce": 20, + "sight_dispersion": 150, + "durability": 10, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], + "clip_size": 50, + "ammo_effects": [ "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "horror", + "type": "GUN", + "name": "blobsaw", + "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier. While its simpler cousins have a limit to the number of keratinous protrusions they can project and control; this blob can utilize hundreds of these sharp fangs to shred anything it detects as a threat into unrecognizable ribbons. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "24331 g", + "volume": "7500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "blue", + "ammo": "bfeed", + "skill": "launcher", + "range": 2, + "ranged_damage": 15, + "pierce": 15, + "sight_dispersion": 150, + "durability": 10, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 20 ] ], + "clip_size": 240, + "ammo_effects": [ "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "inkie", + "type": "GUN", + "name": "fuel puffer", + "//": "God Dangit Blobby.", + "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digestion process turns the result incredibly viscous which, when threats come near, is launched; ensnaring anything it hits. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "15531 g", + "volume": "4 L", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "brown", + "ammo": "gasoline", + "skill": "launcher", + "range": 12, + "ranged_damage": 5, + "dispersion": 450, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 250, + "ammo_effects": [ "JET", "BEANBAG", "BLINDS_EYES", "RECOVER_100", "WIDE", "CUSTOM_EXPLOSION" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] + }, + { + "id": "meltie", + "type": "GUN", + "name": "acid puffer", + "description": "A living blob turned into an autonomous weapon. A filter feeder, the digestion process produces highly acidic byproducts; which is then expelled at any nearby enemies. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "15553 g", + "volume": "4500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "light_red", + "ammo": "water", + "skill": "launcher", + "range": 12, + "ranged_damage": 5, + "dispersion": 900, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 250, + "ammo_effects": [ "JET", "ACID_BOMB", "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] + }, + { + "id": "razorqueen", + "type": "GUN", + "name": "gel spiker", + "description": "A living blob turned into an autonomous weapon. Capable of calcifying large numbers of fang-like fragments within itself. It hurls groups of these fragments along with a small portion of itself. When it reaches its destination, the detached remains shoot these fragments in all directions, expiring in the process. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "24121 g", + "volume": "6500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "cyan", + "ammo": "bfeed", + "skill": "rifle", + "range": 18, + "ranged_damage": 40, + "pierce": 30, + "dispersion": 900, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 250, + "ammo_effects": [ "FRAG", "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] + }, + { + "id": "spouterqueen", + "type": "GUN", + "name": "gel spouter", + "description": "A living blob turned into an autonomous weapon. It can suck in water from a vehicle tank, and forcibly expel it in a wide cone. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "21331 g", + "volume": "20 L", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "looks_like": "razorqueen", + "symbol": ")", + "color": "red", + "ammo": "water", + "skill": "launcher", + "range": 60, + "ranged_damage": 10, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 1000, + "ammo_effects": [ "WIDE", "ACT_ON_RANGED_HIT", "RECOVER_100", "NO_EMBED", "CUSTOM_EXPLOSION" ], + "qualities": [ [ "JACK", 12 ] ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_100" ] + }, + { + "id": "sharp", + "type": "GUN", + "name": "gel lancer", + "description": "A living blob turned into an autonomous weapon. Evolving incredible abilities of perception, it is capable of locating and discerning possible threats within a large radius. When a potential threat is located, it fires a small, calcified projectile with incredible speed and accuracy. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "15103 g", + "volume": "4 L", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "light_blue", + "ammo": "bfeed", + "skill": "pistol", + "range": 16, + "ranged_damage": 8, + "pierce": 5, + "sight_dispersion": 150, + "durability": 10, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], + "clip_size": 36, + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "gelrazor", + "type": "GUN", + "name": "gel razor", + "description": "A living blob turned into an autonomous weapon. An enhanced metabolism allows it to calcify large, toothy discs which are then launched towards any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "17121 g", + "volume": "5500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh", "bone" ], + "symbol": "&", + "color": "blue", + "ammo": "bfeed", + "skill": "rifle", + "range": 12, + "ranged_damage": 20, + "pierce": 10, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 20, + "ammo_effects": [ "BOUNCE", "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "sparkie", + "type": "GUN", + "name": "shock bulb", + "description": "A living blob turned into an autonomous weapon. Shockingly, it somehow is able to project electricity, which it then discharges at any nearby threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "14321 g", + "volume": "3750 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "cyan", + "skill": "launcher", + "range": 8, + "ranged_damage": 30, + "sight_dispersion": 150, + "durability": 10, + "ups_charges": 19, + "ammo_effects": [ "LIGHTNING", "BEANBAG", "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "stickie", + "type": "GUN", + "name": "gel puffer", + "description": "A living blob turned into an autonomous weapon. A filter feeder, it strips any water it processes of nutrients and expels the remainder towards any nearby threats. The process of filter-feeding also makes the remaining liquid viscous, though it also dissipates fairly quickly. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "11331 g", + "volume": "4500 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "yellow", + "ammo": "water", + "skill": "launcher", + "range": 12, + "ranged_damage": 5, + "dispersion": 900, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 500, + "ammo_effects": [ "JET", "BEANBAG", "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] + }, + { + "id": "torchie", + "type": "GUN", + "name": "fire puffer", + "//": "Need a light?", + "description": "A living blob turned into an autonomous weapon. A rather picky eater, it feeds on chemicals found within gasoline. The digested material is still highly flammable, and when launched, also activates an ignition gland located on the outer membrane. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "16331 g", + "volume": "4 L", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "light_red", + "ammo": "gasoline", + "skill": "launcher", + "range": 12, + "ranged_damage": 5, + "dispersion": 450, + "sight_dispersion": 150, + "durability": 10, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], + "clip_size": 180, + "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "STREAM" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ] + }, + { + "id": "voideater", + "type": "GUN", + "name": "spark blight", + "description": "A living blob turned into an autonomous weapon. It is capable of storing energy from sunlight inside itself in the form of electricity. Then, in a truly baffling show of force, projects a highly concentrated stream of electricity towards any possible threats. The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.", + "weight": "17331 g", + "volume": "5250 ml", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": "&", + "color": "cyan", + "skill": "launcher", + "range": 12, + "ranged_damage": 80, + "sight_dispersion": 150, + "durability": 10, + "ups_charges": 199, + "ammo_effects": [ "LIGHTNING", "EXPLOSIVE", "WIDE" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + } +] diff --git a/data/mods/blazemod/items/guns/diamond_turret.json b/data/mods/blazemod/items/guns/diamond_turret.json new file mode 100644 index 0000000000000..bc3a0f884441e --- /dev/null +++ b/data/mods/blazemod/items/guns/diamond_turret.json @@ -0,0 +1,55 @@ +[ + { + "id": "diamondlance", + "type": "GUN", + "name": "diamond lance", + "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst; thus a pre-shaped lump of carbon is brought into contact with the matrix, immediately crystallized and launched just as quickly. The launcher requires a specialized chassis in order to be brought to bear on its unfortunate targets.", + "weight": "16050 g", + "volume": "5500 ml", + "price": 60000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "light_gray", + "ammo": "charcoal", + "skill": "launcher", + "range": 30, + "ranged_damage": 100, + "pierce": 100, + "sight_dispersion": 150, + "durability": 8, + "clip_size": 50, + "reload": 20, + "valid_mod_locations": [ ], + "ammo_effects": [ "SHOT" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "diamondnova", + "type": "GUN", + "name": "diamond nova", + "//": "Behold, the bringer of light.", + "description": "A weapon that is as deadly as it is dazzling. The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness. The substance rapidly decays when separated from the catalyst, and at sizes as large as the projectile used, also rapidly decays when in contact with other matter. Thus the projectile is held and launched by the use of pressurized air from a vortex stone. Upon striking its target, the projectile undergoes explosive decomposition; shattering into a brilliant burst of diamond fragments.", + "weight": "25815 g", + "volume": "5500 ml", + "price": 60000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "light_gray", + "ammo": "charcoal", + "skill": "launcher", + "range": 30, + "ranged_damage": 150, + "pierce": 20, + "sight_dispersion": 150, + "durability": 8, + "clip_size": 50, + "reload": 20, + "valid_mod_locations": [ ], + "ammo_effects": [ "SHOT", "FRAG", "FLASHBANG" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + } +] diff --git a/data/mods/blazemod/items/guns/vortex_turret.json b/data/mods/blazemod/items/guns/vortex_turret.json new file mode 100644 index 0000000000000..b548ecd102f6d --- /dev/null +++ b/data/mods/blazemod/items/guns/vortex_turret.json @@ -0,0 +1,110 @@ +[ + { + "id": "vortexaccelerator", + "type": "GUN", + "name": "vortex accelerator", + "description": "This weapon uses powerful bursts of air to launch sharp fragments at its target at high speed. You'll need some form of platform to mount it on.", + "weight": "10700 g", + "volume": "2500 ml", + "price": 60000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "light_gray", + "ammo": "BB", + "skill": "rifle", + "range": 10, + "ranged_damage": 15, + "pierce": 5, + "dispersion": 300, + "sight_dispersion": 150, + "durability": 10, + "clip_size": 250, + "reload": 10, + "valid_mod_locations": [ ], + "ammo_effects": [ "SHOT" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "vortexbolter", + "type": "GUN", + "name": "vortex bolter", + "description": "This weapon uses powerful bursts of air to launch bolts at its target at high speed. You'll need some form of platform to mount it on.", + "weight": "8310 g", + "volume": "2500 ml", + "price": 90000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "light_gray", + "ammo": "bolt", + "skill": "rifle", + "range": 15, + "ranged_damage": 6, + "pierce": 5, + "dispersion": 300, + "sight_dispersion": 150, + "durability": 8, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], + "clip_size": 30, + "reload": 40, + "valid_mod_locations": [ ], + "ammo_effects": [ "SHOT" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "vortexcannon", + "type": "GUN", + "name": "vortex cannon", + "description": "Essentially a large pneumatic gun made to hurl sharpened metal rails. Instead of a mechanical system, you've managed to harness the vortex to power this gun. While powerful for its size, you'll need some form of platform to mount it on.", + "weight": "21831 g", + "volume": "5 L", + "price": 60000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "light_gray", + "ammo": "metal_rail", + "skill": "launcher", + "range": 50, + "ranged_damage": 120, + "sight_dispersion": 150, + "durability": 8, + "clip_size": 12, + "reload": 100, + "valid_mod_locations": [ ], + "ammo_effects": [ "SHOT" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + }, + { + "id": "vortexrifle", + "type": "GUN", + "name": "vortex rifle", + "description": "This weapon uses powerful bursts of air to launch small projectiles at its target at high speed. You'll need some form of platform to mount it on.", + "weight": "11759 g", + "volume": "2500 ml", + "price": 90000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "light_gray", + "ammo": "pebble", + "skill": "rifle", + "range": 15, + "ranged_damage": 30, + "pierce": 10, + "dispersion": 300, + "sight_dispersion": 150, + "durability": 8, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], + "clip_size": 250, + "reload": 10, + "valid_mod_locations": [ ], + "ammo_effects": [ "SHOT" ], + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + } +] diff --git a/data/mods/blazemod/items/tools/blob_container.json b/data/mods/blazemod/items/tools/blob_container.json new file mode 100644 index 0000000000000..e4f494b5f1a6f --- /dev/null +++ b/data/mods/blazemod/items/tools/blob_container.json @@ -0,0 +1,80 @@ +[ + { + "id": "gloople_tank", + "type": "CONTAINER", + "name": "gelatinous capsule", + "name_plural": "gelatinous capsules", + "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", + "weight": "6662 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_green", + "contains": "10 L", + "seals": true, + "watertight": true + }, + { + "id": "gloople_tank_large", + "type": "CONTAINER", + "name": "gelatinous tank", + "name_plural": "gelatinous tanks", + "copy-from": "gloople_tank", + "volume": "60 L", + "contains": 240 + }, + { + "id": "gray_tank", + "type": "CONTAINER", + "name": "gray cocoon", + "name_plural": "gray cocoons", + "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", + "weight": "19120 g", + "volume": "10 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_gray", + "contains": "30 L", + "seals": true, + "watertight": true + }, + { + "id": "gray_tank_large", + "type": "CONTAINER", + "name": "gray tank", + "name_plural": "gray tanks", + "copy-from": "gray_tank", + "volume": "100 L", + "contains": 400 + }, + { + "id": "oozle_tank", + "type": "CONTAINER", + "name": "oozing pod", + "name_plural": "oozing pods", + "description": "While the blob is very eager to be fed, it's not as enthusiastic about giving up liquids. A few alterations are necessary.", + "weight": "16262 g", + "volume": "7500 ml", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "green", + "contains": "20 L", + "seals": true, + "watertight": true + }, + { + "id": "oozle_tank_large", + "type": "CONTAINER", + "name": "oozing tank", + "name_plural": "oozing tanks", + "copy-from": "oozle_tank", + "volume": "80 L", + "contains": 320 + } +] diff --git a/data/mods/blazemod/items/tools/blob_tools.json b/data/mods/blazemod/items/tools/blob_tools.json new file mode 100644 index 0000000000000..98a1736130b0a --- /dev/null +++ b/data/mods/blazemod/items/tools/blob_tools.json @@ -0,0 +1,651 @@ +[ + { + "id": "bframegrow", + "type": "TOOL", + "category": "tools", + "name": "growing blob frame", + "description": "A growing vehicle frame made of bone. It's coated in a thick layer of ooze, though there's greater amounts on the bindings. It's not quite tough enough to use.", + "weight": "3662 g", + "volume": "10 L", + "price": 100, + "to_hit": -2, + "material": [ "bone", "flesh" ], + "symbol": ";", + "color": "green", + "use_action": { + "target": "gloople", + "msg": "You test the frame; It wiggles, and then collapses into an lump of goo.", + "type": "delayed_transform", + "transform_age": 36000, + "not_ready_msg": "You test the frame; it gives easily, it's still not sturdy enough" + } + }, + { + "id": "bitergrow", + "type": "TOOL", + "category": "tools", + "name": "growing keratinous mass", + "name_plural": "growing keratinous mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12140 g", + "volume": "4500 ml", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "blue", + "use_action": { + "target": "biter", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "cluttergrow", + "type": "TOOL", + "category": "tools", + "name": "growing beaded mass", + "name_plural": "growing beaded mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "5410 g", + "volume": "2500 ml", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "magenta", + "use_action": { + "target": "clutter", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 2400, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "freeziegrow", + "type": "TOOL", + "category": "tools", + "name": "growing icy mass", + "name_plural": "growing icy mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "15140 g", + "volume": "3 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_blue", + "use_action": { + "target": "freezie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "frostie", + "type": "TOOL", + "category": "tools", + "name": "gelacier", + "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It seems pliable enough to pull apart…", + "weight": "6112 g", + "volume": "5 L", + "price": 500, + "to_hit": -3, + "bashing": 9, + "material": [ "flesh" ], + "symbol": "]", + "color": "light_blue" + }, + { + "id": "frostiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing cold mass", + "name_plural": "growing cold mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "3562 g", + "volume": "2 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_blue", + "use_action": { + "target": "frostie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 9600, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "fuzzlegrow", + "type": "TOOL", + "category": "tools", + "name": "growing hairy mass", + "name_plural": "growing hairy mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "18140 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "brown", + "use_action": { + "target": "fuzzle", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "gloople", + "type": "TOOL", + "category": "tools", + "name": "gelatinous mass", + "name_plural": "gelatinous mass", + "description": "An experiment gone horribly right. While the original intent was to combine the structure of a bone frame with the impact absorption of the blob; the blob seems to have completely consumed the bone. Instead, what remains is an amorphous mass of goo with what seems to be numerous thin filaments floating within. With a bit of effort, you can grasp the fibers and stretch the mass into a multitude of shapes. The mass is able to retain the new shape even under force, though the mass yields at your touch. With enough strength, you think you can pull it apart.", + "weight": "6662 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_green", + "ammo": "bfeed", + "max_charges": 250, + "charges_per_use": 250, + "qualities": [ [ "JACK", 2 ] ], + "use_action": { + "target": "gloople_act", + "msg": "You fumble as the blob starts to multiply rapidly!", + "target_charges": 7, + "active": true, + "moves": 250, + "type": "transform" + } + }, + { + "id": "gloople_act", + "type": "TOOL", + "category": "tools", + "name": "multiplying gelatinous mass", + "name_plural": "multiplying gelatinous mass", + "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", + "weight": "8662 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_green", + "ammo": "bfeed", + "max_charges": 40, + "charges_per_use": 20, + "turns_per_charge": 1, + "revert_to": "gloople", + "use_action": { + "type": "place_monster", + "monster_id": "mon_gloople", + "friendly_msg": "A blob splits and bounces away!", + "hostile_msg": "A blob splits and bounces away!", + "difficulty": 1, + "moves": 250, + "place_randomly": true, + "skill1": "cooking" + }, + "flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE" ] + }, + { + "id": "glooplegrow", + "type": "TOOL", + "category": "tools", + "name": "growing gelatinous mass", + "name_plural": "growing gelatinous mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "3562 g", + "volume": "2 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "target": "gloople", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 2400, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "glowiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing glowing mass", + "name_plural": "growing glowing mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "3562 g", + "volume": "2 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "cyan", + "use_action": { + "target": "glowie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "gray", + "type": "TOOL", + "category": "tools", + "name": "gray mass", + "name_plural": "gray mass", + "description": "This internal structures of this creature have developed significantly. While retaining the resilience and malleability of its once simpler form, it has gained the considerable abilities of perception and stimulus response. When directly threatened, it is able to shift and alter its microfibers, hardening its membrane to an almost steel-hard shell. You can still pull it apart with enough force. It's also really gray.", + "weight": "19120 g", + "volume": "15 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_gray", + "ammo": "bfeed", + "max_charges": 250, + "charges_per_use": 250, + "qualities": [ [ "JACK", 8 ] ], + "use_action": { + "target": "gray_act", + "msg": "You fumble as the blob starts to multiply rapidly!", + "target_charges": 3, + "active": true, + "moves": 250, + "type": "transform" + } + }, + { + "id": "gray_act", + "type": "TOOL", + "category": "tools", + "name": "multiplying gray mass", + "name_plural": "multiplying gray mass", + "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", + "weight": "19662 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_green", + "ammo": "bfeed", + "max_charges": 10, + "charges_per_use": 20, + "turns_per_charge": 1, + "revert_to": "gray", + "use_action": { + "type": "place_monster", + "monster_id": "mon_gray", + "friendly_msg": "A blob splits and bounces away!", + "hostile_msg": "A blob splits and bounces away!", + "difficulty": 1, + "moves": 100, + "place_randomly": true, + "skill1": "cooking" + }, + "flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE" ] + }, + { + "id": "graygrow", + "type": "TOOL", + "category": "tools", + "name": "growing gray mass", + "name_plural": "growing gray mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "16335 g", + "volume": "15 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_gray", + "use_action": { + "target": "gray", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 9600, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "horrorgrow", + "type": "TOOL", + "category": "tools", + "name": "growing spike-studded mass", + "name_plural": "growing spike-studded mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "20140 g", + "volume": "5500 ml", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "blue", + "use_action": { + "target": "horror", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "inkiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing gasoline-laced mass", + "name_plural": "growing gasoline-laced mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12140 g", + "volume": "3 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "brown", + "use_action": { + "target": "inkie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 2400, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "meltiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing acidic mass", + "name_plural": "growing acidic mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12140 g", + "volume": "3 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_red", + "use_action": { + "target": "meltie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "oozle", + "type": "TOOL", + "category": "tools", + "name": "oozing mass", + "name_plural": "oozing mass", + "description": "An amorphous mass that has undergone a significant growth. In addition to the increased amount of goo and sinuous filaments, it seems to have started developing other internal structures. Like its smaller counterpart, it can be shaped into various structures; albeit with significantly greater tensile strength due to the increased number of supporting filaments. You believe you can split it apart with enough force.", + "weight": "16262 g", + "volume": "15 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "green", + "ammo": "bfeed", + "max_charges": 250, + "charges_per_use": 250, + "qualities": [ [ "JACK", 4 ] ], + "use_action": { + "target": "oozle_act", + "msg": "You fumble as the blob starts to multiply rapidly!", + "target_charges": 5, + "active": true, + "moves": 250, + "type": "transform" + } + }, + { + "id": "oozle_act", + "type": "TOOL", + "category": "tools", + "name": "multiplying oozing mass", + "name_plural": "multiplying oozing mass", + "description": "Having been fed, this blob is now rapidly multiplying into other copies of itself; extremely noisy copies! And even worse, it's stuck to your hands until whatever it's doing is done! Catch those blobs before they bring in every zombie for miles!", + "weight": "16662 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_green", + "ammo": "bfeed", + "max_charges": 10, + "turns_per_charge": 1, + "revert_to": "oozle", + "use_action": { + "type": "place_monster", + "monster_id": "mon_oozle", + "friendly_msg": "A blob splits and bounces away!", + "hostile_msg": "A blob splits and bounces away!", + "difficulty": 1, + "moves": 250, + "place_randomly": true, + "skill1": "cooking" + }, + "flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE" ] + }, + { + "id": "oozlegrow", + "type": "TOOL", + "category": "tools", + "name": "growing ooze", + "name_plural": "growing ooze", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12662 g", + "volume": "10 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "green", + "use_action": { + "target": "oozle", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "queengrow", + "type": "TOOL", + "category": "tools", + "name": "growing mass of tendrils", + "name_plural": "growing mass of tendrils", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "25325 g", + "volume": "15 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "red", + "use_action": { + "target": "queen", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 36000, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "razorqueengrow", + "type": "TOOL", + "category": "tools", + "name": "growing spiked mass", + "name_plural": "growing spiked mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "18140 g", + "volume": "5 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "cyan", + "use_action": { + "target": "razorqueen", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 9600, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "sharpgrow", + "type": "TOOL", + "category": "tools", + "name": "growing spiny mass", + "name_plural": "growing spiny mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "11140 g", + "volume": "3500 ml", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_blue", + "use_action": { + "target": "sharp", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "sicklegrow", + "type": "TOOL", + "category": "tools", + "name": "growing spiky mass", + "name_plural": "growing spiky mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12140 g", + "volume": "4 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "blue", + "use_action": { + "target": "gelrazor", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "sparkiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing bright mass", + "name_plural": "growing bright mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "11140 g", + "volume": "3 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "cyan", + "use_action": { + "target": "sparkie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "stickiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing viscous mass", + "name_plural": "growing viscous mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "8140 g", + "volume": "3 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "yellow", + "use_action": { + "target": "stickie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 2400, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "torchiegrow", + "type": "TOOL", + "category": "tools", + "name": "growing warm mass", + "name_plural": "growing warm mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12140 g", + "volume": "3 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "light_red", + "use_action": { + "target": "torchie", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 4800, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + }, + { + "id": "voideatergrow", + "type": "TOOL", + "category": "tools", + "name": "growing electrified mass", + "name_plural": "growing electrified mass", + "description": "Not quite fully grown, this blob requires nourishment to fully develop.", + "weight": "12140 g", + "volume": "4 L", + "price": 100, + "to_hit": -2, + "material": [ "flesh" ], + "symbol": ";", + "color": "cyan", + "use_action": { + "target": "voideater", + "msg": "The blob balloons to full size.", + "type": "delayed_transform", + "transform_age": 2400, + "not_ready_msg": "Whatever it's doing, it's not done yet." + } + } +] diff --git a/data/mods/blazemod/items/tools/diamond_tools.json b/data/mods/blazemod/items/tools/diamond_tools.json new file mode 100644 index 0000000000000..fbb2f39d013ee --- /dev/null +++ b/data/mods/blazemod/items/tools/diamond_tools.json @@ -0,0 +1,47 @@ +[ + { + "id": "dcluster", + "type": "TOOL", + "name": "diamond cluster", + "description": "A cluster of artificial crystals that have broken off of a diamond matrix. While the substance usually decays when separated from the catalyst; this cluster seems to be self-sustaining by some unknown mechanism. ", + "weight": "350 g", + "volume": "250 ml", + "price": 300000, + "to_hit": -5, + "material": "diamond", + "symbol": "*", + "color": "white", + "looks_like": "diamond", + "ammo": "NULL", + "revert_to": "dshards", + "use_action": { + "target": "dshards", + "msg": "The cluster comes apart in your hands.", + "target_charges": 25, + "moves": 0, + "type": "transform" + } + }, + { + "id": "spiral_matrix", + "type": "TOOL", + "name": "diamond matrix", + "name_plural": "diamond matrices", + "description": "A sparkling diamond with a dazzling spiral pattern. Small pieces of glittering crystal form on the edges as you hold it.", + "weight": "250 g", + "volume": "250 ml", + "price": 5000000, + "to_hit": -5, + "material": "diamond", + "symbol": "*", + "color": "white", + "looks_like": "spiral_stone", + "revert_to": "spiral_matrix", + "use_action": { + "target": "spiral_matrix", + "msg": "Your senses dull as you gaze into the depths of this gemstone's center…", + "moves": 60000, + "type": "transform" + } + } +] diff --git a/data/mods/blazemod/items/tools/vortex_tools.json b/data/mods/blazemod/items/tools/vortex_tools.json new file mode 100644 index 0000000000000..576c93f9217bc --- /dev/null +++ b/data/mods/blazemod/items/tools/vortex_tools.json @@ -0,0 +1,32 @@ +[ + { + "id": "vgen", + "type": "TOOL", + "category": "veh_parts", + "name": "vortex engine", + "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allows it to be attached to a vehicle to render it mobile.", + "weight": "62071 g", + "volume": "56250 ml", + "price": 1500000, + "bashing": 4, + "rigid": true, + "material": [ "steel" ], + "symbol": ",", + "color": "magenta" + }, + { + "id": "vgen2", + "type": "TOOL", + "category": "veh_parts", + "name": "vortex generator", + "description": "A tornado in a box, so to speak. Inside this innocuous tank contains either the culmination of human innovation in clean energy, or a weapon of mass destruction capable of wiping civilization - or what's left of it - off the map. An external mechanism allow it to be hooked up to a battery to store the power generated.", + "weight": "48066 g", + "volume": "50 L", + "price": 1500000, + "bashing": 4, + "rigid": true, + "material": [ "steel" ], + "symbol": ",", + "color": "magenta" + } +] diff --git a/data/mods/blazemod/items/vehicle/blaze_engine.json b/data/mods/blazemod/items/vehicle/blaze_engine.json new file mode 100644 index 0000000000000..63cd7bd2ace3b --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blaze_engine.json @@ -0,0 +1,83 @@ +[ + { + "id": "steam_triple_large", + "copy-from": "engine_steam", + "type": "ENGINE", + "name": "large steam engine", + "description": "A large steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", + "weight": "280 kg", + "volume": "95 L", + "epower": 0, + "power": 242450, + "energy_consumption": 484890, + "price": 1400000, + "price_postapoc": 2800000 + }, + { + "id": "steam_triple_giant", + "copy-from": "engine_steam", + "type": "ENGINE", + "name": "huge steam engine", + "description": "A huge steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condensor recaptures the water, making this a closed cycle system.", + "weight": "835 kg", + "volume": "175 L", + "epower": 0, + "power": 447600, + "energy_consumption": 895200, + "price": 2565000, + "price_postapoc": 5130000 + }, + { + "id": "steam_turbine_small", + "copy-from": "engine_steam", + "type": "ENGINE", + "name": "small steam turbine", + "description": "A small steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", + "weight": "80 kg", + "volume": "18750 ml", + "//": "Steam turbine efficiency sucks - ideally 47% efficient with reheat cycles, versus 55% for a modern gas engine. Going with 33% efficieny for easy math", + "power": 93250, + "energy_consumption": 279750, + "price": 255000, + "price_postapoc": 510000 + }, + { + "id": "steam_turbine_medium", + "copy-from": "engine_steam", + "type": "ENGINE", + "name": "medium steam turbine", + "description": "A medium sized steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", + "weight": "120 kg", + "volume": "27500 ml", + "power": 149200, + "energy_consumption": 347700, + "price": 380000, + "price_postapoc": 760000 + }, + { + "id": "steam_turbine_large", + "copy-from": "engine_steam", + "type": "ENGINE", + "name": "large steam turbine", + "description": "A large steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", + "weight": "190 kg", + "volume": "45 L", + "power": 242450, + "energy_consumption": 727350, + "price": 595000, + "price_postapoc": 1190000 + }, + { + "id": "steam_turbine_giant", + "copy-from": "engine_steam", + "type": "ENGINE", + "name": "huge steam turbine", + "description": "A huge steam turbine. An integrated boiler burns coal to heat water into steam, driving a spinning turbine. A condensor recaptures the water, making this a closed cycle system.", + "weight": "345 kg", + "volume": "81250 ml", + "power": 447600, + "energy_consumption": 1342800, + "price": 1060000, + "price_postapoc": 2120000 + } +] diff --git a/data/mods/blazemod/blaze_magazines.json b/data/mods/blazemod/items/vehicle/blaze_magazines.json similarity index 100% rename from data/mods/blazemod/blaze_magazines.json rename to data/mods/blazemod/items/vehicle/blaze_magazines.json diff --git a/data/mods/blazemod/items/vehicle/blaze_other.json b/data/mods/blazemod/items/vehicle/blaze_other.json new file mode 100644 index 0000000000000..8c646dfd3510c --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blaze_other.json @@ -0,0 +1,33 @@ +[ + { + "id": "space_anomaly", + "type": "GENERIC", + "category": "veh_parts", + "name": "stabilized portal", + "description": "As you gaze into the seemingly infinite depths of this portable hole in reality, a phrase from a time forever gone echoes in your mind. \"There are two things that are infinite: the universe and human kleptomania.\"", + "weight": "22813 g", + "volume": "50 L", + "price": 1500000, + "to_hit": -4, + "bashing": 2, + "material": [ "steel", "plastic" ], + "symbol": "]", + "color": "cyan" + }, + { + "id": "turretframe", + "type": "GENERIC", + "category": "veh_parts", + "name": { "str": "turret chassis", "str_pl": "turret chassis" }, + "description": "A frame capable of rotating a full 360 degrees, capable of mounting multiple weapon systems either welded directly onto it or secured via the straps. It comes with a easily modified container for ammunition storage, a rudimentary ammo feed system for easy access, and a section for a movement system. It is controlled by a targeting AI that can adapt to the usage of whatever weapon that has been loading, with proper programming.", + "weight": "38604 g", + "volume": "20 L", + "price": 8000, + "to_hit": -3, + "bashing": 15, + "material": [ "steel" ], + "symbol": "]", + "color": "light_gray", + "techniques": [ "DEF_DISARM" ] + } +] diff --git a/data/mods/blazemod/items/vehicle/blaze_solar.json b/data/mods/blazemod/items/vehicle/blaze_solar.json new file mode 100644 index 0000000000000..160be25cdbba4 --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blaze_solar.json @@ -0,0 +1,47 @@ +[ + { + "id": "solar_array", + "type": "GENERIC", + "category": "veh_parts", + "name": "solar array", + "description": "A dozen solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able track the sun. However, this comes at the cost of being prohibitively heavy.", + "weight": "265400 g", + "volume": "62500 ml", + "price": 120000, + "to_hit": -4, + "bashing": 1, + "material": [ "glass" ], + "symbol": "]", + "color": "yellow" + }, + { + "id": "solar_array2", + "type": "GENERIC", + "category": "veh_parts", + "name": "upgraded solar array", + "description": "A dozen upgraded solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", + "weight": "319328 g", + "volume": "62500 ml", + "price": 150000, + "to_hit": -4, + "bashing": 1, + "material": [ "glass" ], + "symbol": "]", + "color": "yellow" + }, + { + "id": "solar_array2r", + "type": "GENERIC", + "category": "veh_parts", + "name": "upgraded reinforced solar array", + "description": "A dozen upgraded reinforced solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.", + "weight": "382736 g", + "volume": "80500 ml", + "price": 150000, + "to_hit": -4, + "bashing": 1, + "material": [ "glass", "steel" ], + "symbol": "]", + "color": "light_blue" + } +] diff --git a/data/mods/blazemod/items/vehicle/blaze_treads.json b/data/mods/blazemod/items/vehicle/blaze_treads.json new file mode 100644 index 0000000000000..85a0c145794fd --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blaze_treads.json @@ -0,0 +1,53 @@ +[ + { + "id": "tread1", + "type": "WHEEL", + "category": "veh_parts", + "name": "Rubber Caterpillar Track", + "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", + "weight": "32368 g", + "volume": "50 L", + "price": 25500, + "to_hit": -3, + "bashing": 30, + "material": [ "plastic", "steel" ], + "symbol": "]", + "color": "white", + "diameter": 30, + "width": 15 + }, + { + "id": "tread2", + "type": "WHEEL", + "category": "veh_parts", + "name": "Steel Caterpillar Track", + "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on large construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is very heavy.", + "weight": "95968 g", + "volume": "75 L", + "price": 45500, + "to_hit": -3, + "bashing": 30, + "material": [ "steel" ], + "symbol": "]", + "color": "white", + "diameter": 50, + "width": 25 + }, + { + "id": "tread3", + "type": "WHEEL", + "category": "veh_parts", + "name": "Reinforced Caterpillar Track", + "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on APCs and armored vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is extremely heavy.", + "weight": "287824 g", + "volume": "87500 ml", + "price": 75500, + "to_hit": -3, + "bashing": 30, + "material": [ "hardsteel", "steel" ], + "symbol": "]", + "color": "white", + "diameter": 60, + "width": 30 + } +] diff --git a/data/mods/blazemod/items/vehicle/blob_treads.json b/data/mods/blazemod/items/vehicle/blob_treads.json new file mode 100644 index 0000000000000..569d3e8243cf0 --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blob_treads.json @@ -0,0 +1,53 @@ +[ + { + "id": "gloopletread", + "type": "WHEEL", + "category": "veh_parts", + "name": "Gelatinous track", + "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", + "weight": "32368 g", + "volume": "50 L", + "price": 25500, + "to_hit": -3, + "bashing": 30, + "material": [ "plastic", "steel" ], + "symbol": "]", + "color": "white", + "diameter": 30, + "width": 15 + }, + { + "id": "oozletread", + "type": "WHEEL", + "category": "veh_parts", + "name": "Oozing track", + "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", + "weight": "32368 g", + "volume": "50 L", + "price": 25500, + "to_hit": -3, + "bashing": 30, + "material": [ "plastic", "steel" ], + "symbol": "]", + "color": "white", + "diameter": 50, + "width": 25 + }, + { + "id": "graytread", + "type": "WHEEL", + "category": "veh_parts", + "name": "Gray track", + "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", + "weight": "32368 g", + "volume": "50 L", + "price": 25500, + "to_hit": -3, + "bashing": 30, + "material": [ "plastic", "steel" ], + "symbol": "]", + "color": "white", + "diameter": 60, + "width": 30 + } +] diff --git a/data/mods/blazemod/items/vehicle/blob_vehicleparts.json b/data/mods/blazemod/items/vehicle/blob_vehicleparts.json new file mode 100644 index 0000000000000..4c3eadbb864ca --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blob_vehicleparts.json @@ -0,0 +1,31 @@ +[ + { + "id": "frostie_hull", + "type": "WHEEL", + "category": "veh_parts", + "name": "gelacier wheel", + "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide boat frame.", + "weight": "6112 g", + "volume": "5 L", + "to_hit": -3, + "bashing": 9, + "material": [ "flesh" ], + "symbol": "]", + "color": "light_blue", + "diameter": 40, + "width": 4 + }, + { + "id": "queen", + "type": "GENERIC", + "name": "amorphous heart", + "description": "This amorphous mass seems to have finished developing; its advanced internal structures testifying to that. It is capable of locomotion through internal hydraulic pressure, capable of moving substantial loads, and, in an astounding display of intelligence, is capable of manipulating anything it's attached to, whether blob-based or otherwise, through extended pseudopods. You think you might be able to manipulate it, and through it, all its attached parts. Though to do so you'll have to position yourself to be in contact with it; and it appears unnervingly willing to accommodate you…", + "weight": "21331 g", + "volume": "20 L", + "to_hit": -5, + "bashing": 10, + "material": [ "flesh" ], + "symbol": ")", + "color": "red" + } +] diff --git a/data/mods/blazemod/items/vehicle/blob_wheel.json b/data/mods/blazemod/items/vehicle/blob_wheel.json new file mode 100644 index 0000000000000..9ac85932de8a1 --- /dev/null +++ b/data/mods/blazemod/items/vehicle/blob_wheel.json @@ -0,0 +1,83 @@ +[ + { + "id": "frostie_wheel", + "type": "WHEEL", + "category": "veh_parts", + "name": "gelacier wheel", + "description": "A biological mystery, this blob's internal structures exist in within a pool of low-density fluid that remains liquid despite being in a super-cooled state; yet possesses all the malleability of its former self. Fragments of frost continually flake off it. It has formed itself into a wide, crude wheel.", + "weight": "6112 g", + "volume": "5 L", + "to_hit": -3, + "bashing": 9, + "material": [ "flesh" ], + "symbol": "]", + "color": "light_blue", + "diameter": 40, + "width": 15 + }, + { + "id": "gloople_wheel", + "type": "WHEEL", + "category": "veh_parts", + "name": "gelatinous wheel", + "description": "Filling a gelatinous mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", + "weight": "30062 g", + "volume": "12500 ml", + "to_hit": -3, + "bashing": 9, + "material": [ "flesh" ], + "symbol": "]", + "color": "light_green", + "diameter": 15, + "width": 15 + }, + { + "id": "gray_wheel", + "type": "WHEEL", + "category": "veh_parts", + "name": "gray wheel", + "description": "Filling a gray mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", + "weight": "53262 g", + "volume": "30 L", + "to_hit": -3, + "bashing": 9, + "material": [ "flesh" ], + "symbol": "]", + "color": "light_gray", + "diameter": 40, + "width": 40 + }, + { + "id": "grinder", + "type": "WHEEL", + "category": "veh_parts", + "name": "earthen roller", + "description": "A large, spherical blob the size of a large truck tire. The outer layer has compacted itself into a solid shell; offering great resilience. Having grown to full size, it seems content to simply sit there.", + "weight": "204540 g", + "volume": "50 L", + "price": 500, + "to_hit": -3, + "bashing": 9, + "material": [ "stone", "flesh" ], + "symbol": "]", + "color": "light_gray", + "diameter": 60, + "width": 60 + }, + { + "id": "oozle_wheel", + "type": "WHEEL", + "category": "veh_parts", + "name": "oozing wheel", + "description": "Filling an oozing mass with water has resulted in something that appears to be a cross between a wheel, an otherworldly abomination, and one of those old squeezy toys.", + "weight": "50262 g", + "volume": "30 L", + "to_hit": -3, + "bashing": 9, + "material": [ "flesh" ], + "symbol": "]", + "color": "green", + "diameter": 30, + "width": 30 + } +] diff --git a/data/mods/blazemod/items/vehicle/diamond_vehicleparts.json b/data/mods/blazemod/items/vehicle/diamond_vehicleparts.json new file mode 100644 index 0000000000000..2281cb07cd842 --- /dev/null +++ b/data/mods/blazemod/items/vehicle/diamond_vehicleparts.json @@ -0,0 +1,35 @@ +[ + { + "id": "diamondframe", + "type": "GENERIC", + "category": "veh_parts", + "name": "diamond frame", + "//": "Sempai can't resist me now!", + "description": "A brilliantly sparkling diamond vehicle frame. Incredibly strong for its weight.", + "weight": "9498 g", + "volume": "10 L", + "price": 10000000, + "to_hit": -3, + "bashing": 15, + "material": [ "diamond" ], + "symbol": "]", + "color": "light_gray", + "techniques": [ "DEF_DISARM" ] + }, + { + "id": "diamondplate", + "type": "GENERIC", + "category": "veh_parts", + "name": "diamond plating", + "description": "A piece of armor plating made of clear diamond. Incredibly strong for its weight.", + "weight": "6130 g", + "volume": "3 L", + "price": 12000000, + "to_hit": -3, + "bashing": 15, + "material": [ "diamond" ], + "symbol": "]", + "color": "light_gray", + "techniques": [ "DEF_DISARM" ] + } +] diff --git a/data/mods/blazemod/blaze_blob_monster.json b/data/mods/blazemod/monsters/blob_monster.json similarity index 100% rename from data/mods/blazemod/blaze_blob_monster.json rename to data/mods/blazemod/monsters/blob_monster.json diff --git a/data/mods/blazemod/blaze_ammo_recipes.json b/data/mods/blazemod/recipes/blaze_ammo_recipes.json similarity index 100% rename from data/mods/blazemod/blaze_ammo_recipes.json rename to data/mods/blazemod/recipes/blaze_ammo_recipes.json diff --git a/data/mods/blazemod/blaze_magazine_recipes.json b/data/mods/blazemod/recipes/blaze_magazine_recipes.json similarity index 100% rename from data/mods/blazemod/blaze_magazine_recipes.json rename to data/mods/blazemod/recipes/blaze_magazine_recipes.json diff --git a/data/mods/blazemod/blaze_other_recipes.json b/data/mods/blazemod/recipes/blaze_other_recipes.json similarity index 89% rename from data/mods/blazemod/blaze_other_recipes.json rename to data/mods/blazemod/recipes/blaze_other_recipes.json index 82eec894fbea5..ddb013fc3a86e 100644 --- a/data/mods/blazemod/blaze_other_recipes.json +++ b/data/mods/blazemod/recipes/blaze_other_recipes.json @@ -128,5 +128,19 @@ [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ] ] + }, + { + "result": "space_anomaly", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "electronics", + "difficulty": 8, + "skills_required": [ [ "mechanics", 3 ], [ "electronics", 3 ] ], + "time": 144000, + "autolearn": true, + "using": [ [ "welding_standard", 6 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "cargo_rack", 1 ] ], [ [ "teleporter", 1 ] ], [ [ "portal", 1 ] ], [ [ "plut_cell", 5 ] ] ] } ] diff --git a/data/mods/blazemod/blaze_weapons_recipes.json b/data/mods/blazemod/recipes/blaze_weapons_recipes.json similarity index 100% rename from data/mods/blazemod/blaze_weapons_recipes.json rename to data/mods/blazemod/recipes/blaze_weapons_recipes.json diff --git a/data/mods/blazemod/blaze_blob_recipes.json b/data/mods/blazemod/recipes/blob_recipes.json similarity index 100% rename from data/mods/blazemod/blaze_blob_recipes.json rename to data/mods/blazemod/recipes/blob_recipes.json diff --git a/data/mods/blazemod/recipes/diamond_recipes.json b/data/mods/blazemod/recipes/diamond_recipes.json new file mode 100644 index 0000000000000..ff02f6e6b436a --- /dev/null +++ b/data/mods/blazemod/recipes/diamond_recipes.json @@ -0,0 +1,81 @@ +[ + { + "result": "diamondplate", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 10, + "skills_required": [ ], + "time": 30000, + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "spiral_matrix", 1 ] ], + [ [ "glass_sheet", 2 ] ], + [ [ "charcoal", 20 ], [ "dshards", 1000 ], [ "dcluster", 40 ] ] + ] + }, + { + "result": "diamondframe", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 10, + "skills_required": [ ], + "time": 30000, + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "spiral_matrix", 1 ] ], + [ [ "xlframe", 1 ], [ "foldframe", 1 ] ], + [ [ "charcoal", 20 ], [ "dshards", 1000 ], [ "dcluster", 40 ] ] + ] + }, + { + "result": "diamondnova", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 10, + "skills_required": [ "mechanics", 8 ], + "time": 120000, + "autolearn": true, + "using": [ [ "welding_standard", 10 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "metal_tank", 1 ] ], + [ [ "pipe", 12 ] ], + [ [ "steel_chunk", 27 ], [ "steel_lump", 9 ] ], + [ [ "spring", 2 ] ], + [ [ "plastic_chunk", 18 ] ], + [ [ "vortex_stone", 1 ] ], + [ [ "spiral_matrix", 1 ] ] + ] + }, + { + "result": "diamondlance", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 10, + "skills_required": [ "mechanics", 8 ], + "time": 90000, + "autolearn": true, + "using": [ [ "welding_standard", 10 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "metal_tank", 1 ] ], + [ [ "2x4", 12 ], [ "stick", 12 ] ], + [ [ "nail", 60 ], [ "adhesive", 5, "LIST" ] ], + [ [ "steel_chunk", 24 ], [ "steel_lump", 6 ] ], + [ [ "string_36", 12 ] ], + [ [ "foot_crank", 1 ] ], + [ [ "plastic_chunk", 6 ] ], + [ [ "spiral_matrix", 1 ] ] + ] + } +] diff --git a/data/mods/blazemod/recipes/vortex_recipes.json b/data/mods/blazemod/recipes/vortex_recipes.json new file mode 100644 index 0000000000000..e3a56230835c2 --- /dev/null +++ b/data/mods/blazemod/recipes/vortex_recipes.json @@ -0,0 +1,142 @@ +[ + { + "result": "vgen", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 6, + "skills_required": [ [ "mechanics", 6 ] ], + "time": 108000, + "reversible": false, + "autolearn": true, + "using": [ [ "forging_standard", 3 ], [ "steel_standard", 3 ], [ "welding_standard", 6 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ], + "components": [ + [ [ "vortex_stone", 1 ] ], + [ [ "chain", 6 ] ], + [ [ "foot_crank", 6 ] ], + [ [ "metal_tank", 1 ] ], + [ [ "plastic_chunk", 30 ] ] + ] + }, + { + "result": "vgen2", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ [ "mechanics", 5 ], [ "electronics", 3 ] ], + "time": 108000, + "autolearn": true, + "using": [ [ "forging_standard", 3 ], [ "steel_standard", 3 ], [ "welding_standard", 6 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "CHISEL", "level": 3 } ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ], + "components": [ + [ [ "vortex_stone", 1 ] ], + [ [ "chain", 6 ] ], + [ [ "foot_crank", 3 ] ], + [ [ "metal_tank", 1 ] ], + [ [ "plastic_chunk", 30 ] ], + [ [ "alternator_truck", 6 ], [ "alternator_car", 6 ], [ "alternator_motorbike", 6 ] ] + ] + }, + { + "result": "vortexbolter", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "mechanics", 7 ], + "time": 30000, + "autolearn": true, + "using": [ [ "soldering_standard", 30 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "metal_tank_little", 1 ] ], + [ [ "pipe", 2 ] ], + [ [ "helsing", 1 ] ], + [ [ "steel_chunk", 9 ], [ "steel_lump", 3 ] ], + [ [ "plastic_chunk", 6 ] ], + [ [ "vortex_stone", 1 ] ] + ] + }, + { + "result": "vortexrifle", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "mechanics", 7 ], + "time": 30000, + "autolearn": true, + "using": [ [ "soldering_standard", 30 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "metal_tank_little", 1 ] ], + [ [ "pipe", 2 ] ], + [ [ "tihar", 1 ] ], + [ [ "steel_chunk", 9 ], [ "steel_lump", 3 ] ], + [ [ "plastic_chunk", 6 ] ], + [ [ "vortex_stone", 1 ] ] + ] + }, + { + "result": "vortexaccelerator", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "mechanics", 7 ], + "time": 60000, + "autolearn": true, + "using": [ [ "soldering_standard", 50 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "metal_tank_little", 1 ] ], + [ [ "pipe", 4 ] ], + [ [ "steel_chunk", 18 ], [ "steel_lump", 6 ] ], + [ [ "plastic_chunk", 6 ] ], + [ [ "vortex_stone", 1 ] ] + ] + }, + { + "result": "spiral_matrix", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 10, + "time": 30000, + "autolearn": true, + "using": [ [ "welding_standard", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], + "components": [ [ [ "charcoal", 50 ] ], [ [ "plasma", 10 ] ], [ [ "spiral_stone", 1 ] ] ] + }, + { + "result": "vortexcannon", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_PARTS", + "skill_used": "fabrication", + "difficulty": 8, + "skills_required": [ "mechanics", 8 ], + "time": 90000, + "autolearn": true, + "using": [ [ "welding_standard", 10 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "metal_tank", 1 ] ], + [ [ "pipe", 10 ] ], + [ [ "steel_chunk", 24 ], [ "steel_lump", 6 ] ], + [ [ "spring", 2 ] ], + [ [ "plastic_chunk", 12 ] ], + [ [ "vortex_stone", 1 ] ] + ] + } +] diff --git a/data/mods/blazemod/requirements/blob.json b/data/mods/blazemod/requirements/blob.json new file mode 100644 index 0000000000000..386efbfc67354 --- /dev/null +++ b/data/mods/blazemod/requirements/blob.json @@ -0,0 +1,8 @@ +[ + { + "id": "blobrep", + "type": "requirement", + "//": "Material for fixing parts made from blobs.", + "components": [ [ [ "bfeed", 1 ] ] ] + } +] diff --git a/data/mods/blazemod/blaze_autoweapons_parts.json b/data/mods/blazemod/vehicleparts/blaze_autoweapons_parts.json similarity index 100% rename from data/mods/blazemod/blaze_autoweapons_parts.json rename to data/mods/blazemod/vehicleparts/blaze_autoweapons_parts.json diff --git a/data/mods/blazemod/blaze_other_parts.json b/data/mods/blazemod/vehicleparts/blaze_other_parts.json similarity index 75% rename from data/mods/blazemod/blaze_other_parts.json rename to data/mods/blazemod/vehicleparts/blaze_other_parts.json index 3507132c350dc..1770aa7c9db3a 100644 --- a/data/mods/blazemod/blaze_other_parts.json +++ b/data/mods/blazemod/vehicleparts/blaze_other_parts.json @@ -235,95 +235,6 @@ }, "flags": [ "SOLAR_PANEL", "OBSTACLE" ] }, - { - "id": "tread1", - "type": "vehicle_part", - "name": "rubber treads", - "item": "tread1", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "dark_gray", - "broken_color": "light_gray", - "durability": 2000, - "damage_modifier": 50, - "description": "A section of continuous track, the kind mounted on construction vehicles and military fighting vehicles. It acts as a wheel, and the broad surface provides plenty of traction to move heavy vehicles off-road, but at the cost of speed due to the heavy weight.", - "breaks_into": [ - { "item": "steel_lump", "count": [ 2, 4 ] }, - { "item": "steel_chunk", "count": [ 6, 12 ] }, - { "item": "scrap", "count": [ 8, 18 ] }, - { "item": "plastic_chunk", "count": [ 50, 120 ] }, - { "item": "chain", "count": [ 1, 3 ] } - ], - "rolling_resistance": 6, - "wheel_type": "treads", - "contact_area": 900, - "requirements": { - "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] }, - "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED" ] - }, - { - "id": "tread2", - "type": "vehicle_part", - "name": "steel treads", - "item": "tread2", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "dark_gray", - "broken_color": "light_gray", - "durability": 3500, - "damage_modifier": 50, - "description": "A section of continuous track, the kind mounted on construction vehicles and military fighting vehicles. It acts as a wheel, and the broad surface provides plenty of traction to move heavy vehicles off-road, but at the cost of speed due to the heavy weight.", - "breaks_into": [ - { "item": "steel_lump", "count": [ 8, 16 ] }, - { "item": "steel_chunk", "count": [ 20, 40 ] }, - { "item": "scrap", "count": [ 50, 75 ] }, - { "item": "chain", "count": [ 3, 6 ] } - ], - "rolling_resistance": 5, - "wheel_type": "treads", - "contact_area": 2500, - "requirements": { - "install": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] }, - "removal": { "skills": [ [ "mechanics", 5 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 8 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED" ] - }, - { - "id": "tread3", - "type": "vehicle_part", - "name": "tank treads", - "item": "tread3", - "location": "under", - "symbol": "|", - "broken_symbol": "x", - "color": "dark_gray", - "broken_color": "light_gray", - "difficulty": 7, - "durability": 5000, - "damage_modifier": 50, - "description": "A section of continuous track, the kind mounted on construction vehicles and military fighting vehicles. It acts as a wheel, and the broad surface provides plenty of traction to move heavy vehicles off-road, but at the cost of speed due to the heavy weight.", - "breaks_into": [ - { "item": "steel_lump", "count": [ 12, 30 ] }, - { "item": "steel_chunk", "count": [ 25, 60 ] }, - { "item": "scrap", "count": [ 60, 120 ] }, - { "item": "chain", "count": [ 3, 4 ] } - ], - "rolling_resistance": 5, - "wheel_type": "treads", - "contact_area": 3600, - "requirements": { - "install": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] }, - "removal": { "skills": [ [ "mechanics", 5 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] }, - "repair": { "skills": [ [ "mechanics", 8 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } - }, - "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED" ] - }, { "id": "turretframe", "type": "vehicle_part", @@ -369,5 +280,27 @@ "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 s" } }, "flags": [ "FOLDABLE", "AISLE" ] + }, + { + "id": "space_anomaly", + "type": "vehicle_part", + "name": "cargo dimension", + "//": "Keep away from Svarog detectors!", + "item": "space_anomaly", + "location": "center", + "symbol": "O", + "broken_symbol": "O", + "color": "magenta", + "broken_color": "magenta", + "durability": 400, + "size": 40000, + "cargo_weight_modifier": 0, + "breaks_into": [ ], + "requirements": { + "install": { "skills": [ [ "mechanics", 8 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 6 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 9 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "CARGO", "COVERED", "UNMOUNT_ON_DAMAGE" ] } ] diff --git a/data/mods/blazemod/vehicleparts/blaze_treads.json b/data/mods/blazemod/vehicleparts/blaze_treads.json new file mode 100644 index 0000000000000..d7eeaeb8190e7 --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blaze_treads.json @@ -0,0 +1,91 @@ +[ + { + "id": "tread1", + "type": "vehicle_part", + "name": "rubber treads", + "item": "tread1", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "dark_gray", + "broken_color": "light_gray", + "durability": 2000, + "damage_modifier": 50, + "description": "A section of continuous track, the kind mounted on construction vehicles and military fighting vehicles. It acts as a wheel, and the broad surface provides plenty of traction to move heavy vehicles off-road, but at the cost of speed due to the heavy weight.", + "breaks_into": [ + { "item": "steel_lump", "count": [ 2, 4 ] }, + { "item": "steel_chunk", "count": [ 6, 12 ] }, + { "item": "scrap", "count": [ 8, 18 ] }, + { "item": "plastic_chunk", "count": [ 50, 120 ] }, + { "item": "chain", "count": [ 1, 3 ] } + ], + "rolling_resistance": 6, + "wheel_type": "treads", + "contact_area": 900, + "requirements": { + "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED" ] + }, + { + "id": "tread2", + "type": "vehicle_part", + "name": "steel treads", + "item": "tread2", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "dark_gray", + "broken_color": "light_gray", + "durability": 3500, + "damage_modifier": 50, + "description": "A section of continuous track, the kind mounted on construction vehicles and military fighting vehicles. It acts as a wheel, and the broad surface provides plenty of traction to move heavy vehicles off-road, but at the cost of speed due to the heavy weight.", + "breaks_into": [ + { "item": "steel_lump", "count": [ 8, 16 ] }, + { "item": "steel_chunk", "count": [ 20, 40 ] }, + { "item": "scrap", "count": [ 50, 75 ] }, + { "item": "chain", "count": [ 3, 6 ] } + ], + "rolling_resistance": 5, + "wheel_type": "treads", + "contact_area": 2500, + "requirements": { + "install": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 5 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 8 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED" ] + }, + { + "id": "tread3", + "type": "vehicle_part", + "name": "tank treads", + "item": "tread3", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "dark_gray", + "broken_color": "light_gray", + "difficulty": 7, + "durability": 5000, + "damage_modifier": 50, + "description": "A section of continuous track, the kind mounted on construction vehicles and military fighting vehicles. It acts as a wheel, and the broad surface provides plenty of traction to move heavy vehicles off-road, but at the cost of speed due to the heavy weight.", + "breaks_into": [ + { "item": "steel_lump", "count": [ 12, 30 ] }, + { "item": "steel_chunk", "count": [ 25, 60 ] }, + { "item": "scrap", "count": [ 60, 120 ] }, + { "item": "chain", "count": [ 3, 4 ] } + ], + "rolling_resistance": 5, + "wheel_type": "treads", + "contact_area": 3600, + "requirements": { + "install": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "removal": { "skills": [ [ "mechanics", 5 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 8 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED" ] + } +] diff --git a/data/mods/blazemod/blaze_weapons_parts.json b/data/mods/blazemod/vehicleparts/blaze_weapons_parts.json similarity index 100% rename from data/mods/blazemod/blaze_weapons_parts.json rename to data/mods/blazemod/vehicleparts/blaze_weapons_parts.json diff --git a/data/mods/blazemod/vehicleparts/blob_boards.json b/data/mods/blazemod/vehicleparts/blob_boards.json new file mode 100644 index 0000000000000..6d768b4a2c025 --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_boards.json @@ -0,0 +1,325 @@ +[ + { + "id": "gloopleboard_horizontal", + "type": "vehicle_part", + "name": "gel panel", + "item": "gloople", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ] + }, + { + "id": "gloopleboard_ne", + "type": "vehicle_part", + "copy-from": "gloopleboard_horizontal", + "symbol": "u" + }, + { + "id": "gloopleboard_nw", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "y" + }, + { + "id": "gloopleboard_se", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "n" + }, + { + "id": "gloopleboard_sw", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "b" + }, + { + "id": "gloopleboard_vertical", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "j" + }, + { + "id": "grayboard_horizontal", + "type": "vehicle_part", + "name": "gray wall", + "item": "gray", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, formed into a vehicle wall. Keeps zombies outside the vehicle and prevents people from seeing through it.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ] + }, + { + "id": "grayboard_ne", + "type": "vehicle_part", + "copy-from": "grayboard_horizontal", + "symbol": "u" + }, + { + "id": "grayboard_nw", + "type": "vehicle_part", + "copy-from": "grayboard_horizontal", + "symbol": "y" + }, + { + "id": "grayboard_se", + "type": "vehicle_part", + "copy-from": "grayboard_horizontal", + "symbol": "n" + }, + { + "id": "grayboard_sw", + "type": "vehicle_part", + "copy-from": "grayboard_horizontal", + "symbol": "b" + }, + { + "id": "grayboard_vertical", + "type": "vehicle_part", + "copy-from": "grayboard_horizontal", + "symbol": "j" + }, + { + "id": "halfgloopleboard_horizontal", + "type": "vehicle_part", + "name": "gel quarterpanel", + "item": "gloople", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ] + }, + { + "id": "halfgloopleboard_horizontal_2", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "=" + }, + { + "id": "halfgloopleboard_ne", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "u" + }, + { + "id": "halfgloopleboard_nw", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "y" + }, + { + "id": "halfgloopleboard_se", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "n" + }, + { + "id": "halfgloopleboard_sw", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "b" + }, + { + "id": "halfgloopleboard_vertical", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "j" + }, + { + "id": "halfgloopleboard_vertical_2", + "type": "vehicle_part", + "copy-from": "halfgloopleboard_horizontal", + "symbol": "H" + }, + { + "id": "halfgrayboard_horizontal", + "type": "vehicle_part", + "name": "gray barricade", + "item": "gray", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ] + }, + { + "id": "halfgrayboard_horizontal_2", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "=" + }, + { + "id": "halfgrayboard_ne", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "u" + }, + { + "id": "halfgrayboard_nw", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "y" + }, + { + "id": "halfgrayboard_se", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "n" + }, + { + "id": "halfgrayboard_sw", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "b" + }, + { + "id": "halfgrayboard_vertical", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "j" + }, + { + "id": "halfgrayboard_vertical_2", + "type": "vehicle_part", + "copy-from": "halfgrayboard_horizontal", + "symbol": "H" + }, + { + "id": "halfoozleboard_horizontal", + "type": "vehicle_part", + "name": "ooze screen", + "item": "oozle", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, formed into a half-height vehicle wall. Keeps zombies outside the vehicle but allows people to see over it.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "FOLDABLE", "HALF_BOARD" ] + }, + { + "id": "halfoozleboard_horizontal_2", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "=" + }, + { + "id": "halfoozleboard_ne", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "u" + }, + { + "id": "halfoozleboard_nw", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "y" + }, + { + "id": "halfoozleboard_se", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "n" + }, + { + "id": "halfoozleboard_sw", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "b" + }, + { + "id": "halfoozleboard_vertical", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "j" + }, + { + "id": "halfoozleboard_vertical_2", + "type": "vehicle_part", + "copy-from": "halfoozleboard_horizontal", + "symbol": "H" + }, + { + "id": "oozleboard_horizontal", + "type": "vehicle_part", + "name": "ooze barrier", + "item": "oozle", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, formed into a vehicle wall. Keeps zombies outside the vehicle and prevents people from seeing through it.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD" ] + }, + { + "id": "oozleboard_ne", + "type": "vehicle_part", + "copy-from": "oozleboard_horizontal", + "symbol": "u" + }, + { + "id": "oozleboard_nw", + "type": "vehicle_part", + "copy-from": "oozleboard_horizontal", + "symbol": "y" + }, + { + "id": "oozleboard_se", + "type": "vehicle_part", + "copy-from": "oozleboard_horizontal", + "symbol": "n" + }, + { + "id": "oozleboard_sw", + "type": "vehicle_part", + "copy-from": "oozleboard_horizontal", + "symbol": "b" + }, + { + "id": "oozleboard_vertical", + "type": "vehicle_part", + "copy-from": "oozleboard_horizontal", + "symbol": "j" + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_frames.json b/data/mods/blazemod/vehicleparts/blob_frames.json new file mode 100644 index 0000000000000..5c3f65d4d6075 --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_frames.json @@ -0,0 +1,203 @@ +[ + { + "id": "gloople_cross", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "c", + "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ] + }, + { + "id": "gloople_horizontal", + "type": "vehicle_part", + "name": "gel framework", + "item": "gloople", + "location": "structure", + "symbol": "h", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "FOLDABLE", "MOUNTABLE" ] + }, + { + "id": "gloople_horizontal_2", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "=" + }, + { + "id": "gloople_ne", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "u" + }, + { + "id": "gloople_nw", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "y" + }, + { + "id": "gloople_se", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "n" + }, + { + "id": "gloople_sw", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "b" + }, + { + "id": "gloople_vertical", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "j" + }, + { + "id": "gloople_vertical_2", + "type": "vehicle_part", + "copy-from": "gloople_horizontal", + "symbol": "H" + }, + { + "id": "gray_cross", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "c", + "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ] + }, + { + "id": "gray_horizontal", + "type": "vehicle_part", + "name": "gray frame", + "item": "gray", + "location": "structure", + "symbol": "h", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "FOLDABLE", "MOUNTABLE" ] + }, + { + "id": "gray_horizontal_2", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "broken_symbol": "#" + }, + { + "id": "gray_ne", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "u" + }, + { + "id": "gray_nw", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "y" + }, + { + "id": "gray_se", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "n" + }, + { + "id": "gray_sw", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "b" + }, + { + "id": "gray_vertical", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "j" + }, + { + "id": "gray_vertical_2", + "type": "vehicle_part", + "copy-from": "gray_horizontal", + "symbol": "H" + }, + { + "id": "oozle_cross", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "c", + "flags": [ "FOLDABLE", "MOUNTABLE", "INITIAL_PART" ] + }, + { + "id": "oozle_horizontal", + "type": "vehicle_part", + "name": "ooze chassis", + "item": "oozle", + "location": "structure", + "symbol": "h", + "broken_symbol": "#", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "description": "A living blob, shaped to provide attachment points for other blobs. Other vehicle components and blobs can be mounted on it. If all the frames and components of a vehicle are foldable or made from blobs, the vehicle can be folding into a small package and picked up as a normal item.", + "flags": [ "FOLDABLE", "MOUNTABLE" ] + }, + { + "id": "oozle_horizontal_2", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "=" + }, + { + "id": "oozle_ne", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "u" + }, + { + "id": "oozle_nw", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "y" + }, + { + "id": "oozle_se", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "n" + }, + { + "id": "oozle_sw", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "b" + }, + { + "id": "oozle_vertical", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "j" + }, + { + "id": "oozle_vertical_2", + "type": "vehicle_part", + "copy-from": "oozle_horizontal", + "symbol": "H" + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_lights.json b/data/mods/blazemod/vehicleparts/blob_lights.json new file mode 100644 index 0000000000000..561faaf8dfdd8 --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_lights.json @@ -0,0 +1,28 @@ +[ + { + "id": "gel_lamp", + "type": "vehicle_part", + "name": "gel lamp", + "item": "glowie", + "fuel_type": "battery", + "symbol": "#", + "broken_symbol": "x", + "color": "cyan", + "broken_color": "cyan", + "durability": 200, + "epower": 0, + "bonus": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glowiegrow" } ], + "description": "A living, glowing blob. It produces a bright light that illuminates a narrow cone outside the vehicle when turned on. During installation, you can choose what direction to point the light, so multiple gel lamps can illuminate the sides or rear, as well as the front.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "CONE_LIGHT", "FOLDABLE" ] + }, + { + "id": "gel_lamp_d", + "type": "vehicle_part", + "copy-from": "gel_lamp", + "name": "directed gel lamp" + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_rams.json b/data/mods/blazemod/vehicleparts/blob_rams.json new file mode 100644 index 0000000000000..eb822d1a3b98c --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_rams.json @@ -0,0 +1,20 @@ +[ + { + "id": "frostie_ram", + "type": "vehicle_part", + "name": "ice ram", + "item": "frostie", + "location": "structure", + "symbol": "X", + "broken_symbol": "0", + "color": "light_blue", + "broken_color": "light_blue", + "durability": 1000, + "damage_modifier": 200, + "folded_volume": 1, + "breaks_into": [ { "item": "frostiegrow" } ], + "description": "A living blob, existing in a super-cooled state. It will absorb damage in a vehicle collision and deliver additional damage to the other object in the collision. It should be mounted on the edge of the vehicle, preferably the front.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "PROTRUSION", "SHARP", "FOLDABLE" ] + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_treads.json b/data/mods/blazemod/vehicleparts/blob_treads.json new file mode 100644 index 0000000000000..5e202bb3f7955 --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_treads.json @@ -0,0 +1,39 @@ +[ + { + "id": "gloopletread", + "type": "vehicle_part", + "name": "Gelatinous track", + "item": "gloopletread", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A set of continuous, interlocking tracks made out of blob. They can be used in place of wheels, and provide good traction and off-road performance.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "wheel_type": "treads", + "contact_area": 2500, + "rolling_resistance": 6, + "flags": [ "WHEEL", "VARIABLE_SIZE", "MULTISQUARE", "TRACKED", "FOLDABLE" ] + }, + { + "id": "oozletread", + "type": "vehicle_part", + "copy-from": "gloopletread", + "name": "Oozing track", + "item": "oozletread", + "breaks_into": [ { "item": "oozlegrow" } ] + }, + { + "id": "graytread", + "type": "vehicle_part", + "copy-from": "gloopletread", + "name": "Gray track", + "item": "graytread", + "breaks_into": [ { "item": "graygrow" } ] + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_turret.json b/data/mods/blazemod/vehicleparts/blob_turret.json new file mode 100644 index 0000000000000..c521ae0827d4f --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_turret.json @@ -0,0 +1,288 @@ +[ + { + "id": "blob_turret_mount", + "type": "vehicle_part", + "name": "inert core", + "item": "queen", + "looks_like": "turret_mount", + "symbol": "X", + "color": "red", + "broken_symbol": "X", + "broken_color": "red", + "damage_modifier": 8, + "durability": 400, + "folded_volume": 1, + "description": "A sleeping amorphous core, acting as a rotating, universal mount for a weapon. If your hands are empty, you can stand next to a tentacle and 'f'ire the weapon by selecting the tile.", + "breaks_into": [ { "item": "queengrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET_MOUNT", "FOLDABLE" ] + }, + { + "id": "biter", + "type": "vehicle_part", + "name": "biting blob", + "item": "biter", + "location": "center", + "symbol": "t", + "broken_symbol": "#", + "color": "blue", + "broken_color": "blue", + "durability": 400, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "bitergrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "description": "A living blob, transformed into a heavy vehicle weapon.", + "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] + }, + { + "id": "clutter", + "type": "vehicle_part", + "name": "gel shooter", + "item": "clutter", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "magenta", + "broken_color": "magenta", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "cluttergrow" } ], + "description": "A living blob, transformed into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + }, + { + "id": "freezie", + "type": "vehicle_part", + "name": "frost lancer", + "item": "freezie", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "light_blue", + "broken_color": "light_blue", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "freeziegrow" } ], + "description": "A living blob, existing in a super-cooled state and transformed into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + }, + { + "id": "fuzzle", + "type": "vehicle_part", + "name": "snapping ooze", + "item": "fuzzle", + "location": "center", + "symbol": "t", + "broken_symbol": "#", + "color": "brown", + "broken_color": "brown", + "durability": 600, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "fuzzlegrow" } ], + "description": "A living blob, transformed into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] + }, + { + "id": "horror", + "type": "vehicle_part", + "name": "blobsaw", + "item": "horror", + "location": "center", + "symbol": "t", + "broken_symbol": "#", + "color": "blue", + "broken_color": "blue", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "horrorgrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ] + }, + { + "id": "inkie", + "type": "vehicle_part", + "name": "fuel puffer", + "item": "inkie", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "brown", + "broken_color": "brown", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "inkiegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] + }, + { + "id": "meltie", + "type": "vehicle_part", + "name": "acid puffer", + "item": "meltie", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "light_red", + "broken_color": "light_red", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "meltiegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] + }, + { + "id": "spouterqueen", + "type": "vehicle_part", + "name": "gel spouter", + "item": "spouterqueen", + "location": "on_roof", + "looks_like": "clutter", + "symbol": "t", + "broken_symbol": "#", + "color": "red", + "broken_color": "red", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "queengrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] + }, + { + "id": "razorqueen", + "type": "vehicle_part", + "name": "gel spiker", + "item": "razorqueen", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "cyan", + "broken_color": "cyan", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "razorqueengrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + }, + { + "id": "sharp", + "type": "vehicle_part", + "name": "gel lancer", + "item": "sharp", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "light_blue", + "broken_color": "light_blue", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "sharpgrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + }, + { + "id": "gelrazor", + "type": "vehicle_part", + "name": "gel razor", + "item": "gelrazor", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "blue", + "broken_color": "blue", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "sicklegrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + }, + { + "id": "sparkie", + "type": "vehicle_part", + "name": "shock bulb", + "item": "sparkie", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "cyan", + "broken_color": "cyan", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "sparkiegrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + }, + { + "id": "stickie", + "type": "vehicle_part", + "name": "gel puffer", + "item": "stickie", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "yellow", + "broken_color": "yellow", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "stickiegrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] + }, + { + "id": "torchie", + "type": "vehicle_part", + "name": "fire puffer", + "item": "torchie", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "light_red", + "broken_color": "light_red", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "torchiegrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE", "USE_TANKS" ] + }, + { + "id": "voideater", + "type": "vehicle_part", + "name": "spark blight", + "item": "voideater", + "location": "on_roof", + "symbol": "t", + "broken_symbol": "#", + "color": "cyan", + "broken_color": "cyan", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "voideatergrow" } ], + "description": "A living blob turned into a heavy vehicle weapon.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "TURRET", "FOLDABLE" ] + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_vehicleparts.json b/data/mods/blazemod/vehicleparts/blob_vehicleparts.json new file mode 100644 index 0000000000000..dc87011de07be --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_vehicleparts.json @@ -0,0 +1,748 @@ +[ + { + "id": "frostie_trunk", + "type": "vehicle_part", + "name": "ice pack", + "item": "frostie", + "location": "center", + "symbol": "H", + "broken_symbol": "#", + "color": "light_blue", + "broken_color": "light_blue", + "difficulty": 3, + "durability": 100, + "epower": 0, + "size": 400, + "damage_modifier": 80, + "folded_volume": 1, + "breaks_into": [ { "item": "frostiegrow" } ], + "description": "A living blob, existing in a super-cooled state. It will keep items stored in it cold, reducing the speed at which food and drink rots.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "CARGO", "OBSTACLE", "FRIDGE", "COVERED", "FOLDABLE" ] + }, + { + "id": "frostie_wall", + "type": "vehicle_part", + "name": "icy windshield", + "item": "frostie", + "location": "center", + "symbol": "\"", + "broken_symbol": "0", + "color": "light_blue", + "broken_color": "light_blue", + "durability": 500, + "damage_modifier": 80, + "folded_volume": 1, + "breaks_into": [ { "item": "frostiegrow" } ], + "description": "A living blob, existing in a super-cooled state. It is transparent, and can be used to see out of the vehicle.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "WINDOW", "FOLDABLE" ] + }, + { + "id": "gloople_amalgam", + "type": "vehicle_part", + "name": "gel retriever", + "item": "gloople", + "location": "under", + "symbol": "R", + "broken_symbol": ";", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "epower": 0, + "size": 300, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, formed to act as a scoop. Use the vehicle controls to turn it on or off. When turned on, it will scoop up any loose items that it travels over, putting them into the vehicle's storage.", + "breaks_into": [ { "item": "glooplegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SCOOP", "CARGO", "FOLDABLE" ] + }, + { + "id": "gloople_belt", + "type": "vehicle_part", + "name": "gel harness", + "item": "gloople", + "location": "on_seat", + "symbol": ",", + "broken_symbol": ",", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "bonus": 25, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, reformed as a belt and attached to a seat.", + "breaks_into": [ { "item": "glooplegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SEATBELT", "FOLDABLE" ] + }, + { + "id": "gloople_tank", + "type": "vehicle_part", + "name": "capsule (10L)", + "item": "gloople_tank", + "location": "fuel_source", + "symbol": "O", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "size": 5000, + "damage_modifier": 10, + "folded_volume": 20, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, formed into a storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "FOLDABLE", "FUEL_TANK" ] + }, + { + "id": "gloople_tank_large", + "type": "vehicle_part", + "copy-from": "gloople_tank", + "name": "gel tank (60L)", + "item": "gloople_tank_large", + "size": 60000, + "folded_volume": 240 + }, + { + "id": "gloople_plate", + "type": "vehicle_part", + "name": "gel reinforcement", + "item": "gloople", + "location": "armor", + "symbol": "X", + "broken_symbol": "*", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, acting as armor plate.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "ARMOR", "FOLDABLE" ] + }, + { + "id": "gloople_roof", + "type": "vehicle_part", + "name": "gel roof", + "item": "gloople", + "location": "roof", + "symbol": "#", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, placed as roof.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "ROOF", "FOLDABLE" ] + }, + { + "id": "gloople_seat", + "type": "vehicle_part", + "name": "gel seat", + "item": "gloople", + "location": "center", + "symbol": "#", + "broken_symbol": "*", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, formed into a comfy couch. You can sit here.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SEAT", "BED", "BOARDABLE", "BELTABLE" ] + }, + { + "id": "gloople_trunk", + "type": "vehicle_part", + "name": "gel receptacle", + "item": "gloople", + "location": "center", + "symbol": "H", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "size": 400, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, shaped into a cargo space.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "CARGO", "COVERED", "FOLDABLE" ] + }, + { + "id": "gloople_trunk_u", + "type": "vehicle_part", + "copy-from": "gloople_trunk", + "name": "gel pouch (under)", + "location": "under" + }, + { + "id": "gloopleaisle_horizontal", + "type": "vehicle_part", + "name": "gel walkway", + "item": "gloople", + "location": "center", + "symbol": "=", + "broken_symbol": "#", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, formed into a walkway.", + "breaks_into": [ { "item": "glooplegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "AISLE", "BOARDABLE", "FOLDABLE" ] + }, + { + "id": "gloopleaisle_vertical", + "type": "vehicle_part", + "copy-from": "gloopleaisle_horizontal", + "symbol": "H" + }, + { + "id": "gloopledoor", + "type": "vehicle_part", + "name": "gel hatch", + "item": "gloople", + "location": "center", + "symbol": "+", + "broken_symbol": "&", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, acting as a door. Has a transparent patch so you can see out of it, even when closed.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "FOLDABLE" ] + }, + { + "id": "gloopledoor_opaque", + "type": "vehicle_part", + "name": "opaque gel hatch", + "item": "gloople", + "location": "center", + "symbol": "+", + "broken_symbol": "&", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glooplegrow" } ], + "description": "A living blob, acting as a door. Entirely opaque so you can't see through it when closed.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ] + }, + { + "id": "glowie_battery", + "type": "vehicle_part", + "name": "gel battery", + "item": "glowie", + "location": "fuel_source", + "fuel_type": "battery", + "symbol": "#", + "broken_symbol": "x", + "color": "cyan", + "broken_color": "cyan", + "durability": 200, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glowiegrow" } ], + "description": "A living, glowing blob. Having been filled with electrical power, it stores that power and can release it to power other parts of the vehicle, allowing it to act as a storage battery.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "FOLDABLE" ] + }, + { + "id": "glowie_battery_u", + "type": "vehicle_part", + "copy-from": "glowie_battery", + "name": "gel battery (under)", + "location": "under" + }, + { + "id": "glowie_power", + "type": "vehicle_part", + "name": "gel generator", + "item": "glowie", + "location": "center", + "fuel_type": "bfeed", + "symbol": "#", + "broken_symbol": "x", + "color": "cyan", + "broken_color": "cyan", + "durability": 200, + "//": "Power is a multiplier on power efficiency - 1 unit is 100 units of battery or 100 kJ", + "power": 50, + "epower": 250, + "bonus": 25, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "glowiegrow" } ], + "description": "A living, glowing blob. It consumes blob feed and produces electrical power, allowing it to be used as a reactor. It also glows, and can be turned on to illuminate several squares inside the vehicle.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "REACTOR", "FOLDABLE", "ATOMIC_LIGHT", "ENABLED_DRAINS_EPOWER" ] + }, + { + "id": "gray_amalgam", + "type": "vehicle_part", + "name": "gray retriever", + "item": "gray", + "location": "under", + "symbol": "R", + "broken_symbol": ";", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "epower": 0, + "size": 800, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "description": "A living blob, formed to act as a scoop. Use the vehicle controls to turn it on or off. When turned on, it will scoop up any loose items that it travels over, putting them into the vehicle's storage.", + "flags": [ "SCOOP", "CARGO", "FOLDABLE" ] + }, + { + "id": "gray_belt", + "type": "vehicle_part", + "name": "gray harness", + "item": "gray", + "location": "on_seat", + "symbol": ",", + "broken_symbol": ",", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "bonus": 50, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, reformed as a belt and attached to a seat.", + "breaks_into": [ { "item": "graygrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SEATBELT", "FOLDABLE" ] + }, + { + "id": "gray_tank", + "type": "vehicle_part", + "name": "cocoon (30L)", + "item": "gray_tank", + "location": "fuel_source", + "symbol": "O", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "size": 10000, + "damage_modifier": 10, + "folded_volume": 40, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, formed into a storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "FOLDABLE", "FUEL_TANK" ] + }, + { + "id": "gray_tank_large", + "type": "vehicle_part", + "copy-from": "gray_tank", + "name": "gray tank (100L)", + "item": "gray_tank_large", + "size": 100000, + "folded_volume": 400 + }, + { + "id": "gray_plate", + "type": "vehicle_part", + "name": "gray reinforcement", + "item": "gray", + "location": "armor", + "symbol": "X", + "broken_symbol": "*", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, acting as armor plate.", + "breaks_into": [ { "item": "graygrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "ARMOR", "FOLDABLE" ] + }, + { + "id": "gray_roof", + "type": "vehicle_part", + "name": "gray roof", + "item": "gray", + "location": "roof", + "symbol": "#", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, placed as roof.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "ROOF", "FOLDABLE" ] + }, + { + "id": "gray_seat", + "type": "vehicle_part", + "name": "gray seat", + "item": "gray", + "location": "center", + "symbol": "#", + "broken_symbol": "*", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, formed into a comfy couch. You can sit here.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SEAT", "BED", "BOARDABLE", "BELTABLE" ] + }, + { + "id": "gray_trunk", + "type": "vehicle_part", + "name": "gray receptacle", + "item": "gray", + "location": "center", + "symbol": "H", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "size": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, shaped into a cargo space.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "CARGO", "COVERED", "FOLDABLE" ] + }, + { + "id": "gray_trunk_u", + "type": "vehicle_part", + "copy-from": "gray_trunk", + "name": "gray pouch (under)", + "location": "under" + }, + { + "id": "grayaisle_horizontal", + "type": "vehicle_part", + "name": "gray walkway", + "item": "gray", + "location": "center", + "symbol": "=", + "broken_symbol": "#", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, formed into a walkway.", + "breaks_into": [ { "item": "graygrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "AISLE", "BOARDABLE", "FOLDABLE" ] + }, + { + "id": "grayaisle_vertical", + "type": "vehicle_part", + "copy-from": "grayaisle_horizontal", + "symbol": "H" + }, + { + "id": "graydoor", + "type": "vehicle_part", + "name": "gray hatch", + "item": "gray", + "location": "center", + "symbol": "+", + "broken_symbol": "&", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, acting as a door. Has a transparent patch so you can see out of it, even when closed.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "FOLDABLE" ] + }, + { + "id": "graydoor_opaque", + "type": "vehicle_part", + "name": "opaque gray hatch", + "item": "gray", + "location": "center", + "symbol": "+", + "broken_symbol": "&", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "graygrow" } ], + "description": "A living blob, acting as a door. Entirely opaque so you can't see through it when closed.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ] + }, + { + "id": "oozle_amalgam", + "type": "vehicle_part", + "name": "ooze retriever", + "item": "oozle", + "location": "under", + "symbol": "R", + "broken_symbol": ";", + "color": "green", + "broken_color": "green", + "durability": 600, + "epower": 0, + "size": 400, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "description": "A living blob, formed to act as a scoop. Use the vehicle controls to turn it on or off. When turned on, it will scoop up any loose items that it travels over, putting them into the vehicle's storage.", + "flags": [ "SCOOP", "CARGO", "FOLDABLE" ] + }, + { + "id": "oozle_belt", + "type": "vehicle_part", + "name": "ooze harness", + "item": "oozle", + "location": "on_seat", + "symbol": ",", + "broken_symbol": ",", + "color": "green", + "broken_color": "green", + "durability": 500, + "bonus": 35, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob, reformed as a belt and attached to a seat.", + "breaks_into": [ { "item": "oozlegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SEATBELT", "FOLDABLE" ] + }, + { + "id": "oozle_tank", + "type": "vehicle_part", + "name": "pod (20L)", + "item": "oozle_tank", + "location": "fuel_source", + "symbol": "O", + "broken_symbol": "#", + "color": "green", + "broken_color": "green", + "durability": 500, + "size": 7500, + "damage_modifier": 10, + "folded_volume": 30, + "breaks_into": [ { "item": "oozlegrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "description": "A living blob, formed into a storage space for holding liquids. If filled with the appropriate fuel for the vehicle's engine, the engine will automatically draw fuel from the tank when the engine is on. If filled with water, you can access the water from a water faucet, if one is installed in the vehicle. You can also use a rubber hose to siphon liquids out of a tank.", + "flags": [ "FOLDABLE", "FUEL_TANK" ] + }, + { + "id": "oozle_tank_large", + "type": "vehicle_part", + "copy-from": "oozle_tank", + "name": "ooze tank (80L)", + "item": "oozle_tank_large", + "size": 8000, + "folded_volume": 320 + }, + { + "id": "oozle_plate", + "type": "vehicle_part", + "name": "ooze reinforcement", + "item": "oozle", + "location": "armor", + "symbol": "X", + "broken_symbol": "*", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, acting as armor plate.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "ARMOR", "FOLDABLE" ] + }, + { + "id": "oozle_roof", + "type": "vehicle_part", + "name": "ooze roof", + "item": "oozle", + "location": "roof", + "symbol": "#", + "broken_symbol": "#", + "color": "green", + "broken_color": "light_green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, placed as roof.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "ROOF", "FOLDABLE" ] + }, + { + "id": "oozle_seat", + "type": "vehicle_part", + "name": "ooze seat", + "item": "oozle", + "location": "center", + "symbol": "#", + "broken_symbol": "*", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, formed into a comfy couch. You can sit here.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "SEAT", "BED", "BOARDABLE", "BELTABLE" ] + }, + { + "id": "oozle_trunk", + "type": "vehicle_part", + "name": "ooze receptacle", + "item": "oozle", + "location": "center", + "symbol": "H", + "broken_symbol": "#", + "color": "green", + "broken_color": "green", + "durability": 500, + "size": 800, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, shaped into a cargo space.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "CARGO", "COVERED", "FOLDABLE" ] + }, + { + "id": "oozle_trunk_u", + "type": "vehicle_part", + "copy-from": "oozle_trunk", + "name": "ooze pouch (under)", + "location": "under" + }, + { + "id": "oozleaisle_horizontal", + "type": "vehicle_part", + "name": "ooze walkway", + "item": "oozle", + "location": "center", + "symbol": "=", + "broken_symbol": "#", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, formed into a walkway.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "AISLE", "BOARDABLE", "FOLDABLE" ] + }, + { + "id": "oozleaisle_vertical", + "type": "vehicle_part", + "copy-from": "oozleaisle_horizontal", + "symbol": "H" + }, + { + "id": "oozledoor", + "type": "vehicle_part", + "name": "ooze hatch", + "item": "oozle", + "location": "center", + "symbol": "+", + "broken_symbol": "&", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, acting as a door. Has a transparent patch so you can see out of it, even when closed.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "FOLDABLE" ] + }, + { + "id": "oozledoor_opaque", + "type": "vehicle_part", + "name": "opaque ooze hatch", + "item": "oozle", + "location": "center", + "symbol": "+", + "broken_symbol": "&", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" } ], + "description": "A living blob, acting as a door. Entirely opaque so you can't see through it when closed.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "FOLDABLE" ] + }, + { + "id": "queen", + "type": "vehicle_part", + "name": "amorphous core", + "item": "queen", + "location": "center", + "fuel_type": "bfeedfuel", + "symbol": "O", + "broken_symbol": "#", + "color": "red", + "broken_color": "red", + "durability": 1000, + "power": 223800, + "energy_consumption": 600000, + "m2c": 65, + "noise_factor": 5, + "epower": -1, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "queengrow" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "description": "An amorphous mass, the living heart and brain of a blob vehicle.", + "flags": [ + "BOARDABLE", + "BELTABLE", + "FOLDABLE", + "ENGINE", + "CONTROLS", + "CTRL_ELECTRONIC", + "SEAT", + "BED", + "E_ALTERNATOR", + "E_STARTS_INSTANTLY", + "E_HIGHER_SKILL", + "TURRET_MOUNT" + ] + } +] diff --git a/data/mods/blazemod/vehicleparts/blob_wheel.json b/data/mods/blazemod/vehicleparts/blob_wheel.json new file mode 100644 index 0000000000000..37a7affd2810c --- /dev/null +++ b/data/mods/blazemod/vehicleparts/blob_wheel.json @@ -0,0 +1,123 @@ +[ + { + "id": "frostie_wheel", + "type": "vehicle_part", + "name": "snow slider", + "item": "frostie_wheel", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "light_blue", + "broken_color": "light_blue", + "durability": 500, + "damage_modifier": 200, + "folded_volume": 1, + "breaks_into": [ { "item": "frostiegrow" } ], + "description": "A living blob, existing in a super-cooled state. It acts as a wheel.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "rolling_resistance": 1.5, + "wheel_type": "standard", + "contact_area": 153, + "flags": [ "WHEEL", "FOLDABLE", "EXTRA_DRAG", "SHARP", "TRACKED" ] + }, + { + "id": "frostie_wheel_sea", + "type": "vehicle_part", + "name": "icy sea skimmer", + "item": "frostie_hull", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "light_blue", + "broken_color": "light_blue", + "durability": 500, + "damage_modifier": 200, + "folded_volume": 1, + "breaks_into": [ { "item": "frostiegrow" } ], + "description": "A living blob, existing in a super-cooled state. It acts as a boat hull.", + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "flags": [ "FLOATS", "FOLDABLE", "EXTRA_DRAG", "SHARP", "TRACKED" ] + }, + { + "id": "gloople_wheel", + "type": "vehicle_part", + "name": "gelatinous wheel", + "item": "gloople_wheel", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "light_green", + "broken_color": "light_green", + "durability": 250, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob. It acts as a wheel.", + "breaks_into": [ { "item": "glooplegrow" }, { "item": "water", "count": [ 50, 100 ] } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "rolling_resistance": 1.75, + "wheel_type": "standard", + "contact_area": 153, + "flags": [ "WHEEL", "FOLDABLE", "TRACKED" ] + }, + { + "id": "gray_wheel", + "type": "vehicle_part", + "name": "gray wheel", + "item": "gray_wheel", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "light_gray", + "broken_color": "light_gray", + "durability": 1000, + "damage_modifier": 10, + "folded_volume": 1, + "description": "A living blob. It acts as a wheel.", + "breaks_into": [ { "item": "graygrow" }, { "item": "water", "count": [ 100, 200 ] } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "rolling_resistance": 1.25, + "wheel_type": "standard", + "contact_area": 153, + "flags": [ "WHEEL", "FOLDABLE", "TRACKED" ] + }, + { + "id": "grinder", + "type": "vehicle_part", + "name": "earthen roller", + "item": "grinder", + "location": "structure", + "symbol": "O", + "broken_symbol": "#", + "color": "brown", + "broken_color": "brown", + "durability": 2500, + "damage_modifier": 250, + "folded_volume": 1, + "breaks_into": [ { "item": "gray" } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "rolling_resistance": 6, + "wheel_type": "rigid", + "contact_area": 500, + "flags": [ "WHEEL", "FOLDABLE", "PROTRUSION", "STABLE", "TRACKED" ] + }, + { + "id": "oozle_wheel", + "type": "vehicle_part", + "name": "oozing wheel", + "item": "oozle_wheel", + "location": "under", + "symbol": "|", + "broken_symbol": "x", + "color": "green", + "broken_color": "green", + "durability": 500, + "damage_modifier": 10, + "folded_volume": 1, + "breaks_into": [ { "item": "oozlegrow" }, { "item": "water", "count": [ 100, 200 ] } ], + "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } }, + "rolling_resistance": 1.5, + "wheel_type": "standard", + "contact_area": 153, + "flags": [ "WHEEL", "FOLDABLE", "TRACKED" ] + } +] diff --git a/data/mods/blazemod/vehicleparts/diamond_parts.json b/data/mods/blazemod/vehicleparts/diamond_parts.json new file mode 100644 index 0000000000000..75ac8b9ffbab4 --- /dev/null +++ b/data/mods/blazemod/vehicleparts/diamond_parts.json @@ -0,0 +1,147 @@ +[ + { + "id": "dboard_horizontal", + "type": "vehicle_part", + "name": "diamond barrier", + "item": "diamondplate", + "location": "center", + "symbol": "h", + "broken_symbol": "#", + "color": "white", + "broken_color": "white", + "description": "A transparent, solid sheet of self-sustaining crystals.", + "durability": 5000, + "breaks_into": [ { "item": "spiral_matrix" }, { "item": "dshards", "count": [ 50, 100 ] }, { "item": "dcluster", "count": [ 2, 6 ] } ], + "requirements": { + "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "OBSTACLE", "WINDOW", "FULL_BOARD" ] + }, + { + "id": "dboard_ne", + "type": "vehicle_part", + "copy-from": "dboard_horizontal", + "symbol": "u" + }, + { + "id": "dboard_nw", + "type": "vehicle_part", + "copy-from": "dboard_horizontal", + "symbol": "y" + }, + { + "id": "dboard_se", + "type": "vehicle_part", + "copy-from": "dboard_horizontal", + "symbol": "n" + }, + { + "id": "dboard_sw", + "type": "vehicle_part", + "copy-from": "dboard_horizontal", + "symbol": "b" + }, + { + "id": "dboard_vertical", + "type": "vehicle_part", + "copy-from": "dboard_horizontal", + "symbol": "j" + }, + { + "id": "dframe_cover", + "type": "vehicle_part", + "name": "diamond frame", + "item": "diamondframe", + "location": "structure", + "symbol": "^", + "broken_symbol": "#", + "color": "white", + "broken_color": "white", + "description": "A framework of super-strong crystal. Other vehicle components can be mounted on it, and it can be attached to other frames to increase the vehicle's size.", + "durability": 3000, + "breaks_into": [ { "item": "spiral_matrix" }, { "item": "dshards", "count": [ 75, 150 ] }, { "item": "dcluster", "count": [ 4, 8 ] } ], + "requirements": { + "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "MOUNTABLE" ] + }, + { + "id": "dframe_cross", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "c", + "flags": [ "MOUNTABLE", "INITIAL_PART" ] + }, + { + "id": "dframe_horizontal", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "h" + }, + { + "id": "dframe_horizontal_2", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "=" + }, + { + "id": "dframe_ne", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "u" + }, + { + "id": "dframe_nw", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "y" + }, + { + "id": "dframe_se", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "n" + }, + { + "id": "dframe_sw", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "b" + }, + { + "id": "dframe_vertical", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "j" + }, + { + "id": "dframe_vertical_2", + "type": "vehicle_part", + "copy-from": "dframe_cover", + "symbol": "H" + }, + { + "id": "plating_diamond", + "type": "vehicle_part", + "name": "diamond plating", + "item": "diamondplate", + "location": "armor", + "symbol": ")", + "broken_symbol": ")", + "color": "white", + "broken_color": "white", + "description": "Transparent crystal armor plate. Will partially protect other components on the same frame from damage.", + "durability": 5000, + "breaks_into": [ { "item": "spiral_matrix" }, { "item": "dshards", "count": [ 50, 100 ] }, { "item": "dcluster", "count": [ 2, 6 ] } ], + "requirements": { + "install": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "ARMOR", "WINDOW" ] + } +] diff --git a/data/mods/blazemod/vehicleparts/diamond_turret.json b/data/mods/blazemod/vehicleparts/diamond_turret.json new file mode 100644 index 0000000000000..f6bcfa57a0cdd --- /dev/null +++ b/data/mods/blazemod/vehicleparts/diamond_turret.json @@ -0,0 +1,30 @@ +[ + { + "id": "diamondlance", + "copy-from": "turret_manual_blaze", + "type": "vehicle_part", + "name": "diamond lance", + "item": "diamondlance", + "color": "white", + "broken_color": "white", + "difficulty": 6, + "size": 10, + "folded_volume": 22, + "breaks_into": [ { "item": "diamondlance", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "diamondnova", + "copy-from": "turret_manual_blaze", + "type": "vehicle_part", + "name": "diamond nova", + "item": "diamondnova", + "color": "white", + "broken_color": "white", + "difficulty": 6, + "size": 10, + "folded_volume": 22, + "breaks_into": [ { "item": "diamondnova", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + } +] diff --git a/data/mods/blazemod/vehicleparts/vortex_parts.json b/data/mods/blazemod/vehicleparts/vortex_parts.json new file mode 100644 index 0000000000000..3ce488dc56f3e --- /dev/null +++ b/data/mods/blazemod/vehicleparts/vortex_parts.json @@ -0,0 +1,68 @@ +[ + { + "id": "vgen", + "type": "vehicle_part", + "name": "vortex generator", + "item": "vgen2", + "location": "engine_block", + "fuel_type": "vpower", + "symbol": "8", + "broken_symbol": "x", + "color": "magenta", + "broken_color": "magenta", + "durability": 400, + "//": "Here power is a multiplier on power efficiency, though ignored because of the PERPTUAL flag", + "power": 100, + "epower": 37300, + "size": 100, + "damage_modifier": 10, + "breaks_into": [ + { "item": "spiral_stone" }, + { "item": "foot_crank", "count": [ 0, 2 ] }, + { "item": "chain", "count": [ 0, 4 ] }, + { "item": "hose", "count": [ 0, 4 ] }, + { "item": "scrap", "count": [ 4, 12 ] }, + { "item": "steel_chunk", "count": [ 2, 5 ] }, + { "item": "plastic_chunk", "count": [ 2, 8 ] } + ], + "requirements": { + "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "REACTOR", "PERPETUAL" ] + }, + { + "id": "vgen2", + "type": "vehicle_part", + "name": "vortex engine", + "item": "vgen", + "location": "engine_block", + "fuel_type": "vpower", + "symbol": "8", + "broken_symbol": "x", + "color": "magenta", + "broken_color": "magenta", + "durability": 400, + "power": 37300, + "epower": 1865, + "noise_factor": 25, + "m2c": 90, + "size": 100, + "damage_modifier": 10, + "breaks_into": [ + { "item": "spiral_stone" }, + { "item": "foot_crank", "count": [ 0, 2 ] }, + { "item": "chain", "count": [ 0, 2 ] }, + { "item": "hose", "count": [ 0, 4 ] }, + { "item": "scrap", "count": [ 4, 12 ] }, + { "item": "plastic_chunk", "count": [ 2, 8 ] } + ], + "requirements": { + "install": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, + "repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } + }, + "flags": [ "ENGINE", "E_STARTS_INSTANTLY", "E_HIGHER_SKILL", "E_ALTERNATOR" ] + } +] diff --git a/data/mods/blazemod/vehicleparts/vortex_turret.json b/data/mods/blazemod/vehicleparts/vortex_turret.json new file mode 100644 index 0000000000000..77f5ba3f51b8c --- /dev/null +++ b/data/mods/blazemod/vehicleparts/vortex_turret.json @@ -0,0 +1,143 @@ +[ + { + "id": "avortexaccelerator", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "vortex accelerator turret", + "item": "vortexaccelerator", + "color": "pink", + "broken_color": "pink", + "size": 5, + "folded_volume": 10, + "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "avortexacceleratornc", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "automated vortex accelerator", + "item": "vortexaccelerator", + "color": "pink", + "broken_color": "pink", + "folded_volume": 10, + "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "avortexbolter", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "vortex bolter turret", + "item": "vortexbolter", + "color": "pink", + "broken_color": "pink", + "size": 10, + "folded_volume": 10, + "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "avortexbolternc", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "automated vortex bolter", + "item": "vortexbolter", + "color": "pink", + "broken_color": "pink", + "folded_volume": 10, + "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "avortexrifle", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "vortex rifle turret", + "item": "vortexrifle", + "color": "pink", + "broken_color": "pink", + "size": 40, + "folded_volume": 10, + "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "avortexriflenc", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "automated vortex rifle", + "item": "vortexrifle", + "color": "pink", + "broken_color": "pink", + "folded_volume": 10, + "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "vortexaccelerator", + "copy-from": "turret_manual_blaze", + "type": "vehicle_part", + "name": "vortex accelerator", + "item": "vortexaccelerator", + "color": "pink", + "broken_color": "pink", + "size": 1000, + "folded_volume": 10, + "breaks_into": [ { "item": "vortexaccelerator", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "vortexbolter", + "copy-from": "turret_manual_blaze", + "type": "vehicle_part", + "name": "vortex bolter", + "item": "vortexbolter", + "color": "pink", + "broken_color": "pink", + "size": 10, + "folded_volume": 10, + "breaks_into": [ { "item": "vortexbolter", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "vortexcannon", + "copy-from": "turret_manual_blaze", + "type": "vehicle_part", + "name": "vortex cannon", + "item": "vortexcannon", + "color": "pink", + "broken_color": "pink", + "size": 10, + "folded_volume": 20, + "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "vortexcannon", + "copy-from": "turret_blaze", + "type": "vehicle_part", + "name": "vortex cannon turret", + "item": "vortexcannon", + "color": "pink", + "broken_color": "pink", + "size": 10, + "folded_volume": 20, + "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + }, + { + "id": "vortexrifle", + "copy-from": "turret_manual_blaze", + "type": "vehicle_part", + "name": "vortex rifle", + "item": "vortexrifle", + "color": "pink", + "broken_color": "pink", + "difficulty": 4, + "size": 40, + "folded_volume": 10, + "breaks_into": [ { "item": "vortexrifle", "count": [ 0, 1 ] } ], + "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } } + } +] diff --git a/data/mods/blazemod/vortex_ammo_types.json b/data/mods/blazemod/vortex_ammo_types.json new file mode 100644 index 0000000000000..a85220d5695b7 --- /dev/null +++ b/data/mods/blazemod/vortex_ammo_types.json @@ -0,0 +1,8 @@ +[ + { + "id": "vpower", + "name": "vortex energy", + "default": "vpower", + "type": "ammunition_type" + } +] From 086d75150f358eb7057ece80bcb882b83c248a40 Mon Sep 17 00:00:00 2001 From: Anton Burmistrov Date: Fri, 17 Apr 2020 11:21:38 +0400 Subject: [PATCH 39/45] Cave jsonify (#39610) * Created json-variants of above-ground and underground sections of cave location and made it spawn * Removed hardcoded cave mapgen --- data/json/mapgen/cave.json | 663 ++++++++++++++++++ .../overmap/overmap_special/specials.json | 6 +- .../overmap_terrain_hardcoded.json | 9 + src/mapgen_functions.cpp | 107 --- src/overmap.cpp | 2 - 5 files changed, 675 insertions(+), 112 deletions(-) create mode 100644 data/json/mapgen/cave.json diff --git a/data/json/mapgen/cave.json b/data/json/mapgen/cave.json new file mode 100644 index 0000000000000..878b6c02293f8 --- /dev/null +++ b/data/json/mapgen/cave.json @@ -0,0 +1,663 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........%%%%%%%%%.......", + ".......%%|||||||%%......", + ".......%|||||||||%......", + ".......%||||,,<||%......", + ".......%|||,,||||%......", + ".......%|||,,||||%......", + ".......%%|||,,||%%......", + "........%%%%;;%%%.......", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + ",": "t_rock_roof", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + "<": "t_slope_down" + }, + "furniture": { }, + "items": { + "O": { "item": "gym", "chance": 30 }, + "c": { "item": "gym", "chance": 10 }, + "f": { "item": "vending_drink_items", "chance": 30, "repeat": [ 2, 4 ] }, + "r": { "item": "snacks", "chance": 20, "repeat": [ 2, 4 ] } + }, + "nested": { "U": { "chunks": [ [ "roof_6x6_garden_1", 50 ], [ "roof_6x6_garden_2", 50 ] ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "........................", + ".....%%%%%%%%%%%%%%%....", + "....%||||||||||||||%%...", + "....%|,,,,,,,,,,,,||%...", + "....%|,,,||||||||,,|%...", + "....%|,,|||||||||,,|%...", + "....%|<||,,,,||||,,|%...", + "....%|||,,||,,|||,,|%...", + "....%|||,,|||,,,,,,|%...", + "....%|||,,||||||||||%...", + "....%|||,,,,,,||||||%...", + "....%|||,,|||,,|||||%...", + "....%|||,,||||,,||||%...", + "....%||,,,|||||,,|||%...", + "....%|,,,,|||||,,|||%...", + "....%||||||,,,,,,|||%...", + "....%|||||,,||||||||%...", + "....%%|||;;||||||||%%...", + ".....%%%%;;%%%%%%%%%....", + "........................", + "........................", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "<": "t_slope_down" + }, + "furniture": { } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "........................", + ".....%%%%%%%%%%%%%%%....", + "....%||||||||||||||%%...", + "....%|,,,WW,,,,WW,||%...", + "....%|,,,||||||||,,|%...", + "....%|WW|||||||||,,|%...", + "....%|<||W,,,||||,,|%...", + "....%|||,W||,,|||,,|%...", + "....%|||,,|||,,,W,,|%...", + "....%|||,,||||||||||%...", + "....%|||,,,W,,||||||%...", + "....%|||,,|||,,|||||%...", + "....%|||,,||||,W||||%...", + "....%||WWW|||||W,|||%...", + "....%|WWWW|||||,,|||%...", + "....%||||||,,,,,,|||%...", + "....%|||||,,||||||||%...", + "....%%|||;;||||||||%%...", + ".....%%%%;;%%%%%%%%%....", + "........................", + "........................", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "W": "t_rock_roof", + "<": "t_slope_down" + }, + "furniture": { }, + "fields": { "W": { "field": "fd_web", "intensity": 2, "age": 10 } }, + "monsters": { "W": { "monster": "GROUP_SPIDER", "chance": 2, "density": 0.01 } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "........................", + ".....%%%%%%%%%%%%%%%....", + "....%||||||||||||||%%...", + "....%|,||||,,,W,||||%...", + "....%|,,||,,|||,,|||%...", + "....%||,,,,|||||,,||%...", + "....%||||||||,,W,,||%...", + "....%|,|,,,,||||,,||%...", + "....%|,|W||,,||||,,,;...", + "....%,,|,,||,<|||,,,;...", + "....%|W||,,||||,,,||%...", + "....%|,,||,,|||,,|||%...", + "....%||,,||,,W,,||,|%...", + "....%|||,,|,|||,||,|%...", + "....%||||,,,|||,,W,|%...", + "....%||||,||||||||||%...", + "....%|||,,,,W,,,,,||%...", + "....%%|||||||||||||%%...", + ".....%%%%%%%%%%%%%%%....", + "........................", + "........................", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "W": "t_rock_roof", + "<": "t_slope_down" + }, + "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } }, + "furniture": { } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "........................", + ".....%%%%%%%%%%%%%%%....", + "....%||||||||||||||%%...", + "....%|,||||,,,,B||||%...", + "....%|,,||BB|||B,|||%...", + "....%||,,,,|||||,,||%...", + "....%||||||||,,B,,||%...", + "....%|,|,,,,||||,,||%...", + "....%|,|,||,,||||,,,;...", + "....%,,|BB||,<|||,,,;...", + "....%|,||,,||||,,,||%...", + "....%|,B||,,|||,,|||%...", + "....%||,,||,BBB,||,|%...", + "....%|||,,|,|||,||,|%...", + "....%||||,,,|||,,,,|%...", + "....%||||,||||||||||%...", + "....%|||BB,,,,,,,,||%...", + "....%%|||||||||||||%%...", + ".....%%%%%%%%%%%%%%%....", + "........................", + "........................", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "B": "t_rock_roof", + "<": "t_slope_down" + }, + "furniture": { }, + "monster": { "B": { "monster": "mon_bat" } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "........................", + ".....%%%%%%%%%%%%%%%....", + "....%||||||||||||||%%...", + "....%|,||||,,W,,||||%...", + "....%|,,||,,|||,,|||%...", + "....%||,,W,|||||,,||%...", + "....%||||||||,,,,,||%...", + "....%|,|,,,,||||,,||%...", + "....%|W|,||,B||||,,,;...", + "....%,,|,,||,<|||,,,;...", + "....%|,||,,||||,,,||%...", + "....%|,,||,,|||,,|||%...", + "....%||,,||,,,,,||,|%...", + "....%|||,,|,|||W||,|%...", + "....%||||,W,|||,,,,|%...", + "....%||||,||||||||||%...", + "....%|||,,,,,,,W,,||%...", + "....%%|||||||||||||%%...", + ".....%%%%%%%%%%%%%%%....", + "........................", + "........................", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "B": "t_rock_roof", + "W": "t_rock_roof", + "<": "t_slope_down" + }, + "furniture": { }, + "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } }, + "monster": { "B": { "monster": "mon_bear" } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + ".........%%%%%%%........", + "........%|||||||%.......", + ".......%|||||||||%......", + "......%|||||,,,,||%.....", + ".....%||||||W||,,||%....", + "....%||,,,,,,|||,,||%...", + "...%||,,||||,,|||,,||%..", + "..%|||W||||||,,|||,,||%.", + ".%||||,,,,,|||,,|||<||%.", + ".%|||||||||||||,,|||||%.", + ".%||||,,,,,,W,,,,,,,,,;.", + ".%|||,,|||,||,,,,,,,,,;.", + ".%||,,||||,|||,,,,,|||%.", + ".%||W|||||,||||,,,||||%.", + "..%|||,|||W|||||,|||||%.", + "...%||,,||,,,||||||||%..", + "....%||,,|||,,||||||%...", + ".....%||,,|||,,||||%....", + "......%||,,|||,,||%.....", + ".......%||,,W,,||%......", + "........%|||||||%.......", + ".........%%%%%%%........", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "B": "t_rock_roof", + "W": "t_rock_roof", + "<": "t_slope_down" + }, + "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } }, + "furniture": { } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave" ], + "weight": 1000, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + ".........%%%%%%%........", + "........%|||||||%.......", + ".......%|||||||||%......", + "......%|||||,,W,||%.....", + ".....%||||||,||,,||%....", + "....%||,,W,,,|||,,||%...", + "...%||,,||||,,|||,W||%..", + "..%|||,||||||,,|||,,||%.", + ".%||||,,W,,|||,,|||<||%.", + ".%|||||||||||||,,|||||%.", + ".%||||,,,,,W,,,,,,,,,,;.", + ".%|||,,|||,||,,,,,,,,,;.", + ".%||,,||||,|||,,,,,|||%.", + ".%||W|||||,||||,B,||||%.", + "..%|||,|||,|||||B|||||%.", + "...%||,,||,W,||||||||%..", + "....%||,,|||,,||||||%...", + ".....%||,,|||,,||||%....", + "......%||,,|||,,||%.....", + ".......%||,,W,,||%......", + "........%|||||||%.......", + ".........%%%%%%%........", + "........................" + ], + "terrain": { + ".": [ [ "t_region_groundcover_forest", 4 ], [ "t_region_tree", 1 ] ], + "|": "t_rock", + "%": [ "t_rock", "t_region_groundcover_forest" ], + ";": "t_dirt", + ",": "t_rock_roof", + "B": "t_rock_roof", + "W": "t_rock_roof", + "<": "t_slope_down" + }, + "furniture": { }, + "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } }, + "monster": { "B": { "monster": "mon_cougar" } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave_underground" ], + "weight": 50, + "object": { + "rotation": [ 0, 3 ], + "rows": [ + "........................", + ".......~~~~~~~~~~~......", + "......~~~~~~~~~~~~~.....", + "......~~~~~~~~~~~~~.....", + "......~~~~......~~~.....", + ".....~~~~~~.....~~~.....", + "....~~~~~~~~....~~~~....", + "......~~~~~~~..~~~~~....", + "....~~~~W~~~..~~~~~~....", + "....~~~~~~~~..~~~~~.....", + ".....~~~~~~~..~~~~~.....", + "..............~~~~~~....", + "............~~~~~~~.....", + "...........~~~~~~~......", + "....~~~~~~~~~~~~~~~~....", + ".....~~~~~~~~~~~~~~.....", + ".......~~~~~~~~~~~......", + ".......~~~~~~~~~~~......", + "........~~~~~~~~~~......", + ".........~~~~~~~~.......", + "..........~~~~~~~.......", + "............,...........", + "............,...........", + "............>..........." + ], + "terrain": { ".": "t_rock", ",": "t_rock_floor", "W": "t_rock_floor", ">": "t_slope_up", "~": "t_water_dp" }, + "furniture": { "W": "f_boulder_small" }, + "item": { "W": { "item": "longsword", "chance": 100 } }, + "monster": { + "~": [ + { "monster": "mon_sewer_fish", "chance": 1 }, + { "monster": "mon_mutant_salmon", "chance": 1 }, + { "monster": "mon_mutant_carp", "chance": 1 } + ] + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave_underground" ], + "weight": 1000, + "object": { + "fill_ter": "t_rock_floor", + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "...............~~~~~~...", + "..............~~~~~~~~..", + "..............~~~~~~~~..", + "............~~~~~~~~~~..", + "...........~~~~~~~~~~~..", + "...........~~~~~~~~~~~..", + "...........~~~~~~~~~~...", + ".........~~~~~~~~.......", + "..~~~~~~~~~~~~~~~.......", + "....~~~~~~~~~~~~~~~~~~..", + "..~~~~~~~~~~~~~~~~~~~~~.", + "..~~~~~~~~~~~~~~~~~~~~~.", + "...~~~~~~~~~~~~~~~~~~~..", + "....~~~~~~~~~~~~........", + "....~~~~~.,,,,,.........", + "..~~~~~~~..,,,..........", + "..~~~~~~~...,...........", + "...~~~~~~...,...........", + ".....~~~....,...........", + "............,...........", + "............,...........", + "............>..........." + ], + "terrain": { ".": "t_rock", ",": "t_rock_floor", ">": "t_slope_up" }, + "furniture": { }, + "items": { "~": [ { "item": "monparts", "chance": 2 }, { "item": "trash_forest", "chance": 2 } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave_underground" ], + "weight": 800, + "object": { + "fill_ter": "t_rock_floor", + "rotation": [ 0, 3 ], + "rows": [ + "........................", + ".......... .....", + "... ... ....... ....", + "... .. .. .. .. ...", + "... ... .. .. ..", + "... .... ... M .. ..", + "... .... .. .. ..", + ".... .... .. .. ..", + "..... .... ...... ...", + "...... .... ....", + "....... ...............", + "....... ......", + ".... ........ .....", + ".... ............. ....", + ".... .............. ...", + ".. .............. ...", + ".. .. ............. ...", + ".. ... ...... ...", + ".. .......... .... ...", + ".. .......... ....", + "... ........ .........", + ".... ..........", + "............ ...........", + "............>..........." + ], + "terrain": { ".": "t_rock", " ": "t_rock_floor", ">": "t_slope_up" }, + "furniture": { }, + "monster": { "M": { "monster": "mon_nakedmolerat_giant" }, " ": { "monster": "mon_nakedmolerat_giant", "chance": 2 } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave_underground" ], + "weight": 500, + "object": { + "fill_ter": "t_rock_floor", + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "...........!!G!!G.......", + ".........S!!!!!!!G......", + ".........S!!!GG!!!......", + ".........!!!!!!!!G......", + ".......G!!,,CC,,!.......", + "........G!!!..,,,!......", + ".........G!,..,,,!G.....", + "..........,,,,,,,!......", + "..........,,,,,,,.......", + "..........,,,,,,,.......", + "..........,,,,,,,.......", + ".........,,,,.CC,.......", + ".........,,,,...,.......", + ".........,,,,...,.......", + ".........,,,,...,.......", + ".........,,,,...,.......", + ".........,,,,...,.......", + ".........,,,,..,,.......", + ".........,,,..,,........", + "..........,,.,,.........", + "...........,,,..........", + "............>..........." + ], + "terrain": { ".": "t_rock", ",": "t_rock_floor", "!": "t_rock_floor", ">": "t_slope_up" }, + "furniture": { "C": "f_crate_c", "S": "f_utility_shelf", "G": [ "f_grave_stone_old", "f_grave_head", "f_grave_monument" ] }, + "item": { + "!": { "item": "material_soil", "chance": 40, "amount": [ 5, 10 ] }, + "C": { "item": "dynamite", "chance": 40, "repeat": 2 } + }, + "items": { "S": { "item": "archeology_tools", "chance": 90, "repeat": [ 1, 2 ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave_underground" ], + "weight": 250, + "object": { + "fill_ter": "t_rock_floor", + "rotation": [ 0, 3 ], + "rows": [ + "........................", + "........................", + "..... 11 13 1111111..", + "...11 ......... ..", + "...11 ......... ...", + "....1 ..........1111..", + "....... ..........4....", + "........ ...... ....", + "..........2..... ......", + "..........1.... .......", + "......... ....1........", + "........ .....5........", + ".......11......1........", + ".... ..... .11...", + "... .... ..", + "...11 ... ...", + "..... ........ ..", + "...111111............ .", + "... .....WC...6.", + ".... ..... w .", + "............ ....Tcf .", + "............6.... D.", + "............ ....F.7J G.", + "............>..........." + ], + "terrain": { ".": "t_rock", " ": "t_rock_floor", ">": "t_slope_up", "7": "t_console_broken" }, + "furniture": { "f": "f_firering", "c": "f_camp_chair", "C": "f_crate_o", "W": "f_crate_c", "T": "f_tourist_table" }, + "traps": { + "F": "tr_rollmat", + "2": "tr_crossbow", + "3": "tr_shotgun_1", + "4": "tr_landmine", + "5": "tr_boobytrap", + "6": "tr_beartrap" + }, + "fields": { + "f": { "field": "fd_fire", "intensity": 1, "age": 10 }, + "1": { "field": "fd_web", "intensity": 1, "age": 10 }, + "2": { "field": "fd_web", "intensity": 1, "age": 10 }, + "3": { "field": "fd_web", "intensity": 1, "age": 10 }, + "4": { "field": "fd_web", "intensity": 1, "age": 10 }, + "5": { "field": "fd_web", "intensity": 1, "age": 10 }, + "6": { "field": "fd_web", "intensity": 1, "age": 10 } + }, + "item": { "f": { "item": "stick", "amount": [ 5, 10 ] }, "J": { "item": "jumper_cable" } }, + "items": { + "C": { "item": "stash_food", "chance": 80, "repeat": [ 2, 3 ] }, + "D": { "item": "fuel_gasoline", "chance": 80 }, + "w": { "item": "stash_wood", "repeat": [ 1, 3 ] }, + "W": { "item": "gear_survival", "chance": 80, "repeat": [ 1, 2 ] } + }, + "vehicles": { "G": { "vehicle": "portable_generator", "chance": 100, "fuel": 40, "status": 1, "rotation": 180 } } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cave_underground" ], + "weight": 700, + "object": { + "fill_ter": "t_rock_floor", + "rotation": [ 0, 3 ], + "rows": [ + "........................", + ".......11111111111......", + ".....111 1111....", + ".....111 2 111....", + "....111 2 111....", + "...11 2 11...", + "...11 2 11...", + "...11 2 11...", + "...11 2 11...", + "...11 2 11...", + "...11111 2 1111...", + "......11 2 1......", + "........ 2 .......", + "........ 2 .......", + "........ 2 .......", + "........ 2 .......", + ".......... 2 .........", + "........... 2 ..........", + "........... 2 ..........", + "........... 2 ..........", + "........... 2 ..........", + "........... 2 ..........", + "........... 2 ..........", + "............>..........." + ], + "terrain": { ".": "t_rock", " ": "t_rock_floor", ">": "t_slope_up", "2": "t_railroad_track_small" }, + "furniture": { }, + "item": { "1": { "item": "broken_molebot", "chance": 2 } }, + "items": { "1": { "item": "cave_minerals", "chance": 40, "repeat": [ 1, 3 ] } }, + "monster": { " ": { "monster": "mon_bat", "chance": 2 } } + } + }, + { + "id": "archeology_tools", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "pickaxe", "prob": 75 }, + { "item": "paint_brush", "prob": 75 }, + { "item": "hammer", "prob": 75 }, + { "item": "chipper", "prob": 75 }, + { "item": "g_shovel", "prob": 75 }, + { "item": "stepladder", "prob": 50 }, + { "item": "miner_hat", "prob": 75 } + ] + } +] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index b13ac5dcc6b76..7e4470cfd8bfe 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -1125,11 +1125,11 @@ { "type": "overmap_special", "id": "Cave", - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cave" } ], - "locations": [ "land" ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cave" }, { "point": [ 0, 0, -1 ], "overmap": "cave_underground" } ], + "locations": [ "forest" ], "city_sizes": [ 0, 12 ], + "city_distance": [ 5, -1 ], "occurrences": [ 0, 30 ], - "rotate": false, "flags": [ "WILDERNESS" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json index 565295e68f01e..f0f94595e9e2d 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json @@ -187,6 +187,15 @@ "see_cost": 2, "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, + { + "type": "overmap_terrain", + "id": "cave_underground", + "name": "cave", + "sym": "C", + "color": "brown", + "see_cost": 2, + "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] + }, { "type": "overmap_terrain", "id": "cave_rat", diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp index e18ebfd48940d..286a8d1b3418f 100644 --- a/src/mapgen_functions.cpp +++ b/src/mapgen_functions.cpp @@ -117,7 +117,6 @@ building_gen_pointer get_mapgen_cfunction( const std::string &ident ) { "river_curved", &mapgen_river_curved }, { "parking_lot", &mapgen_parking_lot }, { "spider_pit", mapgen_spider_pit }, - { "cave", &mapgen_cave }, { "cave_rat", &mapgen_cave_rat }, { "cavern", &mapgen_cavern }, { "open_air", &mapgen_open_air }, @@ -1901,112 +1900,6 @@ void mapgen_parking_lot( mapgendata &dat ) } } -void mapgen_cave( mapgendata &dat ) -{ - map *const m = &dat.m; - if( dat.above() == "cave" ) { - // We're underground! // FIXME: y u no use z-level - for( int i = 0; i < SEEX * 2; i++ ) { - for( int j = 0; j < SEEY * 2; j++ ) { - bool floorHere = ( rng( 0, 6 ) < i || SEEX * 2 - rng( 1, 7 ) > i || - rng( 0, 6 ) < j || SEEY * 2 - rng( 1, 7 ) > j ); - if( floorHere ) { - m->ter_set( point( i, j ), t_rock_floor ); - } else { - m->ter_set( point( i, j ), t_rock ); - } - } - } - square( m, t_slope_up, point( SEEX - 1, SEEY - 1 ), point( SEEX, SEEY ) ); - switch( rng( 1, 10 ) ) { - case 1: - // natural refuse, chance of minerals - m->place_items( "cave_minerals", 50, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, - dat.when() ); - m->place_items( "monparts", 80, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, dat.when() ); - break; - case 2: - // trash, minerals less likely - m->place_items( "cave_minerals", 25, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, - dat.when() ); - m->place_items( "trash", 70, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, dat.when() ); - break; - case 3: - // bat corpses - m->place_items( "cave_minerals", 50, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, - dat.when() ); - for( int i = rng( 1, 12 ); i > 0; i-- ) { - m->add_item_or_charges( point( rng( 1, SEEX * 2 - 1 ), rng( 1, SEEY * 2 - 1 ) ), - item::make_corpse( mon_bat ) ); - } - break; - case 4: - // ant food, chance of 80 - m->place_items( "cave_minerals", 25, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, - dat.when() ); - m->place_items( "ant_food", 85, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, dat.when() ); - break; - case 5: { - // hermitage - int origx = rng( SEEX - 1, SEEX ), - origy = rng( SEEY - 1, SEEY ), - hermx = rng( SEEX - 6, SEEX + 5 ), - hermy = rng( SEEX - 6, SEEY + 5 ); - std::vector bloodline = line_to( point( origx, origy ), point( hermx, hermy ), 0 ); - for( auto &ii : bloodline ) { - madd_field( m, ii.x, ii.y, fd_blood, 2 ); - } - m->add_item_or_charges( point( hermx, hermy ), item::make_corpse() ); - // This seems verbose. Maybe a function to spawn from a list of item groups? - m->place_items( "stash_food", 50, point( hermx - 1, hermy - 1 ), point( hermx + 1, hermy + 1 ), - true, dat.when() ); - m->place_items( "gear_survival", 50, point( hermx - 1, hermy - 1 ), point( hermx + 1, hermy + 1 ), - true, dat.when() ); - m->place_items( "survival_armor", 50, point( hermx - 1, hermy - 1 ), point( hermx + 1, hermy + 1 ), - true, dat.when() ); - m->place_items( "weapons", 40, point( hermx - 1, hermy - 1 ), point( hermx + 1, hermy + 1 ), true, - dat.when() ); - m->place_items( "magazines", 40, point( hermx - 1, hermy - 1 ), point( hermx + 1, hermy + 1 ), true, - dat.when() ); - m->place_items( "rare", 30, point( hermx - 1, hermy - 1 ), point( hermx + 1, hermy + 1 ), true, - dat.when() ); - break; - } - default: - // nothing except maybe minerals, default occurs half the time - m->place_items( "cave_minerals", 50, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ), true, - dat.when() ); - break; - } - m->place_spawns( GROUP_CAVE, 2, point( 6, 6 ), point( 18, 18 ), 1.0 ); - } else { // We're above ground! - // First, draw a forest - mapgendata forest_mapgen_dat( dat, oter_str_id( "forest" ).id() ); - mapgen_forest( forest_mapgen_dat ); - // Clear the center with some rocks - square( m, t_rock, point( SEEX - 6, SEEY - 6 ), point( SEEX + 5, SEEY + 5 ) ); - int pathx = 0; - int pathy = 0; - if( one_in( 2 ) ) { - pathx = rng( SEEX - 6, SEEX + 5 ); - pathy = ( one_in( 2 ) ? SEEY - 8 : SEEY + 7 ); - } else { - pathx = ( one_in( 2 ) ? SEEX - 8 : SEEX + 7 ); - pathy = rng( SEEY - 6, SEEY + 5 ); - } - std::vector pathline = line_to( point( pathx, pathy ), point( SEEX - 1, SEEY - 1 ), 0 ); - for( auto &ii : pathline ) { - square( m, t_dirt, ii, - ii + point_south_east ); - } - while( !one_in( 8 ) ) { - m->ter_set( point( rng( SEEX - 6, SEEX + 5 ), rng( SEEY - 6, SEEY + 5 ) ), t_dirt ); - } - square( m, t_slope_down, point( SEEX - 1, SEEY - 1 ), point( SEEX, SEEY ) ); - } - -} - void mapgen_cave_rat( mapgendata &dat ) { map *const m = &dat.m; diff --git a/src/overmap.cpp b/src/overmap.cpp index 0c142221aa974..47d23274abc5b 100644 --- a/src/overmap.cpp +++ b/src/overmap.cpp @@ -1563,8 +1563,6 @@ bool overmap::generate_sub( const int z ) if( one_in( 3 ) ) { ter_set( p, oter_id( "cave_rat" ) ); requires_sub = true; // rat caves are two level - } else { - ter_set( p, oter_id( "cave" ) ); } } else if( oter_above == "cave_rat" && z == -2 ) { ter_set( p, oter_id( "cave_rat" ) ); From 7d57d0896fee26e0fdfc578eb519197d4ebbbeb1 Mon Sep 17 00:00:00 2001 From: Pupsi Mupsi <44737997+Pupsi-Mupsi@users.noreply.github.com> Date: Fri, 17 Apr 2020 09:21:59 +0200 Subject: [PATCH 40/45] Interface: Match quality color (#39605) * Colorize butchering tool info * Match quality color --- src/game.cpp | 4 ++-- src/veh_type.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 0a220aef353e7..f1fc5b89b5366 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -8011,12 +8011,12 @@ static void butcher_submenu( const std::vector &corpses, in const int factor = g->u.max_quality( quality_id( "BUTCHER" ) ); const std::string msgFactor = factor > INT_MIN - ? string_format( _( "Your best tool has %d butchering." ), factor ) + ? string_format( _( "Your best tool has %d butchering." ), factor ) : _( "You have no butchering tool." ); const int factorD = g->u.max_quality( quality_id( "CUT_FINE" ) ); const std::string msgFactorD = factorD > INT_MIN - ? string_format( _( "Your best tool has %d fine cutting." ), factorD ) + ? string_format( _( "Your best tool has %d fine cutting." ), factorD ) : _( "You have no fine cutting tool." ); bool has_skin = false; diff --git a/src/veh_type.cpp b/src/veh_type.cpp index 06cef05ecae56..a36034c6ed4ad 100644 --- a/src/veh_type.cpp +++ b/src/veh_type.cpp @@ -737,7 +737,7 @@ int vpart_info::format_description( std::string &msg, const nc_color &format_col const quality_id quality_lift( "LIFT" ); for( const auto &qual : qualities ) { msg += string_format( - _( "Has level %1$d %2$s quality" ), qual.second, qual.first.obj().name ); + _( "Has level %1$d %2$s quality" ), qual.second, qual.first.obj().name ); if( qual.first == quality_jack || qual.first == quality_lift ) { msg += string_format( _( " and is rated at %1$d %2$s" ), static_cast( convert_weight( qual.second * TOOL_LIFT_FACTOR ) ), From af60511164dc44d529171e6eca6837a508191829 Mon Sep 17 00:00:00 2001 From: Fris0uman <41293484+Fris0uman@users.noreply.github.com> Date: Fri, 17 Apr 2020 09:34:08 +0200 Subject: [PATCH 41/45] Transforming a mutation into another on activation (#39523) --- data/json/mutations/mutations.json | 28 ++++++++++++++++++++++++---- doc/JSON_FLAGS.md | 1 - doc/JSON_INFO.md | 7 +++++++ src/character.h | 2 ++ src/melee.cpp | 24 +++++++----------------- src/mutation.cpp | 24 ++++++++++++++++++++++++ src/mutation.h | 19 +++++++++++++++++++ src/mutation_data.cpp | 27 +++++++++++++++++++++++++++ src/mutation_ui.cpp | 18 ++++++++++++++---- src/visitable.cpp | 9 +++------ 10 files changed, 127 insertions(+), 32 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 2fabbc7fe4791..d619108decc10 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -2263,6 +2263,7 @@ "points": 2, "visibility": 8, "ugliness": 4, + "pierce_dmg_bonus": 2, "description": "Your skin is covered in small, woody thorns. Whenever an unarmed opponent strikes a part of your body that is not covered by clothing, they will receive minor damage. Your punches may also deal extra damage.", "prereqs": [ "BARK" ], "category": [ "PLANT" ] @@ -2450,6 +2451,7 @@ "name": { "str": "Long Fingernails" }, "points": 1, "visibility": 1, + "pierce_dmg_bonus": 0.5, "description": "Your fingernails are long and sharp. If you aren't wearing gloves, your unarmed attacks deal a minor amount of cutting damage.", "types": [ "CLAWS" ], "changes_to": [ "CLAWS", "TALONS" ], @@ -2464,6 +2466,8 @@ "visibility": 3, "ugliness": 2, "cut_dmg_bonus": 3, + "pierce_dmg_bonus": 3, + "butchering_quality": 4, "description": "You have claws on the ends of your fingers. If you aren't wearing gloves, your unarmed attacks deal a minor amount of cutting damage.", "types": [ "CLAWS" ], "prereqs": [ "NAILS" ], @@ -2479,6 +2483,7 @@ "visibility": 3, "ugliness": 4, "cut_dmg_bonus": 1, + "butchering_quality": 4, "flags": [ "UNARMED_BONUS" ], "description": "Your claws have grown tougher and slightly gnarled.", "types": [ "CLAWS" ], @@ -2497,6 +2502,8 @@ "valid": false, "purifiable": false, "cut_dmg_bonus": 1, + "pierce_dmg_bonus": 3, + "butchering_quality": 8, "flags": [ "UNARMED_BONUS" ], "description": "Your paws are bone, muscle, and claw with a thin layer of skin and fur. They might as well be made of stainless steel.", "types": [ "CLAWS" ], @@ -2511,15 +2518,26 @@ "id": "CLAWS_RETRACT", "name": { "str": "Retractable Claws" }, "points": 2, - "ugliness": 1, - "cut_dmg_bonus": 3, - "flags": [ "NEED_ACTIVE_TO_MELEE" ], "description": "You have claws on the ends of your fingers, and can extend or retract them as desired. Gloves will still get in the way, though.", "types": [ "CLAWS" ], "prereqs": [ "CLAWS" ], "cancels": [ "ARM_TENTACLES", "ARM_TENTACLES_4", "ARM_TENTACLES_8" ], "category": [ "FELINE" ], - "active": true, + "transform": { "target": "CLAWS_RETRACT_active", "msg_transform": "You extend your claws.", "active": false, "moves": 10 }, + "cost": 0 + }, + { + "type": "mutation", + "id": "CLAWS_RETRACT_active", + "name": { "str": "Extended Claws" }, + "copy-from": "CLAWS_RETRACT", + "valid": false, + "ugliness": 1, + "cut_dmg_bonus": 3, + "pierce_dmg_bonus": 3, + "butchering_quality": 4, + "description": "Sharp claws are exten from the end of your fingers.", + "transform": { "target": "CLAWS_RETRACT", "msg_transform": "You retract your claws.", "active": false, "moves": 10 }, "cost": 0 }, { @@ -2555,6 +2573,7 @@ "visibility": 4, "ugliness": 3, "cut_dmg_bonus": 3, + "butchering_quality": 4, "flags": [ "UNARMED_BONUS" ], "mixed_effect": true, "restricts_gear": [ "HAND_L", "HAND_R" ], @@ -3633,6 +3652,7 @@ "points": 1, "visibility": 8, "ugliness": 6, + "butchering_quality": 4, "mixed_effect": true, "description": "A set of insect-like mandibles have grown around your mouth. They allow you to eat faster and provide a slicing unarmed attack, but prevent wearing mouthwear. Slightly reduces wet effects.", "types": [ "TEETH", "MUZZLE" ], diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index 13d71c75ec717..71fe1034d739c 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -1091,7 +1091,6 @@ Also see `monster_attacks.json` for more special attacks, for example, impale an #### Flags - ```UNARMED_BONUS``` You get a bonus to unarmed bash and cut damage equal to unarmed_skill/2 up to 4. -- ```NEED_ACTIVE_TO_MELEE``` This mutation gives bonus to unarmed melee only if it's active. - ```NO_DISEASE``` This mutation grants immunity to diseases. - ```NO_THIRST``` Your thirst is not modified by food or drinks. - ```NO_RADIATION``` This mutation grants immunity to radiations. diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 71efc7b44446e..a74af528e6197 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -1239,7 +1239,9 @@ an `event_statistic`. For example: "visibility": 0, // Visibility of the trait for purposes of NPC interaction (default: 0) "ugliness": 0, // Ugliness of the trait for purposes of NPC interaction (default: 0) "cut_dmg_bonus": 3, // Bonus to unarmed cut damage (default: 0) +"pierce_dmg_bonus": 3, // Bonus to unarmed pierce damage (default: 0.0) "bash_dmg_bonus": 3, // Bonus to unarmed bash damage (default: 0) +"butchering_quality": 4, // Butchering quality of this mutations (default: 0) "rand_cut_bonus": { "min": 2, "max": 3 }, // Random bonus to unarmed cut damage between min and max. "rand_bash_bonus": { "min": 2, "max": 3 }, // Random bonus to unarmed bash damage between min and max. "bodytemp_modifiers" : [100, 150], // Range of additional bodytemp units (these units are described in 'weather.h'. First value is used if the person is already overheated, second one if it's not. @@ -1320,6 +1322,11 @@ an `event_statistic`. For example: "healing_awake": 1.0, // Healing rate per turn while awake. "healing_resting": 0.5, // Healing rate per turn while resting. "mending_modifier": 1.2 // Multiplier on how fast your limbs mend - This value would make your limbs mend 20% faster +"transform": { "target": "BIOLUM1", // Trait_id of the mutation this one will transfomr into + "msg_transform": "You turn your photophore OFF.", // message displayed upon transformation + "active": false , // Will the target mutation start powered ( turn ON ). + "moves": 100 // how many moves this costs. (default: 0) +} ``` ### Vehicle Groups diff --git a/src/character.h b/src/character.h index 6af7d15329aa3..51f5460d5a194 100644 --- a/src/character.h +++ b/src/character.h @@ -751,6 +751,8 @@ class Character : public Creature, public visitable /** Add or removes a mutation on the player, but does not trigger mutation loss/gain effects. */ void set_mutation( const trait_id & ); void unset_mutation( const trait_id & ); + /**Unset switched mutation and set target mutation instead*/ + void switch_mutations( const trait_id &switched, const trait_id &target, bool start_powered ); // Trigger and disable mutations that can be so toggled. void activate_mutation( const trait_id &mutation ); diff --git a/src/melee.cpp b/src/melee.cpp index e1e806031b856..432e626fefe68 100644 --- a/src/melee.cpp +++ b/src/melee.cpp @@ -91,9 +91,6 @@ static const efftype_id effect_narcosis( "narcosis" ); static const efftype_id effect_poison( "poison" ); static const efftype_id effect_stunned( "stunned" ); -static const trait_id trait_CLAWS( "CLAWS" ); -static const trait_id trait_CLAWS_RETRACT( "CLAWS_RETRACT" ); -static const trait_id trait_CLAWS_ST( "CLAWS_ST" ); static const trait_id trait_CLAWS_TENTACLE( "CLAWS_TENTACLE" ); static const trait_id trait_CLUMSY( "CLUMSY" ); static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" ); @@ -947,6 +944,7 @@ void Character::roll_cut_damage( bool crit, damage_instance &di, bool average, if( has_bionic( bionic_id( "bio_razors" ) ) ) { per_hand += 2; } + for( const trait_id &mut : get_mutations() ) { if( mut->flags.count( "NEED_ACTIVE_TO_MELEE" ) > 0 && !has_active_mutation( mut ) ) { continue; @@ -1014,27 +1012,19 @@ void Character::roll_stab_damage( bool crit, damage_instance &di, bool /*average weap.is_null(); if( left_empty || right_empty ) { float per_hand = 0.0f; - if( has_trait( trait_CLAWS ) || has_active_mutation( trait_CLAWS_RETRACT ) ) { - per_hand += 3; - } - if( has_trait( trait_NAILS ) ) { - per_hand += .5; - } + for( const trait_id &mut : get_mutations() ) { + per_hand += mut->pierce_dmg_bonus; - if( has_bionic( bionic_id( "bio_razors" ) ) ) { - per_hand += 2; + if( mut->flags.count( "UNARMED_BONUS" ) > 0 && cut_bonus > 0 ) { + per_hand += std::min( unarmed_skill / 2, 4 ); + } } - if( has_trait( trait_THORNS ) ) { + if( has_bionic( bionic_id( "bio_razors" ) ) ) { per_hand += 2; } - if( has_trait( trait_CLAWS_ST ) ) { - /** @EFFECT_UNARMED increases stabbing damage with CLAWS_ST */ - per_hand += 3 + unarmed_skill / 2.0; - } - cut_dam += per_hand; // First hand if( left_empty && right_empty ) { // Second hand diff --git a/src/mutation.cpp b/src/mutation.cpp index 76e5b51860e11..6fef2103caaa6 100644 --- a/src/mutation.cpp +++ b/src/mutation.cpp @@ -171,6 +171,17 @@ void Character::unset_mutation( const trait_id &trait_ ) reset_encumbrance(); } +void Character::switch_mutations( const trait_id &switched, const trait_id &target, + bool start_powered ) +{ + unset_mutation( switched ); + mutation_loss_effect( switched ); + + set_mutation( target ); + my_mutations[target].powered = start_powered; + mutation_effect( target ); +} + int Character::get_mod( const trait_id &mut, const std::string &arg ) const { auto &mod_data = mut->mods; @@ -494,6 +505,13 @@ void Character::activate_mutation( const trait_id &mut ) recalc_sight_limits(); } + if( mdata.transform ) { + const cata::value_ptr trans = mdata.transform; + mod_moves( - trans->moves ); + switch_mutations( mut, trans->target, trans->active ); + return; + } + if( mut == trait_WEB_WEAVER ) { g->m.add_field( pos(), fd_web, 1 ); add_msg_if_player( _( "You start spinning web with your spinnerets!" ) ); @@ -619,6 +637,12 @@ void Character::deactivate_mutation( const trait_id &mut ) // Handle stat changes from deactivation apply_mods( mut, false ); recalc_sight_limits(); + const mutation_branch &mdata = mut.obj(); + if( mdata.transform ) { + const cata::value_ptr trans = mdata.transform; + mod_moves( -trans->moves ); + switch_mutations( mut, trans->target, trans->active ); + } } trait_id Character::trait_by_invlet( const int ch ) const diff --git a/src/mutation.h b/src/mutation.h index 0e93f0889f506..6984fadd0ab86 100644 --- a/src/mutation.h +++ b/src/mutation.h @@ -76,6 +76,20 @@ struct mut_attack { bool hardcoded_effect = false; }; +struct mut_transform { + + trait_id target; + + /** displayed if player sees transformation with %s replaced by item name */ + translation msg_transform; + /** used to set the active property of the transformed @ref target */ + bool active = false; + /** subtracted from @ref Creature::moves when transformation is successful */ + int moves = 0; + mut_transform(); + bool load( const JsonObject &jsobj, const std::string &member ); +}; + struct mutation_branch { trait_id id; bool was_loaded = false; @@ -131,6 +145,7 @@ struct mutation_branch { float str_modifier = 0.0f; //melee bonuses int cut_dmg_bonus = 0; + float pierce_dmg_bonus = 0.0; std::pair rand_cut_bonus; int bash_dmg_bonus = 0; std::pair rand_bash_bonus; @@ -151,6 +166,10 @@ struct mutation_branch { cata::optional scent_mask; int bleed_resist = 0; + int butchering_quality = 0; + + cata::value_ptr transform; + /**Map of crafting skills modifiers, can be negative*/ std::map craft_skill_bonus; diff --git a/src/mutation_data.cpp b/src/mutation_data.cpp index fd2bb857eae97..33f69b50856e7 100644 --- a/src/mutation_data.cpp +++ b/src/mutation_data.cpp @@ -260,6 +260,20 @@ void mutation_branch::load_trait( const JsonObject &jo, const std::string &src ) trait_factory.load( jo, src ); } +mut_transform::mut_transform() : active( false ), moves( 0 ) {} + +bool mut_transform::load( const JsonObject &jsobj, const std::string &member ) +{ + JsonObject j = jsobj.get_object( member ); + + assign( j, "target", target ); + assign( j, "msg_transform", msg_transform ); + assign( j, "active", active ); + assign( j, "moves", moves ); + + return true; +} + void mutation_branch::load( const JsonObject &jo, const std::string & ) { mandatory( jo, was_loaded, "id", id ); @@ -293,6 +307,10 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) optional( si, was_loaded, "type", ranged_mutation ); optional( si, was_loaded, "message", raw_ranged_mutation_message ); } + if( jo.has_object( "transform" ) ) { + transform = cata::make_value(); + transform->load( jo, "transform" ); + } optional( jo, was_loaded, "initial_ma_styles", initial_ma_styles ); if( jo.has_array( "bodytemp_modifiers" ) ) { @@ -331,6 +349,7 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) optional( jo, was_loaded, "stealth_modifier", stealth_modifier, 0.0f ); optional( jo, was_loaded, "str_modifier", str_modifier, 0.0f ); optional( jo, was_loaded, "cut_dmg_bonus", cut_dmg_bonus, 0 ); + optional( jo, was_loaded, "pierce_dmg_bonus", pierce_dmg_bonus, 0.0f ); optional( jo, was_loaded, "bash_dmg_bonus", bash_dmg_bonus, 0 ); optional( jo, was_loaded, "dodge_modifier", dodge_modifier, 0.0f ); optional( jo, was_loaded, "speed_modifier", speed_modifier, 1.0f ); @@ -367,6 +386,8 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) optional( jo, was_loaded, "can_only_heal_with", can_only_heal_with ); optional( jo, was_loaded, "can_heal_with", can_heal_with ); + optional( jo, was_loaded, "butchering_quality", butchering_quality, 0 ); + optional( jo, was_loaded, "allowed_category", allowed_category ); optional( jo, was_loaded, "mana_modifier", mana_modifier, 0 ); @@ -535,6 +556,12 @@ void mutation_branch::check_consistency() debugmsg( "mutation %s refers to undefined mutation type %s", mid.c_str(), type ); } } + if( mid->transform ) { + const trait_id tid = mid->transform->target; + if( !tid.is_valid() ) { + debugmsg( "mutation %s transform uses undefined target %s", mid.c_str(), tid.c_str() ); + } + } for( const std::pair elem : an_id ) { if( !elem.first.is_valid() ) { debugmsg( "mutation %s refers to undefined species id %s", mid.c_str(), elem.first.c_str() ); diff --git a/src/mutation_ui.cpp b/src/mutation_ui.cpp index 0dbbaff0e31b2..d92413d213b6b 100644 --- a/src/mutation_ui.cpp +++ b/src/mutation_ui.cpp @@ -71,7 +71,7 @@ void player::power_mutations() std::vector passive; std::vector active; for( std::pair &mut : my_mutations ) { - if( !mut.first->activated ) { + if( !mut.first->activated && ! mut.first->transform ) { passive.push_back( mut.first ); } else { active.push_back( mut.first ); @@ -290,10 +290,15 @@ void player::power_mutations() break; } const auto &mut_data = mut_id.obj(); + const cata::value_ptr &trans = mut_data.transform; if( menu_mode == "activating" ) { - if( mut_data.activated ) { + if( mut_data.activated || trans ) { if( my_mutations[mut_id].powered ) { - add_msg_if_player( m_neutral, _( "You stop using your %s." ), mut_data.name() ); + if( trans && !trans->msg_transform.empty() ) { + add_msg_if_player( m_neutral, trans->msg_transform ); + } else { + add_msg_if_player( m_neutral, _( "You stop using your %s." ), mut_data.name() ); + } deactivate_mutation( mut_id ); // Action done, leave screen @@ -303,7 +308,12 @@ void player::power_mutations() ( !mut_data.fatigue || get_fatigue() <= 400 ) ) { g->draw(); - add_msg_if_player( m_neutral, _( "You activate your %s." ), mut_data.name() ); + if( trans && !trans->msg_transform.empty() ) { + add_msg_if_player( m_neutral, trans->msg_transform ); + } else { + add_msg_if_player( m_neutral, _( "You activate your %s." ), mut_data.name() ); + } + activate_mutation( mut_id ); // Action done, leave screen break; diff --git a/src/visitable.cpp b/src/visitable.cpp index aa98f0fadd2bf..0c7ef75e4b603 100644 --- a/src/visitable.cpp +++ b/src/visitable.cpp @@ -10,6 +10,7 @@ #include "active_item_cache.h" #include "bionics.h" +#include "mutation.h" #include "character.h" #include "colony.h" #include "debug.h" @@ -278,12 +279,8 @@ int visitable::max_quality( const quality_id &qual ) const } if( qual == qual_BUTCHER ) { - if( self->has_trait( trait_CLAWS_ST ) ) { - res = std::max( res, 8 ); - } else if( self->has_trait( trait_TALONS ) || self->has_trait( trait_MANDIBLES ) || - self->has_trait( trait_CLAWS ) || self->has_trait( trait_CLAWS_RETRACT ) || - self->has_trait( trait_CLAWS_RAT ) ) { - res = std::max( res, 4 ); + for( const trait_id &mut : self->get_mutations() ) { + res = std::max( res, mut->butchering_quality ); } } From bd67a974c3a355cf44d283c4d7e2569794078be0 Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Fri, 17 Apr 2020 09:50:42 +0200 Subject: [PATCH 42/45] Adds prices to unsorted json --- data/json/items/ammo.json | 61 ++++++ data/json/items/battery.json | 17 ++ data/json/items/bionics.json | 2 + data/json/items/biosignatures.json | 1 + data/json/items/chemicals_and_resources.json | 86 +++++++- data/json/items/containers.json | 63 +++++- data/json/items/electronics.json | 4 +- data/json/items/fluff.json | 4 + data/json/items/fuel.json | 7 +- data/json/items/generic.json | 210 ++++++++++++++----- data/json/items/handloaded_bullets.json | 3 + data/json/items/items_holiday.json | 3 + data/json/items/newspaper.json | 12 ++ data/json/items/robot_parts.json | 11 + data/json/items/software.json | 24 ++- data/json/items/tool_armor.json | 100 ++++++++- 16 files changed, 537 insertions(+), 71 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 9eac63422f2e8..129e60ca7dbc0 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -37,6 +37,7 @@ "id": "RTG_coffee", "category": "spare_parts", "price": 20000, + "price_postapoc": 2000, "name": { "str": "radioisotope thermoelectric generator" }, "symbol": "=", "color": "green", @@ -51,6 +52,7 @@ "id": "aluminum_foil", "category": "spare_parts", "price": 648, + "price_postapoc": 10, "name": { "str": "aluminum foil" }, "symbol": "=", "color": "light_gray", @@ -79,6 +81,7 @@ "id": "thread", "category": "spare_parts", "price": 5000, + "price_postapoc": 25, "name": { "str": "thread", "str_pl": "thread" }, "symbol": "=", "color": "light_gray", @@ -96,6 +99,7 @@ "id": "sinew", "category": "spare_parts", "price": 0, + "price_postapoc": 25, "name": { "str": "sinew" }, "symbol": "=", "color": "light_red", @@ -113,6 +117,7 @@ "id": "plant_fibre", "category": "spare_parts", "price": 0, + "price_postapoc": 25, "name": { "str": "plant fiber" }, "symbol": "=", "color": "light_green", @@ -130,6 +135,7 @@ "id": "yarn", "category": "spare_parts", "price": 0, + "price_postapoc": 25, "name": { "str": "yarn", "str_pl": "yarn" }, "symbol": "=", "color": "white", @@ -147,6 +153,7 @@ "id": "soap", "category": "chems", "price": 300, + "price_postapoc": 100, "name": { "str": "soap bar" }, "symbol": "=", "color": "white", @@ -162,6 +169,7 @@ "id": "duct_tape", "category": "spare_parts", "price": 2000, + "price_postapoc": 250, "name": { "str": "duct tape" }, "symbol": "=", "color": "light_gray", @@ -182,6 +190,7 @@ "name": { "str": "rolling paper" }, "description": "These are thin paper strips intended for the rolling of cigarettes.", "price": 150, + "price_postapoc": 25, "material": "paper", "weight": "1 g", "volume": "100ml", @@ -195,6 +204,7 @@ "id": "cable", "category": "spare_parts", "price": 2000, + "price_postapoc": 100, "name": { "str": "copper wire" }, "symbol": "=", "color": "dark_gray", @@ -210,6 +220,7 @@ "id": "plut_cell", "category": "spare_parts", "price": 150000, + "price_postapoc": 1250, "name": { "str": "plutonium fuel cell" }, "symbol": "=", "color": "green", @@ -228,6 +239,7 @@ "id": "plut_slurry_dense", "category": "spare_parts", "price": 250, + "price_postapoc": 0, "name": { "str": "plutonium slurry" }, "symbol": "=", "color": "green", @@ -245,6 +257,7 @@ "id": "plut_slurry", "category": "spare_parts", "price": 250, + "price_postapoc": 0, "name": { "str": "watery plutonium slurry", "str_pl": "watery plutonium slurry" }, "symbol": "=", "color": "green", @@ -283,6 +296,7 @@ "type": "AMMO", "id": "pebble", "price": 100, + "price_postapoc": 10, "name": { "str": "pebble" }, "symbol": "=", "color": "light_gray", @@ -302,6 +316,7 @@ "type": "AMMO", "id": "pebble_clay", "price": 150, + "price_postapoc": 10, "name": { "str": "clay pellet" }, "symbol": "=", "color": "brown", @@ -322,6 +337,7 @@ "type": "AMMO", "id": "marble", "price": 200, + "price_postapoc": 10, "name": { "str": "marble" }, "symbol": "=", "color": "light_gray", @@ -342,6 +358,7 @@ "type": "AMMO", "id": "bearing", "price": 100, + "price_postapoc": 250, "name": { "str": "bearings", "str_pl": "bearings" }, "symbol": "=", "color": "dark_gray", @@ -362,6 +379,7 @@ "type": "AMMO", "id": "bb", "price": 500, + "price_postapoc": 50, "name": { "str": "BB" }, "symbol": "=", "color": "light_gray", @@ -383,6 +401,7 @@ "id": "feather", "category": "spare_parts", "price": 3000, + "price_postapoc": 250, "name": { "str": "feather" }, "symbol": "=", "color": "brown", @@ -400,6 +419,7 @@ "id": "down_feather", "category": "spare_parts", "price": 3000, + "price_postapoc": 250, "name": { "str": "down feather" }, "symbol": "=", "color": "brown", @@ -416,6 +436,7 @@ "type": "AMMO", "id": "120mm_HEAT", "price": 999999, + "price_postapoc": 1000, "name": { "str": "120mm HEAT" }, "symbol": "=", "color": "dark_gray", @@ -434,6 +455,7 @@ "type": "AMMO", "id": "plasma", "price": 80000, + "price_postapoc": 1000, "name": { "str": "hydrogen canister" }, "symbol": "=", "color": "light_gray", @@ -458,6 +480,7 @@ "id": "gunpowder", "category": "chems", "price": 500, + "price_postapoc": 2000, "name": { "str": "mixed smokeless gunpowder" }, "symbol": "=", "color": "dark_gray", @@ -476,6 +499,7 @@ "id": "gunpowder_shotgun", "copy-from": "gunpowder", "price": 3000, + "price_postapoc": 2500, "name": { "str": "smokeless shotgun powder" }, "description": "Firearm-quality gunpowder, intended for use in shotgun shells." }, @@ -484,6 +508,7 @@ "id": "gunpowder_pistol", "copy-from": "gunpowder", "price": 3000, + "price_postapoc": 2500, "name": { "str": "smokeless pistol powder" }, "description": "Firearm-quality gunpowder, intended for use in pistol ammunition." }, @@ -492,6 +517,7 @@ "id": "gunpowder_magnum_pistol", "copy-from": "gunpowder", "price": 3000, + "price_postapoc": 2500, "name": { "str": "smokeless magnum powder" }, "description": "Firearm-quality gunpowder intended for use in magnum pistol ammunition." }, @@ -500,6 +526,7 @@ "id": "gunpowder_rifle", "copy-from": "gunpowder", "price": 3000, + "price_postapoc": 2500, "name": { "str": "smokeless rifle powder" }, "description": "Firearm-quality gunpowder intended for use in rifle ammunition." }, @@ -508,6 +535,7 @@ "id": "gunpowder_large_rifle", "copy-from": "gunpowder", "price": 3000, + "price_postapoc": 2500, "name": { "str": "smokeless overbore rifle powder" }, "description": "Firearm-quality gunpowder intended for use in large rifle ammunition." }, @@ -516,6 +544,7 @@ "id": "gunpowder_artillery", "copy-from": "gunpowder", "price": 3000, + "price_postapoc": 2500, "name": { "str": "artillery propellant" }, "description": "Single base smokeless gunpowder intended for use in artillery propelling charges." }, @@ -524,6 +553,7 @@ "id": "oxy_powder", "category": "chems", "price": 3000, + "price_postapoc": 1000, "name": { "str": "oxidizer powder" }, "symbol": "=", "color": "white", @@ -541,6 +571,7 @@ "id": "lye_powder", "category": "chems", "price": 3000, + "price_postapoc": 500, "name": { "str": "lye powder" }, "symbol": "=", "color": "white", @@ -557,6 +588,7 @@ "id": "shotgun_primer", "category": "spare_parts", "price": 3000, + "price_postapoc": 2000, "name": { "str": "shotgun primer" }, "symbol": "=", "color": "dark_gray", @@ -573,6 +605,7 @@ "id": "smpistol_primer", "category": "spare_parts", "price": 4000, + "price_postapoc": 1000, "name": { "str": "small pistol primer" }, "symbol": "=", "color": "dark_gray", @@ -589,6 +622,7 @@ "id": "lgpistol_primer", "category": "spare_parts", "price": 6000, + "price_postapoc": 2000, "name": { "str": "large pistol primer" }, "symbol": "=", "color": "dark_gray", @@ -605,6 +639,7 @@ "id": "smrifle_primer", "category": "spare_parts", "price": 6000, + "price_postapoc": 1000, "name": { "str": "small rifle primer" }, "symbol": "=", "color": "dark_gray", @@ -621,6 +656,7 @@ "id": "lgrifle_primer", "category": "spare_parts", "price": 8000, + "price_postapoc": 2000, "name": { "str": "large rifle primer" }, "symbol": "=", "color": "dark_gray", @@ -637,6 +673,7 @@ "id": "rubber_slug", "category": "spare_parts", "price": 1000, + "price_postapoc": 250, "name": { "str": "rubber slug" }, "symbol": "=", "color": "dark_gray", @@ -652,6 +689,7 @@ "id": "copper", "category": "spare_parts", "price": 1000, + "price_postapoc": 250, "name": { "str": "copper" }, "symbol": "=", "color": "yellow", @@ -667,6 +705,7 @@ "id": "medical_tape", "category": "spare_parts", "price": 2000, + "price_postapoc": 100, "name": { "str": "medical tape" }, "symbol": "=", "color": "white", @@ -694,6 +733,7 @@ "id": "charcoal", "category": "spare_parts", "price": 200, + "price_postapoc": 50, "name": { "str": "charcoal", "str_pl": "charcoal" }, "symbol": "=", "color": "dark_gray", @@ -712,6 +752,7 @@ "id": "cac2powder", "category": "spare_parts", "price": 200, + "price_postapoc": 500, "name": { "str": "calcium carbide premix", "str_pl": "calcium carbide premix" }, "symbol": "=", "color": "dark_gray", @@ -730,6 +771,7 @@ "id": "coal_lump", "category": "spare_parts", "price": 200, + "price_postapoc": 100, "name": { "str": "coal" }, "symbol": "=", "color": "dark_gray", @@ -748,6 +790,7 @@ "id": "ampoule", "category": "drugs", "price": 50000, + "price_postapoc": 5000, "name": { "str": "RA21E medical ampoule" }, "symbol": "=", "color": "cyan", @@ -764,6 +807,7 @@ "id": "stimpack_ammo", "category": "drugs", "price": 30000, + "price_postapoc": 5000, "name": { "str": "RA10K stimulant module" }, "symbol": "=", "color": "cyan", @@ -780,6 +824,7 @@ "id": "rebreather_filter", "category": "spare_parts", "price": 2500, + "price_postapoc": 3000, "name": { "str": "rebreather filter cartridge" }, "symbol": "=", "color": "light_gray", @@ -795,6 +840,7 @@ "id": "gasfilter_s", "category": "spare_parts", "price": 2500, + "price_postapoc": 500, "name": { "str": "filter mask cartridge" }, "symbol": "=", "color": "light_gray", @@ -809,6 +855,7 @@ "id": "gasfilter_m", "category": "spare_parts", "price": 2500, + "price_postapoc": 750, "name": { "str": "gas mask cartridge" }, "symbol": "=", "color": "light_gray", @@ -823,6 +870,7 @@ "id": "gasfilter_l", "category": "spare_parts", "price": 2500, + "price_postapoc": 1000, "name": { "str": "chemical mask cartridge" }, "symbol": "=", "color": "light_gray", @@ -837,6 +885,7 @@ "id": "nicotine_liquid", "category": "drugs", "price": 1000, + "price_postapoc": 500, "name": { "str": "nicotine liquid" }, "symbol": "=", "color": "yellow", @@ -867,6 +916,7 @@ "id": "oxygen", "category": "spare_parts", "price": 12000, + "price_postapoc": 1000, "//": "This seems like the larger medical tank, not an instant-use model with mask attached", "name": { "str": "oxygen", "str_pl": "oxygen" }, "symbol": "=", @@ -882,6 +932,7 @@ "type": "AMMO", "id": "spiked_rocket", "price": 1000, + "price_postapoc": 100, "name": { "str": "spiked homemade rocket" }, "symbol": ",", "color": "dark_gray", @@ -900,6 +951,7 @@ "type": "AMMO", "id": "explosive_hm_rocket", "price": 2000, + "price_postapoc": 100, "name": { "str": "explosive homemade rocket" }, "symbol": ",", "color": "dark_gray", @@ -918,6 +970,7 @@ "type": "AMMO", "id": "incendiary_hm_rocket", "price": 1300, + "price_postapoc": 100, "name": { "str": "incendiary homemade rocket" }, "symbol": ",", "color": "red", @@ -937,6 +990,7 @@ "id": "unfinished_charcoal", "category": "spare_parts", "price": 0, + "price_postapoc": 0, "name": { "str": "unfinished charcoal", "str_pl": "unfinished charcoal" }, "symbol": "=", "color": "brown", @@ -951,6 +1005,7 @@ "id": "unfinished_cac2", "category": "spare_parts", "price": 0, + "price_postapoc": 0, "name": { "str": "unfinished calcium carbide", "str_pl": "unfinished calcium carbide" }, "symbol": "=", "color": "white", @@ -965,6 +1020,7 @@ "id": "chain_link", "category": "spare_parts", "price": 150, + "price_postapoc": 50, "name": { "str": "chain link" }, "symbol": "=", "color": "light_gray", @@ -980,6 +1036,7 @@ "id": "nitrox", "category": "chems", "price": 500, + "price_postapoc": 250, "name": { "str": "nitrox", "str_pl": "nitrox" }, "symbol": "=", "color": "white", @@ -999,6 +1056,7 @@ "weight": "10 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "bashing": 1, "material": "wood", "flags": [ "NO_SALVAGE", "TINDER" ], @@ -1012,6 +1070,7 @@ "type": "AMMO", "id": "RPG_die", "price": 10, + "price_postapoc": 10, "name": { "str": "RPG die", "str_pl": "RPG dice" }, "symbol": "=", "color": "light_gray", @@ -1033,6 +1092,7 @@ "type": "AMMO", "id": "metal_RPG_die", "price": 50, + "price_postapoc": 10, "name": { "str": "metal RPG die", "str_pl": "metal RPG dice" }, "symbol": "=", "color": "light_gray", @@ -1059,6 +1119,7 @@ "weight": "218 g", "volume": "250 ml", "price": 1200, + "price_postapoc": 250, "to_hit": -2, "bashing": 1, "material": "bronze", diff --git a/data/json/items/battery.json b/data/json/items/battery.json index 09398f079036d..be4dd6251d8c9 100644 --- a/data/json/items/battery.json +++ b/data/json/items/battery.json @@ -8,6 +8,7 @@ "weight": "200 g", "volume": "250 ml", "price": 1500, + "price_postapoc": 0, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -24,6 +25,7 @@ "weight": "5 g", "volume": "1 ml", "price": 1500, + "price_postapoc": 50, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -41,6 +43,7 @@ "weight": "80 g", "volume": "1 ml", "price": 15000, + "price_postapoc": 200, "material": [ "iron", "plastic" ], "symbol": "=", "color": "green", @@ -59,6 +62,7 @@ "weight": "5 g", "volume": "1 ml", "price": 3000, + "price_postapoc": 100, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -77,6 +81,7 @@ "weight": "30 g", "volume": "25ml", "price": 3500, + "price_postapoc": 100, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -94,6 +99,7 @@ "weight": "45 g", "volume": "35ml", "price": 5000, + "price_postapoc": 150, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -111,6 +117,7 @@ "weight": "160 g", "volume": "35ml", "price": 50000, + "price_postapoc": 400, "material": [ "iron", "plastic" ], "symbol": "=", "color": "green", @@ -129,6 +136,7 @@ "weight": "45 g", "volume": "35ml", "price": 10000, + "price_postapoc": 200, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -147,6 +155,7 @@ "weight": "600 g", "volume": "450ml", "price": 10000, + "price_postapoc": 300, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -164,6 +173,7 @@ "weight": "725 g", "volume": "525ml", "price": 12500, + "price_postapoc": 400, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -181,6 +191,7 @@ "weight": "1000 g", "volume": "525ml", "price": 100000, + "price_postapoc": 1000, "material": [ "iron", "plastic" ], "symbol": "=", "color": "green", @@ -199,6 +210,7 @@ "weight": "725 g", "volume": "525ml", "price": 10000, + "price_postapoc": 500, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -217,6 +229,7 @@ "weight": "1000 g", "volume": "1225ml", "price": 10000, + "price_postapoc": 500, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -234,6 +247,7 @@ "weight": "1250 g", "volume": "1500ml", "price": 12500, + "price_postapoc": 600, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", @@ -251,6 +265,7 @@ "weight": "1600 g", "volume": "1500ml", "price": 100000, + "price_postapoc": 1500, "material": [ "iron", "plastic" ], "symbol": "=", "color": "green", @@ -269,6 +284,7 @@ "weight": "64000 g", "volume": "30 L", "price": 100000, + "price_postapoc": 5000, "material": [ "superalloy", "plastic" ], "symbol": "=", "color": "red", @@ -287,6 +303,7 @@ "weight": "1250 g", "volume": "1500ml", "price": 10000, + "price_postapoc": 750, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index eb30bf02e3703..91277cb9713cf 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -10,6 +10,7 @@ "material": [ "steel", "plastic" ], "symbol": ":", "color": "yellow", + "price_postapoc": 1000, "use_action": "install_bionic", "flags": [ "CBM" ], "is_upgrade": false, @@ -28,6 +29,7 @@ "type": "BIONIC_ITEM", "name": { "str": "abstract faulty bionic module" }, "price": 0, + "price_postapoc": 0, "weight": "500 g", "description": "This CBM is broken beyond repair, you can't do anything with it." }, diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json index 6aef4359d31cb..913669e472ec0 100644 --- a/data/json/items/biosignatures.json +++ b/data/json/items/biosignatures.json @@ -14,6 +14,7 @@ "calories": 26, "description": "Bird dropping, feathers, and soiled bits of rubbish.", "price": 0, + "price_postapoc": 0, "material": "feces", "volume": "250 ml", "charges": 4, diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 7bc2fb9e748d5..f46ef546f7c5c 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -8,6 +8,7 @@ "weight": "714 mg", "volume": "540 ml", "price": 8333, + "price_postapoc": 3000, "ammo_type": "anesthetic", "count": 540, "phase": "liquid", @@ -21,6 +22,7 @@ "id": "chem_sulphur", "category": "chems", "price": 50, + "price_postapoc": 250, "name": { "str": "sulfur", "str_pl": "sulfur" }, "symbol": "=", "color": "yellow", @@ -39,6 +41,7 @@ "id": "chunk_sulfur", "category": "spare_parts", "price": 50, + "price_postapoc": 100, "name": { "str": "chunk of sulfur", "str_pl": "chunks of sulfur" }, "symbol": "*", "color": "yellow", @@ -55,6 +58,7 @@ "id": "material_cement", "category": "spare_parts", "price": 200, + "price_postapoc": 10, "name": { "str": "cement", "str_pl": "cement" }, "symbol": "=", "color": "dark_gray", @@ -71,6 +75,7 @@ "id": "material_limestone", "category": "spare_parts", "price": 50, + "price_postapoc": 10, "name": { "str": "limestone", "str_pl": "limestone" }, "symbol": "=", "color": "dark_gray", @@ -87,6 +92,7 @@ "id": "material_quicklime", "category": "spare_parts", "price": 100, + "price_postapoc": 10, "name": { "str": "quicklime", "str_pl": "quicklime" }, "symbol": "=", "color": "dark_gray", @@ -103,6 +109,7 @@ "id": "material_sand", "category": "spare_parts", "price": 0, + "price_postapoc": 0, "name": { "str": "sand", "str_pl": "sand" }, "symbol": "=", "color": "dark_gray", @@ -119,6 +126,7 @@ "id": "material_soil", "category": "spare_parts", "price": 0, + "price_postapoc": 0, "name": { "str": "soil", "str_pl": "soil" }, "symbol": "=", "color": "brown", @@ -139,6 +147,7 @@ "category": "spare_parts", "description": "A small shard of limestone. Pretty flimsy and not much of a weapon, but its alkaline properties may yet find some use.", "price": 500, + "price_postapoc": 10, "material": "stone", "weight": "700 g", "volume": "1 L", @@ -147,10 +156,10 @@ }, { "type": "GENERIC", - "price_postapoc": 5000, "id": "material_rocksalt", "category": "food", "price": 50, + "price_postapoc": 100, "name": { "str": "rock salt", "str_pl": "rock salt" }, "symbol": "*", "color": "light_gray", @@ -165,6 +174,7 @@ "id": "material_rhodonite", "category": "spare_parts", "price": 250, + "price_postapoc": 100, "name": { "str": "rhodonite", "str_pl": "rhodonite" }, "symbol": "*", "color": "red", @@ -180,6 +190,7 @@ "id": "material_zincite", "category": "spare_parts", "price": 250, + "price_postapoc": 100, "name": { "str": "zincite", "str_pl": "zincite" }, "symbol": "*", "color": "red", @@ -204,6 +215,7 @@ "healthy": -20, "description": "This is sodium hypochlorite, a common household cleaning agent. It is highly unsafe to drink.", "price": 67, + "price_postapoc": 50, "//": "$0.67 per charge for a $10 15-charge gallon of bleach.", "volume": "250 ml", "phase": "liquid", @@ -226,6 +238,7 @@ "healthy": -20, "description": "This is ammonium hydroxide, a common household cleaning agent. It is highly unsafe to drink.", "price": 67, + "price_postapoc": 50, "volume": "250 ml", "phase": "liquid", "charges": 2, @@ -249,6 +262,7 @@ "calories": 260, "description": "A nutrient rich elixir for plants.", "price": 1000, + "price_postapoc": 100, "volume": "250 ml", "phase": "liquid", "charges": 4, @@ -272,6 +286,7 @@ "description": "Nutrient rich granules for plants.", "price": 1000, "//": "This comes out as one charge in the bag, and the price is accurate-KA101.", + "price_postapoc": 1000, "material": "powder", "volume": "2 L", "charges": 60, @@ -294,7 +309,7 @@ "healthy": -7, "description": "Agricultural grade chemical anti-fungal powder designed to destroy infections in plants.", "price": 1100, - "price_postapoc": 5000, + "price_postapoc": 1000, "material": "powder", "volume": "125ml", "charges": 400, @@ -319,7 +334,7 @@ "healthy": -7, "description": "Agricultural-grade chemical insecticide powder designed to eradicate insect pests.", "price": 1100, - "price_postapoc": 5000, + "price_postapoc": 1000, "material": "powder", "volume": "125ml", "charges": 400, @@ -339,6 +354,7 @@ "healthy": -1, "description": "Water with salt added. Not good for drinking.", "price": 0, + "price_postapoc": 0, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -358,6 +374,7 @@ "healthy": -1, "description": "Water with soap added. Not good for drinking.", "price": 0, + "price_postapoc": 0, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -379,6 +396,7 @@ "healthy": -2, "description": "Water collected during an acid rainstorm. Don't drink it. Boiling it concentrates the acid.", "price": 0, + "price_postapoc": 0, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -399,6 +417,7 @@ "healthy": -1, "description": "A mixture of rain and acid rain. Don't drink it. Boiling it concentrates the acid.", "price": 0, + "price_postapoc": 0, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -419,6 +438,7 @@ "healthy": -4, "description": "Concentrated acid. Don't drink it.", "price": 2000, + "price_postapoc": 50, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -440,6 +460,7 @@ "healthy": -20, "description": "A sample of sewage from a treatment plant. Gross.", "price": 0, + "price_postapoc": 0, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -450,6 +471,7 @@ "id": "chem_aluminium_powder", "category": "chems", "price": 500, + "price_postapoc": 500, "name": { "str": "aluminum powder", "str_pl": "aluminum powder" }, "symbol": "=", "color": "white", @@ -468,6 +490,7 @@ "id": "chem_zinc_powder", "category": "chems", "price": 600, + "price_postapoc": 250, "name": { "str": "zinc powder", "str_pl": "zinc powder" }, "symbol": "=", "color": "white", @@ -486,6 +509,7 @@ "id": "chem_zinc", "category": "chems", "price": 200, + "price_postapoc": 250, "name": { "str": "zinc oxide", "str_pl": "zinc oxide" }, "symbol": "=", "color": "white", @@ -504,6 +528,7 @@ "id": "chem_manganese_dioxide", "category": "chems", "price": 600, + "price_postapoc": 100, "name": { "str": "manganese dioxide", "str_pl": "manganese dioxide" }, "symbol": "=", "color": "white", @@ -522,6 +547,7 @@ "id": "chem_potassium_chloride", "category": "chems", "price": 600, + "price_postapoc": 100, "name": { "str": "potassium chloride", "str_pl": "potassium chloride" }, "symbol": "=", "color": "white", @@ -540,6 +566,7 @@ "id": "chem_potassium_hydroxide", "category": "chems", "price": 600, + "price_postapoc": 100, "name": { "str": "potassium hydroxide", "str_pl": "potassium hydroxide" }, "symbol": "=", "color": "white", @@ -558,6 +585,7 @@ "id": "chem_sulphuric_acid", "category": "chems", "price": 250, + "price_postapoc": 100, "name": { "str": "sulfuric acid", "str_pl": "sulfuric acid" }, "symbol": "=", "color": "white", @@ -577,6 +605,7 @@ "id": "chem_muriatic_acid", "category": "chems", "price": 250, + "price_postapoc": 100, "name": { "str": "hydrochloric acid", "str_pl": "hydrochloric acid" }, "symbol": "=", "color": "white", @@ -596,6 +625,7 @@ "id": "chem_acetone", "category": "chems", "price": 50, + "price_postapoc": 100, "name": { "str": "acetone", "str_pl": "acetone" }, "symbol": "=", "color": "white", @@ -612,6 +642,7 @@ "id": "chem_nitric_acid", "category": "chems", "price": 300, + "price_postapoc": 100, "name": { "str": "nitric acid", "str_pl": "nitric acid" }, "symbol": "=", "color": "white", @@ -631,6 +662,7 @@ "id": "chem_chromium_oxide", "category": "chems", "price": 500, + "price_postapoc": 100, "name": { "str": "chromium oxide", "str_pl": "chromium oxide" }, "symbol": "=", "color": "green", @@ -649,6 +681,7 @@ "id": "chem_carbide", "category": "chems", "price": 75, + "price_postapoc": 100, "name": { "str": "calcium carbide", "str_pl": "calcium carbide" }, "symbol": "=", "color": "white", @@ -667,6 +700,7 @@ "id": "chem_hexamine", "category": "chems", "price": 900, + "price_postapoc": 100, "name": { "str": "hexamine", "str_pl": "hexamine" }, "symbol": "=", "color": "red", @@ -684,6 +718,7 @@ "id": "chem_hydrogen_peroxide_conc", "category": "chems", "price": 1000, + "price_postapoc": 100, "name": { "str": "hydrogen peroxide (concentrated)", "str_pl": "hydrogen peroxide (concentrated)" }, "symbol": "~", "color": "white", @@ -700,6 +735,7 @@ "id": "chem_ammonium_nitrate", "category": "chems", "price": 100, + "price_postapoc": 500, "name": { "str": "ammonium nitrate", "str_pl": "ammonium nitrate" }, "symbol": "=", "color": "white", @@ -718,6 +754,7 @@ "looks_like": "fertilizer_commercial", "category": "chems", "price": 100, + "price_postapoc": 500, "name": { "str": "ammonium nitrate pellets", "str_pl": "ammonium nitrate pellets" }, "symbol": "=", "color": "white", @@ -735,6 +772,7 @@ "id": "chem_saltpetre", "category": "chems", "price": 200, + "price_postapoc": 500, "name": { "str": "saltpeter", "str_pl": "saltpeter" }, "symbol": "=", "color": "white", @@ -752,6 +790,7 @@ "id": "material_niter", "category": "spare_parts", "price": 75, + "price_postapoc": 100, "name": { "str": "niter", "str_pl": "niter" }, "symbol": "*", "color": "white", @@ -767,6 +806,7 @@ "id": "chem_aluminium_sulphate", "category": "chems", "price": 300, + "price_postapoc": 100, "name": { "str": "aluminum sulfate", "str_pl": "aluminum sulfate" }, "symbol": "=", "color": "white", @@ -784,6 +824,7 @@ "id": "chem_acetic_acid", "category": "chems", "price": 200, + "price_postapoc": 100, "name": { "str": "acetic acid", "str_pl": "acetic acid" }, "symbol": "~", "color": "white", @@ -800,6 +841,7 @@ "id": "chem_formaldehyde", "category": "chems", "price": 200, + "price_postapoc": 100, "name": { "str": "formaldehyde", "str_pl": "formaldehyde" }, "symbol": "~", "color": "white", @@ -816,6 +858,7 @@ "id": "chem_thermite", "category": "chems", "price": 2500, + "price_postapoc": 500, "name": { "str": "thermite", "str_pl": "thermite" }, "symbol": "=", "color": "white", @@ -834,6 +877,7 @@ "id": "chem_anfo", "category": "chems", "price": 5000, + "price_postapoc": 1000, "name": { "str": "ANFO", "str_pl": "ANFO" }, "symbol": "=", "color": "red", @@ -851,6 +895,7 @@ "id": "chem_black_powder", "category": "chems", "price": 2000, + "price_postapoc": 1000, "name": { "str": "black gunpowder", "str_pl": "black gunpowder" }, "symbol": "=", "color": "dark_gray", @@ -868,6 +913,7 @@ "id": "chem_match_head_powder", "category": "chems", "price": 50, + "price_postapoc": 10, "name": { "str": "match head powder", "str_pl": "match head powder" }, "symbol": "=", "color": "light_red", @@ -885,6 +931,7 @@ "id": "chem_rdx", "category": "chems", "price": 7500, + "price_postapoc": 2500, "name": { "str": "RDX", "str_pl": "RDX" }, "symbol": "=", "color": "white", @@ -902,6 +949,7 @@ "id": "chem_compositionb", "category": "chems", "price": 7500, + "price_postapoc": 2000, "name": "composition b", "name_plural": "composition b", "symbol": "=", @@ -920,6 +968,7 @@ "id": "chem_hmtd", "category": "chems", "price": 5000, + "price_postapoc": 1000, "name": { "str": "HMTD", "str_pl": "HMTD" }, "symbol": "=", "color": "white", @@ -938,6 +987,7 @@ "id": "chem_rocket_fuel", "category": "chems", "price": 500, + "price_postapoc": 500, "name": { "str": "improvised rocket fuel", "str_pl": "improvised rocket fuel" }, "symbol": "=", "color": "white", @@ -977,6 +1027,7 @@ "name": { "str": "hickory root" }, "description": "A root from a hickory tree. It has an earthy smell.", "price": 0, + "price_postapoc": 0, "material": "wood", "weight": "500 g", "volume": "500 ml", @@ -992,6 +1043,7 @@ "description": "A handful of hard nuts from a hickory tree, still in their shell.", "//spoils_in": "180 days", "price": 0, + "price_postapoc": 0, "weight": "212 g", "volume": "250 ml", "to_hit": -2 @@ -1006,6 +1058,7 @@ "description": "A handful of hard nuts from a pecan tree, still in their shell.", "//spoils_in": "180 days", "price": 0, + "price_postapoc": 0, "weight": "212 g", "volume": "250 ml", "to_hit": -2 @@ -1020,6 +1073,7 @@ "description": "A handful of hard nuts from a pistachio tree, still in their shell.", "//spoils_in": "90 days", "price": 0, + "price_postapoc": 0, "weight": "180 g", "volume": "250 ml", "to_hit": -2 @@ -1034,6 +1088,7 @@ "description": "A handful of hard nuts from an almond tree, still in their shell.", "//spoils_in": "300 days", "price": 0, + "price_postapoc": 0, "weight": "212 g", "volume": "250 ml", "to_hit": -2 @@ -1048,6 +1103,7 @@ "description": "A handful of hard nuts from a peanut bush, still in their shell.", "//spoils_in": "240 days", "price": 0, + "price_postapoc": 0, "weight": "200 g", "volume": "250 ml", "to_hit": -2 @@ -1062,6 +1118,7 @@ "description": "A handful of hard nuts from a hazelnut tree, still in their shell.", "//spoils_in": "150 days", "price": 0, + "price_postapoc": 0, "weight": "212 g", "volume": "250 ml", "to_hit": -2 @@ -1076,6 +1133,7 @@ "description": "A handful of hard nuts from a chestnut tree, still in their shell.", "//spoils_in": "180 days", "price": 0, + "price_postapoc": 0, "weight": "240 g", "volume": "250 ml", "to_hit": -2 @@ -1090,6 +1148,7 @@ "description": "A handful of hard nuts from a walnut tree, still in their shell.", "//spoils_in": "180 days", "price": 0, + "price_postapoc": 0, "weight": "240 g", "volume": "250 ml", "to_hit": -2 @@ -1116,6 +1175,7 @@ "id": "detergent", "category": "chems", "price": 1000, + "price_postapoc": 200, "name": { "str": "detergent", "str_pl": "detergent" }, "symbol": "=", "color": "white", @@ -1133,6 +1193,7 @@ "id": "soap_flakes", "category": "chems", "price": 500, + "price_postapoc": 10, "name": { "str": "soap flakes", "str_pl": "soap flakes" }, "looks_like": "detergent", "symbol": "=", @@ -1156,6 +1217,7 @@ "healthy": -20, "description": "This is a liquid form of sodium hydroxide. It is highly corrosive, handle with care.", "price": 100, + "price_postapoc": 100, "volume": "250 ml", "phase": "liquid", "category": "chems", @@ -1166,7 +1228,7 @@ "id": "nanomaterial", "category": "chems", "price": 250000, - "price_postapoc": 1500, + "price_postapoc": 500, "name": { "str": "nanomaterial canister" }, "symbol": "=", "color": "light_gray", @@ -1183,6 +1245,7 @@ "id": "ash", "category": "chems", "price": 0, + "price_postapoc": 0, "name": { "str": "wood ash", "str_pl": "wood ashes" }, "symbol": "=", "looks_like": "f_ash", @@ -1199,6 +1262,7 @@ "id": "ether", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "ether", "str_pl": "ether" }, "symbol": "!", "quench": -96, @@ -1215,6 +1279,7 @@ "id": "chem_DMSO", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "dimethyl sulfoxide", "str_pl": "dimethyl sulfoxide" }, "symbol": "~", "quench": -96, @@ -1231,6 +1296,7 @@ "id": "chem_chloroform", "category": "chems", "price": 20, + "price_postapoc": 5, "name": { "str": "chloroform", "str_pl": "chloroform" }, "symbol": "~", "color": "light_cyan", @@ -1247,6 +1313,7 @@ "id": "chem_phenol", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "phenol", "str_pl": "phenol" }, "symbol": "~", "quench": -96, @@ -1263,6 +1330,7 @@ "id": "chem_glycerol", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "glycerol", "str_pl": "glycerol" }, "symbol": "~", "quench": -15, @@ -1278,6 +1346,7 @@ "id": "chem_peptone_broth", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "peptone broth powder", "str_pl": "peptone broth powder" }, "symbol": ";", "quench": -15, @@ -1297,6 +1366,7 @@ "id": "chem_agar", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "agar", "str_pl": "agar" }, "symbol": ";", "quench": -15, @@ -1316,6 +1386,7 @@ "id": "chem_acrylamide", "category": "chems", "price": 10, + "price_postapoc": 5, "name": { "str": "acrylamide", "str_pl": "acrylamide" }, "symbol": ";", "quench": -15, @@ -1340,6 +1411,7 @@ "weight": "600 g", "volume": "250 ml", "price": 500, + "price_postapoc": 10, "to_hit": 1, "bashing": 2, "material": "steel", @@ -1353,6 +1425,7 @@ "type": "GENERIC", "category": "other", "price": 1000, + "price_postapoc": 50, "name": { "str": "cobalt-60 pellet" }, "symbol": "=", "color": "green", @@ -1371,6 +1444,7 @@ "weight": "1 g", "volume": "250 ml", "price": 1, + "price_postapoc": 10, "material": "wood", "symbol": ".", "color": "brown", @@ -1387,6 +1461,7 @@ "weight": "24415 g", "volume": "16L", "price": 0, + "price_postapoc": 10, "material": [ "cotton", "powder" ], "symbol": ")", "color": "brown", @@ -1401,6 +1476,7 @@ "weight": "19500 g", "volume": "16L", "price": 0, + "price_postapoc": 10, "material": [ "cotton", "powder" ], "symbol": ")", "color": "brown", @@ -1416,6 +1492,7 @@ "volume": "10 ml", "count": 10, "price": 0, + "price_postapoc": 10, "material": "wood", "symbol": "=", "color": "yellow", @@ -1430,6 +1507,7 @@ "weight": "40 g", "volume": "250 ml", "price": 1200, + "price_postapoc": 250, "material": [ "hydrocarbons" ], "symbol": "=", "color": "red", diff --git a/data/json/items/containers.json b/data/json/items/containers.json index d9b5b2029ed4c..f193cfadb76a3 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -8,6 +8,7 @@ "weight": "155 g", "volume": "2500 ml", "price": 1000, + "price_postapoc": 50, "to_hit": -1, "bashing": 1, "material": "plastic", @@ -28,6 +29,7 @@ "weight": "6800 g", "volume": "112500 ml", "price": 5000, + "price_postapoc": 250, "to_hit": -5, "bashing": 8, "material": "plastic", @@ -47,6 +49,7 @@ "weight": "12000 g", "volume": "100 L", "price": 8000, + "price_postapoc": 250, "to_hit": -5, "bashing": 8, "material": "steel", @@ -66,6 +69,7 @@ "weight": "20000 g", "volume": "200 L", "price": 10000, + "price_postapoc": 250, "to_hit": -5, "bashing": 8, "material": "steel", @@ -85,6 +89,7 @@ "weight": "415 g", "volume": "1 L", "price": 0, + "price_postapoc": 10, "to_hit": -5, "rigid": false, "material": "cotton", @@ -102,6 +107,7 @@ "weight": "5 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "to_hit": -5, "rigid": false, "material": "cotton", @@ -119,6 +125,7 @@ "weight": "5 g", "volume": "10 ml", "price": 0, + "price_postapoc": 0, "to_hit": -1, "rigid": false, "material": "plastic", @@ -137,6 +144,7 @@ "weight": "2 g", "volume": "10 ml", "price": 0, + "price_postapoc": 10, "rigid": false, "material": "plastic", "symbol": ")", @@ -155,6 +163,7 @@ "weight": "500 g", "volume": "1 L", "price": 0, + "price_postapoc": 10, "to_hit": -5, "rigid": false, "material": "plastic", @@ -173,6 +182,7 @@ "weight": "10 g", "volume": "50 ml", "price": 0, + "price_postapoc": 10, "to_hit": -1, "rigid": false, "material": "plastic", @@ -192,6 +202,7 @@ "weight": "200 g", "volume": "750 ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "bashing": 2, "material": "glass", @@ -211,6 +222,7 @@ "weight": "13 g", "volume": "500 ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -228,6 +240,7 @@ "weight": "19 g", "volume": "500 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -246,6 +259,7 @@ "weight": "19 g", "volume": "500 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -264,6 +278,7 @@ "weight": "7 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -281,7 +296,7 @@ "weight": "13 g", "volume": "2 L", "price": 25, - "price_postapoc": 500, + "price_postapoc": 10, "material": "plastic", "symbol": ")", "color": "cyan", @@ -298,6 +313,7 @@ "weight": "60 g", "volume": "250 ml", "price": 100, + "price_postapoc": 10, "to_hit": -1, "material": "clay", "symbol": ")", @@ -316,6 +332,7 @@ "weight": "15 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "material": "paper", "symbol": ")", "color": "white", @@ -330,6 +347,7 @@ "weight": "151 g", "volume": "1 L", "price": 0, + "price_postapoc": 0, "material": "cardboard", "symbol": ")", "color": "brown", @@ -345,6 +363,7 @@ "volume": "2 L", "//": "Volume is much lower than the actual volume of a box this size because presumably if it's in your pack, it isn't empty and full of air; and if it's in your hands, it's irrelevant what the volume is.", "price": 0, + "price_postapoc": 0, "material": "cardboard", "symbol": ")", "color": "brown", @@ -360,6 +379,7 @@ "volume": "3 L", "//": "Volume is much lower than the actual volume of a box this size because presumably if it's in your pack, it isn't empty and full of air; and if it's in your hands, it's irrelevant what the volume is.", "price": 0, + "price_postapoc": 10, "material": "cardboard", "symbol": ")", "color": "brown", @@ -375,6 +395,7 @@ "weight": "725 g", "volume": "5 L", "price": 300, + "price_postapoc": 10, "material": "steel", "symbol": ")", "color": "light_gray", @@ -391,6 +412,7 @@ "weight": "286 g", "volume": "2500 ml", "price": 10000, + "price_postapoc": 250, "to_hit": -1, "bashing": 1, "material": [ "cotton", "plastic" ], @@ -411,6 +433,7 @@ "weight": "13 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 2, "material": "aluminum", @@ -442,6 +465,7 @@ "weight": "28 g", "volume": "2 L", "price": 0, + "price_postapoc": 0, "to_hit": 1, "material": [ "plastic", "aluminum", "paper" ], "symbol": ")", @@ -475,6 +499,7 @@ "volume": "10 ml", "contains": "500 ml", "price": 0, + "price_postapoc": 0, "material": "plastic", "symbol": "%", "color": "red", @@ -493,6 +518,7 @@ "weight": "40 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "material": "steel", "symbol": ")", "color": "blue", @@ -546,6 +572,7 @@ "weight": "155 g", "volume": "1500 ml", "price": 800, + "price_postapoc": 50, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -564,6 +591,7 @@ "description": "A Thermos brand vacuum flask. Built for temperature retention, helps keep things hot or cold. Contains 1L of liquid.", "weight": "530 g", "price": 1595, + "price_postapoc": 100, "volume": "1250 ml", "contains": "1 L", "material": "steel", @@ -582,6 +610,7 @@ "weight": "268 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 10, "to_hit": 1, "material": "clay", "symbol": "*", @@ -600,6 +629,7 @@ "weight": "1955 g", "volume": "15 L", "price": 2000, + "price_postapoc": 50, "to_hit": -1, "bashing": 1, "material": "clay", @@ -619,6 +649,7 @@ "weight": "4887 g", "volume": "37500 ml", "price": 10000, + "price_postapoc": 10, "to_hit": -2, "material": "clay", "symbol": ")", @@ -637,6 +668,7 @@ "weight": "6 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -665,6 +697,7 @@ "weight": "48 g", "volume": "250 ml", "price": 400, + "price_postapoc": 10, "to_hit": 1, "bashing": 3, "material": "glass", @@ -684,6 +717,7 @@ "weight": "36 g", "volume": "10ml", "price": 300, + "price_postapoc": 10, "to_hit": -1, "bashing": 1, "material": "glass", @@ -703,6 +737,7 @@ "weight": "150 g", "volume": "250ml", "price": 500, + "price_postapoc": 10, "to_hit": -1, "material": "glass", "symbol": ")", @@ -721,6 +756,7 @@ "weight": "150 g", "volume": "100ml", "price": 500, + "price_postapoc": 10, "to_hit": -1, "material": "glass", "symbol": "|", @@ -739,6 +775,7 @@ "weight": "1 g", "volume": "1ml", "price": 10, + "price_postapoc": 5, "to_hit": -1, "material": "plastic", "symbol": "v", @@ -757,6 +794,7 @@ "weight": "120 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 10, "to_hit": 1, "bashing": 3, "material": "iron", @@ -778,6 +816,7 @@ "weight": "365 g", "volume": "3 L", "price": 0, + "price_postapoc": 10, "to_hit": -1, "bashing": 5, "material": "glass", @@ -840,6 +879,7 @@ "weight": "1587 g", "volume": "10L", "price": 1250, + "price_postapoc": 50, "to_hit": -2, "material": "plastic", "symbol": ")", @@ -857,6 +897,7 @@ "weight": "4815 g", "volume": "20L", "price": 5000, + "price_postapoc": 100, "to_hit": -3, "bashing": 4, "material": "steel", @@ -876,6 +917,7 @@ "weight": "400 g", "volume": "1 L", "price": 100, + "price_postapoc": 10, "bashing": 1, "material": "clay", "symbol": ")", @@ -894,6 +936,7 @@ "weight": "190 g", "volume": "3750 ml", "price": 0, + "price_postapoc": 10, "to_hit": 1, "material": "plastic", "symbol": ")", @@ -911,6 +954,7 @@ "weight": "5040 g", "volume": "50 L", "price": 10000, + "price_postapoc": 250, "to_hit": -5, "bashing": 10, "material": "aluminum", @@ -930,6 +974,7 @@ "weight": "12600 g", "volume": "50 L", "price": 8000, + "price_postapoc": 250, "to_hit": -5, "bashing": 10, "material": "steel", @@ -949,6 +994,7 @@ "weight": "783 g", "volume": "500 ml", "price": 4000, + "price_postapoc": 10, "to_hit": -1, "bashing": 1, "rigid": false, @@ -968,6 +1014,7 @@ "weight": "5668 g", "volume": "60L", "price": 10000, + "price_postapoc": 250, "to_hit": -4, "bashing": 6, "material": [ "steel" ], @@ -987,6 +1034,7 @@ "weight": "800 g", "volume": "2L", "price": 1000, + "price_postapoc": 50, "to_hit": -4, "bashing": 5, "material": "steel", @@ -1006,6 +1054,7 @@ "weight": "232 g", "volume": "1750 ml", "price": 800, + "price_postapoc": 10, "to_hit": 1, "material": "wood", "symbol": ")", @@ -1025,6 +1074,7 @@ "weight": "453 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 10, "to_hit": -1, "bashing": 1, "rigid": false, @@ -1044,6 +1094,7 @@ "weight": "453 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 50, "to_hit": -1, "bashing": 1, "rigid": false, @@ -1065,6 +1116,7 @@ "weight": "783 g", "volume": "500 ml", "price": 4000, + "price_postapoc": 50, "to_hit": -1, "bashing": 2, "rigid": false, @@ -1086,6 +1138,7 @@ "weight": "990 g", "volume": "750 ml", "price": 6000, + "price_postapoc": 100, "to_hit": -1, "bashing": 3, "rigid": false, @@ -1107,6 +1160,7 @@ "weight": "42408 g", "volume": "100 L", "price": 12000, + "price_postapoc": 250, "to_hit": -5, "bashing": 8, "material": [ "wood", "steel" ], @@ -1126,6 +1180,7 @@ "weight": "3 g", "volume": "5 ml", "price": 0, + "price_postapoc": 0, "to_hit": -2, "rigid": false, "material": "paper", @@ -1143,6 +1198,7 @@ "weight": "50 g", "volume": "500 ml", "price": 0, + "price_postapoc": 0, "material": "plastic", "symbol": ")", "color": "white", @@ -1159,7 +1215,7 @@ "weight": "1360 g", "volume": "4500 ml", "price": 10, - "price_postapoc": 100, + "price_postapoc": 10, "material": "plastic", "symbol": ")", "color": "white", @@ -1176,6 +1232,7 @@ "weight": "5 g", "volume": "15 ml", "price": 0, + "price_postapoc": 25, "to_hit": -5, "rigid": false, "material": "plastic", @@ -1204,6 +1261,7 @@ "weight": "350 g", "volume": "3L", "price": 0, + "price_postapoc": 0, "material": "steel", "symbol": ")", "color": "blue", @@ -1233,6 +1291,7 @@ "weight": "200 g", "volume": "1 L", "price": 0, + "price_postapoc": 0, "material": "aluminum", "symbol": "!", "color": "light_cyan", diff --git a/data/json/items/electronics.json b/data/json/items/electronics.json index dd20f99ecba3c..76a2fff3f9131 100644 --- a/data/json/items/electronics.json +++ b/data/json/items/electronics.json @@ -8,6 +8,7 @@ "weight": "954 g", "volume": "4 L", "price": 4000, + "price_postapoc": 10, "looks_like": "motor_small", "material": "steel", "symbol": ":", @@ -22,9 +23,10 @@ "weight": "3589 g", "volume": "10455 ml", "price": 10000, + "price_postapoc": 500, "explode_in_fire": true, "explosion": { "power": 600, "shrapnel": { "casing_mass": 3214, "fragment_mass": 0.5 } }, - "//": "uncraftable right now, needs fiberglass before it can be crafted", + "//": "uncraftable due to complexity of the physics involved", "looks_like": "cu_pipe", "material": "copper", "symbol": "|", diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json index 965511956f17c..1b9438f0d8334 100644 --- a/data/json/items/fluff.json +++ b/data/json/items/fluff.json @@ -8,6 +8,7 @@ "weight": "40 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 10, "material": [ "plastic" ], "symbol": "o", "color": "white", @@ -22,6 +23,7 @@ "weight": "50 g", "volume": "100 ml", "price": 2000, + "price_postapoc": 10, "material": [ "cardboard" ], "symbol": ",", "color": "red", @@ -37,6 +39,7 @@ "weight": "6 g", "volume": "1 ml", "price": 25, + "price_postapoc": 1, "material": [ "silver" ], "symbol": "o", "color": "light_gray", @@ -52,6 +55,7 @@ "weight": "1 g", "volume": "5 ml", "price": 800, + "price_postapoc": 0, "material": [ "paper" ], "symbol": "*", "color": "light_gray" diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json index 2314a22178d2d..4e79a2626a9f5 100644 --- a/data/json/items/fuel.json +++ b/data/json/items/fuel.json @@ -77,7 +77,7 @@ "weight": "1 g", "volume": "200ml", "price": 50, - "price_postapoc": 2000, + "price_postapoc": 1000, "looks_like": "diesel", "count": 250, "stack_size": 200, @@ -106,7 +106,7 @@ "weight": "1 g", "volume": "200ml", "price": 50, - "price_postapoc": 2000, + "price_postapoc": 1000, "count": 250, "stack_size": 200, "phase": "liquid", @@ -228,6 +228,7 @@ "weight": "1 g", "volume": "200ml", "price": 8000, + "price_postapoc": 1000, "count": 250, "stack_size": 200, "phase": "liquid", @@ -247,6 +248,7 @@ "copy-from": "gasoline", "description": "A flammable gel composed of gasoline and dissolved shavings of polystyrene, roughly similar in properties to napalm b. It's meant to be used with a flamethrower.", "price": 400, + "price_postapoc": 500, "ammo_type": "flammable", "damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 10 }, "range": 3 @@ -258,6 +260,7 @@ "copy-from": "gasoline", "description": "A mixture of gasoline and diesel oil in equal parts. Its combustion properties make it unfit for applications where you would use any of them separately, but it can be used to feed a flamethrower.", "price": 400, + "price_postapoc": 500, "ammo_type": "flammable", "range": 0 } diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 2054cef50ea03..f636d66767352 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -150,6 +150,7 @@ "name": { "str": "foodplace loyalty card" }, "description": "A bright pink loyalty card, all the points are stamped. This would definitely prove your fidelity to Foodplace, if it still meant anything…", "price": 0, + "price_postapoc": 0, "material": "paper", "flags": [ "TRADER_AVOID" ], "weight": "3 g", @@ -176,6 +177,7 @@ "name": { "str": "fur pelt" }, "description": "A small bolt of fur from an animal. Can be made into warm clothing.", "price": 1000, + "price_postapoc": 10, "material": [ "fur", "leather" ], "flags": [ "NO_SALVAGE" ], "weight": "114 g", @@ -188,6 +190,7 @@ "copy-from": "fur", "color": "pink", "name": { "str": "faux fur pelt" }, + "price_postapoc": 10, "description": "A small bolt of garishly colored faux fur. Can be made into clothing.", "flags": [ "NO_SALVAGE" ], "material": [ "faux_fur" ] @@ -200,6 +203,7 @@ "name": { "str": "leather patch", "str_pl": "leather patches" }, "description": "A smallish patch of leather, could be used to make tough clothing.", "price": 2000, + "price_postapoc": 10, "material": [ "leather", "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": "100 g", @@ -215,6 +219,7 @@ "name": { "str": "felt patch", "str_pl": "felt patches" }, "description": "A smallish patch of felt, could be disassembled for wool fiber.", "price": 2000, + "price_postapoc": 10, "material": [ "wool" ], "flags": [ "NO_SALVAGE" ], "weight": "100 g", @@ -231,7 +236,7 @@ "name": { "str": "Nomex patch", "str_pl": "Nomex patches" }, "description": "A small bolt of Nomex fire-resistant fabric.", "price": 4000, - "price_postapoc": 200, + "price_postapoc": 20, "material": [ "nomex" ], "flags": [ "NO_SALVAGE" ], "weight": "42 g", @@ -246,6 +251,7 @@ "name": { "str": "superglue", "str_pl": "superglue" }, "description": "A tube of strong glue. Used in many crafting recipes.", "price": 1800, + "price_postapoc": 100, "material": "plastic", "weight": "45 g", "volume": "250 ml", @@ -261,6 +267,7 @@ "name": { "str": "bone glue" }, "description": "Glue made from boiling animal bones. The adhesive isn't strong enough for heavy-duty usages, but it can be used as a varnish or holding together small items.", "price": 1800, + "price_postapoc": 50, "material": "bone", "weight": "45 g", "volume": "250 ml", @@ -289,7 +296,8 @@ "techniques": [ "WRAP" ], "volume": "1 L", "bashing": 12, - "price": 8000 + "price": 8000, + "price_postapoc": 50 }, { "type": "GENERIC", @@ -300,6 +308,7 @@ "name": { "str": "chunk of chitin", "str_pl": "chunks of chitin" }, "description": "A piece of an insect's exoskeleton. It is light and very durable.", "price": 0, + "price_postapoc": 25, "material": "chitin", "flags": [ "NO_SALVAGE" ], "weight": "89 g", @@ -316,6 +325,7 @@ "name": { "str": "set of 100 ceramic disk", "str_pl": "ceramic disks" }, "description": "A set of small slightly elongated disks, made of high-grade ceramic. They remind you of scales.", "price": 0, + "price_postapoc": 25, "material": "lightceramic", "weight": "100 g", "volume": "250 ml", @@ -342,6 +352,7 @@ "weight": "800 g", "volume": "750 ml", "price": 0, + "price_postapoc": 5, "material": "cotton", "symbol": ",", "color": "white" @@ -355,6 +366,7 @@ "weight": "1000 g", "volume": "1 L", "price": 20000, + "price_postapoc": 50, "material": "leather", "symbol": ",", "color": "brown" @@ -368,6 +380,7 @@ "weight": "1000 g", "volume": "1 L", "price": 20000, + "price_postapoc": 50, "material": "wool", "symbol": ",", "color": "white" @@ -381,6 +394,7 @@ "name": { "str": "t-substrate sample" }, "description": "An acrylic cube cast around a small black crystal. It's tepid to the touch.", "price": 0, + "price_postapoc": 0, "material": "stone", "weight": "100 g", "volume": "250 ml", @@ -395,6 +409,7 @@ "name": { "str": "biollante bud" }, "description": "An unopened biollante flower, brilliant purple in color. It may still have its sap-producing organ intact.", "price": 0, + "price_postapoc": 0, "material": "veggy", "weight": "60 g", "volume": "250 ml", @@ -456,7 +471,7 @@ "name": { "str": "USB drive" }, "description": "A USB thumb drive. Useful for holding software.", "price": 10000, - "price_postapoc": 100, + "price_postapoc": 10, "material": "plastic", "weight": "18 g", "volume": "5 ml", @@ -470,7 +485,7 @@ "name": { "str": "data card" }, "description": "Some type of advanced data storage device. Useful for storing very large amounts of information.", "price": 10000, - "price_postapoc": 100, + "price_postapoc": 50, "material": "plastic", "weight": "18 g", "volume": "1 ml", @@ -485,7 +500,7 @@ "description": "A gold candlestick.", "category": "other", "price": 10000, - "price_postapoc": 100, + "price_postapoc": 10, "material": "gold", "weight": "1500 g", "volume": "250 ml", @@ -500,7 +515,7 @@ "description": "A large, relatively sharp blade. Could be used to make bladed weaponry, or attached to a car.", "category": "spare_parts", "price": 28000, - "price_postapoc": 1000, + "price_postapoc": 50, "material": "steel", "weight": "553 g", "volume": "750 ml", @@ -518,7 +533,7 @@ "description": "A large, curved blade. Could be used to assemble a scythe, or make an improvised polearm.", "category": "spare_parts", "price": 28000, - "price_postapoc": 1000, + "price_postapoc": 50, "material": "steel", "weight": "1000 g", "volume": "1500 ml", @@ -536,7 +551,7 @@ "description": "An 8\" circular sawblade. You could make a saw with it, or throw it. Wielding it without sturdy gloves is a bad idea.", "category": "spare_parts", "price": 20000, - "price_postapoc": 1000, + "price_postapoc": 50, "material": "steel", "weight": "349 g", "volume": "250 ml", @@ -553,6 +568,7 @@ "description": "A hollow metal cylinder which is inserted in a tree crust in order to slowly harvest its sap. Can be used on a maple tree in between late winter and early spring to harvest maple sap.", "category": "tools", "price": 5, + "price_postapoc": 10, "material": "steel", "weight": "11 g", "volume": "50 ml" @@ -566,7 +582,7 @@ "description": "A length of thin, relatively stiff, steel wire. Like the sort you find in wire fences.", "category": "spare_parts", "price": 20000, - "price_postapoc": 300, + "price_postapoc": 100, "material": "steel", "weight": "151 g", "volume": "500 ml", @@ -580,7 +596,7 @@ "name": { "str": "barbed wire" }, "description": "A length of stiff wire, covered in sharp barbs.", "price": 20000, - "price_postapoc": 500, + "price_postapoc": 200, "material": "steel", "weight": "302 g", "volume": "500 ml", @@ -597,6 +613,7 @@ "weight": "318 g", "volume": "500 ml", "price": 700, + "price_postapoc": 100, "bashing": 2, "material": "steel" }, @@ -609,7 +626,7 @@ "description": "A length of rebar, makes a nice melee weapon, and could be handy in constructing tougher walls and such.", "category": "spare_parts", "price": 7500, - "price_postapoc": 1000, + "price_postapoc": 25, "material": "steel", "weight": "908 g", "volume": "1500 ml", @@ -626,7 +643,7 @@ "description": "A length of track, made from some planks and rails.", "category": "spare_parts", "price": 7500, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "wood", "steel" ], "weight": "40 kg", "volume": "30000 ml" @@ -641,7 +658,7 @@ "category": "spare_parts", "container": "bag_canvas", "price": 10000, - "price_postapoc": 100, + "price_postapoc": 25, "material": "powder_nonflam", "weight": "2340 g", "volume": "1 L", @@ -714,7 +731,7 @@ "description": "A motorized pushmower that seems to be broken. You could take it apart if you had a wrench.", "category": "other", "price": 10000, - "price_postapoc": 500, + "price_postapoc": 50, "material": [ "steel", "iron" ], "weight": "22680 g", "volume": "6250 ml", @@ -729,6 +746,7 @@ "name": { "str": "damaged tent" }, "description": "A small tent, just big enough to fit a person comfortably. This tent is broken and cannot be deployed.", "price": 6500, + "price_postapoc": 100, "material": [ "plastic", "aluminum" ], "weight": "1133 g", "volume": "2500 ml", @@ -744,6 +762,7 @@ "name": { "str": "large damaged tent" }, "description": "A family sized tent, very bulky but with plenty of space. This tent is broken and can not be deployed.", "price": 10000, + "price_postapoc": 150, "material": [ "plastic", "aluminum" ], "weight": "2266 g", "volume": "10 L", @@ -760,7 +779,7 @@ "category": "spare_parts", "description": "A heating element, like the ones used in hotplates or kettles.", "price": 1000, - "price_postapoc": 100, + "price_postapoc": 10, "material": "iron", "weight": "226 g", "volume": "250 ml" @@ -774,7 +793,7 @@ "category": "spare_parts", "description": "A simple thermostat controlled by thermal expansion of a bimetal strip.", "price": 1000, - "price_postapoc": 100, + "price_postapoc": 10, "material": "iron", "weight": "226 g", "volume": "250 ml" @@ -787,6 +806,7 @@ "name": { "str": "television" }, "description": "A large LCD television, full of delicious electronics.", "price": 0, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "15000 g", "volume": "20 L", @@ -802,7 +822,7 @@ "category": "spare_parts", "description": "A pilot light from a gas-burning device, this particular one is a simple piezoelectric igniter.", "price": 1000, - "price_postapoc": 50, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "5 g", "volume": "5 ml" @@ -816,7 +836,7 @@ "category": "spare_parts", "description": "A complex mechanical fuze. It seems it can be used to detonate stable explosives after a short time by triggering it.", "price": 1000, - "price_postapoc": 250, + "price_postapoc": 100, "material": [ "steel", "plastic" ], "weight": "5 g", "volume": 0 @@ -830,7 +850,7 @@ "category": "spare_parts", "description": "A complex mechanical fuze. It seems it can be used to detonate stable explosives upon a solid impact.", "price": 1000, - "price_postapoc": 250, + "price_postapoc": 100, "material": [ "steel", "plastic" ], "weight": "5 g", "volume": 0 @@ -843,6 +863,7 @@ "name": { "str": "toaster" }, "description": "A small two slice toaster, not much use as anything but spare parts", "price": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "725 g", "volume": "750 ml" @@ -855,6 +876,7 @@ "name": { "str": "microwave" }, "description": "A home microwave, has probably seen its share of baked beans. Good for scrap parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "11339 g", "volume": "9 L" @@ -868,6 +890,7 @@ "category": "other", "description": "A broken laptop, basically a paperweight now.", "price": 1000, + "price_postapoc": 10, "material": [ "plastic", "aluminum" ], "weight": "2721 g", "volume": "750 ml", @@ -882,6 +905,7 @@ "category": "other", "description": "A broken eyebot. Much less threatening now that it won't be calling for backup. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "31520 g", "volume": "15 L", @@ -899,6 +923,7 @@ "category": "other", "description": "A broken skitterbot. Much less threatening now that it lies limp on solid ground. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "62650 g", "volume": "30 L", @@ -916,6 +941,7 @@ "category": "other", "description": "A broken lab defense bot, with its casing broken and fluid drained. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "100000 g", "volume": "65000 ml", @@ -933,7 +959,7 @@ "category": "other", "description": "A broken police bot. Much less threatening now that it's quiet and still. Could be gutted for parts.", "price": 30000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "140000 g", "volume": "62500 ml", @@ -951,7 +977,7 @@ "category": "other", "description": "A broken nurse bot. Its smooth face staring vacantly into empty space. Could be gutted for parts.", "price": 30000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "140000 g", "volume": "62500 ml", @@ -969,7 +995,7 @@ "category": "other", "description": "A broken grocery bot. Its smiling face staring vacantly into empty space. Could be gutted for parts.", "price": 30000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "140000 g", "volume": "62500 ml", @@ -987,7 +1013,7 @@ "category": "other", "description": "The body of a busted grocery bot. Its tarnished face is still smiling. Could be gutted for parts.", "price": 30000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "140000 g", "volume": "62500 ml", @@ -1011,7 +1037,7 @@ "category": "other", "description": "A broken riot control bot. Much less threatening now that it's out of gas. Could be gutted for parts.", "price": 30000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "140000 g", "volume": "62500 ml", @@ -1029,7 +1055,7 @@ "category": "other", "description": "A broken prototype robot, well more broken than before. Could be gutted for parts.", "price": 30000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "140000 g", "volume": "62500 ml", @@ -1047,7 +1073,7 @@ "category": "other", "description": "A broken miner bot. Much less threatening now that it's no longer capable of drilling anything. Could be gutted for parts.", "price": 20000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "170200 g", "volume": "62500 ml", @@ -1064,6 +1090,7 @@ "weight": "700388 g", "volume": "125 L", "price": 1000, + "price_postapoc": 10, "to_hit": -3, "bashing": 7, "material": [ "superalloy" ], @@ -1079,6 +1106,7 @@ "weight": "1280388 g", "volume": "250 L", "price": 1000, + "price_postapoc": 10, "to_hit": -3, "bashing": 8, "material": [ "superalloy" ], @@ -1094,6 +1122,7 @@ "weight": "1480388 g", "volume": "250 L", "price": 1000, + "price_postapoc": 10, "to_hit": -3, "bashing": 8, "material": [ "superalloy" ], @@ -1110,6 +1139,7 @@ "category": "other", "description": "A broken riot dispatch, with its mesh midsection filled with fried manhacks and its motor limp and still. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "100000 g", "volume": "85000 ml", @@ -1127,6 +1157,7 @@ "category": "other", "description": "A broken military dispatch. Though the scratched, disarmed manhacks visible in its belly are disarmed, their destructive potential still inspires a spark of fear, even now. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "100000 g", "volume": "85000 ml", @@ -1144,6 +1175,7 @@ "category": "other", "description": "A broken manhack. Much less threatening now that it lies limp on solid ground. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "5400 g", "volume": "750 ml", @@ -1161,7 +1193,7 @@ "category": "other", "description": "A broken grenade hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.", "price": 9000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "4480 g", "volume": "750 ml", @@ -1179,7 +1211,7 @@ "category": "other", "description": "A broken magenta hack. Just looking at the wreck makes you shiver. Could be gutted for parts.", "price": 18000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "25000 g", "volume": "18750 ml", @@ -1197,7 +1229,7 @@ "category": "other", "description": "A broken tear gas hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.", "price": 9000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "5360 g", "volume": "750 ml", @@ -1215,7 +1247,7 @@ "category": "other", "description": "A broken EMP hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.", "price": 9000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "4700 g", "volume": "750 ml", @@ -1233,7 +1265,7 @@ "category": "other", "description": "A broken flashbang hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.", "price": 9000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "4536 g", "volume": "750 ml", @@ -1251,7 +1283,7 @@ "category": "other", "description": "A broken C-4 hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.", "price": 9000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "5870 g", "volume": "750 ml", @@ -1269,6 +1301,7 @@ "category": "spare_parts", "description": "A central processor unit, useful in advanced electronics crafting.", "price": 12000, + "price_postapoc": 10, "material": [ "plastic" ], "weight": "56 g", "volume": "250 ml", @@ -1283,6 +1316,7 @@ "category": "spare_parts", "description": "A stick of memory. Useful in advanced electronics crafting.", "price": 9000, + "price_postapoc": 10, "material": [ "plastic" ], "weight": "30 g", "//": "A stick of DDR4 SRAM is 133.35 x 31.25 x 4.2mm, or 17.5ml. We round up a touch.", @@ -1298,6 +1332,7 @@ "category": "spare_parts", "description": "A power supply unit. Useful in lots of electronics recipes.", "price": 17000, + "price_postapoc": 25, "material": [ "aluminum", "plastic" ], "weight": "113 g", "volume": "1 L", @@ -1313,6 +1348,7 @@ "category": "spare_parts", "description": "A circuit designed to amplify the strength of a signal. Useful in lots of electronics recipes.", "price": 20000, + "price_postapoc": 10, "material": [ "plastic" ], "weight": "114 g", "volume": "250 ml", @@ -1327,6 +1363,7 @@ "category": "spare_parts", "description": "A circuit designed to repeat a signal. Useful for crafting communications equipment.", "price": 14000, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "480 g", "volume": "250 ml", @@ -1341,6 +1378,7 @@ "category": "spare_parts", "description": "A module designed to receive many forms of signals. Useful for crafting communications equipment.", "price": 13500, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "114 g", "volume": "250 ml", @@ -1355,6 +1393,7 @@ "category": "spare_parts", "description": "A large backlit screen, used for displaying images. Useful in some electronics recipes.", "price": 10000, + "price_postapoc": 10, "material": "plastic", "weight": "13000 g", "volume": "15000 ml", @@ -1369,6 +1408,7 @@ "category": "spare_parts", "description": "A small backlit screen, used for displaying images. Useful in some electronics recipes.", "price": 24000, + "price_postapoc": 10, "material": "plastic", "weight": "500 g", "volume": "250 ml", @@ -1383,6 +1423,7 @@ "category": "spare_parts", "description": "A high-quality lens, useful for focusing or diffusing light. Might be useful for starting a fire.", "price": 120000, + "price_postapoc": 100, "material": "glass", "weight": "30 g", "volume": "1 ml", @@ -1399,6 +1440,7 @@ "category": "spare_parts", "description": "A small high-quality lens, useful for focusing or diffusing light. Might be useful for crafting.", "price": 6000, + "price_postapoc": 50, "material": "glass", "weight": "15 g", "volume": "1 ml" @@ -1412,6 +1454,7 @@ "category": "spare_parts", "description": "A pair of small darkened glass, like the one that sunglasses are made of.", "price": 1000, + "price_postapoc": 10, "material": "glass", "weight": "30 g", "volume": "2 ml", @@ -1426,6 +1469,7 @@ "category": "spare_parts", "description": "Once a valuable bionic implant, it has not held up well under repeated use. This object has been destroyed by excessive electric current and is now useless.", "price": 13500, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "317 g", "volume": "2500 ml", @@ -1441,7 +1485,7 @@ "category": "spare_parts", "description": "A state-of-the-art optical storage system. This small slate of transparent glass holds, inscribed as a miniature pattern, the instructions required to create an item through a nanofabricator.", "price": 150000, - "price_postapoc": 15000, + "price_postapoc": 1000, "material": [ "steel", "plastic" ], "weight": "317 g", "volume": "250 ml", @@ -1456,8 +1500,8 @@ "name": { "str": "nanofabricator template (silicon photonics)", "str_pl": "nanofabricator templates (silicon photonics)" }, "description": "A state-of-the-art optical storage system, containing the instruction set required for the fabrication of complex silicon photonic circuitry. The data within was once clearly worth millions, but now, you are not sure if it's anything more than a fancy, high-tech paperweight.", "price": 200000000, + "price_postapoc": 3000, "//": "actually worth millions", - "price_postapoc": 350, "flags": [ "TRADER_AVOID" ] }, { @@ -1469,6 +1513,7 @@ "category": "spare_parts", "description": "A simple thin aluminum shaft. Useful in lots of electronics recipes.", "price": 8000, + "price_postapoc": 10, "material": "aluminum", "weight": "68 g", "volume": "250 ml", @@ -1483,6 +1528,7 @@ "category": "spare_parts", "description": "A very small electric motor like those used in RC cars. Useful in lots of electronics recipes.", "price": 1000, + "price_postapoc": 25, "material": [ "steel", "plastic" ], "weight": "125 g", "volume": "25 ml" @@ -1496,6 +1542,7 @@ "category": "spare_parts", "description": "A printed card that supports and electrically connects electronic components on a non-conductive substrate.", "price": 5000, + "price_postapoc": 10, "material": "plastic", "weight": "26 g", "volume": "15 ml", @@ -1510,6 +1557,7 @@ "category": "spare_parts", "description": "A random collection of resistors, capacitors, and diodes which have been stripped from printed circuits.", "price": 3000, + "price_postapoc": 10, "material": "aluminum", "weight": "14 g", "volume": "5 ml", @@ -1524,6 +1572,7 @@ "category": "spare_parts", "description": "A system designed to convert a radio station into an autonomous repeater.", "price": 25000, + "price_postapoc": 50, "material": [ "aluminum", "plastic" ], "weight": "21000 g", "volume": "2 L", @@ -1538,7 +1587,7 @@ "name": { "str": "desk fan" }, "description": "A small fan, used to propel air around a room.", "price": 1000, - "price_postapoc": 100, + "price_postapoc": 10, "material": [ "aluminum", "plastic" ], "weight": "2857 g", "volume": "1 L" @@ -1552,7 +1601,7 @@ "name": { "str": "ceramic armor plate" }, "description": "A ceramic armor plate, specifically engineered for use in a bullet resistant vest.", "price": 8000, - "price_postapoc": 1000, + "price_postapoc": 100, "material": "ceramic", "weight": "362 g", "volume": "500 ml", @@ -1566,6 +1615,7 @@ "name": { "str": "fishbowl" }, "description": "A filled fishbowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The fish appears to have tiny antlers.", "price": 100, + "price_postapoc": 10, "material": "glass", "weight": "7042 g", "volume": "1 L", @@ -1591,6 +1641,7 @@ "weight": "50 g", "volume": "250 ml", "price": 500, + "price_postapoc": 50, "material": [ "steel", "cotton" ], "symbol": ";", "color": "light_gray" @@ -1603,7 +1654,7 @@ "name": { "str": "clock" }, "description": "A small mechanical clock, it's stopped at 10:10.", "price": 1000, - "price_postapoc": 0, + "price_postapoc": 10, "material": [ "plastic", "steel" ], "weight": "725 g", "volume": "250 ml", @@ -1619,7 +1670,7 @@ "name": { "str": "clockworks", "str_pl": "clockworks" }, "description": "A small assortment of gears and other clockwork gubbins.", "price": 200, - "price_postapoc": 0, + "price_postapoc": 10, "material": "steel", "weight": "50 g", "volume": "250 ml" @@ -1632,7 +1683,7 @@ "name": { "str": "SD-Memory card" }, "description": "A memory card, used. Might be worth a look.", "price": 1000, - "price_postapoc": 0, + "price_postapoc": 10, "material": "plastic", "flags": [ "MC_MOBILE", "MC_RANDOM_STUFF", "MC_MAY_BE_ENCRYPTED", "MC_TURN_USED" ], "weight": "5 g", @@ -1646,7 +1697,7 @@ "name": { "str": "SD-Memory card (clean)", "str_pl": "SD-Memory cards (clean)" }, "description": "This memory card is either unused or has been wiped clean. You could use it to store your data, though!", "price": 500, - "price_postapoc": 0, + "price_postapoc": 10, "material": "plastic", "flags": [ "MC_MOBILE", "MC_USED" ], "weight": "5 g", @@ -1660,7 +1711,7 @@ "name": { "str": "SD-Memory card (encrypted)", "str_pl": "SD-Memory cards (encrypted)" }, "description": "This memory card appears to have the firmware encryption set. Hopefully it contains something worth encrypting.", "price": 2000, - "price_postapoc": 0, + "price_postapoc": 10, "material": "plastic", "flags": [ "MC_MOBILE", "MC_ENCRYPTED", "MC_TURN_USED" ], "weight": "5 g", @@ -1674,7 +1725,7 @@ "name": { "str": "Science SD-Memory card", "str_pl": "Science SD-Memory cards" }, "description": "This memory card appears to be related to 'XEDRA', and is certainly encrypted. Looks *Interesting*, though…", "price": 10000, - "price_postapoc": 0, + "price_postapoc": 100, "material": "plastic", "flags": [ "MC_MOBILE", "MC_ENCRYPTED", "MC_TURN_USED", "MC_SCIENCE_STUFF" ], "weight": "5 g", @@ -1688,6 +1739,7 @@ "name": { "str": "hand mirror" }, "description": "A small hand mirror.", "price": 15000, + "price_postapoc": 10, "material": "glass", "weight": "300 g", "volume": "750 ml", @@ -1703,6 +1755,7 @@ "description": "A heavy iron disc that typically covers a ladder into the sewers. Lifting it from the manhole is impossible without a crowbar.", "category": "other", "price": 20000, + "price_postapoc": 10, "material": "iron", "flags": [ "DURABLE_MELEE", "TRADER_AVOID" ], "weight": "36287 g", @@ -1747,7 +1800,8 @@ "symbol": ",", "material": [ "veggy" ], "volume": "5 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "type": "GENERIC", @@ -1760,7 +1814,8 @@ "symbol": ",", "material": [ "veggy" ], "volume": "1500 ml", - "price": 0 + "price": 0, + "price_postapoc": 10 }, { "type": "GENERIC", @@ -1772,7 +1827,8 @@ "symbol": ",", "material": [ "veggy" ], "volume": "250 ml", - "price": 0 + "price": 0, + "price_postapoc": 0 }, { "type": "GENERIC", @@ -1783,6 +1839,7 @@ "category": "spare_parts", "description": "A fresh piece of clay. Useful for some crafting recipes.", "price": 531, + "price_postapoc": 10, "material": "freshclay", "weight": "530 g", "volume": "250 ml", @@ -1797,6 +1854,7 @@ "category": "spare_parts", "description": "A fire hardened building block used in masonry construction.", "price": 2500, + "price_postapoc": 10, "material": [ "clay", "stone" ], "weight": "969 g", "volume": "500 ml", @@ -1814,6 +1872,7 @@ "category": "spare_parts", "container": "bag_canvas", "price": 5000, + "price_postapoc": 25, "material": "powder_nonflam", "weight": "2340 g", "volume": "1 L", @@ -1828,6 +1887,7 @@ "name": { "str": "soft adobe brick" }, "description": "A compacted mass of soil and natural fibers, still too wet to build with. Load it onto a pallet and leave it to dry.", "price": 0, + "price_postapoc": 0, "material": "soil", "weight": "1750 g", "volume": "750 ml", @@ -1859,6 +1919,7 @@ "bashing": 10, "to_hit": -2, "price": 2000, + "price_postapoc": 10, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -1871,6 +1932,7 @@ "category": "spare_parts", "container": "bag_canvas", "price": 200, + "price_postapoc": 10, "material": "soil", "weight": "2340 g", "volume": "1 L", @@ -1884,6 +1946,7 @@ "name": { "str": "tanbark", "str_pl": "tanbark" }, "description": "A sheet of tannin-rich bark from a tree, useful for tanning leather", "price": 0, + "price_postapoc": 0, "material": "wood", "weight": "323 g", "volume": "250 ml", @@ -1898,6 +1961,7 @@ "name": { "str": "birchbark" }, "description": "A sheet of tough, water-resistant bark taken from a birch tree.", "price": 0, + "price_postapoc": 0, "material": "wood", "weight": "323 g", "volume": "250 ml", @@ -1912,6 +1976,7 @@ "name": { "str": "willowbark", "str_pl": "willowbark" }, "description": "A sheet of bark taken from a willow tree. Used in the production of aspirin.", "price": 0, + "price_postapoc": 10, "material": "wood", "weight": "323 g", "volume": "250 ml", @@ -1926,7 +1991,7 @@ "name": { "str": "diamond" }, "description": "A sparkling diamond.", "price": 1000000, - "price_postapoc": 100, + "price_postapoc": 50, "material": "diamond", "weight": "200 mg", "volume": "6 ml", @@ -1940,7 +2005,7 @@ "name": { "str": "garnet" }, "description": "A sparkling garnet.", "price": 800000, - "price_postapoc": 80, + "price_postapoc": 30, "material": "gemstone", "weight": "200 mg", "volume": "6 ml", @@ -2050,6 +2115,7 @@ "name": { "str": "cured hide", "str_pl": "cured hides" }, "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable leather.", "price": 200, + "price_postapoc": 0, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": "100 g", @@ -2065,6 +2131,7 @@ "name": { "str": "tanned hide" }, "description": "A folded sheet of leather made from carefully tanned animal hide. Can be cut up or used as is.", "price": 5000, + "price_postapoc": 500, "material": [ "leather" ], "weight": "600 g", "volume": "1500 ml", @@ -2079,6 +2146,7 @@ "name": { "str": "cured pelt" }, "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable fur.", "price": 200, + "price_postapoc": 0, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": "114 g", @@ -2094,6 +2162,7 @@ "name": { "str": "tanned pelt" }, "description": "A folded sheet of leather made from carefully tanned animal hide, with the fur still intact. Can be cut up or used as is.", "price": 5000, + "price_postapoc": 500, "material": [ "fur" ], "weight": "684 g", "volume": "1500 ml", @@ -2122,6 +2191,7 @@ "name": { "str": "straw doll" }, "description": "Old straw doll. Represents a woman in a dress.", "price": 100, + "price_postapoc": 0, "material": [ "paper" ], "weight": "80 g", "volume": "500 ml" @@ -2134,6 +2204,7 @@ "name": { "str": "pillow" }, "description": "A pillow to rest your head on when sleeping.", "price": 1000, + "price_postapoc": 10, "material": [ "cotton" ], "weight": "514 g", "volume": "1 L", @@ -2148,6 +2219,7 @@ "name": { "str": "body pillow" }, "description": "A big, body-sized pillow with a print of an anime character on the front and their scantily clad version on the back.", "price": 1500, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "774 g", "volume": "1750 ml", @@ -2162,6 +2234,7 @@ "name": { "str": "down-filled pillow" }, "description": "A fluffy pillow to rest your head on when sleeping.", "price": 1000, + "price_postapoc": 10, "material": [ "cotton" ], "weight": "514 g", "volume": "1 L", @@ -2176,6 +2249,7 @@ "name": { "str": "teddy bear" }, "description": "An old and half rotten teddy bear. Looks like this one commemorates the grave of the child who once owned it.", "price": 200, + "price_postapoc": 0, "material": [ "cotton" ], "weight": "514 g", "volume": "750 ml", @@ -2189,6 +2263,7 @@ "name": { "str": "teddy bear" }, "description": "A mass-produced plush teddy bear. It is wearing a little red tshirt but no pants.", "price": 200, + "price_postapoc": 10, "material": [ "cotton" ], "weight": "444 g", "volume": "850 ml", @@ -2217,6 +2292,7 @@ "weight": "2 g", "volume": "1 ml", "price": 5, + "price_postapoc": 100, "use_action": "PACK_CBM", "to_hit": -1, "material": [ "plastic", "paper" ], @@ -2328,6 +2404,7 @@ "name": { "str": "cannabis plant" }, "description": "A psychoactive plant indigenous to Central Asia and the Indian subcontinent traditionally cultivated for its fiber, oil, for medicinal purposes, and for use as a recreational drug. It requires further processing to be useful.", "price": 2000, + "price_postapoc": 50, "material": "veggy", "weight": "420 g", "volume": "1 L" @@ -2341,6 +2418,7 @@ "description": "Various parts of tobacco plant, full of nicotine. They need to be dried to become smokable.", "looks_like": "wild_herbs", "price": 300, + "price_postapoc": 50, "material": "veggy", "weight": "100 g", "volume": "250 ml" @@ -2353,7 +2431,7 @@ "name": { "str": "cash card" }, "description": "A yellow plastic card used to store money. These became popular once the government officially moved to all electronic money. It holds up to 2 million dollars.", "price": 1000, - "price_postapoc": 1, + "price_postapoc": 0, "material": "plastic", "flags": [ "NO_UNLOAD", "NO_RELOAD" ], "weight": "6 g", @@ -2411,6 +2489,7 @@ "description": "This small transparent card was attached to the prototype robot's CPU. It might contain the data the intercom spoke of.", "category": "other", "price": 500, + "price_postapoc": 0, "material": "plastic", "weight": "6 g", "volume": "5 ml", @@ -2425,6 +2504,7 @@ "description": "This card gives you a little discount on the purchase of gasoline.", "category": "other", "price": 500, + "price_postapoc": 0, "material": "plastic", "flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_1" ], "weight": "6 g", @@ -2440,6 +2520,7 @@ "description": "This card gives you a good discount on the purchase of gasoline.", "category": "other", "price": 500, + "price_postapoc": 0, "material": "plastic", "flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_2" ], "weight": "6 g", @@ -2455,6 +2536,7 @@ "description": "This card gives you a splendid discount on the purchase of gasoline.", "category": "other", "price": 500, + "price_postapoc": 0, "material": "plastic", "flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_3" ], "weight": "6 g", @@ -2469,7 +2551,7 @@ "name": { "str": "science ID card" }, "description": "This ID card once belonged to a scientist. The reverse side describes protocol for using it; this could grant access at one control panel, if you can find one.", "price": 60000, - "price_postapoc": 5000, + "price_postapoc": 250, "material": "plastic", "weight": "6 g", "volume": "15 ml", @@ -2483,7 +2565,7 @@ "name": { "str": "military ID card" }, "description": "This ID card once belonged to a military officer. The reverse side describes protocol for using it; this could grant access at one control panel, if you can find one.", "price": 120000, - "price_postapoc": 10000, + "price_postapoc": 500, "material": "plastic", "weight": "6 g", "volume": "5 ml", @@ -2498,7 +2580,7 @@ "name": { "str": "industrial ID card" }, "description": "This ID card once belonged to a high level technician. The reverse side describes protocol for using it; this could grant access at one control panel, if you can find one.", "price": 120000, - "price_postapoc": 10000, + "price_postapoc": 100, "material": "plastic", "weight": "6 g", "volume": "5 ml", @@ -2512,6 +2594,7 @@ "name": { "str": "neoprene patch", "str_pl": "neoprene patches" }, "description": "A moderately sized sheet of neoprene. Can be used to craft light and stretchable clothing.", "price": 1000, + "price_postapoc": 100, "material": "neoprene", "flags": [ "NO_SALVAGE" ], "weight": "80 g", @@ -2526,6 +2609,7 @@ "name": { "str": "TX-5LR Laser Cannon" }, "description": "A laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret. Unusable as a weapon on its own without the necessary parts.", "price": 5000000, + "price_postapoc": 1000, "material": [ "steel", "plastic" ], "weight": "5000 g", "volume": "750 ml", @@ -2541,7 +2625,8 @@ "material": "glass", "weight": "10 g", "volume": "250 ml", - "price": 500 + "price": 500, + "price_postapoc": 10 }, { "id": "shrapnel", @@ -2551,6 +2636,7 @@ "weight": "5 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "stack_size": 50, "material": [ "steel" ], "symbol": ".", @@ -2566,6 +2652,7 @@ "weight": "480 g", "volume": "2500 ml", "price": 600, + "price_postapoc": 10, "bashing": 1, "material": "clay", "symbol": ")", @@ -2580,6 +2667,7 @@ "weight": "190 g", "volume": "2500 ml", "price": 300, + "price_postapoc": 10, "bashing": 1, "material": "plastic", "symbol": ")", @@ -2594,6 +2682,7 @@ "weight": "365 g", "volume": "3 L", "price": 100, + "price_postapoc": 0, "to_hit": -1, "bashing": 5, "material": "glass", @@ -2610,6 +2699,7 @@ "weight": "20000 g", "volume": "2 L", "price": 1000, + "price_postapoc": 10, "material": "steel", "symbol": "#", "color": "black" @@ -2623,6 +2713,7 @@ "weight": "20000 g", "volume": "2 L", "price": 1000, + "price_postapoc": 10, "material": "steel", "symbol": "#", "color": "black" @@ -2635,6 +2726,7 @@ "weight": "410 g", "volume": "1L", "price": 3000, + "price_postapoc": 50, "to_hit": -4, "bashing": 5, "material": "steel", @@ -2650,6 +2742,7 @@ "name": { "str": "hard steel plate" }, "description": "An armor plating made of a very thick steel, specifically engineered for use in a bullet resistant vest.", "price": 10000, + "price_postapoc": 100, "material": "hardsteel", "weight": "1500 g", "volume": "500 ml", @@ -2664,6 +2757,7 @@ "name": { "str": "steel plate" }, "description": "A steel armor plate, specifically engineered for use in a bullet resistant vest.", "price": 9000, + "price_postapoc": 50, "material": "steel", "weight": "1000 g", "volume": "500 ml", @@ -2678,6 +2772,7 @@ "name": { "str": "small lock and key", "str_pl": "small locks and keys" }, "description": "A small lock, with a set of keys still inserted.", "price": 500, + "price_postapoc": 10, "material": "steel", "weight": "5 g", "volume": "250 ml", @@ -2691,6 +2786,7 @@ "name": { "str": "in progress craft" }, "description": "This is an in progress craft.", "price": 0, + "price_postapoc": 0, "weight": "1 g", "volume": "250 ml", "use_action": "CRAFT", @@ -2705,6 +2801,7 @@ "name": { "str": "spare tire carrier" }, "description": "A bumper mounted rig for attaching and storing a spare tire on the back of a vehicle. Combine it with a wheel to get a mountable piece.", "price": 3500, + "price_postapoc": 250, "material": "steel", "weight": "5000 g", "volume": "5 L", @@ -2720,6 +2817,7 @@ "name": { "str": "welding component kit" }, "description": "A set of components useful for constructing a full-featured welding station, complete with soldering capability.", "price": 9000, + "price_postapoc": 2500, "weight": "4500 g", "volume": "3 L", "bashing": 8 @@ -2732,7 +2830,7 @@ "name": { "str": "amplifier head" }, "description": "An amplifier head. Typically paired with a speaker cabinet for amplifying musical instruments. Basically only good for spare parts now.", "price": 25000, - "price_postapoc": 2000, + "price_postapoc": 100, "material": [ "steel", "plastic", "wood" ], "weight": "11339 g", "volume": "3 L" @@ -2746,6 +2844,7 @@ "category": "other", "description": "A broken turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "72650 g", "volume": "30 L", @@ -2808,6 +2907,7 @@ "category": "other", "description": "A broken secubot, with its casing broken and fluid drained. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "100 kg", "volume": "65 L", @@ -2825,6 +2925,7 @@ "category": "other", "description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts.", "price": 1000, + "price_postapoc": 10, "material": [ "steel", "plastic" ], "weight": "100 kg", "volume": "65 L", @@ -2842,6 +2943,7 @@ "category": "spare_parts", "description": "A reinforced brick designed to withstand intense heat.", "price": 2500, + "price_postapoc": 10, "material": [ "clay", "stone" ], "weight": "969 g", "volume": "500 ml", @@ -2858,6 +2960,7 @@ "weight": "1612 g", "volume": "1 L", "price": 5000, + "price_postapoc": 250, "material": "aluminum", "symbol": "!", "color": "green", @@ -2873,6 +2976,7 @@ "weight": "5 g", "volume": "10 ml", "price": 100, + "price_postapoc": 1, "material": "plastic", "symbol": ".", "color": "white", diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json index 99a0dbfd75f3f..26aa4ed024a19 100644 --- a/data/json/items/handloaded_bullets.json +++ b/data/json/items/handloaded_bullets.json @@ -3,6 +3,7 @@ "type": "AMMO", "id": "blun_slug", "price": 4500, + "price_postapoc": 50, "name": { "str": "blunderbuss slug" }, "symbol": "=", "color": "red", @@ -22,6 +23,7 @@ "type": "AMMO", "id": "blun_shot", "price": 4500, + "price_postapoc": 50, "name": { "str": "blunderbuss shot" }, "symbol": "=", "color": "red", @@ -40,6 +42,7 @@ "type": "AMMO", "id": "blun_flechette", "price": 4500, + "price_postapoc": 50, "name": { "str": "blunderbuss flechette" }, "symbol": "=", "color": "red", diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json index a3f0ccba60cbd..6a268c116ba9a 100644 --- a/data/json/items/items_holiday.json +++ b/data/json/items/items_holiday.json @@ -7,6 +7,7 @@ "weight": "113 g", "volume": "3964 ml", "price": 100, + "price_postapoc": 0, "to_hit": -2, "material": "plastic", "symbol": "0", @@ -32,6 +33,7 @@ "weight": "113 g", "volume": "3964 ml", "price": 0, + "price_postapoc": 0, "to_hit": -2, "material": "plastic", "symbol": "0", @@ -57,6 +59,7 @@ "weight": "1814 g", "volume": "4 L", "price": 100, + "price_postapoc": 0, "to_hit": -2, "material": "wood", "symbol": "0", diff --git a/data/json/items/newspaper.json b/data/json/items/newspaper.json index 1ba8edc934e96..3ed1bf1cfd1d0 100644 --- a/data/json/items/newspaper.json +++ b/data/json/items/newspaper.json @@ -9,6 +9,7 @@ "snippet_category": "flier", "description": "A scrap of paper.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "5 ml" @@ -23,6 +24,7 @@ "snippet_category": "note", "description": "A scrap of paper. Something's written on it, scrawled in bad handwriting.", "price": 0, + "price_postapoc": 0, "material": "paper", "flags": [ "TRADER_AVOID" ], "weight": "3 g", @@ -39,6 +41,7 @@ "description": "A Dungeons & Dragons character sheet.", "looks_like": "survnote", "price": 0, + "price_postapoc": 0, "material": "paper", "flags": [ "TRADER_AVOID" ], "weight": "3 g", @@ -54,6 +57,7 @@ "snippet_category": "scores", "description": "A colorfully printed score card.", "price": 0, + "price_postapoc": 0, "material": "paper", "flags": [ "TRADER_AVOID" ], "weight": "3 g", @@ -69,6 +73,7 @@ "snippet_category": "newest_news", "description": "A single sheet of newspaper broadsheet. It is possibly one of the last issues printed before New England was overwhelmed. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "1 ml" @@ -83,6 +88,7 @@ "snippet_category": "many_years_old_news", "description": "A single sheet of newspaper broadsheet. It seems to date from several years ago, and you've NO idea how it lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "1 ml" @@ -97,6 +103,7 @@ "snippet_category": "years_old_news", "description": "A single sheet of newspaper broadsheet. It seems to date from a few years ago--amazing it has lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "1 ml" @@ -111,6 +118,7 @@ "snippet_category": "one_year_old_news", "description": "A single sheet of newspaper broadsheet. It was printed more than a year ago. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "1 ml" @@ -125,6 +133,7 @@ "snippet_category": "months_old_news", "description": "A single sheet of newspaper broadsheet. It was printed in the months leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "1 ml" @@ -139,6 +148,7 @@ "snippet_category": "weeks_old_news", "description": "A single sheet of newspaper broadsheet. It was printed in the weeks leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "3 g", "volume": "1 ml" @@ -153,6 +163,7 @@ "snippet_category": "necropolis_intro", "description": "A folded glossy handout that appears to be an introduction to living in a massive underground complex.", "price": 0, + "price_postapoc": 0, "material": "paper", "weight": "1 g", "volume": "1 ml" @@ -167,6 +178,7 @@ "snippet_category": "death_note", "description": "A scrap of paper. Something's written on it, scrawled in bad handwriting.", "price": 0, + "price_postapoc": 0, "looks_like": "survnote", "material": "paper", "flags": [ "TRADER_AVOID" ], diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json index 2f4a535e1e795..553c67c2dd65c 100644 --- a/data/json/items/robot_parts.json +++ b/data/json/items/robot_parts.json @@ -10,6 +10,7 @@ "weight": "250 g", "volume": "500 ml", "price": 32000, + "price_postapoc": 100, "category": "spare_parts" }, { @@ -93,6 +94,7 @@ "weight": "200 g", "volume": "500 ml", "price": 50000, + "price_postapoc": 100, "material": "steel", "category": "spare_parts" }, @@ -106,6 +108,7 @@ "weight": "60000 g", "volume": "20 L", "price": 500000, + "price_postapoc": 250, "material": "steel", "category": "spare_parts" }, @@ -119,6 +122,7 @@ "weight": "10000 g", "volume": "10 L", "price": 100000, + "price_postapoc": 100, "material": "steel", "category": "spare_parts" }, @@ -132,6 +136,7 @@ "weight": "130 g", "volume": "500 ml", "price": 40000, + "price_postapoc": 100, "material": [ "steel", "plastic" ], "category": "spare_parts" }, @@ -145,6 +150,7 @@ "weight": "10000 g", "volume": "10 L", "price": 100000, + "price_postapoc": 250, "material": [ "steel", "plastic" ], "category": "spare_parts" }, @@ -158,6 +164,7 @@ "weight": "5000 g", "volume": "5 L", "price": 100000, + "price_postapoc": 250, "material": [ "steel", "plastic" ], "category": "spare_parts" }, @@ -171,6 +178,7 @@ "weight": "60000 g", "volume": "30 L", "price": 600000, + "price_postapoc": 250, "material": [ "steel", "plastic" ], "category": "spare_parts" }, @@ -184,6 +192,7 @@ "weight": "10000 g", "volume": "10 L", "price": 100000, + "price_postapoc": 100, "material": [ "steel", "plastic" ], "category": "spare_parts" }, @@ -197,6 +206,7 @@ "weight": "20000 g", "volume": "40000 ml", "price": 100000, + "price_postapoc": 100, "material": [ "steel" ], "category": "spare_parts" }, @@ -210,6 +220,7 @@ "weight": "20000 g", "volume": "40000 ml", "price": 100000, + "price_postapoc": 100, "material": [ "steel", "plastic" ], "category": "spare_parts" } diff --git a/data/json/items/software.json b/data/json/items/software.json index b7fe429b23e9b..d8209ddaf19e4 100644 --- a/data/json/items/software.json +++ b/data/json/items/software.json @@ -14,7 +14,8 @@ "type": "GENERIC", "name": { "str": "misc software", "str_pl": "misc software" }, "description": "A miscellaneous piece of hobby software. Probably useless.", - "price": 300 + "price": 300, + "price_postapoc": 0 }, { "id": "software_hacking", @@ -22,7 +23,8 @@ "type": "GENERIC", "name": { "str": "hackPRO", "str_pl": "hackPRO" }, "description": "A piece of hacking software.", - "price": 800 + "price": 800, + "price_postapoc": 2000 }, { "id": "software_medical", @@ -30,7 +32,8 @@ "type": "GENERIC", "name": { "str": "MediSoft", "str_pl": "MediSoft" }, "description": "A piece of medical software.", - "price": 600 + "price": 600, + "price_postapoc": 0 }, { "id": "software_math", @@ -38,7 +41,8 @@ "type": "GENERIC", "name": { "str": "MatheMAX", "str_pl": "MatheMAX" }, "description": "A piece of mathematical software.", - "price": 500 + "price": 500, + "price_postapoc": 0 }, { "id": "software_blood_data", @@ -46,7 +50,8 @@ "type": "GENERIC", "name": { "str": "infection data", "str_pl": "infection data" }, "description": "Medical data on zombie blood.", - "price": 200 + "price": 200, + "price_postapoc": 0 }, { "id": "software_lab_data", @@ -54,7 +59,8 @@ "type": "GENERIC", "name": { "str": "lab data", "str_pl": "lab data" }, "description": "Research archives from a government laboratory.", - "price": 200 + "price": 200, + "price_postapoc": 0 }, { "id": "software_train_data", @@ -62,7 +68,8 @@ "type": "GENERIC", "name": { "str": "train data", "str_pl": "train data" }, "description": "Logistical data on subterranean train routes and schedules.", - "price": 200 + "price": 200, + "price_postapoc": 0 }, { "id": "mind_scan_robofac", @@ -79,6 +86,7 @@ "type": "GENERIC", "name": { "str": "integrated circuit datasheet archives", "str_pl": "misc software" }, "description": "Huge archives of numerous IC circuit datasheets from several major manufacturers. Probably valuable to the right person, as it would be hard to salvage and reuse these components without them.", - "price": 40000 + "price": 40000, + "price_postapoc": 0 } ] diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index ecc53e280a84e..10400db0e6fda 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -7,6 +7,7 @@ "weight": "300 g", "volume": "1 L", "price": 20000, + "price_postapoc": 50, "material": [ "wood", "cotton" ], "symbol": "[", "looks_like": "armguard_hard", @@ -28,6 +29,7 @@ "weight": "600 g", "volume": "2 L", "price": 25000, + "price_postapoc": 50, "encumbrance": 140, "flags": [ "OVERSIZE", "WATER_FRIENDLY", "OUTER", "SPLINT" ] }, @@ -40,6 +42,7 @@ "weight": "72 g", "volume": "250 ml", "price": 600, + "price_postapoc": 10, "material": [ "cotton" ], "symbol": "[", "looks_like": "scarf", @@ -60,6 +63,7 @@ "weight": "10 g", "volume": "10 ml", "price": 10, + "price_postapoc": 50, "material": [ "plastic" ], "symbol": ";", "color": "light_gray", @@ -75,6 +79,7 @@ "weight": "18043 g", "volume": "35750 ml", "price": 100000, + "price_postapoc": 1000, "to_hit": -5, "material": [ "cotton", "plastic" ], "symbol": "[", @@ -106,6 +111,7 @@ "weight": "500 g", "volume": "1 L", "price": 20000, + "price_postapoc": 50, "material": [ "wood", "cotton" ], "symbol": "[", "looks_like": "legguard_hard", @@ -126,6 +132,7 @@ "weight": "1000 g", "volume": "2 L", "price": 25000, + "price_postapoc": 50, "encumbrance": 140, "flags": [ "OVERSIZE", "WATER_FRIENDLY", "OUTER", "SPLINT" ] }, @@ -139,6 +146,7 @@ "description": "This is a mining helmet with a heavy-duty LED flashlight. Using this will turn the flashlight on and provide light, assuming it is charged with batteries.", "flags": [ "WATERPROOF" ], "price": 12500, + "price_postapoc": 250, "material": [ "plastic" ], "weight": "1196 g", "volume": "3 L", @@ -199,6 +207,7 @@ "weight": "1 kg", "volume": "4 L", "price": 1400, + "price_postapoc": 500, "to_hit": -3, "use_action": { "type": "transform", "msg": "You push your %s up your head.", "target": "welding_mask_raised", "menu_text": "Raise" }, "material": [ "plastic" ], @@ -220,6 +229,7 @@ "weight": "4 kg", "volume": "4 L", "price": 1000, + "price_postapoc": 100, "to_hit": -3, "use_action": { "type": "transform", @@ -246,6 +256,7 @@ "weight": "4 kg", "volume": "4 L", "price": 1000, + "price_postapoc": 100, "to_hit": -3, "use_action": { "type": "transform", @@ -270,6 +281,7 @@ "weight": "1 kg", "volume": "4 L", "price": 1400, + "price_postapoc": 500, "to_hit": -3, "use_action": { "type": "transform", @@ -298,6 +310,7 @@ "color": "light_gray", "covers": [ "HAND_EITHER" ], "price": 6000, + "price_postapoc": 100, "material": [ "plastic" ], "flags": [ "WATCH", "WATER_FRIENDLY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ], "coverage": 15, @@ -318,6 +331,7 @@ "color": "light_gray", "covers": [ "HAND_EITHER" ], "price": 5000, + "price_postapoc": 100, "material": [ "plastic" ], "flags": [ "WATCH", "WATER_FRIENDLY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ], "coverage": 15, @@ -332,6 +346,7 @@ "weight": "1552 g", "volume": "3500 ml", "price": 5500000, + "price_postapoc": 10000, "to_hit": -1, "material": [ "superalloy" ], "symbol": "[", @@ -361,6 +376,7 @@ "symbol": "[", "description": "A high-crowned, wide-brimmed, sable colored fedora. Its brim helps keep the sun out of your eyes. The perfect hat for treasure hunting.", "price": 7500, + "price_postapoc": 100, "material": [ "leather" ], "volume": "1750 ml", "warmth": 7, @@ -380,6 +396,7 @@ "description": "This is a pair of socks with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 5000, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "182 g", "volume": "750 ml", @@ -437,6 +454,7 @@ "description": "This is a full-body suit of thin thermal underwear equipped with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 15000, + "price_postapoc": 500, "material": [ "cotton" ], "weight": "864 g", "volume": "2 L", @@ -494,6 +512,7 @@ "description": "This is a pair of gloves with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 5000, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "210 g", "volume": "750 ml", @@ -551,6 +570,7 @@ "description": "This is a snug cloth mask with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 5000, + "price_postapoc": 250, "material": [ "cotton" ], "weight": "196 g", "volume": "1 L", @@ -607,6 +627,7 @@ "name": { "str": "pair of binoculars", "str_pl": "pairs of binoculars" }, "description": "A pair of optics with a neck strap attached. Useful for seeing long distances. Wearing this item or carrying it in your inventory will double the distance around you that is mapped during your travels. You could also use them to focus the sunlight.", "price": 30000, + "price_postapoc": 500, "material": [ "plastic", "glass" ], "flags": [ "ZOOM", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "FIRESTARTER" ], "weight": "708 g", @@ -628,6 +649,7 @@ "name": { "str": "headlamp" }, "description": "This is an LED headlamp with an adjustable strap so as to be comfortably worn on your head or attached to your helmet. Use it to turn it on.", "price": 4000, + "price_postapoc": 100, "material": [ "plastic", "aluminum" ], "flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "weight": "520 g", @@ -685,6 +707,7 @@ "name": { "str": "survivor headlamp" }, "description": "This is a custom-made LED headlamp reinforced to be more durable, brighter, and with a larger and more efficient battery pack. The adjustable strap allows it to be comfortably worn on your head or attached to your helmet. Use it to turn it on.", "price": 6500, + "price_postapoc": 250, "material": [ "plastic", "aluminum" ], "flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "weight": "620 g", @@ -743,6 +766,7 @@ "name": { "str": "atomic headlamp" }, "description": "This is a custom-made reinforced headlamp powered by the magic of nuclear decay, focused for more usable brightness. The adjustable strap allows it to be comfortably worn on your head or attached to your helmet. Use it to close the cover and hide the light.", "price": 4000, + "price_postapoc": 1500, "material": [ "steel", "plastic" ], "flags": [ "LIGHT_200", "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "weight": "1 kg", @@ -786,6 +810,7 @@ "description": "Internally powered by a maximum of ten plutonium fuel cells, this full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology. Use it to turn it on.", "flags": [ "VARSIZE", "STURDY", "WATERPROOF", "RAINPROOF", "WATCH", "ALARMCLOCK", "SWIM_GOGGLES", "SUN_GLASSES", "RAD_RESIST" ], "price": 50000000, + "price_postapoc": 10000, "material": [ "ceramic", "kevlar" ], "weight": "6820 g", "volume": "9 L", @@ -843,6 +868,7 @@ "looks_like": "chestguard_hard", "description": "A featureless, disc-shaped device mounted on a harness. The words \"X.E.D.R.A\" and \"5-point anchor\" are inscribed on its front and back.", "price": 150000, + "price_postapoc": 8000, "material": [ "ceramic", "kevlar" ], "weight": "1250 g", "volume": "4500 ml", @@ -893,6 +919,7 @@ "looks_like": "rm13_armor", "description": "Covered in interlocking plates of reflective metal, this advanced suit resembles both plate armor and an astronaut's spacesuit. Designed to protect its wearer during extra dimensional excursions, it offers unparalleled environmental protection, both in this Earth and beyond. Use it to turn it on.", "price": 150000, + "price_postapoc": 15000, "material": [ "carbide" ], "weight": "1250 g", "volume": "4500 ml", @@ -972,6 +999,7 @@ "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. Use it to turn it on.", "flags": [ "WATER_FRIENDLY" ], "price": 25000, + "price_postapoc": 500, "material": [ "plastic", "aluminum" ], "weight": "720 g", "volume": "500 ml", @@ -1019,6 +1047,7 @@ "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. Use it to turn it on.", "flags": [ "WATER_FRIENDLY", "OVERSIZE" ], "price": 25000, + "price_postapoc": 500, "material": [ "plastic", "aluminum" ], "weight": "960 g", "volume": "1250 ml", @@ -1066,6 +1095,7 @@ "weight": "260 g", "volume": "500 ml", "price": 3500, + "price_postapoc": 250, "to_hit": 1, "material": [ "plastic" ], "symbol": "[", @@ -1092,6 +1122,7 @@ "weight": "897 g", "volume": "1 L", "price": 4900, + "price_postapoc": 750, "to_hit": -3, "material": [ "plastic" ], "symbol": "[", @@ -1117,6 +1148,7 @@ "weight": "1397 g", "volume": "1500 ml", "price": 25000, + "price_postapoc": 750, "to_hit": -3, "material": [ "plastic" ], "symbol": "[", @@ -1143,6 +1175,7 @@ "weight": "708 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1750, "to_hit": -3, "material": [ "kevlar", "nomex" ], "symbol": "[", @@ -1170,6 +1203,7 @@ "weight": "1108 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1500, "to_hit": -3, "material": [ "kevlar", "nomex" ], "symbol": "[", @@ -1199,6 +1233,7 @@ "description": "A full-face mask commonly used by firefighters. The protective breathing apparatus provides excellent protection from smoke, flame, and other dangers. It must be prepared before use.", "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ], "price": 100000, + "price_postapoc": 750, "material": [ "plastic", "nomex" ], "weight": "1260 g", "volume": "1500 ml", @@ -1225,6 +1260,7 @@ "weight": "1612 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 2000, "to_hit": -3, "max_charges": 100, "initial_charges": 100, @@ -1252,6 +1288,7 @@ "weight": "466 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1500, "to_hit": -3, "max_charges": 100, "initial_charges": 100, @@ -1280,6 +1317,7 @@ "weight": "682 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1750, "to_hit": -3, "max_charges": 100, "initial_charges": 100, @@ -1307,6 +1345,7 @@ "weight": "982 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1500, "to_hit": -3, "max_charges": 100, "initial_charges": 100, @@ -1334,6 +1373,7 @@ "weight": "682 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1750, "to_hit": -3, "max_charges": 100, "initial_charges": 100, @@ -1361,6 +1401,7 @@ "weight": "1062 g", "volume": "1250 ml", "price": 24000, + "price_postapoc": 1500, "to_hit": -3, "max_charges": 100, "initial_charges": 100, @@ -1389,6 +1430,7 @@ "description": "A pair of battery-powered goggles that amplify ambient light, allowing you to see in the dark. Use it to turn them on.", "flags": [ "FRAGILE" ], "price": 92000, + "price_postapoc": 3500, "material": [ "plastic", "steel" ], "weight": "1020 g", "volume": "1 L", @@ -1451,6 +1493,7 @@ "description": "A pair of battery-powered goggles that grant infrared vision, allowing you to see warm-blooded creatures in the dark. Use it to turn them on.", "flags": [ "FRAGILE" ], "price": 92000, + "price_postapoc": 2500, "material": [ "plastic", "steel" ], "weight": "1240 g", "volume": "1 L", @@ -1512,6 +1555,7 @@ "name": { "str": "wearable RX12 jet injector" }, "description": "This is a modified RX12 jet injector which can be worn on the body. A label on the side warns against using more than two doses per hour.", "price": 40000, + "price_postapoc": 1000, "material": [ "ceramic", "superalloy" ], "flags": [ "OVERSIZE" ], "weight": "364 g", @@ -1531,6 +1575,7 @@ "name": { "str": "RX11 stimulant delivery system", "str_pl": "RX11 stimulant delivery system" }, "description": "The Rivtech RX11 stimulant delivery system is a jet autoinjector system worn on the user's body. A simple press of its activator injects powerful chemical stimulants into the bloodstream without using a needle.", "price": 40000, + "price_postapoc": 1000, "material": [ "superalloy", "kevlar_rigid" ], "flags": [ "OVERSIZE" ], "weight": "212 g", @@ -1552,6 +1597,7 @@ "description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. Use it to turn it on.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES" ], "price": 40000, + "price_postapoc": 2000, "material": [ "kevlar", "plastic" ], "weight": "982 g", "volume": "1500 ml", @@ -1599,6 +1645,7 @@ "description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. Use it to turn it on.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES", "OVERSIZE" ], "price": 40000, + "price_postapoc": 1500, "material": [ "kevlar", "plastic" ], "weight": "1302 g", "volume": "2 L", @@ -1644,6 +1691,7 @@ "name": { "str": "folded poncho" }, "description": "A folded lightweight plastic rain poncho with a hood. Use it to unfold for use.", "price": 5000, + "price_postapoc": 50, "material": "plastic", "weight": "280 g", "volume": "250 ml", @@ -1659,6 +1707,7 @@ "name": { "str": "unfolded poncho" }, "description": "A lightweight plastic rain poncho with a hood. Use it to fold for storage.", "price": 5000, + "price_postapoc": 50, "material": "plastic", "weight": "280 g", "volume": "1500 ml", @@ -1680,6 +1729,7 @@ "name": { "str": "folded emergency blanket" }, "description": "A folded blanket made of space-age materials that covers your most important body parts. Use it to unfold for use.", "price": 425, + "price_postapoc": 10, "material": "plastic", "weight": "622 g", "volume": "500 ml", @@ -1694,6 +1744,7 @@ "name": { "str": "emergency blanket" }, "description": "A blanket made of space-age material that covers your most important body parts. Use it to fold for storage.", "price": 425, + "price_postapoc": 10, "material": "plastic", "weight": "622 g", "volume": "2500 ml", @@ -1717,6 +1768,7 @@ "name": { "str": "radiation biomonitor" }, "description": "A small battery-powered biometric safety device worn on the wrist. Activate to check your current level of radiation exposure.", "price": 60000, + "price_postapoc": 1000, "material": [ "plastic", "aluminum" ], "weight": "68 g", "volume": "250 ml", @@ -1741,6 +1793,7 @@ "symbol": "[", "description": "A custom-built leather utility belt covered with straps and pouches containing many useful hand tools and a sheath to carry a smaller blade. Durable and carefully crafted to be comfortable to wear. Activate to sheathe/draw a weapon.", "price": 50000, + "price_postapoc": 1000, "material": [ "leather", "iron" ], "volume": "4 L", "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "WAIST", "OVERSIZE" ], @@ -1783,6 +1836,7 @@ "name": { "str": "hairpin" }, "description": "A plain hairpin to keep your hair in place.", "price": 50, + "price_postapoc": 25, "material": [ "iron" ], "weight": "2 g", "use_action": { "type": "picklock", "pick_quality": 3 } @@ -1796,6 +1850,7 @@ "name": { "str": "fancy hairpin" }, "description": "A pink hairpin with cute flower textures.", "price": 1000, + "price_postapoc": 5, "material": [ "plastic" ], "weight": "4 g", "use_action": { "type": "picklock", "pick_quality": 1 }, @@ -1809,6 +1864,7 @@ "name": { "str": "towel" }, "description": "This is a fluffy and large towel. It could be used to dry yourself. Any person that can travel the length and breadth of the apocalypse, rough it, slum it, struggle against terrible odds, win through and still know where their towel is, is clearly a force to be reckoned with.", "price": 4500, + "price_postapoc": 10, "material": "cotton", "covers": [ "TORSO", "LEGS" ], "weight": "370 g", @@ -1828,6 +1884,7 @@ "name": { "str": "towel" }, "description": "This is a large, sopping wet towel. If you wait a little bit, it should dry out. Don't panic.", "price": 2000, + "price_postapoc": 0, "material": "cotton", "covers": [ "TORSO", "LEGS" ], "weight": "400 g", @@ -1848,6 +1905,7 @@ "name": { "str": "soiled towel" }, "description": "This is a large towel, covered in a thick, gooey liquid. You'll need to wash it in some water to make it usable again. Don't panic.", "price": 2000, + "price_postapoc": 0, "material": "cotton", "covers": [ "TORSO", "LEGS" ], "weight": "400 g", @@ -1871,6 +1929,7 @@ "symbol": "[", "description": "Straw fedora hat, comfortable and stylish. Its brim helps keep the sun out of your eyes.", "price": 5000, + "price_postapoc": 50, "material": [ "paper" ], "volume": "1250 ml", "warmth": 5, @@ -1889,6 +1948,7 @@ "name": { "str": "simple patchwork scarf", "str_pl": "simple patchwork scarves" }, "description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 1000, + "price_postapoc": 50, "material": [ "cotton" ], "weight": "60 g", "volume": "500 ml", @@ -1912,6 +1972,7 @@ "name": { "str": "simple patchwork scarf (loose)", "str_pl": "simple patchwork scarves (loose)" }, "description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 1000, + "price_postapoc": 50, "material": [ "cotton" ], "weight": "60 g", "volume": "500 ml", @@ -1935,6 +1996,7 @@ "name": { "str": "long patchwork scarf", "str_pl": "long patchwork scarves" }, "description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 1500, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "120 g", "volume": "1 L", @@ -1958,6 +2020,7 @@ "name": { "str": "long patchwork scarf (loose)", "str_pl": "long patchwork scarves (loose)" }, "description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 1500, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "120 g", "volume": "1 L", @@ -1986,6 +2049,7 @@ "name": { "str": "knit scarf", "str_pl": "knit scarves" }, "description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 2000, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "96 g", "volume": "750 ml", @@ -2009,6 +2073,7 @@ "name": { "str": "knit scarf (loose)", "str_pl": "knit scarves (loose)" }, "description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 2000, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "96 g", "volume": "750 ml", @@ -2032,6 +2097,7 @@ "name": { "str": "long knit scarf", "str_pl": "long knit scarves" }, "description": "A really long knitted cotton scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 3000, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "192 g", "volume": "1250 ml", @@ -2055,6 +2121,7 @@ "name": { "str": "long knit scarf (loose)", "str_pl": "long knit scarves (loose)" }, "description": "A really long knitted cotton scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 3000, + "price_postapoc": 100, "material": [ "cotton" ], "weight": "192 g", "volume": "1250 ml", @@ -2078,6 +2145,7 @@ "name": { "str": "wool scarf", "str_pl": "wool scarves" }, "description": "A long wool scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 3800, + "price_postapoc": 50, "material": [ "wool" ], "weight": "80 g", "volume": "750 ml", @@ -2101,6 +2169,7 @@ "name": { "str": "wool scarf (loose)", "str_pl": "wool scarves (loose)" }, "description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 3800, + "price_postapoc": 50, "material": [ "wool" ], "weight": "80 g", "volume": "750 ml", @@ -2124,6 +2193,7 @@ "name": { "str": "long wool scarf", "str_pl": "long wool scarves" }, "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 4500, + "price_postapoc": 100, "material": [ "wool" ], "weight": "160 g", "volume": "1250 ml", @@ -2147,6 +2217,7 @@ "name": { "str": "long wool scarf (loose)", "str_pl": "long wool scarves (loose)" }, "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 4500, + "price_postapoc": 100, "material": [ "wool" ], "weight": "160 g", "volume": "1250 ml", @@ -2170,6 +2241,7 @@ "name": { "str": "fur scarf", "str_pl": "fur scarves" }, "description": "A long fur scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 9000, + "price_postapoc": 250, "material": [ "fur" ], "weight": "140 g", "volume": "1 L", @@ -2193,6 +2265,7 @@ "name": { "str": "fur scarf (loose)", "str_pl": "fur scarves (loose)" }, "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 9000, + "price_postapoc": 250, "material": [ "fur" ], "weight": "140 g", "volume": "1 L", @@ -2216,6 +2289,7 @@ "name": { "str": "long fur scarf", "str_pl": "long fur scarves" }, "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 17700, + "price_postapoc": 300, "material": [ "fur" ], "weight": "280 g", "volume": "2 L", @@ -2239,6 +2313,7 @@ "name": { "str": "long fur scarf (loose)", "str_pl": "long fur scarves (loose)" }, "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 17700, + "price_postapoc": 300, "material": [ "fur" ], "weight": "280 g", "volume": "2 L", @@ -2262,6 +2337,7 @@ "description": "This suit of thin thermal underwear covers you from head to toe and is equipped with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 30000, + "price_postapoc": 750, "material": [ "cotton" ], "weight": "1452 g", "volume": "4500 ml", @@ -2319,6 +2395,7 @@ "symbol": "[", "description": "A warm wool mask that protects the head and face from cold. It has a full face opening that can be adjusted to set how much is exposed.", "price": 1800, + "price_postapoc": 250, "material": [ "wool" ], "volume": "250 ml", "warmth": 50, @@ -2346,6 +2423,7 @@ "symbol": "[", "description": "A warm wool mask that protects the head and face from cold. It has a full face opening that can be adjusted to set how much is exposed.", "price": 1800, + "price_postapoc": 250, "material": [ "wool" ], "volume": "250 ml", "warmth": 30, @@ -2364,6 +2442,7 @@ "to_hit": -1, "color": "light_gray", "price": 200, + "price_postapoc": 50, "material": [ "steel", "cotton" ], "flags": [ "WATER_FRIENDLY" ], "coverage": 1, @@ -2403,6 +2482,7 @@ "symbol": "-", "description": "A harmonica with a holder, so that you can play it without a free hand.", "price": 1000, + "price_postapoc": 150, "material": [ "steel" ], "volume": "250 ml", "flags": [ "BELTED", "SLEEP_IGNORE" ], @@ -2436,6 +2516,7 @@ "symbol": "-", "description": "A simple wooden acoustic guitar with a strap so you can wear it around, even when not playing.", "price": 1000, + "price_postapoc": 250, "material": [ "wood" ], "volume": "6750 ml", "warmth": 2, @@ -2477,7 +2558,7 @@ "symbol": "-", "description": "A standard factory-made electric guitar. It's probably better at smashing heads than melting faces, these days. Has a strap.", "price": 1000, - "price_postapoc": 500, + "price_postapoc": 250, "//": "Electric guitar less awesome when there's no electricity.", "material": [ "wood", "iron" ], "volume": "6750 ml", @@ -2520,6 +2601,7 @@ "symbol": "-", "description": "A traditional musical instrument using enclosed reeds fed from a reservoir of air contained within a leather bag. It has a strap so you can wear it around, even when not playing.", "price": 10000, + "price_postapoc": 500, "material": [ "leather", "wood" ], "volume": "4 L", "encumbrance": 15, @@ -2556,6 +2638,7 @@ "str": "A big ol' tuba. Much easier to play when wearing." }, "price": 5500, + "price_postapoc": 250, "material": [ "iron" ], "volume": "12500 ml", "encumbrance": 30, @@ -2596,6 +2679,7 @@ "symbol": "{", "description": "A brass alto saxophone with a neck strap, so you can wear it while playing.", "price": 7500, + "price_postapoc": 250, "material": [ "brass" ], "volume": "4500 ml", "encumbrance": 30, @@ -2613,6 +2697,7 @@ "description": "A pair of earmuffs favored by shooters. Without batteries or when turned off they function like normal earmuffs and block all sound. They will block sounds over a certain decibel amount when turned on. The earmuffs are currently off.", "flags": [ "DEAF", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "price": 12500, + "price_postapoc": 750, "material": [ "plastic" ], "weight": "179 g", "volume": "1 L", @@ -2658,6 +2743,7 @@ "description": "A pair of earmuffs favored by shooters. The earmuffs are turned on. They will block sounds over a certain decibel amount, assuming it is charged with batteries.", "flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "PARTIAL_DEAF" ], "price": 12500, + "price_postapoc": 750, "material": [ "plastic" ], "weight": "179 g", "volume": "1 L", @@ -2681,6 +2767,7 @@ "name": { "str": "stethoscope" }, "description": "This is a medical listening tool. Use it to listen to things. Closely.", "price": 4000, + "price_postapoc": 500, "material": [ "plastic", "aluminum" ], "weight": "150 g", "volume": "250 ml", @@ -2697,6 +2784,7 @@ "name": { "str": "makeshift stethoscope" }, "description": "This is a relatively cumbersome DIY child's medical listening toy. Use it to listen to things. Closely.", "price": 500, + "price_postapoc": 100, "material": [ "plastic" ], "weight": "400 g", "volume": "500 ml", @@ -2713,6 +2801,7 @@ "weight": "7500 g", "volume": "5 L", "price": 500000, + "price_postapoc": 1500, "bashing": 10, "to_hit": -1, "material": [ "glass", "steel" ], @@ -2734,6 +2823,7 @@ "weight": "7500 g", "volume": "15 L", "price": 500000, + "price_postapoc": 1500, "bashing": 4, "to_hit": -2, "material": [ "glass", "steel" ], @@ -2758,6 +2848,7 @@ "weight": "2260 g", "volume": "2250 ml", "price": 22000, + "price_postapoc": 1000, "to_hit": -1, "bashing": 8, "material": [ "plastic", "steel" ], @@ -2783,6 +2874,7 @@ "weight": "2260 g", "volume": "2250 ml", "price": 22000, + "price_postapoc": 1000, "to_hit": -1, "bashing": 8, "material": [ "plastic", "steel" ], @@ -2807,6 +2899,7 @@ "weight": "16000 g", "volume": "12 L", "price": 6000, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -2835,6 +2928,7 @@ "weight": "16000 g", "volume": "12 L", "price": 6000, + "price_postapoc": 500, "to_hit": -4, "bashing": 10, "material": [ "steel", "plastic" ], @@ -2863,6 +2957,7 @@ "weight": "7000 g", "volume": "4 L", "price": 4000, + "price_postapoc": 250, "to_hit": -3, "bashing": 6, "material": [ "aluminum", "plastic" ], @@ -2891,6 +2986,7 @@ "weight": "7000 g", "volume": "4 L", "price": 4000, + "price_postapoc": 250, "to_hit": -3, "bashing": 6, "material": [ "aluminum", "plastic" ], @@ -2917,6 +3013,7 @@ "weight": "1123 g", "volume": "2500 ml", "price": 5500, + "price_postapoc": 250, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -2968,6 +3065,7 @@ "weight": "1500 g", "volume": "16L", "price": 1500, + "price_postapoc": 10, "to_hit": -3, "material": [ "cotton", "plastic" ], "symbol": "Q", From 9d6a104bdb0b709978d371a39241ae419e2d10f3 Mon Sep 17 00:00:00 2001 From: Jason Jones Date: Thu, 16 Apr 2020 22:21:46 -0800 Subject: [PATCH 43/45] Build and use json_formatter in Visual Studio --- doc/JSON_STYLE.md | 22 +++ msvc-full-features/Cataclysm-vcpkg-static.sln | 10 ++ msvc-full-features/JsonFormatter.vcxproj | 142 ++++++++++++++++++ msvc-full-features/style-json.ps1 | 5 + tools/format/format.cpp | 13 +- 5 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 msvc-full-features/JsonFormatter.vcxproj create mode 100644 msvc-full-features/style-json.ps1 diff --git a/doc/JSON_STYLE.md b/doc/JSON_STYLE.md index 212847eeb97c1..f6df0ccd7040d 100644 --- a/doc/JSON_STYLE.md +++ b/doc/JSON_STYLE.md @@ -45,3 +45,25 @@ Line breaks occur after open brackets, close brackets, or entries. ## Formatting tool The formatting tool can be invoked via the Makefile, directly as `tools/format/json_formatter.cgi` (built via (`make json_formatter`), or via cgi at http://dev.narc.ro/cataclysm/format.html + +If you're using the Visual Studio solution, you can configure Visual Studio with +commands to format all of the JSON in the project. + +1. Build the JsonFormatter project by either building the entire solution or + just that project. This will create a `tools/format/json_formatter.exe` + binary. +2. Add a new external tool entry ( `Tools` > `External Tools..` > `Add` ) and + configure it as follows: + * Title: `Lint All JSON` + * Command: `C:\windows\system32\windowspowershell\v1.0\powershell.exe` + * Arguments: `-file $(SolutionDir)\style-json.ps1` + * Initial Directory: `$(SolutionDir)` + * Use Output window: *checked* + +At this point, you can use the menu ( `Tools` > `Lint All JSON` ) to invoke the +command and can look in the Output Window for the output of running it. +Additionally, you can configure a keybinding for this command by navigating to +`Tools` > `Options` > `Environment` > `Keyboard`, searching for commands +containing `Tools.ExternalCommand` and pick the one that corresponds to the +position of your command in the list (e.g. `Tools.ExternalCommand1` if it's the +top item in the list) and then assign shortcut keys to it. \ No newline at end of file diff --git a/msvc-full-features/Cataclysm-vcpkg-static.sln b/msvc-full-features/Cataclysm-vcpkg-static.sln index 79de02cbe6560..ce23375f05220 100644 --- a/msvc-full-features/Cataclysm-vcpkg-static.sln +++ b/msvc-full-features/Cataclysm-vcpkg-static.sln @@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cataclysm-test-vcpkg-static EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cataclysm-lib-vcpkg-static", "Cataclysm-lib-vcpkg-static.vcxproj", "{0009BB11-11AD-4C14-A5FC-D882A942C00B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonFormatter", "JsonFormatter.vcxproj", "{35D74C75-FC4A-442F-AF44-43BC9D845BAF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -47,6 +49,14 @@ Global {0009BB11-11AD-4C14-A5FC-D882A942C00B}.Release|x64.Build.0 = Release|x64 {0009BB11-11AD-4C14-A5FC-D882A942C00B}.Release|x86.ActiveCfg = Release|Win32 {0009BB11-11AD-4C14-A5FC-D882A942C00B}.Release|x86.Build.0 = Release|Win32 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Debug|x64.ActiveCfg = Debug|x64 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Debug|x64.Build.0 = Debug|x64 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Debug|x86.ActiveCfg = Debug|Win32 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Debug|x86.Build.0 = Debug|Win32 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Release|x64.ActiveCfg = Release|x64 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Release|x64.Build.0 = Release|x64 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Release|x86.ActiveCfg = Release|Win32 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvc-full-features/JsonFormatter.vcxproj b/msvc-full-features/JsonFormatter.vcxproj new file mode 100644 index 0000000000000..bf31ec6133545 --- /dev/null +++ b/msvc-full-features/JsonFormatter.vcxproj @@ -0,0 +1,142 @@ + + + + + Debug + x64 + + + Debug + Win32 + + + Release + x64 + + + Release + Win32 + + + + 16.0 + {35D74C75-FC4A-442F-AF44-43BC9D845BAF} + Win32Proj + JsonFormatter + 10.0 + x86-windows-static + x64-windows-static + + + + Application + v142 + MultiByte + + + true + + + false + false + + + + + + + + + + json_formatter + .exe + $(SolutionDir)..\tools\format\ + $(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\ + + + true + + + false + + + + Level1 + Use + true + false + true + false + ProgramDatabase + 4819;4146;26495;26444;26451;4068 + stdafx.h + /bigobj /utf-8 %(AdditionalOptions) + _SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CONSOLE;LOCALIZE;USE_VCPKG;%(PreprocessorDefinitions) + stdcpp14 + ..\src;%(AdditionalIncludeDirectories) + + + Console + true + Default + true + /LTCG:OFF %(AdditionalOptions) + winmm.lib;imm32.lib;version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) + + + prebuild.cmd + Get version string + + + true + + + + + Disabled + false + false + _DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + MaxSpeed + true + true + NDEBUG;%(PreprocessorDefinitions) + DebugFastLink + MultiThreaded + + + true + true + + + + + WIN32;%(PreprocessorDefinitions) + + + + + + + + + + + + Create + + + + + {0009bb11-11ad-4c14-a5fc-d882a942c00b} + + + + + + diff --git a/msvc-full-features/style-json.ps1 b/msvc-full-features/style-json.ps1 new file mode 100644 index 0000000000000..cd48c6c7df6ed --- /dev/null +++ b/msvc-full-features/style-json.ps1 @@ -0,0 +1,5 @@ +$scriptDir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent +Set-Location -Path (Join-Path -Path $scriptDir -ChildPath "..") +$blacklist = Get-Content "json_blacklist" | Resolve-Path -Relative +$files = Get-ChildItem -Recurse -Include *.json "data" | Resolve-Path -Relative | ?{$blacklist -notcontains $_} +$files | ForEach-Object { Invoke-Expression ".\tools\format\json_formatter.exe $_" } diff --git a/tools/format/format.cpp b/tools/format/format.cpp index 05babf7761620..f661c172f8163 100644 --- a/tools/format/format.cpp +++ b/tools/format/format.cpp @@ -2,7 +2,11 @@ #include "getpost.h" +#if defined(_MSC_VER) +#include +#else #include +#endif #include #include #include @@ -12,7 +16,7 @@ static void format( JsonIn &jsin, JsonOut &jsout, int depth = -1, bool force_wrap = false ); -#ifdef MSYS2 +#if defined(MSYS2) || defined(_MSC_VER) static void erase_char( std::string &s, const char &c ) { size_t pos = std::string::npos; @@ -210,10 +214,15 @@ int main( int argc, char *argv[] ) std::cout << out.str(); } else { std::string in_str = in.str(); -#ifdef MSYS2 +#if defined(MSYS2) || defined(_MSC_VER) erase_char( in_str, '\r' ); #endif + +#if defined(_MSC_VER) + bool supports_color = _isatty( _fileno( stdout ) ); +#else bool supports_color = isatty( STDOUT_FILENO ); +#endif std::string color_good = supports_color ? "\x1b[32m" : std::string(); std::string color_bad = supports_color ? "\x1b[31m" : std::string(); std::string color_end = supports_color ? "\x1b[0m" : std::string(); From 60ea359f0b2834e26a20390befbb284e5fd7b6b3 Mon Sep 17 00:00:00 2001 From: Qrox Date: Fri, 17 Apr 2020 19:00:39 +0800 Subject: [PATCH 44/45] Fix item info part of crafting ui in wide mode --- src/crafting_gui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crafting_gui.cpp b/src/crafting_gui.cpp index 0d6cac1a30bb9..beaa308570f1b 100644 --- a/src/crafting_gui.cpp +++ b/src/crafting_gui.cpp @@ -213,6 +213,8 @@ const recipe *select_crafting_recipe( int &batch_size ) w_head = catacurses::newwin( headHeight, width, point( wStart, 0 ) ); w_subhead = catacurses::newwin( subHeadHeight, width, point( wStart, 3 ) ); + w_data = catacurses::newwin( dataHeight, width, point( wStart, + headHeight + subHeadHeight ) ); if( isWide ) { item_info_width = width - FULL_SCREEN_WIDTH - 2; @@ -227,9 +229,6 @@ const recipe *select_crafting_recipe( int &batch_size ) w_iteminfo = {}; } - w_data = catacurses::newwin( dataHeight, width - item_info_width, - point( wStart, headHeight + subHeadHeight ) ); - ui.position( point( wStart, 0 ), point( width, TERMY ) ); } ); ui.mark_resize(); @@ -571,6 +570,7 @@ const recipe *select_crafting_recipe( int &batch_size ) } draw_scrollbar( w_data, line, dataLines, recmax, point_zero ); + wrefresh( w_data ); if( isWide && !current.empty() ) { item_info_data data = item_info_data_from_recipe( current[line], count, item_info_scroll ); @@ -584,8 +584,8 @@ const recipe *select_crafting_recipe( int &batch_size ) if( cursor_pos ) { // place the cursor at the selected item name as expected by screen readers wmove( w_data, cursor_pos.value() ); + wrefresh( w_data ); } - wrefresh( w_data ); } ); do { From 357ca0b59abbf522e6107f162b49374bcb6ce8bc Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Fri, 17 Apr 2020 17:07:27 +0200 Subject: [PATCH 45/45] Update docs for the new activty actor system --- doc/PLAYER_ACTIVITY.md | 141 +++++++++++++++++++++++++++++------------ 1 file changed, 101 insertions(+), 40 deletions(-) diff --git a/doc/PLAYER_ACTIVITY.md b/doc/PLAYER_ACTIVITY.md index 0042576ac93cd..c01dc6c24430f 100644 --- a/doc/PLAYER_ACTIVITY.md +++ b/doc/PLAYER_ACTIVITY.md @@ -1,70 +1,131 @@ # Activities -Activities are long term actions, that can be interrupted and (optionally) continued. This allows the player to react to events (like monsters appearing, getting hurt) while doing something that takes more than just one turn. +Activities are long term actions, that can be interrupted and (optionally) +continued. This allows the avatar or an npc to react to events (like +monsters appearing, getting hurt) while doing something that takes more +than just one turn. ## Adding new activities -1. `player_activities.json` Define properties that apply to all instances of the activity in question. -2. `activity_handlers.h` Optionally declare a do_turn and/or finish function. -3. `player_activity.cpp` Optionally update `can_resume_with`. -4. `activity_handlers.cpp` Add the functions from #2 into the do_turn and finish maps, and define the functions. -5. Start the activity by calling `player::assign_activity`. +1. `player_activities.json` Define properties that apply to all instances +of the activity in question. + +2. `activity_actor.h` Create a new subclass of `activity_actor` +(e.g. move_items_activity_actor) to store state and handle turns of the +new activity. + +3. `activity_actor.cpp` Define the `do_turn` and `finish` functions +needed for the new actor as well as the required serialization functions. + +4. `player_activity.cpp` Optionally update `can_resume_with`. + +5. Construct your activity actor and then pass it to the constructor for +`player_activity`. The newly constructed activity can then be assigned +to the character and started using `Character::assign_activity`. ## JSON Properties -* verb: A descriptive term to describe the activity to be used in the query to stop the activity, and strings that describe it, example : `"verb": "mining"` or `"verb": { "ctxt": "instrument", "str": "playing" }`. -* suspendable (true): If true, the activity can be continued without starting from scratch again. This is only possible if `can_resume_with()` returns true. -* rooted (false): If true, then during the activity, recoil is reduced, and plant mutants sink their roots into the ground. Should be true if the activity lasts longer than a few minutes, and can always be accomplished without moving your feet. +* verb: A descriptive term to describe the activity to be used in the +query to stop the activity, and strings that describe it, for example: +`"verb": "mining"` or +`"verb": { "ctxt": "instrument", "str": "playing" }`. + +* suspendable (true): If true, the activity can be continued without +starting from scratch again. This is only possible if `can_resume_with()` +returns true. + +* rooted (false): If true, then during the activity, recoil is reduced, +and plant mutants sink their roots into the ground. Should be true if the +activity lasts longer than a few minutes, and can always be accomplished +without moving your feet. + * based_on: Can be 'time', 'speed', or 'neither'. - * time: The amount that `player_activity::moves_left` is decremented by is independent from the character's speed. - * speed: `player_activity::moves_left` may be decremented faster or slower, depending on the character's speed. - * neither: `moves_left` will not be decremented. Thus you must define a do_turn function; otherwise the activity will never end! -* no_resume (false): Rather than resuming, you must always restart the activity from scratch. -* multi_activity(false): This activity will repeat until it cannot do any more work, used for NPC and player zone activities. -* refuel_fires( false ): If true, the player will automatically refuel fires during the long activity. -* auto_needs( false ) : If true, the player will automatically eat and drink from specific auto_consume zones during long activities. + + * time: The amount that `player_activity::moves_left` is + decremented by is independent from the character's speed. + + * speed: `player_activity::moves_left` may be decremented faster + or slower, depending on the character's speed. + + * neither: `moves_left` will not be decremented. Thus you must + define a do_turn function; otherwise the activity will never end! + +* no_resume (false): Rather than resuming, you must always restart the +activity from scratch. + +* multi_activity(false): This activity will repeat until it cannot do +any more work, used for NPC and avatar zone activities. + +* refuel_fires( false ): If true, the character will automatically refuel +fires during the long activity. + +* auto_needs( false ) : If true, the character will automatically eat and +drink from specific auto_consume zones during long activities. ## Termination There are several ways an activity can be ended: 1. Call `player_activity::set_to_null()` - This can be called if it finished early or something went wrong, such as corrupt data, disappearing items, etc. The activity will not be put into the backlog. + + This can be called if it finished early or something went wrong, + such as corrupt data, disappearing items, etc. The activity will + not be put into the backlog. + 2. `moves_left` <= 0 - Once this condition is true, the finish function, if there is one, is called. The finish function should call `set_to_null()`. If there isn't a finish function, `set_to_null()` will be called for you (from player_activity::do_turn). -3. `game::cancel_activity` or `player::cancel_activity` - Canceling an activity prevents the `player_activity::finish` function from running, and the activity does therefore not yield a result. A copy of the activity is written to `player::backlog` if it's suspendable. + + Once this condition is true, the finish function, if there is one, + is called. The finish function should call `set_to_null()`. If + there isn't a finish function, `set_to_null()` will be called + for you (from activity_actor::do_turn). + +3. `Character::cancel_activity` + + Canceling an activity prevents the `activity_actor::finish` + function from running, and the activity does therefore not yield a + result. A copy of the activity is written to `Character::backlog` + if it's suspendable. ## Notes -While the player character performs the activity, `player_activity::do_turn` is called on each turn. Depending on the JSON properties, this will do some stuff. It will also call the do_turn function, and if `moves_left` is non-positive, the finish function. +While the character performs the activity, +`activity_actor::do_turn` is called on each turn. Depending on the +JSON properties, this will do some stuff. It will also call the do_turn +function, and if `moves_left` is non-positive, the finish function. -Some activities (like playing music on a mp3 player) don't have an end result but instead do something each turn (playing music on the mp3 player decreases its batteries and gives a morale bonus). +Some activities (like playing music on a mp3 player) don't have an end +result but instead do something each turn (playing music on the mp3 +player decreases its batteries and gives a morale bonus). -If the activity needs any information during its execution or when it's finished (like *where* to do something, *which* item to use to do something, ...), use any of: +If the activity needs any information during its execution or when +it's finished (like *where* to do something, *which* item to use to do +something, ...), simply add data members to your activity actor as well +as serialization functions for the data so that the activity can persist +across save/load cycles. -- `player_activity::index` - what to do (which recipe to craft, ...) -- `player_activity::position` - item position in player's inventory (`player::i_at`) -- `player_activity::name` - name of something to do (skill to be trained) -- `player_activity::values` - vector of any `int` values -- `player_activity::str_values` - vector of any `std::string` values -- `player_activity::placement` - where to do something +Be careful when storing coordinates as the activity may be carried out +by NPCS. If its, the coordinates must be absolute not local as local +coordinates are based on the avatars position. -Those values are automatically saved and restored when loading a game. Other than that they are not changed/examined by any common code. Different types of activities can use them however they need to. +### `activity_actor::do_turn` -If you are adding an activity that may be possible for NPCs to perform, then please make the activity placement in absolute coords. -As the local coordinate system is based on the avatar position. +To prevent an infinite loop, ensure that one of the following is +satisfied: -### `activity_handlers::_do_turn` function +- The `based_on` JSON property is `speed` or `time` -To prevent an infinite loop, ensure that one of the following is satisfied: +- The `player_activity::moves_left` is decreased in `do_turn` -- The `based_on` JSON property is `speed` or `time`, -- Or `player_activity::moves_left` is decreased (in `_do_turn`, -- Or that the activity is stopped there (see 'Termination', above). +- The the activity is stopped in `do_turn` (see 'Termination' above) -For example the pulp activity finishes itself when there are no more unpulped corpses on the map. It therefore does not need to decrease `player_activity::moves_left` on each turn. +For example, `move_items_activity_actor::do_turn` will either move as +many items as possible given the character's current moves or, if there +are no target items remaining, terminate the activity. -### `activity_handlers::_finish` function +### `activity_actor::finish` -This function is called when the activity has been completed (`moves_left` <= 0). It must call `set_to_null()` or assign a new activity. One should not call `cancel_activity` for the finished activity, as this could make a copy of the activity in `player::backlog`, which allows resuming an already finished activity. +This function is called when the activity has been completed +(`moves_left` <= 0). It must call `player_activity::set_to_null()` or +assign a new activity. One should not call `Character::cancel_activity` +for the finished activity, as this could make a copy of the activity in +`Character::backlog`, which allows resuming an already finished activity.