diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index ef5065ccb2cf5..56a002e66981e 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -500,7 +500,7 @@ "color": "brown", "healthy": -8, "quench": -5, - "calories": "54", + "calories": 54, "vitamins": [ [ "vitA", 6 ], [ "vitC", 2 ], [ "calcium", 0 ], [ "iron", 8 ], [ "vitB", 155 ] ] }, { diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json index 545a15cfd1fae..bc74b04e9482b 100644 --- a/data/json/items/tool/deployable.json +++ b/data/json/items/tool/deployable.json @@ -173,7 +173,7 @@ "to_hit": -4, "bashing": 7, "material": [ "wood" ], - "looks_like": [ "f_wood_keg" ], + "looks_like": "f_wood_keg", "symbol": "u", "color": "light_gray", "use_action": { "type": "deploy_furn", "furn_type": "f_butter_churn" }, diff --git a/data/json/mapgen/steel_mill/steel_mill_z2.json b/data/json/mapgen/steel_mill/steel_mill_z2.json index b18b63b7901e9..f4b994053c9af 100644 --- a/data/json/mapgen/steel_mill/steel_mill_z2.json +++ b/data/json/mapgen/steel_mill/steel_mill_z2.json @@ -133,7 +133,7 @@ "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::", "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::" ], - "terrain": [ { "M": "t_grate" }, { "8": "t_grate" } ], + "terrain": { "M": "t_grate", "8": "t_grate" }, "furniture": { }, "palettes": [ "steel_mill_palette" ], "place_monsters": [ diff --git a/data/json/npcs/TALK_TEST.json b/data/json/npcs/TALK_TEST.json index 3689139115853..93cdab41ac3b3 100644 --- a/data/json/npcs/TALK_TEST.json +++ b/data/json/npcs/TALK_TEST.json @@ -117,7 +117,7 @@ "responses": [ { "text": "This is a basic test response.", "topic": "TALK_DONE" }, { "text": "This is a cash test response.", "topic": "TALK_DONE", "condition": { "u_has_cash": 500 } }, - { "text": "This is an npc service test response.", "topic": "TALK_DONE", "condition": { "npc_service": 500 } }, + { "text": "This is an npc service test response.", "topic": "TALK_DONE", "condition": { "npc_service": true } }, { "text": "This is an npc available test response.", "topic": "TALK_DONE", "condition": "npc_available" } ] }, diff --git a/data/json/npcs/TALK_TRUE_FOODPERSON.json b/data/json/npcs/TALK_TRUE_FOODPERSON.json index 3af15cc0db5b0..c67aa640abab7 100644 --- a/data/json/npcs/TALK_TRUE_FOODPERSON.json +++ b/data/json/npcs/TALK_TRUE_FOODPERSON.json @@ -92,7 +92,7 @@ ] }, "text": "I am you but from an alternate reality.", - "trial": { "type": "LIE", "difficulty": 10, "mod": { "trust": 1, "value": 1 } }, + "trial": { "type": "LIE", "difficulty": 10, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ] ] }, "success": { "topic": "TALK_FOODPERSON_MULTIVERSE", "opinion": { "trust": 2, "value": 2 } }, "failure": { "topic": "TALK_FOODPERSON_ONLYONE", "opinion": { "trust": -5, "value": -5 } } }, diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json index f0830b5ebb9ec..0eaf670f9ca25 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json @@ -164,7 +164,7 @@ "difficulty": 5, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": [ 10, 50 ] }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, "update_mapgen": { "place_monster": [ { "monster": "mon_graboid", "name": "Little Guy", "x": 12, "y": 12, "target": true }, diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json index aae3288d31962..95486c4edb773 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json @@ -77,13 +77,13 @@ "text": "[$200, 30m] I need you to patch me up.", "topic": "TALK_RANCH_NURSE_AID_DONE", "effect": [ "give_aid", { "u_spend_cash": 20000 } ], - "condition": { "npc_service": 20000 } + "condition": { "npc_service": true } }, { "text": "[$500, 1h] I need you to patch me up.", "topic": "TALK_RANCH_NURSE_AID_DONE", "effect": [ "give_all_aid", { "u_spend_cash": 50000 } ], - "condition": { "npc_service": 50000 } + "condition": { "npc_service": true } }, { "text": "I should be fine.", "topic": "TALK_RANCH_NURSE" } ] diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json b/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json index c13d1d1e28ad4..32b1003f822ea 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json @@ -39,13 +39,13 @@ "text": "[$2000, 1d] 10 logs", "topic": "TALK_DONE", "effect": [ "buy_10_logs", { "u_spend_cash": 200000 } ], - "condition": { "npc_service": 200000 } + "condition": { "npc_service": true } }, { "text": "[$12000, 7d] 100 logs", "topic": "TALK_DONE", "effect": [ "buy_100_logs", { "u_spend_cash": 1200000 } ], - "condition": { "npc_service": 1200000 } + "condition": { "npc_service": true } }, { "text": "Maybe later.", "topic": "TALK_RANCH_WOODCUTTER", "condition": "npc_available" }, { "text": "I'll be back later.", "topic": "TALK_RANCH_WOODCUTTER" } diff --git a/data/mods/Aftershock/items/afs__items.json b/data/mods/Aftershock/items/afs__items.json index 57e4f2510b691..1f6ee95c5a98f 100644 --- a/data/mods/Aftershock/items/afs__items.json +++ b/data/mods/Aftershock/items/afs__items.json @@ -166,7 +166,7 @@ "volume": "11356 ml", "price": 5000, "price_postapoc": 45000, - "looks_like": [ "still" ], + "looks_like": "still", "symbol": "u", "color": "light_green", "use_action": { "type": "deploy_furn", "furn_type": "f_atomic_butter_churn" },