diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index dfaec83bb16c2564074fe47fce7f32cabe0f6cc9..de4de6619d963f113da6e1acc8f47f625901141f 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -3272,15 +3272,6 @@ function _M:checkPool(tid, pid)
end
self.resource_pool_refs[pid] = self.resource_pool_refs[pid] or {}
self.resource_pool_refs[pid][tid] = (self.resource_pool_refs[pid][tid] or 0) + 1
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
- game.log("#CRIMSON#DG MADE THIS BUT CANT TEST, MAKE SURE PREXISTING POOLS ARE NOT REMOVED !!!")
end
--- Actor learns a resource pool
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index d884d9be73488fafbecd7c964a6a91c75306257e..8f4ed570dcddfbac2be99f46bcefa841ea896b65 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -331,6 +331,7 @@ function _M:getAccuracyEffect(weapon, atk, def, scale, max)
end
function _M:isAccuracyEffect(weapon, kind)
+ if not weapon then return false, "none" end
local eff = weapon.accuracy_effect or weapon.talented
return eff == kind, eff
end
diff --git a/game/modules/tome/data/general/npcs/swarm.lua b/game/modules/tome/data/general/npcs/swarm.lua
index 9b10443722635eb97603b3c40ace825cba365b53..74c33b83019cda78ef551df57ed1779bfcbdf881 100644
--- a/game/modules/tome/data/general/npcs/swarm.lua
+++ b/game/modules/tome/data/general/npcs/swarm.lua
@@ -32,6 +32,7 @@ newEntity{
sound_moam = {"creatures/swarm/mswarm_%d", 1, 4},
sound_die = "creatures/swarm/mswarm_die",
sound_random = {"creatures/swarm/mswarm_%d", 1, 4},
+ combat = {sound={"creatures/swarm/mswarm_%d", 1, 4}, sound_miss={"creatures/swarm/mswarm_%d", 1, 4}},
ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=1, },
stats = { str=1, dex=20, mag=3, con=1 },
global_speed_base = 2,
diff --git a/game/modules/tome/data/sound/actions/punch1.ogg b/game/modules/tome/data/sound/actions/punch1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..a627234cb74aaf73432d076a0ac7c2f18b3cf581
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch1.ogg differ
diff --git a/game/modules/tome/data/sound/actions/punch2.ogg b/game/modules/tome/data/sound/actions/punch2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e04f96785bdba9a3e460b396eaae41f8a438bb3d
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch2.ogg differ
diff --git a/game/modules/tome/data/sound/actions/punch3.ogg b/game/modules/tome/data/sound/actions/punch3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..effec0ff03e836a6e685b963e85a624976513b21
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch3.ogg differ
diff --git a/game/modules/tome/data/sound/actions/punch4.ogg b/game/modules/tome/data/sound/actions/punch4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..808ea280de7601dba2acb8858b0438c56ed72667
Binary files /dev/null and b/game/modules/tome/data/sound/actions/punch4.ogg differ
diff --git a/game/modules/tome/data/talents/spells/aether.lua b/game/modules/tome/data/talents/spells/aether.lua
index 0eeb8818410add0704192acc7c1743a4652c63a7..b444b858cedfffb266cb32409ad88be1b9813421 100644
--- a/game/modules/tome/data/talents/spells/aether.lua
+++ b/game/modules/tome/data/talents/spells/aether.lua
@@ -192,7 +192,7 @@ newTalent{
end,
info = function(self, t)
return ([[Fill yourself with aether forces, completely surrounding your body for %d turns.
- While active, you can only cast arcane or aether spells, your cooldown for them is divived by 3, your arcane damage is increased by 25%%, your Disruption Shield can be used at any time, and your maximum mana is increased by 33%%.]]):
+ While active, you can only cast arcane or aether spells, your cooldown for them is divided by 3, your arcane damage is increased by 25%%, your Disruption Shield can be used at any time, and your maximum mana is increased by 33%%.]]):
format(t.getNb(self, t))
end,
}
diff --git a/game/modules/tome/data/talents/techniques/unarmed-training.lua b/game/modules/tome/data/talents/techniques/unarmed-training.lua
index 2a7253dd97292070a93e83c182aa5f990c797009..7526a6702fe467f1617234179b1c40c6591380d2 100644
--- a/game/modules/tome/data/talents/techniques/unarmed-training.lua
+++ b/game/modules/tome/data/talents/techniques/unarmed-training.lua
@@ -28,11 +28,18 @@ newTalent{
points = 1,
no_unlearn_last = true,
on_learn = function(self, t)
- self.before_empty_hands_combat = self.combat
- self.combat = table.clone(self.combat, true)
- self.combat.physspeed = 0.6
- self.combat.sound = "actions/melee"
- self.combat.sound_miss="actions/melee_miss"
+ local fct = function()
+ self.before_empty_hands_combat = self.combat
+ self.combat = table.clone(self.combat, true)
+ self.combat.physspeed = math.min(0.6, self.combat.physspeed or 1000)
+ if not self.combat.sound then self.combat.sound = {"actions/punch%d", 1, 4} end
+ if not self.combat.sound_miss then self.combat.sound_miss = "actions/melee_miss" end
+ end
+ if type(self.combat.dam) == "table" then
+ game:onTickEnd(fct)
+ else
+ fct()
+ end
end,
on_unlearn = function(self, t)
self.combat = self.before_empty_hands_combat