diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-22 01:38:28 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-22 01:38:28 -0700 |
| commit | f2aa58baabb81281323c146d355a1317628afa4f (patch) | |
| tree | 0c08c7aa552e303548bdbef991178ece7d4ec966 /npc/020-2 | |
| parent | 91f0eec3f7ae3cd7976747eb7b74d70903321479 (diff) | |
| parent | 2b9845b6dbf242fe3213d82ac5a2b0dfaec184f0 (diff) | |
| download | serverdata-f2aa58baabb81281323c146d355a1317628afa4f.tar.gz serverdata-f2aa58baabb81281323c146d355a1317628afa4f.tar.bz2 serverdata-f2aa58baabb81281323c146d355a1317628afa4f.tar.xz serverdata-f2aa58baabb81281323c146d355a1317628afa4f.zip | |
Merge branch 'master' of http://git.gitorious.org/tmw-eathena-data/map-renaming
Conflicts:
npc/019-1_Snow_field/_import.txt
Diffstat (limited to 'npc/020-2')
| -rw-r--r-- | npc/020-2/furquest.txt | 2 | ||||
| -rw-r--r-- | npc/020-2/shops.txt | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/npc/020-2/furquest.txt b/npc/020-2/furquest.txt index 01b6c546..4d67f8c4 100644 --- a/npc/020-2/furquest.txt +++ b/npc/020-2/furquest.txt @@ -3,7 +3,7 @@ //################################################################################# // Santa's Inn - Agostine, The Legendary Tailor -new_13-1.gat,102,28,0 script Agostine 137, { +020-2.gat,102,28,0 script Agostine 137, { if (QUEST_WG_state == 1) goto L_State_0_3; if (QUEST_WG_state == 2) goto L_State_1; if (QUEST_WG_state == 3) goto L_State_2; diff --git a/npc/020-2/shops.txt b/npc/020-2/shops.txt index eb84181e..f3d9dedc 100644 --- a/npc/020-2/shops.txt +++ b/npc/020-2/shops.txt @@ -1,12 +1,14 @@ +// Snow town shops + // Clothes shop -new_13-1.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000 +020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000 // Weapons shop -new_13-1.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5 +020-2.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5 // Potions shop -new_13-1.gat,75,26,0 shop Mede 103,501:50,502:70,567:500,568:500 +020-2.gat,75,26,0 shop Mede 103,501:50,502:70,567:500,568:500 // INN -new_13-1.gat,111,23,0 script Kane 120,{ +020-2.gat,111,23,0 script Kane 120,{ set @npcName$, "Kane the Inn Keeper"; set @cost, 100; |