diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-10-24 12:48:53 +0000 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-10-24 12:48:53 +0000 |
| commit | 1a3d323af19764546552b1d621c65303c1fb3005 (patch) | |
| tree | 5e70a62dc756d5a10fe558fe6e3efefcf5ef1a97 /npc/020-2-5 | |
| parent | 8077efb70e0af1c54a84859f73c96de21c60107b (diff) | |
| download | serverdata-1a3d323af19764546552b1d621c65303c1fb3005.tar.gz serverdata-1a3d323af19764546552b1d621c65303c1fb3005.tar.bz2 serverdata-1a3d323af19764546552b1d621c65303c1fb3005.tar.xz serverdata-1a3d323af19764546552b1d621c65303c1fb3005.zip | |
CONTENT III SUPER MERGE REQUEST
Included:
* Tulimshar Casino
* Placeholder fixing/filling
* Food Questline
* Rossy Quest
* Galimatia Quest (mostly by Livio)
* Edourard bugs
* Blood Donor Quest (from Moubootaur Legends)
* Merchant Guild Quest
* Mundane Bugfix
* La Marine
* Hurns Doctor easter eggs
* Sailing to Argaes with Legion
* Other things not relevant enough to be noted down, I guess
Diffstat (limited to 'npc/020-2-5')
| -rw-r--r-- | npc/020-2-5/_import.txt | 2 | ||||
| -rw-r--r-- | npc/020-2-5/dausen.txt | 10 | ||||
| -rw-r--r-- | npc/020-2-5/filipa.txt | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/npc/020-2-5/_import.txt b/npc/020-2-5/_import.txt index f7be2ce9..e7e9087c 100644 --- a/npc/020-2-5/_import.txt +++ b/npc/020-2-5/_import.txt @@ -1,3 +1,5 @@ // Map 020-2-5: Legion Castle // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/020-2-5/_warps.txt", +"npc/020-2-5/dausen.txt", +"npc/020-2-5/filipa.txt", diff --git a/npc/020-2-5/dausen.txt b/npc/020-2-5/dausen.txt index f8b77df1..157c689e 100644 --- a/npc/020-2-5/dausen.txt +++ b/npc/020-2-5/dausen.txt @@ -7,14 +7,14 @@ 020-2-5,40,23,0 script Dausen NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION,{ speech - l("Hi there."), - l("Looks like someone ran out of ideas for placeholder NPCs."), - l("So if you want, you can hunt something, or cook something, or craft somethig."), - l("Whatever."); + l("Hi there. I am lieutenant Dausen."), + l("Red Sands desert is dangerous at the moment, so we sealed it off."), + l("The mines are also on the risk of collapsing, so the workers had to be evacuated as well."), + l("I fear for the future of this town..."); close; OnInit: .bodytype = BODYTYPE_2; - .distance = 2; + .distance = 4; end; } diff --git a/npc/020-2-5/filipa.txt b/npc/020-2-5/filipa.txt index 74beb94e..1390df19 100644 --- a/npc/020-2-5/filipa.txt +++ b/npc/020-2-5/filipa.txt @@ -8,13 +8,13 @@ 020-2-5,47,28,0 script Filipa NPC_RAIJIN_FEMALE_LEGION_ARTIS,{ speech l("Hi there."), - l("Looks like someone ran out of ideas for placeholder NPCs."), - l("So if you want, you can hunt something, or cook something, or craft somethig."), - l("Whatever."); + l("This is no place for you, get moving!"), + l("If you want, you can hunt something, or cook something, or craft something."), + l("Whatever, just get out of here already!"); close; OnInit: .bodytype = BODYTYPE_2; - .distance = 2; + .distance = 4; end; } |