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/re/kafras | |
| 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/re/kafras')
| -rw-r--r-- | npc/re/kafras/kafras.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt index 5db5885d3..448bbc8c4 100644 --- a/npc/re/kafras/kafras.txt +++ b/npc/re/kafras/kafras.txt @@ -26,7 +26,7 @@ // Brasilis //============================================================ -brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{ +brasilis,197,221,4 script Kafra Employee::kaf_bra 4_F_KAFRA1,{ cutin "kafra_01",2; callfunc "F_Kafra",0,3,0,80,700; savepoint "brasilis",195,259; @@ -35,7 +35,7 @@ brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{ // Dewata //============================================================ -dewata,202,184,6 script Kafra Employee::kaf_dewata 117,{ +dewata,202,184,6 script Kafra Employee::kaf_dewata 4_F_KAFRA1,{ cutin "kafra_01",2; callfunc "F_Kafra",0,10,1,40,700; savepoint "dewata",206,174; @@ -44,7 +44,7 @@ dewata,202,184,6 script Kafra Employee::kaf_dewata 117,{ // Eden Group //============================================================ -moc_para01,10,185,4 script Kafra Employee::kaf_eden 721,{ +moc_para01,10,185,4 script Kafra Employee::kaf_eden 4_F_KAFRA7,{ cutin "kafra_07",2; mes "[Kafra Employee]"; mes "Welcome to the"; @@ -55,21 +55,21 @@ moc_para01,10,185,4 script Kafra Employee::kaf_eden 721,{ // Izlude //============================================================ -izlude,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz 117 -izlude_a,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_a 117 -izlude_b,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_b 117 -izlude_c,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_c 117 -izlude_d,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_d 117 +izlude,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz 4_F_KAFRA1 +izlude_a,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_a 4_F_KAFRA1 +izlude_b,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_b 4_F_KAFRA1 +izlude_c,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_c 4_F_KAFRA1 +izlude_d,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_d 4_F_KAFRA1 // Port Malaya //============================================================ -malaya,71,79,4 script Kafra Employee::kaf_malaya1 581,{ +malaya,71,79,4 script Kafra Employee::kaf_malaya1 4_MAL_KAFRA,{ callfunc "F_Kafra",0,3,2,500,700; savepoint "malaya",44,56; callfunc "F_KafEnd",0,1,"in Port Malaya"; } -malaya,234,204,4 script Kafra Employee::kaf_malaya2 581,{ +malaya,234,204,4 script Kafra Employee::kaf_malaya2 4_MAL_KAFRA,{ callfunc "F_Kafra",0,3,2,500,700; savepoint "malaya",281,212; callfunc "F_KafEnd",0,1,"in Port Malaya"; @@ -77,7 +77,7 @@ malaya,234,204,4 script Kafra Employee::kaf_malaya2 581,{ // Rune Knight //============================================================ -job3_rune01,92,62,3 script Kafra Employee::kaf_rune 114,{ +job3_rune01,92,62,3 script Kafra Employee::kaf_rune 4_F_KAFRA4,{ cutin "kafra_04",2; callfunc "F_KafSet"; callfunc "F_Kafra",0,9,2,80,700; |