Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new martial art: Sōjutsu #27535

Merged
merged 4 commits into from
Jan 13, 2019
Merged

Added new martial art: Sōjutsu #27535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225f3c0
Added new martial art
Hymore246 Jan 10, 2019
5eff256
Fixed trailing whitespaces
Hymore246 Jan 10, 2019
09de4f8
Fixed text formatting
Hymore246 Jan 11, 2019
3a87e92
Text formatting
Hymore246 Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/json/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3500,6 +3500,7 @@
[ "novel_swash", 30 ],
[ "manual_fencing", 9 ],
[ "manual_niten", 9 ],
[ "manual_sojutsu", 9 ],
[ "novel_samurai", 30 ],
[ "plays_book", 30 ],
[ "poetry_book", 30 ],
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/book/martial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,13 @@
"name": "Zui Quan and You",
"name_plural": "Zui Quan and You",
"description": "A complete guide to Zui Quan."
},
{
"id": "manual_sojutsu",
"copy-from": "book_martial",
"type": "GENERIC",
"name": "The Way of the Spear",
"name_plural": "The Way of the Spear",
"description": "A complete guide to Sōjutsu."
}
]
54 changes: 54 additions & 0 deletions data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,5 +1008,59 @@
"tec_debug_slow",
"tec_debug_arpen"
]
},{
"type" : "martial_art",
"id" : "style_sojutsu",
"name" : "Sōjutsu",
"description": "Sōjutsu, \"The Way of the Spear\", is the Japanese martial art of fighting with a spear. Sōjutsu focuses on keeping opponents at a distance in order to maintain advantage in combat.",
"arm_block" : 99,
"leg_block" : 99,
"static_buffs" : [
{
"id" : "sojutsu_static",
"name" : "Sōjutsu Stance",
"description" : "Bonus block with reach weapons while standing still",
"unarmed_allowed" : false,
"bonus_blocks" : 1
}
],
"onmove_buffs": [
{
"id" : "sojutsu_damage_buff",
"name" : "Sōjutsu Rush",
"description" : "Increased damage when moving but no bonus block",
"unarmed_allowed" : false,
"min_melee" : 0,
"buff_duration" : 2,
"max_stacks" : 1,
"bonus_blocks" : -1,
"mult_bonuses" : [["damage", "cut", 1.1]]
}
],
"techniques" : [
"tec_sojutsu_push",
"tec_sojutsu_trip",
"tec_sojutsu_skewer"
],
"weapons" : [
"glaive",
"halberd",
"halberd_fake",
"naginata",
"makeshift_halberd",
"pike",
"pike_inferior",
"pike_fake",
"pitchfork",
"qiang",
"spear_copper",
"spear_forked",
"spear_homemade_halfpike",
"spear_pipe",
"spear_rebar",
"spear_steel",
"spear_survivor",
"spear_wood"
]
}
]
4 changes: 2 additions & 2 deletions data/json/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,9 @@
"id": "MARTIAL_ARTS5",
"name": "Melee Weapon Training",
"points": 3,
"description": "You have practiced fighting with weapons. You start with your choice of Eskrima, Fencing, Pentjak Silat or Niten Ichi-Ryu.",
"description": "You have practiced fighting with weapons. You start with your choice of Eskrima, Fencing, Pentjak Silat, Niten Ichi-Ryu, or Sōjutsu.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"description": "You have practiced fighting with weapons. You start with your choice of Eskrima, Fencing, Pentjak Silat, Niten Ichi-Ryu, or Sōjutsu.",
"description": "You have practiced fighting with weapons. You start with your choice of Eskrima, Fencing, Pentjak Silat, Niten Ichi-Ryu or Sōjutsu.",

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So do we want the Oxford comma or not?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want.

"starting_trait" : true,
"initial_ma_styles" : [ "style_eskrima", "style_fencing", "style_silat", "style_niten" ],
"initial_ma_styles" : [ "style_eskrima", "style_fencing", "style_silat", "style_niten", "style_sojutsu" ],
"valid" : false
},{
"type" : "mutation",
Expand Down
46 changes: 46 additions & 0 deletions data/json/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,5 +1347,51 @@
"You phase-strike %s",
"<npcname> phase-strikes %s"
]
},{
"type" : "technique",
"id" : "tec_sojutsu_push",
"name" : "Push",
"min_melee" : 1,
"mult_bonuses" : [
["movecost", 0.0],
["damage", "bash", 0.5],
["damage", "cut", 0.5],
["damage", "stab", 0.5]
],
"unarmed_allowed" : false,
"block_counter": true,
"knockback_dist" : 1,
"messages" : [
"You push %s away",
"<npcname> pushes %s away"
]
},{
"type" : "technique",
"id" : "tec_sojutsu_trip",
"name" : "Trip",
"min_melee" : 2,
"unarmed_allowed" : false,
"down_dur" : 2,
"messages" : [
"You deftly trip %s",
"<npcname> deftly trips %s"
]
},{
"type" : "technique",
"id" : "tec_sojutsu_skewer",
"name" : "Skewer",
"min_melee" : 4,
"mult_bonuses" : [
["damage", "bash", 0.0],
["damage", "cut", 1.5]
],
"unarmed_allowed" : false,
"crit_tec" : true,
"knockback_dist" : 1,
"stun_dur" : 2,
"messages" : [
"You brutally skewer %s",
"<npcname> brutally skewers %s"
]
}
]