Merge pull request #344 from Zugerujk/master

Fixed !kill not working
aristotlepenguin · Jul 12, 2023 · 168923c · 168923c
2 parents 7bbc18f + 6aef63d
commit 168923c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ew/cmd/wep/wepcmds.py b/ew/cmd/wep/wepcmds.py
@@ -86,7 +86,7 @@ async def attack(cmd):
 
         # Calculate some base values
         skill_mult = (0.05 * attacker.weaponskill) + 1
-        base_cost = ((max(35, attacker.slimelevel) ** 4) / 30) if attacker_weapon.is_tool else ((attacker.slimelevel ** 4) / 30) * float(ewcfg.global_damage_multiplier[attacker.id_server])
+        base_cost = ((max(35, attacker.slimelevel) ** 4) / 30) if attacker_weapon.is_tool else ((attacker.slimelevel ** 4) / 30) * float(ewcfg.global_damage_multiplier_dt[attacker.id_server])
         base_dmg = 5 * base_cost * skill_mult
 
         # Generate some random values

diff --git a/ew/static/weapons.py b/ew/static/weapons.py
@@ -1786,7 +1786,6 @@ def wef_harpoon(ctn = None):
         vendors=[ewcfg.vendor_basedhardware],
         classes=[ewcfg.weapon_class_juvie],
         stat=ewcfg.stat_sledgehammer_kills,
-        is_tool=1,
         str_brandish=["{name} finds the closest thing to destroy and hurls {weapon} into it!"]
     ),
     EwWeapon(  # 47