Merge pull request Regalis11#116 from ENDSHN/dev

New stuff for SCP:CB 1.3.11

Converter.bb

@@ -558,13 +558,15 @@ Cls
 Color 255,255,255
 Text 5,5,"Press a key:"
 Text 5,25,"1 - Convert B3D (generated by 3D World Studio) to RMESH"
-Text 5,45,"2 - Reset rooms.ini to use B3D meshes"
-Text 5,65,"ESC - Close without doing anything"
+Text 5,45,"2 - Convert a specific B3D (generated by 3D World Studio) to RMESH"
+Text 5,65,"3 - Reset rooms.ini to use B3D meshes"
+Text 5,85,"ESC - Close without doing anything"
 Flip
 
 While (Not KeyHit(1))
 	If KeyHit(2) Or KeyHit(79) Then state=1 : Exit
 	If KeyHit(3) Or KeyHit(80) Then state=2 : Exit
+	If KeyHit(4) Or KeyHit(81) Then state=3 : Exit
 Wend
 
 Local Stri$,TemporaryString$,f%
@@ -622,8 +624,20 @@ If state=1 Then ;convert B3D to Rmesh
 	Delay 1000
 
 	CloseFile f
-
 Else If state=2
+
+	Cls
+	Flip
+	FlushKeys()
+	Stri=Input("Path for the room to be converted: ")
+	mesh=LoadAnimMesh(Stri)
+	SaveRoomMesh(mesh,Replace(Stri,".b3d",".rmesh"))
+	Cls
+	Text 5,5,"Conversion of "+Stri+" complete"
+	Flip
+	Delay 1000
+
+Else If state=3
 	f%=ReadFile("Data\rooms.ini")
 
 	While Not Eof(f)

Credits.txt

@@ -17,15 +17,16 @@
 		Apocryphos
 		Atomicsneak
 		Brandon Smith
+		EternalError
 		GamerEntitlement
 		Hakkla
+		Ivan Mikhailov ("Redbull.Ivan")
 		James Bear ("Moonsaber")
 		Kenneth Crooker
 		Lionel Ruskin ("Cridone")
 		Micro
 		Night
 		Prosth
-		Ivan Mikhailov ("Redbull.Ivan")
 		TheKMan
 		Reilly Grindle ("Mirocaine")
 		SaitoFox
@@ -75,6 +76,7 @@
 		Caleb Yu ("Omniary")
 		KyoteeWilliams
 		Orgil Pount ("Destructoid")
+		Pavel Lvovich Gorfunkel ("-Mark-")
 		Shadowscale48
 		Shaun Gaylard ("ENDSHN")
 		Vladislav Borisevich ("Vane Brain")
@@ -94,6 +96,7 @@
 
 		Christian Rieß
 		Emil215p
+		Flipsy
 		Inclination
 		LordDeathv11
 		Onemario1234

Data/NPCs.ini

@@ -11,7 +11,7 @@ speed = 9.0
 scale = 0.6
 
 [SCP-049]
-speed = 1.6
+speed = 1.5
 scale = 1.2
 
 [SCP-049-2]
@@ -39,7 +39,7 @@ speed = 2.0
 scale = 0.17
 
 [SCP-966]
-speed = 3.0
+speed = 1.0
 scale = 0.5
 
 [SCP-1499-1]

Data/events.ini

@@ -297,4 +297,8 @@ room1=room2pit
 
 [room1archive]
 descr=Required for the entrance door to be functional.
-room1=room1archive
+room1=room1archive
+
+[room1lifts]
+descr=Required for the elevator buttons to be clickable.
+room1=room1lifts

FreeImage.decls

