moar

git-svn-id: http://svn.net-core.org/repos/t-engine4@4558 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/interface/ActorProject.lua

@@ -411,6 +411,8 @@ function _M:projectDoStop(typ, tg, damtype, dam, particles, lx, ly, tmp, rx, ry)
 
 	self:check("on_project_grids", grids)
 
+	if typ.sound_stop then game:playSoundNear({x=lx,y=ly}, typ.sound_stop) end
+
 	for px, ys in pairs(grids) do
 		for py, _ in pairs(ys) do
 			if self:projectDoAct(typ, tg, damtype, dam, particles, px, py, tmp) then break end

game/modules/tome/data/talents/spells/fire.lua

@@ -110,7 +110,7 @@ newTalent{
 			)
 		end
 		game.level.map:particleEmitter(self.x, self.y, tg.radius, "breath_fire", {radius=tg.radius, tx=x-self.x, ty=y-self.y})
-		game:playSoundNear(self, "talents/fire")
+		game:playSoundNear(self, "talents/fireflash")
 		return true
 	end,
 	info = function(self, t)
@@ -140,7 +140,7 @@ newTalent{
 	direct_hit = true,
 	requires_target = true,
 	target = function(self, t)
-		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=self:spellFriendlyFire(), talent=t, display={particle="bolt_fire", trail="firetrail"}}
+		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=self:spellFriendlyFire(), talent=t, display={particle="bolt_fire", trail="firetrail"}, sound_stop="talents/fireflash"}
 	end,
 	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 28, 280) end,
 	action = function(self, t)
@@ -160,7 +160,7 @@ newTalent{
 				)
 			end
 		end)
-		game:playSoundNear(self, "talents/fireflash")
+		game:playSoundNear(self, "talents/fire")
 		return true
 	end,
 	info = function(self, t)

game/modules/tome/data/talents/spells/water.lua

@@ -82,7 +82,7 @@ newTalent{
 		local dam = self:spellCrit(t.getDamage(self, t))
 		self:project(tg, x, y, DamageType.COLD, dam, {type="freeze"})
 		self:project(tg, x, y, DamageType.FREEZE, {dur=2+math.ceil(self:getTalentLevelRaw(t)), hp=70 + dam * 1.5})
-		game:playSoundNear(self, "talents/ice")
+		game:playSoundNear(self, "talents/water")
 		return true
 	end,
 	info = function(self, t)
@@ -171,7 +171,7 @@ newTalent{
 			end,
 			false
 		)
-		game:playSoundNear(self, "talents/ice")
+		game:playSoundNear(self, "talents/icestorm")
 		return true
 	end,
 	info = function(self, t)

game/modules/tome/data/talents/techniques/archery.lua

@@ -30,6 +30,7 @@ newTalent{
 	requires_target = true,
 	tactical = { ATTACK = 1 },
 	on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end,
+	no_unlearn_last = true,
 	use_psi_archery = function(self, t)
 		local inven = self:getInven("PSIONIC_FOCUS")
 		if not inven then return false end