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

Rework (and nerf) melee combat practice recipes. #64197

Merged
merged 4 commits into from
Mar 12, 2023
Merged

Rework (and nerf) melee combat practice recipes. #64197

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
01254eb
Rework melee combat practice recipes.
Aerin-of-the-Toast Mar 12, 2023
f161c92
Add missing book requirement to intermediate spears
Aerin-of-the-Toast Mar 12, 2023
6744bf0
remove extraneous scrap requirement from intermediate cutting
Aerin-of-the-Toast Mar 12, 2023
2fb0869
speelchequer
Aerin-of-the-Toast Mar 12, 2023
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
229 changes: 146 additions & 83 deletions data/json/recipes/practice/melee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,48 @@
{
"id": "prac_melee_beg",
"type": "practice",
"activity_level": "MODERATE_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "melee (beginner)",
"description": "Practice close quarters combat with and without weapons against an imaginary opponent.",
"description": "Swing around a weapon-shaped object to try and get a feel for what fighting might be like. It's difficult without any instruction to guide you, but hopefully this practice will help you to swing at your enemies without falling on your face or panicking too much.",
"skill_used": "melee",
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 0, "skill_limit": 1 },
"autolearn": [ [ "melee", 0 ] ],
"//": "At this level, anything will do that isn't like, a microwave, but I don't want to bloat out the list.",
"tools": [ [ "stick", "2x4", "stick_long", "pipe" ] ]
},
{
"id": "prac_melee_int",
"type": "practice",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "melee (intermediate)",
"description": "Practice the basics of combat with the guidance of a manual or prior knowledge. Even without a sparring partner you can practice your footwork, form, and flow drills to help avoid overswinging and stumbling.",
"skill_used": "melee",
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "melee", 1 ] ],
"book_learn": [ [ "mag_melee", 0 ], [ "manual_melee", 0 ] ],
"//": "Only training weapons, all of these have the WBLOCK_2 techniques and are relatively easy to handle, in other words they have a positive to_hit bonus.",
"tools": [ [ "cudgel", "bokken", "bokken_fake", "bokken_inferior", "q_staff" ] ]
"practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "melee", 3 ] ],
"book_learn": [ [ "mag_melee", 1 ], [ "manual_melee", 1 ] ],
"tools": [ [ "stick", "2x4", "stick_long", "pipe" ] ]
},
{
"id": "prac_cutting_beg",
"type": "practice",
"activity_level": "MODERATE_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "cutting (beginner)",
"description": "Practice the use of the sword and similar weapons against a training dummy. You will need something to mark the striking points while you train.",
"description": "Practice some of the basics of combat with cutting weapons, such as how to keep your edge lined up and how to not chop your own leg off.",
"skill_used": "cutting",
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "cutting", 1 ] ],
"practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 },
"autolearn": [ [ "cutting", 2 ] ],
"book_learn": [ [ "mag_cutting", 0 ], [ "manual_cutting", 0 ] ],
"//": "Only training weapons or wooden versions of swords, a real katana would be too much to handle correctly at these levels.",
"tools": [
[ "bokken", "bokken_fake", "bokken_inferior", "sword_wood" ],
[ "pseudo_training_dummy_light", "pseudo_training_dummy_heavy" ]
],
"//1": "Some components to mark the striking points for the session.",
"components": [ [ [ "duct_tape", 25 ], [ "medical_tape", 50 ], [ "paint", 1, "LIST" ] ] ]
"tools": [ [ "bokken", "bokken_fake", "bokken_inferior", "sword_wood" ] ]
},
{
"id": "prac_cutting_int",
Expand All @@ -44,14 +52,15 @@
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "cutting (intermediate)",
"description": "Practice advanced handling of the sword and similar weapons against an armored training dummy. You will need to make repairs to the dummy while you train.",
"description": "Practice your edge alignment and cutting form by slashing soaked rolled-up paper on a stand. It's not quite tatami mats but you don't have the luxury of historical accuracy.",
"skill_used": "cutting",
"skills_required": [ [ "melee", 3 ] ],
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 3, "max_difficulty": 4, "skill_limit": 4 },
"autolearn": [ [ "cutting", 3 ] ],
"practice_data": { "min_difficulty": 2, "max_difficulty": 3, "skill_limit": 4 },
"autolearn": [ [ "cutting", 4 ] ],
"book_learn": [ [ "mag_cutting", 2 ], [ "manual_cutting", 2 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"//": "Only historial, real and powerful cutting weapons.",
"//": "Only real and powerful cutting weapons.",
"tools": [
[
"katana",
Expand All @@ -73,36 +82,33 @@
"halberd",
"poleaxe",
"battleaxe",
"fire_ax",
"ax",
"ji",
"naginata",
"scythe_war"
],
[ "pseudo_training_dummy_heavy" ]
[ "water", "water_clean" ]
],
"//1": "A bunch of duct tape and scrap to repair the dummy with each training session.",
"components": [ [ [ "duct_tape", 50 ] ], [ [ "scrap", 20 ] ] ]
"components": [ [ [ "duct_tape", 10 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "paper", 10 ] ] ]
},
{
"id": "prac_bashing_beg",
"type": "practice",
"activity_level": "MODERATE_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "bashing (beginner)",
"description": "Practice the use of batons and similar weapons against a training dummy. You will need something to mark the striking points while you train.",
"description": "Practice the basics of fighting with bludgeons, both purpose-made and impromptu. Learn how to apply your leverage, maximize kinetic energy, and to swing for the fences without tearing your shoulder out of its socket.",
"skill_used": "bashing",
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "bashing", 1 ] ],
"practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 },
"autolearn": [ [ "bashing", 2 ] ],
"book_learn": [ [ "mag_bashing", 0 ], [ "manual_bashing", 0 ] ],
"//": "Only training weapons or light and easy to use weapons, a war hammer is a good weapon but you should not start your training with one.",
"tools": [
[ "cudgel", "q_staff", "bat", "baton-extended", "PR24-extended" ],
[ "pseudo_training_dummy_light", "pseudo_training_dummy_heavy" ]
],
"//1": "Some components to mark the striking points for the session.",
"components": [ [ [ "duct_tape", 25 ], [ "medical_tape", 50 ], [ "paint", 1, "LIST" ] ] ]
"tools": [ [ "cudgel", "q_staff", "bat", "baton-extended", "PR24-extended" ] ]
},
{
"id": "prac_bashing_int",
Expand All @@ -111,97 +117,156 @@
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "bashing (intermediate)",
"description": "Practice advanced handling of bashing weapons against an armored training dummy. You will need to make repairs to the dummy while you train.",
"description": "Practice the handling of very top-heavy and weighty bludgeons. Learn how to swing fast, accurately, with force, and without throwing yourself for a loop. You'll need a reinforced training dummy to not break it into splinters with such heavy weaponry, though.",
"skill_used": "bashing",
"skills_required": [ [ "melee", 3 ] ],
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 3, "max_difficulty": 4, "skill_limit": 4 },
"autolearn": [ [ "bashing", 3 ] ],
"practice_data": { "min_difficulty": 2, "max_difficulty": 3, "skill_limit": 4 },
"autolearn": [ [ "bashing", 4 ] ],
"book_learn": [ [ "mag_bashing", 2 ], [ "manual_bashing", 2 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"//": "Only historial, powerful bashing weapons.",
"//": "Only large, top-heavy bashing weapons or axes.",
"tools": [
[
"warhammer",
"mace",
"i_staff",
"bo",
"morningstar",
"2h_flail_steel",
"glaive",
"halberd",
"lucern_hammer",
"poleaxe",
"battleaxe"
"fire_ax",
"ax",
"battleaxe",
"hammer_sledge",
"hammer_sledge_short",
"hammer_sledge_heavy",
"hammer_sledge_engineer"
],
[ "pseudo_training_dummy_heavy" ]
],
"//1": "A bunch of duct tape and scrap to repair the dummy with each training session.",
"components": [ [ [ "duct_tape", 50 ] ], [ [ "scrap", 20 ] ] ]
},
{
"id": "prac_stabbing_beg",
"id": "prac_stabbing_beg_spear",
"type": "practice",
"activity_level": "MODERATE_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "stabbing (beginner)",
"description": "Practice the use of spears and similar stabbing weapons against a training dummy. You will need something to mark the striking points while you train.",
"name": "spears (beginner)",
"description": "Practice the basics of spears, the most popular melee weapon throughout history. Learn the footwork, how to thrust with power, where to place your hands, and the right way to hold the damn thing. Dominant hand back, non-dominant forward!",
"skill_used": "stabbing",
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "stabbing", 1 ] ],
"book_learn": [ [ "mag_stabbing", 0 ], [ "manual_stabbing", 0 ] ],
"//": "Only training weapons or light and easy to use weapons.",
"tools": [
[ "spear_wood", "spear_knife_superior", "spear_stone", "spear_spike", "fencing_foil", "fencing_epee", "fencing_sabre" ],
[ "pseudo_training_dummy_light", "pseudo_training_dummy_heavy" ]
],
"//1": "Some components to mark the striking points for the session.",
"components": [ [ [ "duct_tape", 25 ], [ "medical_tape", 50 ], [ "paint", 1, "LIST" ] ] ]
"practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 },
"autolearn": [ [ "stabbing", 2 ] ],
"book_learn": [ [ "manual_stabbing", 0 ] ],
"//": "Long stick works as a spear here, no tip is needed to practice form.",
"tools": [ [ "stick_long", "spear_shaft" ] ]
},
{
"id": "prac_stabbing_int",
"id": "prac_stabbing_beg_fencing",
"type": "practice",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "stabbing (intermediate)",
"description": "Practice advanced handling of stabbing weapons against an armored training dummy. You will need to make repairs to the dummy while you train.",
"name": "fencing",
"description": "Practice the basics of the noble art of fencing. Learn how to angle your body, aim your lunges, and parry pretend swords. Not that the undead are using swords. Hopefully.",
"skill_used": "stabbing",
"skills_required": [ [ "melee", 3 ] ],
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 3, "max_difficulty": 4, "skill_limit": 4 },
"autolearn": [ [ "stabbing", 3 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"//": "Only historial, powerful stabbing weapons.",
"practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 },
"autolearn": [ [ "stabbing", 2 ] ],
"book_learn": [ [ "mag_stabbing", 0 ] ],
"//": "Basically anything that works with the fencing MA should work here, but the list is truncated for my sanity.",
"tools": [ [ "cudgel", "fencing_epee", "fencing_foil", "fencing_sabre" ] ]
},
{
"id": "prac_stabbing_beg_knife",
"type": "practice",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "knives (beginner)",
"description": "Practice the brutal art of shanking the shit out of something until it dies. Learn the form, where and how to stab to avoid your knife glancing off bone, and whether you should actually hold the knife in reverse grip. (It depends.)",
"skill_used": "stabbing",
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 },
"autolearn": [ [ "stabbing", 2 ] ],
"book_learn": [ [ "manual_cutting", 0 ], [ "manual_knives", 0 ] ],
"//": "Too many damn knives. Someone else can flesh out the list if they want, but this should be enough that you'll almost always have at least one of these before you get others.",
"tools": [ [ "makeshift_knife", "primitive_knife", "knife_trench", "knife_combat", "knife_chef", "knife_rambo" ] ]
},
{
"id": "prac_stabbing_int_spear",
"type": "practice",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "spears (intermediate)",
"description": "Practice advanced spear moves and accurate thrusts against a training dummy. It's not glamorous, but spears were the workhorses of armed combat for millenia with good reason.",
"skill_used": "stabbing",
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 2, "max_difficulty": 3, "skill_limit": 4 },
"autolearn": [ [ "stabbing", 4 ] ],
"book_learn": [ [ "manual_stabbing", 2 ] ],
"tools": [ [ "stick_long", "spear_shaft" ], [ "pseudo_training_dummy_light", "pseudo_training_dummy_heavy" ] ]
},
{
"id": "prac_stabbing_int_knife",
"type": "practice",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "knives (intermediate)",
"description": "Get in touch with your inner commando and practice some advanced knife-fighting techniques on a training dummy.",
"skill_used": "stabbing",
"skills_required": [ [ "melee", 1 ] ],
"time": "1 h",
"practice_data": { "min_difficulty": 2, "max_difficulty": 3, "skill_limit": 4 },
"autolearn": [ [ "stabbing", 4 ] ],
"book_learn": [ [ "manual_cutting", 2 ], [ "manual_knives", 2 ] ],
"tools": [
[ "pike", "lucern_hammer", "spear_dory", "sword_cane", "rapier", "estoc", "kris", "qiang", "tanto" ],
[ "pseudo_training_dummy_heavy" ]
],
"//1": "A bunch of duct tape and scrap to repair the dummy with each training session.",
"components": [ [ [ "duct_tape", 50 ] ], [ [ "scrap", 20 ] ] ]
[ "makeshift_knife", "primitive_knife", "knife_trench", "knife_combat", "knife_chef", "knife_rambo" ],
[ "pseudo_training_dummy_light", "pseudo_training_dummy_heavy" ]
]
},
{
"id": "prac_unarmed_beg",
"type": "practice",
"activity_level": "MODERATE_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "unarmed (beginner)",
"skills_required": [ [ "melee", 1 ] ],
"description": "Practice some unarmed moves against a training dummy or punching bag.",
"description": "Do a bit of shadowboxing as practice just in case you're left without a weapon versus the undead. There's not much you can learn without someone to correct your mistakes, though.",
"skill_used": "unarmed",
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "unarmed", 1 ] ],
"book_learn": [ [ "mag_unarmed", 0 ], [ "manual_brawl", 0 ] ],
"practice_data": { "min_difficulty": 0, "max_difficulty": 0, "skill_limit": 1 },
"autolearn": [ [ "unarmed", 0 ] ]
},
{
"id": "prac_unarmed_int",
"type": "practice",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "unarmed (beginner)",
"description": "Learn how to throw a punch without breaking your wrist or kick without falling over with the help of a punching bag or training dummy.",
"skill_used": "unarmed",
"time": "1 h",
"practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "unarmed", 3 ] ],
"book_learn": [ [ "mag_unarmed", 1 ], [ "manual_brawl", 1 ] ],
"tools": [ [ "pseudo_training_dummy_light", "pseudo_punching_bag" ] ]
},
{
"id": "prac_dancing",
"type": "practice",
"activity_level": "LIGHT_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "dancing",
Expand All @@ -214,16 +279,14 @@
{
"id": "prac_dodge_beg",
"type": "practice",
"activity_level": "MODERATE_EXERCISE",
"activity_level": "BRISK_EXERCISE",
"category": "CC_PRACTICE",
"subcategory": "CSC_PRACTICE_COMBAT",
"name": "dodge (beginner)",
"description": "Practice your dodging by throwing a ball at a wall and dodging it when it bounces off.",
"description": "Practice your dodging with some side hops, backsteps, and maybe a somersault or two to learn why you shouldn't somersault in a fight. Without someone attacking you to actually dodge all you can practice is footwork, but hopefully it'll help prevent you tripping over your shoelaces in a panic.",
"skill_used": "dodge",
"time": "1 h",
"practice_data": { "min_difficulty": 0, "max_difficulty": 2, "skill_limit": 3 },
"autolearn": [ [ "dodge", 1 ] ],
"book_learn": [ [ "manual_dodge_kid", 0 ], [ "manual_dodge", 0 ] ],
"tools": [ [ "basketball", "indoor_volleyball", "beach_volleyball", "baseball", "golf_ball" ] ]
"practice_data": { "min_difficulty": 0, "max_difficulty": 0, "skill_limit": 1 },
"autolearn": [ [ "dodge", 0 ] ]
}
]
9 changes: 9 additions & 0 deletions tools/spell_checker/dictionary.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ babiues
babylonica
backblast
backrest
backstep
backstepping
backsteps
backtracing
bagh
bakelite
Expand Down Expand Up @@ -1697,6 +1700,7 @@ migo
mildewy
militar
milkfat
millenia
milspec
mineable
minesweeper
Expand Down Expand Up @@ -1950,6 +1954,8 @@ overpenetration
overpressure
overqueen
overshoes
overswing
overswinging
overtaxing
overtop
ovipositor
Expand Down Expand Up @@ -2448,6 +2454,8 @@ seweranha
sexten
sexualities
sh
shadowbox
shadowboxing
shadowcat
shambler
shantak
Expand Down Expand Up @@ -2536,6 +2544,7 @@ solarpunk
solderers
solderless
soled
somersault
sommat
somniferum
soother
Expand Down