-

- Changed the way height is calculated
- When you use the 'reload map' button, keep the camera and zoom position

Author: rainlizard

Class/ClmClass.gd

@@ -2,12 +2,18 @@ extends Node
 
 # Class is used by both DkClm and DataClm
 
-func get_real_height(cubeArray):
+func get_highest_cube_height(cubeArray):
 	for cubeNumber in 8:
 		if cubeArray[7-cubeNumber] != 0:
 			return 8-cubeNumber
 	return 0
 
+func get_height_from_bottom(cubeArray):
+	for cubeNumber in 7:
+		if cubeArray[cubeNumber] == 0:
+			return cubeNumber
+	return 8
+
 func calculate_solid_mask(cubeArray):
 	# For each cube value that isn't 0, add a bitmask value.
 	# 0 = 1
@@ -93,7 +99,7 @@ func find_cubearray_index(cubeArray, floorID):
 func get_top_cube_face(index, slabID):
 	var get_height = self.height[index]
 	if slabID == Slabs.PORTAL:
-		get_height = get_real_height(self.cubes[index])
+		get_height = get_highest_cube_height(self.cubes[index])
 	if get_height == 0:
 		return self.floorTexture[index]
 	else:

Scenes/3dSelector.gd

@@ -64,7 +64,7 @@ extends Spatial
 #		clmIndex = oGenerateTerrain.get_clm_index(translation.x,translation.z)
 #
 #	if clmIndex != null:
-#		newSize = oDataClm.get_real_height(clmIndex)
+#		newSize = oDataClm.get_height_from_bottom(clmIndex)
 #	else:
 #		newSize = 0
 #

Scenes/Camera2D.gd

@@ -24,6 +24,7 @@ var middleMousePanning = false
 #var mouseIsMoving = false
 
 var mouseInWindow = true
+var skip_camera_reset = false
 
 func _ready():
 	reset_camera(M.xSize, M.ySize)

Scenes/ClmControls.gd

@@ -142,7 +142,7 @@ func _on_cube_value_changed(value, cubeNumber): # signal connected by GDScript
 	nodeClm.cubes[clmIndex][cubeNumber] = int(value)
 	nodeVoxelView.update_column_view()
 
-	oHeightSpinBox.value = nodeClm.get_real_height(nodeClm.cubes[clmIndex])
+	oHeightSpinBox.value = nodeClm.get_height_from_bottom(nodeClm.cubes[clmIndex])
 	oSolidMaskSpinBox.value = nodeClm.calculate_solid_mask(nodeClm.cubes[clmIndex])
 
 	_on_cube_mouse_entered(cubeNumber) # Update tooltip

Scenes/ClmControls.tscn

@@ -336,7 +336,7 @@ unique_name_in_owner = true
 margin_left = 132.0
 margin_right = 206.0
 margin_bottom = 24.0
-hint_tooltip = "Height is set to the position of highest cube for this column"
+hint_tooltip = "Height is set to the position of highest cube for this column."
 size_flags_horizontal = 10
 max_value = 99999.0
 script = ExtResource( 1 )
@@ -356,7 +356,7 @@ margin_left = 132.0
 margin_top = 28.0
 margin_right = 206.0
 margin_bottom = 52.0
-hint_tooltip = "Determines which cubes in this column have collision"
+hint_tooltip = "Needs more info."
 size_flags_horizontal = 10
 max_value = 99999.0
 script = ExtResource( 1 )
@@ -376,7 +376,7 @@ margin_left = 132.0
 margin_top = 56.0
 margin_right = 206.0
 margin_bottom = 80.0
-hint_tooltip = "Non-permanent columns are recycled when their Utilized drops to zero"
+hint_tooltip = "Non-permanent columns are recycled when their Utilized drops to zero."
 size_flags_horizontal = 10
 max_value = 99999.0
 script = ExtResource( 1 )
@@ -418,7 +418,7 @@ margin_left = 132.0
 margin_top = 84.0
 margin_right = 206.0
 margin_bottom = 108.0
-hint_tooltip = "Whether the column is attached to the ceiling in first person view"
+hint_tooltip = "This should affect how  columns are attached to the ceiling, but it may be non-functional. Needs more info."
 size_flags_horizontal = 10
 max_value = 99999.0
 script = ExtResource( 1 )

Scenes/CustomSlabSystem.gd

@@ -136,7 +136,7 @@ func remove_custom_slab(header_id):
 
 func get_top_fake_cube_face(indexIn3x3, slabID):
 	var cubesArray = Slabs.fake_extra_data[slabID][Slabs.FAKE_CUBE_DATA][indexIn3x3]
-	var get_height = oDataClm.get_real_height(cubesArray)
+	var get_height = oDataClm.get_highest_cube_height(cubesArray)
 	if get_height == 0:
 		return Slabs.fake_extra_data[slabID][Slabs.FAKE_FLOOR_DATA][indexIn3x3]
 	else:

Scenes/DataClm.gd

@@ -58,7 +58,7 @@ func index_entry(cubeArray, setFloorID):
 		solidMask[index] = calculate_solid_mask(cubeArray)
 		permanent[index] = 1 # Does this affect whether columns get reset?
 		lintel[index] = 0
-		height[index] = get_real_height(cubeArray)
+		height[index] = get_height_from_bottom(cubeArray)
 		cubes[index] = cubeArray
 		floorTexture[index] = setFloorID
 

Scenes/Menu.gd

@@ -38,6 +38,7 @@ onready var oDataLof = Nodelist.list["oDataLof"]
 onready var oExportPreview = Nodelist.list["oExportPreview"]
 onready var oResizeCurrentMapSize = Nodelist.list["oResizeCurrentMapSize"]
 onready var oGridDataWindow = Nodelist.list["oGridDataWindow"]
+onready var oCamera2D = Nodelist.list["oCamera2D"]
 
 var recentlyOpened = []
 var recentlyOpenedPopupMenu = PopupMenu.new()
@@ -280,4 +281,5 @@ func _on_PlayButton_pressed(): # Use normal Button instead of MenuButton in comb
 	oMenuPlayButton.connect("pressed",self,"_on_PlayButton_pressed")
 
 func _on_ConfirmDiscardChanges_confirmed():
+	oCamera2D.skip_camera_reset = true
 	oOpenMap.open_map(oCurrentMap.path)

Scenes/OpenMap.gd

@@ -203,7 +203,7 @@ func finish_opening_map(map):
 	oScriptEditor.initialize_for_new_map()
 	oOverheadOwnership.start()
 	oScriptHelpers.start()
-	oCamera2D.reset_camera(M.xSize, M.ySize)
+	
 
 	if Slabset.dat.empty() == true: Slabset.load_default_slabset()
 	if Columnset.cubes.empty() == true: Columnset.load_default_columnset()
@@ -233,6 +233,11 @@ func finish_opening_map(map):
 
 	oDataClm.store_default_data()
 
+	if oCamera2D.skip_camera_reset == false:
+		oCamera2D.reset_camera(M.xSize, M.ySize)
+	else:
+		oCamera2D.skip_camera_reset = false
+	
 #	if oGame.running_keeperfx() == true:
 #		if oCurrentFormat.selected == 1: # KFX format
 #			if oGame.KEEPERFX_VERSION_INT != 500: # Skip worrying about the compiled versions (0.5.0.0)