diff options
author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/jobs/2-2/dancer.txt | |
parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/jobs/2-2/dancer.txt')
-rw-r--r-- | npc/jobs/2-2/dancer.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index 88157d40b..4075ce51f 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -21,7 +21,7 @@ //= 3.7a Fixed a label execution. [Euphy] //============================================================ -comodo,180,153,4 script Sonotora#1 90,{ +comodo,180,153,4 script Sonotora#1 4_F_01,{ mes "[Athena Sonotora]"; mes "They say the"; mes "famous dance school"; @@ -41,7 +41,7 @@ comodo,180,153,4 script Sonotora#1 90,{ close; } -comodo,193,151,4 script Bor Robin#1 86,{ +comodo,193,151,4 script Bor Robin#1 4_M_04,{ mes "[Bor Robin]"; mes "Aah...."; mes "A prima donna"; @@ -74,7 +74,7 @@ comodo,193,151,4 script Bor Robin#1 86,{ close; } -job_duncer,43,93,4 script Aile#da 724,{ +job_duncer,43,93,4 script Aile#da 4_F_07,{ if (Upper == 1) { mes "[Aile]"; mes "One two three four,"; @@ -408,7 +408,7 @@ job_duncer,43,93,4 script Aile#da 724,{ } } -job_duncer,95,93,4 script Bijou#da 101,{ +job_duncer,95,93,4 script Bijou#da 4W_F_01,{ if (SkillPoint) { mes "[Bijou]"; mes "You can't change jobs"; @@ -893,7 +893,7 @@ job_duncer,95,93,4 script Bijou#da 101,{ // Waiting Room //============================================================ -job_duncer,32,154,1 script Waiting Room#dance 66,{ +job_duncer,32,154,1 script Waiting Room#dance 1_F_01,{ end; OnInit: @@ -918,7 +918,7 @@ OnEnable: end; } -job_duncer,32,154,1 script Waiting Room#click 66,{ +job_duncer,32,154,1 script Waiting Room#click 1_F_01,{ mes "[Pyorgin]"; mes "Please wait in"; mes "the waiting room."; @@ -1322,7 +1322,7 @@ OnDisable: // Backup Dancers //============================================================ -job_duncer,63,110,4 script Backdancer#1 724,{ +job_duncer,63,110,4 script Backdancer#1 4_F_07,{ end; OnSmile: @@ -1340,7 +1340,7 @@ OnOmg: end; } -job_duncer,66,113,4 script Backdancer#2 724,{ +job_duncer,66,113,4 script Backdancer#2 4_F_07,{ end; OnSmile: @@ -1352,7 +1352,7 @@ OnOmg: end; } -job_duncer,72,113,4 script Backdancer#3 724,{ +job_duncer,72,113,4 script Backdancer#3 4_F_07,{ end; OnSmile: @@ -1364,7 +1364,7 @@ OnOmg: end; } -job_duncer,75,110,4 script Backdancer#4 724,{ +job_duncer,75,110,4 script Backdancer#4 4_F_07,{ end; OnSmile: |