Code

Restore variable encumbrance#40321

Code

Merged

kevingranade merged 15 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom jbytheway:restore_variable_encumbrancejbytheway/Cataclysm-DDA:restore_variable_encumbranceCopy head branch name to clipboardMay 12, 2020

+595-178

Commits

Commits on May 11, 2020

• Reinstate variable encumbrance for non-rigid items

  Show description for ab8408d
  jbytheway

  committed
  ab8408d

  Copy full SHA for ab8408d

• Restore iteminfo regarding variable encumbrance

  jbytheway

  committed
  15ac4ac

  Copy full SHA for 15ac4ac

• Reinstate iteminfo tests

  Show description for d2a6e4a
  jbytheway

  committed
  d2a6e4a

  Copy full SHA for d2a6e4a

• item_contents::is_rigid -> all_pockets_rigid

  Show description for 4f6532e
  jbytheway

  committed
  4f6532e

  Copy full SHA for 4f6532e

• Switch assertion to debugmsg

  Show description for 532f78e
  jbytheway

  committed
  532f78e

  Copy full SHA for 532f78e

• Add item_pocket::max_contains_volume

  Show description for 2ea8bfb
  jbytheway

  committed
  2ea8bfb

  Copy full SHA for 2ea8bfb

• Refactor capacity / contains_volume

  Show description for 83ba08f
  jbytheway

  committed
  83ba08f

  Copy full SHA for 83ba08f

• Add quiver to iteminfo tests

  Show description for 62e2f70
  jbytheway

  committed
  62e2f70

  Copy full SHA for 62e2f70

• Make some holsters actually have holster pockets

  Show description for 7ee89e9
  jbytheway

  committed
  7ee89e9

  Copy full SHA for 7ee89e9

• Make briefcase and laundry basket rigid

  Show description for 0dad99c
  jbytheway

  committed
  0dad99c

  Copy full SHA for 0dad99c

• Automatic updating of existing armor items

  Show description for 2c358e8
  jbytheway

  committed
  2c358e8

  Copy full SHA for 2c358e8

• Capture more details in iteminfo tests

  Show description for 423217a
  jbytheway

  committed
  423217a

  Copy full SHA for 423217a

• clear_avatar in iteminfo tests

  Show description for 357316e
  jbytheway

  committed
  357316e

  Copy full SHA for 357316e

• Misc comment fixes

  Show description for 5a49ef7
  jbytheway

  committed
  5a49ef7

  Copy full SHA for 5a49ef7

• Revert encumbrance changes to power armour

  Show description for 491c34c
  jbytheway

  committed
  491c34c

  Copy full SHA for 491c34c