refactor: move cancel.bmp to factions root

MegaGlest · Sep 12, 2022 · dbf0e46 · dbf0e46
1 parent 0a96212
commit dbf0e46
Show file tree

Hide file tree

Showing 209 changed files with 219 additions and 201 deletions.
diff --git a/...ypt/units/spearman/images/tech_cancel.bmp → techs/megapack/factions/egypt/cancel.bmp b/...ypt/units/spearman/images/tech_cancel.bmp → techs/megapack/factions/egypt/cancel.bmp
diff --git a/techs/megapack/factions/egypt/units/air_pyramid/air_pyramid.xml b/techs/megapack/factions/egypt/units/air_pyramid/air_pyramid.xml
@@ -31,7 +31,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/air_pyramid.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="false">
 			<sound path="../technician/sounds/technician_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/anubis_warrior/anubis_warrior.xml b/techs/megapack/factions/egypt/units/anubis_warrior/anubis_warrior.xml
@@ -32,7 +32,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/anubis.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/warrior_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/chicken/chicken.xml b/techs/megapack/factions/egypt/units/chicken/chicken.xml
@@ -32,7 +32,7 @@
 			<!-- more time for reaction in case of hunger -->
 		</resources-stored>
 		<image path="images/chicken.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/chicken_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/desert_camp/desert_camp.xml b/techs/megapack/factions/egypt/units/desert_camp/desert_camp.xml
@@ -35,7 +35,7 @@
 		</resource-requirements>
 		<resources-stored />
 		<image path="images/barracks.bmp" />
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav" />

diff --git a/techs/megapack/factions/egypt/units/farm/farm.xml b/techs/megapack/factions/egypt/units/farm/farm.xml
@@ -40,7 +40,7 @@
 			<resource name="food" amount="20"/>
 		</resources-stored>
 		<image path="images/farm.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../desert_camp/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/egypt/units/ibis/ibis.xml b/techs/megapack/factions/egypt/units/ibis/ibis.xml
@@ -33,7 +33,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/ibis.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/horseman_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/mummy/mummy.xml b/techs/megapack/factions/egypt/units/mummy/mummy.xml
@@ -26,7 +26,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/daemon.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/mummy_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/obelisk/obelisk.xml b/techs/megapack/factions/egypt/units/obelisk/obelisk.xml
@@ -38,7 +38,7 @@
 		<resources-stored>
 		</resources-stored>
 		<image path="images/obelisk.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../desert_camp/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav" />

diff --git a/techs/megapack/factions/egypt/units/priest/priest.xml b/techs/megapack/factions/egypt/units/priest/priest.xml
@@ -30,7 +30,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/priest.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/swordman_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/pyramid/pyramid.xml b/techs/megapack/factions/egypt/units/pyramid/pyramid.xml
@@ -42,7 +42,7 @@
 			<resource name= "food" amount="150"/>
 		</resources-stored>
 		<image path="images/pyramid.bmp" />
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../desert_camp/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav" />

diff --git a/techs/megapack/factions/egypt/units/scarab/scarab.xml b/techs/megapack/factions/egypt/units/scarab/scarab.xml
@@ -35,7 +35,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/scarab.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/archmage_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/slave/slave.xml b/techs/megapack/factions/egypt/units/slave/slave.xml
@@ -29,7 +29,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/worker.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/worker_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/snake/snake.xml b/techs/megapack/factions/egypt/units/snake/snake.xml
@@ -32,7 +32,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/snake.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/archmage_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/spearman/spearman.xml b/techs/megapack/factions/egypt/units/spearman/spearman.xml
@@ -31,7 +31,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/swordman.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/spearman_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/spearthrower/spearthrower.xml b/techs/megapack/factions/egypt/units/spearthrower/spearthrower.xml
@@ -32,7 +32,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/archer.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/archer_select1.wav"/>

diff --git a/techs/megapack/factions/egypt/units/sphinx/sphinx.xml b/techs/megapack/factions/egypt/units/sphinx/sphinx.xml
@@ -40,7 +40,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/sphinx.bmp"/>
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/egypt/units/temple/temple.xml b/techs/megapack/factions/egypt/units/temple/temple.xml
@@ -40,7 +40,7 @@
 			<resource name="wood" amount="200" />
 		</resources-stored>
 		<image path="images/temple.bmp" />
-		<image-cancel path="../spearman/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav" />

