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/pre-re/quests | |
| 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/pre-re/quests')
| -rw-r--r-- | npc/pre-re/quests/doomed_swords.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/quests/monstertamers.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/quests/quests_13_1.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/quests/quests_nameless.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/quests/skills/swordman_skills.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/npc/pre-re/quests/doomed_swords.txt b/npc/pre-re/quests/doomed_swords.txt index 9d27d588b..6e8c45eba 100644 --- a/npc/pre-re/quests/doomed_swords.txt +++ b/npc/pre-re/quests/doomed_swords.txt @@ -61,4 +61,4 @@ izlude_in,173,88,2 script Nain#magum 102,{ set event_magum,5; set dmdswrd_Q2,dmdswrd_Q2 | 4; close; -}
\ No newline at end of file +} diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt index 86f118f5a..df1cb6c9d 100644 --- a/npc/pre-re/quests/monstertamers.txt +++ b/npc/pre-re/quests/monstertamers.txt @@ -12,4 +12,4 @@ //= 1.0 Duplicates for Monster Tamer [Streusel] //============================================================ -izlude_in,129,64,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125
\ No newline at end of file +izlude_in,129,64,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125 diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt index b98aa2b95..5e61465d8 100644 --- a/npc/pre-re/quests/quests_13_1.txt +++ b/npc/pre-re/quests/quests_13_1.txt @@ -14,4 +14,4 @@ // Onward to the New World //============================================================ -izlude,101,173,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100
\ No newline at end of file +izlude,101,173,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100 diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt index ab5d816dc..e272ad43b 100644 --- a/npc/pre-re/quests/quests_nameless.txt +++ b/npc/pre-re/quests/quests_nameless.txt @@ -388,4 +388,4 @@ izlude_in,113,66,0 script Strange Machine 111,{ mes "a hand on my precious"; mes "masterpiece inventions! "; close; -}
\ No newline at end of file +} diff --git a/npc/pre-re/quests/skills/swordman_skills.txt b/npc/pre-re/quests/skills/swordman_skills.txt index 7a4aa2ff3..47858500f 100644 --- a/npc/pre-re/quests/skills/swordman_skills.txt +++ b/npc/pre-re/quests/skills/swordman_skills.txt @@ -145,4 +145,4 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ mes "I have a certain duty these days."; mes "Ehem! Need I say more."; close; -}
\ No newline at end of file +} |