Skip to content

Commit

Permalink
Merge pull request CleverRaven#38872 from snipercup/Aftershock-martia…
Browse files Browse the repository at this point in the history
…l_art-name-to-object

Aftershock martial_art name to object
  • Loading branch information
ZhilkinSerg authored Mar 18, 2020
2 parents e4d26a1 + df68e17 commit 27a36d0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions data/mods/Aftershock/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,56 @@
"id": "style_eskrima",
"copy-from": "style_eskrima",
"type": "martial_art",
"name": "Eskrima",
"name": { "str": "Eskrima" },
"extend": { "weapons": [ "ceramic_knife" ] }
},
{
"id": "style_fencing",
"copy-from": "style_fencing",
"type": "martial_art",
"name": "Fencing",
"name": { "str": "Fencing" },
"extend": { "weapons": [ "afs_energy_saber_on" ] }
},
{
"id": "style_krav_maga",
"copy-from": "style_krav_maga",
"type": "martial_art",
"name": "Krav Maga",
"name": { "str": "Krav Maga" },
"extend": { "weapons": [ "ceramic_knife" ] }
},
{
"id": "style_swordsmanship",
"copy-from": "style_swordsmanship",
"type": "martial_art",
"name": "Medieval Swordsmanship",
"name": { "str": "Medieval Swordsmanship" },
"extend": { "weapons": [ "afs_energy_saber_on" ] }
},
{
"id": "style_ninjutsu",
"copy-from": "style_ninjutsu",
"type": "martial_art",
"name": "Ninjutsu",
"name": { "str": "Ninjutsu" },
"extend": { "weapons": [ "afs_energy_saber_on", "ceramic_knife" ] }
},
{
"id": "style_niten",
"copy-from": "style_niten",
"type": "martial_art",
"name": "Niten Ichi-Ryu",
"name": { "str": "Niten Ichi-Ryu" },
"extend": { "weapons": [ "afs_energy_saber_on" ] }
},
{
"id": "style_silat",
"copy-from": "style_silat",
"type": "martial_art",
"name": "Silat",
"name": { "str": "Silat" },
"extend": { "weapons": [ "afs_energy_saber_on" ] }
},
{
"id": "style_sojutsu",
"copy-from": "style_sojutsu",
"type": "martial_art",
"name": "Sojutsu",
"name": { "str": "Sojutsu" },
"extend": { "weapons": [ "afs_titanium_bat" ] }
}
]
2 changes: 1 addition & 1 deletion data/mods/MMA/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "martial_art",
"id": "style_mma_panzer",
"name": "Panzer Kunst",
"name": { "str": "Panzer Kunst" },
"description": "Panzer Kunst or \"Armor Art\" is a futuristic martial art devised for cyborgs fighting in zero-gravity environments.",
"initiate": [ "You adopt a panzer kunst stance.", "%s adopts a panzer kunst stance." ],
"learn_difficulty": 10,
Expand Down

0 comments on commit 27a36d0

Please sign in to comment.