Merge pull request #9 from weigo87/New-Extended

New extended
Pocket-Plane-Group · Jan 15, 2024 · 96442d1 · 96442d1
2 parents 82de0b4 + 2a45d16
commit 96442d1
Show file tree

Hide file tree

Showing 75 changed files with 242 additions and 220 deletions.
diff --git a/SirinesCall/areas/J#Hall_are.tpa b/SirinesCall/areas/J#Hall_are.tpa
@@ -0,0 +1,19 @@
+COPY_EXISTING ~J#Hall.are~ ~override~
+	//Add candles and torches
+	PATCH_DEFINE_ARRAY x_coord BEGIN 254 430 211 386 END
+	PATCH_DEFINE_ARRAY y_coord BEGIN 148 192 237 281 END
+	PATCH_PHP_EACH x_coord AS index => x BEGIN
+		LPF fj_are_structure
+		INT_VAR
+			fj_loc_x = $x_coord("%index%")
+			fj_loc_y = $y_coord("%index%")
+			fj_schedule = 0b111111111111111111111111 //Hours 0.00 - 24.00
+			fj_flags = 0b00000000000000000001000001000011	// Visible, blend colours, not covered by wall, don't remove in combat
+			STR_VAR
+			fj_structure_type = animation
+			fj_name = FLMS
+			fj_bam_resref = FLMS 
+		END
+	END
+	CLEAR_ARRAY x_coord
+	CLEAR_ARRAY y_coord
diff --git a/SirinesCall/areas/J#Lig2_are.tpa b/SirinesCall/areas/J#Lig2_are.tpa
@@ -0,0 +1,20 @@
+COPY_EXISTING ~J#Lig2.are~ ~override~
+	//Add candles and torches
+	PATCH_DEFINE_ARRAY x_coord BEGIN 136  76 105 121 229 385 369 289 END
+	PATCH_DEFINE_ARRAY y_coord BEGIN 276 184 147 102  75 103 277 272 END
+	PATCH_PHP_EACH x_coord AS index => x BEGIN
+		LPF fj_are_structure
+		INT_VAR
+			fj_loc_x = $x_coord("%index%")
+			fj_loc_y = $y_coord("%index%")
+			fj_schedule = 0b111111111111111111111111 //Hours 0.00 - 24.00
+			fj_flags = 0b00000000000000000001000001000011	// Visible, blend colours, not covered by wall, don't remove in combat
+			STR_VAR
+			fj_structure_type = animation
+			fj_name = FLAME2S
+			fj_bam_resref = FLAME2S //bgrd
+		END
+	END
+	CLEAR_ARRAY x_coord
+	CLEAR_ARRAY y_coord 
+
diff --git a/SirinesCall/areas/J#Ligh_are.tpa b/SirinesCall/areas/J#Ligh_are.tpa
@@ -0,0 +1,20 @@
+COPY_EXISTING ~J#Ligh.are~ ~override~
+	//Add candles and torches
+	PATCH_DEFINE_ARRAY x_coord BEGIN 208 218 272 296 257 388 393 398 403 408 END
+	PATCH_DEFINE_ARRAY y_coord BEGIN 209 168 156 198 215 328 318 323 331 322 END
+	PATCH_PHP_EACH x_coord AS index => x BEGIN
+		LPF fj_are_structure
+		INT_VAR
+			fj_loc_x = $x_coord("%index%")
+			fj_loc_y = $y_coord("%index%")
+			fj_schedule = 0b111111111111111111111111 //Hours 0.00 - 24.00
+			fj_flags = 0b00000000000000000001000001000011	// Visible, blend colours, not covered by wall, don't remove in combat
+			STR_VAR
+			fj_structure_type = animation
+			fj_name = FLAME2S
+			fj_bam_resref = FLAME2S //bgrd
+		END
+	END
+	CLEAR_ARRAY x_coord
+	CLEAR_ARRAY y_coord
+
diff --git a/SirinesCall/areas/J#Stor_are.tpa b/SirinesCall/areas/J#Stor_are.tpa
@@ -0,0 +1,20 @@
+COPY_EXISTING ~J#Stor.are~ ~override~
+	//Add candles and torches
+	PATCH_DEFINE_ARRAY x_coord BEGIN 446 END
+	PATCH_DEFINE_ARRAY y_coord BEGIN 197 END
+	PATCH_PHP_EACH x_coord AS index => x BEGIN
+		LPF fj_are_structure
+		INT_VAR
+			fj_loc_x = $x_coord("%index%")
+			fj_loc_y = $y_coord("%index%")
+			fj_schedule = 0b111111111111111111111111 //Hours 0.00 - 24.00
+			fj_flags = 0b00000000000000000001000001000011	// Visible, blend colours, not covered by wall, don't remove in combat
+			STR_VAR
+			fj_structure_type = animation
+			fj_name = FLAME2S
+			fj_bam_resref = FLAME2S //bgrd
+		END
+	END
+	CLEAR_ARRAY x_coord
+	CLEAR_ARRAY y_coord
+
diff --git a/SirinesCall/base/wed/AR3600.WED → SirinesCall/base/Lighthouse_bg1/AR3600.WED b/SirinesCall/base/wed/AR3600.WED → SirinesCall/base/Lighthouse_bg1/AR3600.WED
diff --git a/SirinesCall/base/mbc/non-EE/AR3600.mbc → SirinesCall/base/Lighthouse_bg1/AR3600.mbc b/SirinesCall/base/mbc/non-EE/AR3600.mbc → SirinesCall/base/Lighthouse_bg1/AR3600.mbc
diff --git a/SirinesCall/base/tbcD/AR3600.tbc → SirinesCall/base/Lighthouse_bg1/AR3600.tbc b/SirinesCall/base/tbcD/AR3600.tbc → SirinesCall/base/Lighthouse_bg1/AR3600.tbc
diff --git a/SirinesCall/base/wed/AR3600N.WED → ...all/base/Lighthouse_bg1/night/AR3600N.WED b/SirinesCall/base/wed/AR3600N.WED → ...all/base/Lighthouse_bg1/night/AR3600N.WED
diff --git a/SirinesCall/base/mbc/non-EE/n/AR3600N.mbc → ...all/base/Lighthouse_bg1/night/AR3600N.mbc b/SirinesCall/base/mbc/non-EE/n/AR3600N.mbc → ...all/base/Lighthouse_bg1/night/AR3600N.mbc
diff --git a/SirinesCall/base/tbcN/AR3600N.tbc → ...all/base/Lighthouse_bg1/night/AR3600N.tbc b/SirinesCall/base/tbcN/AR3600N.tbc → ...all/base/Lighthouse_bg1/night/AR3600N.tbc
diff --git a/SirinesCall/base/Lighthouse_bgt/AR3600.WED b/SirinesCall/base/Lighthouse_bgt/AR3600.WED
diff --git a/SirinesCall/base/Lighthouse_bgt/AR3600.mbc b/SirinesCall/base/Lighthouse_bgt/AR3600.mbc
diff --git a/SirinesCall/base/Lighthouse_bgt/AR3600.tbc b/SirinesCall/base/Lighthouse_bgt/AR3600.tbc
diff --git a/SirinesCall/base/Lighthouse_bgt/AR3600N.WED b/SirinesCall/base/Lighthouse_bgt/AR3600N.WED
diff --git a/SirinesCall/base/Lighthouse_bgt/AR3600N.mbc b/SirinesCall/base/Lighthouse_bgt/AR3600N.mbc
diff --git a/SirinesCall/base/Lighthouse_bgt/AR3600N.tbc b/SirinesCall/base/Lighthouse_bgt/AR3600N.tbc
diff --git a/SirinesCall/base/Lighthouse_ee/A360000.PVRZ b/SirinesCall/base/Lighthouse_ee/A360000.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360001.PVRZ b/SirinesCall/base/Lighthouse_ee/A360001.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360002.PVRZ b/SirinesCall/base/Lighthouse_ee/A360002.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360003.PVRZ b/SirinesCall/base/Lighthouse_ee/A360003.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360004.PVRZ b/SirinesCall/base/Lighthouse_ee/A360004.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360005.PVRZ b/SirinesCall/base/Lighthouse_ee/A360005.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360006.PVRZ b/SirinesCall/base/Lighthouse_ee/A360006.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360007.PVRZ b/SirinesCall/base/Lighthouse_ee/A360007.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360008.PVRZ b/SirinesCall/base/Lighthouse_ee/A360008.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360009.PVRZ b/SirinesCall/base/Lighthouse_ee/A360009.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360010.PVRZ b/SirinesCall/base/Lighthouse_ee/A360010.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360011.PVRZ b/SirinesCall/base/Lighthouse_ee/A360011.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360012.PVRZ b/SirinesCall/base/Lighthouse_ee/A360012.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360013.PVRZ b/SirinesCall/base/Lighthouse_ee/A360013.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360014.PVRZ b/SirinesCall/base/Lighthouse_ee/A360014.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360015.PVRZ b/SirinesCall/base/Lighthouse_ee/A360015.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360016.PVRZ b/SirinesCall/base/Lighthouse_ee/A360016.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360017.PVRZ b/SirinesCall/base/Lighthouse_ee/A360017.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360018.PVRZ b/SirinesCall/base/Lighthouse_ee/A360018.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360019.PVRZ b/SirinesCall/base/Lighthouse_ee/A360019.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360020.PVRZ b/SirinesCall/base/Lighthouse_ee/A360020.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360021.PVRZ b/SirinesCall/base/Lighthouse_ee/A360021.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360022.PVRZ b/SirinesCall/base/Lighthouse_ee/A360022.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A360023.PVRZ b/SirinesCall/base/Lighthouse_ee/A360023.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N00.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N00.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N01.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N01.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N02.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N02.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N03.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N03.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N04.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N04.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N05.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N05.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N06.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N06.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N07.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N07.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N08.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N08.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N09.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N09.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N10.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N10.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N11.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N11.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N12.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N12.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N13.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N13.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N14.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N14.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N15.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N15.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N16.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N16.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N17.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N17.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N18.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N18.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N19.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N19.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N20.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N20.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N21.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N21.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N22.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N22.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/A3600N23.PVRZ b/SirinesCall/base/Lighthouse_ee/A3600N23.PVRZ
diff --git a/SirinesCall/base/Lighthouse_ee/AR3600.MOS b/SirinesCall/base/Lighthouse_ee/AR3600.MOS
diff --git a/SirinesCall/base/Lighthouse_ee/AR3600.TIS b/SirinesCall/base/Lighthouse_ee/AR3600.TIS
diff --git a/SirinesCall/base/Lighthouse_ee/AR3600.WED b/SirinesCall/base/Lighthouse_ee/AR3600.WED
diff --git a/SirinesCall/base/Lighthouse_ee/AR3600N.MOS b/SirinesCall/base/Lighthouse_ee/AR3600N.MOS
diff --git a/SirinesCall/base/Lighthouse_ee/AR3600N.TIS b/SirinesCall/base/Lighthouse_ee/AR3600N.TIS
diff --git a/SirinesCall/base/Lighthouse_ee/AR3600N.WED b/SirinesCall/base/Lighthouse_ee/AR3600N.WED
diff --git a/SirinesCall/base/tbcN/yswave.tbc b/SirinesCall/base/tbcN/yswave.tbc
diff --git a/SirinesCall/base/tbcN/yswaver.tbc b/SirinesCall/base/tbcN/yswaver.tbc
diff --git a/SirinesCall/lib/alter_searchmap.tpa b/SirinesCall/lib/alter_searchmap.tpa
@@ -2,18 +2,19 @@ DEFINE_ACTION_FUNCTION ~ALTER_SEARCHMAP~
 	INT_VAR
 
 	STR_VAR
