diff --git a/data/json/item_groups.json b/data/json/item_groups.json index af911752632fc..7363cdcccdfc5 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -387,7 +387,7 @@ [ "kippah", 1 ], [ "robe", 3 ], [ "thawb", 1 ], - [ "kimono", 1 ], + [ "yukata", 1 ], [ "eclipse_glasses", 1 ], [ "reading_light", 9 ] ] @@ -1201,7 +1201,11 @@ [ "robe", 10 ], [ "eboshi", 1 ], [ "kariginu", 1 ], - [ "kimono", 5 ], + [ "geta", 1 ], + [ "kimono", 2 ], + [ "yukata", 6 ], + [ "haori", 2 ], + [ "hakama", 4 ], [ "eclipse_glasses", 1 ], [ "thermos", 20 ] ] @@ -3297,7 +3301,11 @@ [ "robe", 5 ], [ "eboshi", 1 ], [ "kariginu", 1 ], - [ "kimono", 3 ] + [ "geta", 1 ], + [ "kimono", 2 ], + [ "yukata", 4 ], + [ "haori", 1 ], + [ "hakama", 2 ] ] }, { @@ -5165,7 +5173,11 @@ [ "cassock", 1 ], [ "eboshi", 1 ], [ "kariginu", 2 ], - [ "kimono", 3 ], + [ "kimono", 2 ], + [ "yukata", 4 ], + [ "haori", 1 ], + [ "hakama", 2 ], + [ "geta", 1 ], [ "l-stick", 1 ], [ "solarpack", 5 ], [ "tourist_table", 10 ], @@ -9002,6 +9014,8 @@ [ "cavalry_sabre", 2 ], [ "glaive", 2 ], [ "naginata", 2 ], + [ "naginata_fake", 2 ], + [ "naginata_inferior", 3 ], [ "estoc", 2 ], [ "estoc_fake", 6 ], [ "qiang", 3 ], diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json index 26bfa1ca6463f..c696ef553f887 100644 --- a/data/json/itemgroups/mansion.json +++ b/data/json/itemgroups/mansion.json @@ -480,19 +480,29 @@ "id": "soa_fake_weapon_samurai", "type": "item_group", "subtype": "distribution", - "items": [ { "group": "samurai_sword_set_fake", "prob": 7 }, [ "bokken_fake", 6 ], [ "nodachi_fake", 5 ] ] + "items": [ + { "group": "samurai_sword_set_fake", "prob": 7 }, + [ "bokken_fake", 6 ], + [ "nodachi_fake", 5 ], + [ "naginata_fake", 5 ] + ] }, { "id": "soa_poor_weapon_samurai", "type": "item_group", "subtype": "distribution", - "items": [ { "group": "samurai_sword_set_inferior", "prob": 7 }, [ "bokken_inferior", 6 ], [ "nodachi_inferior", 5 ] ] + "items": [ + { "group": "samurai_sword_set_inferior", "prob": 7 }, + [ "bokken_inferior", 6 ], + [ "nodachi_inferior", 5 ], + [ "naginata_inferior", 5 ] + ] }, { "id": "soa_real_weapon_samurai", "type": "item_group", "subtype": "distribution", - "items": [ { "group": "samurai_sword_set", "prob": 7 }, [ "bokken", 6 ], [ "nodachi", 5 ] ] + "items": [ { "group": "samurai_sword_set", "prob": 7 }, [ "bokken", 6 ], [ "nodachi", 5 ], [ "naginata", 5 ] ] }, { "id": "toy_box", @@ -1329,6 +1339,7 @@ [ "eboshi", 1 ], [ "kariginu", 1 ], [ "kimono", 3 ], + [ "haori", 2 ], [ "hat_fur", 2 ], [ "coat_fur_sf", 2 ], [ "coat_faux_fur", 4 ], diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 1b51bd640905a..7dfb1c42d5575 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -3166,28 +3166,6 @@ "environmental_protection": 1, "flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS" ] }, - { - "id": "geta", - "type": "ARMOR", - "name": "pair of geta", - "name_plural": "pairs of geta", - "description": "Simple wooden geta.", - "weight": 460, - "volume": 4, - "price": 6500, - "to_hit": -2, - "bashing": 5, - "material": [ "wood", "cotton" ], - "symbol": "[", - "color": "yellow", - "covers": [ "FEET" ], - "coverage": 50, - "encumbrance": 10, - "warmth": 5, - "material_thickness": 2, - "environmental_protection": 1, - "flags": [ "VARSIZE", "WATERPROOF" ] - }, { "id": "glasses_bal", "type": "ARMOR", @@ -4084,10 +4062,28 @@ "color": "dark_gray", "covers": [ "LEGS" ], "coverage": 100, + "encumbrance": 6, + "warmth": 10, + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY" ] + }, + { + "id": "hakama", + "type": "ARMOR", + "name": "hakama", + "description": "A flowing, pleated garment which can be worn over a kimono.", + "weight": 500, + "volume": 6, + "price": 3000, + "material": [ "cotton" ], + "symbol": "[", + "color": "blue", + "covers": [ "LEGS" ], + "coverage": 100, "encumbrance": 10, "warmth": 15, - "material_thickness": 1, - "flags": [ "VARSIZE" ] + "material_thickness": 2, + "flags": [ "VARSIZE", "OUTER" ] }, { "id": "halter_top", @@ -5617,9 +5613,9 @@ "covers": [ "ARMS", "LEGS", "TORSO" ], "coverage": 95, "encumbrance": 10, - "warmth": 15, + "warmth": 10, "material_thickness": 3, - "flags": [ "VARSIZE" ] + "flags": [ "VARSIZE", "STURDY" ] }, { "id": "jumpsuit", @@ -5673,9 +5669,10 @@ "symbol": "[", "color": "white", "covers": [ "ARMS", "LEGS", "TORSO" ], - "coverage": 100, - "material_thickness": 1, - "flags": [ "VARSIZE" ] + "coverage": 80, + "warmth": 5, + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY" ] }, { "id": "kariginu", @@ -5723,16 +5720,16 @@ "name": "keikogi", "description": "Plain white keikogi for use in martial arts.", "weight": 250, - "volume": 2, + "volume": 3, "price": 2500, "material": [ "cotton" ], "symbol": "[", "color": "white", "covers": [ "ARMS", "TORSO" ], - "coverage": 100, - "warmth": 10, - "material_thickness": 1, - "flags": [ "VARSIZE" ] + "coverage": 80, + "warmth": 5, + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY" ] }, { "id": "kevlar", @@ -5811,6 +5808,45 @@ "material_thickness": 2, "flags": [ "VARSIZE", "FANCY" ] }, + { + "id": "yukata", + "type": "ARMOR", + "name": "yukata", + "description": "An easy to wear, breezy robe secured with a sash. Essentially Japanese pajamas. Great for summer nights.", + "weight": 900, + "volume": 12, + "price": 5000, + "to_hit": -5, + "material": [ "cotton" ], + "symbol": "[", + "color": "blue", + "covers": [ "LEGS", "TORSO", "ARMS" ], + "coverage": 80, + "encumbrance": 3, + "storage": 4, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "FANCY" ] + }, + { + "id": "haori", + "type": "ARMOR", + "name": "haori", + "description": "A loose coat with wide sleeves that is worn unfastened over a kimono. It is jet black with sparse, tasteful golden embroidery.", + "weight": 800, + "volume": 8, + "price": 30000, + "to_hit": -5, + "material": [ "cotton" ], + "symbol": "[", + "color": "black", + "covers": [ "TORSO", "ARMS" ], + "coverage": 60, + "encumbrance": 3, + "warmth": 10, + "material_thickness": 1, + "flags": [ "VARSIZE", "SUPER_FANCY", "OUTER" ] + }, { "id": "kippah", "type": "ARMOR", @@ -8937,7 +8973,6 @@ "color": "dark_gray", "covers": [ "FEET" ], "coverage": 100, - "encumbrance": 10, "warmth": 5, "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] @@ -8956,7 +8991,6 @@ "color": "white", "covers": [ "FEET" ], "coverage": 100, - "encumbrance": 10, "warmth": 5, "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] @@ -9920,17 +9954,17 @@ "type": "ARMOR", "name": "zubon", "description": "Plain white zubon for use in martial arts.", - "weight": 250, - "volume": 2, + "weight": 150, + "volume": 3, "price": 2500, "material": [ "cotton" ], "symbol": "[", "color": "white", "covers": [ "LEGS" ], - "coverage": 100, - "warmth": 10, - "material_thickness": 1, - "flags": [ "VARSIZE" ] + "coverage": 80, + "warmth": 5, + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY" ] }, { "id": "case_violin", diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 042df4324ffe1..4d9a2d8385186 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -691,6 +691,28 @@ "material_thickness": 1, "flags": [ "SKINTIGHT", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ] }, + { + "id": "geta", + "type": "ARMOR", + "name": "pair of geta", + "name_plural": "pairs of geta", + "description": "Simple wooden geta.", + "weight": 460, + "volume": 4, + "price": 6500, + "to_hit": -2, + "bashing": 5, + "material": [ "wood", "cotton" ], + "symbol": "[", + "color": "yellow", + "covers": [ "FEET" ], + "coverage": 50, + "encumbrance": 10, + "warmth": 5, + "material_thickness": 2, + "environmental_protection": 1, + "flags": [ "VARSIZE", "WATERPROOF" ] + }, { "id": "heels", "type": "ARMOR", diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json index 3344d2797543f..48f78acbb0e6a 100644 --- a/data/json/items/book/tailor.json +++ b/data/json/items/book/tailor.json @@ -78,6 +78,24 @@ "time": 55, "fun": -1 }, + { + "id": "tailor_japanese", + "type": "BOOK", + "name": "Traditional Japanese Kimono", + "description": "An illustrated textbook on the crafting of Japanese traditional garb.", + "weight": 2400, + "volume": 6, + "price": 8000, + "bashing": 8, + "material": [ "paper", "leather" ], + "symbol": "?", + "color": "red", + "skill": "tailor", + "required_level": 3, + "max_level": 6, + "intelligence": 8, + "time": 40 + }, { "id": "recipe_fauxfur", "type": "BOOK", diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 4979bef736d89..39b0431ddfd6b 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -119,6 +119,7 @@ "volume": 8, "bashing": 10, "cutting": 1, + "to_hit": 1, "category": "weapons" }, { @@ -137,6 +138,7 @@ "volume": 8, "bashing": 18, "cutting": 1, + "to_hit": 1, "category": "weapons" }, { @@ -856,6 +858,43 @@ "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ], "price": 80000 }, + { + "type": "GENERIC", + "id": "naginata_inferior", + "name": "naginata", + "name_plural": "naginata", + "description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. This one has a bit of wiggle to its blade and feels a bit shoddily made.", + "weight": 1700, + "color": "light_gray", + "symbol": "/", + "material": [ "budget_steel", "wood" ], + "techniques": [ "WIDE", "WBLOCK_1" ], + "volume": 10, + "bashing": 6, + "cutting": 21, + "to_hit": 2, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -24 ] ], + "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ], + "price": 8000 + }, + { + "type": "GENERIC", + "id": "naginata_fake", + "name": "naginata", + "name_plural": "naginata", + "description": "This is a dull, slightly floppy replica of a Japanese polearm with a curved blade. With a little difficulty, you could use it administer a solid slap from a distance.", + "weight": 1400, + "color": "light_gray", + "symbol": "/", + "material": [ "aluminum", "wood" ], + "techniques": [ "WIDE", "WBLOCK_1" ], + "volume": 10, + "bashing": 13, + "cutting": 1, + "to_hit": -1, + "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ], + "price": 8000 + }, { "type": "GENERIC", "id": "spear_survivor", @@ -1548,8 +1587,8 @@ "flags": "SHEATH_SWORD", "weight": 753, "volume": 8, - "bashing": 6, - "cutting": 2, + "bashing": 10, + "cutting": 3, "to_hit": 1, "category": "weapons" }, @@ -1566,7 +1605,7 @@ "flags": [ "SHEATH_SWORD" ], "weight": 1133, "volume": 8, - "bashing": 3, + "bashing": 4, "cutting": 24, "to_hit": 1, "category": "weapons", @@ -1681,9 +1720,9 @@ "flags": "SHEATH_SWORD", "weight": 557, "volume": 6, - "bashing": 4, + "bashing": 7, "cutting": 2, - "to_hit": 1, + "to_hit": 2, "category": "weapons" }, { @@ -1702,7 +1741,7 @@ "volume": 6, "bashing": 3, "cutting": 20, - "to_hit": 1, + "to_hit": 2, "category": "weapons", "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 13 ] ] }, @@ -2230,7 +2269,7 @@ "price": 1800, "to_hit": 1, "bashing": 1, - "cutting": 5, + "cutting": 7, "material": "aluminum", "symbol": "/", "color": "dark_gray", @@ -2250,7 +2289,7 @@ "price": 18000, "to_hit": 2, "bashing": 1, - "cutting": 10, + "cutting": 12, "material": "budget_steel", "symbol": "/", "color": "dark_gray", diff --git a/data/json/mapgen/dojo.json b/data/json/mapgen/dojo.json index b24af5498fc45..fe23f2f623571 100644 --- a/data/json/mapgen/dojo.json +++ b/data/json/mapgen/dojo.json @@ -23,7 +23,10 @@ [ "zubon_gi", 25 ], [ "hakama_gi", 10 ], [ "mouthpiece", 5 ], - [ "obi_gi", 10 ] + [ "obi_gi", 10 ], + [ "geta", 1 ], + [ "haori", 1 ], + [ "yukata", 1 ] ] }, { diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 094900084954a..c3f9fc9e81b0a 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -406,11 +406,14 @@ "knife_hunting", "knife_trench", "kris", + "kris_fake", "machete", "makeshift_halberd", "makeshift_knife", "makeshift_machete", "naginata", + "naginata_inferior", + "naginata_fake", "pipe", "pointy_stick", "pool_cue", @@ -419,6 +422,8 @@ "q_staff", "rebar", "scimitar", + "scimitar_inferior", + "scimitar_fake", "scythe", "scythe_war", "shock_staff", @@ -468,10 +473,14 @@ "techniques": [ "tec_feint", "tec_fencing_lunge", "tec_fencing_stop_thrust", "tec_fencing_thrust" ], "weapons": [ "broadsword", + "broadsword_inferior", + "broadsword_fake", "broadfire_off", "broadfire_on", "rapier", + "rapier_fake", "cavalry_sabre", + "cavalry_sabre_fake", "fencing_foil", "fencing_sabre", "fencing_epee", @@ -533,7 +542,22 @@ } ], "techniques": [ "niten_water_cut", "niten_red_leaf", "niten_stone_cut", "niten_timing_attack", "niten_feint" ], - "weapons": [ "katana", "firekatana_off", "firekatana_on", "bokken", "wakizashi", "nodachi" ] + "weapons": [ + "katana", + "katana_inferior", + "katana_fake", + "firekatana_off", + "firekatana_on", + "bokken", + "bokken_inferior", + "bokken_fake", + "wakizashi", + "wakizashi_inferior", + "wakizashi_fake", + "nodachi", + "nodachi_inferior", + "nodachi_fake" + ] }, { "type": "martial_art", @@ -611,6 +635,8 @@ "stick", "switchblade", "tanto", + "tanto_inferior", + "tanto_fake", "tonfa", "tonfa_wood", "umbrella", @@ -817,6 +843,8 @@ "halberd", "halberd_fake", "naginata", + "naginata_inferior", + "naginata_fake", "makeshift_halberd", "pike", "pike_inferior", diff --git a/data/json/professions.json b/data/json/professions.json index 4c061bb3f9ee3..e674e134607c8 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3555,5 +3555,20 @@ "male": [ "boxer_shorts" ], "female": [ "bra", "panties" ] } + }, + { + "type": "profession", + "ident": "urban_samurai", + "name": "Urban Samurai", + "description": "You were always an inexplicable sight in town, always with the funny hair, always wearing what appeared to be some kind of Japanese bathrobe. Some claimed you were a visiting Shinto god. Little of this concerns you, but last week the grocery service stopped coming and now the TV no longer turns on. This displeases you.", + "points": 2, + "skills": { "level": 2, "name": "melee" }, + "items": { + "both": { + "items": [ "haori", "kimono", "hakama", "loincloth", "tabi_dress", "geta" ], + "entries": [ { "item": "bokken_inferior", "container-item": "scabbard" } ] + }, + "female": [ "chestwrap" ] + } } ] diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 60163068351c0..ad6819c95307b 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -265,6 +265,18 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ] ] }, + { + "result": "geta", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "fabrication", + "difficulty": 1, + "time": 40000, + "book_learn": [ [ "tailor_japanese", 2 ] ], + "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ], + "components": [ [ [ "2x4", 1 ] ], [ [ "string_6", 1 ] ] ] + }, { "result": "footrags", "type": "recipe", diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 7599f2bd0cd8e..881c9ff53168b 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -103,6 +103,18 @@ "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "leather", 8 ], [ "tanned_hide", 2 ] ] ] }, + { + "result": "hakama", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_LEGS", + "skill_used": "tailor", + "difficulty": 3, + "time": 50000, + "book_learn": [ [ "tailor_japanese", 3 ] ], + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "rag", 15 ] ] ] + }, { "result": "hot_pants", "type": "recipe", diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index d3a635dd7dc5a..48f6d8ffda512 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -520,6 +520,18 @@ "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "jumpsuit", 1 ] ], [ [ "rag", 10 ] ] ] }, + { + "result": "kimono", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_SUIT", + "skill_used": "tailor", + "difficulty": 4, + "time": 150000, + "book_learn": [ [ "tailor_japanese", 4 ] ], + "using": [ [ "sewing_standard", 35 ] ], + "components": [ [ [ "rag", 25 ] ] ] + }, { "result": "lsurvivor_suit", "type": "recipe", @@ -779,5 +791,17 @@ [ [ "duct_tape", 400 ] ], [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 42 ] ] ] + }, + { + "result": "yukata", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_SUIT", + "skill_used": "tailor", + "difficulty": 3, + "time": 90000, + "book_learn": [ [ "tailor_japanese", 3 ] ], + "using": [ [ "sewing_standard", 18 ] ], + "components": [ [ [ "rag", 16 ] ] ] } ] diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 003d1ad27d752..e4e884d0753f0 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -321,6 +321,18 @@ "using": [ [ "sewing_standard", 160 ] ], "components": [ [ [ "felt_patch", 33 ] ] ] }, + { + "result": "haori", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 5, + "time": 60000, + "book_learn": [ [ "tailor_japanese", 5 ] ], + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "rag", 20 ] ] ] + }, { "result": "hoodie", "type": "recipe", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index e54a052463e7a..fe5078f3c2503 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -2879,7 +2879,7 @@ "book_learn": [ [ "textbook_weapeast", 6 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 100 ], [ "oxy_torch", 20 ] ] ], - "components": [ [ [ "katana", 1 ] ], [ [ "stick_long", 1 ] ] ] + "components": [ [ [ "katana", 1 ], [ "wakizashi", 1 ] ], [ [ "stick_long", 1 ] ] ] }, { "type": "recipe",