From 16d747af48d64effc2bd56475160ed2bdf2cb911 Mon Sep 17 00:00:00 2001 From: Playtester Date: Sat, 14 Mar 2015 11:50:59 +0100 Subject: [PATCH] - Fixed trap HP and knock back (fixes #338) * Talkie Box and all ranger traps no longer can be destroyed by HP damage * Electric Shock can now be knocked back --- db/re/skill_unit_db.txt | 2 +- src/map/skill.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index 23f4616872..70dfdaf70a 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -115,7 +115,7 @@ 2214,0x86, , 0, 5, 100,enemy, 0x080 //WL_CHAINLIGHTNING 2216,0xcb, , -1, 2,2000,enemy, 0x018 //WL_EARTHSTRAIN -2238,0xd8, , 0, 1,1000,enemy, 0x9006 //RA_ELECTRICSHOCKER +2238,0xd8, , 0, 1,1000,enemy, 0x8006 //RA_ELECTRICSHOCKER 2239,0xd9, , 0, 1,1000,enemy, 0x8006 //RA_CLUSTERBOMB 2249,0xd2, , 0, 1,1000,enemy, 0x8022 //RA_MAGENTATRAP 2250,0xd3, , 0, 1,1000,enemy, 0x8022 //RA_COBALTTRAP diff --git a/src/map/skill.c b/src/map/skill.c index 6c78d60e68..ac847225ca 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -12363,19 +12363,10 @@ struct skill_unit_group *skill_unitsetting(struct block_list *src, uint16 skill_ case HT_FLASHER: case HT_FREEZINGTRAP: case MA_FREEZINGTRAP: - case HT_TALKIEBOX: case HT_SKIDTRAP: case MA_SKIDTRAP: case HT_CLAYMORETRAP: case HT_BLASTMINE: - case RA_ELECTRICSHOCKER: - case RA_CLUSTERBOMB: - case RA_MAGENTATRAP: - case RA_COBALTTRAP: - case RA_MAIZETRAP: - case RA_VERDURETRAP: - case RA_FIRINGTRAP: - case RA_ICEBOUNDTRAP: unit_val1 = 3500; break; @@ -13769,7 +13760,6 @@ int64 skill_unit_ondamaged(struct skill_unit *unit, int64 damage) case UNT_FLASHER: case UNT_CLAYMORETRAP: case UNT_FREEZINGTRAP: - case UNT_TALKIEBOX: case UNT_ANKLESNARE: case UNT_ICEWALL: case UNT_WALLOFTHORN: