- UB Improvements / Cleanup (by Jazz)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2026-08-26 14:30:26 +02:00 · 2013-08-29 11:53:39 +00:00
parent a5abf4d91a
commit 25dd0b084e
16 changed files with 734 additions and 200 deletions
@@ -107,6 +107,22 @@ static int l_InitMercgridNo5 (lua_State *L);
 static int l_InitMercgridNo6 (lua_State *L);
 static int l_InitJerryGridNo (lua_State *L);

+static int l_InitMapProfil (lua_State *L);
+static int l_SetKeySoldier (lua_State *L);
+
+static int  l_Ja25MANUEL_UB  (lua_State *L);
+static int  l_Ja25BIGGENS_UB  (lua_State *L);
+static int  l_Ja25JOHN_K_UB  (lua_State *L);
+static int  l_Ja25TEX_UB  (lua_State *L);
+static int  l_Ja25GASTON_UB  (lua_State *L);
+static int  l_Ja2JERRY_MILO_UB  (lua_State *L);
+static int  l_Ja25PGMALE4_UB  (lua_State *L);
+static int  l_Ja25BETTY_UB  (lua_State *L);
+static int  l_Ja25RAUL_UB  (lua_State *L);
+static int  l_Ja25MORRIS_UB  (lua_State *L);
+static int  l_Ja25RUDY_UB  (lua_State *L);
+static int l_Ja25STOGIE_UB (lua_State *L);
+
 static int l_SetInternalLocateGridNo(lua_State *L);

 static int l_setInGameHeliCrash (lua_State *L);
@@ -149,6 +165,8 @@ static int l_HavePersonAtGridnoStop(lua_State *L);
 static int l_WhoIsThere2 (lua_State *L);

 static int l_GuaranteeAtLeastXItemsOfIndex(lua_State *L);
+static int l_GuaranteeAtMostNumOfItemsForItem(lua_State *L);
+
 static int l_gMercProfileGearset(lua_State *L);

 static int l_FindUnderGroundSector(lua_State *L);
@@ -1370,6 +1388,7 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )
 	//------Shop------
 	
 	lua_register(L, "GuaranteeAtLeastXItemsOfIndex", l_GuaranteeAtLeastXItemsOfIndex);	
+	lua_register(L, "GuaranteeAtMostNumOfItemsForItem", l_GuaranteeAtMostNumOfItemsForItem);	

 //--------------------------------------------------------------------------------------------
 	
@@ -1459,9 +1478,26 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )

 	lua_register(L, "InitMercFace", l_InitFace);
 	
+	lua_register(L, "AddProfileToMap", l_InitMapProfil);
+	
+	lua_register(L, "SetKeyProfile", l_SetKeySoldier); // tactical mode
 	
 #ifdef JA2UB	
-	//john
+	
+	lua_register(L, "UB_GetManuelID", l_Ja25MANUEL_UB);
+	lua_register(L, "UB_GetBiggensID", l_Ja25BIGGENS_UB);
+	lua_register(L, "UB_GetJohnID", l_Ja25JOHN_K_UB);
+	lua_register(L, "UB_GetTexID", l_Ja25TEX_UB);
+	lua_register(L, "UB_GetStogieID", l_Ja25STOGIE_UB);
+	lua_register(L, "UB_GetGastonID", l_Ja25GASTON_UB);
+	lua_register(L, "UB_GetJerryID", l_Ja2JERRY_MILO_UB);
+	lua_register(L, "UB_GetPgmale4ID", l_Ja25PGMALE4_UB);
+	lua_register(L, "UB_GetBettyID", l_Ja25BETTY_UB);
+	lua_register(L, "UB_GetRaulID", l_Ja25RAUL_UB);
+	lua_register(L, "UB_GetMorrisID", l_Ja25MORRIS_UB);
+	lua_register(L, "UB_GetRudyID", l_Ja25RUDY_UB);
+	
+	//old compatibility script variable 
 	lua_register(L, "Ja25JohnKulbaIsInGame", l_Ja25SaveStructJohnKulbaIsInGame);
 	lua_register(L, "Ja25CheckJohnKulbaIsInGame", l_Ja25SaveCheckStructJohnKulbaIsInGame);
 	lua_register(L, "Ja25JohnKulbaInitialSectorY", l_Ja25SaveStructubJohnKulbaInitialSectorY);
