Author: esr
Date: Mon Nov 17 23:23:20 2008
New Revision: 30802
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30802&view=rev
Log:
Collect the Nym line into one file so her animations can be defined by
a single macro.
Added:
trunk/data/campaigns/Under_the_Burning_Suns/units/Nym.cfg
Removed:
trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg
trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg
trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg
Added: trunk/data/campaigns/Under_the_Burning_Suns/units/Nym.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Nym.cfg?rev=30802&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Nym.cfg (added)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Nym.cfg Mon Nov 17
23:23:20 2008
@@ -1,0 +1,127 @@
+#textdomain wesnoth-utbs
+
+#define NYM_ANIMATIONS
+ {DEFENSE_ANIM "units/elves-desert/nym-defend.png"
units/elves-desert/nym.png {SOUND_LIST:ELF_FEMALE_HIT} }
+ [attack_anim]
+ [filter_attack]
+ name=bolas
+ [/filter_attack]
+ [missile_frame]
+ begin=-150
+ end=0
+ image=projectiles/bolas-n.png
+ image_diagonal=projectiles/bolas-ne.png
+ [/missile_frame]
+ [if]
+ hits=yes
+ [frame]
+ begin=-300
+ end=-200
+ image=units/elves-desert/nym-ranged-1.png
+ sound=hatchet.wav
+ [/frame]
+ [/if]
+ [else]
+ hits=no
+ [frame]
+ begin=-300
+ end=-200
+ image=units/elves-desert/nym-ranged-1.png
+ sound=hatchet-miss.wav
+ [/frame]
+ [/else]
+ [frame]
+ begin=-200
+ end=-100
+ image=units/elves-desert/nym-ranged-2.png
+ [/frame]
+ [frame]
+ begin=-100
+ end=0
+ image=units/elves-desert/nym-ranged-3.png
+ [/frame]
+ {SOUND:SLOW}
+ [/attack_anim]
+ [attack_anim]
+ [filter_attack]
+ name=sword
+ [/filter_attack]
+ [frame]
+ begin=-200
+ end=-175
+ image=units/elves-desert/nym.png
+ [/frame]
+ [frame]
+ begin=-175
+ end=-100
+ image=units/elves-desert/nym-melee-1.png
+ [/frame]
+ [if]
+ hits=yes
+ [frame]
+ begin=-100
+ end=100
+ image=units/elves-desert/nym-melee-2.png
+ sound={SOUND_LIST:SWORD_SWISH}
+ [/frame]
+ [/if]
+ [else]
+ hits=no
+ [frame]
+ begin=-100
+ end=100
+ image=units/elves-desert/nym-melee-2.png
+ sound={SOUND_LIST:MISS}
+ [/frame]
+ [/else]
+ [frame]
+ begin=100
+ end=150
+ image=units/elves-desert/nym.png
+ [/frame]
+ [/attack_anim]
+#enddef
+
+[unit_type]
+ id=Nym Hunter
+ [base_unit]
+ id=Desert Hunter
+ [/base_unit]
+ name= _ "female^Desert Hunter"
+ gender=female
+ image=units/elves-desert/nym.png
+ profile=portraits/nym.png
+ advances_to=Nym Sentinel
+ description= _ "Nym is Kaleh's childhood friend who follows the tradition
of a family of Desert Hunters, as much as that can be said about a young,
rebellious lady with quick wits and strong will. Her high spirits are a great
boon in dark times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
+ die_sound={SOUND_LIST:ELF_FEMALE_HIT}
+ {NYM_ANIMATIONS}
+[/unit_type]
+
+[unit_type]
+ id=Nym Sentinel
+ [base_unit]
+ id=Desert Sentinel
+ [/base_unit]
+ name= _ "female^Desert Sentinel"
+ gender=female
+ image=units/elves-desert/nym.png
+ profile=portraits/nym.png
+ advances_to=Nym Prowler
+ description= _ "Nym is Kaleh's childhood friend who follows the tradition
of a family of Desert Hunters, as much as that can be said about a young,
rebellious lady with quick wits and strong will. Her high spirits are a great
boon in dark
times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_SKIRMISHER}
+ die_sound={SOUND_LIST:ELF_FEMALE_HIT}
+ {NYM_ANIMATIONS}
+[/unit_type]
+
+[unit_type]
+ id=Nym Prowler
+ [base_unit]
+ id=Desert Prowler
+ [/base_unit]
+ gender=female
+ name= _ "female^Desert Prowler"
+ image=units/elves-desert/nym.png
+ profile=portraits/nym.png
+ description= _ "Nym is Kaleh's childhood friend who follows the tradition
of a family of Desert Hunters, as much as that can be said about a young,
rebellious lady with quick wits and strong will. Her high spirits are a great
boon in dark
times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_SKIRMISHER}
+ die_sound={SOUND_LIST:ELF_FEMALE_HIT}
+ {NYM_ANIMATIONS}
+[/unit_type]
Removed: trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg?rev=30801&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Hunter.cfg (removed)
@@ -1,93 +1,0 @@
-#textdomain wesnoth-utbs
-[unit_type]
- id=Nym Hunter
- [base_unit]
- id=Desert Hunter
- [/base_unit]
- name= _ "female^Desert Hunter"
- gender=female
- image=units/elves-desert/nym.png
- profile=portraits/nym.png
- advances_to=Nym Sentinel
- description= _ "Nym is Kaleh's childhood friend who follows the tradition
of a family of Desert Hunters, as much as that can be said about a young,
rebellious lady with quick wits and strong will. Her high spirits are a great
boon in dark times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
- die_sound={SOUND_LIST:ELF_FEMALE_HIT}
- {DEFENSE_ANIM "units/elves-desert/nym-defend.png"
units/elves-desert/nym.png {SOUND_LIST:ELF_FEMALE_HIT} }
- [attack_anim]
- [filter_attack]
- name=bolas
- [/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image=projectiles/bolas-n.png
- image_diagonal=projectiles/bolas-ne.png
- [/missile_frame]
- [if]
- hits=yes
- [frame]
- begin=-300
- end=-200
- image=units/elves-desert/nym-ranged-1.png
- sound=hatchet.wav
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- begin=-300
- end=-200
- image=units/elves-desert/nym-ranged-1.png
- sound=hatchet-miss.wav
- [/frame]
- [/else]
- [frame]
- begin=-200
- end=-100
- image=units/elves-desert/nym-ranged-2.png
- [/frame]
- [frame]
- begin=-100
- end=0
- image=units/elves-desert/nym-ranged-3.png
- [/frame]
- {SOUND:SLOW}
- [/attack_anim]
- [attack_anim]
- [filter_attack]
- name=sword
- [/filter_attack]
- [frame]
- begin=-200
- end=-175
- image=units/elves-desert/nym.png
- [/frame]
- [frame]
- begin=-175
- end=-100
- image=units/elves-desert/nym-melee-1.png
- [/frame]
- [if]
- hits=yes
- [frame]
- begin=-100
- end=100
- image=units/elves-desert/nym-melee-2.png
- sound={SOUND_LIST:SWORD_SWISH}
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- begin=-100
- end=100
- image=units/elves-desert/nym-melee-2.png
- sound={SOUND_LIST:MISS}
- [/frame]
- [/else]
- [frame]
- begin=100
- end=150
- image=units/elves-desert/nym.png
- [/frame]
- [/attack_anim]
-[/unit_type]
Removed: trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg?rev=30801&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Prowler.cfg (removed)
@@ -1,92 +1,0 @@
-#textdomain wesnoth-utbs
-[unit_type]
- id=Nym Prowler
- [base_unit]
- id=Desert Prowler
- [/base_unit]
- gender=female
- name= _ "female^Desert Prowler"
- image=units/elves-desert/nym.png
- profile=portraits/nym.png
- description= _ "Nym is Kaleh's childhood friend who follows the tradition
of a family of Desert Hunters, as much as that can be said about a young,
rebellious lady with quick wits and strong will. Her high spirits are a great
boon in dark
times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_SKIRMISHER}
- die_sound={SOUND_LIST:ELF_FEMALE_HIT}
- {DEFENSE_ANIM "units/elves-desert/nym-defend.png"
units/elves-desert/nym.png {SOUND_LIST:ELF_FEMALE_HIT} }
- [attack_anim]
- [filter_attack]
- name=bolas
- [/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image=projectiles/bolas-n.png
- image_diagonal=projectiles/bolas-ne.png
- [/missile_frame]
- [if]
- hits=yes
- [frame]
- begin=-300
- end=-200
- image=units/elves-desert/nym-ranged-1.png
- sound=hatchet.wav
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- begin=-300
- end=-200
- image=units/elves-desert/nym-ranged-1.png
- sound=hatchet-miss.wav
- [/frame]
- [/else]
- [frame]
- begin=-200
- end=-100
- image=units/elves-desert/nym-ranged-2.png
- [/frame]
- [frame]
- begin=-100
- end=0
- image=units/elves-desert/nym-ranged-3.png
- [/frame]
- {SOUND:SLOW}
- [/attack_anim]
- [attack_anim]
- [filter_attack]
- name=sword
- [/filter_attack]
- [frame]
- begin=-200
- end=-175
- image=units/elves-desert/nym.png
- [/frame]
- [frame]
- begin=-175
- end=-100
- image=units/elves-desert/nym-melee-1.png
- [/frame]
- [if]
- hits=yes
- [frame]
- begin=-100
- end=100
- image=units/elves-desert/nym-melee-2.png
- sound={SOUND_LIST:SWORD_SWISH}
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- begin=-100
- end=100
- image=units/elves-desert/nym-melee-2.png
- sound={SOUND_LIST:MISS}
- [/frame]
- [/else]
- [frame]
- begin=100
- end=150
- image=units/elves-desert/nym.png
- [/frame]
- [/attack_anim]
-[/unit_type]
Removed: trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg?rev=30801&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Nym_Sentinel.cfg (removed)
@@ -1,93 +1,0 @@
-#textdomain wesnoth-utbs
-[unit_type]
- id=Nym Sentinel
- [base_unit]
- id=Desert Sentinel
- [/base_unit]
- name= _ "female^Desert Sentinel"
- gender=female
- image=units/elves-desert/nym.png
- profile=portraits/nym.png
- advances_to=Nym Prowler
- description= _ "Nym is Kaleh's childhood friend who follows the tradition
of a family of Desert Hunters, as much as that can be said about a young,
rebellious lady with quick wits and strong will. Her high spirits are a great
boon in dark
times."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}+{SPECIAL_NOTES_SKIRMISHER}
- die_sound={SOUND_LIST:ELF_FEMALE_HIT}
- {DEFENSE_ANIM "units/elves-desert/nym-defend.png"
units/elves-desert/nym.png {SOUND_LIST:ELF_FEMALE_HIT} }
- [attack_anim]
- [filter_attack]
- name=bolas
- [/filter_attack]
- [missile_frame]
- begin=-150
- end=0
- image=projectiles/bolas-n.png
- image_diagonal=projectiles/bolas-ne.png
- [/missile_frame]
- [if]
- hits=yes
- [frame]
- begin=-300
- end=-200
- image=units/elves-desert/nym-ranged-1.png
- sound=hatchet.wav
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- begin=-300
- end=-200
- image=units/elves-desert/nym-ranged-1.png
- sound=hatchet-miss.wav
- [/frame]
- [/else]
- [frame]
- begin=-200
- end=-100
- image=units/elves-desert/nym-ranged-2.png
- [/frame]
- [frame]
- begin=-100
- end=0
- image=units/elves-desert/nym-ranged-3.png
- [/frame]
- {SOUND:SLOW}
- [/attack_anim]
- [attack_anim]
- [filter_attack]
- name=sword
- [/filter_attack]
- [frame]
- begin=-200
- end=-175
- image=units/elves-desert/nym.png
- [/frame]
- [frame]
- begin=-175
- end=-100
- image=units/elves-desert/nym-melee-1.png
- [/frame]
- [if]
- hits=yes
- [frame]
- begin=-100
- end=100
- image=units/elves-desert/nym-melee-2.png
- sound={SOUND_LIST:SWORD_SWISH}
- [/frame]
- [/if]
- [else]
- hits=no
- [frame]
- begin=-100
- end=100
- image=units/elves-desert/nym-melee-2.png
- sound={SOUND_LIST:MISS}
- [/frame]
- [/else]
- [frame]
- begin=100
- end=150
- image=units/elves-desert/nym.png
- [/frame]
- [/attack_anim]
-[/unit_type]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
