Merge pull request #2 from Gitjas/master

update to v3

Imoen4Ever.bat

@@ -6,7 +6,7 @@ call "%~dp0..\ModPackaging\utilities\ie_games.bat"
 
 REM /* MODIFY: set the values of the 3 variables below to reflect the current mod version */
 set "mod_name=Imoen 4 Ever"
-set mod_version=v2
+set mod_version=v3
 set mod_folder=imoen_forever
 
 REM /* MODIFY: list here which IE games the mod is compatible with, from this list of possibilities: */
@@ -23,7 +23,7 @@ set ico_folder=%mod_folder%\style
 set audio_folder=%mod_folder%\audio
 set tispack_folder=%mod_folder%\tiz
 set iconv_folder=%mod_folder%\tra\autotra\iconv
-set mod_readme=http://www.gibberlings3.net/readmes/readme.imoen_forever.english.txt
+set mod_readme=https://gibberlings3.github.io/Documentation/readmes/readme.imoen_forever.english.txt
 
 REM /* MODIFY: if you don't need to build a specific package, you can disable it below by setting the appropriate variable to 0 */
 set build_windows_zip=1

imoen_forever/ImoenInGroupKD/Imoen_in_group_KD.d

@@ -5,10 +5,10 @@ INTERJECT BDIMOEN 0 C#st_BDIMOEN_0
 @0
 END
   IF ~  IsValidForPartyDialogue("Dynaheir")
-~ THEN REPLY #63943 /* ~What do we know of our prey?~ */ EXTERN ~BDDYNAHJ~ 3
+~ THEN REPLY #%63943% /* ~What do we know of our prey?~ */ EXTERN ~BDDYNAHJ~ 3
   IF ~  !IsValidForPartyDialogue("Dynaheir")
-~ THEN REPLY #63943 /* ~What do we know of our prey?~ */ GOTO 2
-  IF ~~ THEN REPLY #63944 /* ~Sounds simple enough. Let's get to it.~ */ GOTO 5
+~ THEN REPLY #%63943% /* ~What do we know of our prey?~ */ GOTO 2
+  IF ~~ THEN REPLY #%63944% /* ~Sounds simple enough. Let's get to it.~ */ GOTO 5
 
 
 EXTEND_BOTTOM BDIMOEN 2 
@@ -50,21 +50,21 @@ IF WEIGHT #-1
   SAY @6
 ++ @7 + 29_add_01
   IF ~~ THEN REPLY @8 GOTO 29_add_02
-  IF ~~ THEN REPLY #64518 /* ~The important thing is we've triumphed—you and I are safe.~ */ GOTO 29_add_02
+  IF ~~ THEN REPLY #%64518% /* ~The important thing is we've triumphed—you and I are safe.~ */ GOTO 29_add_02
 ++ @9 + 29_add_02
 END
 
 IF ~~ THEN 29_add_01
 SAY @10
   IF ~~ THEN REPLY @8 GOTO 29_add_02
-  IF ~~ THEN REPLY #64518 /* ~The important thing is we've triumphed—you and I are safe.~ */ GOTO 29_add_02
+  IF ~~ THEN REPLY #%64518% /* ~The important thing is we've triumphed—you and I are safe.~ */ GOTO 29_add_02
 ++ @9 + 29_add_02
 END
 
 IF ~~ THEN BEGIN 29_add_02 
-  SAY #64521 /* ~I suppose so. Are you ready to leave now? This place gives me the shivers.~ [BD64521] */
-  IF ~~ THEN REPLY #64522 /* ~I am.~ */ GOTO 29_add_04
-  IF ~~ THEN REPLY #64524 /* ~Not yet. I want to look around.~ */ GOTO 29_add_03
+  SAY #%64521% /* ~I suppose so. Are you ready to leave now? This place gives me the shivers.~ [BD64521] */
+  IF ~~ THEN REPLY #%64522% /* ~I am.~ */ GOTO 29_add_04
+  IF ~~ THEN REPLY #%64524% /* ~Not yet. I want to look around.~ */ GOTO 29_add_03
 END
 
 IF ~~ THEN BEGIN 29_add_03
@@ -99,7 +99,7 @@ SAY @13
 END
 
 IF ~~ THEN BEGIN bhaal_research_01
