Misc bugfixes from DDA 6 #316
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Include items in vehicle for warmth when sleeping * Vehicle cargo overrides ground item warmth * To be more consistent with vehicle overriding the ground
* Allow stripping unclosed color tags * Added tests for remove_color_tags function
Coolthulhu
reviewed
Jan 17, 2021
| item_warmth += 60 * elem.get_warmth() * elem.volume() / 2500_ml; | ||
| }; | ||
|
|
||
| if( !!g->m.veh_at( pos ) ) { |
There was a problem hiding this comment.
This could probably be skipped.
The items under the vehicle are still reachable anyway.
Coolthulhu
reviewed
Jan 17, 2021
| add_msg( m_good, _( "%s wounds are closing up!" ), cr->disp_name( true ) ); | ||
| if( g->u.sees( cr->pos() ) ) { | ||
| add_msg( m_good, _( "%s wounds are closing up!" ), cr->disp_name( true ) ); | ||
| } |
There was a problem hiding this comment.
Not caused here, but it seems that it still prints the message even if there are no wounds to close up.
Coolthulhu
reviewed
Jan 17, 2021
| if( mon->is_player() ) { | ||
| who.add_msg_if_player( m_info, _( "There's some buffoon in the way!" ) ); | ||
| } else if( mon->is_monster() ) { | ||
| // TODO: Houseflies, mosquitoes, etc shouldn't count |
It's allowed to fire through you if you are on an inside-vehicle tile, because it can't hit you there. |
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.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of change
Digital disinsection
Describe the solution
Cherry-picked from DDA:
CleverRaven#46266
CleverRaven#46345
CleverRaven#46242
CleverRaven#42549
CleverRaven#46407
CleverRaven#40995
CleverRaven#46433
CleverRaven#46465
CleverRaven#46453 (the bug persists if z-levels are disabled)
CleverRaven#46521
CleverRaven#46536
Describe alternatives you've considered
Calling Ghostbusters?
Testing
Didn't test fixes for profession / regen message, but those are trivial.
The rest either have tests from original PRs or were tested manually.
Turret's friendly fire check is really weird: the turret sometimes refused to shoot until I moved 10 tiles away from the line of fire, and sometimes it fired right over my shoulder (through my tile).