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/019-1_Snow_field | |
| 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/019-1_Snow_field')
| -rw-r--r-- | npc/019-1_Snow_field/monsters.txt | 6 | ||||
| -rw-r--r-- | npc/019-1_Snow_field/snowman.txt | 4 | ||||
| -rw-r--r-- | npc/019-1_Snow_field/taro.txt | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/npc/019-1_Snow_field/monsters.txt b/npc/019-1_Snow_field/monsters.txt index b4515cf2..607ade82 100644 --- a/npc/019-1_Snow_field/monsters.txt +++ b/npc/019-1_Snow_field/monsters.txt @@ -2,10 +2,10 @@ // This is the Snow Fields. // -new_10-1.gat,0,0,0,0 monster SantaSlime 1015,10,0,0,Mob10::OnSantaSlime -new_10-1.gat,0,0,0,0 monster RudolphSlime 1016,25,0,0,Mob10::OnRudolphSlime +019-1.gat,0,0,0,0 monster SantaSlime 1015,10,0,0,Mob10::OnSantaSlime +019-1.gat,0,0,0,0 monster RudolphSlime 1016,25,0,0,Mob10::OnRudolphSlime -new_10-1.gat,0,0,0 script Mob10 -1,{ +019-1.gat,0,0,0 script Mob10 -1,{ OnSantaSlime: set @mobID, 1015; callfunc "MobPoints"; diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1_Snow_field/snowman.txt index 1e5ba412..1f56e4f2 100644 --- a/npc/019-1_Snow_field/snowman.txt +++ b/npc/019-1_Snow_field/snowman.txt @@ -1,4 +1,6 @@ -new_10-1.gat,77,44,0 script Snowman 129,{ +// + +019-1.gat,77,44,0 script Snowman 129,{ if( ChristmasQuest == 1) goto L_Done; mes "[Snowman]"; diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index c5ab3289..00976aa4 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -1,6 +1,6 @@ // Snow Taro -new_10-1.gat,57,61,0 script Taro 114,{ +019-1.gat,57,61,0 script Taro 114,{ if (getequipid(equip_head) == 511 || getequipid(equip_head) == 1206) goto L_Santa; if (getequipid(equip_head) == 633) goto L_Elf; if (getequipid(equip_head) == 628) goto L_NearElf; |