Commit d74cebde4ac6a66e57d6ff0e55652089ae7251ef

Authored by dg
1 parent 239d79f0

Hymn of Moonlight and similar talents wont activate on the worldmap


git-svn-id: http://svn.net-core.org/repos/t-engine4@3356 51575b47-30f0-44d4-a5cc-537603b46e54
... ... @@ -242,49 +242,51 @@ function _M:actTurn()
242 242 self:timedEffects()
243 243
244 244 -- Handle thunderstorm, even if the actor is stunned or incapacitated it still works
245   - if self:isTalentActive(self.T_THUNDERSTORM) then
246   - local t = self:getTalentFromId(self.T_THUNDERSTORM)
247   - t.do_storm(self, t)
248   - end
249   - if self:isTalentActive(self.T_STONE_VINES) then
250   - local t = self:getTalentFromId(self.T_STONE_VINES)
251   - t.do_vines(self, t)
252   - end
253   - if self:isTalentActive(self.T_BODY_OF_FIRE) then
254   - local t = self:getTalentFromId(self.T_BODY_OF_FIRE)
255   - t.do_fire(self, t)
256   - end
257   - if self:isTalentActive(self.T_HYMN_OF_MOONLIGHT) then
258   - local t = self:getTalentFromId(self.T_HYMN_OF_MOONLIGHT)
259   - t.do_beams(self, t)
260   - end
261   - if self:isTalentActive(self.T_BLOOD_FRENZY) then
262   - local t = self:getTalentFromId(self.T_BLOOD_FRENZY)
263   - t.do_turn(self, t)
264   - end
265   - if self:isTalentActive(self.T_TRUE_GRIT) then
266   - local t = self:getTalentFromId(self.T_TRUE_GRIT)
267   - t.do_turn(self, t)
268   - end
269   - -- this handles cursed gloom turn based effects
270   - if self:isTalentActive(self.T_GLOOM) then
271   - local t = self:getTalentFromId(self.T_GLOOM)
272   - t.do_gloom(self, t)
273   - end
274   - -- this handles cursed call shadows turn based effects
275   - if self:isTalentActive(self.T_CALL_SHADOWS) then
276   - local t = self:getTalentFromId(self.T_CALL_SHADOWS)
277   - t.do_callShadows(self, t)
278   - end
279   - -- this handles cursed deflection turn based effects
280   - if self:isTalentActive(self.T_DEFLECTION) then
281   - local t = self:getTalentFromId(self.T_DEFLECTION)
282   - t.do_act(self, t, self:isTalentActive(self.T_DEFLECTION))
283   - end
284   - -- this handles doomed unseen force turn based effects
285   - if self.unseenForce then
286   - local t = self:getTalentFromId(self.T_UNSEEN_FORCE)
287   - t.do_unseenForce(self, t)
  245 + if not game.zone.wilderness then
  246 + if self:isTalentActive(self.T_THUNDERSTORM) then
  247 + local t = self:getTalentFromId(self.T_THUNDERSTORM)
  248 + t.do_storm(self, t)
  249 + end
  250 + if self:isTalentActive(self.T_STONE_VINES) then
  251 + local t = self:getTalentFromId(self.T_STONE_VINES)
  252 + t.do_vines(self, t)
  253 + end
  254 + if self:isTalentActive(self.T_BODY_OF_FIRE) then
  255 + local t = self:getTalentFromId(self.T_BODY_OF_FIRE)
  256 + t.do_fire(self, t)
  257 + end
  258 + if self:isTalentActive(self.T_HYMN_OF_MOONLIGHT) then
  259 + local t = self:getTalentFromId(self.T_HYMN_OF_MOONLIGHT)
  260 + t.do_beams(self, t)
  261 + end
  262 + if self:isTalentActive(self.T_BLOOD_FRENZY) then
  263 + local t = self:getTalentFromId(self.T_BLOOD_FRENZY)
  264 + t.do_turn(self, t)
  265 + end
  266 + if self:isTalentActive(self.T_TRUE_GRIT) then
  267 + local t = self:getTalentFromId(self.T_TRUE_GRIT)
  268 + t.do_turn(self, t)
  269 + end
  270 + -- this handles cursed gloom turn based effects
  271 + if self:isTalentActive(self.T_GLOOM) then
  272 + local t = self:getTalentFromId(self.T_GLOOM)
  273 + t.do_gloom(self, t)
  274 + end
  275 + -- this handles cursed call shadows turn based effects
  276 + if self:isTalentActive(self.T_CALL_SHADOWS) then
  277 + local t = self:getTalentFromId(self.T_CALL_SHADOWS)
  278 + t.do_callShadows(self, t)
  279 + end
  280 + -- this handles cursed deflection turn based effects
  281 + if self:isTalentActive(self.T_DEFLECTION) then
  282 + local t = self:getTalentFromId(self.T_DEFLECTION)
  283 + t.do_act(self, t, self:isTalentActive(self.T_DEFLECTION))
  284 + end
  285 + -- this handles doomed unseen force turn based effects
  286 + if self.unseenForce then
  287 + local t = self:getTalentFromId(self.T_UNSEEN_FORCE)
  288 + t.do_unseenForce(self, t)
  289 + end
288 290 end
289 291
290 292 -- Suffocate ?
... ...