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-1e/StarGladiator.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-1e/StarGladiator.txt')
| -rw-r--r-- | npc/jobs/2-1e/StarGladiator.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt index d5797edd3..ca04c46c9 100644 --- a/npc/jobs/2-1e/StarGladiator.txt +++ b/npc/jobs/2-1e/StarGladiator.txt @@ -17,7 +17,7 @@ //= 1.3 Added Quest Log commands. [Kisuka] //============================================================ -payon,215,102,3 script Moohyun#job_star 828,3,3,{ +payon,215,102,3 script Moohyun#job_star 4_M_ROGUE,3,3,{ if (Class == Job_Taekwon) { if (STGL_Q == 0) { mes "[Moohyun]"; @@ -353,7 +353,7 @@ OnTouch: close; } -comodo,172,230,3 script Wandering Master#job_sta 730,{ +comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{ if (Class == Job_Taekwon) { if (STGL_Q == 1) { mes "[Moogang]"; @@ -816,7 +816,7 @@ comodo,172,230,3 script Wandering Master#job_sta 730,{ close; } -job_star,29,33,0 script Daru#job_star 59,{ +job_star,29,33,0 script Daru#job_star 1_M_ORIENT01,{ if (Class == Job_Taekwon) { if (STGL_Q == 3) { mes "[Daru]"; @@ -1101,7 +1101,7 @@ job_star,29,33,0 script Daru#job_star 59,{ close; } -job_star,95,33,0 script Beeryu#job_star 106,{ +job_star,95,33,0 script Beeryu#job_star 1_M_MOC_LORD,{ if (Class == Job_Taekwon) { if (STGL_Q == 4) { mes "[Beeryu]"; @@ -1413,7 +1413,7 @@ job_star,95,33,0 script Beeryu#job_star 106,{ close; } -job_star,161,33,0 script Cheehee#job_star 77,{ +job_star,161,33,0 script Cheehee#job_star 1_F_ORIENT_03,{ if (Class == Job_Taekwon) { if (STGL_Q == 6) { mes "[Cheehee]"; |