@@ -1481,6 +1517,26 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )
 	lua_register(L, "HandlePlayerHittingSwitchToLaunchMissles", l_HandlePlayerHittingSwitchToLaunchMissles);
 	lua_register(L, "HavePersonAtGridnoStop", l_HavePersonAtGridnoStop);
 	
+	//new
+	lua_register(L, "UB_JohnKulbaIsInGame", l_Ja25SaveStructJohnKulbaIsInGame);
+	lua_register(L, "UB_CheckJohnKulbaIsInGame", l_Ja25SaveCheckStructJohnKulbaIsInGame);
+	lua_register(L, "UB_JohnKulbaInitialSectorY", l_Ja25SaveStructubJohnKulbaInitialSectorY);
+	lua_register(L, "UB_JohnKulbaInitialSectorX", l_Ja25SaveStructubJohnKulbaInitialSectorX);	
+	
+	lua_register(L, "UB_SetNumberJa25EnemiesInSurfaceSector", l_SetNumberJa25EnemiesInSurfaceSector);	
+	
+	lua_register(L, "UB_SetNumberOfJa25BloodCatsInSector", l_SetNumberOfJa25BloodCatsInSector);
+
+	lua_register(L, "UB_HasNpcSaidQuoteBefore", l_HasNpcSaidQuoteBefore);	
+	
+	lua_register(L, "UB_ShouldThePlayerStopWhenWalkingOnBiggensActionItem", l_ShouldThePlayerStopWhenWalkingOnBiggensActionItem);	
+	
+	lua_register(L, "UB_HandleSeeingPowerGenFan", l_HandleSeeingPowerGenFan);	
+	lua_register(L, "UB_HandleSwitchToOpenFortifiedDoor", l_HandleSwitchToOpenFortifiedDoor);	
+	lua_register(L, "UB_HandleSeeingFortifiedDoor", l_HandleSeeingFortifiedDoor);	
+	lua_register(L, "UB_HandlePlayerHittingSwitchToLaunchMissles", l_HandlePlayerHittingSwitchToLaunchMissles);
+	lua_register(L, "UB_HavePersonAtGridnoStop", l_HavePersonAtGridnoStop);
+	
 #endif	

 	lua_register(L, "WhoIsThere2", l_WhoIsThere2);	
@@ -1494,7 +1550,10 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )
 	lua_register(L, "SetCurrentWorldSector", l_SetCurrentWorldSector);	

 #ifdef JA2UB
+	//old compatibility script variable 
 	lua_register(L, "EnterTacticalInFinalSector", l_EnterTacticalInFinalSector);	
+	//new
+	lua_register(L, "UB_EnterTacticalInFinalSector", l_EnterTacticalInFinalSector);	
 #endif

 	lua_register(L, "ReStartingGame", l_ReStartingGame);
@@ -1510,6 +1569,7 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )
 	lua_register(L, "InitialProfile", l_InitProfile);
 	
 	#ifdef JA2UB
+	//old scripts
 	lua_register(L, "InitialHeliGridNo1", l_InitMercgridNo0);
 	lua_register(L, "InitialHeliGridNo2", l_InitMercgridNo1);
 	lua_register(L, "InitialHeliGridNo3", l_InitMercgridNo2);
@@ -1528,6 +1588,26 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )
 	lua_register(L, "InitialHeli", l_setInGameHeli );
 	
 	lua_register(L, "InternalLocateGridNo", l_SetInternalLocateGridNo );
