summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-28 08:07:00 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-28 08:07:00 +0000
commit399cde8af5a0d1e0a8e8f7bb31494e916bacafaf (patch)
tree80698313b825631327879d49280769dc3ce973de /npc
parente0e70276d5d0bf992d7327d4e2696da62c5a2237 (diff)
downloadhercules-399cde8af5a0d1e0a8e8f7bb31494e916bacafaf.tar.gz
hercules-399cde8af5a0d1e0a8e8f7bb31494e916bacafaf.tar.bz2
hercules-399cde8af5a0d1e0a8e8f7bb31494e916bacafaf.tar.xz
hercules-399cde8af5a0d1e0a8e8f7bb31494e916bacafaf.zip
reverted Bard Quest to my version.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10634 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/quests/Bard_Quest.txt9
2 files changed, 6 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index dd5bda3da..a489cc7ed 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2007/05/28
+ * Reverted Samuray22's work in Bard Quest. RTM. [Lupus]
2007/05/26
* Rev. 10632 Guild flag update. [L0ne_W0lf]
- Guild flags in town by default will no longer show dialog.
diff --git a/npc/quests/Bard_Quest.txt b/npc/quests/Bard_Quest.txt
index ea2421661..464a700fc 100644
--- a/npc/quests/Bard_Quest.txt
+++ b/npc/quests/Bard_Quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Riotblade and L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,7 +21,6 @@
//= @inputstr$ : temp var
//=
//= This Quest has relation with brisingamen_seal.txt (Seals)
-//= 1.2 Fixed a little bug. [Samuray22]
//============================================================
geffen,132,38,3 script Bard#2 51,{
@@ -1308,11 +1307,10 @@ S_StorySong:
// For 3 and 4 cases we set more chance earlier on @random
if(getarg(0) == 3 || getarg(0) == 4){
mes "[Errende]";
- if (sex) {
+ if (sex)
mes "Heroic warrior,";
- } else {
+ else
mes "My fair lady,";
- }
mes "Please listen to my song. If you have a flower in hand and are in love, let's count the flower petals as we go along.";
next;
mes "^483D8BAt One, I fall in love.";
@@ -1350,6 +1348,7 @@ S_StorySong:
mes "You're an adventurer, aren't you? So you must travel quite a bit? It's embarassing for me to ask,";
mes "but I have a favor to ask...!";
next;
+
if(select("Sure, no problem.:I ain't gonna help you.")==1) {
cutin "bard_eland01",2;
mes "[Errende]";