Toggle engines #9755

malhawee · Oct 31, 2014

Adds ability to toggle individual engines in vehicle control menu, when more than one engine present. Choice brings up submenu listing all engines. Velocities, noise and fuel usage update accordingly.
If velocity after toggling is higher than the new safe velocity, the cruise control speed is lowered.

~~TODO: make radiators only work if the engine they are attached to is enabled~~

malhawee · Oct 31, 2014

Much less buggy than that hybrid PR I had going before.

KA101 · Oct 31, 2014

What radiators? Didn't think we had any. Alternators maybe?

malhawee · Oct 31, 2014

Whoops, you're right, alternators

malhawee · Oct 31, 2014

Alternators work now! Calling it feature complete.

KA101 · Oct 31, 2014

I'm hesitant to grab this right now given that we're assembling a stable release, but once that's done, I'm confident that it will be VERY popular.

Update: I mentioned it on the IRC. May get in after all.

KA101 · Oct 31, 2014

KA101 reviewed Oct 31, 2014

View changes

KA101 · Oct 31, 2014

src/vehicle.cpp

+}
+
+void vehicle::toggle_specific_engine(int p,bool on){
+    parts[engines[p]].enabled = on;


Eyeball check: I'm not seeing anything to turn an engine off here?

Yep, that function gets the user to select an engine index in the engines vector. Its called from control_engines, which handles disabling the engines. It calls toggle_specific engine to turn the engine on/off.

Well, that's the thing--I'm not seeing an "off" here. Someplace else I should be looking?

malhawee · Oct 31, 2014

Heh, I figured people would want it in the next release, I certainly do.

Robik81 · Oct 31, 2014

Oh yes, this feature was sorely missing. True hybrid cars FTW.

malhawee · Oct 31, 2014

malhawee reviewed Oct 31, 2014

View changes

malhawee · Oct 31, 2014

src/vehicle.cpp

+        if (e_toggle >= 0 && e_toggle < (int)engines.size() &&
+                (active_count > 1 || !is_engine_on(e_toggle))){
+            active_count += (!is_engine_on(e_toggle))?1:-1;
+            toggle_specific_engine(e_toggle, !is_engine_on(e_toggle));


This line (441) toggles engines on or off. It first fetches the state of the engine, and inverts it.

OK, thanks.

kevingranade · Nov 1, 2014

kevingranade reviewed Nov 1, 2014

View changes

kevingranade · Nov 1, 2014

src/vehicle.cpp

+    parts[engines[p]].enabled = on;
+}
+
+bool vehicle::is_engine_on(int p){


How about pulling the damage and fuel checks into this too? That would clean up a lot of code I think.

kevingranade · Nov 1, 2014

kevingranade reviewed Nov 1, 2014

View changes

kevingranade · Nov 1, 2014

src/vehicle.cpp

+    return parts[engines[p]].enabled;
+}
+
+bool vehicle::is_part_on(int p){


Especially if you do the above, you probably want one method that expects a part index that does the real work, and another method that expects the engine index and just passes the part index to the other one.

kevingranade · Nov 1, 2014

kevingranade reviewed Nov 1, 2014

View changes

kevingranade · Nov 1, 2014

src/vehicle.cpp

+}
+
+bool vehicle::is_active_engine_at(int x,int y){
+    for( size_t p = 0; p < engines.size(); ++p ) {


Probably redefine this one in terms of calling the is_part_on() method too, nice to have it only check things in one place.

kevingranade · Nov 1, 2014

kevingranade reviewed Nov 1, 2014

View changes

kevingranade · Nov 1, 2014

src/vehicle.cpp

@@ -474,6 +549,7 @@ void vehicle::use_controls()
            has_reactor = true;
        }
        else if (part_flag(p, "ENGINE")) {
+            has_mult_engine = has_engine;


kevingranade · Nov 1, 2014

kevingranade reviewed Nov 1, 2014

View changes

kevingranade · Nov 1, 2014

src/vehicle.cpp

    switch(options_choice[select]) {
+    //brackets prevent initialisation errors


I'm guessing this comment is obsolete.

kevingranade · Nov 1, 2014

kevingranade reviewed Nov 1, 2014

View changes

kevingranade · Nov 1, 2014

src/vehicle.h

@@ -10,6 +10,7 @@
 #include <map>
 #include <string>
 #include <iosfwd>
+#include "ui.h"


Why add this here? If it's only referenced in vehicle.cpp, #include it there.

malhawee · Nov 2, 2014

Looks like I've made all the code cleaner than it was before. My testing seems to show that its still working as expected.

BevapDin · Nov 2, 2014

BevapDin reviewed Nov 2, 2014

View changes

BevapDin · Nov 2, 2014

src/vehicle.cpp

+            active_count += (!is_engine_on(e_toggle))?1:-1;
+            toggle_specific_engine(e_toggle, !is_engine_on(e_toggle));
+
+            add_msg("Switched %s %s",part_info(engines[e_toggle]).name.c_str(), 


This needs _() to be translated. The "on" / "off" needs this, too.

BevapDin · Nov 2, 2014

BevapDin reviewed Nov 2, 2014

View changes

BevapDin · Nov 2, 2014

src/vehicle.cpp

+    // control an engine
+    if (has_mult_engine) {
+        options_choice.push_back(cont_engines);
+        options_message.push_back(uimenu_entry("Control individual engines", 'y'));


Translation missing.

malhawee added some commits Oct 31, 2014

Alternator disabled when attached engine not running.

Loading status checks…

7ea8248

Prevented engine control if less than two engines

114d06d

Fixed engine counter

Loading status checks…

523dc97

malhawee force-pushed the malhawee:ToggleEngines branch to 523dc97 Oct 31, 2014

malhawee changed the title ~~Toggle engines (WIP)~~ Toggle engines Oct 31, 2014

malhawee added some commits Nov 2, 2014

Refactored code

78b4e19

Renamed p variable to e where appropriate, changed type to size_t where
was int.

a8bc024

More p to e

da5c68a

translation macro

Loading status checks…

07a12f0

kevingranade merged commit 07a12f0 into CleverRaven:master Nov 2, 2014
1 check passed

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.

CleverRaven/Cataclysm-DDA

Join GitHub today

Toggle engines #9755

Conversation

malhawee commented Oct 31, 2014

malhawee added some commits Oct 31, 2014

This comment has been minimized.

malhawee commented Oct 31, 2014

This comment has been minimized.

KA101 commented Oct 31, 2014

This comment has been minimized.

malhawee commented Oct 31, 2014

malhawee added some commits Oct 31, 2014

malhawee force-pushed the malhawee:ToggleEngines branch to 523dc97 Oct 31, 2014

This comment has been minimized.

malhawee commented Oct 31, 2014

malhawee changed the title Toggle engines (WIP) Toggle engines Oct 31, 2014

This comment has been minimized.

KA101 commented Oct 31, 2014

KA101 reviewed Oct 31, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

malhawee commented Oct 31, 2014

This comment has been minimized.

Robik81 commented Oct 31, 2014

malhawee reviewed Oct 31, 2014 View changes

This comment has been minimized.

This comment has been minimized.

kevingranade reviewed Nov 1, 2014 View changes

This comment has been minimized.

kevingranade reviewed Nov 1, 2014 View changes

This comment has been minimized.

kevingranade reviewed Nov 1, 2014 View changes

This comment has been minimized.

kevingranade reviewed Nov 1, 2014 View changes

This comment has been minimized.

kevingranade reviewed Nov 1, 2014 View changes

This comment has been minimized.

kevingranade reviewed Nov 1, 2014 View changes

This comment has been minimized.

malhawee added some commits Nov 2, 2014

This comment has been minimized.

malhawee commented Nov 2, 2014

BevapDin reviewed Nov 2, 2014 View changes

This comment has been minimized.

BevapDin reviewed Nov 2, 2014 View changes

This comment has been minimized.

Hide details View details kevingranade merged commit 07a12f0 into CleverRaven:master Nov 2, 2014 1 check passed

1 check passed

malhawee force-pushed the malhawee:ToggleEngines branch to `523dc97` Oct 31, 2014

KA101 reviewed Oct 31, 2014

View changes

malhawee reviewed Oct 31, 2014

View changes

kevingranade reviewed Nov 1, 2014

View changes

kevingranade reviewed Nov 1, 2014

View changes

kevingranade reviewed Nov 1, 2014

View changes

kevingranade reviewed Nov 1, 2014

View changes

kevingranade reviewed Nov 1, 2014

View changes

kevingranade reviewed Nov 1, 2014

View changes

BevapDin reviewed Nov 2, 2014

View changes

BevapDin reviewed Nov 2, 2014

View changes

kevingranade merged commit `07a12f0` into CleverRaven:master Nov 2, 2014
1 check passed