Code

Rework monster equipment#36377

Code

Merged

kevingranade merged 27 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom ymber:drop_saddleymber/Cataclysm-DDA:drop_saddleCopy head branch name to clipboardJan 12, 2020

+374-242

Commits

Commits on Dec 30, 2019

• Add item optionals to monster

  

  ymber

  committed
  d0c2c2a

  Copy full SHA for d0c2c2a

• Add monexamine::get_weight_on_monster

  

  ymber

  committed
  d0e91d0

  Copy full SHA for d0e91d0

• Use monster::armor_item for animal armor

  

  ymber

  committed
  e7e710a

  Copy full SHA for e7e710a

• Use monster::tack_item for saddles

  

  ymber

  committed
  3111038

  Copy full SHA for 3111038

• Move current weight calculator to monster

  

  ymber

  committed
  ef292bd

  Copy full SHA for ef292bd

• Refactor bags on monsters

  

  ymber

  committed
  42fc875

  Copy full SHA for 42fc875

• Misc updates to monexamine::pet_menu

  

  ymber

  committed
  dfa9901

  Copy full SHA for dfa9901

• Use TACK flag instead of hardcoded itype_id

  

  ymber

  committed
  e599336

  Copy full SHA for e599336

• Remove obsolete comment

  

  ymber

  committed
  6738681

  Copy full SHA for 6738681

• Update horse armors

  

  ymber

  committed
  0a648b4

  Copy full SHA for 0a648b4

• Fix monster storage check

  

  ymber

  committed
  95e647c

  Copy full SHA for 95e647c

• Clean includes

  

  ymber

  committed
  645a5b2

  Copy full SHA for 645a5b2

• Add monster::move_special_item_to_inv

  

  ymber

  committed
  63d6758

  Copy full SHA for 63d6758

• Fix horse tack duplication

  

  ymber

  committed
  fdd2d80

  Copy full SHA for fdd2d80

• Access optionals by operator*

  

  ymber

  committed
  6aae703

  Copy full SHA for 6aae703

• Add translation context comments

  

  ymber

  committed
  e6f39c5

  Copy full SHA for e6f39c5

• Update give item checks

  

  ymber

  committed
  e5d6141

  Copy full SHA for e5d6141

• Use reference for move_special_item_to_inv

  

  ymber

  committed
  2376350

  Copy full SHA for 2376350

• Use proper access operator

  

  ymber

  committed
  c047792

  Copy full SHA for c047792

• Replace item position ints with item_location

  

  ymber

  committed
  925d5d0

  Copy full SHA for 925d5d0

• Remove space

  

  ymber

  committed
  0e17083

  Copy full SHA for 0e17083

• Remove helper functions from public interface

  

  ymber

  committed
  187741e

  Copy full SHA for 187741e

• Use new drop_locations in give_items_to

  

  ymber

  committed
  286408e

  Copy full SHA for 286408e

Commits on Jan 1, 2020

• Use cata::value_ptr<item> for special items

  

  ymber

  committed
  b7e44a0

  Copy full SHA for b7e44a0

• Show armor valuse for monster armor

  

  ymber

  committed
  f68b570

  Copy full SHA for f68b570

• Astyle, update horse armor data

  

  ymber

  committed
  15f7170

  Copy full SHA for 15f7170

Commits on Jan 8, 2020

• Merge branch 'master' into drop_saddle

  kevingranade

  authored
  dfe9157

  Copy full SHA for dfe9157