Code

Random encounter 1#56629

Code

Merged

kevingranade merged 24 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom I-am-Erk:random-encounter-1I-am-Erk/Cataclysm-DDA:random-encounter-1Copy head branch name to clipboardApr 18, 2022

+398-10

Commits

Commits on Apr 4, 2022

• Add nested map infrastructure

  Show description for 55c1cb3
  I-am-Erk

  committed
  55c1cb3

  Copy full SHA for 55c1cb3

Commits on Apr 5, 2022

• Update roadstop.json

  I-am-Erk

  committed
  42043e6

  Copy full SHA for 42043e6

• Update roadstop.json

  I-am-Erk

  authored
  24f7458

  Copy full SHA for 24f7458

• Update roadstop.json

  I-am-Erk

  authored
  25dada6

  Copy full SHA for 25dada6

• Update roadstop.json

  I-am-Erk

  authored
  6e8cc90

  Copy full SHA for 6e8cc90

• Update roadstop.json

  I-am-Erk

  authored
  35f7498

  Copy full SHA for 35f7498

Commits on Apr 6, 2022

• Merge branch 'CleverRaven:master' into random-encounter-1

  I-am-Erk

  authored
  e93e8ff

  Copy full SHA for e93e8ff

• Update roadstop.json

  I-am-Erk

  authored
  a548972

  Copy full SHA for a548972

• dialogue

  I-am-Erk

  committed
  613b990

  Copy full SHA for 613b990

• Update free_merchant_caravans.json

  I-am-Erk

  committed
  269e3cc

  Copy full SHA for 269e3cc

• cleanup after playtesting

  I-am-Erk

  committed
  600c9f7

  Copy full SHA for 600c9f7

• Add NPC remove script by Mylie

  I-am-Erk

  committed
  552ff80

  Copy full SHA for 552ff80

• Merge remote-tracking branch 'upstream/master' into random-encounter-1

  I-am-Erk

  committed
  ee14ca7

  Copy full SHA for ee14ca7

• astyle

  I-am-Erk

  committed
  7dc8bc4

  Copy full SHA for 7dc8bc4

• Apply suggestions from code review

  Show description for 52ce629
  

  I-am-Erk

  and

  Night-Pryanik

  authored
  52ce629

  Copy full SHA for 52ce629

• Update NPC_free_merchant_shopkeep.json

  I-am-Erk

  authored
  ec03693

  Copy full SHA for ec03693

• change recurrence type

  Show description for 58652b2
  I-am-Erk

  committed
  58652b2

  Copy full SHA for 58652b2

• Make the pickup custom

  Show description for 5ad9ad6
  I-am-Erk

  committed
  5ad9ad6

  Copy full SHA for 5ad9ad6

Commits on Apr 7, 2022

• Update factional.json

  I-am-Erk

  authored
  d5b6e23

  Copy full SHA for d5b6e23

• Update NPC_free_merchant_shopkeep.json

  I-am-Erk

  authored
  308001a

  Copy full SHA for 308001a

• Update free_merchant_caravans.json

  I-am-Erk

  authored
  9ecca0c

  Copy full SHA for 9ecca0c

• Update randenc_caravans.json

  I-am-Erk

  authored
  7cf7584

  Copy full SHA for 7cf7584

Commits on Apr 9, 2022

• Merge remote-tracking branch 'upstream/master' into random-encounter-1

  I-am-Erk

  committed
  6fa8901

  Copy full SHA for 6fa8901

Commits on Apr 12, 2022

• Merge branch 'master' into random-encounter-1

  I-am-Erk

  authored
  5abc8ae

  Copy full SHA for 5abc8ae