Merge ja#wily2.d into ja#wilyn.d

MikeX1234 · Oct 5, 2024 · 70bce71 · 70bce71
1 parent c159d96
commit 70bce71
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 49 deletions.
diff --git a/JA#BGT_AdvPack/Miniquest/JA#C00.ARE b/JA#BGT_AdvPack/Miniquest/JA#C00.ARE
diff --git a/JA#BGT_AdvPack/Miniquest/JA#WILY1.BAF b/JA#BGT_AdvPack/Miniquest/JA#WILY1.BAF
@@ -1,8 +1,8 @@
 IF
 	GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8)
-	Global("JA#WILYN1_DEACT","LOCALS",0)
+	Global("JA#WILYN1","LOCALS",0)
 THEN
 	RESPONSE #100
-		SetGlobal("JA#WILYN1_DEACT","LOCALS",1)
-		Deactivate(Myself)
+		SetGlobal("JA#WILYN1","LOCALS",1)
+		Activate(Myself)
 END
diff --git a/JA#BGT_AdvPack/Miniquest/JA#WILY1.CRE b/JA#BGT_AdvPack/Miniquest/JA#WILY1.CRE
diff --git a/JA#BGT_AdvPack/Miniquest/JA#WILY2.BAF b/JA#BGT_AdvPack/Miniquest/JA#WILY2.BAF
diff --git a/JA#BGT_AdvPack/Miniquest/ja#wily1.d b/JA#BGT_AdvPack/Miniquest/ja#wily1.d
@@ -2,7 +2,7 @@ BEGIN ~JA#WILY1~
 
 IF ~GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8) NumTimesTalkedTo(0)~ THEN JA#WILY1_1
   SAY @0 = @1
-  IF ~~ THEN EXIT
+  IF ~~ THEN DO ~SetGlobal("JA#WILY2","GLOBAL",1)~ EXIT
 END
 
 IF ~GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8) RandomNum(3,1)~ THEN JA#WILY1_2

diff --git a/JA#BGT_AdvPack/Miniquest/ja#wily2.d b/JA#BGT_AdvPack/Miniquest/ja#wily2.d
diff --git a/JA#BGT_AdvPack/Miniquest/ja#wilyn.d b/JA#BGT_AdvPack/Miniquest/ja#wilyn.d
@@ -125,4 +125,24 @@ IF ~Global("JA#ELFSONG_QUEST","GLOBAL",6)~ THEN JA#WILYN_22
   IF ~~ THEN REPLY @52 EXIT
 END
 
+IF ~GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8) Global("JA#WILY2","GLOBAL",0)~ THEN JA#WILY2_1
+  SAY @0
+  IF ~~ THEN DO ~SetGlobal("JA#WILY2","GLOBAL",1)~ EXIT
+END
+
+IF ~GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8) RandomNum(3,1)~ THEN JA#WILY2_2
+  SAY @1
+  IF ~~ THEN EXIT
+END
+
+IF ~GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8) RandomNum(3,2)~ THEN JA#WILY2_3
+  SAY @2
+  IF ~~ THEN EXIT
+END
+
+IF ~GlobalGT("JA#ELFSONG_QUEST","GLOBAL",8) RandomNum(3,3)~ THEN JA#WILY2_4
+  SAY @3
+  IF ~~ THEN EXIT
+END
+
 // END JA#WILYN
diff --git a/JA#BGT_AdvPack/Miniquest/setup-Miniquest.tpa b/JA#BGT_AdvPack/Miniquest/setup-Miniquest.tpa
@@ -86,7 +86,6 @@ END
 
 
 COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/JA#WILY1.BAF~
-COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/JA#WILY2.BAF~
 
 
 MKDIR ~music/JA#ESTA~
@@ -119,7 +118,6 @@ COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/ja#rum01.d~
 COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/ja#serw1.d~
 COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/ja#vaala.d~
 COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/ja#wily1.d~
-COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/ja#wily2.d~
 COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Miniquest/ja#wilyn.d~
 
 // NTotSC