Commit 492f795e3fe0ed52214441c240073a401519570d
1 parent
fc72f4ad
fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@2933 51575b47-30f0-44d4-a5cc-537603b46e54
Showing
3 changed files
with
4 additions
and
3 deletions
... | ... | @@ -24,6 +24,7 @@ Fonts: |
24 | 24 | - Vera*: http://www.gnome.org/fonts/ |
25 | 25 | - INSULA, USENET: http://www.dafont.com/fr/apostrophic-labs.d128 |
26 | 26 | - SVBasicManual: http://www.dafont.com/fr/johan-winge.d757 // http://home.student.uu.se/j/jowi4905/fonts/ |
27 | +- FSEX300: http://www.fixedsysexcelsior.com/ | |
27 | 28 | |
28 | 29 | Others: |
29 | 30 | - My dear wife who is not bothered by my coding frenzy :) | ... | ... |
... | ... | @@ -32,7 +32,7 @@ function _M:init(t) |
32 | 32 | self.nb_items = t.nb_items |
33 | 33 | assert(self.h or self.nb_items, "no list height/nb_items") |
34 | 34 | self.fct = t.fct |
35 | - self.select = t.select | |
35 | + self.on_select = t.select | |
36 | 36 | self.display_prop = t.display_prop or "name" |
37 | 37 | self.scrollbar = t.scrollbar |
38 | 38 | self.all_clicks = t.all_clicks |
... | ... | @@ -132,7 +132,7 @@ function _M:onSelect() |
132 | 132 | local item = self.list[self.sel] |
133 | 133 | if not item then return end |
134 | 134 | |
135 | - if rawget(self, "select") then self.select(item, self.sel) end | |
135 | + if rawget(self, "on_select") then self.on_select(item, self.sel) end | |
136 | 136 | end |
137 | 137 | |
138 | 138 | function _M:onUse(...) | ... | ... |
... | ... | @@ -132,7 +132,7 @@ newEntity{ |
132 | 132 | inc_damage = { [DamageType.ACID] = resolvers.mbonus_material(10, 10, function(e, v) return v * 0.8 end) }, |
133 | 133 | resists = {}, |
134 | 134 | }, |
135 | - resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHTNING] = (e.wielder.resists[engine.DamageType.LIGHTNING] or 0) + e.wielder.inc_damage[engine.DamageType.LIGHTNING] end), | |
135 | + resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.ACID] = (e.wielder.resists[engine.DamageType.ACID] or 0) + e.wielder.inc_damage[engine.DamageType.ACID] end), | |
136 | 136 | } |
137 | 137 | |
138 | 138 | newEntity{ | ... | ... |
-
Please register or login to post a comment