Zone activity - farm plot planting #25181

Robik81 · 2018-08-27T17:48:59Z

Summary

SUMMARY: Features "adds new option for Farm: Plot zone to attach specific seed and new activity to plant in nearby plot zones"

Purpose of change

As outlined in #24826 , this PR aims at reducing tedium of farming. Follow up of #25125 . Planting activity for Farm: Plot zone. Watering, weeding and fertilizing will follow in separate PRs.

Describe the solution

Select seed for existing Farm: Plot zone (via Edit->Edit options in zone manager) or select seed while creating a new one
After Tilling farm plots activity, perform Plant seeds activity (shortcut Shift+O).
Watch your character do all the work automatically.

Update

Watering, weeding and fertilizing will follow if / when the improved crop farming is implemented again.

Vasyan2006 · 2018-08-27T19:05:06Z

I'm still planning to separate >Watering, weeding and fertilizing into new functions, so you will be able to use your tumba-jumba zone magic and apply them over every tile. I suppose it will be faster to commit such changes into your branch rather then opening new PR.

Robik81 · 2018-08-27T19:18:44Z

I suppose it will be faster to commit such changes into your branch rather then opening new PR.

I think if you'l make tiny PR only with refactoring of a function into two, @ZhilkinSerg can review and merge something like this quite fast?

Robik81 · 2018-08-27T19:25:23Z

src/iexamine.cpp

+
+    // if true, it works fine for normal planting, but closes immediately if called
+    // from parent uimenu when adding new planting zone
+    smenu.return_invalid = false;


What comment says.

I guess it is because there's a timeout set in the input manager (for blinking), so when the timeout is triggered in the submenu, it thinks it is an unbound key, and returns because return_invalid is true.

See here:
https://github.com/CleverRaven/Cataclysm-DDA/blob/c27cf5e2335d55cb13cf97e8b47b485b51b6c5d2/src/game.cpp#L8420

I'll let uimenu handle it properly in my PR. For now you may want to temporarily disable the timeout before calling up the submenu.

Your guess was correct. That was indeed a problem.

Thank you very much for helping me out.

(I see you are going to handle it on the uimenu side, cool.)

ZhilkinSerg · 2018-08-28T13:43:23Z

#25204 is merged

Robik81 · 2018-08-28T14:28:48Z

Thank you guys.

On the weeding I go... it will be in separate PR though, this one is big enough as it is.

much easier to add more than one extra option to zones this way

when zone manager is open, zones which support marking show selected mark in its tiles

break the code into multiple functions to allow calling the same code from outside

while I prefer distinct naming convention for interfaces, it looked incredibly odd with naming conventions in this project

gorgon fix CleverRaven#2 gorgon fix

to prevent possible infinite loop

Robik81 · 2018-08-29T09:28:12Z

Given that PR #24291 was rolled back, I updated this PR to work with the old planting system.

ZhilkinSerg · 2018-08-29T15:59:20Z

src/iexamine.cpp

+    g->m.add_item_or_charges( examp, used_seed.front() );
+    g->m.set( examp, t_dirt, f_plant_seed );
+    p.moves -= 500;
+    add_msg( _( "Planted %s" ), item::nname( seed_id ).c_str() );


Should probably add period after Planted %s

ZhilkinSerg · 2018-08-29T16:01:05Z

No feedback for player (in message log or popup) when Plant items action is selected, but plant zone is not defined or plant zone has no seeds selected in its options.

Robik81 · 2018-08-29T16:33:07Z

No feedback for player (in message log or popup) when Plant items action is selected, but plant zone is not defined or plant zone has no seeds selected in its options.

There is feedback if no compatible zone is nearby:

