Merge pull request #198 from wushin/band-change

Change Band in Dimonds Dialogue

3 files changed, 43 insertions, 30 deletions

diff --git a/world/map/npc/010-2/_import.txt b/world/map/npc/010-2/_import.txt
index 1aeba756..c5080ede 100644
--- a/world/map/npc/010-2/_import.txt
+++ b/world/map/npc/010-2/_import.txt
@@ -3,6 +3,7 @@
 map: 010-2.gat
 npc: npc/010-2/_mobs.txt
 npc: npc/010-2/_warps.txt
+npc: npc/010-2/band.txt
 npc: npc/010-2/chef.txt
 npc: npc/010-2/dimonds.txt
 npc: npc/010-2/doug.txt
diff --git a/world/map/npc/010-2/band.txt b/world/map/npc/010-2/band.txt
new file mode 100644
index 00000000..d0783d8d
--- /dev/null
+++ b/world/map/npc/010-2/band.txt
@@ -0,0 +1,42 @@
+// dimonds band
+010-2.gat,40,35,0|script|Phil|157,
+{
+    callfunc "DimondBand";
+    end;
+}
+
+010-2.gat,40,37,0|script|Jerry|160,
+{
+    callfunc "DimondBand";
+    end;
+}
+
+010-2.gat,42,36,0|script|Robert|162,
+{
+    callfunc "DimondBand";
+    end;
+}
+function|script|DimondBand|,
+{
+    npctalk $@SongLyrics$[$@LyricSpot];
+    set $@LyricSpot, ($@LyricSpot + 1);
+    if (getarraysize($@SongLyrics$) <= $@LyricSpot)
+        set $@LyricSpot, 0;
+    goto L_Return;
+
+L_Return:
+    return;
+}
+-|script|#BandConfig|-1,
+{
+    end;
+
+OnInit:
+    set $@LyricSpot, 0;
+    setarray $@SongLyrics$, "Laid back in Hurnscald, with a GP in my hand,",
+                            "Watchin' GMs and players on the street,",
+                            "And I catch a glimpse of cheap rares on ManaMarket once a while,",
+                            "There's a woman who wants me to save their child.",
+                            "I got the Argean blues!";
+    end;
+}
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 09c585e2..6f158c65 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -12,36 +12,6 @@
     close;
 }
 
-010-2.gat,40,35,0|script|Phil|157,
-{
-    mes "[Phil]";
-    mes "\"We're having problems with our equipment!\"";
-    next;
-    mes "[Phil]";
-    mes "\"I don't know if we can play any songs!\"";
-    close;
-}
-
-010-2.gat,40,37,0|script|Jerry|160,
-{
-    mes "[Jerry]";
-    mes "\"I don't know what's wrong.\"";
-    next;
-    mes "[Jerry]";
-    mes "\"We should be able to play you music in the future!\"";
-    close;
-}
-
-010-2.gat,42,36,0|script|Robert|162,
-{
-    mes "[Robert]";
-    mes "\"I hope we can figure something out!\"";
-    next;
-    mes "[Robert]";
-    mes "\"We are kinda useless if we can't play music.\"";
-    close;
-}
-
 010-2.gat,35,35,0|script|Shannon|193,
 {
     set @month, 1;