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

@@ -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]
 

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
   </LOADSCREENHINT>
   <LOADSCREENHINT>
     <uiIndex>101</uiIndex>
-    <szName>Press [G] to toggle on/off the artificial light around the mercs.</szName>
+    <szName>Press [CTRL]+[ALT]+[G] to toggle on/off the artificial light around the mercs.</szName>
     <keybind>1</keybind>
   </LOADSCREENHINT>
   <LOADSCREENHINT>
@@ -616,7 +616,7 @@ The other tags determine in what category this hint falls, and will be displayed
   </LOADSCREENHINT>
   <LOADSCREENHINT>
     <uiIndex>118</uiIndex>
-    <szName>Press [CTRL]+[SHIFT]+[G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation.</szName>
+    <szName>Press [G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation.</szName>
     <keybind>1</keybind>
   </LOADSCREENHINT>
   <LOADSCREENHINT>

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]
 

gamedir/Data/TableData/LoadScreenHints.xml

@@ -531,7 +531,7 @@ The other tags determine in what category this hint falls, and will be displayed
   </LOADSCREENHINT>
   <LOADSCREENHINT>
     <uiIndex>101</uiIndex>
-    <szName>Press [G] to toggle on/off the artificial light around the mercs.</szName>
+    <szName>Press [CTRL]+[ALT]+[G] to toggle on/off the artificial light around the mercs.</szName>
     <keybind>1</keybind>
   </LOADSCREENHINT>
   <LOADSCREENHINT>
@@ -616,7 +616,7 @@ The other tags determine in what category this hint falls, and will be displayed
   </LOADSCREENHINT>
   <LOADSCREENHINT>
     <uiIndex>118</uiIndex>
-    <szName>Press [CTRL]+[SHIFT]+[G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation.</szName>
+    <szName>Press [G] to toggle mercenary formation move. When ON and you select more then one merc, they will keep their current formation.</szName>
     <keybind>1</keybind>
   </LOADSCREENHINT>
   <LOADSCREENHINT>