More general organisation and fixes

data/definitions/animations.yml

@@ -1383,27 +1383,27 @@ teleport_land_ectophial:
 empty_ectophial:
   id: 9609
   ticks: 4
-cow_hit: 5850
+cow_defend: 5850
 cow_death: 5851
 cow_attack: 5849
 cow_eat_grass: 5854
-calf_hit: 150
+calf_defend: 150
 calf_death: 244
 calf_attack: 245
 chicken_attack: 5387
-chicken_hit: 5388
+chicken_defend: 5388
 chicken_death: 5389
 goblin_attack: 6184
-goblin_hit: 6183
+goblin_defend: 6183
 goblin_death: 6182
 giant_spider_attack: 5327
-giant_spider_hit: 5328
+giant_spider_defend: 5328
 giant_spider_death: 5329
 rat_attack: 2705
-rat_hit: 2706
+rat_defend: 2706
 giant_rat_attack: 14859
 giant_rat_death: 14860
-giant_rat_hit: 14861
+giant_rat_defend: 14861
 human_death: 836
 sap: 12569
 leech: 12575
@@ -1413,39 +1413,39 @@ hand_cannon_special: 12174
 hand_cannon_explode: 12175
 guthans_spear_attack: 2080
 guthans_spear_swipe: 2081
-guthans_spear_block: 12008
+guthans_spear_defend: 12008
 veracs_flail_attack: 2062
-veracs_flail_block: 2063
+veracs_flail_defend: 2063
 torags_hammers_attack: 2068
 dharoks_greataxe_attack: 2066
 dharoks_greataxe_smash: 2067
-dharoks_greataxe_block: 2063
+dharoks_greataxe_defend: 2063
 boxing_gloves_attack: 3678
-boxing_gloves_block: 3679
+boxing_gloves_defend: 3679
 anchor_attack: 5865
-anchor_block: 5866
+anchor_defend: 5866
 granite_maul_attack: 1665
 granite_maul_block: 1666
 godsword_chop: 11978
 godsword_slash: 11979
 godsword_smash: 11980
 godsword_block: 11981
-godsword_hit: 12022
+godsword_defend: 12022
 zamorakian_spear_pound: 12005
 zamorakian_spear_swipe: 12006
 zamorakian_spear_lunge: 12007
-zamorakian_spear_block: 12008
+zamorakian_spear_defend: 12008
 maul_attack: 13691
 maul_block: 1666
 vestas_longsword_attack: 12311
 vestas_longsword_lunge: 12310
-vestas_longsword_block: 388
+vestas_longsword_defend: 388
 korasis_sword_chop: 12028
 korasis_sword_slash: 12029
-korasis_sword_block: 12030
+korasis_sword_defend: 12030
 dragon_dagger_attack: 376
 dragon_dagger_slash: 377
-dragon_dagger_block: 403
+dragon_dagger_defend: 403
 puncture_special: 1062
 defender_block: 4177
 book_block: 420
@@ -1479,7 +1479,7 @@ weaken_special: 2890
 impale_special: 923
 spear_wall_special: 10499
 banner_attack: 1428
-banner_hit: 1429
+banner_defend: 1429
 mouse_toy_attack: 1658
 power_of_light_special: 12804
 wind_spell: 10546
@@ -1568,7 +1568,7 @@ demon_slayer_cupboard_disappear: 4600
 traiborn_bone_spell: 4602
 summon_demon: 4617
 demon_attack: 64
-demon_hit: 65
+demon_defend: 65
 delrith_continue: 4620
 delrith_appear: 4623
 delrith_death: 4624
@@ -1597,94 +1597,94 @@ bind_runes: 791
 unarmed_punch: 422
 unarmed_kick: 423
 unarmed_block: 422
-unarmed_hit: 424
+unarmed_defend: 424
 human_attack: 422
 human_block: 422
-human_hit: 424
+human_defend: 424
 staff_bash: 419
 staff_pound: 419
 staff_focus: 419
-staff_hit: 420
+staff_defend: 420
 axe_chop: 395
 axe_hack: 395
 axe_smash: 401
 axe_block: 395
-axe_hit: 397
+axe_defend: 397
 sceptre_bash: 414
 sceptre_pound: 414
 sceptre_block: 414
-sceptre_hit: 430
+sceptre_defend: 430
 pickaxe_spike: 401
 pickaxe_impale: 401
 pickaxe_smash: 400
 pickaxe_block: 401
-pickaxe_hit: 397
+pickaxe_defend: 397
 dagger_stab: 386
 dagger_lunge: 386
 dagger_slash: 390
 dagger_block: 386
-dagger_hit: 388
+dagger_defend: 388
 sword_chop: 390
 sword_slash: 390
 sword_lunge: 386
 sword_block: 390
-sword_hit: 388
+sword_defend: 388
 2h_chop: 7041
 2h_slash: 7041
 2h_smash: 7042
 2h_block: 7041
-2h_hit: 7050
+2h_defend: 7050
 mace_pound: 401
 mace_pummel: 401
 mace_spike: 400
 mace_block: 401
