tome / Tales of MajEyal · Commits

Commit cf9f974177629a774320a6e4cca7933f707d1023

Authored by dg
1 parent 2e56e0a2

bump 41 

Rend, Acid Strike and Dark Surprise correctly refund vim when dealing a deathblow


git-svn-id: http://svn.net-core.org/repos/t-engine4@5142 51575b47-30f0-44d4-a5cc-537603b46e54
Inline Side-by-side
Showing 5 changed files with 13 additions and 5 deletions
... ... @@ -18,7 +18,7 @@
18 18 -- darkgod@te4.org
19 19
20 20 -- Engine Version
21   -engine.version = {0,9,40,"te4",17}
  21 +engine.version = {0,9,41,"te4",17}
22 22 engine.require_c_core = engine.version[5]
23 23 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
24 24
... ...
... ... @@ -23,7 +23,7 @@ short_name = "example"
23 23 author = { "DarkGod", "darkgod@te4.org" }
24 24 homepage = "http://te4.org/modules:example"
25 25 version = {1,0,0}
26   -engine = {0,9,40,"te4"}
  26 +engine = {0,9,41,"te4"}
27 27 description = [[
28 28 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
29 29 ]]
... ...
... ... @@ -23,7 +23,7 @@ short_name = "example_realtime"
23 23 author = { "DarkGod", "darkgod@te4.org" }
24 24 homepage = "http://te4.org/modules:example"
25 25 version = {1,0,0}
26   -engine = {0,9,40,"te4"}
  26 +engine = {0,9,41,"te4"}
27 27 description = [[
28 28 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
29 29 ]]
... ...
... ... @@ -17,6 +17,8 @@
17 17 -- Nicolas Casalini "DarkGod"
18 18 -- darkgod@te4.org
19 19
  20 +local DamageType = require "engine.DamageType"
  21 +
20 22 newTalent{
21 23 name = "Rend",
22 24 type = {"corruption/scourge", 1},
... ... @@ -39,8 +41,10 @@ newTalent{
39 41 if not x or not y or not target then return nil end
40 42 if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
41 43
  44 + DamageType:projectingFor(self, {project_type={talent=t}})
42 45 local speed1, hit1 = self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 0.8, 1.6))
43 46 local speed2, hit2 = self:attackTargetWith(target, offweapon.combat, nil, self:getOffHandMult(offweapon.combat, self:combatTalentWeaponDamage(t, 0.8, 1.6)))
  47 + DamageType:projectingFor(self, nil)
44 48
45 49 -- Try to bleed !
46 50 if hit1 then
... ... @@ -120,8 +124,10 @@ newTalent{
120 124 if not x or not y or not target then return nil end
121 125 if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
122 126
  127 + DamageType:projectingFor(self, {project_type={talent=t}})
123 128 local speed1, hit1 = self:attackTargetWith(target, weapon.combat, DamageType.ACID, self:combatTalentWeaponDamage(t, 0.8, 1.6))
124 129 local speed2, hit2 = self:attackTargetWith(target, offweapon.combat, DamageType.ACID, self:getOffHandMult(offweapon.combat, self:combatTalentWeaponDamage(t, 0.8, 1.6)))
  130 + DamageType:projectingFor(self, nil)
125 131
126 132 -- Acid splash !
127 133 if hit1 or hit2 then
... ... @@ -162,6 +168,7 @@ newTalent{
162 168 if not x or not y or not target then return nil end
163 169 if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
164 170
  171 + DamageType:projectingFor(self, {project_type={talent=t}})
165 172 local speed1, hit1 = self:attackTargetWith(target, weapon.combat, DamageType.DARKNESS, self:combatTalentWeaponDamage(t, 0.6, 1.4))
166 173
167 174 if hit1 then
... ... @@ -174,6 +181,7 @@ newTalent{
174 181 game.logSeen(self, "%s resists the darkness.", target.name:capitalize())
175 182 end
176 183 end
  184 + DamageType:projectingFor(self, nil)
177 185
178 186 return true
179 187 end,
... ...
... ... @@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
22 22 short_name = "tome"
23 23 author = { "DarkGod", "darkgod@te4.org" }
24 24 homepage = "http://tome.te4.org/"
25   -version = {3,9,40}
26   -engine = {0,9,40,"te4"}
  25 +version = {3,9,41}
  26 +engine = {0,9,41,"te4"}
27 27 description = [[
28 28 Welcome to Maj'Eyal.
29 29
... ...