-  SAY #64525 /* ~This is exactly the sort of thing I was looking for. Thanks. I'll tell Duke Jannath you found these when we get back to the palace.~ [BD64525] */
+  SAY #%64525% /* ~This is exactly the sort of thing I was looking for. Thanks. I'll tell Duke Jannath you found these when we get back to the palace.~ [BD64525] */
   IF ~~ THEN DO ~SetGlobal("C#st_BhaalResearch","LOCALS",2)
 ActionOverride(Player1,DestroyItem("BDSHBHR"))
 ActionOverride(Player2,DestroyItem("BDSHBHR"))
@@ -147,17 +147,17 @@ ADD_TRANS_TRIGGER BDFF1002 0 ~Range("%IMOEN_DV_SOD%",20) !StateCheck("%IMOEN_DV_
 
 EXTEND_BOTTOM BDFF1000 0
   IF ~OR(2)
-StateCheck("%IMOEN_DV_SOD%",CD_STATE_NOTVALID) Dead("%IMOEN_DV_SOD%")~ THEN REPLY #69736 /* ~Thank you. I'm ready to return to the Ducal Palace now.~ */ DO ~SetGlobal("C#st_ImoenRaised","GLOBAL",1)~ + 1
+StateCheck("%IMOEN_DV_SOD%",CD_STATE_NOTVALID) Dead("%IMOEN_DV_SOD%")~ THEN REPLY #%69736% /* ~Thank you. I'm ready to return to the Ducal Palace now.~ */ DO ~SetGlobal("C#st_ImoenRaised","GLOBAL",1)~ + 1
 END
 
 EXTEND_BOTTOM BDFF1001 0
   IF ~OR(2)
-StateCheck("%IMOEN_DV_SOD%",CD_STATE_NOTVALID) Dead("%IMOEN_DV_SOD%")~ THEN REPLY #69736 /* ~Thank you. I'm ready to return to the Ducal Palace now.~ */ DO ~SetGlobal("C#st_ImoenRaised","GLOBAL",1)~ + 1
+StateCheck("%IMOEN_DV_SOD%",CD_STATE_NOTVALID) Dead("%IMOEN_DV_SOD%")~ THEN REPLY #%69736% /* ~Thank you. I'm ready to return to the Ducal Palace now.~ */ DO ~SetGlobal("C#st_ImoenRaised","GLOBAL",1)~ + 1
 END
 
 EXTEND_BOTTOM BDFF1002 0
   IF ~OR(2)
-StateCheck("%IMOEN_DV_SOD%",CD_STATE_NOTVALID) Dead("%IMOEN_DV_SOD%")~ THEN REPLY #69736 /* ~Thank you. I'm ready to return to the Ducal Palace now.~ */ DO ~SetGlobal("C#st_ImoenRaised","GLOBAL",1)~ + 1
+StateCheck("%IMOEN_DV_SOD%",CD_STATE_NOTVALID) Dead("%IMOEN_DV_SOD%")~ THEN REPLY #%69736% /* ~Thank you. I'm ready to return to the Ducal Palace now.~ */ DO ~SetGlobal("C#st_ImoenRaised","GLOBAL",1)~ + 1
 END
 
 
@@ -208,10 +208,10 @@ ADD_TRANS_TRIGGER BDIMOEN 67 ~Global("C#st_ImoenInGroupKD","GLOBAL",0)~
 ADD_TRANS_TRIGGER BDIMOEN 78 ~Global("C#st_ImoenInGroupKD","GLOBAL",0)~ 
 
 EXTEND_BOTTOM BDIMOEN 67 
-+ ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~ + #35302 /* ~Imoen. It's good to see you up and about. How are you doing?~ */ DO ~SetGlobal("BD_MDD007","BD0103",2)~ + new_1
-  IF ~~ THEN REPLY #55721 /* ~What was that man in the hood doing here?~ */ DO ~SetGlobal("BD_MDD007","BD0103",2)
++ ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~ + #%35302% /* ~Imoen. It's good to see you up and about. How are you doing?~ */ DO ~SetGlobal("BD_MDD007","BD0103",2)~ + new_1
+  IF ~~ THEN REPLY #%55721% /* ~What was that man in the hood doing here?~ */ DO ~SetGlobal("BD_MDD007","BD0103",2)
 ~ GOTO new_2
-  IF ~~ THEN REPLY #35304 /* ~You look well, Imoen. Are you ready to pay Caelar back?~ */ DO ~SetGlobal("BD_MDD007","BD0103",2)~ + new_3
+  IF ~~ THEN REPLY #%35304% /* ~You look well, Imoen. Are you ready to pay Caelar back?~ */ DO ~SetGlobal("BD_MDD007","BD0103",2)~ + new_3
 END
 
 APPEND BDIMOEN
@@ -222,14 +222,14 @@ IF ~~ THEN + new_6
 END
 
 IF ~~ THEN new_2
-SAY #55722 /* ~You don't know him? He said he was a friend of yours. We've known some pretty strange characters, so I didn't think it was weird to have someone pop in looking for you.~ [BD55722] */
-  IF ~~ THEN REPLY #55723 /* ~I don't know who he is—he's certainly no friend of mine.~ */ GOTO new_4
-  IF ~~ THEN REPLY #55725 /* ~Eh. It's a mystery for another <DAYNIGHTALL>. How are you?~ */ GOTO new_1
-  IF ~~ THEN REPLY #55726 /* ~I have no friends, just allies and tools.~ */ GOTO new_5
+SAY #%55722% /* ~You don't know him? He said he was a friend of yours. We've known some pretty strange characters, so I didn't think it was weird to have someone pop in looking for you.~ [BD55722] */
+  IF ~~ THEN REPLY #%55723% /* ~I don't know who he is—he's certainly no friend of mine.~ */ GOTO new_4
+  IF ~~ THEN REPLY #%55725% /* ~Eh. It's a mystery for another <DAYNIGHTALL>. How are you?~ */ GOTO new_1
+  IF ~~ THEN REPLY #%55726% /* ~I have no friends, just allies and tools.~ */ GOTO new_5
 END
 
 IF ~~ THEN new_3
-SAY #35323 /* ~I knew you'd say that. I'm... I'm sorry. I can't go with you.~ [BD35323] */
+SAY #%35323% /* ~I knew you'd say that. I'm... I'm sorry. I can't go with you.~ [BD35323] */
 IF ~~ THEN + new_6
 END
 
@@ -239,50 +239,50 @@ IF ~~ THEN + new_6
 END
 
 IF ~~ THEN new_5
-SAY #66750 /* ~Gee, thanks. Actually, I'm kind of glad you said that—it'll make what I have to say a little easier.~ [BD66750] */
+SAY #%66750% /* ~Gee, thanks. Actually, I'm kind of glad you said that—it'll make what I have to say a little easier.~ [BD66750] */
 IF ~~ THEN + new_6
 END
 
 IF ~~ THEN new_6
-SAY #55732 /* ~I wanted to talk to you about going to battle the crusade. I can't do it, <CHARNAME>. I can't go with you.~ [BD55732] */
+SAY #%55732% /* ~I wanted to talk to you about going to battle the crusade. I can't do it, <CHARNAME>. I can't go with you.~ [BD55732] */
 ++ @22 + new_9
-  IF ~~ THEN REPLY #55743 /* ~I don't want you to. You'll be safer here.~ */ GOTO new_7
+  IF ~~ THEN REPLY #%55743% /* ~I don't want you to. You'll be safer here.~ */ GOTO new_7
   IF ~  Global("bd_liia_trains_immy","global",1)
-~ THEN REPLY #55744 /* ~Liia Jannath told me you're neither the thief you were nor the mage you will be at the moment. Best you remain here.~ */ GOTO new_9
-  IF ~~ THEN REPLY #55745 /* ~Good. I'd not have had you anyway. You'd only slow me down.~ */ GOTO new_8
-  IF ~~ THEN REPLY #55746 /* ~Can't go with me? What nonsense is this?~ */ GOTO new_9
+~ THEN REPLY #%55744% /* ~Liia Jannath told me you're neither the thief you were nor the mage you will be at the moment. Best you remain here.~ */ GOTO new_9
+  IF ~~ THEN REPLY #%55745% /* ~Good. I'd not have had you anyway. You'd only slow me down.~ */ GOTO new_8
+  IF ~~ THEN REPLY #%55746% /* ~Can't go with me? What nonsense is this?~ */ GOTO new_9
 END
 
 IF ~~ THEN new_7
-SAY #35327 /* ~Well, so would you, silly! But that doesn't matter, does it? I know that look in your eyes. I'm just wasting my breath.~ [BD35327] */
+SAY #%35327% /* ~Well, so would you, silly! But that doesn't matter, does it? I know that look in your eyes. I'm just wasting my breath.~ [BD35327] */
 IF ~~ THEN + new_9
 END
 
 IF ~~ THEN new_8
-  SAY #35347 /* ~Gods! You can really be mean sometimes, you know that?~ [BD35347] */
+  SAY #%35347% /* ~Gods! You can really be mean sometimes, you know that?~ [BD35347] */
   IF ~~ THEN + 88
 END
 
 IF ~~ THEN new_9
   SAY @23
 = @24
 = @25
-  IF ~~ THEN REPLY #35344 /* ~I understand. I'm glad you're not coming, in a way. You'll be safer here.~ */ GOTO new_10
-  IF ~~ THEN REPLY #35345 /* ~But... we're adventurers...~ */ GOTO new_10
-  IF ~~ THEN REPLY #35350 /* ~I thought you were made of sterner stuff, Imoen. If this is truly how you feel, then it's best you don't accompany us. I wouldn't want you dragging us down.~ */ GOTO 87
+  IF ~~ THEN REPLY #%35344% /* ~I understand. I'm glad you're not coming, in a way. You'll be safer here.~ */ GOTO new_10
+  IF ~~ THEN REPLY #%35345% /* ~But... we're adventurers...~ */ GOTO new_10
+  IF ~~ THEN REPLY #%35350% /* ~I thought you were made of sterner stuff, Imoen. If this is truly how you feel, then it's best you don't accompany us. I wouldn't want you dragging us down.~ */ GOTO 87
 END
 
 IF ~~ THEN new_10
   SAY @26
-= #66751 /* ~We need to talk about you going to Dragonspear Castle. Don't do it. Don't go.~ [BD66751] */
+= #%66751% /* ~We need to talk about you going to Dragonspear Castle. Don't do it. Don't go.~ [BD66751] */
   IF ~~ THEN + 83
 END
 
 END //APPEND
 
 EXTEND_BOTTOM BDIMOEN 78
-  IF  ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~  THEN REPLY #35320 /* ~Would that I could. But Caelar has forced my hand.~ */ GOTO 84
-  IF  ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~  THEN REPLY #35321 /* ~The city needs me. What would you have me do?~ */ GOTO 82
-  IF  ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~  THEN REPLY #35322 /* ~Caelar and her crusade must never be allowed to attack us again.~ */ GOTO 84
+  IF  ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~  THEN REPLY #%35320% /* ~Would that I could. But Caelar has forced my hand.~ */ GOTO 84
+  IF  ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~  THEN REPLY #%35321% /* ~The city needs me. What would you have me do?~ */ GOTO 82
+  IF  ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~  THEN REPLY #%35322% /* ~Caelar and her crusade must never be allowed to attack us again.~ */ GOTO 84
 + ~GlobalGT("C#st_ImoenInGroupKD","GLOBAL",0)~ + @27 + 84
 END

imoen_forever/ImoenInGroupKD/c#stimoe.baf

@@ -97,13 +97,13 @@ THEN
 	RESPONSE #100
 		SetGlobal("BD_Talk2","LOCALS",1)
 		FaceObject(Player1)
-		DisplayStringHead(Myself,63976)  // That symbol sure looks familiar. How about we keep moving?
+		DisplayStringHead(Myself,%63976%)  // That symbol sure looks familiar. How about we keep moving?
 END
 
 IF
 	Global("BD_Talk3","LOCALS",0)
 	AreaCheck("bd0130")
-	Range("Dead_Three_center",15)
+	Range("Dead_three_center",20)
 	!StateCheck(Myself,STATE_INVISIBLE)
 	InParty(Myself) 
 	See(Player1) 
@@ -113,13 +113,16 @@ THEN
 	RESPONSE #100
 		SetGlobal("BD_Talk3","LOCALS",1)
 		FaceObject(Player1)
-		DisplayStringHead(Myself,63978)  // The braziers in here must be magical. The different colors really liven up this drab ol' place.
+		DisplayStringHead(Myself,%63978%)  // The braziers in here must be magical. The different colors really liven up this drab ol' place.
 END
 
 IF
 	Global("BD_Talk4","LOCALS",0)
-	Global("BDSH_Imoen_Room","BD0130",4)
+//	Global("BDSH_Imoen_Room","BD0130",4)
 	AreaCheck("bd0130")
+	Range("Lava01",20)
+//	Range("Chasm02",15)
+	!Range("Trap_spook",5)
 	!StateCheck(Myself,STATE_INVISIBLE)
 	InParty(Myself) 
 	See(Player1) 
@@ -129,7 +132,7 @@ THEN
 	RESPONSE #100
 		SetGlobal("BD_Talk4","LOCALS",1)
 		FaceObject(Player1)
-		DisplayStringHead(Myself,63974)  // Hey�you feel a breeze? I feel a breeze.
+		DisplayStringHead(Myself,%63974%)  // Hey�you feel a breeze? I feel a breeze.
 END
 
 IF
@@ -146,13 +149,16 @@ THEN
 	RESPONSE #100
 		SetGlobal("BD_Talk5","LOCALS",1)
 		FaceObject("Massive_Door")
-		DisplayStringHead(Myself,63975)  // Wow, look at the size of that door! There must be a lever or something to open it.
+		DisplayStringHead(Myself,%63975%)  // Wow, look at the size of that door! There must be a lever or something to open it.
 END
 
 IF
 	Global("BD_Talk6","LOCALS",0)
 	AreaCheck("bd0120")
-	Range("Imoen_room1b",15)
+	OR(3)
+		Range("Imoen_room2",15)
+		Range("Imoen_room1b",15)
+		Range("Imoen_room2b",15)
 	!StateCheck(Myself,STATE_INVISIBLE)
 	InParty(Myself) 
 	See(Player1) 
@@ -162,7 +168,7 @@ THEN
 	RESPONSE #100
 		SetGlobal("BD_Talk6","LOCALS",1)
 		FaceObject(Player1)
-		DisplayStringHead(Myself,63977)  // This chasm sure looks deep. Do you feel warm air coming up from below? I do. Wonder what's down there?
+		DisplayStringHead(Myself,%63977%)  // This chasm sure looks deep. Do you feel warm air coming up from below? I do. Wonder what's down there?
 END
 
 /* group finds Korlasz's tomes about Bhaal research with Imoen in group */

imoen_forever/imoen_forever.ini

@@ -0,0 +1,35 @@
+# File encoding: preferred UTF8 (no BOM) if unicode characters are present, it can be ANSI for English-only
+# File format: ini as default and then HJSON/JSON5/JSONC/JSON (JSON doesn't allow comments) for advanced modders who want to use benefits of those file formats  
+# File name: it must be the same as tp2 name: MyMod.tp2 => MyMod.ini (.hjson/.json5/.jsonc/.json)  
+# File location: the same folder where .tp2 file is present  
+# File content: every key=value pair is optional, key names are case insensitive  
+
+# ini section header is required to avoid false detection
+[Metadata]
+
+# Full name of the mod, without version number
+Name = Imoen 4 Ever
+
+# Author name or nick, don't use email address
+Author = jastey
+
+# Short description of the mod, main goals, features etc
+Description = This mod aims at making Imoen a steady companion throughout the whole BG-Saga. Imoen-related story content is being considered, therefore Imoen will be out of party temporarily to reflect the most crucial original game events. This mod makes her rejoin the party after such incidents, so that she can be seen as an actual travel companion in SoD (not finished yet) and BGII.
+
+# Web address of mod Homepage
+Homepage = https://www.gibberlings3.net/mods/other/imoen4ever/
+
+#  Web address of mod dedicated forum or forum thread 
+Forum = https://www.gibberlings3.net/forums/forum/209-imoen-4-ever/
+
+# if you use github.com (preferred hosting site), simply use github.com/AccountOrOrgName/RepositoryName    
+# If you use other hosting sites, please check requirements and put direct download link  
+Download = https://github.com/Gibberlings3/Imoen4Ever
+
+# Requirements for other hosting sites:
+# - forum attachments won't work because the download links will be changed every time when you update mod package
+# - mod package should be downloaded using 'wget' commandline tool: wget.exe --no-check-certificate 'link'
+# - it's possible to preform file size check using 'wget' commandline tool: wget.exe --no-check-certificate --spider 'link'
+# - links do not expire after 30 or more days without download ( speeedyshare, mediafire etc has forced expiration dates)
+# - hosting site won't require user interaction or captcha ( googledrive, mediafire etc require user interaction)
+# - hosting site don't advertise any kind of adware/crapware etc