diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index 20c0701f9dc19..ab38c5eb484a0 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -175,7 +175,8 @@ "subtype": "collection", "entries": [ { "item": "manual_stabbing", "count": [ 1, 3 ], "prob": 80 }, - { "item": "manual_rifle", "count": [ 1, 3 ], "prob": 80 } + { "item": "manual_rifle", "count": [ 1, 3 ], "prob": 80 }, + { "item": "manual_traps_mil", "count": [ 1, 3 ], "prob": 80 } ] }, { diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index b41b7cad111ce..c859cea94334b 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -82,6 +82,7 @@ [ "manual_smg", 20 ], [ "manual_stabbing", 40 ], [ "manual_swimming", 30 ], + [ "manual_traps_mil", 30 ], [ "pocket_firearms", 10 ], [ "textbook_firstaid", 30 ] ] diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index e4dae14b82272..850565016b134 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -342,6 +342,7 @@ [ "manual_shotgun", 5 ], [ "manual_rifle", 5 ], [ "manual_pistol", 5 ], + [ "manual_traps_mil", 5 ], [ "mag_pistol", 10 ], [ "mag_rifle", 10 ] ] diff --git a/data/json/items/book/traps.json b/data/json/items/book/traps.json index 0fa13913ddd1f..2607019e48ae9 100644 --- a/data/json/items/book/traps.json +++ b/data/json/items/book/traps.json @@ -50,6 +50,27 @@ "intelligence": 4, "time": "20 m" }, + { + "id": "manual_traps_mil", + "type": "BOOK", + "name": { + "str": "FM 20-32 Mine/Countermine Operations manual", + "str_pl": "copies of FM 20-32 Mine/Countermine Operations manual" + }, + "description": "A hefty military field manual about mine-warfare principles, the mechanics of different types of mines/IED's, and countermine operations.", + "looks_like": "manual_rifle", + "weight": "422 g", + "volume": "500 ml", + "price": 2000, + "price_postapoc": 8600, + "material": [ "paper" ], + "symbol": "?", + "color": "green", + "skill": "traps", + "max_level": 3, + "intelligence": 4, + "time": "20 m" + }, { "id": "textbook_traps", "type": "BOOK", diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 6c5d409a6e35d..ebb571500bbaf 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -498,7 +498,7 @@ { "item": "manual_melee", "x": 54, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "manual_stabbing", "x": 53, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "manual_gun", "x": 52, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_shotgun", "x": 51, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, + { "item": "manual_traps_mil", "x": 51, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "manual_rifle", "x": 50, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "mag_fieldrepair", "x": 49, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "boltcutters", "x": 55, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 25eb6698fe06e..8c1f4a37796bf 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1568,7 +1568,7 @@ "skill_used": "traps", "difficulty": 3, "time": "5 m", - "book_learn": [ [ "textbook_traps", 2 ], [ "manual_traps", 3 ], [ "howto_traps", 3 ] ], + "book_learn": [ [ "manual_traps_mil", 3 ] ], "using": [ [ "cordage_short", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -1586,7 +1586,7 @@ "difficulty": 5, "time": "10 m", "reversible": true, - "book_learn": [ [ "textbook_traps", 5 ], [ "manual_traps", 5 ], [ "howto_traps", 4 ], [ "recipe_bullets", 6 ] ], + "book_learn": [ [ "manual_traps_mil", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "superglue", 1 ], [ "duct_tape", 75 ] ],