Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upMake shaving/haircut interruptable #24384
Conversation
lucasmr
closed this
Jul 20, 2018
lucasmr
force-pushed the
lucasmr:interrupt_shaving
branch
to
d51b80a
Jul 20, 2018
lucasmr
reopened this
Jul 20, 2018
lucasmr
force-pushed the
lucasmr:interrupt_shaving
branch
to
d4e1bb7
Jul 20, 2018
ZhilkinSerg
reviewed
Jul 20, 2018
src/iuse.cpp
Outdated
| p->add_msg_if_player( _( "You open up your kit and shave." ) ); | ||
| p->moves -= 3000; | ||
| p->add_morale( MORALE_SHAVE, 8, 8, 240_minutes, 3_minutes ); | ||
| p->assign_activity( activity_id( "ACT_SHAVE" ), 3000); |
This comment has been minimized.
This comment has been minimized.
ZhilkinSerg
reviewed
Jul 20, 2018
src/iuse.cpp
Outdated
| p->add_msg_if_player( _( "You give your hair a trim." ) ); | ||
| p->moves -= 3000; | ||
| p->add_morale( MORALE_HAIRCUT, 3, 3, 480_minutes, 3_minutes ); | ||
| p->assign_activity( activity_id( "ACT_HAIRCUT" ), 3000); |
This comment has been minimized.
This comment has been minimized.
Night-Pryanik
reviewed
Jul 20, 2018
data/json/player_activities.json
Outdated
| "type": "activity_type", | ||
| "stop_phrase": "Stop cutting your hair?", | ||
| "based_on": "speed" | ||
| } |
This comment has been minimized.
This comment has been minimized.
ZhilkinSerg
self-assigned this
Jul 20, 2018
ZhilkinSerg
merged commit 387a304
into
CleverRaven:master
Jul 20, 2018
ZhilkinSerg
removed their assignment
Jul 20, 2018
lucasmr
deleted the
lucasmr:interrupt_shaving
branch
Jul 21, 2018
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/cs-students-looking-to-fix-issue-23440/17737/4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
lucasmr commentedJul 20, 2018
Fixes #24295. Moves haircut and shaving to new activity handlers. This way, these actions can be interrupted by approaching enemies.