From 34350dec842fdc1172aa32329ea65ae3201bd548 Mon Sep 17 00:00:00 2001 From: Photoloss Date: Sat, 30 Mar 2019 22:56:08 +0100 Subject: [PATCH 01/10] re-remove Deadly Venom manuals from loot table --- data/json/item_groups.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index dbade2825005f..57bb93a3646ce 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -3752,16 +3752,11 @@ "type": "item_group", "//": "These are exceptionally rare martial arts books that should only spawn very rarely.", "items": [ - [ "manual_centipede", 1 ], [ "manual_crane", 1 ], [ "manual_dragon", 1 ], [ "manual_leopard", 1 ], - [ "manual_lizard", 1 ], - [ "manual_scorpion", 1 ], [ "manual_snake", 1 ], [ "manual_tiger", 1 ], - [ "manual_toad", 1 ], - [ "manual_venom_snake", 1 ], [ "manual_zui_quan", 1 ] ] }, From b3548d505b771995672a5ef05d9dab17e0a49a13 Mon Sep 17 00:00:00 2001 From: Photoloss Date: Sat, 30 Mar 2019 23:15:25 +0100 Subject: [PATCH 02/10] add Panzer Kunst --- data/mods/MMA/martial.json | 11 ++++++ data/mods/MMA/martialarts.json | 57 ++++++++++++++++++++++++++++ data/mods/MMA/mutations.json | 10 +++++ data/mods/MMA/professions.json | 21 +++++++++++ data/mods/MMA/techniques.json | 69 ++++++++++++++++++++++++++++++++++ 5 files changed, 168 insertions(+) create mode 100644 data/mods/MMA/martial.json create mode 100644 data/mods/MMA/martialarts.json create mode 100644 data/mods/MMA/professions.json create mode 100644 data/mods/MMA/techniques.json diff --git a/data/mods/MMA/martial.json b/data/mods/MMA/martial.json new file mode 100644 index 0000000000000..b351d88c60aef --- /dev/null +++ b/data/mods/MMA/martial.json @@ -0,0 +1,11 @@ +[ + { + "id": "manual_mma_panzer", + "copy-from": "book_martial", + "looks_like": "manual_karate", + "type": "GENERIC", + "name": "The Life and Work of Tiger Sauer", + "name_plural": "The Life and Work of Tiger Sauer", + "description": "A biography of a combat cyborg agent detailing his philosophy and martial art." + } +] diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json new file mode 100644 index 0000000000000..fdabcd5649895 --- /dev/null +++ b/data/mods/MMA/martialarts.json @@ -0,0 +1,57 @@ +[ + { + "type": "martial_art", + "id": "style_mma_panzer", + "name": "Panzer Kunst", + "description": "A futuristic martial art devised for cyborgs fighting in zero-gravity environments.", + "arm_block": 99, + "leg_block": 99, + "arm_block_with_bio_armor_arms": true, + "leg_block_with_bio_armor_legs": true, + "static_buffs": [ + { + "id": "mma_panzer_static", + "name": "Schatten Folgen", + "unarmed_allowed": true, + "melee_allowed": true, + "min_melee": 1, + "description": "+1 dodge", + "bonus_dodges": 1 + } + ], + "onmove_buffs": [ + { + "id": "mma_panzer_move", + "name": "Einsatzrhythmen", + "unarmed_allowed": true, + "melee_allowed": true, + "min_melee": 3, + "description": "Perception increases dodging ability, +1 block", + "bonus_blocks": 1, + "flat_bonuses": [ [ "dodge", "per", 0.12 ] ], + "buff_duration": 2, + "max_stacks": 1 + } + ], + "onhit_buffs": [ + { + "id": "mma_panzer_combo", + "name": "Verschlag", + "description": "You have imparted a powerful shockwave to your enemy", + "unarmed_allowed": true, + "min_unarmed": 6, + "buff_duration": 2, + "max_stacks": 1 + } + ], + "techniques": [ + "mma_tec_panzer_counter_dodge", + "mma_tec_panzer_blade", + "mma_tec_panzer_appunch", + "mma_tec_panzer_rapid", + "mma_tec_panzer_stun", + "mma_tec_panzer_spin" + ], + "weapons": [ "bio_claws_weapon", "bio_blade_weapon" ] + } +] diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json index b1c4dce9b30c4..87afa248e262d 100644 --- a/data/mods/MMA/mutations.json +++ b/data/mods/MMA/mutations.json @@ -8,5 +8,15 @@ "starting_trait": true, "initial_ma_styles": [ "style_centipede", "style_venom_snake", "style_scorpion", "style_lizard", "style_toad" ], "valid": false + }, + { + "type" : "mutation", + "id" : "MMA_MARTIAL_ARTS_PANZER", + "name" : "Künstler", + "points" : 3, + "description" : "You have lingering memories of training to fight cyborgs and war machines in zero gravity using the obscure Panzer Kunst.", + "starting_trait" : true, + "initial_ma_styles" : [ "style_mma_panzer" ], + "valid" : false } ] diff --git a/data/mods/MMA/professions.json b/data/mods/MMA/professions.json new file mode 100644 index 0000000000000..55d5e03c6aadd --- /dev/null +++ b/data/mods/MMA/professions.json @@ -0,0 +1,21 @@ +[ + { + "type": "profession", + "ident": "mma_battle_angel", + "name": "Battle Angel", + "description": "A combat cyborg built in the image of a girl...", + "points": 8, + "traits": [ "MMA_MARTIAL_ARTS_PANZER" ], + "skills": [ { "level": 3, "name": "unarmed" }, { "level": 3, "name": "melee" }, { "level": 1, "name": "dodge" } ], + "items": { "both": { "items": [ "wetsuit", "trenchcoat", "gloves_fingerless", "knee_pads", "boots" ] } }, + "CBMs": [ + "bio_power_storage_mkII", + "bio_armor_arms", + "bio_armor_head", + "bio_armor_legs", + "bio_armor_torso", + "bio_blade", + "bio_metabolics" + ] + } +] diff --git a/data/mods/MMA/techniques.json b/data/mods/MMA/techniques.json new file mode 100644 index 0000000000000..48df0009e3738 --- /dev/null +++ b/data/mods/MMA/techniques.json @@ -0,0 +1,69 @@ +[ + { + "type": "technique", + "id": "mma_tec_panzer_counter_dodge", + "name": "Ausstoß", + "min_melee": 4, + "unarmed_allowed": true, + "dodge_counter": true, + "req_buffs": [ "mma_panzer_move" ], + "mult_bonuses": [ [ "movecost", 0.0 ], [ "damage", "bash", 1.2 ], [ "damage", "cut", 1.1 ], [ "damage", "stab", 1.3 ] ], + "messages": [ "You redirect %s's attack against them", " redirects %s's attack against them" ] + }, + { + "type": "technique", + "id": "mma_tec_panzer_blade", + "name": "Ellbogen Blatt", + "//": "should be 'Ellbogen Klinge', 'Blatt' means 'leaf' ", + "min_melee": 2, + "unarmed_allowed": true, + "melee_allowed": true, + "messages": [ "You expertly cut %s", " expertly cuts %s" ], + "mult_bonuses": [ [ "movecost", 0.75 ], [ "damage", "cut", 1.2 ] ] + }, + { + "type": "technique", + "id": "mma_tec_panzer_appunch", + "name": "Herzschlag", + "min_unarmed": 5, + "crit_tec": true, + "unarmed_allowed": true, + "mult_bonuses": [ [ "movecost", 2 ], [ "damage", "bash", 2 ], [ "target_armor_multiplier", 0 ] ], + "messages": [ "You hit %s with a powerful vibro-punch", " hits %s with a powerful vibro-punch" ], + "stun_dur": 1 + }, + { + "type": "technique", + "id": "mma_tec_panzer_rapid", + "name": "Geschoss Schlag", + "min_unarmed": 3, + "unarmed_allowed": true, + "messages": [ "You launch a supersonic punch at %s", " launches a supersonic punch at %s" ], + "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ] + }, + { + "type": "technique", + "id": "mma_tec_panzer_stun", + "name": "Herz Nadel", + "min_unarmed": 6, + "unarmed_allowed": true, + "messages": [ "You detonate the shockwave within %s", " detonates the shockwave within %s" ], + "mult_bonuses": [ [ "movecost", 1.5 ], [ "damage", "bash", 1.5 ] ], + "req_buffs": [ "mma_panzer_combo" ], + "stun_dur": 3 + }, + { + "type": "technique", + "id": "mma_tec_panzer_spin", + "name": "Mehr Umdrehungen", + "//": "unofficial translation of 'Senkai Kyaku', open for better mangled German suggestions", + "min_melee": 5, + "unarmed_allowed": true, + "melee_allowed": true, + "messages": [ "You kick %s and spin around", " kicks %s and spins around" ], + "aoe": "spin", + "knockback_dist": 1, + "defensive": true, + "grab_break": true + } +] From 4f6848041d4cd236275babe10145d8e05c417de0 Mon Sep 17 00:00:00 2001 From: Photoloss <47065409+Photoloss@users.noreply.github.com> Date: Sun, 31 Mar 2019 00:12:51 +0100 Subject: [PATCH 03/10] stupid trailing space... astyle happy now? --- data/mods/MMA/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json index 87afa248e262d..0bb55afca1a2b 100644 --- a/data/mods/MMA/mutations.json +++ b/data/mods/MMA/mutations.json @@ -8,7 +8,7 @@ "starting_trait": true, "initial_ma_styles": [ "style_centipede", "style_venom_snake", "style_scorpion", "style_lizard", "style_toad" ], "valid": false - }, + }, { "type" : "mutation", "id" : "MMA_MARTIAL_ARTS_PANZER", From 514f72c34c109a00023ddf1c7e0417f93a1d4e0b Mon Sep 17 00:00:00 2001 From: Photoloss <47065409+Photoloss@users.noreply.github.com> Date: Sun, 31 Mar 2019 00:33:02 +0100 Subject: [PATCH 04/10] astyle --- data/mods/MMA/mutations.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json index 0bb55afca1a2b..197c3255344d0 100644 --- a/data/mods/MMA/mutations.json +++ b/data/mods/MMA/mutations.json @@ -1,15 +1,14 @@ [ { - "type": "mutation", - "id": "MARTIAL_ARTS4", - "name": "Venom Mob Protege", - "points": 2, - "description": "You are a pupil of the Venom Clan. You start with one of the five deadly venoms: Centipede, Viper, Scorpion, Lizard, or Toad.", - "starting_trait": true, - "initial_ma_styles": [ "style_centipede", "style_venom_snake", "style_scorpion", "style_lizard", "style_toad" ], - "valid": false - }, - { + "type" : "mutation", + "id" : "MARTIAL_ARTS4", + "name" : "Venom Mob Protege", + "points" : 2, + "description" : "You are a pupil of the Venom Clan. You start with one of the five deadly venoms: Centipede, Viper, Scorpion, Lizard, or Toad.", + "starting_trait" : true, + "initial_ma_styles" : [ "style_centipede", "style_venom_snake", "style_scorpion", "style_lizard", "style_toad" ], + "valid" : false + },{ "type" : "mutation", "id" : "MMA_MARTIAL_ARTS_PANZER", "name" : "Künstler", From 3bbd79ab30d2d85cdb37094c011cc6bbb680a0c8 Mon Sep 17 00:00:00 2001 From: Photoloss <47065409+Photoloss@users.noreply.github.com> Date: Sun, 31 Mar 2019 10:32:55 +0200 Subject: [PATCH 05/10] add Panzer Kunst manual to dojo drop table --- data/mods/MMA/item_groups.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/MMA/item_groups.json b/data/mods/MMA/item_groups.json index 1faf85943b457..ed847da01627f 100644 --- a/data/mods/MMA/item_groups.json +++ b/data/mods/MMA/item_groups.json @@ -7,7 +7,8 @@ [ "manual_lizard", 1 ], [ "manual_scorpion", 1 ], [ "manual_toad", 1 ], - [ "manual_venom_snake", 1 ] + [ "manual_venom_snake", 1 ], + [ "manual_mma_panzer", 1 ] ] } ] From e5c7f4fe96ec584b26c3eac98df1c0b563949ba1 Mon Sep 17 00:00:00 2001 From: Photoloss Date: Sun, 31 Mar 2019 13:53:13 +0200 Subject: [PATCH 06/10] move Venoms fix to own PR --- data/json/item_groups.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 57bb93a3646ce..dbade2825005f 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -3752,11 +3752,16 @@ "type": "item_group", "//": "These are exceptionally rare martial arts books that should only spawn very rarely.", "items": [ + [ "manual_centipede", 1 ], [ "manual_crane", 1 ], [ "manual_dragon", 1 ], [ "manual_leopard", 1 ], + [ "manual_lizard", 1 ], + [ "manual_scorpion", 1 ], [ "manual_snake", 1 ], [ "manual_tiger", 1 ], + [ "manual_toad", 1 ], + [ "manual_venom_snake", 1 ], [ "manual_zui_quan", 1 ] ] }, From e859871988c7aad90232a2850eb98de91cd52dbe Mon Sep 17 00:00:00 2001 From: Photoloss Date: Sun, 31 Mar 2019 13:55:14 +0200 Subject: [PATCH 07/10] lint MMA/mutations.json --- data/mods/MMA/mutations.json | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json index 197c3255344d0..952a0f72a6a4d 100644 --- a/data/mods/MMA/mutations.json +++ b/data/mods/MMA/mutations.json @@ -1,21 +1,22 @@ [ { - "type" : "mutation", - "id" : "MARTIAL_ARTS4", - "name" : "Venom Mob Protege", - "points" : 2, - "description" : "You are a pupil of the Venom Clan. You start with one of the five deadly venoms: Centipede, Viper, Scorpion, Lizard, or Toad.", - "starting_trait" : true, - "initial_ma_styles" : [ "style_centipede", "style_venom_snake", "style_scorpion", "style_lizard", "style_toad" ], - "valid" : false - },{ - "type" : "mutation", - "id" : "MMA_MARTIAL_ARTS_PANZER", - "name" : "Künstler", - "points" : 3, - "description" : "You have lingering memories of training to fight cyborgs and war machines in zero gravity using the obscure Panzer Kunst.", - "starting_trait" : true, - "initial_ma_styles" : [ "style_mma_panzer" ], - "valid" : false + "type": "mutation", + "id": "MARTIAL_ARTS4", + "name": "Venom Mob Protege", + "points": 2, + "description": "You are a pupil of the Venom Clan. You start with one of the five deadly venoms: Centipede, Viper, Scorpion, Lizard, or Toad.", + "starting_trait": true, + "initial_ma_styles": [ "style_centipede", "style_venom_snake", "style_scorpion", "style_lizard", "style_toad" ], + "valid": false + }, + { + "type": "mutation", + "id": "MMA_MARTIAL_ARTS_PANZER", + "name": "Künstler", + "points": 3, + "description": "You have lingering memories of training to fight cyborgs and war machines in zero gravity using the obscure Panzer Kunst.", + "starting_trait": true, + "initial_ma_styles": [ "style_mma_panzer" ], + "valid": false } ] From 1998efa6dba904b6cc9f16a246b4779e153a8ad3 Mon Sep 17 00:00:00 2001 From: Photoloss Date: Sun, 31 Mar 2019 14:12:49 +0200 Subject: [PATCH 08/10] drop manual as rare military book instead --- data/mods/MMA/item_groups.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/mods/MMA/item_groups.json b/data/mods/MMA/item_groups.json index ed847da01627f..e445a806fdb37 100644 --- a/data/mods/MMA/item_groups.json +++ b/data/mods/MMA/item_groups.json @@ -7,8 +7,12 @@ [ "manual_lizard", 1 ], [ "manual_scorpion", 1 ], [ "manual_toad", 1 ], - [ "manual_venom_snake", 1 ], - [ "manual_mma_panzer", 1 ] + [ "manual_venom_snake", 1 ] ] + }, + { + "type": "item_group", + "id": "book_military", + "items": [ [ "manual_mma_panzer", 10 ] ] } ] From fb2afd50f677c263d75f39925a3e3a0ce98c9716 Mon Sep 17 00:00:00 2001 From: Photoloss <47065409+Photoloss@users.noreply.github.com> Date: Sun, 31 Mar 2019 20:54:45 +0200 Subject: [PATCH 09/10] removed unnecessary gendered language --- data/mods/MMA/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/MMA/professions.json b/data/mods/MMA/professions.json index 55d5e03c6aadd..8327ba16c7cd2 100644 --- a/data/mods/MMA/professions.json +++ b/data/mods/MMA/professions.json @@ -3,7 +3,7 @@ "type": "profession", "ident": "mma_battle_angel", "name": "Battle Angel", - "description": "A combat cyborg built in the image of a girl...", + "description": "A combat-ready cyborg once salvaged from an obscure junkyard...", "points": 8, "traits": [ "MMA_MARTIAL_ARTS_PANZER" ], "skills": [ { "level": 3, "name": "unarmed" }, { "level": 3, "name": "melee" }, { "level": 1, "name": "dodge" } ], From 9468d5901d715011581405e1363e934a08ce1329 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Sat, 18 May 2019 13:44:47 +0300 Subject: [PATCH 10/10] Update martialarts.json --- data/mods/MMA/martialarts.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json index fdabcd5649895..5e261feefa7f3 100644 --- a/data/mods/MMA/martialarts.json +++ b/data/mods/MMA/martialarts.json @@ -4,6 +4,7 @@ "id": "style_mma_panzer", "name": "Panzer Kunst", "description": "A futuristic martial art devised for cyborgs fighting in zero-gravity environments.", + "initiate": [ "You adopt a panzer kust stance.", "%s adopts a panzer kust stance." ], "arm_block": 99, "leg_block": 99, "arm_block_with_bio_armor_arms": true,