Farming parts #13376

epsilon-phase · Aug 21, 2015

Do you have lots and lots of seeds? Good for you.

Now there are parts that might be used to actually cultivate at reasonable speeds. Plows for tilling, seed drills for sowing, and reapers for reaping.

What more could you need?

kevingranade · Aug 23, 2015

The plow part should add mass as normal for any part. When active, it should also reduce engine output directly instead of adjusting vehicle mass and k_whatever.

narc0tiq · Aug 23, 2015

Yeah, farming equipment tends to draw directly off the engine's power
train, so subtracting engine power directly sounds like the right idea.

On Sun, Aug 23, 2015 at 10:23 PM Kevin Granade notifications@github.com
wrote:

The plow part should add mass as normal for any part.
When active, it should also reduce engine output directly instead of
adjusting vehicle mass and k_whatever.

—
Reply to this email directly or view it on GitHub
#13376 (comment)
.

epsilon-phase · Aug 23, 2015

That's done.

epsilon-phase · Aug 23, 2015

It does seem to leave my semi with a rather high speed, but that seems to be acceptable to me. At any case, you can only plow on a bike at -1 mph.

kevingranade · Aug 23, 2015

kevingranade reviewed Aug 23, 2015

View changes

kevingranade · Aug 23, 2015

src/vehicle.cpp

