Commit d6c6fbdad7f4cc38c8e339a69c0bf25e236e4de7
1 parent
9fea3671
fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@3594 51575b47-30f0-44d4-a5cc-537603b46e54
Showing
1 changed file
with
2 additions
and
2 deletions
... | ... | @@ -36,7 +36,7 @@ When activated it will prompt to destroy items on the floor, if there are none i |
36 | 36 | pricemod = function(o) if o.type == "gem" then return 0.40 else return 0.05 end end, |
37 | 37 | transmo_filter = function(o) if o:getPrice() <= 0 or o.quest then return false end return true end, |
38 | 38 | transmo_inven = function(self, who, inven, idx, o) |
39 | - local price = math.min(o:getPrice(), 25) * o:getNumber() * self.pricemod(o) | |
39 | + local price = math.min(o:getPrice() * self.pricemod(o), 25) * o:getNumber() | |
40 | 40 | who:removeObject(who:getInven("INVEN"), idx, true) |
41 | 41 | who:sortInven() |
42 | 42 | who:incMoney(price) |
... | ... | @@ -49,7 +49,7 @@ When activated it will prompt to destroy items on the floor, if there are none i |
49 | 49 | if game.level.map:getObjectTotal(who.x, who.y) > 0 then |
50 | 50 | local x, y = who.x, who.y |
51 | 51 | local d = require("mod.dialogs.ShowPickupFloor").new("Transmogrify", x, y, self.transmo_filter, function(o, idx) |
52 | - local price = math.min(o:getPrice(), 25) * o:getNumber() * self.pricemod(o) | |
52 | + local price = math.min(o:getPrice() * self.pricemod(o), 25) * o:getNumber() | |
53 | 53 | game.level.map:removeObject(x, y, idx) |
54 | 54 | who:incMoney(price) |
55 | 55 | who:hasQuest("shertul-fortress"):gain_energy(price/10) | ... | ... |
-
Please register or login to post a comment