From 45dbe7e9315467b7392a63ef985f6db74a8c4cb9 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 11 Apr 2019 20:36:56 -0400 Subject: [PATCH 01/13] Japanese melee pass - Added naginata_fake and naginata_inferior - Small buff to fake and inferior variants of Japanese weapons. Fake variants are still worse than a makeshift crowbar. --- data/json/items/melee.json | 55 ++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 8 deletions(-) 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", From 722a5d2645d342714ce476faaba49dc728228936 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 11 Apr 2019 21:06:20 -0400 Subject: [PATCH 02/13] Japanese clothing pass - Yukata added. Yukata is similar to the kimono, but has less protection and less warmth and even less encumbrance. It is slightly more common than the kimono. Like the kimono, it has the flag FANCY. -Haori added. It is a torso and arm outer garment with the SUPER_FANCY flag and low encumbrance. It is not very protective. It is a rare item. - dress hakama added. This is an outer wear leg garment. It is not very protective. The idea is that you could wear it over a kimono or yukata (or anything else) - keikogi, karate_gi, zubon_gi, hakama_gi now have 2 defense, instead of 1, and have the STURDY flag. The idea is that martial arts wear is meant to withstand a lot of abuse and tumbling and are at least as tough and more tear-proof than jeans, which have 3? defense. keikogi and zubon_gi are now identical in terms of stats to the karate_gi, except that they're for legs or upper body only. hakama_gi now has slightly more coverage and warmth than zubon_gi, at the expense of being slightly more cumbersome. - tabi_gi and tabi_dress no longer have 10 encumbrance, which made them straight worse than socks with otherwise identical stats. --- data/json/items/armor.json | 96 ++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 20 deletions(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 1b51bd640905a..ad2ec2612c099 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -4084,10 +4084,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 +5635,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 +5691,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 +5742,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 +5830,45 @@ "material_thickness": 2, "flags": [ "VARSIZE", "FANCY" ] }, + { + "id": "yukata", + "type": "ARMOR", + "name": "yukata", + "description": "A easy to wear, breezy Japanese robe secured with a sash. Essentially Japanese pajamas. Great to wear out on a summer night.", + "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 +8995,6 @@ "color": "dark_gray", "covers": [ "FEET" ], "coverage": 100, - "encumbrance": 10, "warmth": 5, "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] @@ -8956,7 +9013,6 @@ "color": "white", "covers": [ "FEET" ], "coverage": 100, - "encumbrance": 10, "warmth": 5, "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] @@ -9920,17 +9976,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", From f0e3f124f3e81e803a5303c8b877e1bce807776d Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 11 Apr 2019 21:09:52 -0400 Subject: [PATCH 03/13] martial arts apply to _inferior and _fake across the board All martial arts which applied to weapons with fake and inferior variants now apply to all fake and inferior variants. This was already the case for the halberd and halberd_fake, now it's consistent for all weapons. Also, the survivor naginata was added to sojutsu. --- data/json/martialarts.json | 39 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 094900084954a..46df697f80208 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", @@ -532,8 +541,29 @@ "max_stacks": 1 } ], - "techniques": [ "niten_water_cut", "niten_red_leaf", "niten_stone_cut", "niten_timing_attack", "niten_feint" ], - "weapons": [ "katana", "firekatana_off", "firekatana_on", "bokken", "wakizashi", "nodachi" ] + "techniques": [ + "niten_water_cut", + "niten_red_leaf", + "niten_stone_cut", + "niten_timing_attack", + "niten_feint" + ], + "weapons": [ + "katana", + "katana_inferior", + "katana_fake", + "firekatana_off", + "firekatana_on", + "bokken", + "bokken_inferior", + "bokken_fake", + "wakizashi", + "wakizahi_inferior", + "wakizashi_fake", + "nodachi", + "nodachi_inferior", + "nodachi_fake" + ] }, { "type": "martial_art", @@ -611,6 +641,8 @@ "stick", "switchblade", "tanto", + "tanto_inferior", + "tanto_fake", "tonfa", "tonfa_wood", "umbrella", @@ -817,6 +849,9 @@ "halberd", "halberd_fake", "naginata", + "naginata_inferior", + "naginata_fake", + "survivor_naginata", "makeshift_halberd", "pike", "pike_inferior", From 4fae63fcb6c14de22d450e0268f9a8d8dc7ed7d8 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 11 Apr 2019 21:41:44 -0400 Subject: [PATCH 04/13] itemgroups updated - added the new items to the itemgroups, with haori being treated as a rare item and the kimono is slightly less common than before, while yukata is more common. Also, geta was added to itemgroups. - Fixed some typos --- data/json/item_groups.json | 22 ++++++++++++++++++---- data/json/itemgroups/mansion.json | 7 ++++--- data/json/mapgen/dojo.json | 5 ++++- data/json/martialarts.json | 7 +++---- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index af911752632fc..47882c0fdc0f8 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..47e080f9d3ea4 100644 --- a/data/json/itemgroups/mansion.json +++ b/data/json/itemgroups/mansion.json @@ -480,19 +480,19 @@ "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 +1329,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/mapgen/dojo.json b/data/json/mapgen/dojo.json index b24af5498fc45..8186a3c99e793 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 46df697f80208..15dde51e3dbb7 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -406,7 +406,7 @@ "knife_hunting", "knife_trench", "kris", - "kris_fake" + "kris_fake", "machete", "makeshift_halberd", "makeshift_knife", @@ -474,7 +474,7 @@ "weapons": [ "broadsword", "broadsword_inferior", - "broadsword_fake" + "broadsword_fake", "broadfire_off", "broadfire_on", "rapier", @@ -558,7 +558,7 @@ "bokken_inferior", "bokken_fake", "wakizashi", - "wakizahi_inferior", + "wakizashi_inferior", "wakizashi_fake", "nodachi", "nodachi_inferior", @@ -851,7 +851,6 @@ "naginata", "naginata_inferior", "naginata_fake", - "survivor_naginata", "makeshift_halberd", "pike", "pike_inferior", From 0d132b04c2fb11cb012f7f453cbc90965394285c Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 11 Apr 2019 22:08:00 -0400 Subject: [PATCH 05/13] Added urban samurai profession. Added urban samurai. Starts with very fancy clothes and decent early-game melee. It is unique in being the only profession to start with a weapon compatible with niten ichi-ryu. --- data/json/professions.json | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/data/json/professions.json b/data/json/professions.json index 4c061bb3f9ee3..4677acdeae15e 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3555,5 +3555,36 @@ "male": [ "boxer_shorts" ], "female": [ "bra", "panties" ] } + }, + { + "type": "profession", + "ident": "urban_samurai", + "name": "Urban Samurai", + "description": "You were an unusual presence in town, always sighted in what appeared to be a Japanese bathrobe. Some claimed you were the earthly apparition of an old shinto god; others said you once won a skateboarding championship in another state. More importantly, the grocery service stopped coming last week, and now the TV no longer turns on. This displeases you.", + "points": 2, + "skills": { "level": 2, "name": "melee" }, + "items": { + "male": { + "entries": [ { "item": "wakizashi_inferior", "container-item": "scabbard" } ] + }, + "female": { + "items": [ + "chestwrap", + "barrette" + ], + "entries": [ { "item": "bokken_inferior", "container-item": "scabbard" } ] + }, + "both": { + "items": [ + "haori", + "kimono", + "hakama", + "loincloth", + "tabi_dress", + "geta" + ], + "entries": [ { "item": "whiskey", "container-item": "flask_hip" } ] + } } +} ] From 3b3dbd397d8c3838fd56abe44e8f6e00b85c0042 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 11 Apr 2019 23:00:09 -0400 Subject: [PATCH 06/13] Update armor.json --- data/json/items/armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index ad2ec2612c099..1cb48ac1a2146 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -5834,7 +5834,7 @@ "id": "yukata", "type": "ARMOR", "name": "yukata", - "description": "A easy to wear, breezy Japanese robe secured with a sash. Essentially Japanese pajamas. Great to wear out on a summer night.", + "description": "An easy to wear, breezy Japanese robe secured with a sash. Essentially Japanese pajamas. Great to wear out on a summer night.", "weight": 900, "volume": 12, "price": 5000, From 04dd14ffeab68f3bc9a0478e69e0eaf6d451e01d Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Wed, 24 Apr 2019 02:25:10 -0400 Subject: [PATCH 07/13] Move geta to boots.json --- data/json/items/armor.json | 22 ---------------------- data/json/items/armor/boots.json | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 1cb48ac1a2146..ea2cac904ef63 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", 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", From fcea2078fc70b1bec2c95f5523e41a9e63ca215c Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Wed, 24 Apr 2019 02:25:41 -0400 Subject: [PATCH 08/13] Add japanese tailoring book and recipes --- data/json/items/book/tailor.json | 18 ++++++++++++++++++ data/json/recipes/armor/feet.json | 12 ++++++++++++ data/json/recipes/armor/legs.json | 12 ++++++++++++ data/json/recipes/armor/suit.json | 24 ++++++++++++++++++++++++ data/json/recipes/armor/torso.json | 12 ++++++++++++ 5 files changed, 78 insertions(+) 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/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 60163068351c0..14a66da4b8b2b 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", From de92b7177e7dcc5d94bd59bd90539155a3eabfd0 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Wed, 24 Apr 2019 02:26:11 -0400 Subject: [PATCH 09/13] Final tweaks to wording and profession --- data/json/items/armor.json | 2 +- data/json/professions.json | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index ea2cac904ef63..7dfb1c42d5575 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -5812,7 +5812,7 @@ "id": "yukata", "type": "ARMOR", "name": "yukata", - "description": "An easy to wear, breezy Japanese robe secured with a sash. Essentially Japanese pajamas. Great to wear out on a summer night.", + "description": "An easy to wear, breezy robe secured with a sash. Essentially Japanese pajamas. Great for summer nights.", "weight": 900, "volume": 12, "price": 5000, diff --git a/data/json/professions.json b/data/json/professions.json index 4677acdeae15e..4951baee7d462 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3560,20 +3560,10 @@ "type": "profession", "ident": "urban_samurai", "name": "Urban Samurai", - "description": "You were an unusual presence in town, always sighted in what appeared to be a Japanese bathrobe. Some claimed you were the earthly apparition of an old shinto god; others said you once won a skateboarding championship in another state. More importantly, the grocery service stopped coming last week, and now the TV no longer turns on. This displeases you.", + "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": { - "male": { - "entries": [ { "item": "wakizashi_inferior", "container-item": "scabbard" } ] - }, - "female": { - "items": [ - "chestwrap", - "barrette" - ], - "entries": [ { "item": "bokken_inferior", "container-item": "scabbard" } ] - }, "both": { "items": [ "haori", @@ -3583,8 +3573,9 @@ "tabi_dress", "geta" ], - "entries": [ { "item": "whiskey", "container-item": "flask_hip" } ] - } + "entries": [ { "item": "bokken_inferior", "container-item": "scabbard" } ] + }, + "female": [ "chestwrap" ] } } ] From 5a20b3c3cd1fd4d8f0d120884bd4fac0dff93b81 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Wed, 24 Apr 2019 03:27:27 -0400 Subject: [PATCH 10/13] Linting on item_groups.json --- data/json/item_groups.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 47882c0fdc0f8..7363cdcccdfc5 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -1201,7 +1201,7 @@ [ "robe", 10 ], [ "eboshi", 1 ], [ "kariginu", 1 ], - [ "geta", 1], + [ "geta", 1 ], [ "kimono", 2 ], [ "yukata", 6 ], [ "haori", 2 ], @@ -3301,7 +3301,7 @@ [ "robe", 5 ], [ "eboshi", 1 ], [ "kariginu", 1 ], - [ "geta", 1], + [ "geta", 1 ], [ "kimono", 2 ], [ "yukata", 4 ], [ "haori", 1 ], @@ -5177,7 +5177,7 @@ [ "yukata", 4 ], [ "haori", 1 ], [ "hakama", 2 ], - [ "geta",1 ], + [ "geta", 1 ], [ "l-stick", 1 ], [ "solarpack", 5 ], [ "tourist_table", 10 ], From e68fbd9f1ed1c7d485fe960e8ce933ab1038b03d Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Wed, 24 Apr 2019 03:43:31 -0400 Subject: [PATCH 11/13] More linting! --- data/json/mapgen/dojo.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/dojo.json b/data/json/mapgen/dojo.json index 8186a3c99e793..fe23f2f623571 100644 --- a/data/json/mapgen/dojo.json +++ b/data/json/mapgen/dojo.json @@ -24,9 +24,9 @@ [ "hakama_gi", 10 ], [ "mouthpiece", 5 ], [ "obi_gi", 10 ], - [ "geta", 1], - [ "haori", 1], - [ "yukata", 1] + [ "geta", 1 ], + [ "haori", 1 ], + [ "yukata", 1 ] ] }, { From 16fb5b84dc5708d015bafc0eeb75a266ee3603fb Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Wed, 24 Apr 2019 04:09:40 -0400 Subject: [PATCH 12/13] Still more linting --- data/json/itemgroups/mansion.json | 14 +++++++++++-- data/json/martialarts.json | 8 +------- data/json/professions.json | 33 ++++++++++++------------------- data/json/recipes/armor/feet.json | 2 +- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json index 47e080f9d3ea4..c696ef553f887 100644 --- a/data/json/itemgroups/mansion.json +++ b/data/json/itemgroups/mansion.json @@ -480,13 +480,23 @@ "id": "soa_fake_weapon_samurai", "type": "item_group", "subtype": "distribution", - "items": [ { "group": "samurai_sword_set_fake", "prob": 7 }, [ "bokken_fake", 6 ], [ "nodachi_fake", 5 ], [ "naginata_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 ], [ "naginata_inferior", 5 ] ] + "items": [ + { "group": "samurai_sword_set_inferior", "prob": 7 }, + [ "bokken_inferior", 6 ], + [ "nodachi_inferior", 5 ], + [ "naginata_inferior", 5 ] + ] }, { "id": "soa_real_weapon_samurai", diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 15dde51e3dbb7..c3f9fc9e81b0a 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -541,13 +541,7 @@ "max_stacks": 1 } ], - "techniques": [ - "niten_water_cut", - "niten_red_leaf", - "niten_stone_cut", - "niten_timing_attack", - "niten_feint" - ], + "techniques": [ "niten_water_cut", "niten_red_leaf", "niten_stone_cut", "niten_timing_attack", "niten_feint" ], "weapons": [ "katana", "katana_inferior", diff --git a/data/json/professions.json b/data/json/professions.json index 4951baee7d462..e674e134607c8 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3557,25 +3557,18 @@ } }, { - "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" ] + "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 14a66da4b8b2b..ad6819c95307b 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -274,7 +274,7 @@ "difficulty": 1, "time": 40000, "book_learn": [ [ "tailor_japanese", 2 ] ], - "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ], + "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ] ], [ [ "string_6", 1 ] ] ] }, { From a28adb0e2bd2612c08dca42e04a10e7b79eba7b7 Mon Sep 17 00:00:00 2001 From: SeanWiig Date: Thu, 2 May 2019 03:49:56 -0400 Subject: [PATCH 13/13] add naginata to naginata recipe now you can craft a naginata from a wakizashi as an alternative to a katana --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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",