Vehicle boat/traction update #17687

Coolthulhu · 2016-07-14T17:49:58Z

Mostly refactoring for future land vehicle/boat split.
Wheel configuration, traction etc. functions got a bool boat argument. If false, it checks the wheels. If true, the boat parts.

Other code changes:

Removed hardcoded division by 9 of wheel area. Adjusted k_mass so that it doesn't change from current values.
Removed some hardcoded boat checks
Changed the "nothing grabbed" condition from grab_point == tripoint_zero to grab_type == OBJECT_NONE. This allows grabbing stuff below self

Gameplay changes:

Updated vehicle push/pull. Had to, because vehicle push/pull is related to all of: traction, wheel configuration, pivoting. All of those were changed here, so vehicle grab could easily regress otherwise. On the positive side, the changes make dragging bicycles a much less painful experience for the user - I didn't manage to lose my grabbed bike by walking around.
Added a "K traction" display to vehicle interaction menu. It displays the multiplier on acceleration (1.0 or less) due to bad traction, calculated for dirt (the most common terrain for offroading).
Added a warning message when acceleration of a vehicle is 0. Can happen when biking on a heavy vehicle, for example.

mugling · 2016-07-17T21:07:57Z

Needs rebase

Coolthulhu · 2016-07-18T09:12:22Z

Rebased

mugling · 2016-07-21T12:58:32Z

On the positive side, the changes make dragging bicycles a much less painful experience for the user

This is a significant improvement

mugling · 2016-07-21T13:00:19Z

src/item.cpp

@@ -3531,6 +3531,15 @@ std::set<fault_id> item::faults_potential() const
    return res;
 }

