Skip to content

Commit

Permalink
Merge pull request #77757 from Karol1223/strings-of-evil
Browse files Browse the repository at this point in the history 
Make pet interaction strings sound more natural
  • Loading branch information
@Night-Pryanik
Night-Pryanik authored Nov 13, 2024
2 parents 6377cb0 + bbd4b85 commit 16cc889
Showing 1 changed file with 29 additions and 28 deletions.
57 changes: 29 additions & 28 deletions src/monexamine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,72 +649,73 @@ bool monexamine::pet_menu( monster &z )
z.get_stomach_fullness_percent() );
}
amenu.addentry( swap_pos, true, 's', _( "Swap positions" ) );
amenu.addentry( push_monster, true, 'p', _( "Push %s" ), pet_name );
amenu.addentry( push_monster, true, 'p', _( "Push the %s" ), pet_name );
if( z.has_effect( effect_leashed ) ) {
if( z.has_effect( effect_led_by_leash ) ) {
amenu.addentry( stop_lead, true, 'l', _( "Stop leading %s" ), pet_name );
amenu.addentry( stop_lead, true, 'l', _( "Stop leading the %s" ), pet_name );
} else {
amenu.addentry( lead, true, 'l', _( "Lead %s by the leash" ), pet_name );
amenu.addentry( lead, true, 'l', _( "Lead the %s by the leash" ), pet_name );
}
}
amenu.addentry( rename, true, 'e', _( "Rename" ) );
amenu.addentry( attack, true, 'A', _( "Attack" ) );
Character &player_character = get_player_character();
if( z.has_effect( effect_has_bag ) ) {
amenu.addentry( give_items, true, 'g', _( "Place items into bag" ) );
amenu.addentry( remove_bag, true, 'b', _( "Remove bag from %s" ), pet_name );
amenu.addentry( remove_bag, true, 'b', _( "Remove a bag from the %s" ), pet_name );
if( !z.inv.empty() ) {
amenu.addentry( drop_all, true, 'd', _( "Remove all items from bag" ) );
amenu.addentry( drop_all, true, 'd', _( "Remove all items from a bag" ) );
}
} else if( !z.has_flag( mon_flag_RIDEABLE_MECH ) ) {
amenu.addentry( attach_bag, true, 'b', _( "Attach bag to %s" ), pet_name );
amenu.addentry( attach_bag, true, 'b', _( "Attach a bag to the %s" ), pet_name );
}
if( z.has_effect( effect_harnessed ) ) {
amenu.addentry( mon_harness_remove, true, 'H', _( "Remove vehicle harness from %s" ), pet_name );
amenu.addentry( mon_harness_remove, true, 'H', _( "Remove the vehicle harness from the %s" ),
pet_name );
}
if( z.has_effect( effect_monster_armor ) ) {
amenu.addentry( mon_armor_remove, true, 'a', _( "Remove armor from %s" ), pet_name );
amenu.addentry( mon_armor_remove, true, 'a', _( "Remove armor from the %s" ), pet_name );
} else if( !z.has_flag( mon_flag_RIDEABLE_MECH ) ) {
amenu.addentry( mon_armor_add, true, 'a', _( "Equip %s with armor" ), pet_name );
amenu.addentry( mon_armor_add, true, 'a', _( "Equip the %s with armor" ), pet_name );
}
if( z.has_effect( effect_tied ) ) {
amenu.addentry( untie, true, 't', _( "Untie" ) );
}
if( z.has_effect( effect_leashed ) && !z.has_effect( effect_tied ) ) {
amenu.addentry( tie, true, 't', _( "Tie" ) );
amenu.addentry( unleash, true, 'L', _( "Remove leash from %s" ), pet_name );
amenu.addentry( unleash, true, 'L', _( "Remove the leash from the %s" ), pet_name );
}
if( !z.has_effect( effect_leashed ) && !z.has_flag( mon_flag_RIDEABLE_MECH ) ) {
if( player_character.cache_has_item_with( json_flag_TIE_UP ) ) {
amenu.addentry( leash, true, 't', _( "Attach leash to %s" ), pet_name );
amenu.addentry( leash, true, 't', _( "Attach a leash to the %s" ), pet_name );
} else {
amenu.addentry( leash, false, 't', _( "You need any type of rope to leash %s" ),
amenu.addentry( leash, false, 't', _( "You need any type of rope to leash the %s" ),
pet_name );
}
}

if( z.has_flag( mon_flag_CANPLAY ) ) {
amenu.addentry( play_with_pet, true, 'y', _( "Play with %s" ), pet_name );
amenu.addentry( play_with_pet, true, 'y', _( "Play with the %s" ), pet_name );
}
if( z.has_flag( mon_flag_CAN_BE_CULLED ) ) {
amenu.addentry( cull_pet, true, 'k', _( "Cull %s" ), pet_name );
amenu.addentry( cull_pet, true, 'k', _( "Cull the %s" ), pet_name );
}
if( z.has_flag( mon_flag_MILKABLE ) ) {
amenu.addentry( milk, true, 'm', _( "Milk %s" ), pet_name );
amenu.addentry( milk, true, 'm', _( "Milk the %s" ), pet_name );
}
if( z.shearable() ) {
bool available = true;
if( season_of_year( calendar::turn ) == WINTER ) {
amenu.addentry( shear, false, 'S',
_( "This animal would freeze if you shear it during winter." ) );
_( "This animal would freeze if you shear it during the winter." ) );
available = false;
} else if( z.has_effect( effect_sheared ) ) {
amenu.addentry( shear, false, 'S', _( "This animal is not ready to be sheared again yet." ) );
available = false;
}
if( available ) {
if( player_character.has_quality( qual_SHEAR, 1 ) ) {
amenu.addentry( shear, true, 'S', _( "Shear %s." ), pet_name );
amenu.addentry( shear, true, 'S', _( "Shear the %s." ), pet_name );
} else {
amenu.addentry( shear, false, 'S', _( "You cannot shear this animal without a shearing tool." ) );
}
Expand All @@ -723,34 +724,34 @@ bool monexamine::pet_menu( monster &z )
if( z.has_flag( mon_flag_PET_MOUNTABLE ) && !z.has_effect( effect_monster_saddled ) &&
player_character.cache_has_item_with( json_flag_TACK ) ) {
if( player_character.get_skill_level( skill_survival ) >= 1 ) {
amenu.addentry( attach_saddle, true, 'h', _( "Tack up %s" ), pet_name );
amenu.addentry( attach_saddle, true, 'h', _( "Tack up the %s" ), pet_name );
} else {
amenu.addentry( attach_saddle, false, 'h', _( "You don't know how to saddle %s" ), pet_name );
amenu.addentry( attach_saddle, false, 'h', _( "You don't know how to saddle the %s" ), pet_name );
}
}
if( z.has_flag( mon_flag_PET_MOUNTABLE ) && z.has_effect( effect_monster_saddled ) ) {
amenu.addentry( remove_saddle, true, 'h', _( "Remove tack from %s" ), pet_name );
amenu.addentry( remove_saddle, true, 'h', _( "Remove the tack from the %s" ), pet_name );
}
if( z.has_flag( mon_flag_PAY_BOT ) ) {
amenu.addentry( pay, true, 'f', _( "Manage your friendship with %s" ), pet_name );
amenu.addentry( pay, true, 'f', _( "Manage your friendship with the %s" ), pet_name );
}
if( !z.type->chat_topics.empty() ) {
amenu.addentry( talk_to, true, 'c', _( "Talk to %s" ), pet_name );
amenu.addentry( talk_to, true, 'c', _( "Talk to the %s" ), pet_name );
}
if( z.has_effect( effect_bleed ) ) {
amenu.addentry( stop_bleeding, true, 'B', _( "Treat bleeding from %s" ), pet_name );
amenu.addentry( stop_bleeding, true, 'B', _( "Treat the %s's bleeding" ), pet_name );
}
if( !z.has_flag( mon_flag_RIDEABLE_MECH ) ) {
if( z.has_flag( mon_flag_PET_MOUNTABLE ) && player_character.can_mount( z ) ) {
amenu.addentry( mount, true, 'r', _( "Mount %s" ), pet_name );
amenu.addentry( mount, true, 'r', _( "Mount the %s" ), pet_name );
} else if( !z.has_flag( mon_flag_PET_MOUNTABLE ) ) {
amenu.addentry( mount, false, 'r', _( "%s cannot be mounted" ), pet_name );
amenu.addentry( mount, false, 'r', _( "The %s cannot be mounted" ), pet_name );
} else if( z.get_size() <= player_character.get_size() ) {
amenu.addentry( mount, false, 'r', _( "%s is too small to carry your weight" ), pet_name );
amenu.addentry( mount, false, 'r', _( "The %s is too small to carry your weight" ), pet_name );
} else if( player_character.get_skill_level( skill_survival ) < 1 ) {
amenu.addentry( mount, false, 'r', _( "You require survival skill 1 to ride" ) );
amenu.addentry( mount, false, 'r', _( "You require survival skill 1 to ride a mount" ) );
} else if( player_character.get_weight() >= z.get_weight() * z.get_mountable_weight_ratio() ) {
amenu.addentry( mount, false, 'r', _( "You are too heavy to mount %s" ), pet_name );
amenu.addentry( mount, false, 'r', _( "You are too heavy to mount the %s" ), pet_name );
} else if( !z.has_effect( effect_monster_saddled ) &&
player_character.get_skill_level( skill_survival ) < 4 ) {
amenu.addentry( mount, false, 'r', _( "You require survival skill 4 to ride without a saddle" ) );
Expand Down

0 comments on commit 16cc889

Please sign in to comment.