Merge remote-tracking branch 'upstream/master' into i18n

@@ -4320,6 +4320,7 @@ function _M:updateModdableTile()
 			table.insert(self.shimmer_particles_active, p)
 		end
 	end
+	if not self.moddable_tile then return end
 
 	local base = "player/"..self.moddable_tile:gsub("#sex#", self.female and "female" or "male").."/"
 

@@ -100,7 +100,7 @@ newTalent {
 		end
 		pen_off(self, t, target, x, y)
 	end,
-	archery_target_parameters = {one_shot = true},
+	archery_target_parameters = {limit_shots = 1, multishots = 1}, -- {one_shot = true},
 	damage_multiplier = function(self, t)
 		return self:combatTalentWeaponDamage(t, 1.5, 1.9)
 	end,
@@ -149,7 +149,7 @@ newTalent {
 	archery_onhit = function(self, t, target, x, y)
 		pen_off(self, t, target, x, y)
 	end,
-	archery_target_parameters = {one_shot = true},
+	archery_target_parameters = {limit_shots = 1, multishots = 1}, --{one_shot = true},
 	speed = "archery",
 	action = function(self, t)
 		local tg = {type = "hit"}

@@ -668,7 +668,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Open a hole in space, summoning an animated blade for 10 turns.]]):tformat()
+		return ([[Open a hole in space, summoning an animated blade for 15 turns.]]):tformat()
 	end,
 }
 

@@ -163,7 +163,7 @@ newTalent{
 		local _ _, x, y = self:canProject(tg, x, y)
 
 		local proj = throw(self, tg.range, 1, x, y, nil, nil, nil)
-		proj.name = _t"Throwing Knife"
+		if proj then proj.name = _t"Throwing Knife" end
 
 		return true
 	end,
@@ -255,7 +255,7 @@ newTalent{
 				local tgt, id = rng.table(tgts)
 				if tgt then
 					local proj = throw(self, self:getTalentRadius(t), t.getDamage(self,t), tgt.act.x, tgt.act.y, nil, nil, 1)
-					proj.name = _t"Fan of Knives"
+					if proj then proj.name = _t"Fan of Knives" end
 					tgt.cnt = tgt.cnt + 1
 					print(("Fan of Knives #%d: target:%s (%s, %s) = %d"):format(count, tgt.act.name, tgt.act.x, tgt.act.y, tgt.cnt))
 					count = count - 1
@@ -334,7 +334,7 @@ newTalent{
 		if #tgts <= 0 then return nil end
 		local a, id = rng.table(tgts)
 		local proj = throw(self, self:getTalentRange(t), 1, a.x, a.y, nil, nil, nil)
-		proj.name = _t"Quickdraw Knife"
+		if proj then proj.name = _t"Quickdraw Knife" end
 		self.turn_procs.quickdraw = true
 	end,
 	info = function(self, t)
@@ -379,7 +379,7 @@ newTalent{
 		local dam = t2.getDamage(self,t2)
 
 		local proj = throw(self, self:getTalentRange(t), dam, x, y, DamageType.NATURE, 1, nil)
-		proj.name = _t"Venomous Throw"
+		if proj then proj.name = _t"Venomous Throw" end
 		self.talents_cd[self.T_VENOMOUS_STRIKE] = 8
 
 		return true

@@ -3882,6 +3882,7 @@ newEffect{
 		eff.target:removeEffect(eff.target.EFF_FED_UPON, false, true)
 	end,
 	updateFeed = function(self, eff)
+		if not eff then return end
 		local source = eff.src
 		local target = eff.target