Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed trap HP and knock back (fixes #338)

Browse Source 
* Talkie Box and all ranger traps no longer can be destroyed by HP damage
* Electric Shock can now be knocked back
This commit is contained in:
Playtester 2015-03-14 11:50:59 +01:00
parent 9f6f55c07c
commit 16d747af48
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/re/skill_unit_db.txt
View File

@ -115,7 +115,7 @@
2214,0x86, , 0, 5, 100,enemy, 0x080 //WL_CHAINLIGHTNING 2214,0x86, , 0, 5, 100,enemy, 0x080 //WL_CHAINLIGHTNING
2216,0xcb, , -1, 2,2000,enemy, 0x018 //WL_EARTHSTRAIN 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 2239,0xd9, , 0, 1,1000,enemy, 0x8006 //RA_CLUSTERBOMB
2249,0xd2, , 0, 1,1000,enemy, 0x8022 //RA_MAGENTATRAP 2249,0xd2, , 0, 1,1000,enemy, 0x8022 //RA_MAGENTATRAP
2250,0xd3, , 0, 1,1000,enemy, 0x8022 //RA_COBALTTRAP 2250,0xd3, , 0, 1,1000,enemy, 0x8022 //RA_COBALTTRAP

10
src/map/skill.c
View File

@ -12363,19 +12363,10 @@ struct skill_unit_group *skill_unitsetting(struct block_list *src, uint16 skill_
case HT_FLASHER: case HT_FLASHER:
case HT_FREEZINGTRAP: case HT_FREEZINGTRAP:
case MA_FREEZINGTRAP: case MA_FREEZINGTRAP:
case HT_TALKIEBOX:
case HT_SKIDTRAP: case HT_SKIDTRAP:
case MA_SKIDTRAP: case MA_SKIDTRAP:
case HT_CLAYMORETRAP: case HT_CLAYMORETRAP:
case HT_BLASTMINE: 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; unit_val1 = 3500;
break; break;
@ -13769,7 +13760,6 @@ int64 skill_unit_ondamaged(struct skill_unit *unit, int64 damage)
case UNT_FLASHER: case UNT_FLASHER:
case UNT_CLAYMORETRAP: case UNT_CLAYMORETRAP:
case UNT_FREEZINGTRAP: case UNT_FREEZINGTRAP:
case UNT_TALKIEBOX:
case UNT_ANKLESNARE: case UNT_ANKLESNARE:
case UNT_ICEWALL: case UNT_ICEWALL:
case UNT_WALLOFTHORN: case UNT_WALLOFTHORN: