1dot13/gamedir
1
0
Fork 0
mirror of https://github.com/1dot13/gamedir.git synced 2026-07-22 13:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

UB 1.13 Fixes (by Jazz)

Browse Source 
- Externalized more hardcoded grid numbers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2298 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
2016-03-08 21:07:09 +00:00
parent 6f2e08ad99
commit be90711020
4 changed files with 233 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data-UB/AddOns/Data-UB-1.13/UB_Options.INI
+121 -10
View File
@@ -31,12 +31,110 @@ BORDER_ITEM = TRUE
EVENT_ATTACK_INITIAL_SECTOR_IF_PLAYER_STILL_THERE = TRUE
;------------------------------------------------------------------------------------------------------------------------------
; HandlePlayerSayingQuoteWhenFailingToOpenGateInTunnel
; Handle player saying quote when failing to open gate in tunnel (sector K14-1)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_OPEN_GATE_IN_TUNNEL_X = 14
SECTOR_OPEN_GATE_IN_TUNNEL_Y = 11
SECTOR_OPEN_GATE_IN_TUNNEL_Z = 1
;------------------------------------------------------------------------------------------------------------------------------
; Handle player team quotes when entering Manuel sector (Sector I9)
;------------------------------------------------------------------------------------------------------------------------------
I9_SECTOR_PLAYER_QUOTE_X = 9
I9_SECTOR_PLAYER_QUOTE_Y = 9
I9_SECTOR_PLAYER_QUOTE_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Handle player team quotes when entering Manuel sector (Sector H10)
;------------------------------------------------------------------------------------------------------------------------------
H10_SECTOR_PLAYER_QUOTE_X = 10
H10_SECTOR_PLAYER_QUOTE_Y = 8
H10_SECTOR_PLAYER_QUOTE_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; this is the guardpost H9
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_GUARDPOST_X = 9
SECTOR_GUARDPOST_Y = 8
SECTOR_GUARDPOST_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Add some money to the location (Sector H9)
;------------------------------------------------------------------------------------------------------------------------------
H9_MONEY_GRIDNO = 9026
H9_MONEY_EASY = 15000
H9_MONEY_MEDIUM = 10000
H9_MONEY_HARD = 7000
;------------------------------------------------------------------------------------------------------------------------------
; this is the First sector of the town (Sector I10)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_TOWN1_X = 10
SECTOR_TOWN1_Y = 9
SECTOR_TOWN1_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Add some money to the location (Sector I10)
;------------------------------------------------------------------------------------------------------------------------------
I10_MONEY_GRIDNO_1 = 11894
I10_MONEY_EASY_1 = 8000
I10_MONEY_MEDIUM_1 = 4000
I10_MONEY_HARD_1 = 3000
I10_MONEY_GRIDNO_2 = 7906
I10_MONEY_EASY_2 = 12000
I10_MONEY_MEDIUM_2 = 6000
I10_MONEY_HARD_2 = 5000
;------------------------------------------------------------------------------------------------------------------------------
; this is the sector south of the town J11
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_TOWN2_X = 11
SECTOR_TOWN2_Y = 10
SECTOR_TOWN2_Z = 0
;Move enemy from gridno to roof gridno
TOWN2_FROM_GRIDNO_1 = 15446
TOWN2_TO_ROOF_GRIDNO_1 = 13993
;Move enemy from gridno to roof gridno
TOWN2_FROM_GRIDNO_2 = 15436
TOWN2_TO_ROOF_GRIDNO_2 = 14006
;------------------------------------------------------------------------------------------------------------------------------
; this is the sector south of the town (Sector H11)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_TOWN3_X = 11
SECTOR_TOWN3_Y = 8
SECTOR_TOWN3_Z = 0
;Move enemy from gridno to roof gridno
TOWN3_FROM_GRIDNO_1 = 8711
TOWN3_TO_ROOF_GRIDNO_1 = 5521
;------------------------------------------------------------------------------------------------------------------------------
; Handle seeing fortifiedd door Sector (Sector K15-1)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_DOOR_IN_TUNNEL_X = 15
SECTOR_DOOR_IN_TUNNEL_Y = 11
SECTOR_DOOR_IN_TUNNEL_Z = 1
;if the fortified door should be open
SECTOR_DOOR_IN_TUNNEL_GRIDNO = 11419
;------------------------------------------------------------------------------------------------------------------------------
; After blowing up the fan in the J13, the enemy is alerted, and the underground sectors (J14-1 and K14-1)
; will be added to enemy units.
@@ -116,9 +214,11 @@ JERRY = TRUE
;------------------------------------------------------------------------------------------------------------------------------
JERRY_GRIDNO = 15109
;------------------------------------------------------------------------------------------------------------------------------
; Launch missles sector L15-3
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_LAUNCH_MISSLES_X = 15
SECTOR_LAUNCH_MISSLES_Y = 12
SECTOR_LAUNCH_MISSLES_Z = 3
@@ -142,24 +242,28 @@ SWITCH_TO_LAUNCH_MISSLES_GRIDNO_2 = 15708
RADIO_LOCATORS_GRIDNO_1 = 15070
RADIO_LOCATORS_GRIDNO_2 = 14744
;------------------------------------------------------------------------------------------------------------------------------
; J13-0 HandleFanStartingAtEndOfCombat
;------------------------------------------------------------------------------------------------------------------------------
POWERGEN_SECTOR_X = 13
POWERGEN_SECTOR_Z = 10
POWERGEN_SECTOR_Y = 0
;------------------------------------------------------------------------------------------------------------------------------
; Miejsca przy wentylatorze (sektor J13), pod którymi podkładam ładunki wybuchowe.
; Handle fan starting at end of combat (Sector J13)
;------------------------------------------------------------------------------------------------------------------------------
POWERGEN_SECTOR_X = 13
POWERGEN_SECTOR_Y = 10
POWERGEN_SECTOR_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; The tactical grid numbers of the fan tiles (default sector J13)
;------------------------------------------------------------------------------------------------------------------------------
POWERGEN_SECTOR_GRIDNO_1 = 15100
POWERGEN_SECTOR_GRIDNO_2 = 12220
POWERGEN_SECTOR_GRIDNO_3 = 14155
POWERGEN_SECTOR_GRIDNO_4 = 13980
;------------------------------------------------------------------------------------------------------------------------------
; J14-1. Add Exit Grid For Fan To PowerGen Sector
; Add exit grid for fan to power gen Sector (J14-1)
;------------------------------------------------------------------------------------------------------------------------------
EXIT_FOR_FAN_TO_POWER_GEN_SECTOR_X = 14
EXIT_FOR_FAN_TO_POWER_GEN_SECTOR_Y = 10
EXIT_FOR_FAN_TO_POWER_GEN_SECTOR_Z = 1
@@ -190,7 +294,7 @@ START_FANBACKUP_AGAIN_GRIDNO = 10980
STOP_POWERGEN_FAN_GRIDNO = 10980
;------------------------------------------------------------------------------------------------------------------------------
; The tactical grid numbers of the fan tiles (default sector J13)
; Miejsca przy wentylatorze (sektor J13), pod którymi podkładam ładunki wybuchowe.
;------------------------------------------------------------------------------------------------------------------------------
FAN_GRIDNO_1 = 10978
@@ -210,24 +314,31 @@ FAN_GRIDNO_9 = 10660
MINE_SECTOR_X = 13
MINE_SECTOR_Y = 9
MINE_SECTOR_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Is Mine Entrance In Sector I13 At This GridNo
;------------------------------------------------------------------------------------------------------------------------------
MINE_ENTRANCE_GRIDNO = 12421
;------------------------------------------------------------------------------------------------------------------------------
; Replace Mine Entrance Graphic With Collapsed Entrance (sector I13)
; Interface Dialogue.cpp
;------------------------------------------------------------------------------------------------------------------------------
MINE_GRIDNO_ADD_STRUCT_TO_HEAD = 12745
;remove the exit grid from the world
MINE_REMOVE_EXIT_GRID_FROM_WORLD_1 = 12422
MINE_REMOVE_EXIT_GRID_FROM_WORLD_2 = 12423
; Apply changes to the underground mine
MINE_SECTOR_UNDERGROUND_X = 13
MINE_SECTOR_UNDERGROUND_Y = 9
MINE_SECTOR_UNDERGROUND_Z = 1
MINE_SECTOR_UNDERGROUND_GRIDNO_1 = 13057
MINE_SECTOR_UNDERGROUND_GRIDNO_2 = 12897
;******************************************************************************************************************************
;******************************************************************************************************************************
Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI
+107 -7
View File
@@ -31,12 +31,110 @@ BORDER_ITEM = TRUE
EVENT_ATTACK_INITIAL_SECTOR_IF_PLAYER_STILL_THERE = TRUE
;------------------------------------------------------------------------------------------------------------------------------
; HandlePlayerSayingQuoteWhenFailingToOpenGateInTunnel
; Handle player saying quote when failing to open gate in tunnel (sector K14-1)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_OPEN_GATE_IN_TUNNEL_X = 14
SECTOR_OPEN_GATE_IN_TUNNEL_Y = 11
SECTOR_OPEN_GATE_IN_TUNNEL_Z = 1
;------------------------------------------------------------------------------------------------------------------------------
; Handle player team quotes when entering Manuel sector (Sector I9)
;------------------------------------------------------------------------------------------------------------------------------
I9_SECTOR_PLAYER_QUOTE_X = 9
I9_SECTOR_PLAYER_QUOTE_Y = 9
I9_SECTOR_PLAYER_QUOTE_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Handle player team quotes when entering Manuel sector (Sector H10)
;------------------------------------------------------------------------------------------------------------------------------
H10_SECTOR_PLAYER_QUOTE_X = 10
H10_SECTOR_PLAYER_QUOTE_Y = 8
H10_SECTOR_PLAYER_QUOTE_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; this is the guardpost H9
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_GUARDPOST_X = 9
SECTOR_GUARDPOST_Y = 8
SECTOR_GUARDPOST_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Add some money to the location (Sector H9)
;------------------------------------------------------------------------------------------------------------------------------
H9_MONEY_GRIDNO = 9026
H9_MONEY_EASY = 15000
H9_MONEY_MEDIUM = 10000
H9_MONEY_HARD = 7000
;------------------------------------------------------------------------------------------------------------------------------
; this is the First sector of the town (Sector I10)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_TOWN1_X = 10
SECTOR_TOWN1_Y = 9
SECTOR_TOWN1_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Add some money to the location (Sector I10)
;------------------------------------------------------------------------------------------------------------------------------
I10_MONEY_GRIDNO_1 = 11894
I10_MONEY_EASY_1 = 8000
I10_MONEY_MEDIUM_1 = 4000
I10_MONEY_HARD_1 = 3000
I10_MONEY_GRIDNO_2 = 7906
I10_MONEY_EASY_2 = 12000
I10_MONEY_MEDIUM_2 = 6000
I10_MONEY_HARD_2 = 5000
;------------------------------------------------------------------------------------------------------------------------------
; this is the sector south of the town J11
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_TOWN2_X = 11
SECTOR_TOWN2_Y = 10
SECTOR_TOWN2_Z = 0
;Move enemy from gridno to roof gridno
TOWN2_FROM_GRIDNO_1 = 15446
TOWN2_TO_ROOF_GRIDNO_1 = 13993
;Move enemy from gridno to roof gridno
TOWN2_FROM_GRIDNO_2 = 15436
TOWN2_TO_ROOF_GRIDNO_2 = 14006
;------------------------------------------------------------------------------------------------------------------------------
; this is the sector south of the town (Sector H11)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_TOWN3_X = 11
SECTOR_TOWN3_Y = 8
SECTOR_TOWN3_Z = 0
;Move enemy from gridno to roof gridno
TOWN3_FROM_GRIDNO_1 = 8711
TOWN3_TO_ROOF_GRIDNO_1 = 5521
;------------------------------------------------------------------------------------------------------------------------------
; Handle seeing fortifiedd door Sector (Sector K15-1)
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_DOOR_IN_TUNNEL_X = 15
SECTOR_DOOR_IN_TUNNEL_Y = 11
SECTOR_DOOR_IN_TUNNEL_Z = 1
;if the fortified door should be open
SECTOR_DOOR_IN_TUNNEL_GRIDNO = 11419
;------------------------------------------------------------------------------------------------------------------------------
; After blowing up the fan in the J13, the enemy is alerted, and the underground sectors (J14-1 and K14-1)
; will be added to enemy units.
@@ -119,6 +217,7 @@ JERRY_GRIDNO = 15109
;------------------------------------------------------------------------------------------------------------------------------
; Launch missles sector L15-3
;------------------------------------------------------------------------------------------------------------------------------
SECTOR_LAUNCH_MISSLES_X = 15
SECTOR_LAUNCH_MISSLES_Y = 12
SECTOR_LAUNCH_MISSLES_Z = 3
@@ -144,14 +243,15 @@ RADIO_LOCATORS_GRIDNO_1 = 15070
RADIO_LOCATORS_GRIDNO_2 = 14744
;------------------------------------------------------------------------------------------------------------------------------
; J13-0 HandleFanStartingAtEndOfCombat
; Handle fan starting at end of combat (Sector J13)
;------------------------------------------------------------------------------------------------------------------------------
POWERGEN_SECTOR_X = 13
POWERGEN_SECTOR_Z = 10
POWERGEN_SECTOR_Y = 0
POWERGEN_SECTOR_Y = 10
POWERGEN_SECTOR_Z = 0
;------------------------------------------------------------------------------------------------------------------------------
; Miejsca przy wentylatorze (sektor J13), pod którymi podkładam ładunki wybuchowe.
; The tactical grid numbers of the fan tiles (default sector J13)
;------------------------------------------------------------------------------------------------------------------------------
POWERGEN_SECTOR_GRIDNO_1 = 15100
@@ -160,7 +260,7 @@ POWERGEN_SECTOR_GRIDNO_3 = 14155
POWERGEN_SECTOR_GRIDNO_4 = 13980
;------------------------------------------------------------------------------------------------------------------------------
; J14-1. Add Exit Grid For Fan To PowerGen Sector
; Add exit grid for fan to power gen Sector (J14-1)
;------------------------------------------------------------------------------------------------------------------------------
EXIT_FOR_FAN_TO_POWER_GEN_SECTOR_X = 14
@@ -193,7 +293,7 @@ START_FANBACKUP_AGAIN_GRIDNO = 10980
STOP_POWERGEN_FAN_GRIDNO = 10980
;------------------------------------------------------------------------------------------------------------------------------
; The tactical grid numbers of the fan tiles (default sector J13)
; Miejsca przy wentylatorze (sektor J13), pod którymi podkładam ładunki wybuchowe.
;------------------------------------------------------------------------------------------------------------------------------
FAN_GRIDNO_1 = 10978
Data-UB/Scripts/ExplosionControl.lua
+2 -2
View File
@@ -366,11 +366,11 @@ end
if ActionID == 29 then
-- if the player is in the power plant
if( gWorldSectorX == 13 and gWorldSectorY == 10 and gbWorldSectorZ == 0 ) then
if( gWorldSectorX == UB_iniPOWERGEN_SECTOR_X and gWorldSectorY == UB_iniPOWERGEN_SECTOR_Y and gbWorldSectorZ == UB_iniPOWERGEN_SECTOR_Z ) then
UB_HandleSeeingPowerGenFan( sGridNo )
elseif( gWorldSectorX == 15 and gWorldSectorY == 12 and gbWorldSectorZ == 3 ) then
elseif( gWorldSectorX == UB_iniSECTOR_LAUNCH_MISSLES_X and gWorldSectorY == UB_iniSECTOR_LAUNCH_MISSLES_Y and gbWorldSectorZ == UB_iniSECTOR_LAUNCH_MISSLES_Z ) then
-- The player is hitting the switch to launch the missles
UB_HandlePlayerHittingSwitchToLaunchMissles()
Data-UB/TableData/Map/MovementCosts.xml
+3 -3
View File
@@ -1476,7 +1476,7 @@ Possible values for Here tag:
<East>GROUNDBARRIER</East>
<South>GROUNDBARRIER</South>
<West>GROUNDBARRIER</West>
<Here>FARMLAND_ROAD</Here>
<Here>GROUNDBARRIER</Here>
</Sector>
<Sector y="J" x="15">
<TravelRating>0</TravelRating>
@@ -1619,7 +1619,7 @@ Possible values for Here tag:
<East>GROUNDBARRIER</East>
<South>GROUNDBARRIER</South>
<West>GROUNDBARRIER</West>
<Here>SPARSE_ROAD</Here>
<Here>GROUNDBARRIER</Here>
</Sector>
<Sector y="K" x="15">
<TravelRating>7</TravelRating>
@@ -1769,7 +1769,7 @@ Possible values for Here tag:
<East>GROUNDBARRIER</East>
<South>GROUNDBARRIER</South>
<West>GROUNDBARRIER</West>
<Here>DENSE</Here>
<Here>GROUNDBARRIER</Here>
</Sector>
<Sector y="L" x="16">
<TravelRating>0</TravelRating>