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-1a | |
| 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-1a')
| -rw-r--r-- | npc/jobs/2-1a/AssassinCross.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-1a/HighPriest.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-1a/HighWizard.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-1a/LordKnight.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-1a/Sniper.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-1a/WhiteSmith.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index ff15ab302..a9fdee622 100644 --- a/npc/jobs/2-1a/AssassinCross.txt +++ b/npc/jobs/2-1a/AssassinCross.txt @@ -13,7 +13,7 @@ //= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ -valkyrie,44,58,5 script Assassin Cross#Valkyrie 725,{ +valkyrie,44,58,5 script Assassin Cross#Valkyrie 4_F_JOB_ASSASSIN,{ if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt index 9c6109dba..e7dffe9b9 100644 --- a/npc/jobs/2-1a/HighPriest.txt +++ b/npc/jobs/2-1a/HighPriest.txt @@ -13,7 +13,7 @@ //= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ -valkyrie,44,42,5 script High Priest#Valkyrie 60,{ +valkyrie,44,42,5 script High Priest#Valkyrie 1_M_PASTOR,{ if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index 6a152a5cb..12517e04c 100644 --- a/npc/jobs/2-1a/HighWizard.txt +++ b/npc/jobs/2-1a/HighWizard.txt @@ -13,7 +13,7 @@ //= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ -valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ +valkyrie,44,47,5 script High Wizard#Valkyrie 4_M_JOB_WIZARD,{ if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt index f1254c08a..eb310e360 100644 --- a/npc/jobs/2-1a/LordKnight.txt +++ b/npc/jobs/2-1a/LordKnight.txt @@ -13,7 +13,7 @@ //= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ -valkyrie,44,39,5 script Lord Knight#Valkyrie 56,{ +valkyrie,44,39,5 script Lord Knight#Valkyrie 1_M_KNIGHTMASTER,{ if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt index de9b8e44e..c7060cdf6 100644 --- a/npc/jobs/2-1a/Sniper.txt +++ b/npc/jobs/2-1a/Sniper.txt @@ -13,7 +13,7 @@ //= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ -valkyrie,44,55,5 script Sniper#Valkyrie 727,{ +valkyrie,44,55,5 script Sniper#Valkyrie 4_F_JOB_HUNTER,{ if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index 174fb2582..d917d3988 100644 --- a/npc/jobs/2-1a/WhiteSmith.txt +++ b/npc/jobs/2-1a/WhiteSmith.txt @@ -13,7 +13,7 @@ //= 1.3 Now saves/restores all the quest skills [Lupus] //============================================================ -valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{ +valkyrie,44,50,5 script MasterSmith#Valkyrie 4_M_JOB_BLACKSMITH,{ if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { |