Code

Move ammo effects to JSON#36919

Code

Merged

kevingranade merged 12 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom ymber:json_ammoymber/Cataclysm-DDA:json_ammoCopy head branch name to clipboardJan 17, 2020

+424-153

Commits

Commits on Oct 2, 2019

• Jsonized ammo effects

  ZhilkinSerg

  committed
  e32d9ab

• 1

  ZhilkinSerg

  committed
  40d2ff9

Commits on Jan 11, 2020

• Move ammo effect definitions to JSON

  

  ymber

  committed
  38c5a88

• Fix const JsonObject &

  

  ymber

  committed
  5b4fdf3

• Don't fire all effects for every projectile

  

  ymber

  committed
  9c6bbc2

• Remove hardcoded behaviors for FLAME and NO_BOOM

  

  ymber

  committed
  5ab02dd

• Fix EXPLOSIVE_BIG definition

  

  ymber

  committed
  2096222

Commits on Jan 12, 2020

• Restore Mk211 explosion

  

  ymber

  committed
  f050457

• Remove unused aoe objects

  

  ymber

  committed
  d180776

• Simplify AoE checks

  

  ymber

  committed
  0fdaa97

• Add ammo effect checks

  

  ymber

  committed
  96ec090

Commits on Jan 13, 2020

• Fix ammo_effect::check

  

  ymber

  committed
  1b595de