aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-12 00:49:50 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-12 00:49:50 -0700
commit5bc8eb5237c7eb570cc1586e75c4c3f51d9bb443 (patch)
treef4cb832c5e813f228a4af211b0c4f6152a99c3c8
parentClean up formatting (diff)
downloadcataclysm-dda-mod_battle-maid-redone-5bc8eb5237c7eb570cc1586e75c4c3f51d9bb443.tar.xz
Clean up formatting to make syncing against another repo easier
-rw-r--r--ammo.json66
-rw-r--r--ammo_types.json16
-rw-r--r--armor.json522
-rw-r--r--martial_arts_manuals.json12
-rw-r--r--martialarts.json70
-rw-r--r--materials.json32
-rw-r--r--monster_drops.json8
-rw-r--r--mutations.json38
-rw-r--r--professions.json16
-rw-r--r--techniques.json144
-rw-r--r--tool_armor.json4
-rw-r--r--tools.json181
12 files changed, 559 insertions, 550 deletions
diff --git a/ammo.json b/ammo.json
index 7363361..60ebd3c 100644
--- a/ammo.json
+++ b/ammo.json
@@ -1,39 +1,39 @@
[
{
- "type" : "AMMO",
- "id" : "assassins_throwing_dagger",
- "category" : "weapons",
- "price" : 9000,
- "name" : { "str": "assassin's throwing knife" },
- "symbol" : "/",
- "color" : "light_gray",
- "description" : "A nimble blade meant for ranged assassination, but makes an improvised cutlery tool in a pinch. It's very lightweight and silent and can be used on both zombies and games involving apples.",
- "material" : ["steel","leather"],
- "volume" : "1000 ml",
- "weight" : "750 g",
- "cutting" : 21,
- "to_hit" : 2,
- "flags" : ["SPEAR","SHEATH_KNIFE"],
- "qualities": [["CUT", 1], ["BUTCHER", 10]],
- "ammo_type" : "assassins_throwing_dagger",
- "count" : 4,
- "stack_size" : 4
+ "type": "AMMO",
+ "id": "assassins_throwing_dagger",
+ "category": "weapons",
+ "price": 9000,
+ "name": { "str": "assassin's throwing knife" },
+ "symbol": "/",
+ "color": "light_gray",
+ "description": "A nimble blade meant for ranged assassination, but makes an improvised cutlery tool in a pinch. It's very lightweight and silent and can be used on both zombies and games involving apples.",
+ "material": [ "steel", "leather" ],
+ "volume": "1 L",
+ "weight": "750 g",
+ "cutting": 21,
+ "to_hit": 2,
+ "flags": [ "SPEAR", "SHEATH_KNIFE" ],
+ "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ],
+ "ammo_type": "assassins_throwing_dagger",
+ "count": 4,
+ "stack_size": 4
},
{
- "type" : "AMMO",
- "id" : "makeshift_throwing_knife",
- "category" : "weapons",
- "price" : 5200,
- "name" : { "str": "makeshift throwing knife" },
- "symbol" : ";",
- "color" : "light_gray",
- "description" : "A crude and simple throwing knife made from a sharpened piece of salvaged steel with cloth wrapped around it. It's better than throwing rocks, at least.",
- "material" : ["steel"],
- "weight" : "600 g",
- "volume" : "250 ml",
- "bashing" : 1,
- "cutting" : 7,
- "ammo_type" : "makeshift_throwing_knife",
- "count" : 5
+ "type": "AMMO",
+ "id": "makeshift_throwing_knife",
+ "category": "weapons",
+ "price": 5200,
+ "name": { "str": "makeshift throwing knife" },
+ "symbol": ";",
+ "color": "light_gray",
+ "description": "A crude and simple throwing knife made from a sharpened piece of salvaged steel with cloth wrapped around it. It's better than throwing rocks, at least.",
+ "material": [ "steel" ],
+ "volume": "250 ml",
+ "weight": "600 g",
+ "bashing": 3,
+ "cutting": 9,
+ "ammo_type": "makeshift_throwing_knife",
+ "count": 5
}
]
diff --git a/ammo_types.json b/ammo_types.json
index 8264c45..67c3b7e 100644
--- a/ammo_types.json
+++ b/ammo_types.json
@@ -1,14 +1,14 @@
[
{
- "type" : "ammunition_type",
- "id" : "makeshift_throwing_knife",
- "name" : "makeshift throwing knife",
- "default" : "makeshift_throwing_knife"
+ "type": "ammunition_type",
+ "id": "makeshift_throwing_knife",
+ "name": "makeshift throwing knife",
+ "default": "makeshift_throwing_knife"
},
{
- "type" : "ammunition_type",
- "id" : "assassins_throwing_dagger",
- "name" : "assassin's throwing knife",
- "default" : "assassins_throwing_dagger"
+ "type": "ammunition_type",
+ "id": "assassins_throwing_dagger",
+ "name": "assassin's throwing knife",
+ "default": "assassins_throwing_dagger"
}
]
diff --git a/armor.json b/armor.json
index 5c7ff6d..4964fb3 100644
--- a/armor.json
+++ b/armor.json
@@ -1,33 +1,33 @@
[
{
- "id" : "maid_dress",
- "type" : "ARMOR",
- "category" : "clothing",
- "name" : { "str": "victorian maid dress", "str_pl": "victorian maid dresses" },
- "description" : "A classic maid outfit with a white apron, frills and a black one piece. It has some storage space thanks to the many pockets, including space for throwing knives.",
- "weight" : "800 g",
- "volume" : "4250 ml",
- "price" : 5000,
- "material" : ["cotton"],
- "symbol" : "[",
- "color" : "black",
- "covers" : ["TORSO", "ARMS", "LEGS"],
- "coverage" : 95,
- "encumbrance" : 10,
- "storage" : "2500 ml",
- "warmth" : 20,
- "material_thickness" : 4,
- "environmental_protection" : 1,
- "flags" : ["VARSIZE", "FANCY"]
+ "id": "maid_dress",
+ "type": "ARMOR",
+ "category": "clothing",
+ "name": { "str": "Victorian maid dress", "str_pl": "Victorian maid dresses" },
+ "description": "A classic maid outfit with a white apron, frills and a black one piece. It has some storage space thanks to the many pockets, including space for throwing knives.",
+ "weight": "800 g",
+ "volume": "4250 ml",
+ "price": 5000,
+ "material": ["cotton"],
+ "symbol": "[",
+ "color": "black",
+ "covers": ["TORSO", "ARMS", "LEGS"],
+ "coverage": 95,
+ "encumbrance": 10,
+ "storage": "2500 ml",
+ "warmth": 20,
+ "material_thickness": 4,
+ "environmental_protection": 1,
+ "flags": ["VARSIZE", "FANCY"]
},
{
"id": "kawaii_maid_dress_long_leather",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "tailored victorian maid dress" },
+ "name": { "str": "tailored victorian maid dress" },
"description": "A classic maid outfit with a white apron, frills and a black one piece. It has been reinforced with leather for greater protection.",
- "weight" : "5100 g",
- "volume" : "10250 ml",
+ "weight": "5100 g",
+ "volume": "10250 ml",
"price": 800000,
"material": [ "leather", "cotton" ],
"symbol": "[",
@@ -39,16 +39,16 @@
"warmth": 40,
"material_thickness": 5,
"environmental_protection": 2,
- "flags" : ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "FANCY"]
+ "flags": ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "FANCY"]
},
{
"id": "kawaii_maid_dress_long_armor",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "survivor victorian maid dress" },
+ "name": { "str": "survivor victorian maid dress" },
"description": "A classic maid outfit with a white apron, frills and a black one piece. It has been reinforced with kevlar for greater protection.",
- "weight" : "5100 g",
- "volume" : "10250 ml",
+ "weight": "5100 g",
+ "volume": "10250 ml",
"price": 800000,
"material": [ "kevlar", "cotton" ],
"symbol": "[",
@@ -67,35 +67,35 @@
"max_volume": "2 L",
"flags": [ "SHEATH_SWORD" ]
},
- "flags" : ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"]
- },
- {
- "id" : "maid_dress_french",
- "type" : "ARMOR",
- "category" : "clothing",
- "name" : { "str": "french maid dress", "str_pl" : "french maid dresses" },
- "description" : "The French maid dress, blue with a frilly white apron.",
- "weight" : "100 g",
- "volume" : "250 ml",
- "price" : 5000,
- "material" : ["cotton"],
- "symbol" : "[",
- "color" : "blue",
- "covers" : ["TORSO", "ARMS", "LEGS"],
- "coverage" : 75,
- "encumbrance" : 7,
- "storage" : "500 ml",
- "warmth" : 5,
- "material_thickness" : 1,
- "flags" : ["VARSIZE", "SUPER_FANCY"]
+ "flags": ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"]
+ },
+ {
+ "id": "maid_dress_french",
+ "type": "ARMOR",
+ "category": "clothing",
+ "name": { "str": "french maid dress", "str_pl": "french maid dresses" },
+ "description": "The French maid dress, blue with a frilly white apron.",
+ "weight": "100 g",
+ "volume": "250 ml",
+ "price": 5000,
+ "material": ["cotton"],
+ "symbol": "[",
+ "color": "blue",
+ "covers": ["TORSO", "ARMS", "LEGS"],
+ "coverage": 75,
+ "encumbrance": 7,
+ "storage": "500 ml",
+ "warmth": 5,
+ "material_thickness": 1,
+ "flags": ["VARSIZE", "SUPER_FANCY"]
},
{
"id": "kawaii_maid_dress",
"type": "ARMOR",
- "name" : { "str": "maid dress" },
+ "name": { "str": "maid dress" },
"description": "A black dress with white apron and lace trim, worn by maids.",
- "weight" : "150 g",
- "volume" : "1000 ml",
+ "weight": "150 g",
+ "volume": "1000 ml",
"price": 50000,
"material": [ "cotton" ],
"symbol": "[",
@@ -111,10 +111,10 @@
{
"id": "kawaii_maid_dress_ex",
"type": "ARMOR",
- "name" : { "str": "tailored maid dress" },
+ "name": { "str": "tailored maid dress" },
"description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with leather for better protection.",
- "weight" : "5830 g",
- "volume" : "7500 ml",
+ "weight": "5830 g",
+ "volume": "7500 ml",
"price": 50000,
"material": [ "cotton" ],
"symbol": "[",
@@ -132,10 +132,10 @@
"id": "kawaii_maid_dress_lss",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "survivor maid dress" },
+ "name": { "str": "survivor maid dress" },
"description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with kevlar for greater protection.",
- "weight" : "5100 g",
- "volume" : "10250 ml",
+ "weight": "5100 g",
+ "volume": "10250 ml",
"price": 800000,
"material": [ "kevlar", "cotton" ],
"symbol": "[",
@@ -157,33 +157,33 @@
"flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
},
{
- "id" : "jokyu_fuku",
- "type" : "ARMOR",
- "category" : "clothing",
- "name" : { "str": "jokyū dress", "str_pl" : "jokyū dresses" },
- "weight" : "1200 g",
- "volume" : "5000 ml",
- "color" : "brown",
- "covers" : ["TORSO", "ARMS", "LEGS"],
- "storage" : "500 ml",
- "symbol" : "[",
- "description" : "Women's servant clothes worn in Japanese cafes a long time ago. Essentially a white apron over a kimono.",
- "price" : 5000,
- "material" : ["cotton"],
- "warmth" : 20,
- "environmental_protection" : 1,
- "encumbrance" : 8,
- "flags" : ["VARSIZE", "FANCY"],
- "coverage" : 95,
- "material_thickness" : 4
+ "id": "jokyu_fuku",
+ "type": "ARMOR",
+ "category": "clothing",
+ "name": { "str": "jokyū dress", "str_pl": "jokyū dresses" },
+ "weight": "1200 g",
+ "volume": "5000 ml",
+ "color": "brown",
+ "covers": ["TORSO", "ARMS", "LEGS"],
+ "storage": "500 ml",
+ "symbol": "[",
+ "description": "Women's servant clothes worn in Japanese cafes a long time ago. Essentially a white apron over a kimono.",
+ "price": 5000,
+ "material": ["cotton"],
+ "warmth": 20,
+ "environmental_protection": 1,
+ "encumbrance": 8,
+ "flags": ["VARSIZE", "FANCY"],
+ "coverage": 95,
+ "material_thickness": 4
},
{
"id": "kawaii_hat_cotton",
"type": "ARMOR",
- "name" : { "str": "maid hat" },
+ "name": { "str": "maid hat" },
"description": "It's a warm hat made of cotton, coloured white to better match a maid uniform.",
- "weight" : "78 g",
- "volume" : "250 ml",
+ "weight": "78 g",
+ "volume": "250 ml",
"price": 2000,
"material": [ "cotton" ],
"symbol": "[",
@@ -197,10 +197,10 @@
{
"id": "kawaii_maid_hat",
"type": "ARMOR",
- "name" : { "str": "maid headband" },
+ "name": { "str": "maid headband" },
"description": "A black headband with white lace trim, worn by maids.",
- "weight" : "150 g",
- "volume" : "250 ml",
+ "weight": "150 g",
+ "volume": "250 ml",
"price": 2500,
"material": [ "cotton" ],
"symbol": "[",
@@ -216,10 +216,10 @@
"id": "kawaii_maid_hat_thermal_off",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "tailored maid headband" },
+ "name": { "str": "tailored maid headband" },
"description": "A black headband with white lace trim, worn by maids. It has been reinforced with leather for greater protection.",
- "weight" : "250 g",
- "volume" : "250 ml",
+ "weight": "250 g",
+ "volume": "250 ml",
"price": 25000,
"material": [ "leather", "cotton" ],
"symbol": "[",
@@ -235,10 +235,10 @@
"id": "kawaii_maid_hat_lss",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "survivor maid headband" },
+ "name": { "str": "survivor maid headband" },
"description": "A black headband with white lace trim, worn by maids. It has been reinforced with kevlar for greater protection.",
- "weight" : "350 g",
- "volume" : "250 ml",
+ "weight": "350 g",
+ "volume": "250 ml",
"price": 55000,
"material": [ "kevlar", "cotton" ],
"symbol": "[",
@@ -263,10 +263,10 @@
{
"id": "maid_hat",
"type": "ARMOR",
- "name" : { "str": "french maid headband"},
+ "name": { "str": "french maid headband"},
"description": "A frilly white headpiece.",
- "weight" : "10 g",
- "volume" : "250 ml",
+ "weight": "10 g",
+ "volume": "250 ml",
"price": 2500,
"material": [ "cotton" ],
"symbol": "[",
@@ -281,10 +281,10 @@
{
"id": "maid_gloves_cotton",
"type": "ARMOR",
- "name" : { "str": "pair of maid gloves", "str_pl": "pairs of maid gloves" },
+ "name": { "str": "pair of maid gloves", "str_pl": "pairs of maid gloves" },
"description": "A pair of white gloves, used by maids.",
- "weight" : "118 g",
- "volume" : "250 ml",
+ "weight": "118 g",
+ "volume": "250 ml",
"price": 1100,
"to_hit": 1,
"material": [ "cotton" ],
@@ -300,10 +300,10 @@
{
"id": "maid_gloves_leather",
"type": "ARMOR",
- "name" : { "str": "pair of tailored maid gloves", "str_pl": "pairs of tailored maid gloves" },
+ "name": { "str": "pair of tailored maid gloves", "str_pl": "pairs of tailored maid gloves" },
"description": "A pair of white gloves, used by maids. They have been reinforced with leather for greater protection.",
- "weight" : "150 g",
- "volume" : "500 ml",
+ "weight": "150 g",
+ "volume": "500 ml",
"price": 12000,
"to_hit": 1,
"material": [ "cotton", "leather" ],
@@ -321,10 +321,10 @@
"id": "maid_gloves_armor",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "pair of survivor maid gloves", "str_pl": "pairs of survivor maid gloves" },
+ "name": { "str": "pair of survivor maid gloves", "str_pl": "pairs of survivor maid gloves" },
"description": "A pair of white gloves, used by maids. They have been reinforced with kevlar for greater protection.",
- "weight" : "190 g",
- "volume" : "750 ml",
+ "weight": "190 g",
+ "volume": "750 ml",
"price": 18000,
"to_hit": 2,
"material": [ "cotton", "kevlar" ],
@@ -341,10 +341,10 @@
{
"id": "maid_gloves_long_cotton",
"type": "ARMOR",
- "name" : { "str": "pair of long maid gloves", "str_pl": "pairs of long maid gloves" },
+ "name": { "str": "pair of long maid gloves", "str_pl": "pairs of long maid gloves" },
"description": "A pair of long white gloves, used by maids.",
- "weight" : "400 g",
- "volume" : "1000 ml",
+ "weight": "400 g",
+ "volume": "1000 ml",
"price": 1100,
"to_hit": 1,
"material": [ "cotton" ],
@@ -360,10 +360,10 @@
{
"id": "maid_gloves_long_leather",
"type": "ARMOR",
- "name" : { "str": "pair of tailored long maid gloves", "str_pl": "pairs of tailored long maid gloves" },
+ "name": { "str": "pair of tailored long maid gloves", "str_pl": "pairs of tailored long maid gloves" },
"description": "A pair of long white gloves, used by maids. They have been reinforced with leather for greater protection.",
- "weight" : "150 g",
- "volume" : "500 ml",
+ "weight": "150 g",
+ "volume": "500 ml",
"price": 12000,
"to_hit": 1,
"material": [ "leather", "cotton" ],
@@ -381,10 +381,10 @@
"id": "maid_gloves_long_armor",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "pair of survivor long maid gloves", "str_pl": "pairs of survivor long maid gloves" },
+ "name": { "str": "pair of survivor long maid gloves", "str_pl": "pairs of survivor long maid gloves" },
"description": "A pair of long white gloves, used by maids. They have been reinforced with kevlar for greater protection.",
- "weight" : "190 g",
- "volume" : "750 ml",
+ "weight": "190 g",
+ "volume": "750 ml",
"price": 18000,
"to_hit": 2,
"material": [ "kevlar", "cotton" ],
@@ -401,10 +401,10 @@
{
"id": "kawaii_dress_shoes",
"type": "ARMOR",
- "name" : { "str": "pair of maid shoes" },
+ "name": { "str": "pair of maid shoes" },
"description": "A pair of black dress shoes designed to be worn with a maid dress.",
- "weight" : "500 g",
- "volume" : "1250 ml",
+ "weight": "500 g",
+ "volume": "1250 ml",
"price": 12000,
"material": [ "leather" ],
"symbol": "[",
@@ -420,10 +420,10 @@
"id": "kawaii_shoes_hi",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "pair of survivor maid shoes" },
+ "name": { "str": "pair of survivor maid shoes" },
"description": "A pair of black dress shoes designed to be worn with a maid dress. They have been reinforced with kevlar for greater protection.",
- "weight" : "400 g",
- "volume" : "750 ml",
+ "weight": "400 g",
+ "volume": "750 ml",
"price": 55000,
"material": [ "kevlar", "leather" ],
"symbol": "[",
@@ -439,10 +439,10 @@
{
"id": "kawaii_boots",
"type": "ARMOR",
- "name" : { "str": "pair of maid boots" },
+ "name": { "str": "pair of maid boots" },
"description": "A pair of black boots designed to be worn with a maid dress.",
- "weight" : "800 g",
- "volume" : "2000 ml",
+ "weight": "800 g",
+ "volume": "2000 ml",
"price": 25000,
"material": [ "leather" ],
"symbol": "[",
@@ -459,10 +459,10 @@
"id": "kawaii_boots_hi",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "pair of survivor maid boots" },
+ "name": { "str": "pair of survivor maid boots" },
"description": "A pair of black boots designed to be worn with a maid dress. They have been reinforced with kevlar for greater protection.",
- "weight" : "600 g",
- "volume" : "1250 ml",
+ "weight": "600 g",
+ "volume": "1250 ml",
"price": 85000,
"material": [ "kevlar", "leather" ],
"symbol": "[",
@@ -478,10 +478,10 @@
{
"id": "kawaii_maid_niso_thick",
"type": "ARMOR",
- "name" : { "str": "pair of maid stockings" },
+ "name": { "str": "pair of maid stockings" },
"description": "A pair of black stockings with white lace trim. The thick material keeps the wearer's legs warm.",
- "weight" : "90 g",
- "volume" : "250 ml",
+ "weight": "90 g",
+ "volume": "250 ml",
"price": 500,
"material": [ "cotton" ],
"symbol": "[",
@@ -496,10 +496,10 @@
{
"id": "kawaii_maid_niso_thin",
"type": "ARMOR",
- "name" : { "str": "pair of maid stockings (sheer)" },
+ "name": { "str": "pair of maid stockings (sheer)" },
"description": "A pair of black stockings with white lace trim. The material is thin enough to be slightly transparent when worn.",
- "weight" : "40 g",
- "volume" : "250 ml",
+ "weight": "40 g",
+ "volume": "250 ml",
"price": 500,
"material": [ "cotton" ],
"symbol": "[",
@@ -514,15 +514,15 @@
{
"id": "kawaii_maid_garter",
"type": "ARMOR",
- "name" : { "str": "garter belt" },
+ "name": { "str": "garter belt" },
"description": "A black garter belt, designed to be worn with stockings.",
- "weight" : "10 g",
- "volume" : "250 ml",
+ "weight": "10 g",
+ "volume": "250 ml",
"price": 1500,
"material": [ "cotton" ],
"symbol": "[",
"color": "dark_gray",
- "use_action" : {
+ "use_action": {
"type": "holster",
"max_volume": 4,
"draw_cost": 80,
@@ -531,34 +531,34 @@
"flags": [ "FANCY" ]
},
{
- "type" : "TOOL_ARMOR",
- "category" : "clothing",
- "id" : "tux",
- "name" : { "str": "tuxedo" },
- "description" : "A full-body tuxedo. Makes the apocalypse feel a little more classy.",
- "weight" : "1587 g",
- "volume" : "5500 ml",
- "color" : "dark_gray",
- "covers" : ["LEGS", "TORSO", "ARMS"],
- "storage" : "2500 ml",
- "symbol" : "[",
- "price" : 21000,
- "material" : ["cotton"],
- "warmth" : 30,
- "environmental_protection" : 1,
- "encumbrance" : 12,
- "flags" : ["VARSIZE", "SUPER_FANCY"],
- "coverage" : 95,
- "material_thickness" : 4
+ "type": "TOOL_ARMOR",
+ "category": "clothing",
+ "id": "tux",
+ "name": { "str": "tuxedo" },
+ "description": "A full-body tuxedo. Makes the apocalypse feel a little more classy.",
+ "weight": "1587 g",
+ "volume": "5500 ml",
+ "color": "dark_gray",
+ "covers": ["LEGS", "TORSO", "ARMS"],
+ "storage": "2500 ml",
+ "symbol": "[",
+ "price": 21000,
+ "material": ["cotton"],
+ "warmth": 30,
+ "environmental_protection": 1,
+ "encumbrance": 12,
+ "flags": ["VARSIZE", "SUPER_FANCY"],
+ "coverage": 95,
+ "material_thickness": 4
},
{
"id": "survivor_tux",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "survivor tuxedo" },
+ "name": { "str": "survivor tuxedo" },
"description": "A tux tailored specifically for post-cataclysm butlers. Besides protecting key parts with kevlar lining, it has more storage space.",
- "weight" : "3050 g",
- "volume" : "11250 ml",
+ "weight": "3050 g",
+ "volume": "11250 ml",
"price": 110000,
"material": [ "kevlar", "cotton" ],
"symbol": "[",
@@ -572,15 +572,15 @@
"environmental_protection": 3,
"max_charges": 12,
"ammo": "assassins_throwing_dagger",
- "flags" : ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"]
+ "flags": ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"]
},
{
"id": "kawaii_vest",
"type": "ARMOR",
- "name" : { "str": "maid vest" },
+ "name": { "str": "maid vest" },
"description": "A modified utility vest with many pockets, worn by maids.",
- "weight" : "516 g",
- "volume" : "1000 ml",
+ "weight": "516 g",
+ "volume": "1000 ml",
"price": 3900,
"material": [ "cotton" ],
"symbol": "[",
@@ -596,10 +596,10 @@
{
"id": "kawaii_vest_armor",
"type": "ARMOR",
- "name" : { "str": "survivor maid vest" },
+ "name": { "str": "survivor maid vest" },
"description": "A modified utility vest with many pockets, worn by maids. It has been reinforced with kevlar for greater protection and has four pouches capable of carrying magazines.",
- "weight" : "516 g",
- "volume" : "1000 ml",
+ "weight": "516 g",
+ "volume": "1000 ml",
"price": 120000,
"material": [ "kevlar", "kevlar_rigid" ],
"symbol": "[",
@@ -623,17 +623,17 @@
"flags": [ "VARSIZE", "WAIST", "STURDY" ]
},
{
- "type" : "ARMOR",
- "category" : "clothing",
- "id" : "petticoat",
- "name" : { "str": "petticoat", "str_pl" : "petticoats" },
- "description" : "A type of frilly undergarment usually worn under skirts.",
- "weight" : "90 g",
- "volume" : "250 ml",
- "color" : "white",
- "symbol" : "[",
- "price" : 500,
- "material" : ["cotton"],
+ "type": "ARMOR",
+ "category": "clothing",
+ "id": "petticoat",
+ "name": { "str": "petticoat", "str_pl": "petticoats" },
+ "description": "A type of frilly undergarment usually worn under skirts.",
+ "weight": "90 g",
+ "volume": "250 ml",
+ "color": "white",
+ "symbol": "[",
+ "price": 500,
+ "material": ["cotton"],
"use_action": {
"type": "holster",
"holster_prompt": "Sheath knife",
@@ -642,64 +642,64 @@
"draw_cost": 30,
"flags": [ "SHEATH_KNIFE" ]
},
- "flags" : ["SUPER_FANCY"],
- "material_thickness" : 1
- },
- {
- "type" : "ARMOR",
- "category" : "clothing",
- "id" : "panties_kemo",
- "name" : { "str": "panties (for beasts)", "str_pl" : "panties (for beasts)" },
- "description" : "A special type of underwear meant for people with tails. Although it's incredibly thin, it's the last line of defense against your dignity.",
- "weight" : "32 g",
- "volume" : "250 ml",
- "color" : "white",
- "covers" : ["LEGS"],
- "symbol" : "[",
- "price" : 1000,
- "material" : ["cotton"],
- "warmth" : 5,
- "flags" : ["VARSIZE", "SKINTIGHT"],
- "coverage" : 15,
- "material_thickness" : 1
- },
- {
- "type" : "ARMOR",
- "id" : "briefs_kemo",
- "name" : { "str": "briefs (for beasts)", "str_pl" : "briefs (for beasts)" },
- "description" : "A special type of underwear meant for people with tails. It stands as the difference between being a gentleman and being a beast.",
- "weight" : "32 g",
- "volume" : "250 ml",
- "color" : "white",
- "covers" : ["LEGS"],
- "symbol" : "[",
- "price" : 1000,
- "material" : ["cotton"],
- "warmth" : 5,
- "flags" : ["VARSIZE", "SKINTIGHT"],
- "coverage" : 15,
- "material_thickness" : 1
+ "flags": ["SUPER_FANCY"],
+ "material_thickness": 1
+ },
+ {
+ "type": "ARMOR",
+ "category": "clothing",
+ "id": "panties_kemo",
+ "name": { "str": "panties (for beasts)", "str_pl": "panties (for beasts)" },
+ "description": "A special type of underwear meant for people with tails. Although it's incredibly thin, it's the last line of defense against your dignity.",
+ "weight": "32 g",
+ "volume": "250 ml",
+ "color": "white",
+ "covers": ["LEGS"],
+ "symbol": "[",
+ "price": 1000,
+ "material": ["cotton"],
+ "warmth": 5,
+ "flags": ["VARSIZE", "SKINTIGHT"],
+ "coverage": 15,
+ "material_thickness": 1
+ },
+ {
+ "type": "ARMOR",
+ "id": "briefs_kemo",
+ "name": { "str": "briefs (for beasts)", "str_pl": "briefs (for beasts)" },
+ "description": "A special type of underwear meant for people with tails. It stands as the difference between being a gentleman and being a beast.",
+ "weight": "32 g",
+ "volume": "250 ml",
+ "color": "white",
+ "covers": ["LEGS"],
+ "symbol": "[",
+ "price": 1000,
+ "material": ["cotton"],
+ "warmth": 5,
+ "flags": ["VARSIZE", "SKINTIGHT"],
+ "coverage": 15,
+ "material_thickness": 1
},
{
"id": "kawaii_scarf",
"type": "TOOL_ARMOR",
- "category" : "clothing",
+ "category": "clothing",
"symbol": "[",
"color": "light_gray",
- "name" : { "str": "maid scarf" },
+ "name": { "str": "maid scarf" },
"description": "A very long light cloth scarf, worn over the mouth for warmth.",
"price": 1500,
"material": ["cotton"],
- "weight" : "120 g",
- "volume" : "1000 ml",
- "to_hit" : -3,
- "covers" : ["MOUTH"],
- "flags" : ["POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS"],
- "warmth" : 60,
- "environmental_protection" : 5,
- "encumbrance" : 3,
- "coverage" : 85,
- "material_thickness" : 1,
+ "weight": "120 g",
+ "volume": "1000 ml",
+ "to_hit": -3,
+ "covers": ["MOUTH"],
+ "flags": ["POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS"],
+ "warmth": 60,
+ "environmental_protection": 5,
+ "encumbrance": 3,
+ "coverage": 85,
+ "material_thickness": 1,
"use_action": {
"type": "transform",
"msg": "You loosen the scarf.",
@@ -710,23 +710,23 @@
{
"id": "kawaii_scarf_loose",
"type": "TOOL_ARMOR",
- "category" : "clothing",
+ "category": "clothing",
"symbol": "[",
"color": "light_gray",
- "name" : { "str": "maid scarf (loose)" },
+ "name": { "str": "maid scarf (loose)" },
"description": "A very long light cloth scarf, worn over the mouth for warmth.",
"price": 1500,
"material": ["cotton"],
- "weight" : "120 g",
- "volume" : "1000 ml",
- "to_hit" : -3,
- "covers" : ["MOUTH"],
- "flags" : ["POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS"],
- "warmth" : 20,
- "environmental_protection" : 5,
- "encumbrance" : 2,
- "coverage" : 45,
- "material_thickness" : 1,
+ "weight": "120 g",
+ "volume": "1000 ml",
+ "to_hit": -3,
+ "covers": ["MOUTH"],
+ "flags": ["POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS"],
+ "warmth": 20,
+ "environmental_protection": 5,
+ "encumbrance": 2,
+ "coverage": 45,
+ "material_thickness": 1,
"use_action": {
"type": "transform",
"msg": "You pull the scarf tighter around you.",
@@ -737,10 +737,10 @@
{
"id": "kawaii_raincoat",
"type": "ARMOR",
- "name" : { "str": "transparent rain coat" },
+ "name": { "str": "transparent rain coat" },
"description": "A transparent raincoat made from very thin vinyl. The material is thin enough that the entire coat can fold away into a pocket when not in use.",
- "weight" : "120 g",
- "volume" : "750 ml",
+ "weight": "120 g",
+ "volume": "750 ml",
"price": 5000,
"material": [ "plastic", "cotton" ],
"symbol": "[",
@@ -762,10 +762,10 @@
{
"id": "kawaii_raincoat_off",
"type": "ARMOR",
- "name" : { "str": "transparent rain coat (hood packed)" },
+ "name": { "str": "transparent rain coat (hood packed)" },
"description": "A transparent raincoat made from very thin vinyl. The material is thin enough that the entire coat can fold away into a pocket when not in use.",
- "weight" : "120 g",
- "volume" : "750 ml",
+ "weight": "120 g",
+ "volume": "750 ml",
"price": 5000,
"material": [ "plastic", "cotton" ],
"symbol": "[",
@@ -787,10 +787,10 @@
{
"id": "kawaii_maid_panties",
"type": "ARMOR",
- "name" : { "str": "white panties" },
+ "name": { "str": "white panties" },
"description": "Pure white panties, very breathable and comfortable even in summer.",
- "weight" : "32 g",
- "volume" : "250 ml",
+ "weight": "32 g",
+ "volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
"symbol": "[",
@@ -804,10 +804,10 @@
{
"id": "kawaii_maid_bra",
"type": "ARMOR",
- "name" : { "str": "white bra" },
+ "name": { "str": "white bra" },
"description": "Pure white bra, very breathable and comfortable even in summer.",
- "weight" : "32 g",
- "volume" : "250 ml",
+ "weight": "32 g",
+ "volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
"symbol": "[",
@@ -821,10 +821,10 @@
{
"id": "kawaii_maid_hardcase",
"type": "ARMOR",
- "name" : { "str": "hardcase" },
+ "name": { "str": "hardcase" },
"description": "A huge rectangular hardcase. Normally used for carrying large musical instruments, sniper rifles, or sensitive electrical equipment.",
- "weight" : "800 g",
- "volume" : "7500 ml",
+ "weight": "800 g",
+ "volume": "7500 ml",
"price": 12000,
"material": [ "plastic", "steel" ],
"symbol": "[",
@@ -845,10 +845,10 @@
{
"id": "kawaii_maid_hardcase_mini",
"type": "ARMOR",
- "name" : { "str": "small hardcase" },
+ "name": { "str": "small hardcase" },
"description": "A smaller version of the standard hardcase.",
- "weight" : "650 g",
- "volume" : "5000 ml",
+ "weight": "650 g",
+ "volume": "5000 ml",
"price": 8000,
"material": [ "plastic", "leather" ],
"symbol": "[",
@@ -869,10 +869,10 @@
{
"id": "kawaii_maid_hardcase_slim",
"type": "ARMOR",
- "name" : { "str": "compact hardcase" },
+ "name": { "str": "compact hardcase" },
"description": "A compact version of the hardcase.",
- "weight" : "400 g",
- "volume" : "2500 ml",
+ "weight": "400 g",
+ "volume": "2500 ml",
"price": 8000,
"material": [ "plastic", "leather" ],
"symbol": "[",
@@ -893,10 +893,10 @@
{
"id": "kawaii_secretpoach",
"type": "ARMOR",
- "name" : { "str": "garter purse" },
+ "name": { "str": "garter purse" },
"description": "A small storage purse that can be consealed beneath a skirt, held up using a garter band.",
- "weight" : "250 g",
- "volume" : "250 ml",
+ "weight": "250 g",
+ "volume": "250 ml",
"price": 3000,
"material": [ "cotton" ],
"symbol": "[",
@@ -915,10 +915,10 @@
{
"id": "kawaii_maid_megane_01",
"type": "ARMOR",
- "name" : { "str": "maid glasses" },
+ "name": { "str": "maid glasses" },
"description": "A maid wearing these will never miss the smallest speck of dust, nor signs of their Mistress's health.",
- "weight" : "30 g",
- "volume" : "250 ml",
+ "weight": "30 g",
+ "volume": "250 ml",
"price": 7900,
"material": [ "glass", "plastic" ],
"symbol": "[",
@@ -933,10 +933,10 @@
"id": "kawaii_hitec_megane",
"type": "ARMOR",
"category": "armor",
- "name" : { "str": "survivor maid glasses" },
+ "name": { "str": "survivor maid glasses" },
"description": "A maid wearing these will never miss the smallest speck of dust, nor signs of their Mistress's health. These have been reinforced with bullet resistant glass for greater protection, the ability to withstand chemical corrosion, and protection against bright flashes.",
- "weight" : "90 g",
- "volume" : "250 ml",
+ "weight": "90 g",
+ "volume": "250 ml",
"price": 250000,
"material": [ "kevlar", "plastic" ],
"symbol": "[",
diff --git a/martial_arts_manuals.json b/martial_arts_manuals.json
index 0c48f98..f6c3993 100644
--- a/martial_arts_manuals.json
+++ b/martial_arts_manuals.json
@@ -8,18 +8,10 @@
"name": { "str": "101 ways to protect my Mistress" },
"description": "A manual penned by different maids, listing all of their ideas on physical ways to protect their Mistresses.",
"price": 20000,
- "material": "paper",
+ "material": [ "paper" ],
"weight": "150 g",
"volume": "250 ml",
"use_action": "MA_MANUAL",
- "book_data": {
- "max_level" : 0,
- "intelligence" : 5,
- "time" : 10,
- "fun" : 0,
- "skill" : "none",
- "required_level" : 0,
- "chapters": 5
- }
+ "book_data": { "max_level": 0, "intelligence": 5, "time": 10, "fun": 0, "skill": "none", "required_level": 0, "chapters": 5 }
}
]
diff --git a/martialarts.json b/martialarts.json
index 858d6e1..ca98429 100644
--- a/martialarts.json
+++ b/martialarts.json
@@ -1,32 +1,32 @@
[
{
- "type" : "martial_art",
- "id" : "style_maid",
- "name" : { "str": "Servant's fighting technique" },
- "description" : "A secret assassination technique taught to first-class servants. It gives you an elegant appearance, allowing you to dodge and counterattack with style.",
+ "type": "martial_art",
+ "id": "style_maid",
+ "name": { "str": "Servant's fighting technique" },
+ "description": "A secret assassination technique taught to first-class servants. It gives you an elegant appearance, allowing you to dodge and counterattack with style.",
"initiate": [ "You steady yourself, ready to strike with poise and grace.", "%s appears more steady and composed." ],
- "arm_block" : 99,
- "leg_block" : 99,
- "static_buffs" : [
+ "arm_block": 99,
+ "leg_block": 99,
+ "static_buffs": [
{
- "id" : "maid_evade",
- "name" : "Silent presence" ,
- "description" : "By staying still, you get +2 to dodging.",
- "unarmed_allowed" : true,
- "melee_allowed" : true,
- "flat_bonuses" : [["dodge", 2.0]]
+ "id": "maid_evade",
+ "name": "Silent presence",
+ "description": "By staying still, you get +2 to dodging.",
+ "unarmed_allowed": true,
+ "melee_allowed": true,
+ "flat_bonuses": [["dodge", 2.0]]
}
],
"onmove_buffs": [
{
- "id" : "maid_moved",
- "name" : "Assault" ,
- "description" : "You receive a penalty to dodging when moving, but your chances of hitting and damage dealt are increased in accordance with your perception.",
- "unarmed_allowed" : true,
- "melee_allowed" : true,
- "min_unarmed" : 0,
- "buff_duration" : 2,
- "flat_bonuses" : [
+ "id": "maid_moved",
+ "name": "Assault",
+ "description": "You receive a penalty to dodging when moving, but your chances of hitting and damage dealt are increased in accordance with your perception.",
+ "unarmed_allowed": true,
+ "melee_allowed": true,
+ "min_unarmed": 0,
+ "buff_duration": 2,
+ "flat_bonuses": [
["hit", "per", 1],
["damage", "bash", "per", 0.2],
["damage", "cut", "per", 0.2],
@@ -35,30 +35,24 @@
]
}
],
- "ondodge_buffs": [
+ "ondodge_buffs": [
{
- "id" : "maid_evaded_bonus",
- "name" : "Counterattack" ,
- "description" : "Avoided attacks with minimal movement. You have a chance of landing a counterattack.",
- "unarmed_allowed" : true,
- "melee_allowed" : true,
- "min_unarmed" : 0,
- "buff_duration" : 2,
- "max_stacks" : 1,
- "mult_bonuses" : [
+ "id": "maid_evaded_bonus",
+ "name": "Counterattack",
+ "description": "Avoided attacks with minimal movement. You have a chance of landing a counterattack.",
+ "unarmed_allowed": true,
+ "melee_allowed": true,
+ "min_unarmed": 0,
+ "buff_duration": 2,
+ "max_stacks": 1,
+ "mult_bonuses": [
["damage", "bash", 1.2],
["damage", "cut", 1.2],
["damage", "stab", 1.2]
]
}
],
- "techniques" : [
- "tec_maid_precise",
- "tec_maid_counter",
- "tec_maid_meleecounter",
- "tec_maid_miyage",
- "tec_maid_kyusyu"
- ],
+ "techniques": [ "tec_maid_precise", "tec_maid_counter", "tec_maid_meleecounter", "tec_maid_miyage", "tec_maid_kyusyu" ],
"weapons": [
"mop",
"battle_mop",
diff --git a/materials.json b/materials.json
index f36de84..2b34588 100644
--- a/materials.json
+++ b/materials.json
@@ -1,22 +1,18 @@
[
{
- "type" : "material",
- "ident" : "maid",
- "name" : "maid",
- "bash_resist" : 1000,
- "cut_resist" : 1000,
- "bash_dmg_verb" : "chipped",
- "cut_dmg_verb" : "scratched",
- "dmg_adj" : [
- "marked",
- "chipped",
- "cracked",
- "shattered"
- ],
- "acid_resist" : 1000,
- "elec_resist" : 1000,
- "fire_resist" : 1000,
- "chip_resist" : 1000,
- "density" : 1000
+ "type": "material",
+ "id": "maid",
+ "name": "maid",
+ "bash_resist": 1000,
+ "cut_resist": 1000,
+ "bash_dmg_verb": "chipped",
+ "cut_dmg_verb": "scratched",
+ "dmg_adj": [ "marked", "chipped", "cracked", "shattered" ],
+ "acid_resist": 1000,
+ "elec_resist": 1000,
+ "fire_resist": 1000,
+ "bullet_resist": 1000,
+ "chip_resist": 1000,
+ "density": 1000
}
]
diff --git a/monster_drops.json b/monster_drops.json
index 618f8f0..5ec12b5 100644
--- a/monster_drops.json
+++ b/monster_drops.json
@@ -3,16 +3,12 @@
"type": "item_group",
"id": "mon_shoggoth_maid_death_drops",
"subtype": "collection",
- "entries": [
- { "item": "mini_shoggoth", "prob": 100 }
- ]
+ "entries": [ { "item": "mini_shoggoth", "prob": 100 } ]
},
{
"type": "item_group",
"id": "mon_little_maid_death_drops",
"subtype": "collection",
- "entries": [
- { "item": "mini_little_maid", "prob": 100 }
- ]
+ "entries": [ { "item": "mini_little_maid", "prob": 100 } ]
}
]
diff --git a/mutations.json b/mutations.json
index cc7ce43..e0b778b 100644
--- a/mutations.json
+++ b/mutations.json
@@ -1,31 +1,31 @@
[
{
- "type" : "mutation",
- "id" : "MARTIAL_ARTS_maid",
- "name" : { "str": "Servant's fighting technique" },
- "points" : 3,
- "description" : "You have learned the secret assassination techniques of a first-class servant.",
- "starting_trait" : true,
- "initial_ma_styles" : [ "style_maid" ],
- "valid" : false
+ "type": "mutation",
+ "id": "MARTIAL_ARTS_maid",
+ "name": { "str": "Servant's fighting technique" },
+ "points": 3,
+ "description": "You have learned the secret assassination techniques of a first-class servant.",
+ "starting_trait": true,
+ "initial_ma_styles": [ "style_maid" ],
+ "valid": false
},
{
- "type" : "mutation",
- "id" : "PROF_MA_MAID",
- "name" : { "str": "Servant's fighting technique" },
- "points" : 0,
- "description" : "You have learned the secret assassination techniques of a first-class servant.",
- "initial_ma_styles" : [ "style_maid" ],
+ "type": "mutation",
+ "id": "PROF_MA_MAID",
+ "name": { "str": "Servant's fighting technique" },
+ "points": 0,
+ "description": "You have learned the secret assassination techniques of a first-class servant.",
+ "initial_ma_styles": [ "style_maid" ],
"valid": false,
"purifiable": false,
"profession": true
},
{
- "type" : "mutation",
- "id" : "PROF_NEKOMIMI",
- "name" : { "str": "Cat characteristics" },
- "points" : 0,
- "description" : "You have grown features that of a cat.",
+ "type": "mutation",
+ "id": "PROF_NEKOMIMI",
+ "name": { "str": "Cat characteristics" },
+ "points": 0,
+ "description": "You have grown features that of a cat.",
"valid": false,
"purifiable": false,
"profession": true
diff --git a/professions.json b/professions.json
index c2db6fe..f413282 100644
--- a/professions.json
+++ b/professions.json
@@ -2,10 +2,7 @@
{
"type": "profession",
"ident": "maid",
- "name": {
- "male": "Butler",
- "female": "Maid"
- },
+ "name": { "male": "Butler", "female": "Maid" },
"description": "You worked in a wealthy household, but after the cataclysm they took a family vacation to an unknown place, leaving you to fend for yourself.",
"points": 1,
"skills": [
@@ -43,15 +40,10 @@
{
"type": "profession",
"ident": "battle_maid",
- "name": {
- "male": "Battle Butler",
- "female": "Battle Maid"
- },
+ "name": { "male": "Battle Butler", "female": "Battle Maid" },
"description": "In order to serve your Mistress, you have went through special combat training. You have learned to clean every bit of malice coming towards your Mistress.",
"points": 8,
- "traits": [
- "PROF_MA_MAID"
- ],
+ "traits": [ "PROF_MA_MAID" ],
"skills": [
{ "level": 5, "name": "cooking" },
{ "level": 4, "name": "tailor" },
@@ -60,7 +52,7 @@
{ "level": 3, "name": "melee" },
{ "level": 3, "name": "unarmed" },
{ "level": 3, "name": "dodge" }
- ],
+ ],
"items": {
"both" : {
"items": [
diff --git a/techniques.json b/techniques.json
index ff62138..2fcc976 100644
--- a/techniques.json
+++ b/techniques.json
@@ -1,97 +1,83 @@
[
{
- "type" : "technique",
- "id" : "tec_maid_precise",
- "name" : "Assassination",
- "min_melee" : 3,
- "unarmed_allowed" : true,
- "melee_allowed" : true,
- "crit_tec" : true,
- "messages" : [
- "You strike %s from the shadows",
- "<npcname> strikes %s from the shadows"
- ],
- "stun_dur" : 2,
- "mult_bonuses" : [
- ["damage", "bash", 1.20],
- ["damage", "cut", 1.20],
- ["damage", "stab", 1.20]
+ "type": "technique",
+ "id": "tec_maid_precise",
+ "name": "Assassination",
+ "min_melee": 3,
+ "unarmed_allowed": true,
+ "melee_allowed": true,
+ "crit_tec": true,
+ "messages": [ "You strike %s from the shadows", "<npcname> strikes %s from the shadows" ],
+ "stun_dur": 2,
+ "mult_bonuses": [
+ [ "damage", "bash", 1.2 ],
+ [ "damage", "cut", 1.2 ],
+ [ "damage", "stab", 1.2 ]
]
},
{
- "type" : "technique",
- "id" : "tec_maid_counter",
- "name" : "Abandonment",
- "min_unarmed" : 5,
- "dodge_counter" : true,
- "unarmed_allowed" : true,
- "stun_dur" : 1,
- "messages" : [
- "You cancelled the strike from %s",
- "<npcname> cancles the strike from %s"
- ],
- "mult_bonuses" : [["movecost", 0.0]],
- "flat_bonuses" : [["movecost", 33]]
+ "type": "technique",
+ "id": "tec_maid_counter",
+ "name": "Abandonment",
+ "min_unarmed": 5,
+ "dodge_counter": true,
+ "unarmed_allowed": true,
+ "stun_dur": 1,
+ "messages": [ "You cancelled the strike from %s", "<npcname> cancles the strike from %s" ],
+ "mult_bonuses": [ [ "movecost", 0.0 ] ],
+ "flat_bonuses": [ [ "movecost", 33 ] ]
},
{
- "type" : "technique",
- "id" : "tec_maid_meleecounter",
- "name" : "Removal",
- "min_melee" : 5,
- "dodge_counter" : true,
- "block_counter" : true,
- "melee_allowed" : true,
- "down_dur" : 1,
- "knockback_dist" : 1,
- "aoe" : "spin",
- "messages" : [
+ "type": "technique",
+ "id": "tec_maid_meleecounter",
+ "name": "Removal",
+ "min_melee": 5,
+ "dodge_counter": true,
+ "block_counter": true,
+ "melee_allowed": true,
+ "down_dur": 1,
+ "knockback_dist": 1,
+ "aoe": "spin",
+ "messages": [
"You dodged the strike and hit %s and everything around it",
"<npcname> dodges the strike from %s and hits everything around it"
],
- "mult_bonuses" : [["movecost", 0.0]],
- "flat_bonuses" : [["movecost", 50]]
+ "mult_bonuses": [ [ "movecost", 0.0 ] ],
+ "flat_bonuses": [ [ "movecost", 50 ] ]
},
{
- "type" : "technique",
- "id" : "tec_maid_miyage",
- "name" : "Maid's Offering",
- "min_melee" : 6,
- "melee_allowed" : true,
- "req_buffs" : ["maid_evaded_bonus"],
- "crit_tec" : true,
- "down_dur" : 1,
- "knockback_dist" : 1,
- "messages" : [
- "%s receives the offering of pain",
- "<npcname> offers %s pain"
- ],
- "mult_bonuses" : [
- ["damage", "bash", 2.50],
- ["damage", "cut", 2.50],
- ["damage", "stab", 2.50]
+ "type": "technique",
+ "id": "tec_maid_miyage",
+ "name": "Maid's Offering",
+ "min_melee": 6,
+ "melee_allowed": true,
+ "req_buffs": [ "maid_evaded_bonus" ],
+ "crit_tec": true,
+ "down_dur": 1,
+ "knockback_dist": 1,
+ "messages": [ "%s receives the offering of pain", "<npcname> offers %s pain" ],
+ "mult_bonuses": [
+ [ "damage", "bash", 2.5 ],
+ [ "damage", "cut", 2.5 ],
+ [ "damage", "stab", 2.5 ]
]
},
{
- "type" : "technique",
- "id" : "tec_maid_kyusyu",
- "name" : "Assault",
- "min_unarmed" : 6,
- "unarmed_allowed" : true,
- "crit_tec" : true,
- "req_buffs" : ["maid_moved"],
- "down_dur" : 3,
- "knockback_dist" : 2,
- "messages" : [
- "You assault %s",
- "<npcname> assaults %s"
- ],
- "flat_bonuses" : [
- ["arpen", "bash", 5]
- ],
- "mult_bonuses" : [
- ["damage", "bash", 1.75],
- ["damage", "cut", 1.75],
- ["damage", "stab", 1.75]
+ "type": "technique",
+ "id": "tec_maid_kyusyu",
+ "name": "Assault",
+ "min_unarmed": 6,
+ "unarmed_allowed": true,
+ "crit_tec": true,
+ "req_buffs": [ "maid_moved" ],
+ "down_dur": 3,
+ "knockback_dist": 2,
+ "messages": [ "You assault %s", "<npcname> assaults %s" ],
+ "flat_bonuses": [ { "stat": "arpen", "type": "bash", "scale": 5 } ],
+ "mult_bonuses": [
+ [ "damage", "bash", 1.75 ],
+ [ "damage", "cut", 1.75 ],
+ [ "damage", "stab", 1.75 ]
]
}
]
diff --git a/tool_armor.json b/tool_armor.json
index b7980d2..e980190 100644
--- a/tool_armor.json
+++ b/tool_armor.json
@@ -5,7 +5,7 @@
"name" : { "str": "human-sized carry bag" },
"description" : "A large bag that could fit a person inside. The zipper running across it provides ventilation and you can open and close it from the inside.",
"weight" : "1000 g",
- "volume" : "5000 ml",
+ "volume" : "5 L",
"price" : 20500,
"material" : [ "leather", "wool" ],
"symbol" : "[",
@@ -14,7 +14,7 @@
"coverage" : 50,
"encumbrance" : 20,
"warmth" : 10,
- "material_thickness" : 2,
+ "material_thickness" : 4,
"flags" : [ "OVERSIZE", "BELTED" ],
"use_action": "CAPTURE_MONSTER_ACT",
"properties": [ [ "monster_size_capacity", "MEDIUM" ] ]
diff --git a/tools.json b/tools.json
index 7971cd7..10661c3 100644
--- a/tools.json
+++ b/tools.json
@@ -1,64 +1,56 @@
[
- {
- "id": "maid_master_child",
- "type": "TOOL",
+ {
+ "type": "GENERIC",
+ "id": "meat_shoggoth",
+ "name": { "str": "shoggoth meat", "str_pl": "shoggoth meats" },
+ "description": "A piece of meat left behind by a shoggoth. It sometimes twitches around, but it doesn't seem hostile.",
+ "weight": "1000 g",
+ "symbol": ")",
+ "color": "dark_gray",
+ "price": 5000,
+ "material": [ "maid" ],
+ "volume": "250 ml",
+ "category": "tools"
+ },
+ {
+ "type": "GENERIC",
"category": "other",
- "symbol": "m",
- "color": "brown",
- "name": "Mistress",
- "description": "A girl entrusted to you by the owner of the house you served at. There's a deep feeling of fear in your stomach as you embrace the cataclysm, but protecting this girl gives you purpose and makes you feel less alone.",
- "price": 60000,
- "material": ["flesh"],
+ "id": "flask_shoggoth",
+ "name": { "str": "flask (shoggoth)", "str_pl": "flasks (shoggoth)" },
+ "description": "A glass flask containing a piece of meat that seems to be growing. Occasionally the piece of meat pulsates.",
"weight": "1200 g",
+ "symbol": "M",
+ "color": "dark_gray",
+ "price": 5000,
+ "material": [ "glass", "maid" ],
"volume": "250 ml",
"use_action": {
- "type": "place_monster",
- "monster_id": "maid_master",
- "friendly_msg": "Mistress seemed worried about the state of the neighbours.",
- "place_randomly": true
+ "type": "delayed_transform",
+ "transform_age": 201600,
+ "not_ready_msg": "The piece of meat pulsates.",
+ "msg": "The flask is threatening to shatter as the meat keeps growing. Use it again to open it and relieve the pressure.",
+ "moves": 0,
+ "target": "shoggoth_maid"
}
},
{
- "id": "master_doll",
+ "id": "shoggoth_maid",
"type": "TOOL",
"category": "other",
- "symbol": "m",
- "color": "brown",
- "name": "Mistress doll",
- "description": "This is a doll in the shape of your beloved Mistress. By keeping it close, you are comforted by thoughts of your Mistress.",
- "price": 5400,
- "material": ["cotton"],
- "weight": "300 g",
- "volume": "500 ml"
- },
- {
- "id": "maid_mess_kit",
- "sub": "hotplate",
- "type": "TOOL",
- "symbol": ";",
- "color": "brown",
- "name": "maid's cookware kit",
- "description": "A set of secret maid cookware.",
- "price": 2000,
- "material": ["steel"],
- "techniques": ["BRUTAL", "WBLOCK_1"],
- "flags" : ["CHOP", "DURABLE_MELEE", "ALLOWS_REMOTE_USE" ],
- "weight": "1000 g",
- "volume": "1250 ml",
- "cutting": 18,
- "bashing": 18,
- "to_hit": 1,
- "charges_per_use": 1,
- "ammo": "battery",
- "qualities": [["COOK", 3], ["BOIL", 2], ["CONTAIN", 1], ["CHEM", 1], ["CUT", 1], ["BUTCHER", 20]],
- "use_action": ["HOTPLATE", "HEAT_FOOD" ],
- "magazines": [
- [
- "battery",
- [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
- ]
- ],
- "magazine_well": 2
+ "symbol": "M",
+ "color": "dark_gray",
+ "name": { "str": "growing shoggoth maid" },
+ "description": "The meat inside this flask glow with iridescent colors. It's lightly shivering.",
+ "price": 60000,
+ "material": [ "glass", "maid" ],
+ "weight": "1200 g",
+ "volume": "250 ml",
+ "use_action": {
+ "type": "place_monster",
+ "monster_id": "mon_shoggoth_maid",
+ "friendly_msg": "The odd meat is released from its glass flask prison and begins to rapidly and violently expand, extending numerous disjointed tentacles in every direction. The tentacles intertwine with each other and transform into an organism, resembling a beautiful woman, not quite like the horrible nightmare creature it used to be. She suddenly speaks up: 'Finally, I am able to meet you like this! Thank you for helping me, mistress!'",
+ "place_randomly": true
+ }
},
{
"type": "GENERIC",
@@ -70,8 +62,8 @@
"symbol": "m",
"color": "white",
"price": 5000,
- "material" : ["maid"],
- "volume": 1,
+ "material": [ "maid" ],
+ "volume": "250 ml",
"use_action": {
"type": "delayed_transform",
"transform_age": 100800,
@@ -87,12 +79,12 @@
"category": "other",
"symbol": "M",
"color": "white",
- "name": "Revitalized Cute Maid",
+ "name": { "str": "Revitalized Cute Maid" },
"description": "'What's up? Why haven't you put me on the ground yet? Ah, you want me to stay tiny for a little while longer? Ehh... I suppose it can't be helped.'",
"price": 60000,
- "material": ["maid"],
+ "material": [ "maid" ],
"weight": "1200 g",
- "volume": 1,
+ "volume": "250 ml",
"use_action": {
"type": "place_monster",
"monster_id": "mon_shoggoth_maid",
@@ -101,17 +93,49 @@
}
},
{
+ "id": "maid_master_child",
+ "type": "TOOL",
+ "category": "other",
+ "symbol": "m",
+ "color": "brown",
+ "name": { "str": "Mistress" },
+ "description": "A girl entrusted to you by the owner of the house you served at. There's a deep feeling of fear in your stomach as you embrace the cataclysm, but protecting this girl gives you purpose and makes you feel less alone.",
+ "price": 60000,
+ "material": [ "flesh" ],
+ "weight": "1200 g",
+ "volume": "250 ml",
+ "use_action": {
+ "type": "place_monster",
+ "monster_id": "maid_master",
+ "friendly_msg": "Mistress seemed worried about the state of the neighbours.",
+ "place_randomly": true
+ }
+ },
+ {
+ "id": "master_doll",
+ "type": "TOOL",
+ "category": "other",
+ "symbol": "m",
+ "color": "brown",
+ "name": { "str": "Mistress doll" },
+ "description": "This is a doll in the shape of your beloved Mistress. By keeping it close, you are comforted by thoughts of your Mistress.",
+ "price": 5400,
+ "material": [ "cotton" ],
+ "weight": "300 g",
+ "volume": "500 ml"
+ },
+ {
"id": "summon_little_maid",
"type": "TOOL",
"category": "other",
"symbol": "M",
"color": "white",
- "name": "scroll (Summon Little Maid)",
+ "name": { "str": "scroll (Summon Little Maid)" },
"description": "A set of scrolls and sacrifices used to summon a different kind of maid. Pour the sacrificial sugar in the middle of the magic circle and cast the correct spell.",
"price": 60000,
- "material": ["paper"],
+ "material": [ "paper" ],
"weight": "1200 g",
- "volume": 1,
+ "volume": "250 ml",
"use_action": {
"type": "place_monster",
"monster_id": "mon_little_maid",
@@ -129,8 +153,8 @@
"symbol": "m",
"color": "white",
"price": 5000,
- "material" : ["maid"],
- "volume": 1,
+ "material": [ "maid" ],
+ "volume": "250 ml",
"use_action": {
"type": "delayed_transform",
"transform_age": 7200,
@@ -146,17 +170,46 @@
"category": "other",
"symbol": "m",
"color": "white",
- "name": "Revitalized Little Maid",
+ "name": { "str": "Revitalized Little Maid" },
"description": "Your little maid seems to have made a complete recovery.",
"price": 60000,
- "material": ["maid"],
+ "material": [ "maid" ],
"weight": "1200 g",
- "volume": 1,
+ "volume": "250 ml",
"use_action": {
"type": "place_monster",
"monster_id": "mon_little_maid",
"friendly_msg": "The little maid jumps down to the ground and turns around, lightly lifting the hem of her skirt and giving you a bow. 'Mistress!' she says with a smile.",
"place_randomly": true
}
+ },
+ {
+ "id": "maid_mess_kit",
+ "sub": "hotplate",
+ "type": "TOOL",
+ "symbol": ";",
+ "color": "brown",
+ "name": { "str": "maid's cookware kit" },
+ "description": "A set of secret maid cookware.",
+ "price": 2000,
+ "material": [ "steel" ],
+ "techniques": [ "BRUTAL", "WBLOCK_1" ],
+ "flags" : [ "CHOP", "DURABLE_MELEE", "ALLOWS_REMOTE_USE" ],
+ "weight": "1000 g",
+ "volume": "1250 ml",
+ "cutting": 18,
+ "bashing": 18,
+ "to_hit": 1,
+ "charges_per_use": 1,
+ "ammo": "battery",
+ "qualities": [["COOK", 3], ["BOIL", 2], ["CONTAIN", 1], ["CHEM", 1], ["CUT", 1], ["BUTCHER", 20]],
+ "use_action": ["HOTPLATE", "HEAT_FOOD" ],
+ "magazines": [
+ [
+ "battery",
+ [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
+ ]
+ ],
+ "magazine_well": 2
}
]