1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Externalized Kingpin money sector and Hospital sector (by Buggler)

Browse Source 
[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
This commit is contained in:
Wanne
2013-09-20 08:20:39 +00:00
parent e4d62464dd
commit 0c2c5945e2
8 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Mod_Settings.ini
+11
View File
@@ -72,6 +72,11 @@ BROTHEL_DOOR_1 = 11010
BROTHEL_DOOR_2 = 11176 BROTHEL_DOOR_2 = 11176
BROTHEL_DOOR_3 = 11177 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] [Gear Dropoff]
;if you tell a leaving merc to drop his gear in Omerta, this is where it'll end up ;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_X = 9
@@ -82,3 +87,9 @@ OMERTA_DROPOFF_GRIDNO = 4868
[Alma] [Alma]
;location of rocket rifle ;location of rocket rifle
ROCKETRIFLE_POSITION = 10472 ROCKETRIFLE_POSITION = 10472
[Cambria]
;The Hospital sector
HOSPITAL_SECTOR_X = 8
HOSPITAL_SECTOR_Y = 6
HOSPITAL_SECTOR_Z = 0
gamedir/Data-1.13/Scripts/StrategicEventHandler.lua
+1 -8
View File
@@ -339,13 +339,6 @@ NpcAction =
NPC_ACTION_FREE_KIDS = 117, NPC_ACTION_FREE_KIDS = 117,
} }
Sectors =
{
HOSPITAL_SECTOR_X = 8,
HOSPITAL_SECTOR_Y = 6,
HOSPITAL_SECTOR_Z = 0,
}
EventTypes = EventTypes =
{ {
EVENT_SET_BY_NPC_SYSTEM = 27, EVENT_SET_BY_NPC_SYSTEM = 27,
@@ -630,7 +623,7 @@ function HandleEarlyMorningEvents()
SetFactFalse( Facts.FACT_DAVE_HAS_GAS ) SetFactFalse( Facts.FACT_DAVE_HAS_GAS )
end 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() CheckForMissingHospitalSupplies()
end end
gamedir/Data-1.13/Scripts/strategicmap.lua
+2 -10
View File
@@ -79,14 +79,6 @@ Facts = {
FACT_ALL_TERRORISTS_KILLED = 156, 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 local NOBODY = 254
History = { History = {
@@ -226,7 +218,7 @@ end
function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) 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 ) CheckForKingpinsMoneyMissing( true )
end end
@@ -236,7 +228,7 @@ function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ )
SetCharacterSectorY(Profil.CONRAD, 0) SetCharacterSectorY(Profil.CONRAD, 0)
end 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() CheckForMissingHospitalSupplies()
end end
gamedir/Data-UB/Scripts/StrategicEventHandler.lua
+1 -8
View File
@@ -338,13 +338,6 @@ NpcAction =
NPC_ACTION_FREE_KIDS = 117, NPC_ACTION_FREE_KIDS = 117,
} }
Sectors =
{
HOSPITAL_SECTOR_X = 8,
HOSPITAL_SECTOR_Y = 6,
HOSPITAL_SECTOR_Z = 0,
}
EventTypes = EventTypes =
{ {
EVENT_SET_BY_NPC_SYSTEM = 27, EVENT_SET_BY_NPC_SYSTEM = 27,
@@ -633,7 +626,7 @@ function HandleEarlyMorningEvents()
SetFactFalse( Facts.FACT_DAVE_HAS_GAS ) SetFactFalse( Facts.FACT_DAVE_HAS_GAS )
end 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() CheckForMissingHospitalSupplies()
end end
]] ]]
gamedir/Data-UB/Scripts/strategicmap.lua
+2 -10
View File
@@ -81,14 +81,6 @@ Facts = {
FACT_ALL_TERRORISTS_KILLED = 156, 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 local NOBODY = 254
History = { History = {
@@ -199,7 +191,7 @@ local pSoldier
-- JA2 -- 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 ) CheckForKingpinsMoneyMissing( true )
end end
@@ -209,7 +201,7 @@ local pSoldier
SetCharacterSectorY(Profil.CONRAD, 0) SetCharacterSectorY(Profil.CONRAD, 0)
end 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() CheckForMissingHospitalSupplies()
end end
gamedir/Data/Mod_Settings.ini
+11
View File
@@ -72,9 +72,20 @@ BROTHEL_DOOR_1 = 11010
BROTHEL_DOOR_2 = 11176 BROTHEL_DOOR_2 = 11176
BROTHEL_DOOR_3 = 11177 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] [Gear Dropoff]
;if you tell a leaving merc to drop his gear in Omerta, this is where it'll end up ;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_X = 9
OMERTA_DROPOFF_Y = 1 OMERTA_DROPOFF_Y = 1
OMERTA_DROPOFF_Z = 0 OMERTA_DROPOFF_Z = 0
OMERTA_DROPOFF_GRIDNO = 4868 OMERTA_DROPOFF_GRIDNO = 4868
[Cambria]
;The Hospital sector
HOSPITAL_SECTOR_X = 8
HOSPITAL_SECTOR_Y = 6
HOSPITAL_SECTOR_Z = 0
gamedir/Data/Scripts/StrategicEventHandler.lua
+1 -8
View File
@@ -339,13 +339,6 @@ NpcAction =
NPC_ACTION_FREE_KIDS = 117, NPC_ACTION_FREE_KIDS = 117,
} }
Sectors =
{
HOSPITAL_SECTOR_X = 8,
HOSPITAL_SECTOR_Y = 6,
HOSPITAL_SECTOR_Z = 0,
}
EventTypes = EventTypes =
{ {
EVENT_SET_BY_NPC_SYSTEM = 27, EVENT_SET_BY_NPC_SYSTEM = 27,
@@ -630,7 +623,7 @@ function HandleEarlyMorningEvents()
SetFactFalse( Facts.FACT_DAVE_HAS_GAS ) SetFactFalse( Facts.FACT_DAVE_HAS_GAS )
end 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() CheckForMissingHospitalSupplies()
end end
gamedir/Data/Scripts/strategicmap.lua
+2 -10
View File
@@ -79,14 +79,6 @@ Facts = {
FACT_ALL_TERRORISTS_KILLED = 156, 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 local NOBODY = 254
History = { History = {
@@ -226,7 +218,7 @@ end
function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ ) 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 ) CheckForKingpinsMoneyMissing( true )
end end
@@ -236,7 +228,7 @@ function HandleQuestCodeOnSectorExit( sOldSectorX, sOldSectorY, bOldSectorZ )
SetCharacterSectorY(Profil.CONRAD, 0) SetCharacterSectorY(Profil.CONRAD, 0)
end 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() CheckForMissingHospitalSupplies()
end end