@@ -0,0 +1,70 @@
+.lib "FreeImage.dll"
+
+FI_Allocate%( Width%,Height%,BPP%,RedMask%,GreenMask%,BlueMask% ) : "_FreeImage_Allocate@24"
+FI_Load%( ImageType%,File$,Mode% ) : "_FreeImage_Load@12"
+FI_Save%( ImapeType%,FIBITMAP%,File$,Flags% ) : "_FreeImage_Save@16"
+FI_Unload%( FIBITMAP% ) : "_FreeImage_Unload@4"
+FI_GetFIFDescription$( FREE_IMAGE_FORMAT% ) : "_FreeImage_GetFIFDescription@4"
+FI_GetFileType%( File$,Default% ) : "_FreeImage_GetFileType@8"
+FI_ConvertToRawBits( Bank*,FIBITMAP%,Pitch%,Depth%,Red_Mask%,Green_Mask%,Blue_Mask%,TopDown% ) : "_FreeImage_ConvertToRawBits@32"
+FI_ConvertToRawBits3D( Pointer,FIBITMAP%,Pitch%,Depth%,Red_Mask%,Green_Mask%,Blue_Mask%,TopDown% ) : "_FreeImage_ConvertToRawBits@32"
+FI_GetFIFFromFilename%( File$ ) : "_FreeImage_GetFIFFromFilename@4"
+FI_GetColorsUsed%( FIBITMAP% ) : "_FreeImage_GetColorsUsed@4"
+FI_GetBits%( FIBITMAP% ) : "_FreeImage_GetBits@4"
+FI_GetLine%( FIBITMAP%,ScanLine% ) : "_FreeImage_GetLine@8"
+FI_GetBPP%( FIBITMAP% ) : "_FreeImage_GetBPP@4"
+FI_GetWidth%( FIBITMAP% ) : "_FreeImage_GetWidth@4"
+FI_GetHeight%( FIBITMAP% ) : "_FreeImage_GetHeight@4"
+FI_GetPitch%( FIBITMAP% ) : "_FreeImage_GetPitch@4"
+FI_GetDIBSize%( FIBITMAP% ) : "_FreeImage_GetDIBSize@4"
+FI_GetPalette%( FIBITMAP% ) : "_FreeImage_GetPalette@4"
+FI_GetDotsPerMeterX%( FIBITMAP% ) : "_FreeImage_GetDotsPerMeterX@4"
+FI_GetDotsPerMeterY%( FIBITMAP% ) : "_FreeImage_GetDotsPerMeterY@4"
+FI_GetInfoHeader%( FIBITMAP% ) : "_FreeImage_GetInfoHeader@4"
+FI_GetInfo%( FIBITMAP% ) : "_FreeImage_GetInfo@4"
+FI_GetColorType%( FIBITMAP% ) : "_FreeImage_GetColorType@4"
+FI_GetRedMask%( FIBITMAP% ) : "_FreeImage_GetRedMask@4"
+FI_GetGreenMask%( FIBITMAP% ) : "_FreeImage_GetGreenMask@4"
+FI_GetBlueMask%( FIBITMAP% ) : "_FreeImage_GetBlueMask@4"
+FI_GetTransparencyCount%( FIBITMAP% ) : "_FreeImage_GetTransparencyCount@4"
+FI_GetTransparencyTable%( FIBITMAP% ) : "_FreeImage_GetTransparencyTable@4"
+FI_SetTransparencyTable%( FIBITMAP%,Table*,Size ) : "_FreeImage_SetTransparencyTable@12"
+FI_SetTransparent( FIBITMAP%,Flag% ) : "_FreeImage_SetTransparent@8"
+FI_IsTransparent%( FIBITMAP% ) : "_FreeImage_IsTransparent@4"
+FI_ConvertTo8Bits%( FIBITMAP% ) : "_FreeImage_ConvertTo8Bits@4"
+FI_ConvertTo16Bits555%( FIBITMAP% ) : "_FreeImage_ConvertTo16Bits555@4"
+FI_ConvertTo16Bits565%( FIBITMAP% ) : "_FreeImage_ConvertTo16Bits565@4"
+FI_ConvertTo24Bits%( FIBITMAP% ) : "_FreeImage_ConvertTo24Bits@4"
+FI_ConvertTo32Bits%( FIBITMAP% ) : "_FreeImage_ConvertTo32Bits@4"
+FI_ColorQuantize%( FIBITMAP%,Flag% ) : "_FreeImage_ColorQuantize@8"
+FI_Threshold%( FIBITMAP%,Flag% ) : "_FreeImage_Threshold@8"
+FI_Dither%( FIBITMAP%,Algo% ) : "_FreeImage_Dither@8"
+FI_ConvertFromRawBits%( Bank*,Width%,Height%,Pitch%,Depth%,RedMask%,GreenMask%,BlueMask%,TopDown% ) : "_FreeImage_ConvertFromRawBits@36"
+FI_ConvertFromRawBits3D%( Pointer,Width%,Height%,Pitch%,Depth%,RedMask%,GreenMask%,BlueMask%,TopDown% ) : "_FreeImage_ConvertFromRawBits@36"
+FI_Clone%(DIB%) : "_FreeImage_Clone@4"
+FI_FIFSupportsReading%( FREE_IMAGE_FORMAT% ) : "_FreeImage_FIFSupportsReading@4"
+FI_FIFSupportsWriting%( FREE_IMAGE_FORMAT% ) : "_FreeImage_FIFSupportsWriting@4"
+FI_FIFSupportsExportBPP%( FREE_IMAGE_FORMAT%, BPP% ) : "_FreeImage_FIFSupportsExportBPP@8"
+FI_ZLibCompress%( BankOut*,BSizeOut%,BankIn*,BSizeIn% ) : "_FreeImage_ZLibCompress@16"
+FI_ZLibUncompress%( BankOut*,BSizeOut%,BankIn*,BSizeIn% ) : "_FreeImage_ZLibUncompress@16"
+FI_RotateClassic%( FIBITMAP%,Angle% ) : "_FreeImage_RotateClassic@8"
+FI_RotateEx%( FIBITMAP%,Angle%,Shiftx%,Shifty%,offx%,offy%,Masked% ) : "_FreeImage_RotateEx@28"
+FI_FlipHorizontal%( FIBITMAP% ) : "_FreeImage_FlipHorizontal@4"
+FI_FlipVertical%( FIBITMAP% ) : "_FreeImage_FlipVertical@4"
+FI_Rescale%( FIBITMAP%,Width%,Height%,Filter% ) : "_FreeImage_Rescale@16"
+FI_AdjustCurve%( FIBITMAP%,Bank*,Channel% ) : "_FreeImage_AdjustCurve@12"
+FI_AdjustGamma%( FIBITMAP%,Gamma% ) : "_FreeImage_AdjustGamma@8"
+FI_AdjustBrightness%( FIBITMAP%,Percent% ) : "_FreeImage_AdjustBrightness@8"
+FI_AdjustContrast%( FIBITMAP%,Percent% ) : "_FreeImage_AdjustContrast@8"
+FI_Invert%( FIBITMAP% ) : "_FreeImage_Invert@4"
+FI_GetHistogram%( FIBITMAP%,Bank*,Channel% ) : "_FreeImage_GetHistogram@12"
+FI_GetChannel%( FIBITMAP%,Channel% ) : "_FreeImage_GetChannel@8"
+FI_SetChannel%( FIBITMAP%, FIBITMAP8%, Channel% ) : "_FreeImage_SetChannel@12"
+FI_Copy%( FIBITMAP%,XA%,XB%,YA%,YB% ) : "_FreeImage_Copy@20"
+FI_Paste%( FIBITMAP%,X%,Y%,Alpha% ) : "_FreeImage_Paste@16"
+FI_GetVersion$() : "_FreeImage_GetVersion@0"
+
+.lib "kernel32.dll"
+RtlMoveMemory_To%(Destination%,Source*,Length%) : "RtlMoveMemory"
+RtlMoveMemory_From%(Destination*,Source%,Length%) : "RtlMoveMemory" 
+RtlMoveMemory_Ex%(Destination%,Source%,Length%) : "RtlMoveMemory"