Merge remote-tracking branch 'main/master' into i18n-aggro

game/modules/tome/data/zones/eruan/zone.lua

@@ -51,7 +51,7 @@ return {
 
 			nb_rooms = {0,0,1},
 			rooms = {"greater_vault"},
-			greater_vaults_list = {"dragon_lair", "lava_island", "bandit-fortress", "horror-chamber", "living-weapons", "sleeping-dragons"},
+			greater_vaults_list = {"dragon_lair", "lava_island", "horror-chamber", "living-weapons", "sleeping-dragons"},
 			lite_room_chance = 100,
 		},
 		actor = {

game/modules/tome/data/zones/old-forest/zone.lua

@@ -46,7 +46,7 @@ return {
 			edge_entrances = {4,6},
 			rooms = {"forest_clearing", {"lesser_vault",8}},
 			rooms_config = {forest_clearing={pit_chance=5, filters={{type="insect", subtype="ant"}, {type="insect"}, {type="animal", subtype="snake"}, {type="animal", subtype="canine"}}}},
-			lesser_vaults_list = {"honey_glade", "troll-hideout", "mage-hideout", "thief-hideout", "plantlife", "mold-path", "bandit-fortress","loot-vault","worms"},
+			lesser_vaults_list = {"honey_glade", "troll-hideout", "mage-hideout", "thief-hideout", "plantlife", "mold-path", "loot-vault","worms"},
 			['.'] = "GRASS",
 			['#'] = "TREE",
 			up = "GRASS_UP4",

game/modules/tome/dialogs/DeathDialog.lua

@@ -37,7 +37,7 @@ function _M:init(actor)
 
 	self:generateList()
 	if self.dont_show then return end
-	if not config.settings.cheat then game:saveGame() end
+	if not config.settings.cheat then game:onTickEnd(function() game:saveGame() end) end
 
 	local text = _t[[Death in #{bold}#Tales of Maj'Eyal#{normal}# is usually permanent, but if you have a means of resurrection it will be proposed in the menu below.
 You can dump your character data to a file to remember her/him forever, or you can exit and try once again to survive in the wilds!
@@ -191,7 +191,7 @@ function _M:eidolonPlane()
 
 		game.log("#LIGHT_RED#From the brink of death you seem to be yanked to another plane.")
 		game.player:updateMainShader()
-		if not config.settings.cheat then game:saveGame() end
+		if not config.settings.cheat then game:onTickEnd(function() game:saveGame() end) end
 
 		self.actor:checkTwoHandedPenalty()
 	end)