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/quests/gunslinger_quests.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/quests/gunslinger_quests.txt')
| -rw-r--r-- | npc/quests/gunslinger_quests.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index 8f57ea9f1..a37841f89 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -22,7 +22,7 @@ //= 1.7 Removed all 'menu' and 'goto'. [Euphy] //============================================================ -que_ng,182,85,3 script Garrison 109,{ +que_ng,182,85,3 script Garrison 4_M_MANAGER,{ if(BaseJob != Job_Gunslinger) { @@ -424,7 +424,7 @@ lighthalzen,322,247,6 script Ravey 86,{ } -que_ng,187,163,3 script Ingrid 744,{ +que_ng,187,163,3 script Ingrid 4_F_ALCHE,{ if(BaseJob != Job_Gunslinger) { @@ -597,7 +597,7 @@ SubInferno: } } -que_ng,185,180,3 script Vanessa 726,{ +que_ng,185,180,3 script Vanessa 4_F_JOB_BLACKSMITH,{ if(BaseJob != Job_Gunslinger) { @@ -912,7 +912,7 @@ SubDestroyer_: } } -que_ng,149,178,4 script Lab Director 744,{ +que_ng,149,178,4 script Lab Director 4_F_ALCHE,{ if(gun_na == 1){ if(countitem(1043) > 999 && countitem(932) > 999){ @@ -1381,7 +1381,7 @@ que_ng,149,178,4 script Lab Director 744,{ } } -lighthalzen,205,284,6 script F. Harrison 85,{ +lighthalzen,205,284,6 script F. Harrison 4_M_03,{ if (gun_na == 100){ if(checkweight(13102,1) == 0){ |