Code

Improve crop farming.#24291

Code

Merged

ZhilkinSerg merged 41 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Vasyan2006:grow-timeVasyan2006/Cataclysm-DDA:grow-timeCopy head branch name to clipboardAug 27, 2018

+1,177-225

Commits

Commits on Jul 13, 2018

• Add temperature dependence to the plant grow time.

  Vasyan2006

  committed
  1056809

  Copy full SHA for 1056809

• Add function to calculate effective plant grow time.

  Vasyan2006

  committed
  29d3cdc

  Copy full SHA for 29d3cdc

• Add function to calculate effective plant grow time.

  Show description for 5e3372c
  Vasyan2006

  committed
  5e3372c

  Copy full SHA for 5e3372c

• Add warm_enough_to_safe_plant() function.

  Vasyan2006

  committed
  46d2678

  Copy full SHA for 46d2678

• Change menu header if it can be too cold.

  Vasyan2006

  committed
  90e8c89

  Copy full SHA for 90e8c89

Commits on Jul 14, 2018

• Add double spacing.

  Vasyan2006

  committed
  509a800

  Copy full SHA for 509a800

• Remove excessive period.

  Vasyan2006

  committed
  52b7195

  Copy full SHA for 52b7195

Commits on Jul 31, 2018

• Edit plant grow.

  Vasyan2006

  committed
  c94219f

  Copy full SHA for c94219f

• Edit seeds info.

  Vasyan2006

  committed
  0182edb

  Copy full SHA for 0182edb

• Add "water requirement" and "weed susceptibility" plant parameters.

  Vasyan2006

  committed
  9dba40f

  Copy full SHA for 9dba40f

Commits on Aug 2, 2018

• Merge branch 'master' into grow-time

  Vasyan2006

  authored
  b26f848

  Copy full SHA for b26f848

Commits on Aug 3, 2018

• Add mushrooms and shrubs.

  Vasyan2006

  committed
  7ffece9

  Copy full SHA for 7ffece9

• Add carrot and sugar beet.

  Vasyan2006

  committed
  5efb79b

  Copy full SHA for 5efb79b

• Remove charges from pumpkin.

  Vasyan2006

  committed
  88d54c4

  Copy full SHA for 88d54c4

• Edit seed data.

  Vasyan2006

  committed
  d78a0be

  Copy full SHA for d78a0be

• Add more seed parameters.

  Vasyan2006

  committed
  85ada5b

  Copy full SHA for 85ada5b

• Edit plant processing.

  Vasyan2006

  committed
  1574849

  Copy full SHA for 1574849

• Edit mission with plants.

  Vasyan2006

  committed
  55541c8

  Copy full SHA for 55541c8

• Edit plant processing.

  Vasyan2006

  committed
  893809f

  Copy full SHA for 893809f

• Update seed data.

  Vasyan2006

  committed
  eadb21d

  Copy full SHA for eadb21d

Commits on Aug 5, 2018

• Add more berries.

  Vasyan2006

  committed
  7fed619

  Copy full SHA for 7fed619

• Update seeds.

  Vasyan2006

  committed
  bf2e681

  Copy full SHA for bf2e681

• Bugfixing.

  Vasyan2006

  committed
  142b2af

  Copy full SHA for 142b2af

Commits on Aug 6, 2018

• Update seed info.

  Vasyan2006

  committed
  deed0d5

  Copy full SHA for deed0d5

• Edit is_warm_enought().

  Vasyan2006

  committed
  aa48489

  Copy full SHA for aa48489

• Water rebalancing and astyle.

  Vasyan2006

  committed
  a383f70

  Copy full SHA for a383f70

• Merge branch 'master' into grow-time

  Vasyan2006

  authored
  917a730

  Copy full SHA for 917a730

Commits on Aug 7, 2018

• Replace dash-like character with minus sign.

  Vasyan2006

  committed
  7313c2c

  Copy full SHA for 7313c2c

Commits on Aug 11, 2018

• Edit crops interactions.

  Vasyan2006

  committed
  5af2342

  Copy full SHA for 5af2342

• Linting.

  Vasyan2006

  committed
  f0035ca

  Copy full SHA for f0035ca

• Typo.

  Vasyan2006

  committed
  4009795

  Copy full SHA for 4009795

• Edit crops grow.

  Vasyan2006

  committed
  0becd48

  Copy full SHA for 0becd48

Commits on Aug 13, 2018

• Merge branch 'master' into grow-time

  Vasyan2006

  authored
  62c725e

  Copy full SHA for 62c725e

Commits on Aug 18, 2018

• Merge branch 'master' into grow-time

  Vasyan2006

  authored
  d96742a

  Copy full SHA for d96742a

Commits on Aug 25, 2018

• Bugfixes for crop farming.

  Vasyan2006

  committed
  de8cc6f

  Copy full SHA for de8cc6f

• Merge branch 'master' into grow-time

  Vasyan2006

  authored
  d5849cb

  Copy full SHA for d5849cb

• Bugfixes for crop farming.

  Vasyan2006

  committed
  3b959a4

  Copy full SHA for 3b959a4

• Astyle to make Jenkins happy

  ZhilkinSerg

  authored
  bdfb4a8

  Copy full SHA for bdfb4a8

Commits on Aug 26, 2018

• Minor bugfix for crop farming.

  Vasyan2006

  committed
  a728c1c

  Copy full SHA for a728c1c

• Using game constant for freezing temperature.

  Vasyan2006

  committed
  0ff00d5

  Copy full SHA for 0ff00d5

• Merge branch 'master' into grow-time

  Vasyan2006

  authored
  8ce5a6d

  Copy full SHA for 8ce5a6d