0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved the Fire Guardian to core.

Browse source
This commit is contained in:
Steven Panek 2010-10-07 21:47:03 +00:00
parent f3052d1159
commit 2f88768339
16 changed files with 34 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -1513,21 +1513,21 @@
[/redraw]
#ifdef EASY
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 26 21 () ( _ "Guardian Phoenix")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 26 21 () ( _ "Guardian Phoenix")}
[+unit]
role=Guardian Phoenix
[/unit]
#endif
#ifdef NORMAL
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 26 21 () ( _ "Guardian Phoenix")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 26 21 () ( _ "Guardian Phoenix")}
[+unit]
role=Guardian Phoenix
[/unit]
#endif
#ifdef HARD
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 26 21 () ( _ "Guardian Phoenix")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 26 21 () ( _ "Guardian Phoenix")}
[+unit]
role=Guardian Phoenix
[/unit]
@ -1592,21 +1592,21 @@
[/redraw]
#ifdef EASY
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 26 21 () ( _ "Guardian Phoenix")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 26 21 () ( _ "Guardian Phoenix")}
[+unit]
role=Guardian Phoenix
[/unit]
#endif
#ifdef NORMAL
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 26 21 () ( _ "Guardian Phoenix")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 26 21 () ( _ "Guardian Phoenix")}
[+unit]
role=Guardian Phoenix
[/unit]
#endif
#ifdef HARD
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 26 21 () ( _ "Guardian Phoenix")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 26 21 () ( _ "Guardian Phoenix")}
[+unit]
role=Guardian Phoenix
[/unit]
@ -1699,19 +1699,19 @@
[/scroll_to]
#ifdef EASY
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 26 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 26 18 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 26 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 26 18 () ( _ "Fire Guardian")}
#endif
#ifdef NORMAL
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 26 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 26 18 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 26 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 26 18 () ( _ "Fire Guardian")}
#endif
#ifdef HARD
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 25 18 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 26 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 26 18 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 25 18 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 26 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 26 18 () ( _ "Fire Guardian")}
#endif
{CHECK_EXPLORER}
@ -1750,19 +1750,19 @@
[/scroll_to]
#ifdef EASY
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 26 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 27 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 26 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 27 22 () ( _ "Fire Guardian")}
#endif
#ifdef NORMAL
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 26 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 27 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 26 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 27 22 () ( _ "Fire Guardian")}
#endif
#ifdef HARD
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 26 21 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 26 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 27 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 26 21 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 26 22 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 27 22 () ( _ "Fire Guardian")}
#endif
{CHECK_EXPLORER}
@ -1801,19 +1801,19 @@
[/scroll_to]
#ifdef EASY
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 22 16 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster) 23 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 22 16 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian) 23 17 () ( _ "Fire Guardian")}
#endif
#ifdef NORMAL
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 22 16 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster2) 23 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 22 16 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian2) 23 17 () ( _ "Fire Guardian")}
#endif
#ifdef HARD
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 23 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 22 16 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Lava Monster3) 22 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 23 17 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 22 16 () ( _ "Fire Guardian")}
{NAMED_NOTRAIT_UNIT 5 (Fire Guardian3) 22 17 () ( _ "Fire Guardian")}
#endif
{CHECK_EXPLORER}
[message]

6
data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster2.cfg → data/campaigns/Under_the_Burning_Suns/units/monsters/Fire_Guardian2.cfg
View file

@ -1,9 +1,9 @@
#textdomain wesnoth-utbs
# wmllint: no translatables
[unit_type]
[base_unit]
id=Lava Monster
id=Fire Guardian
[/base_unit]
id=Lava Monster2
id=Fire Guardian2
hitpoints=23
[defense]
frozen=50

6
data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster3.cfg → data/campaigns/Under_the_Burning_Suns/units/monsters/Fire_Guardian3.cfg
View file

@ -1,9 +1,9 @@
#textdomain wesnoth-utbs
# wmllint: no translatables
[unit_type]
[base_unit]
id=Lava Monster
id=Fire Guardian
[/base_unit]
id=Lava Monster3
id=Fire Guardian3
hide_help=yes
do_not_list=yes
hitpoints=26

