diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json index d109a34e90347..790983ffe0463 100644 --- a/data/json/items/book/abstract.json +++ b/data/json/items/book/abstract.json @@ -333,8 +333,7 @@ }, { "abstract": "book_martial", - "type": "GENERIC", - "category": "books", + "type": "BOOK", "name": { "str": "martial art manual" }, "weight": "150 g", "volume": "250 ml", @@ -343,6 +342,7 @@ "symbol": "?", "color": "green", "use_action": [ "MA_MANUAL" ], - "book_data": { "time": "10 m", "intelligence": 9 } + "intelligence": 9, + "time": "10 m" } ] diff --git a/data/json/items/book/martial.json b/data/json/items/book/martial.json index f9dd4c7cf91f5..ccf5d8943abbb 100644 --- a/data/json/items/book/martial.json +++ b/data/json/items/book/martial.json @@ -2,271 +2,271 @@ { "id": "manual_aikido", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Spirit of Aikido" }, "price_postapoc": 2000, "description": "A complete guide to Aikido.", - "book_data": { "martial_art": "style_aikido" } + "martial_art": "style_aikido" }, { "id": "manual_boxing", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Practical Pugilism" }, "price_postapoc": 2000, "description": "A complete guide to boxing. Let's get ready to rough-up some ruffians!", - "book_data": { "martial_art": "style_boxing" } + "martial_art": "style_boxing" }, { "id": "manual_capoeira", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Capoeira 100" }, "price_postapoc": 2000, "description": "A complete guide to Capoeira.", - "book_data": { "martial_art": "style_capoeira" } + "martial_art": "style_capoeira" }, { "id": "manual_centipede", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Centipede Lu Feng" }, "price_postapoc": 2000, "description": "A complete guide to Centipede Kung Fu.", - "book_data": { "martial_art": "style_centipede" } + "martial_art": "style_centipede" }, { "id": "manual_crane", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Red Crane" }, "price_postapoc": 2000, "description": "A complete guide to Crane Kung Fu.", - "book_data": { "martial_art": "style_crane" } + "martial_art": "style_crane" }, { "id": "manual_dragon", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Jade Dragon" }, "price_postapoc": 2000, "description": "A complete guide to Dragon Kung Fu.", - "book_data": { "martial_art": "style_dragon" } + "martial_art": "style_dragon" }, { "id": "manual_eskrima", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Practical Eskrima" }, "price_postapoc": 3000, "description": "A complete guide to Eskrima.", - "book_data": { "martial_art": "style_eskrima" } + "martial_art": "style_eskrima" }, { "id": "manual_fencing", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Modern Swordsman" }, "price_postapoc": 3000, "description": "A complete guide to Fencing.", - "book_data": { "martial_art": "style_fencing" } + "martial_art": "style_fencing" }, { "id": "manual_judo", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Kodokan Judo" }, "price_postapoc": 2000, "description": "A complete guide to Judo.", - "book_data": { "martial_art": "style_judo" } + "martial_art": "style_judo" }, { "id": "manual_karate", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Shotokan Karate Handbook" }, "price_postapoc": 2000, "description": "A complete guide to Shotokan Karate.", - "book_data": { "martial_art": "style_karate" } + "martial_art": "style_karate" }, { "id": "manual_krav_maga", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Complete Krav Maga" }, "price_postapoc": 2000, "description": "A complete guide to Krav Maga.", - "book_data": { "martial_art": "style_krav_maga" } + "martial_art": "style_krav_maga" }, { "id": "manual_leopard", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Deaf Leopard" }, "price_postapoc": 2000, "description": "A complete guide to Leopard Kung Fu.", - "book_data": { "martial_art": "style_leopard" } + "martial_art": "style_leopard" }, { "id": "manual_lizard", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Lizard Kuo Chui" }, "price_postapoc": 2000, "description": "A complete guide to Lizard Kung Fu.", - "book_data": { "martial_art": "style_lizard" } + "martial_art": "style_lizard" }, { "id": "manual_muay_thai", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Ultimate Muay Thai" }, "price_postapoc": 2000, "description": "A complete guide to Muay Thai.", - "book_data": { "martial_art": "style_muay_thai" } + "martial_art": "style_muay_thai" }, { "id": "manual_ninjutsu", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Essence of Ninjutsu" }, "price_postapoc": 3000, "description": "A complete guide to Ninjutsu.", - "book_data": { "martial_art": "style_ninjutsu" } + "martial_art": "style_ninjutsu" }, { "id": "manual_niten", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Book of Five Rings" }, "price_postapoc": 3000, "description": "A primer on Miyamoto Musashi's style of combat and philosophy, Niten Ichi-Ryu.", - "book_data": { "martial_art": "style_niten" } + "martial_art": "style_niten" }, { "id": "manual_pankration", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Modern Pankratiast" }, "price_postapoc": 2000, "description": "A complete guide to Pankration.", - "book_data": { "martial_art": "style_pankration" } + "martial_art": "style_pankration" }, { "id": "manual_scorpion", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Scorpion Sun Chien" }, "price_postapoc": 2000, "description": "A complete guide to Scorpion Kung Fu.", - "book_data": { "martial_art": "style_scorpion" } + "martial_art": "style_scorpion" }, { "id": "manual_silat", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Indonesian Warrior" }, "price_postapoc": 3000, "description": "A complete guide to Pentjak Silat.", - "book_data": { "martial_art": "style_silat" } + "martial_art": "style_silat" }, { "id": "manual_snake", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Black Snake" }, "price_postapoc": 2000, "description": "A complete guide to Snake Kung Fu.", - "book_data": { "martial_art": "style_snake" } + "martial_art": "style_snake" }, { "id": "manual_taekwondo", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Official Taekwondo Training Manual" }, "price_postapoc": 2000, "description": "A complete guide to Taekwondo.", - "book_data": { "martial_art": "style_taekwondo" } + "martial_art": "style_taekwondo" }, { "id": "manual_tai_chi", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Becoming One with the Tao" }, "price_postapoc": 2000, "description": "A complete guide to T'ai Chi Ch'uan.", - "book_data": { "martial_art": "style_tai_chi" } + "martial_art": "style_tai_chi" }, { "id": "manual_tiger", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The White Tiger" }, "price_postapoc": 2000, "description": "A complete guide to Tiger Kung Fu.", - "book_data": { "martial_art": "style_tiger" } + "martial_art": "style_tiger" }, { "id": "manual_toad", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Toad Lo Mang" }, "price_postapoc": 2000, "description": "A complete guide to Toad Kung Fu.", - "book_data": { "martial_art": "style_toad" } + "martial_art": "style_toad" }, { "id": "manual_venom_snake", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Viper Wei Pai" }, "price_postapoc": 2000, "description": "A complete guide to Viper Kung Fu.", - "book_data": { "martial_art": "style_venom_snake" } + "martial_art": "style_venom_snake" }, { "id": "manual_zui_quan", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Zui Quan and You" }, "price_postapoc": 2000, "description": "A complete guide to Zui Quan.", - "book_data": { "martial_art": "style_zui_quan" } + "martial_art": "style_zui_quan" }, { "id": "manual_sojutsu", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "The Way of the Spear" }, "price_postapoc": 3000, "description": "A complete guide to Sōjutsu.", - "book_data": { "martial_art": "style_sojutsu" } + "martial_art": "style_sojutsu" }, { "id": "manual_wingchun", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Beautiful Springtime" }, "price_postapoc": 2000, "description": "A complete guide to Wing Chun Kung-fu.", - "book_data": { "martial_art": "style_wingchun" } + "martial_art": "style_wingchun" }, { "id": "manual_medievalpole", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Fior Di Battaglia" }, "price_postapoc": 3000, "description": "A completely translated medieval guide teaching various techniques with polearms, there is a chapter about the many variations of common polearms… there are even pictures!", - "book_data": { "martial_art": "style_medievalpole" } + "martial_art": "style_medievalpole" }, { "id": "manual_swordsmanship", "copy-from": "book_martial", - "type": "GENERIC", + "type": "BOOK", "name": { "str_sp": "Historic European Swordfighting" }, "price_postapoc": 3000, "description": "A complete guide to medieval swordsmanship. Compares the German and Italian traditions for longsword and side sword, in and out of armor, with and without shield.", - "book_data": { "martial_art": "style_swordsmanship" } + "martial_art": "style_swordsmanship" } ]