Japanese stuff (New profession, items, and tweaks) (#29883)

* 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. * 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. * 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. * 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 * 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. * Update armor.json * Move geta to boots.json * Add japanese tailoring book and recipes * Final tweaks to wording and profession * add naginata to naginata recipe now you can craft a naginata from a wakizashi as an alternative to a katana
CleverRaven · May 8, 2019 · d225685 · d225685
1 parent 2203dfc
commit d225685
Show file tree

Hide file tree

Showing 14 changed files with 304 additions and 60 deletions.
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -389,7 +389,7 @@
       [ "kippah", 1 ],
       [ "robe", 3 ],
       [ "thawb", 1 ],
-      [ "kimono", 1 ],
+      [ "yukata", 1 ],
       [ "eclipse_glasses", 1 ],
       [ "reading_light", 9 ]
     ]
@@ -1139,7 +1139,11 @@
       [ "robe", 10 ],
       [ "eboshi", 1 ],
       [ "kariginu", 1 ],
-      [ "kimono", 5 ],
+      [ "geta", 1 ],
+      [ "kimono", 2 ],
+      [ "yukata", 6 ],
+      [ "haori", 2 ],
+      [ "hakama", 4 ],
       [ "eclipse_glasses", 1 ],
       [ "thermos", 20 ]
     ]
@@ -3044,7 +3048,11 @@
       [ "robe", 5 ],
       [ "eboshi", 1 ],
       [ "kariginu", 1 ],
-      [ "kimono", 3 ]
+      [ "geta", 1 ],
+      [ "kimono", 2 ],
+      [ "yukata", 4 ],
+      [ "haori", 1 ],
+      [ "hakama", 2 ]
     ]
   },
   {
@@ -4419,7 +4427,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 ],
@@ -8208,6 +8220,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
@@ -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
@@ -3191,28 +3191,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",
@@ -4109,10 +4087,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",
@@ -5642,9 +5638,9 @@
     "covers": [ "ARMS", "LEGS", "TORSO" ],
     "coverage": 95,
     "encumbrance": 10,
-    "warmth": 15,
+    "warmth": 10,
     "material_thickness": 3,
-    "flags": [ "VARSIZE" ]
+    "flags": [ "VARSIZE", "STURDY" ]
   },
   {
     "id": "jumpsuit",
@@ -5698,9 +5694,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",
@@ -5748,16 +5745,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",
@@ -5836,6 +5833,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",
@@ -8989,7 +9025,6 @@
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 100,
-    "encumbrance": 10,
     "warmth": 5,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT" ]
@@ -9008,7 +9043,6 @@
     "color": "white",
     "covers": [ "FEET" ],
     "coverage": 100,
-    "encumbrance": 10,
     "warmth": 5,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT" ]
@@ -9991,17 +10025,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
@@ -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
@@ -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",