Commit 10cfd29b1ba6320fe68a38805fc42af8c3365887
Merge branch 'moon_star_fix' into 'master'
Fixes Moon & Star set bonus. Fixes the set bonus from Moon and Star. The `special_on_hit.fct` bit of its damage had a misinterpreted argument: the first argument is not `self` but the weapon's `combat` table. Luckily the combat table now has a reference to the source as of MR !693. **This MR is save safe, but old copies of the items will still have the broken behavior.** See merge request !801
Showing
1 changed file
with
4 additions
and
4 deletions
... | ... | @@ -894,9 +894,9 @@ newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_MOON", |
894 | 894 | damage = function(self, who) |
895 | 895 | return self.set_complete and who:getCun()*2 or 70 |
896 | 896 | end, |
897 | - fct=function(self, who, target, dam, special) | |
897 | + fct=function(combat, who, target, dam, special) | |
898 | 898 | local tg = {type="hit", range=1, radius=0, selffire=false} |
899 | - local damage = special.damage(self, who) | |
899 | + local damage = special.damage(combat.self, who) | |
900 | 900 | who:project(tg, target.x, target.y, engine.DamageType.DARKNESS, damage) |
901 | 901 | end}, |
902 | 902 | }, |
... | ... | @@ -949,9 +949,9 @@ newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_STAR", |
949 | 949 | damage = function(self, who) |
950 | 950 | return self.set_complete and who:getDex()*2 or 70 |
951 | 951 | end, |
952 | - fct=function(self, who, target, dam, special) | |
952 | + fct=function(combat, who, target, dam, special) | |
953 | 953 | local tg = {type="hit", range=1, radius=0, selffire=false} |
954 | - local damage = special.damage(self, who) | |
954 | + local damage = special.damage(combat.self, who) | |
955 | 955 | who:project(tg, target.x, target.y, engine.DamageType.LIGHT, damage) |
956 | 956 | end}, |
957 | 957 | }, | ... | ... |
-
Please register or login to post a comment