Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 13 commits into from
May 8, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
45dbe7e
Japanese melee pass
SeanWiig Apr 12, 2019
722a5d2
Japanese clothing pass
SeanWiig Apr 12, 2019
f0e3f12
martial arts apply to _inferior and _fake across the board
SeanWiig Apr 12, 2019
4fae63f
itemgroups updated
SeanWiig Apr 12, 2019
0d132b0
Added urban samurai profession.
SeanWiig Apr 12, 2019
3b3dbd3
Update armor.json
SeanWiig Apr 12, 2019
04dd14f
Move geta to boots.json
SeanWiig Apr 24, 2019
fcea207
Add japanese tailoring book and recipes
SeanWiig Apr 24, 2019
de92b71
Final tweaks to wording and profession
SeanWiig Apr 24, 2019
5a20b3c
Linting on item_groups.json
SeanWiig Apr 24, 2019
e68fbd9
More linting!
SeanWiig Apr 24, 2019
16fb5b8
Still more linting
SeanWiig Apr 24, 2019
a28adb0
add naginata to naginata recipe
SeanWiig May 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions data/json/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
[ "kippah", 1 ],
[ "robe", 3 ],
[ "thawb", 1 ],
[ "kimono", 1 ],
[ "yukata", 1 ],
[ "eclipse_glasses", 1 ],
[ "reading_light", 9 ]
]
Expand Down Expand Up @@ -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 ]
]
Expand Down Expand Up @@ -3297,7 +3301,11 @@
[ "robe", 5 ],
[ "eboshi", 1 ],
[ "kariginu", 1 ],
[ "kimono", 3 ]
[ "geta", 1 ],
[ "kimono", 2 ],
[ "yukata", 4 ],
[ "haori", 1 ],
[ "hakama", 2 ]
]
},
{
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -9002,6 +9014,8 @@
[ "cavalry_sabre", 2 ],
[ "glaive", 2 ],
[ "naginata", 2 ],
[ "naginata_fake", 2 ],
[ "naginata_inferior", 3 ],
[ "estoc", 2 ],
[ "estoc_fake", 6 ],
[ "qiang", 3 ],
Expand Down
17 changes: 14 additions & 3 deletions data/json/itemgroups/mansion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -1329,6 +1339,7 @@
[ "eboshi", 1 ],
[ "kariginu", 1 ],
[ "kimono", 3 ],
[ "haori", 2 ],
[ "hat_fur", 2 ],
[ "coat_fur_sf", 2 ],
[ "coat_faux_fur", 4 ],
Expand Down
118 changes: 76 additions & 42 deletions data/json/items/armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -8937,7 +8973,6 @@
"color": "dark_gray",
"covers": [ "FEET" ],
"coverage": 100,
"encumbrance": 10,
"warmth": 5,
"material_thickness": 1,
"flags": [ "VARSIZE", "SKINTIGHT" ]
Expand All @@ -8956,7 +8991,6 @@
"color": "white",
"covers": [ "FEET" ],
"coverage": 100,
"encumbrance": 10,
"warmth": 5,
"material_thickness": 1,
"flags": [ "VARSIZE", "SKINTIGHT" ]
Expand Down Expand Up @@ -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",
Expand Down
22 changes: 22 additions & 0 deletions data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/book/tailor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading