Code

Weakpoints as objects#53486

Code

Merged

kevingranade merged 28 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom I-am-Erk:weakpoints2againI-am-Erk/Cataclysm-DDA:weakpoints2againCopy head branch name to clipboardDec 24, 2021

+772-452

Commits

Commits on Dec 16, 2021

• begin implementing weakpoints as objects

  I-am-Erk

  committed
  a26e4c4

• Update zed-winged.json

  I-am-Erk

  authored
  c753861

• Update humanoid_weakpoints.json

  I-am-Erk

  authored
  73f0ed6

• Update zed_acid.json

  I-am-Erk

  authored
  5d7f3da

Commits on Dec 17, 2021

• Merge branch 'CleverRaven:master' into weakpoints2again

  I-am-Erk

  authored
  63dc0a4

• Merge branch 'CleverRaven:master' into weakpoints2again

  I-am-Erk

  authored
  b0b5671

• simplify weakpoint setup and move file

  I-am-Erk

  committed
  702c149

Commits on Dec 22, 2021

• expand to skeltal

  I-am-Erk

  committed
  00b6061

• Merge remote-tracking branch 'upstream/master' into weakpoints2again

  I-am-Erk

  committed
  19946ca

• children, burned, and revise some details on classics

  I-am-Erk

  committed
  04c6976

• survivors and some adjustments to armour

  I-am-Erk

  committed
  b494e51

Commits on Dec 23, 2021

• Update zed_electric.json

  I-am-Erk

  authored
  df33024

• Update zed_soldiers.json

  I-am-Erk

  authored
  4e2fe06

• Update zed_ferrous.json

  I-am-Erk

  authored
  655ee4b

• Update feral_humans.json

  I-am-Erk

  authored
  806ba1b

• Update humanoid_weakpoints.json

  I-am-Erk

  authored
  1af7fec

• Update humanoid_weakpoints.json

  I-am-Erk

  authored
  05be143

• Update humanoid_weakpoints.json

  I-am-Erk

  authored
  3d39ecc

• Update effects.json

  Show description for 0152c9b
  I-am-Erk

  authored
  0152c9b

• lint, adjust covg

  I-am-Erk

  committed
  7e756d4

• Merge branch 'weakpoints2again' of https://github.com/i-am-erk/Cataclysm-DDA into weakpoints2again

  I-am-Erk

  committed
  b51dbb5

• Update generic_weakpoints.json

  I-am-Erk

  committed
  273f0b7

• Merge remote-tracking branch 'upstream/master' into weakpoints2again

  I-am-Erk

  committed
  825e6fc

• lint

  I-am-Erk

  committed
  2da570d

• bit more linting

  I-am-Erk

  committed
  574d803

• last bit of linting I hope

  I-am-Erk

  committed
  38c83f6

• dps test fixes and change to incorrect spelling of "armour"

  I-am-Erk

  committed
  4af1f2f

Commits on Dec 24, 2021

• Update effective_dps_test.cpp

  kevingranade

  authored
  53823dd