diff --git a/gamedir/Data-UB/AddOns/Data-UB-1.13/UB_Options.INI b/gamedir/Data-UB/AddOns/Data-UB-1.13/UB_Options.INI
index 33b95f713..8d2145b32 100644
--- a/gamedir/Data-UB/AddOns/Data-UB-1.13/UB_Options.INI
+++ b/gamedir/Data-UB/AddOns/Data-UB-1.13/UB_Options.INI
@@ -30,6 +30,13 @@ BORDER_ITEM = TRUE
EVENT_ATTACK_INITIAL_SECTOR_IF_PLAYER_STILL_THERE = TRUE
+;------------------------------------------------------------------------------------------------------------------------------
+; HandlePlayerSayingQuoteWhenFailingToOpenGateInTunnel
+;------------------------------------------------------------------------------------------------------------------------------
+SECTOR_OPEN_GATE_IN_TUNNEL_X = 14
+SECTOR_OPEN_GATE_IN_TUNNEL_Y = 11
+SECTOR_OPEN_GATE_IN_TUNNEL_Z = 1
+
;------------------------------------------------------------------------------------------------------------------------------
; 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.
@@ -109,6 +116,12 @@ 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
;------------------------------------------------------------------------------------------------------------------------------
; The switch in the L15-3. The final sector with General Morris.
@@ -129,6 +142,12 @@ 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.
@@ -138,6 +157,12 @@ 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
+;------------------------------------------------------------------------------------------------------------------------------
+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
;------------------------------------------------------------------------------------------------------------------------------
; Po wysadzeniu wentylatora, (sektor J13) w tym miejscu pojawi się przejście do sektora J14-1.
@@ -178,7 +203,31 @@ FAN_GRIDNO_7 = 10658
FAN_GRIDNO_8 = 10659
FAN_GRIDNO_9 = 10660
+;------------------------------------------------------------------------------------------------------------------------------
+; Mine Sector (default sector I13)
+;------------------------------------------------------------------------------------------------------------------------------
+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
;******************************************************************************************************************************
;******************************************************************************************************************************
diff --git a/gamedir/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI b/gamedir/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI
index b4f1ca9ab..ebcfdcaa2 100644
--- a/gamedir/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI
+++ b/gamedir/Data-UB/AddOns/Data-UB-Vanilla/UB_Options.INI
@@ -30,6 +30,13 @@ BORDER_ITEM = TRUE
EVENT_ATTACK_INITIAL_SECTOR_IF_PLAYER_STILL_THERE = TRUE
+;------------------------------------------------------------------------------------------------------------------------------
+; HandlePlayerSayingQuoteWhenFailingToOpenGateInTunnel
+;------------------------------------------------------------------------------------------------------------------------------
+SECTOR_OPEN_GATE_IN_TUNNEL_X = 14
+SECTOR_OPEN_GATE_IN_TUNNEL_Y = 11
+SECTOR_OPEN_GATE_IN_TUNNEL_Z = 1
+
;------------------------------------------------------------------------------------------------------------------------------
; 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.
@@ -109,6 +116,12 @@ 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
;------------------------------------------------------------------------------------------------------------------------------
; The switch in the L15-3. The final sector with General Morris.
@@ -130,6 +143,13 @@ 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.
;------------------------------------------------------------------------------------------------------------------------------
@@ -138,6 +158,14 @@ 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
+;------------------------------------------------------------------------------------------------------------------------------
+
+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
;------------------------------------------------------------------------------------------------------------------------------
; Po wysadzeniu wentylatora, (sektor J13) w tym miejscu pojawi się przejście do sektora J14-1.
@@ -178,6 +206,37 @@ FAN_GRIDNO_7 = 10658
FAN_GRIDNO_8 = 10659
FAN_GRIDNO_9 = 10660
+;------------------------------------------------------------------------------------------------------------------------------
+; Mine Sector (default sector I13)
+;------------------------------------------------------------------------------------------------------------------------------
+
+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
;******************************************************************************************************************************
;******************************************************************************************************************************
diff --git a/gamedir/Data-UB/TableData/Map/MovementCosts.xml b/gamedir/Data-UB/TableData/Map/MovementCosts.xml
index e5a097e4e..faa206860 100644
--- a/gamedir/Data-UB/TableData/Map/MovementCosts.xml
+++ b/gamedir/Data-UB/TableData/Map/MovementCosts.xml
@@ -1472,10 +1472,10 @@ Possible values for Here tag:
50
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
FARMLAND_ROAD
@@ -1615,18 +1615,18 @@ Possible values for Here tag:
50
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
SPARSE_ROAD
7
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
DENSE
@@ -1765,10 +1765,10 @@ Possible values for Here tag:
3
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
- EDGEOFWORLD
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
+ GROUNDBARRIER
DENSE