-mace_hit: 403
+mace_defend: 403
 claws_chop: 393
 claws_slash: 393
 claws_lunge: 1067
 claws_block: 393
-claws_hit: 397
+claws_defend: 397
 hammer_pound: 401
 hammer_pummel: 401
 hammer_block: 401
-hammer_hit: 403
+hammer_defend: 403
 whip_flick: 11968 # needs verification
 whip_lash: 11969 # needs verification
 whip_deflect: 11970 # needs verification
 energy_drain_special: 11971 # needs verification
-whip_block: 11974 # needs verification
+whip_defend: 11974 # needs verification
 fun_pound: 400
 fun_pummel: 400
 fun_block: 400
-fun_hit: 424
+fun_defend: 424
 pie_accurate: 2779
 pie_rapid: 2779
 pie_long_range: 2779
-pie_hit: 3176
+pie_defend: 3176
 spear_lunge: 428
 spear_swipe: 440
 spear_pound: 428
 spear_block: 429
-spear_hit: 430
+spear_defend: 430
 halberd_jab: 428
 halberd_swipe: 440
 halberd_fend: 428
-halberd_hit: 430
+halberd_defend: 430
 bow_accurate: 426
 bow_rapid: 426
 bow_long_range: 426
-bow_hit: 424
+bow_defend: 424
 snapshot_special: 1074
 crossbow_accurate: 4230
 crossbow_rapid: 4230
 crossbow_long_range: 4230
-crossbow_hit: 424
+crossbow_defend: 424
 karils_crossbow_shoot: 2075
 zaniks_crossbow_special: 11359
 thrown_accurate: 929
 thrown_rapid: 929
 thrown_long_range: 929
-thrown_hit: 424
+thrown_defend: 424
 throw_dart: 582
 toktz_xil_ul: 3353
 throw_javelin: 10501
@@ -1694,37 +1694,37 @@ throw_morrigans_throwing_axe_special: 10504
 chinchompa_short_fuse: 2779
 chinchompa_medium_fuse: 2779
 chinchompa_long_fuse: 2779
-chinchompa_hit: 3176
+chinchompa_defend: 3176
 fixed_device_aim_and_fire: -1 # needs verification
 salamander_scorch: 5247
-salamander_hit: 388
+salamander_defend: 388
 scythe_reap: 440
 scythe_chop: 440
 scythe_jab: 438
 scythe_block: 440
-scythe_hit: 435
+scythe_defend: 435
 ivandis_flail_slash: 9047
 ivandis_flail_crush: 9047
-ivandis_flail_hit: 9048
+ivandis_flail_defend: 9048
 sling_rock: 14867 # needs verification
 sling_sling: 14867 # needs verification
 sling_chuck: 14867 # needs verification
 sling_lob: 14867 # needs verification
-#sling_hit: -1
+#sling_defend: -1
 trident_jab: -1 # needs verification
 trident_swipe: -1 # needs verification
 trident_fend: -1 # needs verification
-trident_hit: -1 # needs verification
+trident_defend: -1 # needs verification
 staff_of_light_jab: 15072
 staff_of_light_swipe: 15071
 staff_of_light_fend: 414
-staff_of_light_hit: 12806
+staff_of_light_defend: 12806
 chaotic_maul_attack: 13055
-chaotic_maul_block: 13054
+chaotic_maul_defend: 13054
 pull_lever: 2140
 dragon_breath: 81
 dragon_attack: 91
-dragon_hit: 89
+dragon_defend: 89
 dragon_death: 92
 teleport_jewellery:
   id: 9603
@@ -1769,7 +1769,7 @@ fletching_string_rune_crossbow: 6677
 dig_with_spade: 830
 giant_mole_burrow: 3314
 giant_mole_attack: 3312
-giant_mole_hit: 3311
+giant_mole_defend: 3311
 giant_mole_death: 3310
 dirt_projectile: 570
 giant_mole_burrow_up: 1664
@@ -1780,19 +1780,19 @@ stomp_eyes: 794
 abyss_kneel: 1331
 abyss_stand: 1332
 crawling_cave: 844
-abyssal_leech_hit: 2182
+abyssal_leech_defend: 2182
 abyssal_leech_attack: 2181
 abyssal_leech_death: 2183
-abyssal_guardian_hit: 2188
+abyssal_guardian_defend: 2188
 abyssal_guardian_attack: 2186
 abyssal_guardian_death: 2189
-abyssal_walker_hit: 2192
+abyssal_walker_defend: 2192
 abyssal_walker_attack: 2193
 abyssal_walker_death: 2194
-gecko_hit: 7208
+gecko_defend: 7208
 gecko_attack: 7207
 gecko_death: 7205
-wolves_hit: 6557
+wolves_defend: 6557
 wolves_attack: 6559
 wolves_death: 6558
 run_replenish: 9988
@@ -1838,7 +1838,7 @@ fall_off_log_right: 2582
 fall_on_floor: 767
 stepping_stone_step: 769
 stepping_stone_jump: 741
-skeleton_hit: 5489
+skeleton_defend: 5489
 skeleton_death: 5491
 skeleton_crush: 5485
 skeleton_slash: 5487