-	path_to_2da_file = ~~ // full path to the *changes.2da file containing your icons, e.g. ~mymod/bam/AR3700SR_changes_ee.2da~
+	path_to_2da_file = ~~ // full path to the *changes.2da file, e.g. ~mymod/bmp/AR3700SR_changes_ee.2da~
 	areaname = ~~ 		  // area name, e.g. ~AR3700~
+	output_path = ~override~
+	type = ~SR~ // SR searchmap; HT heightmap; LM LN lightmap
 
 	RET
 
 BEGIN
-	PRINT ~%path_to_2da_file% - %areaname%~ 
 	COPY ~%path_to_2da_file%~ ~%path_to_2da_file%~
 		READ_2DA_ENTRIES_NOW ~newpixelarray~ 4
 		COUNT_2DA_ROWS 4 ~pixelnumber~
 
-	COPY_EXISTING ~%areaname%SR.bmp~ ~override~
+	COPY_EXISTING ~%areaname%%type%.bmp~ ~%output_path%~
 		FOR (cnt=0; cnt<pixelnumber; cnt=cnt+1) BEGIN
 			READ_2DA_ENTRY_FORMER ~newpixelarray~ cnt 0 ~offset~
 			READ_BYTE ~offset~ ~oldpixel~

diff --git a/SirinesCall/readme/sirine_readme.english.html b/SirinesCall/readme/sirine_readme.english.html
@@ -33,7 +33,7 @@
   <center><b><font SIZE="150em">The Lure of the Sirine's Call</font></b><br>
   Get it at the <a HREF="http://www.pocketplane.net/tutumods" TARGET="_blank">Pocket Plane Group</a><br>
   <b>A mod for all 4 BG1 games: classic BG1:TotSC, Baldur's Gate Tutu, BGT, BG:EE, and EET<br>
-  Version 16.3<br></b>
+  Version 16.4<br></b>
   <p>Developed by: <b>Ghreyfain</b>
   <p>The Tutu forums: <a HREF="http://forums.pocketplane.net/index.php?board=46.0" TARGET="_blank&quot;">http://forums.pocketplane.net/index.php?board=46.0</a><br>
   The BGT-WeiDU forums: <a HREF="http://www.shsforums.net/index.php?showforum=261" TARGET="_blank&quot;">http://www.shsforums.net/index.php?showforum=261</a><br>
@@ -504,6 +504,18 @@
 	<td>- Included AM_2005.WAV needed for J#Base.are.</td>
 	</tr>	
 
+	 <tr>
+	<td>Version 16.4</td>
+	<td>- Corrected extended nightmaps</td>
+    </tr>
+	<tr>
+	<td></td>
+	<td>- compatible with BGGO</td>
+	</tr>
+	<tr>
+	<td></td>
+	<td>- added candle animations to the interior maps</td>
+	</tr>
 
 </table>