Merge pull request #18 from Gitjas/master

update to v25.1
Gibberlings3 · Nov 27, 2021 · 36604f4 · 36604f4
2 parents ddff17e + c2971aa
commit 36604f4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 8 deletions.
diff --git a/bgqe/nashkell_monster/dialogues/c#q04eggdelivery.d b/bgqe/nashkell_monster/dialogues/c#q04eggdelivery.d
@@ -421,3 +421,18 @@ SetGlobal("C#Q04_WyvernDeliverer","GLOBAL",9) %ERASEJOURNALENTRY_10031% %ERASEJO
 END
 
 END //APPEND
+
+APPEND player1
+
+IF WEIGHT #-1
+~Global("C#Q04_WyvernDeliverer","GLOBAL",10)~ THEN hereiam
+SAY @116
+IF ~~ THEN DO ~SetGlobal("C#Q04_WyvernDeliverer","GLOBAL",11)
+%ERASEJOURNALENTRY_10031%
+%ERASEJOURNALENTRY_10033% 
+%ERASEJOURNALENTRY_10067%
+AddJournalEntry(@10035%QUEST_DONE%)
+CreateCreature("C#Q04009",[-1.-1]%FACE_0%)~ EXIT
+END
+
+END //APPEND
diff --git a/bgqe/nashkell_monster/scripts/c#q04spiderhatch.baf b/bgqe/nashkell_monster/scripts/c#q04spiderhatch.baf
@@ -6,18 +6,29 @@ IF
 	GlobalTimerExpired("c#q04_SpiderTimer","GLOBAL")
 	GlobalLT("C#Q04_WyvernDeliverer","GLOBAL",7)
 	PartyHasItem("C#Q04001")
+THEN
+	RESPONSE #100
+		SetGlobal("C#Q04_WyvernDeliverer","GLOBAL",10)
+END
+
+IF
+	Global("C#Q04_WyvernDeliverer","GLOBAL",10)
+	PartyHasItem("C#Q04001")
+THEN
+	RESPONSE #100
+		ActionOverride(Player1,StartDialogOverride("player1",Player1))
+END
+
+IF
+	Global("C#Q04_WyvernDeliverer","GLOBAL",11)
+	PartyHasItem("C#Q04001")
 THEN
 	RESPONSE #100
 		SetInterrupt(FALSE)
-		SetGlobal("C#Q04_WyvernDeliverer","GLOBAL",9)
-		ActionOverride(Player1,CreateCreature("C#Q04009",[-1.-1]%FACE_0%))
 		ActionOverride("C#Q04009",TakePartyItem("c#q04001"))
 		ActionOverride("C#Q04009",DestroyItem("c#q04001"))
-		DisplayStringHead(Player1,@116)
-		%ERASEJOURNALENTRY_10031%
-		%ERASEJOURNALENTRY_10033% 
-		%ERASEJOURNALENTRY_10067%
-		AddJournalEntry(@10035%QUEST_DONE%)
+		SetGlobal("C#Q04_WyvernDeliverer","GLOBAL",12)
 		SetInterrupt(TRUE)
 END
 
+
diff --git a/bgqe/readmes/english.bgqe.txt b/bgqe/readmes/english.bgqe.txt
@@ -380,6 +380,9 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORY
 
+Version 25.1:
+-changed dialogue for appearing spider back into dialogue and egg should really be removed after spider hatches.
+
 Version 25:
 -Italian setup.tra updated, by improbabile.
 -patching of Sil to make removing of turning hostile more stable.

diff --git a/bgqe/readmes/german.bgqe.txt b/bgqe/readmes/german.bgqe.txt
@@ -371,6 +371,9 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORIE
 
+Version 25.1:
+-changed dialogue for appearing spider back into dialogue and egg should really be removed after spider hatches.
+
 Version 25:
 -Italian setup.tra updated, by improbabile.
 -patching of Sil to make removing of turning hostile more stable.

diff --git a/bgqe/readmes/italiano.bgqe.txt b/bgqe/readmes/italiano.bgqe.txt
@@ -380,6 +380,9 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORY
 
+Version 25.1:
+-changed dialogue for appearing spider back into dialogue and egg should really be removed after spider hatches.
+
 Version 25:
 -Italian setup.tra updated, by improbabile.
 -patching of Sil to make removing of turning hostile more stable.

diff --git a/bgqe/readmes/readme.polski.txt → bgqe/readmes/polski.bgqe.txt b/bgqe/readmes/readme.polski.txt → bgqe/readmes/polski.bgqe.txt
@@ -374,6 +374,9 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORIE
 
+Version 25.1:
+-changed dialogue for appearing spider back into dialogue and egg should really be removed after spider hatches.
+
 Version 25:
 -Italian setup.tra updated, by improbabile.
 -patching of Sil to make removing of turning hostile more stable.

diff --git a/bgqe/setup-bgqe.tp2 b/bgqe/setup-bgqe.tp2
@@ -11,7 +11,7 @@ BACKUP ~bgqe/Backup~
 AUTHOR ~Please post in one of the forums as listed in the readme~
 
 //MODDER
-VERSION ~v25~ 
+VERSION ~v25.1~ 
 
 README ~bgqe/readmes/%LANGUAGE%.bgqe.txt~ ~bgqe/readmes/english.bgqe.txt~