diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-attack1.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-attack1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-attack1.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-attack1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-attack2.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-attack2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-attack2.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-attack2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-attack3.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-attack3.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-attack3.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-attack3.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-defend-ranged.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-defend-ranged.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-defend-ranged.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-defend-ranged.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-defend.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-defend.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister-defend.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister-defend.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-arcanister.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/arcanister.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner-attack.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner-attack.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner-attack2.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner-attack2.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner-withstuff.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-withstuff.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner-withstuff.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-withstuff.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-miner.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-attack1.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-attack1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-attack1.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-attack1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-attack2.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-attack2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-attack2.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-attack2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-attack3.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-attack3.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-attack3.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-attack3.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-defend.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-defend.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt-defend.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt-defend.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runemasteralt.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runemasteralt.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-attack1.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-attack1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-attack1.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-attack1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-attack2.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-attack2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-attack2.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-attack2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-attack3.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-attack3.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-attack3.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-attack3.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-defend.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-defend.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith-defend.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith-defend.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-runesmith.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/runesmith.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-thain.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/thain.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-thain.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/thain.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-thain2.png b/data/campaigns/Sceptre_of_Fire/images/units/dwarves/thain2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/dwarf-thain2.png rename to data/campaigns/Sceptre_of_Fire/images/units/dwarves/thain2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/monsters/neutral-wolf-attack.png b/data/campaigns/Sceptre_of_Fire/images/units/monsters/wolf-attack.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/monsters/neutral-wolf-attack.png rename to data/campaigns/Sceptre_of_Fire/images/units/monsters/wolf-attack.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/monsters/neutral-wolf-defend.png b/data/campaigns/Sceptre_of_Fire/images/units/monsters/wolf-defend.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/monsters/neutral-wolf-defend.png rename to data/campaigns/Sceptre_of_Fire/images/units/monsters/wolf-defend.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/monsters/neutral-wolf.png b/data/campaigns/Sceptre_of_Fire/images/units/monsters/wolf.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/monsters/neutral-wolf.png rename to data/campaigns/Sceptre_of_Fire/images/units/monsters/wolf.png diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Arcanister.cfg b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Arcanister.cfg index 1421d40d918..821c13d82f0 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Arcanister.cfg +++ b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Arcanister.cfg @@ -3,7 +3,7 @@ id=Dwarvish Arcanister name= _ "Dwarvish Arcanister" race=dwarf - image=units/dwarves/dwarf-arcanister.png + image=units/dwarves/arcanister.png hitpoints=54 movement_type=dwarvishfoot [resistance] @@ -19,8 +19,8 @@ experience=100 {AMLA_TOUGH 3} unit_description= _ "The most powerful of all the runecrafters, the Dwarvish Arcanister destroys wounded enemies almost instantly, and rarely fails to cause a wound when that is his intent. His skill in runecrafting is unrivaled, and the glyphs he carves into his weapons and armor deflect the blows of his enemies." - {DEFENSE_ANIM_RANGE "units/dwarves/dwarf-arcanister-defend.png" "units/dwarves/dwarf-arcanister.png" {SOUND_LIST:DWARF_HIT} melee} - {DEFENSE_ANIM_RANGE "units/dwarves/dwarf-arcanister-defend-ranged.png" "units/dwarves/dwarf-arcanister.png" {SOUND_LIST:DWARF_HIT} ranged} + {DEFENSE_ANIM_RANGE "units/dwarves/arcanister-defend.png" "units/dwarves/arcanister.png" {SOUND_LIST:DWARF_HIT} melee} + {DEFENSE_ANIM_RANGE "units/dwarves/arcanister-defend-ranged.png" "units/dwarves/arcanister.png" {SOUND_LIST:DWARF_HIT} ranged} die_sound={SOUND_LIST:DWARF_DIE} [attack] name=hammer @@ -36,14 +36,14 @@ [frame] begin=-200 end=-100 - image=units/dwarves/dwarf-arcanister-attack1.png + image=units/dwarves/arcanister-attack1.png [/frame] [if] hits=yes [frame] begin=-100 end=100 - image=units/dwarves/dwarf-arcanister-attack2.png + image=units/dwarves/arcanister-attack2.png sound=mace.wav [/frame] [/if] @@ -52,14 +52,14 @@ [frame] begin=-100 end=100 - image=units/dwarves/dwarf-arcanister-attack2.png + image=units/dwarves/arcanister-attack2.png sound={SOUND_LIST:MISS} [/frame] [/else] [frame] begin=100 end=175 - image=units/dwarves/dwarf-arcanister-attack3.png + image=units/dwarves/arcanister-attack3.png [/frame] [/animation] [/attack] diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg index a76d2916a96..c799962a89c 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg +++ b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg @@ -3,7 +3,7 @@ id=Dwarvish Miner name= _ "Dwarvish Miner" race=dwarf - image=units/dwarves/dwarf-miner.png + image=units/dwarves/miner.png hitpoints=25 movement_type=dwarvishfoot movement=5 @@ -12,7 +12,7 @@ cost=19 usage=fighter unit_description= _ "Dwarvish miners are the grunt workers of Dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts." - {DEFENSE_ANIM "units/dwarves/dwarf-miner.png" "units/dwarves/dwarf-miner.png" {SOUND_LIST:DWARF_HIT} } + {DEFENSE_ANIM "units/dwarves/miner.png" "units/dwarves/miner.png" {SOUND_LIST:DWARF_HIT} } die_sound={SOUND_LIST:DWARF_DIE} [attack] name=pick @@ -26,14 +26,14 @@ [frame] begin=-200 end=-100 - image=units/dwarves/dwarf-miner-attack.png + image=units/dwarves/miner-attack.png [/frame] [if] hits=yes [frame] begin=-100 end=100 - image=units/dwarves/dwarf-miner-attack2.png + image=units/dwarves/miner-attack2.png sound=axe.ogg [/frame] [/if] @@ -42,14 +42,14 @@ [frame] begin=-100 end=100 - image=units/dwarves/dwarf-miner-attack2.png + image=units/dwarves/miner-attack2.png sound={SOUND_LIST:MISS} [/frame] [/else] [frame] begin=100 end=175 - image=units/dwarves/dwarf-miner.png + image=units/dwarves/miner.png [/frame] [/animation] [/attack] diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runemaster.cfg b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runemaster.cfg index 381de227789..c4be0fab943 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runemaster.cfg +++ b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runemaster.cfg @@ -3,7 +3,7 @@ id=Dwarvish Runemaster_alt name= _ "Dwarvish Runemaster" race=dwarf - image=units/dwarves/dwarf-runemasteralt.png + image=units/dwarves/runemasteralt.png hitpoints=48 movement_type=dwarvishfoot [resistance] @@ -19,7 +19,7 @@ experience=100 {AMLA_TOUGH 3} unit_description= _ "Except for those with almost supernatural skill, the highest rank a runecrafter can rise to is that of the Dwarvish Runemaster. Striking blows nearly as powerful as those of the best warriors, they would be fearsome without their craft, but with it they are also nigh on invincible, since their runes cause the physical blows of their enemies to deal less damage than would be expected." - {DEFENSE_ANIM "units/dwarves/dwarf-runemasteralt-defend.png" "units/dwarves/dwarf-runemasteralt.png" {SOUND_LIST:DWARF_HIT} } + {DEFENSE_ANIM "units/dwarves/runemasteralt-defend.png" "units/dwarves/runemasteralt.png" {SOUND_LIST:DWARF_HIT} } die_sound={SOUND_LIST:DWARF_DIE} [attack] name=hammer @@ -35,14 +35,14 @@ [frame] begin=-200 end=-100 - image=units/dwarves/dwarf-runemasteralt-attack1.png + image=units/dwarves/runemasteralt-attack1.png [/frame] [if] hits=yes [frame] begin=-100 end=100 - image=units/dwarves/dwarf-runemasteralt-attack2.png + image=units/dwarves/runemasteralt-attack2.png sound=mace.wav [/frame] [/if] @@ -51,14 +51,14 @@ [frame] begin=-100 end=100 - image=units/dwarves/dwarf-runemasteralt-attack2.png + image=units/dwarves/runemasteralt-attack2.png sound={SOUND_LIST:MISS} [/frame] [/else] [frame] begin=100 end=175 - image=units/dwarves/dwarf-runemasteralt-attack3.png + image=units/dwarves/runemasteralt-attack3.png [/frame] [/animation] [/attack] diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runesmith.cfg b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runesmith.cfg index 57e7dd0d3a1..1c5c84235c6 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runesmith.cfg +++ b/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Runesmith.cfg @@ -3,7 +3,7 @@ id=Dwarvish Runesmith name= _ "Dwarvish Runesmith" race=dwarf - image=units/dwarves/dwarf-runesmith.png + image=units/dwarves/runesmith.png hitpoints=40 movement_type=dwarvishfoot [resistance] @@ -22,7 +22,7 @@ unit=Dwarvish Fighter [/advancefrom] unit_description= _ "Dwarvish runesmiths, now practiced at their craft, carve arcane runes into their weapons and armor. These runes infuse the runesmith's blows with power and accuracy, and disrupt the blows of their enemies, causing them to strike softly, weakly and on the armor of the defender." - {DEFENSE_ANIM "units/dwarves/dwarf-runesmith-defend.png" "units/dwarves/dwarf-runesmith.png" {SOUND_LIST:DWARF_HIT} } + {DEFENSE_ANIM "units/dwarves/runesmith-defend.png" "units/dwarves/runesmith.png" {SOUND_LIST:DWARF_HIT} } die_sound={SOUND_LIST:DWARF_DIE} [attack] name=hammer @@ -38,14 +38,14 @@ [frame] begin=-200 end=-100 - image=units/dwarves/dwarf-runesmith-attack1.png + image=units/dwarves/runesmith-attack1.png [/frame] [if] hits=yes [frame] begin=-100 end=100 - image=units/dwarves/dwarf-runesmith-attack2.png + image=units/dwarves/runesmith-attack2.png sound=mace.wav [/frame] [/if] @@ -54,14 +54,14 @@ [frame] begin=-100 end=100 - image=units/dwarves/dwarf-runesmith-attack2.png + image=units/dwarves/runesmith-attack2.png sound={SOUND_LIST:MISS} [/frame] [/else] [frame] begin=100 end=175 - image=units/dwarves/dwarf-runesmith-attack3.png + image=units/dwarves/runesmith-attack3.png [/frame] [/animation] [/attack] diff --git a/data/campaigns/Sceptre_of_Fire/units/Wolf.cfg b/data/campaigns/Sceptre_of_Fire/units/Wolf.cfg index 4360502f1e7..39cbc61d3f7 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Wolf.cfg +++ b/data/campaigns/Sceptre_of_Fire/units/Wolf.cfg @@ -3,12 +3,12 @@ id=Wolf name= _ "Wolf" race=monster -image="units/monsters/neutral-wolf.png" +image="units/monsters/wolf.png" [defend] [frame] begin=-150 end=-150 - image="units/monsters/neutral-wolf-defend.png" + image="units/monsters/wolf-defend.png" [/frame] [/defend] hitpoints=37 @@ -34,14 +34,14 @@ die_sound=wolf-die.wav [frame] begin=-190 end=-120 - image="units/monsters/neutral-wolf-attack.png" + image="units/monsters/wolf-attack.png" [/frame] [if] hits=yes [frame] begin=-120 end=10 - image="units/monsters/neutral-wolf-attack.png" + image="units/monsters/wolf-attack.png" sound=wolf-bite.ogg [/frame] [/if] @@ -50,7 +50,7 @@ die_sound=wolf-die.wav [frame] begin=-120 end=10 - image="units/monsters/neutral-wolf-attack.png" + image="units/monsters/wolf-attack.png" sound=wolf-bite-miss.ogg [/frame] [/else] @@ -67,14 +67,14 @@ die_sound=wolf-die.wav [frame] begin=-190 end=-120 - image="units/monsters/neutral-wolf-attack.png" + image="units/monsters/wolf-attack.png" [/frame] [if] hits=yes [frame] begin=-120 end=10 - image="units/monsters/neutral-wolf-attack.png" + image="units/monsters/wolf-attack.png" sound=wolf-bite.ogg [/frame] [/if] @@ -83,7 +83,7 @@ die_sound=wolf-die.wav [frame] begin=-120 end=10 - image="units/monsters/neutral-wolf-attack.png" + image="units/monsters/wolf-attack.png" sound=wolf-bite-miss.ogg [/frame] [/else]