+	
+	//new
+	lua_register(L, "UB_InitialHeliGridNo1", l_InitMercgridNo0);
+	lua_register(L, "UB_InitialHeliGridNo2", l_InitMercgridNo1);
+	lua_register(L, "UB_InitialHeliGridNo3", l_InitMercgridNo2);
+	lua_register(L, "UB_InitialHeliGridNo4", l_InitMercgridNo3);
+	lua_register(L, "UB_InitialHeliGridNo5", l_InitMercgridNo4);
+	lua_register(L, "UB_InitialHeliGridNo6", l_InitMercgridNo5);
+	lua_register(L, "UB_InitialHeliGridNo7", l_InitMercgridNo6);
+	
+	lua_register(L, "UB_InitialJerryGridNo", l_InitJerryGridNo);
+	
+	lua_register(L, "UB_InitialLaptopQuest", l_setLaptopQuest);
+	
+	lua_register(L, "UB_InitialHeliCrash", l_setInGameHeliCrash );
+	lua_register(L, "UB_InitialJerryQuotes", l_setJerryQuotes );
+	lua_register(L, "UB_InitialJerry", l_setInJerry );
+	lua_register(L, "UB_InitialHeli", l_setInGameHeli );
+	
+	lua_register(L, "UB_InternalLocateGridNo", l_SetInternalLocateGridNo );
 	#endif
 	
 	//lua_register(L, "ExecuteTacticalTextBox", l_ExecuteTacticalTextBox);
@@ -1843,6 +1923,19 @@ static int l_GuaranteeAtLeastXItemsOfIndex(lua_State *L)
 	return 0;
 }
 	
+static int l_GuaranteeAtMostNumOfItemsForItem(lua_State *L)
+{
+	if ( lua_gettop(L) >= 3 )
+	{
+		UINT8 ubArmsDealer = lua_tointeger(L,1);
+		INT16 sItemIndex = lua_tointeger(L,2);
+		UINT32 ubAtMostNumItems = lua_tointeger(L,3);
+		GuaranteeAtMostNumOfItemsForItem( ubArmsDealer, sItemIndex, ubAtMostNumItems );
+	}
+	
+	return 0;
+}
+	
 static int l_FindUnderGroundSectorVisited(lua_State *L)
 {
 	if ( lua_gettop(L) >= 3 )
@@ -2972,6 +3065,89 @@ int i;
 	return 0;
 }

+static int l_Ja25STOGIE_UB (lua_State *L)
+{
+		lua_pushinteger(L, STOGIE_UB);
+		
+	return 1;
+}
+static int l_Ja25RUDY_UB (lua_State *L)
+{
+		lua_pushinteger(L, RUDY_UB);
+		
+	return 1;
+}
+
+static int l_Ja25MORRIS_UB (lua_State *L)
+{
+		lua_pushinteger(L, MORRIS_UB);
+		
+	return 1;
+}
+
+static int l_Ja25RAUL_UB (lua_State *L)
+{
+		lua_pushinteger(L, RAUL_UB);
+		
+	return 1;
+}
+
+static int l_Ja25BETTY_UB (lua_State *L)
+{
+		lua_pushinteger(L, BETTY_UB);
+		
+	return 1;
+}
+
+static int l_Ja25PGMALE4_UB (lua_State *L)
+{
+		lua_pushinteger(L, PGMALE4_UB);
+		
+	return 1;
+}
+
+static int l_Ja2JERRY_MILO_UB (lua_State *L)
+{
+		lua_pushinteger(L, JERRY_MILO_UB);
+		
+	return 1;
+}
+
+static int l_Ja25GASTON_UB (lua_State *L)
+{
+		lua_pushinteger(L, GASTON_UB);
+		
+	return 1;
+}
+
+static int l_Ja25MANUEL_UB (lua_State *L)
+{
+		lua_pushinteger(L, MANUEL_UB);
+		
+	return 1;
+}
+
+static int l_Ja25BIGGENS_UB (lua_State *L)
+{
+		lua_pushinteger(L, BIGGENS_UB);
+		
+	return 1;
+}
+
+static int l_Ja25JOHN_K_UB (lua_State *L)
+{
+		lua_pushinteger(L, JOHN_K_UB);
+		
+	return 1;
+}
+
+static int l_Ja25TEX_UB (lua_State *L)
+{
+		lua_pushinteger(L, TEX_UB);
+		
+	return 1;
+}
+
 static int l_setLaptopQuest (lua_State *L)
 {
 BOOLEAN set = TRUE;
@@ -3887,6 +4063,31 @@ static int l_FadeOutGameScreen(lua_State *L)
 return 0;
 }

