Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TMW Serverdata
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5838c600

Commit 5838c600 authored 4 years ago by Jesusalva Jesusalva

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'livio/20201108_west_argaes' into 'master'

Add a couple quests for Captain Hal and Sergeant Ryan

See merge request evol/serverdata!279

parents e9b5eb87 212bb43e

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

db/quest_db.conf 18 additions, 14 deletions

db/quest_db.conf
npc/008-1-1/galimatia.txt 263 additions, 345 deletions

npc/008-1-1/galimatia.txt
npc/008-1-1/hal.txt 120 additions, 8 deletions

npc/008-1-1/hal.txt
npc/008-1-1/morcant.txt 5 additions, 3 deletions

npc/008-1-1/morcant.txt
npc/008-1-1/soldiers.txt 7 additions, 4 deletions

npc/008-1-1/soldiers.txt
npc/008-1/_import.txt 1 addition, 0 deletions

npc/008-1/_import.txt
npc/008-1/sergeant-ryan.txt 72 additions, 0 deletions

npc/008-1/sergeant-ryan.txt
npc/008-2-32/thamas.txt 10 additions, 2 deletions

npc/008-2-32/thamas.txt
npc/commands/debug-quest.txt 4 additions, 3 deletions

npc/commands/debug-quest.txt
npc/functions/libquest.txt 104 additions, 0 deletions

npc/functions/libquest.txt
npc/functions/quest-debug/061-General_Hal.txt 30 additions, 0 deletions

npc/functions/quest-debug/061-General_Hal.txt
npc/scripts.conf 4 additions, 1 deletion

npc/scripts.conf

with 638 additions and 380 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment