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-1 | |
| 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-1')
| -rw-r--r-- | npc/020-1/amrak.txt | 2 | ||||
| -rw-r--r-- | npc/020-1/monsters.txt | 4 | ||||
| -rw-r--r-- | npc/020-1/sexchanger.txt | 4 | ||||
| -rw-r--r-- | npc/020-1/soul-menhir.txt | 6 | ||||
| -rw-r--r-- | npc/020-1/startrek.txt | 6 |
5 files changed, 14 insertions, 8 deletions
diff --git a/npc/020-1/amrak.txt b/npc/020-1/amrak.txt index b5b52962..19979ca0 100644 --- a/npc/020-1/amrak.txt +++ b/npc/020-1/amrak.txt @@ -1,6 +1,6 @@ // -new_11-1.gat,66,90,0 script Amrak 103, { +020-1.gat,66,90,0 script Amrak 103, { mes "[Amrak]"; mes "\"This... stone..."; mes "I have never seen a mineral like this"; diff --git a/npc/020-1/monsters.txt b/npc/020-1/monsters.txt index 92c95f81..9259cfdb 100644 --- a/npc/020-1/monsters.txt +++ b/npc/020-1/monsters.txt @@ -2,9 +2,9 @@ // This is Snow Town. // -new_11-1.gat,56,63,1,1 monster Maggot 1002,2,0,0,Mob11::OnMaggot +020-1.gat,56,63,1,1 monster Maggot 1002,2,0,0,Mob11::OnMaggot -new_11-1.gat,0,0,0 script Mob11 -1,{ +020-1.gat,0,0,0 script Mob11 -1,{ OnMaggot: set @mobID, 1002; callfunc "MobPoints"; diff --git a/npc/020-1/sexchanger.txt b/npc/020-1/sexchanger.txt index b26f9e14..168f47a3 100644 --- a/npc/020-1/sexchanger.txt +++ b/npc/020-1/sexchanger.txt @@ -1,4 +1,6 @@ -new_11-1.gat,50,49,0 script Xanith 136,{ +// + +020-1.gat,50,49,0 script Xanith 136,{ mes "[Xanith the Surgeon]"; mes "\"No sex changes right now, sorry.\""; close; diff --git a/npc/020-1/soul-menhir.txt b/npc/020-1/soul-menhir.txt index 7769530c..3d0bc82a 100644 --- a/npc/020-1/soul-menhir.txt +++ b/npc/020-1/soul-menhir.txt @@ -1,5 +1,7 @@ -new_11-1.gat,64,89,0 script Soul Menhir 144, { - set @map$, "new_11-1.gat"; +// + +020-1.gat,64,89,0 script Soul Menhir 144, { + set @map$, "020-1.gat"; set @x, 64; set @y, 90; callfunc "SoulMenhir"; diff --git a/npc/020-1/startrek.txt b/npc/020-1/startrek.txt index 72afe5e3..5c8847ad 100644 --- a/npc/020-1/startrek.txt +++ b/npc/020-1/startrek.txt @@ -1,11 +1,13 @@ -new_11-1.gat,79,77,0 script Kirk 133,{ +// + +020-1.gat,79,77,0 script Kirk 133,{ mes "[Capt. Kirk]"; mes "\"Spock: We're breaking the prime directive."; mes "This is not the right way to have the first contact.\""; close; } -new_11-1.gat,81,77,0 script Spock 134,{ +020-1.gat,81,77,0 script Spock 134,{ mes "[Spock]"; mes "\"Live long and prosper captain.\""; next; |