diff --git a/techs/megapack/factions/egypt/upgrades/power_of_ra/power_of_ra.xml b/techs/megapack/factions/egypt/upgrades/power_of_ra/power_of_ra.xml
@@ -2,7 +2,7 @@
 
 <upgrade>
 	<image path="images/ra.bmp"/>
-	<image-cancel path="../spear_weapons/images/upgrade_cancel.bmp"/>
+	<image-cancel path="../../../cancel.bmp"/>
 	<time value="600"/>
 	<unit-requirements/>
 	<upgrade-requirements/>

diff --git a/techs/megapack/factions/egypt/upgrades/spear_weapons/spear_weapons.xml b/techs/megapack/factions/egypt/upgrades/spear_weapons/spear_weapons.xml
@@ -2,7 +2,7 @@
 
 <upgrade>
 	<image path="images/piercing.bmp"/>
-	<image-cancel path="../spear_weapons/images/upgrade_cancel.bmp"/>
+	<image-cancel path="../../../cancel.bmp"/>
 	<time value="200"/>
 	<unit-requirements/>
 	<upgrade-requirements/>

diff --git a/.../megapack/factions/egypt/upgrades/speedup_priest_production/speedup_priest_production.xml b/.../megapack/factions/egypt/upgrades/speedup_priest_production/speedup_priest_production.xml
@@ -2,7 +2,7 @@
 
 <upgrade>
 	<image path="images/stables.bmp"/>
-	<image-cancel path="../spear_weapons/images/upgrade_cancel.bmp"/>
+	<image-cancel path="../../../cancel.bmp"/>
 	<time value="100"/>
 	<unit-requirements/>
 	<upgrade-requirements />

diff --git a/techs/megapack/factions/egypt/upgrades/summon_ibis/summon_ibis.xml b/techs/megapack/factions/egypt/upgrades/summon_ibis/summon_ibis.xml
@@ -2,7 +2,7 @@
 
 <upgrade>
 	<image path="images/stables.bmp"/>
-	<image-cancel path="../spear_weapons/images/upgrade_cancel.bmp"/>
+	<image-cancel path="../../../cancel.bmp"/>
 	<time value="200"/>
 	<unit-requirements/>
 	<upgrade-requirements />

diff --git a/techs/megapack/factions/egypt/upgrades/summon_scarab/summon_scarab.xml b/techs/megapack/factions/egypt/upgrades/summon_scarab/summon_scarab.xml
@@ -2,7 +2,7 @@
 
 <upgrade>
 	<image path="images/stables.bmp"/>
-	<image-cancel path="../spear_weapons/images/upgrade_cancel.bmp"/>
+	<image-cancel path="../../../cancel.bmp"/>/>
 	<time value="200"/>
 	<unit-requirements/>
 	<upgrade-requirements/>

diff --git a/...s/spear_weapons/images/upgrade_cancel.bmp → techs/megapack/factions/indian/cancel.bmp b/...s/spear_weapons/images/upgrade_cancel.bmp → techs/megapack/factions/indian/cancel.bmp
diff --git a/techs/megapack/factions/indian/units/archer/archer.xml b/techs/megapack/factions/indian/units/archer/archer.xml
@@ -36,7 +36,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/archer.bmp"/>
-		<image-cancel path="images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/archer_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/axe_indian/axe_indian.xml b/techs/megapack/factions/indian/units/axe_indian/axe_indian.xml
@@ -35,7 +35,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/axe_indian.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/daemon_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/axe_thrower/axe_thrower.xml b/techs/megapack/factions/indian/units/axe_thrower/axe_thrower.xml
@@ -35,7 +35,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/axe_thrower.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/axe_thrower_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/beehive/beehive.xml b/techs/megapack/factions/indian/units/beehive/beehive.xml
@@ -33,7 +33,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/defense_tower.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/indian/units/big_tent/big_tent.xml b/techs/megapack/factions/indian/units/big_tent/big_tent.xml
@@ -40,7 +40,7 @@
 			<resource name= "wood" amount="200"/>
 		</resources-stored>
 		<image path="images/bigtent.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../main_teepee/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/indian/units/bull/bull.xml b/techs/megapack/factions/indian/units/bull/bull.xml