124
data/campaigns/Under_the_Burning_Suns/units/monsters/Lava_Monster.cfg
View file

@ -1,124 +0,0 @@
#textdomain wesnoth-utbs
[unit_type]
id=Lava Monster
name= _ "Fire Guardian"
race=monster
{TRAIT_ELEMENTAL}
image="units/monsters/fireghost.png"
{DEFENSE_ANIM "units/monsters/fireghost-defend.png" "units/monsters/fireghost.png" groan.wav }
hitpoints=20
movement_type=drakefly
[defense]
frozen=40
[/defense]
[resistance]
blade=100
pierce=100
impact=100
[/resistance]
movement=6
experience=150
level=1
alignment=neutral
advances_to=null
{AMLA_DEFAULT}
cost=19
usage=fighter
description= _ "Fire Guardians are spirits of smoke and flame. No one is exactly sure where they come from, but they are occasionally summoned by powerful mages. When not being ordered around, they like to frolic in pools of lava and take great delight in burning anything they can reach."
[attack]
name=fire claws
description= _"fire claws"
type=fire
icon=attacks/claws-flaming.png
range=melee
damage=4
number=3
[/attack]
[attack]
name=fire breath
description= _"fire breath"
icon=attacks/fireball.png
type=fire
range=ranged
damage=7
number=2
[/attack]
[death]
[frame]
begin=0
end=50
image="units/monsters/fireghost.png"
[/frame]
[frame]
begin=50
end=150
image="units/monsters/fireghost-death1.png"
[/frame]
[frame]
begin=150
end=250
image="units/monsters/fireghost-death2.png"
[/frame]
[frame]
begin=250
end=350
image="units/monsters/fireghost-death3.png"
[/frame]
[frame]
begin=350
end=450
image="units/monsters/fireghost-death4.png"
[/frame]
[frame]
begin=450
end=550
image="units/monsters/fireghost-death5.png"
[/frame]
[frame]
begin=550
end=650
image="units/monsters/fireghost-death6.png"
[/frame]
[/death]
[attack_anim]
[filter_attack]
name=fire breath
[/filter_attack]
{MISSILE_FRAME_FIREBALL}
start_time=-450
[frame]
duration=100
image="units/monsters/fireghost-attack1.png"
[/frame]
[frame]
duration=50
image="units/monsters/fireghost-ranged2.png"
[/frame]
[frame]
duration=100
image="units/monsters/fireghost-ranged2.png"
sound=fire.wav
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
name=fire claws
[/filter_attack]
[frame]
begin=-100
end=0
image="units/monsters/fireghost-attack1.png"
[/frame]
[frame]
begin=0
end=50
image="units/monsters/fireghost-attack2.png"
[/frame]
[frame]
begin=50
end=100
image="units/monsters/fireghost-attack2.png"
sound=fire.wav
[/frame]
[/attack_anim]
[/unit_type]

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-attack1.png → data/core/images/units/monsters/fireghost-attack1.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-attack2.png → data/core/images/units/monsters/fireghost-attack2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-death1.png → data/core/images/units/monsters/fireghost-death1.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-death2.png → data/core/images/units/monsters/fireghost-death2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-death3.png → data/core/images/units/monsters/fireghost-death3.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-death4.png → data/core/images/units/monsters/fireghost-death4.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-death5.png → data/core/images/units/monsters/fireghost-death5.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 677 B

After

Width:  |  Height:  |  Size: 677 B

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-death6.png → data/core/images/units/monsters/fireghost-death6.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-defend.png → data/core/images/units/monsters/fireghost-defend.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost-ranged2.png → data/core/images/units/monsters/fireghost-ranged2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

0
data/campaigns/Dead_Water/images/units/monsters/fireghost.png → data/core/images/units/monsters/fireghost.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

2
data/campaigns/Dead_Water/units/Fire_Guardian.cfg → data/core/units/monsters/Fire_Guardian.cfg
View file

@ -1,4 +1,4 @@
#textdomain wesnoth-dw
#textdomain wesnoth-units
[unit_type]
id=Fire Guardian
name= _ "Fire Guardian"