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/novice/supernovice.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/novice/supernovice.txt')
| -rw-r--r-- | npc/jobs/novice/supernovice.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index 434ead038..cf9ea7b87 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -18,7 +18,7 @@ //= 2.4 Added an Ex. Super Novice dialog check. [Euphy] //============================================================ -aldeba_in,223,167,3 script Tzerero#sn 709,{ +aldeba_in,223,167,3 script Tzerero#sn 4_M_SEAMAN,{ if (BaseJob == Job_SuperNovice) { mes "[Tzerero]"; mes "I trust that you are enjoying"; @@ -326,7 +326,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{ } } -aldeba_in,216,169,5 script Esseray#sn 86,{ +aldeba_in,216,169,5 script Esseray#sn 4_M_04,{ if (Class == Job_Super_Novice_E || Class == Job_Super_Baby_E) { mes "[Esseray]"; mes "You! Stronger than before."; @@ -382,7 +382,7 @@ aldeba_in,216,169,5 script Esseray#sn 86,{ } } -aldebaran,54,238,5 script Kafra Employee#sn 117,{ +aldebaran,54,238,5 script Kafra Employee#sn 4_F_KAFRA1,{ if (BaseJob == Job_SuperNovice) { mes "[Kafra Employee]"; if (Sex ) |