Skip to content

/Cataclysm-DDA

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.

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

Boxing Complete #6201

Closed
wants to merge 43 commits into from

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@IOSYN @KA101 @BevapDin @ClockworkZombie
@IOSYN
Copy link
Contributor

commented Feb 19, 2014

As far as I can see this is mostly complete, although if anyone wants to proofread I'd be very grateful.
Decided not to add it to a starting trait for now.

Boxing style should give some nice basic attacks, then allow counters at unarmed 5.
May need to tweak the damage a bit, I'll see how it goes.

  • Boxing gloves, headgear and MA manual.
  • Boxing gym with related equipment and a water cooler.
  • Made hand wraps skintight.

Any suggestions/critique/feedback lemme know-- and a massive thanks to wito for putting up with my questions.

IOSYN added some commits Feb 19, 2014

IOSYN
Boxing techniques 
Cross, jab, upper and counter.
793815e
IOSYN
Add boxing to styles. 
Static/onmove/ondodge, techniques.
d7075c6
IOSYN
Add "SKINTIGHT" to hand wraps 
Also half warmth
55dbdb4
IOSYN
Add MA manual
57c7d89
IOSYN
Create Boxing.json 
Very WIP, dojo.json used as template.
59aa960
IOSYN
Update iexamine.cpp 
update to include dispensable clean water from water coolers using the toilet function
328dc67
IOSYN
Update Boxing.json
0b96da5
IOSYN
Update martial_arts_manuals.json 
typo
5ada9f6
IOSYN
Add headgear
31390e5
IOSYN
Add headgear to item_group
63ebbc6
IOSYN
Update item_groups.json 
Add boxing gloves and headgear to sports item group.
Loading status checks…
e59e3af
IOSYN
Fix missing seperators.
Loading status checks…
fecc6ab
IOSYN
Fix more seperators.
Loading status checks…
4a3f9ae
IOSYN
Remove superfluous seperator.
Loading status checks…
6772da6
IOSYN
Remove superfluous seperator.
Loading status checks…
4077c01
IOSYN
Update regional_map_settings.json 
Added gym (boxing gym) to the weighted list. Dropped dojo weight back to 2-- with two martial arts buildings you've got double the chance of an MA/sports building in a given town compared to before, so you'll hopefully get one or the other at least.
Loading status checks…
6ef12eb
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Feb 19, 2014

Feature freeze, so on hold. Will take an interested look once the freeze is lifted.
data/json/Boxing.json Outdated
"to_hit" : 1,
"storage" : 0,
"symbol" : "G",
"description" : "A pair of big, red 8-Oz Boxing gloves. They make dexterous tasks near impossible, but provide ample protection.",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Feb 21, 2014

Contributor

big, red, 8 oz. boxing gloves

