From 0c2c5945e2d9098f2fbb757760fb74fec1352d28 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 20 Sep 2013 08:20:39 +0000 Subject: [PATCH] - Externalized Kingpin money sector and Hospital sector (by Buggler) [San Mona] ;Kingpin's private stash. He will come looking for you if stolen KINGPIN_MONEY_SECTOR_X = 5 KINGPIN_MONEY_SECTOR_Y = 4 KINGPIN_MONEY_SECTOR_Z = 1 [Cambria] ;The Hospital sector HOSPITAL_SECTOR_X = 8 HOSPITAL_SECTOR_Y = 6 HOSPITAL_SECTOR_Z = 0 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1780 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Mod_Settings.ini | 13 ++++++++++++- gamedir/Data-1.13/Scripts/StrategicEventHandler.lua | 9 +-------- gamedir/Data-1.13/Scripts/strategicmap.lua | 12 ++---------- gamedir/Data-UB/Scripts/StrategicEventHandler.lua | 9 +-------- gamedir/Data-UB/Scripts/strategicmap.lua | 12 ++---------- gamedir/Data/Mod_Settings.ini | 11 +++++++++++ gamedir/Data/Scripts/StrategicEventHandler.lua | 9 +-------- gamedir/Data/Scripts/strategicmap.lua | 12 ++---------- 8 files changed, 32 insertions(+), 55 deletions(-) diff --git a/gamedir/Data-1.13/Mod_Settings.ini b/gamedir/Data-1.13/Mod_Settings.ini index bdca13cce..47b1e06ee 100644 --- a/gamedir/Data-1.13/Mod_Settings.ini +++ b/gamedir/Data-1.13/Mod_Settings.ini @@ -72,6 +72,11 @@ BROTHEL_DOOR_1 = 11010 BROTHEL_DOOR_2 = 11176 BROTHEL_DOOR_3 = 11177 +;Kingpin's private stash. He will come looking for you if stolen +KINGPIN_MONEY_SECTOR_X = 5 +KINGPIN_MONEY_SECTOR_Y = 4 +KINGPIN_MONEY_SECTOR_Z = 1 + [Gear Dropoff] ;if you tell a leaving merc to drop his gear in Omerta, this is where it'll end up OMERTA_DROPOFF_X = 9 @@ -81,4 +86,10 @@ OMERTA_DROPOFF_GRIDNO = 4868 [Alma] ;location of rocket rifle -ROCKETRIFLE_POSITION = 10472 \ No newline at end of file +ROCKETRIFLE_POSITION = 10472 + +[Cambria] +;The Hospital sector +HOSPITAL_SECTOR_X = 8 +HOSPITAL_SECTOR_Y = 6 +HOSPITAL_SECTOR_Z = 0 \ No newline at end of file diff --git a/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua b/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua index 7dcdebeae..e54816ecf 100644 --- a/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua +++ b/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua @@ -339,13 +339,6 @@ NpcAction = NPC_ACTION_FREE_KIDS = 117, } -Sectors = -{ - HOSPITAL_SECTOR_X = 8, - HOSPITAL_SECTOR_Y = 6, - HOSPITAL_SECTOR_Z = 0, -} - EventTypes = { EVENT_SET_BY_NPC_SYSTEM = 27, @@ -630,7 +623,7 @@ function HandleEarlyMorningEvents() SetFactFalse( Facts.FACT_DAVE_HAS_GAS ) end - if ( gWorldSectorX == Sectors.HOSPITAL_SECTOR_X and gWorldSectorY == Sectors.HOSPITAL_SECTOR_Y and gWorldSectorZ == Sectors.HOSPITAL_SECTOR_Z ) then + if ( gWorldSectorX == iniHOSPITAL_SECTOR_X and gWorldSectorY == iniHOSPITAL_SECTOR_Y and gWorldSectorZ == iniHOSPITAL_SECTOR_Z ) then CheckForMissingHospitalSupplies() end diff --git a/gamedir/Data-1.13/Scripts/strategicmap.lua b/gamedir/Data-1.13/Scripts/strategicmap.lua index 9a0b8aa8e..bdecc704a 100644 --- a/gamedir/Data-1.13/Scripts/strategicmap.lua +++ b/gamedir/Data-1.13/Scripts/strategicmap.lua @@ -79,14 +79,6 @@ Facts = { FACT_ALL_TERRORISTS_KILLED = 156, } -local KINGPIN_MONEY_SECTOR_X = 5 -local KINGPIN_MONEY_SECTOR_Y = 4 -- MAP_ROW_D -local KINGPIN_MONEY_SECTOR_Z = 1 - -local HOSPITAL_SECTOR_X = 8 -local HOSPITAL_SECTOR_Y = 6 -- MAP_ROW_F -local HOSPITAL_SECTOR_Z = 0 - local NOBODY = 254 History = { @@ -226,7 +218,7 @@ end function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) - if ( sOldSectorX == KINGPIN_MONEY_SECTOR_X and sOldSectorY == KINGPIN_MONEY_SECTOR_Y and bOldSectorZ == KINGPIN_MONEY_SECTOR_Z ) then + if ( sOldSectorX == iniKINGPIN_MONEY_SECTOR_X and sOldSectorY == iniKINGPIN_MONEY_SECTOR_Y and bOldSectorZ == iniKINGPIN_MONEY_SECTOR_Z ) then CheckForKingpinsMoneyMissing( true ) end @@ -236,7 +228,7 @@ function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) SetCharacterSectorY(Profil.CONRAD, 0) end - if ( sOldSectorX == HOSPITAL_SECTOR_X and sOldSectorY == HOSPITAL_SECTOR_Y and bOldSectorZ == HOSPITAL_SECTOR_Z ) then + if ( sOldSectorX == iniHOSPITAL_SECTOR_X and sOldSectorY == iniHOSPITAL_SECTOR_Y and bOldSectorZ == iniHOSPITAL_SECTOR_Z ) then CheckForMissingHospitalSupplies() end diff --git a/gamedir/Data-UB/Scripts/StrategicEventHandler.lua b/gamedir/Data-UB/Scripts/StrategicEventHandler.lua index 21fdfb73f..003d37e89 100644 --- a/gamedir/Data-UB/Scripts/StrategicEventHandler.lua +++ b/gamedir/Data-UB/Scripts/StrategicEventHandler.lua @@ -338,13 +338,6 @@ NpcAction = NPC_ACTION_FREE_KIDS = 117, } -Sectors = -{ - HOSPITAL_SECTOR_X = 8, - HOSPITAL_SECTOR_Y = 6, - HOSPITAL_SECTOR_Z = 0, -} - EventTypes = { EVENT_SET_BY_NPC_SYSTEM = 27, @@ -633,7 +626,7 @@ function HandleEarlyMorningEvents() SetFactFalse( Facts.FACT_DAVE_HAS_GAS ) end - if ( gWorldSectorX == Sectors.HOSPITAL_SECTOR_X and gWorldSectorY == Sectors.HOSPITAL_SECTOR_Y and gWorldSectorZ == Sectors.HOSPITAL_SECTOR_Z ) then + if ( gWorldSectorX == iniHOSPITAL_SECTOR_X and gWorldSectorY == iniHOSPITAL_SECTOR_Y and gWorldSectorZ == iniHOSPITAL_SECTOR_Z ) then CheckForMissingHospitalSupplies() end ]] diff --git a/gamedir/Data-UB/Scripts/strategicmap.lua b/gamedir/Data-UB/Scripts/strategicmap.lua index 51ad951ab..2ef7fe7f7 100644 --- a/gamedir/Data-UB/Scripts/strategicmap.lua +++ b/gamedir/Data-UB/Scripts/strategicmap.lua @@ -81,14 +81,6 @@ Facts = { FACT_ALL_TERRORISTS_KILLED = 156, } -local KINGPIN_MONEY_SECTOR_X = 5 -local KINGPIN_MONEY_SECTOR_Y = 4 -- MAP_ROW_D -local KINGPIN_MONEY_SECTOR_Z = 1 - -local HOSPITAL_SECTOR_X = 8 -local HOSPITAL_SECTOR_Y = 6 -- MAP_ROW_F -local HOSPITAL_SECTOR_Z = 0 - local NOBODY = 254 History = { @@ -199,7 +191,7 @@ local pSoldier -- JA2 --[[ - if ( sOldSectorX == KINGPIN_MONEY_SECTOR_X and sOldSectorY == KINGPIN_MONEY_SECTOR_Y and bOldSectorZ == KINGPIN_MONEY_SECTOR_Z ) then + if ( sOldSectorX == iniKINGPIN_MONEY_SECTOR_X and sOldSectorY == iniKINGPIN_MONEY_SECTOR_Y and bOldSectorZ == iniKINGPIN_MONEY_SECTOR_Z ) then CheckForKingpinsMoneyMissing( true ) end @@ -209,7 +201,7 @@ local pSoldier SetCharacterSectorY(Profil.CONRAD, 0) end - if ( sOldSectorX == HOSPITAL_SECTOR_X and sOldSectorY == HOSPITAL_SECTOR_Y and bOldSectorZ == HOSPITAL_SECTOR_Z ) then + if ( sOldSectorX == iniHOSPITAL_SECTOR_X and sOldSectorY == iniHOSPITAL_SECTOR_Y and bOldSectorZ == iniHOSPITAL_SECTOR_Z ) then CheckForMissingHospitalSupplies() end diff --git a/gamedir/Data/Mod_Settings.ini b/gamedir/Data/Mod_Settings.ini index a14bed895..6982e7947 100644 --- a/gamedir/Data/Mod_Settings.ini +++ b/gamedir/Data/Mod_Settings.ini @@ -72,9 +72,20 @@ BROTHEL_DOOR_1 = 11010 BROTHEL_DOOR_2 = 11176 BROTHEL_DOOR_3 = 11177 +;Kingpin's private stash. He will come looking for you if stolen +KINGPIN_MONEY_SECTOR_X = 5 +KINGPIN_MONEY_SECTOR_Y = 4 +KINGPIN_MONEY_SECTOR_Z = 1 + [Gear Dropoff] ;if you tell a leaving merc to drop his gear in Omerta, this is where it'll end up OMERTA_DROPOFF_X = 9 OMERTA_DROPOFF_Y = 1 OMERTA_DROPOFF_Z = 0 OMERTA_DROPOFF_GRIDNO = 4868 + +[Cambria] +;The Hospital sector +HOSPITAL_SECTOR_X = 8 +HOSPITAL_SECTOR_Y = 6 +HOSPITAL_SECTOR_Z = 0 diff --git a/gamedir/Data/Scripts/StrategicEventHandler.lua b/gamedir/Data/Scripts/StrategicEventHandler.lua index 7dcdebeae..e54816ecf 100644 --- a/gamedir/Data/Scripts/StrategicEventHandler.lua +++ b/gamedir/Data/Scripts/StrategicEventHandler.lua @@ -339,13 +339,6 @@ NpcAction = NPC_ACTION_FREE_KIDS = 117, } -Sectors = -{ - HOSPITAL_SECTOR_X = 8, - HOSPITAL_SECTOR_Y = 6, - HOSPITAL_SECTOR_Z = 0, -} - EventTypes = { EVENT_SET_BY_NPC_SYSTEM = 27, @@ -630,7 +623,7 @@ function HandleEarlyMorningEvents() SetFactFalse( Facts.FACT_DAVE_HAS_GAS ) end - if ( gWorldSectorX == Sectors.HOSPITAL_SECTOR_X and gWorldSectorY == Sectors.HOSPITAL_SECTOR_Y and gWorldSectorZ == Sectors.HOSPITAL_SECTOR_Z ) then + if ( gWorldSectorX == iniHOSPITAL_SECTOR_X and gWorldSectorY == iniHOSPITAL_SECTOR_Y and gWorldSectorZ == iniHOSPITAL_SECTOR_Z ) then CheckForMissingHospitalSupplies() end diff --git a/gamedir/Data/Scripts/strategicmap.lua b/gamedir/Data/Scripts/strategicmap.lua index 9a0b8aa8e..bdecc704a 100644 --- a/gamedir/Data/Scripts/strategicmap.lua +++ b/gamedir/Data/Scripts/strategicmap.lua @@ -79,14 +79,6 @@ Facts = { FACT_ALL_TERRORISTS_KILLED = 156, } -local KINGPIN_MONEY_SECTOR_X = 5 -local KINGPIN_MONEY_SECTOR_Y = 4 -- MAP_ROW_D -local KINGPIN_MONEY_SECTOR_Z = 1 - -local HOSPITAL_SECTOR_X = 8 -local HOSPITAL_SECTOR_Y = 6 -- MAP_ROW_F -local HOSPITAL_SECTOR_Z = 0 - local NOBODY = 254 History = { @@ -226,7 +218,7 @@ end function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) - if ( sOldSectorX == KINGPIN_MONEY_SECTOR_X and sOldSectorY == KINGPIN_MONEY_SECTOR_Y and bOldSectorZ == KINGPIN_MONEY_SECTOR_Z ) then + if ( sOldSectorX == iniKINGPIN_MONEY_SECTOR_X and sOldSectorY == iniKINGPIN_MONEY_SECTOR_Y and bOldSectorZ == iniKINGPIN_MONEY_SECTOR_Z ) then CheckForKingpinsMoneyMissing( true ) end @@ -236,7 +228,7 @@ function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) SetCharacterSectorY(Profil.CONRAD, 0) end - if ( sOldSectorX == HOSPITAL_SECTOR_X and sOldSectorY == HOSPITAL_SECTOR_Y and bOldSectorZ == HOSPITAL_SECTOR_Z ) then + if ( sOldSectorX == iniHOSPITAL_SECTOR_X and sOldSectorY == iniHOSPITAL_SECTOR_Y and bOldSectorZ == iniHOSPITAL_SECTOR_Z ) then CheckForMissingHospitalSupplies() end