+int item::wheel_area() const
+{
+    if( !is_wheel() ) {


overly verbose. item.cpp is already obese.

return is_wheel() ? type->wheel->diameter * type->wheel->width : 0

mugling · 2016-07-21T13:12:42Z

Vehicle movement functions need some further documentation starting with the k_* family. The work you're doing on this is excellent but it's very hard to follow without such documentation.

Can you provide a skeleton outline on the github wiki of how vehicles actually move as this would probably accelerate review of vehicle PR's and possibly encourage other developers to assist. It doesn't need to be all encompassing but having something there also encourages future contributions to the documentation.

Coolthulhu · 2016-07-21T13:47:49Z

Cleaned up

Not sure how to document the k_*. Their exact values aren't all that relevant, except when we're talking about balance. The way they're used is generally just multiplication.

mugling · 2016-07-21T13:52:13Z

Not sure how to document the k_*

Can you provide an overview/introduction as to how the whole system works?

Coolthulhu · 2016-07-21T13:56:26Z

Can you provide an overview/introduction as to how the whole system works?

Maximum speed is multiplied by k_dynamics and k_mass.
Safe speed is multiplied by k_dynamics and k_mass ^ 2.
Acceleration is multiplied by k_dynamics, k_mass ^2 and k_traction.
k_dynamics = k_friction * k_aerodynamics

mugling · 2016-07-21T15:20:41Z

src/veh_interact.cpp

@@ -1445,6 +1445,55 @@ void veh_interact::display_veh ()
    wrefresh (w_disp);
 }

+std::string wheel_state_description( const vehicle &veh )


mugling · 2016-07-21T15:30:16Z

src/vehicle.cpp

-    float fr0 = 1000.0;
-    float kf = ( fr0 / (fr0 + wheels_area()) );
-    return kf;
+    constexpr float fr0 = 9000.0;


magic value

Was always magic, kept for compatibility.

Any idea what it means?

I assume it's just there for the numbers to look right.
It doesn't really model any real life effect.

Might be best to document is as unknown magical value - at least that makes it clear future removal would be acceptable

mugling · 2016-07-21T17:07:44Z

src/vehicle.h


-    // Combined coefficient of aerodynamic and wheel friction resistance of vehicle, 0-1.0.
-    // 1.0 means it's ideal form and have no resistance at all. 0 -- it won't move


Does this still hold true because it's more descriptive than the below?

Should I copy+paste "0 means won't move, 1 means ideal" to every k_* description?

No but you could wrap the whole family of k_* functions in a doxygen scope and explain that there

Coolthulhu · 2016-07-21T17:29:20Z

How about this?

mugling · 2016-07-21T17:32:10Z

Better but I'd wrap the whole lot in a doxygen scope and provide a short summary.

The function documentation would be better in the style of the preamble one you gave for k_traction

Coolthulhu · 2016-07-21T17:40:10Z

How to scope multiple functions and provide one description for all of them and specific descriptions for details for each function?

mugling · 2016-07-21T17:46:29Z

There is an example starting at item.h:1209

Coolthulhu · 2016-07-21T18:12:52Z

How about this?

mugling · 2016-07-21T18:17:59Z

Perfect.

Now they have definitions the VEHICLE stats dumper would benefit from dumping of those values - can you add them to dump.cpp as it will help in identifying any changes in future PR's.

Apart from that looks good to go

Coolthulhu · 2016-07-21T18:24:45Z

Added the same info that veh_interact.cpp displays to dump.cpp

mugling · 2016-07-21T18:40:51Z

src/dump.cpp

@@ -147,7 +147,10 @@ void game::dump_stats( const std::string& what, dump_mode mode )

    } else if( what == "VEHICLE" ) {
        header = {
-            "Name", "Weight (empty)", "Weight (fueled)"
+            "Name", "Weight (empty)", "Weight (fueled)",
+            "Max velocity", "Safe velocity", "Acceleration",


What are the units of max velocity, safe velocity and acceleration?

mugling · 2016-07-21T18:54:21Z

k_mass doesn't appear to do much. Is that a regression from this PR or has it always been there?

Coolthulhu · 2016-07-21T19:02:15Z

k_mass doesn't appear to do much.

?

mugling · 2016-07-21T19:04:00Z

Dump the vehicle stats. All vehicles are 99%

Coolthulhu · 2016-07-21T19:42:54Z

I forgot a to include a magic constant I removed from wheels_area in k_mass.

Coolthulhu added 6 commits July 18, 2016 11:10

Add traction display to vehicle interaction

87867b6

Don't display 100%

58035ae

Fix vehicle pulling

403d092

Fix boats

7b12751

Fix vehicle push/pull

dcaa29f

Allow braking when accel == 0

9fd355f

Coolthulhu force-pushed the vehicle-boat-disp branch from f614477 to 9fd355f Compare July 18, 2016 09:12

Post-rebase fix

605b796

mugling self-assigned this Jul 21, 2016

mugling reviewed Jul 21, 2016
View reviewed changes

Coolthulhu added 2 commits July 21, 2016 15:31

Cleanup

cc648d7

Wheel area comment

d26488c

mugling reviewed Jul 21, 2016
View reviewed changes

More cleanup

2d3542a

mugling reviewed Jul 21, 2016
View reviewed changes

Docs about k_*

3b76904

More docs

db6bbe8

Coolthulhu added 2 commits July 21, 2016 20:23

Add to dump.cpp

ac7c7fa

Tiny fix

7249374

mugling reviewed Jul 21, 2016
View reviewed changes

Units in dump

eabb5a4

Forgotten magic constant

f58b43b

mugling merged commit 6f69357 into CleverRaven:master Jul 21, 2016

Maddremor mentioned this pull request May 2, 2017

Enable playermade amphibious vehicles #20933

Closed

Coolthulhu deleted the vehicle-boat-disp branch June 15, 2020 17:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vehicle boat/traction update #17687

Vehicle boat/traction update #17687

Coolthulhu commented Jul 14, 2016

mugling commented Jul 17, 2016

Coolthulhu commented Jul 18, 2016

mugling commented Jul 21, 2016

mugling Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling Jul 21, 2016

mugling Jul 21, 2016

Coolthulhu Jul 21, 2016

mugling Jul 21, 2016

Coolthulhu Jul 21, 2016

mugling Jul 21, 2016

mugling Jul 21, 2016

Coolthulhu Jul 21, 2016

mugling Jul 21, 2016 •

edited

Loading

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016 •

edited

Loading

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016


		// Combined coefficient of aerodynamic and wheel friction resistance of vehicle, 0-1.0.
		// 1.0 means it's ideal form and have no resistance at all. 0 -- it won't move

Vehicle boat/traction update #17687

Vehicle boat/traction update #17687

Conversation

Coolthulhu commented Jul 14, 2016

mugling commented Jul 17, 2016

Coolthulhu commented Jul 18, 2016

mugling commented Jul 21, 2016

Choose a reason for hiding this comment

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mugling Jul 21, 2016 • edited Loading

Choose a reason for hiding this comment

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016 • edited Loading

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

Choose a reason for hiding this comment

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling commented Jul 21, 2016

Coolthulhu commented Jul 21, 2016

mugling Jul 21, 2016 •

edited

Loading

mugling commented Jul 21, 2016 •

edited

Loading