(side note: Pretty confident that "red" needs lowercased in the color field.)
data/json/Boxing.json Outdated
"required_str": 7,
"flags": ["BASHABLE", "DECONSTRUCT", "BLOCKSDOOR", "PLACE_ITEM", "ORGANIC"],
"bash": {
"str_min": 10, "str_max": 20,

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Feb 21, 2014

Contributor

Smashing a punchbag seems an exercise in futility: they're built for that sort of thing! ;-P

ST 15 at minimum, I'd think?

(I have a 50-lb canvas heavy bag in storage. Came in handy from time to time: much stronger than a pillow if you feel the need to punch something during high school. You can shear off a cheap metal hook if you hit it right--I have--but a reputable gym would mount 'em properly: reinforced swivel.)
data/json/Boxing.json Outdated
{
"type" : "furniture",
"id" : "f_cooler",
"name": "Water Cooler",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Feb 21, 2014

Contributor

This is a very good idea. Nice job.
data/json/martialarts.json Outdated
@@ -48,6 +48,55 @@
]
},{
"type" : "martial_art",
"id" : "style_boxing",
"name" : "Boxing",
"description" : "Sport of the true Gentleman, Modern boxing has evolved from the prizefights of the victorian era.",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Feb 21, 2014

Contributor

modern [...] Victorian era.
data/json/martialarts.json Outdated
"min_unarmed" : 5,
"unarmed_allowed" : true,
"max_stacks": 2,
"buff_duration" : 1,

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Feb 21, 2014

Contributor

In general, effects need to be at least 2 turns long for the player to be able to get them (they're decremented by 1 on the turn they're created).
data/json/martialarts.json Outdated
"onmove_buffs" : [
{
"id" : "boxing_move_buff",
"name" : "footwork",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Feb 21, 2014

Contributor

Caps here. Footwork! ;-)

IOSYN added some commits Feb 21, 2014

IOSYN
Update and rename Boxing.json to boxing.json 
fix suggestions, capitals, add mouthpiece to itemgroup.
Loading status checks…
bfc37d2
IOSYN
Update martialarts.json 
fix capitals, increase buff_duraiton of counter
Loading status checks…
79680b4
IOSYN
Fix spelling.
Loading status checks…
5ef5ae7
@IOSYN

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Feb 21, 2014

There. Think I've fixed everything.
@BevapDin

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Feb 21, 2014

In the bash_items section of the Heavy Punching Bag, the item ids are "leather", not "leather_patch" and "chain" instead of "steel_chain".

Edit: grey isn't a color (at least not in New England). Apparently, not even gray is a color there. One has to use ltgray or dkgray. Crazy folks. For the full list of existing colors refer to src/colors.cpp line 640. You should get a debug message about those invalid colors.
@IOSYN

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Feb 21, 2014

thanks for the tip BevapDin, fixing now.
IOSYN
Fix item IDs
Loading status checks…
5d51440

IOSYN added some commits Feb 23, 2014

IOSYN
Tweak techniques 
Removes crit_tec from uppers, damage balances
2ea52da
IOSYN
Tweak boxing.json 
nerf boxing glove defence slightly (should bring it in line with headgear)
tweak item spawn chances.
Loading status checks…
426810a
IOSYN
Update martialarts.json 
Change description, nerf block slightly, tweak counter buff duration.
d5b58e0
IOSYN
Update techniques.json 
adds quick to counter
Loading status checks…
07acf52
@IOSYN

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Feb 23, 2014

Compiled and tested.
Made some balance tweaks (namely crit_tec on uppers was hilariously OP, so that's gone.)
Nerfed boxing glove defence to bring it in line with headgear,
Tweaked item spawn chances.
Second round of testing in progress.
Ding-Ding!
IOSYN
Update martialarts.json 
Damage tweaks, buff duration
Loading status checks…
d3356e8
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Feb 23, 2014

Hey, we all appreciate the effort, but this bumps into the string and content freeze. Can't merge it until 0.A goes--hopefully tonight, but we're not there yet.
@IOSYN

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Feb 23, 2014

Nah, no worries. Way more important that existing issues are fixed.
Besides I was having compiler trouble, so it's given me more time for tweaks and testing anyway.

IOSYN added some commits Feb 25, 2014

IOSYN
Update iexamine.cpp 
Create action for water coolers.
Loading status checks…
a2fe307
IOSYN
Update iexamine.h 
Add cooler function
Loading status checks…
badf92f
IOSYN
Update boxing.json 
Add cooler place_special
Loading status checks…
edfa150
IOSYN
Add cooler pointer
Loading status checks…
2445e16
IOSYN
Update boxing.json
Loading status checks…
8c70329
IOSYN
Update boxing.json
Loading status checks…
bb15a75
IOSYN
Update boxing.json
Loading status checks…
38d6ac2
IOSYN
Rollback
Loading status checks…
b415c98
IOSYN
Rollback
Loading status checks…
49f3307
IOSYN
Update map.h 
adds place_cooler
Loading status checks…
c634edc
IOSYN
Add cooler place_special
Loading status checks…
1acf5f6
IOSYN
Cooler function
Loading status checks…
f28cf34
IOSYN
Update mapgen.cpp
0e3767c
IOSYN
Update furniture.json 
Add coolers to furn json
Loading status checks…
47fc646
@IOSYN

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Feb 28, 2014

Adding the new place special is taking longer than I'd thought -- and I've got some IRL stuff to sort out too so it's going to be a few days before I can take a good look yet.
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Mar 3, 2014

Freeze is lifted, so we can review this whenever you're ready.

IOSYN added some commits Mar 6, 2014

IOSYN
Update furniture.json
Loading status checks…
748c85b
IOSYN
remove coolers from boxing.json 
added to furn.json
Loading status checks…
8b97b48
IOSYN
Update mapgen.cpp
Loading status checks…
3fd1941
@IOSYN

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Mar 6, 2014

Okay, gonna close this pull and open a new one.
The boxing stuff is completed and works fine, I'll have to get my head around the place_specials at a later date.

@IOSYN IOSYN closed this Mar 6, 2014

@kevingranade kevingranade changed the title Boxing Complete [closed] Boxing Complete Sep 20, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.