There is no feedback if you have only Unsorted loot zone defined but there is nothing to sort (i'l write it down as sort loot issue). You can't pick any farm related action in this case though.

If you have plant zone, but is not tilled, have no seed attached, or you have no seeds, there is also not any feedback. This one is probably the one you are referring to.

I'll fix the issue.

Robik81 · 2018-08-29T17:03:39Z

New commits changes

extra dot in Planted %s message
action menu now checks if you have any seeds at all (planting disabled if not)
added message "You planted all seeds you could." after planting action is finished (whether you planted anything or not)

damn you, astyling in Visual Studio

Robik81 force-pushed the farm_plant branch from 24e5a99 to c27cf5e Compare August 27, 2018 18:49

Robik81 commented Aug 27, 2018

View reviewed changes

Robik81 mentioned this pull request Aug 27, 2018

Unify uimenu behavior, part 1 #25178

Closed

ZhilkinSerg added <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Controls / Input Keyboard, mouse, keybindings, input UI, etc. labels Aug 28, 2018

Vasyan2006 mentioned this pull request Aug 28, 2018

Move plant care actions to new functions. #25202

Merged

Robik81 force-pushed the farm_plant branch from d547388 to 27dbb11 Compare August 28, 2018 14:04

Robik81 added 13 commits August 29, 2018 09:52

ACT_PLANT_PLOT activity

47b20a1

zone subtype support

366d2ef

zone ui subtype support

ab75970

plant plot handler

623135d

subtype -> zone_options

beed918

much easier to add more than one extra option to zones this way

option descriptions

7bfba56

zone marks

df4f361

when zone manager is open, zones which support marking show selected mark in its tiles

zone marks serialization

73d90db

zone mark no seed fix

fcc6b60

refactoring of iexamine::dirtmound

29ff0c4

break the code into multiple functions to allow calling the same code from outside

IMarkOption -> mark_option

08718ed

while I prefer distinct naming convention for interfaces, it looked incredibly odd with naming conventions in this project

gorgon fix

6a9557e

gorgon fix CleverRaven#2 gorgon fix

safe mode check

252883e

to prevent possible infinite loop

Robik81 force-pushed the farm_plant branch from c8787b9 to 252883e Compare August 29, 2018 08:59

ZhilkinSerg self-assigned this Aug 29, 2018

ZhilkinSerg reviewed Aug 29, 2018

View reviewed changes

Robik81 added 2 commits August 29, 2018 18:59

extra dot

ef7bb9f

better feedback

b292477

fix position of binary operator

c20e230

damn you, astyling in Visual Studio

ZhilkinSerg merged commit 0db5290 into CleverRaven:master Aug 31, 2018

ZhilkinSerg removed their assignment Aug 31, 2018

Robik81 deleted the farm_plant branch September 2, 2018 13:43

nexusmrsep added this to Done in farming improvements Sep 3, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Zone activity - farm plot planting #25181

Zone activity - farm plot planting #25181

Robik81 commented Aug 27, 2018 •

edited

Vasyan2006 commented Aug 27, 2018

Robik81 commented Aug 27, 2018

Robik81 Aug 27, 2018

Qrox Aug 28, 2018 •

edited

Robik81 Aug 28, 2018

ZhilkinSerg commented Aug 28, 2018

Robik81 commented Aug 28, 2018

Robik81 commented Aug 29, 2018

ZhilkinSerg Aug 29, 2018

ZhilkinSerg commented Aug 29, 2018

Robik81 commented Aug 29, 2018

Robik81 commented Aug 29, 2018

Zone activity - farm plot planting #25181

Zone activity - farm plot planting #25181

Conversation

Robik81 commented Aug 27, 2018 • edited

Summary

Purpose of change

Describe the solution

Update

Vasyan2006 commented Aug 27, 2018

Robik81 commented Aug 27, 2018

Robik81 Aug 27, 2018

Choose a reason for hiding this comment

Qrox Aug 28, 2018 • edited

Choose a reason for hiding this comment

Robik81 Aug 28, 2018

Choose a reason for hiding this comment

ZhilkinSerg commented Aug 28, 2018

Robik81 commented Aug 28, 2018

Robik81 commented Aug 29, 2018

ZhilkinSerg Aug 29, 2018

Choose a reason for hiding this comment

ZhilkinSerg commented Aug 29, 2018

Robik81 commented Aug 29, 2018

Robik81 commented Aug 29, 2018

New commits changes

Robik81 commented Aug 27, 2018 •

edited

Qrox Aug 28, 2018 •

edited