@@ -32,7 +32,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/bull.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/bull_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/campfire/campfire.xml b/techs/megapack/factions/indian/units/campfire/campfire.xml
@@ -31,7 +31,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/campfire.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../main_teepee/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/indian/units/fire_archer/fire_archer.xml b/techs/megapack/factions/indian/units/fire_archer/fire_archer.xml
@@ -37,7 +37,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/fire_archer.bmp"/>
-		<image-cancel path="images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/archer_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/fire_archer/images/tech_cancel.bmp b/techs/megapack/factions/indian/units/fire_archer/images/tech_cancel.bmp
diff --git a/techs/megapack/factions/indian/units/fire_golem/fire_golem.xml b/techs/megapack/factions/indian/units/fire_golem/fire_golem.xml
@@ -35,7 +35,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/firegolem.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/golem_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/horse_farm/horse_farm.xml b/techs/megapack/factions/indian/units/horse_farm/horse_farm.xml
@@ -35,7 +35,7 @@
 			<resource name="food" amount="20"/>
 		</resources-stored>
 		<image path="images/farm.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../main_teepee/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/indian/units/horseman/horseman.xml b/techs/megapack/factions/indian/units/horseman/horseman.xml
@@ -36,7 +36,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/horseman.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/horseman_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/main_teepee/main_teepee.xml b/techs/megapack/factions/indian/units/main_teepee/main_teepee.xml
@@ -40,7 +40,7 @@
 			<resource name= "stone" amount="1500"/>
 		</resources-stored>
 		<image path="images/mainteepee.bmp" />
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav" />

diff --git a/techs/megapack/factions/indian/units/reed/reed.xml b/techs/megapack/factions/indian/units/reed/reed.xml
@@ -36,7 +36,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/reed.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/indian/units/round_tent/round_tent.xml b/techs/megapack/factions/indian/units/round_tent/round_tent.xml
@@ -37,7 +37,7 @@
 		</resource-requirements>
 		<resources-stored />
 		<image path="images/roundtent.bmp" />
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav" />

diff --git a/techs/megapack/factions/indian/units/shaman/shaman.xml b/techs/megapack/factions/indian/units/shaman/shaman.xml
@@ -29,7 +29,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/shaman.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/shaman_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/spearman/spearman.xml b/techs/megapack/factions/indian/units/spearman/spearman.xml
@@ -35,7 +35,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/spearman.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/stickfighter_select1.wav"/>
@@ -107,7 +107,12 @@
 			<attack-start-time value="0.15"/>
 			<projectile value="false">
 			</projectile>
-			<splash value="true">				<radius value="0"/>				<damage-all value="true"/>				<particle value="true" path="particle_splash.xml"/>			</splash>		</skill>
+			<splash value="true">
+				<radius value="0"/>
+				<damage-all value="true"/>
+				<particle value="true" path="particle_splash.xml"/>
+			</splash>
+		</skill>
 
 		<skill>
 			<type value="morph"/>

diff --git a/techs/megapack/factions/indian/units/stickfighter/stickfighter.xml b/techs/megapack/factions/indian/units/stickfighter/stickfighter.xml
@@ -33,7 +33,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/swordman.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/stickfighter_select1.wav"/>

diff --git a/techs/megapack/factions/indian/units/tent/tent.xml b/techs/megapack/factions/indian/units/tent/tent.xml
@@ -36,7 +36,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/tent.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="true" image-path="../main_teepee/images/meeting_point.bmp"/>
 		<selection-sounds enabled="true">
 			<sound path="$COMMONDATAPATH/sounds/tech_click.wav"/>

diff --git a/techs/megapack/factions/indian/units/thunderbird/thunderbird.xml b/techs/megapack/factions/indian/units/thunderbird/thunderbird.xml
@@ -34,7 +34,7 @@
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/eagle.bmp"/>
-		<image-cancel path="../archer/images/tech_cancel.bmp"/>
+		<image-cancel path="../../cancel.bmp"/>
 		<meeting-point value="false"/>
 		<selection-sounds enabled="true">
 			<sound path="sounds/eagle_select1.wav"/>
@@ -100,7 +100,12 @@
 					<sound-file path="$COMMONDATAPATH/sounds/eagle_hit4.wav"/>
 				</sound>
 			</projectile>
-			<splash value="true">				<radius value="1"/>				<damage-all value="true"/>				<particle value="true" path="particle_splash.xml"/>			</splash>		</skill>
+			<splash value="true">
+				<radius value="1"/>
+				<damage-all value="true"/>
+				<particle value="true" path="particle_splash.xml"/>
+			</splash>
+		</skill>
 		<skill>
 			<type value="attack"/>
 			<name value="attack_skill"/>