diff options
| -rw-r--r-- | armor.json | 36 | ||||
| -rw-r--r-- | item_groups.json | 60 | ||||
| -rw-r--r-- | martialarts.json | 44 | ||||
| -rw-r--r-- | recipes.json | 102 |
4 files changed, 134 insertions, 108 deletions
@@ -14,7 +14,7 @@ "covers" : ["TORSO", "ARMS", "LEGS"], "coverage" : 95, "encumbrance" : 10, - "storage" : 10, + "storage" : "2500 ml", "warmth" : 20, "material_thickness" : 4, "environmental_protection" : 1, @@ -35,7 +35,7 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 16, - "storage": 80, + "storage": "20 L", "warmth": 40, "material_thickness": 5, "environmental_protection": 1, @@ -56,7 +56,7 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 20, - "storage": 80, + "storage": "20 L", "warmth": 40, "material_thickness": 8, "environmental_protection": 10, @@ -64,7 +64,7 @@ "type": "holster", "holster_prompt": "Sheath sword", "holster_msg": "You sheath your %s", - "max_volume": 8, + "max_volume": "2 L", "flags": [ "SHEATH_SWORD" ] }, "flags" : ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"] @@ -84,7 +84,7 @@ "covers" : ["TORSO", "ARMS", "LEGS"], "coverage" : 75, "encumbrance" : 7, - "storage" : 2, + "storage" : "500 ml", "warmth" : 5, "material_thickness" : 1, "flags" : ["VARSIZE", "SUPER_FANCY"] @@ -103,7 +103,7 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 75, "encumbrance": 7, - "storage": 10, + "storage": "2500 ml", "warmth": 15, "material_thickness": 1, "flags": [ "VARSIZE", "FANCY" ] @@ -122,7 +122,7 @@ "covers": [ "TORSO", "ARMS", "LEGS" ], "coverage": 95, "encumbrance": 10, - "storage": 80, + "storage": " 20 L", "warmth": 15, "material_thickness": 5, "environmental_protection": 1, @@ -143,7 +143,7 @@ "covers": [ "LEGS", "TORSO", "ARMS" ], "coverage": 100, "encumbrance": 15, - "storage": 80, + "storage": "20 L", "warmth": 15, "material_thickness": 5, "environmental_protection": 10, @@ -151,7 +151,7 @@ "type": "holster", "holster_prompt": "Sheath sword", "holster_msg": "You sheath your %s", - "max_volume": 8, + "max_volume": "2 L", "flags": [ "SHEATH_SWORD" ] }, "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ] @@ -165,7 +165,7 @@ "volume" : "5000 ml", "color" : "brown", "covers" : ["TORSO", "ARMS", "LEGS"], - "storage" : 2, + "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, @@ -545,7 +545,7 @@ "volume" : "5500 ml", "color" : "dark_gray", "covers" : ["LEGS", "TORSO", "ARMS"], - "storage" : 10, + "storage" : "2500 ml", "symbol" : "[", "price" : 21000, "material" : ["cotton"], @@ -566,7 +566,7 @@ "volume" : "11250 ml", "color" : "dark_gray", "covers" : ["LEGS", "TORSO", "ARMS"], - "storage" : 22, + "storage" : "5500 ml", "symbol" : "[", "price" : 110000, "material": [ "kevlar", "cotton" ], @@ -593,7 +593,7 @@ "covers": [ "TORSO" ], "coverage": 60, "encumbrance": 5, - "storage": 12, + "storage": "3 L", "warmth": 5, "material_thickness": 2, "flags": [ "VARSIZE", "WAIST" ] @@ -612,7 +612,7 @@ "covers": [ "TORSO" ], "coverage": 85, "encumbrance": 5, - "storage": 12, + "storage": "3 L", "warmth": 5, "material_thickness": 5, "use_action": { @@ -837,7 +837,7 @@ "covers": [ "TORSO" ], "coverage": 30, "encumbrance": 20, - "storage": 150, + "storage": "37500 ml", "material_thickness": 2, "use_action": { "type": "holster", @@ -861,7 +861,7 @@ "covers": [ "TORSO" ], "coverage": 15, "encumbrance": 15, - "storage": 100, + "storage": "25 L", "material_thickness": 2, "use_action": { "type": "holster", @@ -885,7 +885,7 @@ "covers": [ "TORSO" ], "coverage": 10, "encumbrance": 6, - "storage": 50, + "storage": "12500 ml", "material_thickness": 2, "use_action": { "type": "holster", @@ -909,7 +909,7 @@ "covers": [ "LEG_EITHER" ], "coverage": 5, "encumbrance": 1, - "storage": 10, + "storage": "2500 ml", "material_thickness": 2, "use_action": { "type": "holster", diff --git a/item_groups.json b/item_groups.json index 26dd56d..702fed8 100644 --- a/item_groups.json +++ b/item_groups.json @@ -23,27 +23,27 @@ { "type" : "item_group", "id" : "mansion_books", - "items":[ - ["manual_maid", 3] + "entries":[ + { "item": "manual_maid", "prob": 3 } ] }, { "type" : "item_group", "id" : "bedroom", - "items":[ - ["kawaii_maid_garter", 3], - ["petticoat", 3], - ["jokyu_fuku", 3], - ["maid_dress_french", 3], - ["kawaii_maid_hat", 3], - ["maid_gloves_cotton", 2], - ["maid_gloves_long_cotton", 2], - ["kawaii_maid_panties", 3], - ["kawaii_maid_bra", 3], - ["kawaii_dress_shoes", 3], - ["kawaii_boots", 3], - ["kawaii_maid_niso_thick", 3], - ["kawaii_maid_niso_thin", 3] + "entries":[ + { "item": "kawaii_maid_garter", "prob": 3 }, + { "item": "petticoat", "prob": 3 }, + { "item": "jokyu_fuku", "prob": 3 }, + { "item": "maid_dress_french", "prob": 3 }, + { "item": "kawaii_maid_hat", "prob": 3 }, + { "item": "maid_gloves_cotton", "prob": 2 }, + { "item": "maid_gloves_long_cotton", "prob": 2 }, + { "item": "kawaii_maid_panties", "prob": 3 }, + { "item": "kawaii_maid_bra", "prob": 3 }, + { "item": "kawaii_dress_shoes", "prob": 3 }, + { "item": "kawaii_boots", "prob": 3 }, + { "item": "kawaii_maid_niso_thick", "prob": 3 }, + { "item": "kawaii_maid_niso_thin", "prob": 3 } ] }, { @@ -75,20 +75,20 @@ { "type" : "item_group", "id" : "allclothes", - "items":[ - ["kawaii_maid_garter", 3], - ["petticoat", 3], - ["jokyu_fuku", 3], - ["maid_dress_french", 3], - ["kawaii_maid_hat", 3], - ["maid_gloves_cotton", 2], - ["maid_gloves_long_cotton", 2], - ["kawaii_maid_panties", 3], - ["kawaii_maid_bra", 3], - ["kawaii_dress_shoes", 3], - ["kawaii_boots", 3], - ["kawaii_maid_niso_thick", 3], - ["kawaii_maid_niso_thin", 3] + "entries":[ + { "item": "kawaii_maid_garter", "prob": 3 }, + { "item": "petticoat", "prob": 3 }, + { "item": "jokyu_fuku", "prob": 3 }, + { "item": "maid_dress_french", "prob": 3 }, + { "item": "kawaii_maid_hat", "prob": 3 }, + { "item": "maid_gloves_cotton", "prob": 3 }, + { "item": "maid_gloves_long_cotton", "prob": 3 }, + { "item": "kawaii_maid_panties", "prob": 3 }, + { "item": "kawaii_maid_bra", "prob": 3 }, + { "item": "kawaii_dress_shoes", "prob": 3 }, + { "item": "kawaii_boots", "prob": 3 }, + { "item": "kawaii_maid_niso_thick", "prob": 3 }, + { "item": "kawaii_maid_niso_thin", "prob": 3 } ] }, { diff --git a/martialarts.json b/martialarts.json index 32b958b..1a1b7e5 100644 --- a/martialarts.json +++ b/martialarts.json @@ -59,25 +59,51 @@ "tec_maid_kyusyu" ], "weapons": [ + "mop", "battle_mop", + "bagh_nakha", "maid_claw", - "shikomi_stick_draw", + "bokken_fake", + "bokken_inferior", + "bokken", + "katana_fake", + "katana_inferior", + "katana", + "tanto_fake", + "tanto_inferior", + "tanto" "shikomi_stick", - "shikomi_kasa_draw", + "shikomi_stick_draw", + "umbrella", "shikomi_kasa", + "shikomi_kasa_draw", + "bullwhip", "spiked_whip", - "brutal_broom", - "slaying_pan", - "vorpal_kitchen_knife", "broom", - "mop", + "brutal_broom", "knife_butter", "knife_steak", + "knife_butcher", + "knife_paring", + "knife_chef", + "knife_carving", + "knife_bread", + "knife_vegetable_cleaver", + "knife_meat_cleaver", + "vorpal_kitchen_knife", "spoon", "fork", - "pan" - - + "carving_fork", + "spork", + "foon", + "chopsticks", + "ladle" + "destruction_otama", + "rolling_pin", + "pan", + "steel_pan", + "copper_pan", + "slaying_pan" ] } ] diff --git a/recipes.json b/recipes.json index 75a9e8e..cdfeb31 100644 --- a/recipes.json +++ b/recipes.json @@ -6,7 +6,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 90000, + "time": "90 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 150 ] ], @@ -25,7 +25,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 120000, + "time": "2 h", "autolearn": true, "using": [ [ "filament", 200 ] ], "qualities": [ @@ -47,7 +47,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 6, - "time": 180000, + "time": "3 h", "autolearn": true, "using": [ [ "filament", 200 ] ], "qualities": [ @@ -71,7 +71,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 90000, + "time": "90 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 150 ] ], @@ -90,7 +90,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "filament", 30 ] ], "qualities": [ @@ -110,7 +110,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 6, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "filament", 30 ] ], "qualities": [ @@ -129,7 +129,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 60000, + "time": "1 h", "reversible": false, "autolearn": true, "using": [ [ "filament", 20 ] ], @@ -148,7 +148,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 90000, + "time": "90 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 150 ] ], @@ -167,7 +167,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 30 ] ], "qualities": [ @@ -184,7 +184,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 10 ] ], "qualities": [ @@ -201,7 +201,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 10 ] ], "qualities": [ @@ -218,7 +218,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 4, - "time": 60000, + "time": "1 h", "reversible": false, "autolearn": true, "using": [ [ "filament", 50 ] ], @@ -237,7 +237,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 90000, + "time": "90 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 150 ] ], @@ -257,7 +257,7 @@ "skill_used": "tailor", "skills_required" : ["fabrication", 6], "difficulty": 7, - "time": 180000, + "time": "3 h", "reversible": false, "autolearn": true, "using": [ [ "filament", 200 ] ], @@ -285,7 +285,7 @@ "skill_used": "fabrication", "difficulty": 3, "skills_required" : [ "throw", 4 ], - "time": 5000, + "time": "5 m", "reversible": false, "autolearn": true, "qualities":[ @@ -305,7 +305,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required" : [ "throw", 7 ], - "time": 300000, + "time": "7 h", "reversible": false, "autolearn": true, "qualities":[ @@ -331,7 +331,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required" : [ "throw", 5 ], - "time": 210000, + "time": "7 h", "reversible": false, "autolearn": true, "qualities":[ @@ -357,7 +357,7 @@ "skill_used": "fabrication", "difficulty": 10, "skills_required" : [ "melee", 10 ], - "time": 300000, + "time": "10 h", "reversible": false, "autolearn": true, "qualities": [ @@ -384,7 +384,7 @@ "skill_used": "fabrication", "difficulty": 9, "skills_required" : [ "melee", 7 ], - "time": 270000, + "time": "9 h", "reversible": false, "autolearn": true, "qualities": [ @@ -412,7 +412,7 @@ "skill_used": "fabrication", "difficulty": 6, "skills_required" : [ "melee", 4 ], - "time": 180000, + "time": "6 h", "reversible": false, "autolearn": true, "qualities" : [ @@ -440,7 +440,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required" : [ "melee", 6 ], - "time": 240000, + "time": "8 h", "reversible": false, "autolearn": true, "qualities": [ @@ -469,7 +469,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required" : [ "melee", 6 ], - "time": 240000, + "time": "8 h", "reversible": false, "autolearn": true, "qualities": [ @@ -496,7 +496,7 @@ "skill_used": "fabrication", "difficulty": 8, "skills_required" : [ "melee", 6 ], - "time": 240000, + "time": "8 h", "reversible": false, "autolearn": true, "qualities": [ @@ -525,7 +525,7 @@ "subcategory": "CSC_ARMOR_OTHER", "skill_used": "tailor", "difficulty": 4, - "time": 75000, + "time": "75 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 150 ] ], @@ -546,7 +546,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 15000, + "time": "15 m", "autolearn": true, "using": [ [ "filament", 20 ] ], "qualities": [ @@ -564,7 +564,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 4, - "time": 120000, + "time": "2 h", "autolearn": true, "using": [ [ "filament", 24 ] ], "qualities": [ @@ -583,7 +583,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 6, - "time": 180000, + "time": "3 h", "autolearn": true, "using": [ [ "filament", 200 ] ], "qualities": [ @@ -680,7 +680,7 @@ "skill_used": "fabrication", "skills_required": [ "tailor", 3 ], "difficulty": 3, - "time": 60000, + "time": "1 h", "reversible": false, "autolearn": true, "using": [ [ "filament", 50 ] ], @@ -700,7 +700,7 @@ "skill_used": "fabrication", "difficulty": 4, "skills_required" : [ "cooking", 4 ], - "time": 60000, + "time": "1 h", "reversible": false, "autolearn": true, "components": [ @@ -716,7 +716,7 @@ "skill_used": "fabrication", "difficulty": 7, "skills_required" : [ "melee", 5 ], - "time": 210000, + "time": "7 h", "reversible": false, "autolearn": true, "qualities" : [ @@ -742,7 +742,7 @@ "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", "difficulty": 2, - "time": 60000, + "time": "2 h", "reversible": true, "autolearn": true, "qualities" : [ @@ -763,7 +763,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 15 ] ], @@ -782,7 +782,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "reversible": false, "autolearn": true, "using": [ [ "filament", 15 ] ], @@ -801,7 +801,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 2, - "time": 60000, + "time": "1 h", "autolearn": true, "using": [ [ "filament", 150 ] ], "qualities": [ @@ -819,7 +819,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 4, - "time": 120000, + "time": "2 h", "autolearn": true, "using": [ [ "filament", 200 ] ], "qualities": [ @@ -841,7 +841,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 6, - "time": 180000, + "time": "3 h", "autolearn": true, "using": [ [ "filament", 200 ] ], "qualities": [ @@ -865,7 +865,7 @@ "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", "difficulty": 1, - "time": 30000, + "time": "30 m", "autolearn": true, "components": [ [ [ "duct_tape", 50 ] ], @@ -881,7 +881,7 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 15 ] ], "qualities": [ @@ -899,7 +899,7 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 20 ] ], "qualities": [ @@ -917,7 +917,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", "difficulty": 6, - "time": 100000, + "time": "100 m", "autolearn": true, "tools": [ [ ["tongs", -1] ], @@ -940,7 +940,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", "difficulty": 5, - "time": 90000, + "time": "90 m", "autolearn": true, "using": [ [ "filament", 160 ] ], "qualities": [ @@ -964,7 +964,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", "difficulty": 4, - "time": 80000, + "time": "80 m", "autolearn": true, "using": [ [ "filament", 120 ] ], "qualities": [ @@ -987,7 +987,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "difficulty": 4, - "time": 30000, + "time": "30 m", "autolearn": true, "using": [ [ "filament", 10 ] ], "qualities": [ @@ -1005,7 +1005,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 10 ] ], "qualities": [ @@ -1023,7 +1023,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 2, - "time": 35000, + "time": "35 m", "autolearn": true, "using": [ [ "filament", 10 ] ], "qualities": [ @@ -1041,7 +1041,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 6, - "time": 240000, + "time": "4 h", "autolearn": true, "using": [ [ "filament", 100 ] ], "qualities": [ @@ -1066,7 +1066,7 @@ "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", "difficulty": 6, - "time": 240000, + "time": "4 h", "autolearn": true, "using": [ [ "filament", 100 ] ], "qualities": [ @@ -1091,7 +1091,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 90000, + "time": "90 m", "reversible": true, "autolearn": true, "using": [ [ "filament", 3 ] ], @@ -1108,7 +1108,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": 40000, + "time": "40 m", "autolearn": true, "using": [ [ "filament", 8 ] ], "qualities": [ @@ -1124,7 +1124,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 2, - "time": 8000, + "time": "8 m", "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ @@ -1142,7 +1142,7 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "fabrication", "difficulty": 6, - "time": 100000, + "time": "100 m", "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ |