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

Drag heavier vehicles take 2 #64867

Merged
merged 7 commits into from
May 18, 2023
Merged

Drag heavier vehicles take 2 #64867

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e2aedb
drag heavier vehicles, take 2
anoobindisguise Mar 1, 2023
818da81
Update grab.cpp
anoobindisguise Mar 1, 2023
d48458b
Update grab.cpp
anoobindisguise Mar 1, 2023
90bf638
Update grab.cpp
anoobindisguise Mar 1, 2023
a5924cf
Merge branch 'CleverRaven:master' into anoobindisguise-grab-veh-2
anoobindisguise Apr 7, 2023
934a1ca
stamina cost
anoobindisguise May 10, 2023
d40067d
Merge branch 'CleverRaven:master' into anoobindisguise-grab-veh-2
anoobindisguise May 12, 2023
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
24 changes: 10 additions & 14 deletions src/grab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,14 @@ bool game::grabbed_veh_move( const tripoint &dp )
// Make sure the mass and pivot point are correct
grabbed_vehicle->invalidate_mass();

//vehicle movement: strength check
//vehicle movement: strength check. very strong humans can move about 2,000 kg in a wheelbarrow.
int mc = 0;
int str_req = grabbed_vehicle->total_mass() / 25_kilogram; //strength required to move vehicle.
int str_req = grabbed_vehicle->total_mass() / 100_kilogram; //strength required to move vehicle.
// ARM_STR governs dragging heavy things
int str = u.get_arm_str();

//if vehicle is rollable we modify str_req based on a function of movecost per wheel.

// Vehicle just too big to grab & move; 41-45 lets folks have a bit of a window
// (Roughly 1.1K kg = danger zone; cube vans are about the max)
if( str_req > 45 ) {
add_msg( m_info, _( "The %s is too bulky for you to move by hand." ),
grabbed_vehicle->name );
return true; // No shoving around an RV.
}

const auto &wheel_indices = grabbed_vehicle->wheelcache;
if( grabbed_vehicle->valid_wheel_config() ) {
//determine movecost for terrain touching wheels
Expand All @@ -104,9 +96,11 @@ bool game::grabbed_veh_move( const tripoint &dp )
} else {
str_req = mc / wheel_indices.size() + 1;
}
//finally, adjust by the off-road coefficient (always 1.0 on a road, as low as 0.1 off road.)
str_req /= grabbed_vehicle->k_traction( get_map().vehicle_wheel_traction( *grabbed_vehicle ) );
} else {
str_req++;
//if vehicle has no wheels str_req make a noise.
str_req *= 10;
//if vehicle has no wheels str_req make a noise. since it has no wheels assume it has the worst off roading possible (0.1)
if( str_req <= str ) {
sounds::sound( grabbed_vehicle->global_pos3(), str_req * 2, sounds::sound_t::movement,
_( "a scraping noise." ), true, "misc", "scraping" );
Expand All @@ -118,8 +112,10 @@ bool game::grabbed_veh_move( const tripoint &dp )
if( str_req <= str ) {
//calculate exertion factor and movement penalty
///\EFFECT_STR increases speed of dragging vehicles
u.moves -= 100 * str_req / std::max( 1, str );
const int ex = dice( 1, 3 ) - 1 + str_req;
u.moves -= 400 * str_req / std::max( 1, str );
///\EFFECT_STR decreases stamina cost of dragging vehicles
u.mod_stamina( -200 * str_req / std::max( 1, str ) );
const int ex = dice( 1, 6 ) - 1 + str_req;
if( ex > str + 1 ) {
// Pain and movement penalty if exertion exceeds character strength
add_msg( m_bad, _( "You strain yourself to move the %s!" ), grabbed_vehicle->name );
Expand Down