Skip to content

Commit

Permalink
Remove unused images from Dead Water.
Browse files Browse the repository at this point in the history
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.

(cherry-picked from commit 649fdc9)
  • Loading branch information
Pentarctagon committed Oct 7, 2018
1 parent 39edd7c commit 27ea9cc
Show file tree
Hide file tree
Showing 46 changed files with 0 additions and 141 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
30 changes: 0 additions & 30 deletions data/campaigns/Dead_Water/units/Child_King.cfg
Expand Up @@ -17,7 +17,6 @@
description= _ "When a merman king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/child_king.png" "units/merfolk/child_king.png" mermen-hit.wav }
# {DEFENSE_ANIM "units/merfolk/child_king-defend.png" "units/merfolk/child_king.png" mermen-hit.wav }
[attack]
name=scepter
description=_"scepter"
Expand All @@ -26,33 +25,4 @@
damage=4
number=3
[/attack]
# [attack_anim]
# [filter_attack]
# name=scepter
# [/filter_attack]
# direction=s,se,sw,ne,nw
# start_time=-500
# [frame]
# image="units/merfolk/child_king-attack-[1~5].png:[200,100*3,200]"
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image="units/merfolk/child_king.png:150"
# [/frame]
# [/attack_anim]
#
# [attack_anim]
# [filter_attack]
# name=scepter
# [/filter_attack]
# direction=n
# start_time=-400
# [frame]
# image="units/merfolk/child_king-attack-[1,2,3n].png:[200,100,200]"
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image="units/merfolk/child_king.png:150"
# [/frame]
# [/attack_anim]
[/unit_type]
37 changes: 0 additions & 37 deletions data/campaigns/Dead_Water/units/Soldier_King.cfg
Expand Up @@ -4,12 +4,6 @@
name= _ "Soldier King"
race=merman
image="units/merfolk/soldier_king.png"
# [leading_anim]
# start_time=-150
# [frame]
# image="units/merfolk/soldier_king-leading.png:300"
# [/frame]
# [/leading_anim]
profile="portraits/kai_krellis2.png"
hitpoints=52
movement_type=swimmer
Expand All @@ -26,7 +20,6 @@
description= _ "A king who is skilled at combat commands great respect — especially among soldiers. His strength allows him to wield powerful weapons and move quickly, even with heavy armor. His leadership abilities inspire his troops."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/soldier_king.png" "units/merfolk/soldier_king.png" mermen-hit.wav }
# {DEFENSE_ANIM "units/merfolk/soldier_king-defend.png" "units/merfolk/soldier_king.png" mermen-hit.wav }
[resistance]
blade=80
pierce=80
Expand All @@ -41,34 +34,4 @@
damage=8
number=4
[/attack]
# [attack_anim]
# [filter_attack]
# name=mace-spiked
# [/filter_attack]
# direction=s,se,sw,ne,nw
# start_time=-300
# [frame]
# image=units/merfolk/soldier_king-attack-[1~8].png:[100*2,50*3,150,50*2]
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image=units/merfolk/soldier_king.png:150
# [/frame]
# [/attack_anim]
#
# # attack north----------------------------------------------
# [attack_anim]
# [filter_attack]
# name=mace-spiked
# [/filter_attack]
# direction=n
# start_time=-400
# [frame]
# image=units/merfolk/soldier_king-attack-[1~3,4n,8].png:[100*3,150,100]
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image=units/merfolk/soldier_king.png:150
# [/frame]
# [/attack_anim]
[/unit_type]
37 changes: 0 additions & 37 deletions data/campaigns/Dead_Water/units/Warrior_King.cfg
Expand Up @@ -4,12 +4,6 @@
name= _ "Warrior King"
race=merman
image="units/merfolk/warrior_king.png"
# [leading_anim]
# start_time=-150
# [frame]
# image="units/merfolk/warrior_king-leading.png:300"
# [/frame]
# [/leading_anim]
profile="portraits/kai_krellis2.png"
hitpoints=64
movement_type=swimmer
Expand All @@ -26,7 +20,6 @@
description= _ "Warrior kings often become legendary in their own time. Their skill and strength allows them to be truly formidable in battle. They are also fast despite their heavy armor. Even skilled soldiers look upon them with awe."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/warrior_king.png" "units/merfolk/warrior_king.png" mermen-hit.wav }
# {DEFENSE_ANIM "units/merfolk/warrior_king-defend.png" "units/merfolk/warrior_king.png" mermen-hit.wav }
[resistance]
pierce=80
blade=70
Expand All @@ -42,34 +35,4 @@
damage=9
number=5
[/attack]
# [attack_anim]
# [filter_attack]
# name=mace-spiked
# [/filter_attack]
# direction=s,se,sw,ne,nw
# start_time=-300
# [frame]
# image=units/merfolk/warrior_king-attack-[1~8].png:[100*2,50*3,150,50*2]
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image=units/merfolk/warrior_king.png:150
# [/frame]
# [/attack_anim]
#
# # attack north----------------------------------------------
# [attack_anim]
# [filter_attack]
# name=mace-spiked
# [/filter_attack]
# direction=n
# start_time=-400
# [frame]
# image=units/merfolk/warrior_king-attack-[1~3,4n,8].png:[100*3,150,100]
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image=units/merfolk/warrior_king.png:150
# [/frame]
# [/attack_anim]
[/unit_type]
37 changes: 0 additions & 37 deletions data/campaigns/Dead_Water/units/Young_King.cfg
Expand Up @@ -4,12 +4,6 @@
name= _ "Young King"
race=merman
image="units/merfolk/young_king.png"
# [leading_anim]
# start_time=-150
# [frame]
# image=units/merfolk/young_king-leading.png:300
# [/frame]
# [/leading_anim]
profile="portraits/kai_krellis.png"
hitpoints=38
movement_type=swimmer
Expand All @@ -26,7 +20,6 @@
description= _ "A young king with some battle experience will be treated with some respect. Common citizens will be inspired to do their utmost when the king is nearby, but battle-hardened veterens will be less impressed."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/young_king.png" "units/merfolk/young_king.png" mermen-hit.wav }
# {DEFENSE_ANIM "units/merfolk/young_king-defend.png" "units/merfolk/young_king.png" mermen-hit.wav }
[attack]
name=mace
#textdomain wesnoth-units
Expand All @@ -37,34 +30,4 @@
damage=7
number=3
[/attack]
# [attack_anim]
# [filter_attack]
# name=mace
# [/filter_attack]
# direction=s,se,sw,ne,nw
# start_time=-500
# [frame]
# image=units/merfolk/young_king-attack-[1~9].png:[100*2,50*3,150,100*3]
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image=units/merfolk/young_king.png:150
# [/frame]
# [/attack_anim]
#
# #- attack north ---------------------------
# [attack_anim]
# [filter_attack]
# name=mace
# [/filter_attack]
# direction=n
# start_time=-400
# [frame]
# image=units/merfolk/young_king-attack-[1~3,4n,9].png:[100*3,150,100]
# [/frame]
# {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
# [frame]
# image=units/merfolk/young_king.png:150
# [/frame]
# [/attack_anim]
[/unit_type]

0 comments on commit 27ea9cc

Please sign in to comment.