Merge branch 'master' of git.net-core.org:darkgod/t-engine4

game/modules/tome/class/Actor.lua

@@ -1579,7 +1579,7 @@ function _M:onHeal(value, src)
 	end
 
 --	print("[HEALING]", self.uid, self.name, "for", value)
-	if not self.resting and value + psi_heal >= 1 then
+	if (not self.resting and (not game.party:hasMember(self) or not game:getPlayer(true).resting)) and value + psi_heal >= 1 then
 		if game.level.map.seens(self.x, self.y) then
 			local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
 			game.flyers:add(sx, sy, 30, rng.float(-3, -2), (rng.range(0,2)-1) * 0.5, tostring(math.ceil(value)), {255,255,0})

game/modules/tome/class/Game.lua

@@ -2043,7 +2043,7 @@ function _M:onExit()
 				-- savefile_pipe is created as a global by the engine
 				self:saveGame()
 				savefile_pipe:forceWait()
-				os.exit()
+				engine.GameTurnBased.onExit(self)
 			end
 			self.quit_dialog = nil
 		end)

game/modules/tome/data/talents/gifts/call.lua

@@ -93,8 +93,8 @@ newTalent{ short_name = "NATURE_TOUCH",
 			target:heal(self:mindCrit(20 + self:combatTalentMindDamage(t, 20, 500)), self)
 			target:attr("allow_on_heal", -1)
 			if core.shader.active(4) then
-				self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
-				self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+				target:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+				target:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
 			end
 		end
 		game:playSoundNear(self, "talents/heal")