diff options
| author | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
| commit | 5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch) | |
| tree | da13821a29480d88dcd872c682b26b75e5191482 /npc/re/jobs/3-1 | |
| parent | 4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff) | |
| parent | fe2f840e5d6cb4230ba02c47132790d067b3814d (diff) | |
| download | hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2 hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/re/jobs/3-1')
| -rw-r--r-- | npc/re/jobs/3-1/archbishop.txt | 2 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/guillotine_cross.txt | 2 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/mechanic.txt | 2 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/ranger.txt | 2 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/warlock.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index c71e2abd3..9a13aa359 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1664,4 +1664,4 @@ job3_arch01,1,1,1 script control#arch 844,{ close; } } -*/
\ No newline at end of file +*/ diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 71769be81..47b42e16f 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3916,4 +3916,4 @@ job3_guil03,1,8,0 script #GMhelper02_gc 844,{ mes "-_-."; close; } -*/
\ No newline at end of file +*/ diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index c38d4608f..4890d072b 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -730,4 +730,4 @@ OnTouch: } jupe_core2,150,33,0 duplicate(#Acquiring Knowledge) #Acquiring Knowledge2 139,1,0 -jupe_core2,0,0,0,0 monster Dimik 1669,100,0,0,0
\ No newline at end of file +jupe_core2,0,0,0,0 monster Dimik 1669,100,0,0,0 diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 314f199d2..02af29d54 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1803,4 +1803,4 @@ job3_rang01,58,1,0 script Worker#job_ranger 88,{ close; } } -*/
\ No newline at end of file +*/ diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 9894eae4b..d08d7395d 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -1096,4 +1096,4 @@ job3_war01,1,2,0 script Button Girl 66,{ */ spl_fild02,0,0,0,0 monster Bradium Golem 2049,20,5000,0,0 -spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0
\ No newline at end of file +spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0 |