plop

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

game/modules/tome/data/general/objects/egos/weapon.lua

@@ -208,7 +208,7 @@ newEntity{
 	level_range = {1, 50},
 	rarity = 3,
 	cost = 4,
-	wielder = {
+	combat = {
 		melee_project={[DamageType.LIGHT] = resolvers.mbonus_material(45, 6, function(e, v) return v * 0.9 end)},
 	},
 }

game/modules/tome/data/talents/psionic/augmented-mobility.lua

@@ -137,9 +137,9 @@ newTalent{
 	--range = function(self, t) return 3+self:getTalentLevel(t)+self:getWil(4) end,
 	direct_hit = true,
 	requires_target = true,
-	on_pre_use = function(self, t, vocal)
+	on_pre_use = function(self, t, silent)
 		if not self:hasEffect(self.EFF_KINSPIKE_SHIELD) then
-			if vocal then game.logSeen(self, "You must have a spiked kinetic shield active. Cancelling charge.") end
+			if not silent then game.logSeen(self, "You must have a spiked kinetic shield active. Cancelling charge.") end
 			return false
 		end
 		return true

game/modules/tome/dialogs/Donation.lua

@@ -40,6 +40,7 @@ ToME is free and open-source and will stay that way, but that does not mean I ca
 If you feel that the (many) hours you have spent having fun were worth it, please consider making a donation for the future of the game.
 ]]}
 	self.c_donate = Numberbox.new{title="Donation amount: ", number=10, max=1000, min=5, chars=5, fct=function() end}
+	local euro = Textzone.new{auto_width=true, auto_height=true, text=[[€]]}
 	self.c_recur = Checkbox.new{title="Make it a recurring montly donation", default=false, fct=function() end}
 	local ok = require("engine.ui.Button").new{text="Accept", fct=function() self:ok() end}
 	local cancel = require("engine.ui.Button").new{text="Cancel", fct=function() self:cancel() end}
@@ -47,6 +48,7 @@ If you feel that the (many) hours you have spent having fun were worth it, pleas
 	self:loadUI{
 		{left=0, top=0, ui=desc},
 		{left=5, bottom=5 + ok.h, ui=self.c_donate},
+		{left=5+self.c_donate.w, bottom=10 + ok.h, ui=euro},
 		{right=5, bottom=5 + ok.h, ui=self.c_recur},
 		{left=0, bottom=0, ui=ok},
 		{right=0, bottom=0, ui=cancel},