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

Externalized (by Buggler)

Browse Source 
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1822 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
2013-10-14 11:57:51 +00:00
parent eabb415ee1
commit bcc9d88efd
6 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Mod_Settings.ini
+29 -5
View File
@@ -53,10 +53,10 @@ OMERTA_DROPOFF_GRIDNO = 4868
[Omerta] [Omerta]
[Drassen] [Drassen]
;this will make John & Mary disappear on quest completion. Use different values here from LUA script for them to remain in sector ;meet Carmen in sector for reward collection
JOHN_UNESCORT_SECTOR_X = 13 CARMEN_GIVE_REWARD_SECTOR_X = 13
JOHN_UNESCORT_SECTOR_Y = 2 CARMEN_GIVE_REWARD_SECTOR_Y = 3
JOHN_UNESCORT_SECTOR_Z = 0 CARMEN_GIVE_REWARD_SECTOR_Z = 0
[Alma] [Alma]
;location of rocket rifle ;location of rocket rifle
@@ -97,6 +97,9 @@ PORN_SHOP_ROOM_HANS = 49
HANS_POSTION = 13523 HANS_POSTION = 13523
PORN_SHOP_ROOM_BRENDA = 47 PORN_SHOP_ROOM_BRENDA = 47
PORN_SHOP_ROOM_TONY = 50 PORN_SHOP_ROOM_TONY = 50
PORN_SHOP_TONY_SECTOR_X = 5
PORN_SHOP_TONY_SECTOR_Y = 3
PORN_SHOP_TONY_SECTOR_Z = 0
;Kyle Lemmons gets the money for the Leather Shop Deed Quest here ;Kyle Lemmons gets the money for the Leather Shop Deed Quest here
KYLE_MONEY_POSITION = 14952 KYLE_MONEY_POSITION = 14952
@@ -104,6 +107,10 @@ KYLE_MONEY_POSITION = 14952
;Angel's leathershop, escort Maria to this room ;Angel's leathershop, escort Maria to this room
ANGELS_LEATHERSHOP = 2 ANGELS_LEATHERSHOP = 2
;brothel sector
BROTHEL_SECTOR_X = 5
BROTHEL_SECTOR_Y = 3
;doors to the girl's rooms in the brothel ;doors to the girl's rooms in the brothel
DOOR_TO_BAMBIS_ROOM = 12290 DOOR_TO_BAMBIS_ROOM = 12290
DOOR_TO_CARLAS_ROOM = 13413 DOOR_TO_CARLAS_ROOM = 13413
@@ -120,6 +127,13 @@ BROTHEL_DOOR_1 = 11010
BROTHEL_DOOR_2 = 11176 BROTHEL_DOOR_2 = 11176
BROTHEL_DOOR_3 = 11177 BROTHEL_DOOR_3 = 11177
;Kingpin residing location and room no to call him over for boxing match
KINGPIN_HOUSE_SECTOR_X = 5
KINGPIN_HOUSE_SECTOR_Y = 4
KINGPIN_HOUSE_SECTOR_Z = 0
FIRST_ROOM_IN_KINGPIN_HOUSE = 30
LAST_ROOM_IN_KINGPIN_HOUSE = 39
;Kingpin's private stash. He will come looking for you if stolen ;Kingpin's private stash. He will come looking for you if stolen
KINGPIN_MONEY_SECTOR_X = 5 KINGPIN_MONEY_SECTOR_X = 5
KINGPIN_MONEY_SECTOR_Y = 4 KINGPIN_MONEY_SECTOR_Y = 4
@@ -192,4 +206,14 @@ MEDUNA_OUTSKIRTS_ROW_Y = 13
;column sectors to trigger meduna outskirts meanwhile ;column sectors to trigger meduna outskirts meanwhile
MEDUNA_OUTSKIRTS_COL_X = 6 MEDUNA_OUTSKIRTS_COL_X = 6
MEDUNA_OUTSKIRTS_COL_MIN_Y = 14 MEDUNA_OUTSKIRTS_COL_MIN_Y = 14
MEDUNA_OUTSKIRTS_COL_MAX_Y = 14 MEDUNA_OUTSKIRTS_COL_MAX_Y = 14
;add Madlab to location after scientist AWOL meanwhile scene. Set to (0, 0) if unused and LUA script to random location
ADD_MADLAB_SECTOR_1_X = 7
ADD_MADLAB_SECTOR_1_Y = 8
ADD_MADLAB_SECTOR_2_X = 16
ADD_MADLAB_SECTOR_2_Y = 8
ADD_MADLAB_SECTOR_3_X = 11
ADD_MADLAB_SECTOR_3_Y = 9
ADD_MADLAB_SECTOR_4_X = 4
ADD_MADLAB_SECTOR_4_Y = 5
gamedir/Data-1.13/Scripts/GameInit.lua
+5 -5
View File
@@ -417,22 +417,22 @@ function InitNPCs()
i = math.random(1, 4) i = math.random(1, 4)
if i == 1 then if i == 1 then
--H7 --H7
AddAltSectorNew( 7, SectorY.MAP_ROW_H ) AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
elseif i == 2 then elseif i == 2 then
--H16 --H16
AddAltSectorNew( 16, SectorY.MAP_ROW_H ) AddAltSectorNew( iniADD_MADLAB_SECTOR_2_X, iniADD_MADLAB_SECTOR_2_Y )
elseif i == 3 then elseif i == 3 then
--I11 --I11
AddAltSectorNew( 11, SectorY.MAP_ROW_I ) AddAltSectorNew( iniADD_MADLAB_SECTOR_3_X, iniADD_MADLAB_SECTOR_3_Y )
elseif i == 4 then elseif i == 4 then
--E4 --E4
AddAltSectorNew( 4, SectorY.MAP_ROW_E ) AddAltSectorNew( iniADD_MADLAB_SECTOR_4_X, iniADD_MADLAB_SECTOR_4_Y )
end end
end end
if is_networked == 1 then if is_networked == 1 then
--H7 --H7
AddAltSectorNew( 7, SectorY.MAP_ROW_H ) AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
end end
-- Add Micky in random location -- Add Micky in random location
gamedir/Data-1.13/Scripts/StrategicEventHandler.lua
+18
View File
@@ -260,6 +260,8 @@ Profil =
CONRAD = 70, CONRAD = 70,
KINGPIN = 86, KINGPIN = 86,
MADAME = 107, MADAME = 107,
JOHN = 118,
MARY = 119,
} }
Facts = Facts =
@@ -555,6 +557,22 @@ function HandleEarlyMorningEvents()
SetCharacterSectorZ (Profil.RAT,0) SetCharacterSectorZ (Profil.RAT,0)
end end
-- Does John leave country after quest completion?
JOHNid,JOHNx,JOHNy,JOHNz = CheckNPCinSector(Profil.JOHN)
if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and JOHNx == 13 and JOHNy == 2 and JOHNz == 0 ) then
SetCharacterSectorX (Profil.JOHN,0)
SetCharacterSectorY (Profil.JOHN,0)
SetCharacterSectorZ (Profil.JOHN,0)
end
-- Does Mary leave country after quest completion?
MARYid,MARYx,MARYy,MARYz = CheckNPCinSector(Profil.MARY)
if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and MARYx == 13 and MARYy == 2 and MARYz == 0 ) then
SetCharacterSectorX (Profil.MARY,0)
SetCharacterSectorY (Profil.MARY,0)
SetCharacterSectorZ (Profil.MARY,0)
end
-- Empty money from pockets of Vince 69, Willis 80, and Jenny 132 -- Empty money from pockets of Vince 69, Willis 80, and Jenny 132
SetMoneyInSoldierProfile( Profil.VINCE, 0 ) SetMoneyInSoldierProfile( Profil.VINCE, 0 )
SetMoneyInSoldierProfile( Profil.STEVE, 0 ) SetMoneyInSoldierProfile( Profil.STEVE, 0 )
gamedir/Data/Mod_Settings.ini
+29 -5
View File
@@ -53,10 +53,10 @@ OMERTA_DROPOFF_GRIDNO = 4868
[Omerta] [Omerta]
[Drassen] [Drassen]
;this will make John & Mary disappear on quest completion. Use different values here from LUA script for them to remain in sector ;meet Carmen in sector for reward collection
JOHN_UNESCORT_SECTOR_X = 13 CARMEN_GIVE_REWARD_SECTOR_X = 13
JOHN_UNESCORT_SECTOR_Y = 2 CARMEN_GIVE_REWARD_SECTOR_Y = 3
JOHN_UNESCORT_SECTOR_Z = 0 CARMEN_GIVE_REWARD_SECTOR_Z = 0
[Alma] [Alma]
;location of rocket rifle ;location of rocket rifle
@@ -97,6 +97,9 @@ PORN_SHOP_ROOM_HANS = 49
HANS_POSTION = 13523 HANS_POSTION = 13523
PORN_SHOP_ROOM_BRENDA = 47 PORN_SHOP_ROOM_BRENDA = 47
PORN_SHOP_ROOM_TONY = 50 PORN_SHOP_ROOM_TONY = 50
PORN_SHOP_TONY_SECTOR_X = 5
PORN_SHOP_TONY_SECTOR_Y = 3
PORN_SHOP_TONY_SECTOR_Z = 0
;Kyle Lemmons gets the money for the Leather Shop Deed Quest here ;Kyle Lemmons gets the money for the Leather Shop Deed Quest here
KYLE_MONEY_POSITION = 14952 KYLE_MONEY_POSITION = 14952
@@ -104,6 +107,10 @@ KYLE_MONEY_POSITION = 14952
;Angel's leathershop, escort Maria to this room ;Angel's leathershop, escort Maria to this room
ANGELS_LEATHERSHOP = 2 ANGELS_LEATHERSHOP = 2
;brothel sector
BROTHEL_SECTOR_X = 5
BROTHEL_SECTOR_Y = 3
;doors to the girl's rooms in the brothel ;doors to the girl's rooms in the brothel
DOOR_TO_BAMBIS_ROOM = 12290 DOOR_TO_BAMBIS_ROOM = 12290
DOOR_TO_CARLAS_ROOM = 13413 DOOR_TO_CARLAS_ROOM = 13413
@@ -120,6 +127,13 @@ BROTHEL_DOOR_1 = 11010
BROTHEL_DOOR_2 = 11176 BROTHEL_DOOR_2 = 11176
BROTHEL_DOOR_3 = 11177 BROTHEL_DOOR_3 = 11177
;Kingpin residing location and room no to call him over for boxing match
KINGPIN_HOUSE_SECTOR_X = 5
KINGPIN_HOUSE_SECTOR_Y = 4
KINGPIN_HOUSE_SECTOR_Z = 0
FIRST_ROOM_IN_KINGPIN_HOUSE = 30
LAST_ROOM_IN_KINGPIN_HOUSE = 39
;Kingpin's private stash. He will come looking for you if stolen ;Kingpin's private stash. He will come looking for you if stolen
KINGPIN_MONEY_SECTOR_X = 5 KINGPIN_MONEY_SECTOR_X = 5
KINGPIN_MONEY_SECTOR_Y = 4 KINGPIN_MONEY_SECTOR_Y = 4
@@ -192,4 +206,14 @@ MEDUNA_OUTSKIRTS_ROW_Y = 13
;column sectors to trigger meduna outskirts meanwhile ;column sectors to trigger meduna outskirts meanwhile
MEDUNA_OUTSKIRTS_COL_X = 6 MEDUNA_OUTSKIRTS_COL_X = 6
MEDUNA_OUTSKIRTS_COL_MIN_Y = 14 MEDUNA_OUTSKIRTS_COL_MIN_Y = 14
MEDUNA_OUTSKIRTS_COL_MAX_Y = 14 MEDUNA_OUTSKIRTS_COL_MAX_Y = 14
;add Madlab to location after scientist AWOL meanwhile scene. Set to (0, 0) if unused and LUA script to random location
ADD_MADLAB_SECTOR_1_X = 7
ADD_MADLAB_SECTOR_1_Y = 8
ADD_MADLAB_SECTOR_2_X = 16
ADD_MADLAB_SECTOR_2_Y = 8
ADD_MADLAB_SECTOR_3_X = 11
ADD_MADLAB_SECTOR_3_Y = 9
ADD_MADLAB_SECTOR_4_X = 4
ADD_MADLAB_SECTOR_4_Y = 5
gamedir/Data/Scripts/GameInit.lua
+5 -5
View File
@@ -417,22 +417,22 @@ function InitNPCs()
i = math.random(1, 4) i = math.random(1, 4)
if i == 1 then if i == 1 then
--H7 --H7
AddAltSectorNew( 7, SectorY.MAP_ROW_H ) AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
elseif i == 2 then elseif i == 2 then
--H16 --H16
AddAltSectorNew( 16, SectorY.MAP_ROW_H ) AddAltSectorNew( iniADD_MADLAB_SECTOR_2_X, iniADD_MADLAB_SECTOR_2_Y )
elseif i == 3 then elseif i == 3 then
--I11 --I11
AddAltSectorNew( 11, SectorY.MAP_ROW_I ) AddAltSectorNew( iniADD_MADLAB_SECTOR_3_X, iniADD_MADLAB_SECTOR_3_Y )
elseif i == 4 then elseif i == 4 then
--E4 --E4
AddAltSectorNew( 4, SectorY.MAP_ROW_E ) AddAltSectorNew( iniADD_MADLAB_SECTOR_4_X, iniADD_MADLAB_SECTOR_4_Y )
end end
end end
if is_networked == 1 then if is_networked == 1 then
--H7 --H7
AddAltSectorNew( 7, SectorY.MAP_ROW_H ) AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
end end
-- Add Micky in random location -- Add Micky in random location
gamedir/Data/Scripts/StrategicEventHandler.lua
+18
View File
@@ -260,6 +260,8 @@ Profil =
CONRAD = 70, CONRAD = 70,
KINGPIN = 86, KINGPIN = 86,
MADAME = 107, MADAME = 107,
JOHN = 118,
MARY = 119,
} }
Facts = Facts =
@@ -555,6 +557,22 @@ function HandleEarlyMorningEvents()
SetCharacterSectorZ (Profil.RAT,0) SetCharacterSectorZ (Profil.RAT,0)
end end
-- Does John leave country after quest completion?
JOHNid,JOHNx,JOHNy,JOHNz = CheckNPCinSector(Profil.JOHN)
if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and JOHNx == 13 and JOHNy == 2 and JOHNz == 0 ) then
SetCharacterSectorX (Profil.JOHN,0)
SetCharacterSectorY (Profil.JOHN,0)
SetCharacterSectorZ (Profil.JOHN,0)
end
-- Does Mary leave country after quest completion?
MARYid,MARYx,MARYy,MARYz = CheckNPCinSector(Profil.MARY)
if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and MARYx == 13 and MARYy == 2 and MARYz == 0 ) then
SetCharacterSectorX (Profil.MARY,0)
SetCharacterSectorY (Profil.MARY,0)
SetCharacterSectorZ (Profil.MARY,0)
end
-- Empty money from pockets of Vince 69, Willis 80, and Jenny 132 -- Empty money from pockets of Vince 69, Willis 80, and Jenny 132
SetMoneyInSoldierProfile( Profil.VINCE, 0 ) SetMoneyInSoldierProfile( Profil.VINCE, 0 )
SetMoneyInSoldierProfile( Profil.STEVE, 0 ) SetMoneyInSoldierProfile( Profil.STEVE, 0 )