@@ -3249,7 +3286,7 @@ float vehicle::k_friction() const
 {
    // calculate safe speed reduction due to wheel friction
    float fr0 = 1000.0;
-    float kf = ( fr0 / (fr0 + wheels_area()) );


Ideally return these to they way they were originally so they don't appear in the diff at all.

kevingranade · Aug 23, 2015

kevingranade reviewed Aug 23, 2015

View changes

kevingranade · Aug 23, 2015

src/vehicle.h

@@ -889,6 +890,7 @@ class vehicle : public JsonSerializer, public JsonDeserializer
    int aisle_lights_epower = 0;
    int recharger_epower    = 0; // total power consumed by rechargers
    int camera_epower       = 0; // power consumed by camera system
+    int plow_engine_drag       = 0; //The amount of friction applied by plows on the vehicle.


Perhaps make this a generic "accessory_drag" value, for example when we add trailers the trailer would add drag as well.

kevingranade · Aug 23, 2015

kevingranade reviewed Aug 23, 2015

View changes

kevingranade · Aug 23, 2015

data/json/vehicle_parts.json

+        "item" : "v_plow_item",
+        "difficulty" : 4,
+        "location" : "under",
+        "bonus": 1500,


The bonus value and the comment about it are obsolete.

kevingranade · Aug 23, 2015

kevingranade reviewed Aug 23, 2015

View changes

kevingranade · Aug 23, 2015

data/json/vehicle_parts.json

+            {"item": "plastic_chunk", "count": [1, 2]}
+        ]
+    },{
+        "type" : "vehicle_part",


Seed drills and reapers are also going to be a drag on a vehicle. If I understand correctly, they are either going to be coupled to the vehicle powertrain directly, or they will get power from being drug across the ground (think of the kind of children's toy that is actuated by turning its wheels). Either way, they'll be a drain on power just like plows, perhaps with different values.

kevingranade · Aug 23, 2015

I can't test right now, but this seems likely to do the right thing, we probably just need some number tweaking now.

epsilon-phase · Aug 24, 2015

Seed drills and reapers are generally actuated by their motion across the
ground, excepting a few very advanced ones that require hydraulic power
from the tractor. So yeah. Hmm. I'll just assume that the powertrain is
what they are tapping from.

On Sun, Aug 23, 2015 at 6:20 PM, Kevin Granade notifications@github.com
wrote:

I can't test right now, but this seems likely to do the right thing, we
probably just need some number tweaking now.

—
Reply to this email directly or view it on GitHub
#13376 (comment)
.

kevingranade · Aug 25, 2015

kevingranade reviewed Aug 25, 2015

View changes

kevingranade · Aug 25, 2015

src/vehicle.cpp

@@ -4762,6 +4882,9 @@ void vehicle::refresh()
    alternator_load = 0;
    camera_epower = 0;
    has_atomic_lights = false;
+    plow_engine_drag = 0;


Instead of special casing them all the same way, add a flag like "POWERED_PART" abd trigger off of that.

Wouldn't that prevent them from being used independently, or being switched off then? That doesn't sound realistic, or am I missing something else?

Your current solution has 3 different variables that are summed anyway. Just merge them into a single variable like extra_part_drag. Just the drag calculations.
Then add a flag for parts that cause drag, so that you aren't checking has_flag("PLOW") || has_flag("REAPER") || has_flag("PLANTER"), just has_flag("POWERED_PART") for the extra drag calculations. You'd still check for plow/reaper/planter in their exclusive sections (ie. actual plowing etc.).

Though I'd name the flag differently. POWERED_PART be interpreted as electrical power, DRIVETRAIN_POWERED is unambiguous. Or EXTRA_DRAG.

Thanks for the clarification, that is what I meant. I like 'EXTRA_DRAG'.

Okay thanks, I'll get on that.

Coolthulhu · Aug 30, 2015

Is it still WiP or should be ready for testing+merging?

epsilon-phase · Aug 30, 2015

It should be good to go for testing and merging.

On Sun, Aug 30, 2015, 8:35 AM Coolthulhu notifications@github.com wrote:

Is it still WiP or should be ready for testing+merging?

—
Reply to this email directly or view it on GitHub
#13376 (comment)
.

kevingranade · Sep 25, 2015

Merged after more additions and bugfixes in #13467

epsilon-phase added some commits Aug 23, 2015

fixed plow_epower still being used

c322b63

fixed capitalization

e15522d

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …
…into farming_parts

d630f6d

removed plow from calculation in k_friction and k_mass

Loading status checks…

43d4c04

epsilon-phase changed the title ~~[wip] [CR] Farming parts~~ Farming parts Aug 31, 2015

kevingranade referenced this pull request Sep 1, 2015
Merged
Sharing plows #13467
3 of 5 tasks complete

kevingranade closed this Sep 25, 2015

CleverRaven/Cataclysm-DDA

Join GitHub today

Farming parts #13376

Conversation

epsilon-phase commented Aug 21, 2015

epsilon-phase added some commits Aug 13, 2015

epsilon-phase added some commits Aug 23, 2015

This comment has been minimized.

kevingranade commented Aug 23, 2015

This comment has been minimized.

narc0tiq commented Aug 23, 2015

This comment has been minimized.

epsilon-phase commented Aug 23, 2015

This comment has been minimized.

epsilon-phase commented Aug 23, 2015

kevingranade reviewed Aug 23, 2015 View changes

This comment has been minimized.

kevingranade reviewed Aug 23, 2015 View changes

This comment has been minimized.

kevingranade reviewed Aug 23, 2015 View changes

This comment has been minimized.

kevingranade reviewed Aug 23, 2015 View changes

This comment has been minimized.

This comment has been minimized.

kevingranade commented Aug 23, 2015

This comment has been minimized.

epsilon-phase commented Aug 24, 2015

epsilon-phase added some commits Aug 24, 2015

kevingranade reviewed Aug 25, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

kevingranade via email Aug 26, 2015

This comment has been minimized.

epsilon-phase added some commits Aug 25, 2015

This comment has been minimized.

Coolthulhu commented Aug 30, 2015

This comment has been minimized.

epsilon-phase commented Aug 30, 2015

epsilon-phase changed the title [wip] [CR] Farming parts Farming parts Aug 31, 2015

kevingranade referenced this pull request Sep 1, 2015

This comment has been minimized.

kevingranade commented Sep 25, 2015

kevingranade closed this Sep 25, 2015

kevingranade reviewed Aug 23, 2015

View changes

kevingranade reviewed Aug 23, 2015

View changes

kevingranade reviewed Aug 23, 2015

View changes

kevingranade reviewed Aug 23, 2015

View changes

kevingranade reviewed Aug 25, 2015

View changes