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

Jump to bottom

Fix Nurse bot Checkup #36810

Merged
merged 5 commits into from
Jan 10, 2020
Merged

Fix Nurse bot Checkup #36810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73735e3
Clearer message and longer countdown
Jan 8, 2020
8a81789
Shorter CHECK_UP cooldown
Jan 8, 2020
cd19578
Update defective nurse bot speech
Jan 8, 2020
63ca6d4
fix english
Jan 8, 2020
cca81b3
comma
Jan 8, 2020
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
2 changes: 1 addition & 1 deletion data/json/monsters/monsters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@
"melee_dice": 3,
"melee_dice_sides": 2,
"revert_to_itype": "bot_nursebot",
"special_attacks": [ [ "ASSIST", 30 ], [ "CHECK_UP", 200 ] ],
"special_attacks": [ [ "ASSIST", 30 ], [ "CHECK_UP", 120 ] ],
"death_drops": { "groups": [ [ "robots", 4 ] ] },
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "ELECTRONIC", "NO_BREATHE", "FIREPROOF", "PUSH_MON", "HEARS", "PACIFIST" ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/speech.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,7 +1874,7 @@
{
"type": "speech",
"speaker": "mon_nursebot_defective",
"sound": "a soft robotic voice say, \"Come here. I'll give you a check-up.\"",
"sound": "a soft robotic voice say, \"Come here and stand still for a few minutes, I'll give you a check-up.\"",
"volume": 8
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/monattack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,8 +2874,8 @@ bool mattack::nurse_check_up( monster *z )
if( !z->has_effect( effect_countdown ) ) {
sounds::sound( z->pos(), 8, sounds::sound_t::electronic_speech,
string_format(
_( "a soft robotic voice say, \"Come here. I'll give you a check-up.\"" ) ) );
z->add_effect( effect_countdown, 1_minutes );
_( "a soft robotic voice say, \"Come here and stand still for a few minutes, I'll give you a check-up.\"" ) ) );
z->add_effect( effect_countdown, 30_minutes );
} else if( rl_dist( target->pos(), z->pos() ) > 1 ) {
// Giving them some encouragement
sounds::sound( z->pos(), 8, sounds::sound_t::electronic_speech,
Expand Down