From 56cc070c62abc81c20e7c653bc7cf159620b2c46 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 17 Oct 2014 16:26:36 +0000 Subject: [PATCH] Merged from revision: 2169 Externalized (by Buggler): - Kingpin's faction sector and roaming gridno around tony shop if they become hostile - Queen's alternate grid no if basement sector is cleared - Hotkey corrections in LoadScreenHints.xml git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2170 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Mod_Settings.ini | 10 +++++++++- gamedir/Data-1.13/TableData/LoadScreenHints.xml | 4 ++-- gamedir/Data/Mod_Settings.ini | 10 +++++++++- gamedir/Data/TableData/LoadScreenHints.xml | 4 ++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/gamedir/Data-1.13/Mod_Settings.ini b/gamedir/Data-1.13/Mod_Settings.ini index 8947de731..18c659215 100644 --- a/gamedir/Data-1.13/Mod_Settings.ini +++ b/gamedir/Data-1.13/Mod_Settings.ini @@ -123,13 +123,16 @@ ADD_RAT_SECTOR_Z = 0 [San Mona] ;some rooms in the porn shop and Hans' location before moving PORN_SHOP_ROOM_HANS = 49 -HANS_POSTION = 13523 +HANS_POSITION = 13523 PORN_SHOP_ROOM_BRENDA = 47 PORN_SHOP_ROOM_TONY = 50 PORN_SHOP_TONY_SECTOR_X = 5 PORN_SHOP_TONY_SECTOR_Y = 3 PORN_SHOP_TONY_SECTOR_Z = 0 +;Kingpin's faction will roam around the gridno if they become hostile to player +PORN_SHOP_ENTRANCE_GRIDNO = 13531 + ;Kyle Lemmons gets the money for the Leather Shop Deed Quest here KYLE_MONEY_POSITION = 14952 @@ -193,6 +196,11 @@ ADD_IGGY_SECTOR_Z = 0 [Balime] [Meduna] +;Queen's new gridno instead of the map pre-placed gridno if basement sector is cleared +QUEEN_BASEMENT_SECTOR_X = 3 +QUEEN_BASEMENT_SECTOR_Y = 16 +QUEEN_BASEMENT_SECTOR_Z = 1 +QUEEN_ALTERNATE_GRIDNO = 11448 [Chitzena] diff --git a/gamedir/Data-1.13/TableData/LoadScreenHints.xml b/gamedir/Data-1.13/TableData/LoadScreenHints.xml index 4e80cc44e..c338031de 100644 --- a/gamedir/Data-1.13/TableData/LoadScreenHints.xml +++ b/gamedir/Data-1.13/TableData/LoadScreenHints.xml @@ -531,7 +531,7 @@ The other tags determine in what category this hint falls, and will be displayed 101 - Press [G] to toggle on/off the artificial light around the mercs. + Press [CTRL]+[ALT]+[G] to toggle on/off the artificial light around the mercs. 1 @@ -616,7 +616,7 @@ The other tags determine in what category this hint falls, and will be displayed 118 - Press [CTRL]+[SHIFT]+[G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation. + Press [G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation. 1 diff --git a/gamedir/Data/Mod_Settings.ini b/gamedir/Data/Mod_Settings.ini index 8947de731..18c659215 100644 --- a/gamedir/Data/Mod_Settings.ini +++ b/gamedir/Data/Mod_Settings.ini @@ -123,13 +123,16 @@ ADD_RAT_SECTOR_Z = 0 [San Mona] ;some rooms in the porn shop and Hans' location before moving PORN_SHOP_ROOM_HANS = 49 -HANS_POSTION = 13523 +HANS_POSITION = 13523 PORN_SHOP_ROOM_BRENDA = 47 PORN_SHOP_ROOM_TONY = 50 PORN_SHOP_TONY_SECTOR_X = 5 PORN_SHOP_TONY_SECTOR_Y = 3 PORN_SHOP_TONY_SECTOR_Z = 0 +;Kingpin's faction will roam around the gridno if they become hostile to player +PORN_SHOP_ENTRANCE_GRIDNO = 13531 + ;Kyle Lemmons gets the money for the Leather Shop Deed Quest here KYLE_MONEY_POSITION = 14952 @@ -193,6 +196,11 @@ ADD_IGGY_SECTOR_Z = 0 [Balime] [Meduna] +;Queen's new gridno instead of the map pre-placed gridno if basement sector is cleared +QUEEN_BASEMENT_SECTOR_X = 3 +QUEEN_BASEMENT_SECTOR_Y = 16 +QUEEN_BASEMENT_SECTOR_Z = 1 +QUEEN_ALTERNATE_GRIDNO = 11448 [Chitzena] diff --git a/gamedir/Data/TableData/LoadScreenHints.xml b/gamedir/Data/TableData/LoadScreenHints.xml index 4e80cc44e..c338031de 100644 --- a/gamedir/Data/TableData/LoadScreenHints.xml +++ b/gamedir/Data/TableData/LoadScreenHints.xml @@ -531,7 +531,7 @@ The other tags determine in what category this hint falls, and will be displayed 101 - Press [G] to toggle on/off the artificial light around the mercs. + Press [CTRL]+[ALT]+[G] to toggle on/off the artificial light around the mercs. 1 @@ -616,7 +616,7 @@ The other tags determine in what category this hint falls, and will be displayed 118 - Press [CTRL]+[SHIFT]+[G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation. + Press [G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation. 1