+int l_InitMapProfil (lua_State *L)
+{
+	if ( lua_gettop(L) >= 1 )
+	{	
+	
+	UINT8 prof = lua_tointeger(L,1);
+	INT16 x = lua_tointeger(L,2);
+	INT16 y = lua_tointeger(L,3);
+	INT16 z = lua_tointeger(L,4);
+	UINT32 gridno = lua_tointeger(L,5);
+	
+	gMercProfiles[ prof ].sSectorX = x;
+	gMercProfiles[ prof ].sSectorY = y;
+	gMercProfiles[ prof ].bSectorZ = z;
+	gMercProfiles[ prof ].sGridNo = gridno; 
+	gMercProfiles[ prof ].fUseProfileInsertionInfo = TRUE;
+	gMercProfiles[ prof ].ubStrategicInsertionCode = INSERTION_CODE_GRIDNO;
+	gMercProfiles[ prof ].usStrategicInsertionData = gridno; 
+	
+	}
+	
+	return 0;
+	
+}
+
 static int l_ProfilesStrategicInsertionData (lua_State *L)
 {
 UINT8  n = lua_gettop(L);
@@ -5986,6 +6187,25 @@ SOLDIERTYPE * pSoldier;
 return 0;
 }

+static int l_SetKeySoldier(lua_State *L)
+{
+SOLDIERTYPE * pSoldier;
+
+	if ( lua_gettop(L) >= 2 )
+	{
+		UINT8 ID = lua_tointeger(L,1);
+		BOOLEAN Bool = lua_toboolean(L,2);
+
+		pSoldier = FindSoldierByProfileID( ID, FALSE );
+		if (pSoldier)
+		{
+			pSoldier->flags.bHasKeys = Bool;
+		}
+	}
+return 0;
+}
+
+
 static int l_ActiveTimedBombExists(lua_State *L)
 {
 BOOLEAN Bool;
@@ -63,8 +63,13 @@ void IniGlobalGameSetting(lua_State *L)
 	lua_setglobal(L, "newDIFFICULTY_LEVEL");
 	
 #ifdef JA2UB
+	//Old
 	lua_pushinteger(L, gGameOptions.ubDifficultyLevel);
 	lua_setglobal(L, "difficultyLevel");
+	
+	//new
+	lua_pushinteger(L, gGameOptions.ubDifficultyLevel);
+	lua_setglobal(L, "UB_difficultyLevel");
 #endif

 	// -------------------------------
@@ -115,6 +120,7 @@ void IniGlobalGameSetting(lua_State *L)
 	lua_setglobal(L, "iniDEFAULT_ARRIVAL_SECTOR_X");	
 	
 #ifdef JA2UB
+	//old
 	lua_pushinteger(L, gGameUBOptions.ubEndDefaultSectorX);
 	lua_setglobal(L, "iniDEFAULT_END_SECTOR_X");
 	
@@ -157,6 +163,50 @@ void IniGlobalGameSetting(lua_State *L)
 	
 	lua_pushboolean(L, gGameUBOptions.InGameHeli);
 	lua_setglobal(L, "iniINGAMEHELI");
+	
+	//new
+	lua_pushinteger(L, gGameUBOptions.ubEndDefaultSectorX);
+	lua_setglobal(L, "UB_iniDEFAULT_END_SECTOR_X");
+	
+	lua_pushinteger(L, gGameUBOptions.ubEndDefaultSectorY);
+	lua_setglobal(L, "UB_iniDEFAULT_END_SECTOR_Y");
+	
+	lua_pushinteger(L, gGameUBOptions.ubEndDefaultSectorZ);
+	lua_setglobal(L, "UB_iniDEFAULT_END_SECTOR_Z");
+	
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 0 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO1");
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 1 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO2");
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 2 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO3");
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 3 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO4");
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 4 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO5");
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 5 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO6");
+	lua_pushinteger(L, gGameUBOptions.InitialHeliGridNo[ 6 ]);
+	lua_setglobal(L, "UB_iniINITIALHELIGRIDNO7");
+	
+	lua_pushinteger(L, gGameUBOptions.JerryGridNo);
+	lua_setglobal(L, "UB_iniJERRYGRIDNO");
+	
+	lua_pushboolean(L, gGameUBOptions.LaptopQuestEnabled);
+	lua_setglobal(L, "UB_iniLAPTOP_QUEST");
+	
+	lua_pushboolean(L, gGameUBOptions.InJerry);
+	lua_setglobal(L, "UB_iniJERRY");
+	
+	lua_pushboolean(L, gGameUBOptions.JerryQuotes);
+	lua_setglobal(L, "UB_iniJERRYQUOTES");
+	
+	lua_pushboolean(L, gGameUBOptions.InGameHeliCrash);
+	lua_setglobal(L, "UB_iniINGAMEHELICRASH");
+	
+	
+	lua_pushboolean(L, gGameUBOptions.InGameHeli);
+	lua_setglobal(L, "UB_iniINGAMEHELI");
 #endif
 	
 	//Mod Setting.ini
@@ -489,15 +539,23 @@ void IniGlobalGameSetting(lua_State *L)
 	lua_setglobal(L, "guiCurrentScreen");

 #ifdef JA2UB
+	//old
 	lua_pushboolean(L, gGameUBOptions.fTexAndJohn);
 	lua_setglobal(L, "enabledJohnAndTex");		
 	
 	lua_pushboolean(L, gGameUBOptions.fRandomManuelText);
 	lua_setglobal(L, "RandomManuelText");	
+	
+	//new
+	lua_pushboolean(L, gGameUBOptions.fTexAndJohn);
+	lua_setglobal(L, "UB_enabledJohnAndTex");		
+	
+	lua_pushboolean(L, gGameUBOptions.fRandomManuelText);
+	lua_setglobal(L, "UB_RandomManuelText");	
 #endif
 	
 #ifdef JA2UB
-	//Items
+	//Old
 	lua_pushinteger(L, BARRETT_UB);
 	lua_setglobal(L, "itemBARRETT_UB");	

@@ -543,25 +601,92 @@ void IniGlobalGameSetting(lua_State *L)
 	lua_pushinteger(L, TEX_MOVIE_WILD_EAST);
 	lua_setglobal(L, "itemTEX_MOVIE_WILD_EAST");
 	
-	lua_pushboolean(L, TEX_MOVIE_HAVE_HONDA);
+	lua_pushinteger(L, TEX_MOVIE_HAVE_HONDA);
 	lua_setglobal(L, "itemTEX_MOVIE_HAVE_HONDA");
 	
-	lua_pushboolean(L, LAPTOP_TRANSMITTER);
+	lua_pushinteger(L, LAPTOP_TRANSMITTER);
 	lua_setglobal(L, "itemLAPTOP_TRANSMITTER");
 	
-	lua_pushboolean(L, CHE_GUEVARA_CANTEEN);
+	lua_pushinteger(L, CHE_GUEVARA_CANTEEN);
 	lua_setglobal(L, "itemCHE_GUEVARA_CANTEEN");
 	
-	lua_pushboolean(L, MERC_WRISTWATCH);
+	lua_pushinteger(L, MERC_WRISTWATCH);
 	lua_setglobal(L, "itemMERC_WRISTWATCH");
 	
-	lua_pushboolean(L, SAM_GARVER_COMBAT_KNIFE);
+	lua_pushinteger(L, SAM_GARVER_COMBAT_KNIFE);
 	lua_setglobal(L, "itemSAM_GARVER_COMBAT_KNIFE");
 	
-	lua_pushboolean(L, MERC_UMBRELLA_OLD);
+	lua_pushinteger(L, MERC_UMBRELLA_OLD);
 	lua_setglobal(L, "itemMERC_UMBRELLA_OLD");
 	
-	lua_pushboolean(L, MORRIS_INSTRUCTION_NOTE);
+	lua_pushinteger(L, MORRIS_INSTRUCTION_NOTE);
 	lua_setglobal(L, "itemMORRIS_INSTRUCTION_NOTE");
+	
+	//New
+	lua_pushinteger(L, BARRETT_UB);
+	lua_setglobal(L, "UB_itemBARRETT");	
+
+	lua_pushinteger(L, CALICO_960_UB);
+	lua_setglobal(L, "UB_itemCALICO_960");	
+	
+	lua_pushinteger(L, PSG1_UB);
+	lua_setglobal(L, "UB_itemPSG1");	
+	
+	lua_pushinteger(L, L85_UB);
+	lua_setglobal(L, "UB_itemL85");
+	
+	lua_pushinteger(L, TAR21_UB);
+	lua_setglobal(L, "UB_itemTAR21");
+
+	lua_pushinteger(L, VAL_SILENT_UB);
+	lua_setglobal(L, "UB_itemVAL_SILENT");
+
+	lua_pushinteger(L, MICRO_UZI_UB);
+	lua_setglobal(L, "UB_itemMICRO_UZI");
+	
+	lua_pushinteger(L, CALICO_950_UB);
+	lua_setglobal(L, "UB_itemCALICO_950");
+	
+	lua_pushinteger(L, CALICO_900_UB);
+	lua_setglobal(L, "UB_itemCALICO_900");
+	
+	lua_pushinteger(L, CLIP_CANNON_BALL);
+	lua_setglobal(L, "UB_itemCLIP_CANNON_BALL");
+	
+	lua_pushinteger(L, MERC_UMBRELLA);
+	lua_setglobal(L, "UB_itemMERC_UMBRELLA");
+	
+	lua_pushinteger(L, HAND_CANNON);
+	lua_setglobal(L, "UB_itemHAND_CANNON");
+	
+	lua_pushinteger(L, HARTFORD_6_SHOOTER);
+	lua_setglobal(L, "UB_itemHARTFORD_6_SHOOTER");
+	
+	lua_pushinteger(L, TEX_MOVIE_ATTACK_CLYDESDALES);
+	lua_setglobal(L, "UB_itemTEX_MOVIE_ATTACK_CLYDESDALES");
+	
+	lua_pushinteger(L, TEX_MOVIE_WILD_EAST);
+	lua_setglobal(L, "UB_itemTEX_MOVIE_WILD_EAST");
+	
+	lua_pushinteger(L, TEX_MOVIE_HAVE_HONDA);
+	lua_setglobal(L, "UB_itemTEX_MOVIE_HAVE_HONDA");
+	
+	lua_pushinteger(L, LAPTOP_TRANSMITTER);
+	lua_setglobal(L, "UB_itemLAPTOP_TRANSMITTER");
+	
+	lua_pushinteger(L, CHE_GUEVARA_CANTEEN);
+	lua_setglobal(L, "UB_itemCHE_GUEVARA_CANTEEN");
+	
+	lua_pushinteger(L, MERC_WRISTWATCH);
+	lua_setglobal(L, "UB_itemMERC_WRISTWATCH");
+	
+	lua_pushinteger(L, SAM_GARVER_COMBAT_KNIFE);
+	lua_setglobal(L, "UB_itemSAM_GARVER_COMBAT_KNIFE");
+	
+	lua_pushinteger(L, MERC_UMBRELLA_OLD);
+	lua_setglobal(L, "UB_itemMERC_UMBRELLA_OLD");
+	
+	lua_pushinteger(L, MORRIS_INSTRUCTION_NOTE);
+	lua_setglobal(L, "UB_itemMORRIS_INSTRUCTION_NOTE");
 #endif
-}
+}