diff --git a/data/multiplayer.cfg b/data/multiplayer.cfg index ea91bb284ed..24a012657db 100644 --- a/data/multiplayer.cfg +++ b/data/multiplayer.cfg @@ -3,12 +3,7 @@ name= _ "User Map" turns=90 - {DAWN} - {MORNING} - {AFTERNOON} - {DUSK} - {FIRST_WATCH} - {SECOND_WATCH} + {DEFAULT_SCHEDULE} [/generic_multiplayer] #ifdef MULTIPLAYER diff --git a/data/units/Elvish_Druid.cfg b/data/units/Elvish_Druid.cfg index d6d54a71ea2..71e2abc34e4 100644 --- a/data/units/Elvish_Druid.cfg +++ b/data/units/Elvish_Druid.cfg @@ -50,7 +50,7 @@ Special Notes: A druid's entangling attack slows enemies down, halving their mov [/sound] [/animation] [/attack] - + [attack] name=ensnare type=impact @@ -60,6 +60,10 @@ Special Notes: A druid's entangling attack slows enemies down, halving their mov range=ranged icon=attacks/entangle.png [animation] + [sound] + time=0 + sound=entangle.wav + [/sound] [frame] begin=-250 end=0 @@ -73,7 +77,7 @@ Special Notes: A druid's entangling attack slows enemies down, halving their mov [/missile_frame] [/animation] [/attack] - + [attack] name=thorns type=pierce diff --git a/data/units/Elvish_Enchantress.cfg b/data/units/Elvish_Enchantress.cfg index 3e61d43c855..c6a3edf59a5 100644 --- a/data/units/Elvish_Enchantress.cfg +++ b/data/units/Elvish_Enchantress.cfg @@ -1,191 +1,195 @@ -[unit] - id=Elvish Enchantress - name= _ "female^Elvish Enchantress" - race=elf - gender=female - image="units/elves-wood/enchantress.png" - [defend] - range=melee - [frame] - begin=-150 - end=150 - image="units/elves-wood/enchantress-defend.png" - [/frame] - [/defend] - [defend] - range=ranged - [frame] - begin=-150 - end=150 - image="units/elves-wood/enchantress-ranged-defend.png" - [/frame] - [/defend] - hitpoints=50 - movement_type=woodland - [resistance] - cold=80 - [/resistance] - movement=5 - experience=180 - level=3 - alignment=neutral - advanceto=Elvish Sylph - cost=55 - usage=mixed fighter - unit_description= _ "The Elven Enchantresses are masters of offensive magic, striking at their enemies both with blasts of icy wind drawn from the ethereal plane, and magically animating roots with which they bind their enemies in place." - get_hit_sound=female-hit.wav - - [attack] - name=staff - type=impact - range=melee - damage=5 - number=2 - range=melee - icon=attacks/druidstaff.png - [animation] - [frame] - begin=-250 - end=-200 - image="units/elves-wood/enchantress-melee1.png" - [/frame] - [frame] - begin=-200 - end=-100 - image="units/elves-wood/enchantress-melee2.png" - [/frame] - [frame] - begin=-100 - end=25 - image="units/elves-wood/enchantress-melee3.png" - [/frame] - [frame] - begin=25 - end=100 - image="units/elves-wood/enchantress-melee4.png" - [/frame] - [frame] - begin=100 - end=150 - image="units/elves-wood/enchantress-melee5.png" - [/frame] - [sound] - time=-100 - sound=staff.wav - [/sound] - [/animation] - [/attack] - - - [attack] - name=entangle - type=impact - special=slow - damage=5 - number=4 - range=ranged - [animation] - [frame] - begin=-450 - end=-380 - image="units/elves-wood/enchantress-entangle1.png" - [/frame] - [frame] - begin=-380 - end=-310 - image="units/elves-wood/enchantress-entangle2.png" - [/frame] - [frame] - begin=-310 - end=-240 - image="units/elves-wood/enchantress-entangle3.png" - [/frame] - [frame] - begin=-240 - end=-170 - image="units/elves-wood/enchantress-entangle4.png" - [/frame] - [frame] - begin=-170 - end=-100 - image="units/elves-wood/enchantress-entangle5.png" - [/frame] - - [missile_frame] - begin=-200 - end=50 - image="projectiles/entangle.png" - image_diagonal="projectiles/entangle.png" - [/missile_frame] - - [frame] - begin=-100 - end=-30 - image="units/elves-wood/enchantress-entangle6.png" - [/frame] - [frame] - begin=-30 - end=40 - image="units/elves-wood/enchantress-entangle7.png" - [/frame] - [/animation] - [/attack] - - [attack] - name=faerie fire - type=cold - damage=9 - number=4 - range=ranged - special=magical - icon=attacks/iceball.png - [animation] - [frame] - begin=-450 - end=-380 - image="units/elves-wood/enchantress-attack1.png" - [/frame] - [frame] - begin=-380 - end=-310 - image="units/elves-wood/enchantress-attack2.png" - [/frame] - [frame] - begin=-310 - end=-240 - image="units/elves-wood/enchantress-attack3.png" - [/frame] - [frame] - begin=-240 - end=-170 - image="units/elves-wood/enchantress-attack4.png" - [/frame] - [frame] - begin=-170 - end=-100 - image="units/elves-wood/enchantress-attack5.png" - [/frame] - - [missile_frame] - begin=-200 - end=50 - image="projectiles/icemissile-n.png" - image_diagonal="projectiles/icemissile-ne.png" - halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100, - halo_x,halo_y=0,0 - [/missile_frame] - - [frame] - begin=-100 - end=-30 - image="units/elves-wood/enchantress-attack6.png" - [/frame] - [frame] - begin=-30 - end=40 - image="units/elves-wood/enchantress-attack7.png" - [/frame] - [/animation] - [/attack] - -[/unit] +[unit] + id=Elvish Enchantress + name= _ "female^Elvish Enchantress" + race=elf + gender=female + image="units/elves-wood/enchantress.png" + [defend] + range=melee + [frame] + begin=-150 + end=150 + image="units/elves-wood/enchantress-defend.png" + [/frame] + [/defend] + [defend] + range=ranged + [frame] + begin=-150 + end=150 + image="units/elves-wood/enchantress-ranged-defend.png" + [/frame] + [/defend] + hitpoints=50 + movement_type=woodland + [resistance] + cold=80 + [/resistance] + movement=5 + experience=180 + level=3 + alignment=neutral + advanceto=Elvish Sylph + cost=55 + usage=mixed fighter + unit_description= _ "The Elven Enchantresses are masters of offensive magic, striking at their enemies both with blasts of icy wind drawn from the ethereal plane, and magically animating roots with which they bind their enemies in place." + get_hit_sound=female-hit.wav + + [attack] + name=staff + type=impact + range=melee + damage=5 + number=2 + range=melee + icon=attacks/druidstaff.png + [animation] + [frame] + begin=-250 + end=-200 + image="units/elves-wood/enchantress-melee1.png" + [/frame] + [frame] + begin=-200 + end=-100 + image="units/elves-wood/enchantress-melee2.png" + [/frame] + [frame] + begin=-100 + end=25 + image="units/elves-wood/enchantress-melee3.png" + [/frame] + [frame] + begin=25 + end=100 + image="units/elves-wood/enchantress-melee4.png" + [/frame] + [frame] + begin=100 + end=150 + image="units/elves-wood/enchantress-melee5.png" + [/frame] + [sound] + time=-100 + sound=staff.wav + [/sound] + [/animation] + [/attack] + + + [attack] + name=entangle + type=impact + special=slow + damage=5 + number=4 + range=ranged + [animation] + [sound] + time=0 + sound=entangle.wav + [/sound] + [frame] + begin=-450 + end=-380 + image="units/elves-wood/enchantress-entangle1.png" + [/frame] + [frame] + begin=-380 + end=-310 + image="units/elves-wood/enchantress-entangle2.png" + [/frame] + [frame] + begin=-310 + end=-240 + image="units/elves-wood/enchantress-entangle3.png" + [/frame] + [frame] + begin=-240 + end=-170 + image="units/elves-wood/enchantress-entangle4.png" + [/frame] + [frame] + begin=-170 + end=-100 + image="units/elves-wood/enchantress-entangle5.png" + [/frame] + + [missile_frame] + begin=-200 + end=50 + image="projectiles/entangle.png" + image_diagonal="projectiles/entangle.png" + [/missile_frame] + + [frame] + begin=-100 + end=-30 + image="units/elves-wood/enchantress-entangle6.png" + [/frame] + [frame] + begin=-30 + end=40 + image="units/elves-wood/enchantress-entangle7.png" + [/frame] + [/animation] + [/attack] + + [attack] + name=faerie fire + type=cold + damage=9 + number=4 + range=ranged + special=magical + icon=attacks/iceball.png + [animation] + [frame] + begin=-450 + end=-380 + image="units/elves-wood/enchantress-attack1.png" + [/frame] + [frame] + begin=-380 + end=-310 + image="units/elves-wood/enchantress-attack2.png" + [/frame] + [frame] + begin=-310 + end=-240 + image="units/elves-wood/enchantress-attack3.png" + [/frame] + [frame] + begin=-240 + end=-170 + image="units/elves-wood/enchantress-attack4.png" + [/frame] + [frame] + begin=-170 + end=-100 + image="units/elves-wood/enchantress-attack5.png" + [/frame] + + [missile_frame] + begin=-200 + end=50 + image="projectiles/icemissile-n.png" + image_diagonal="projectiles/icemissile-ne.png" + halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100, + halo_x,halo_y=0,0 + [/missile_frame] + + [frame] + begin=-100 + end=-30 + image="units/elves-wood/enchantress-attack6.png" + [/frame] + [frame] + begin=-30 + end=40 + image="units/elves-wood/enchantress-attack7.png" + [/frame] + [/animation] + [/attack] + +[/unit] diff --git a/data/units/Elvish_Shaman.cfg b/data/units/Elvish_Shaman.cfg index de442e48a11..be002301423 100644 --- a/data/units/Elvish_Shaman.cfg +++ b/data/units/Elvish_Shaman.cfg @@ -32,7 +32,7 @@ The healing abilities of the elves are also remarkable, and of capital use in ba Special Notes: A shaman's entangling attack slows enemies down, halving their movement speed and attack damage. Shamans are capable of basic healing, though they can only delay the effects of poison, not cure them entirely." get_hit_sound=female-hit.wav - + [attack] name=staff type=impact @@ -52,7 +52,7 @@ Special Notes: A shaman's entangling attack slows enemies down, halving their mo [/sound] [/animation] [/attack] - + [attack] name=entangle type=impact @@ -61,6 +61,10 @@ Special Notes: A shaman's entangling attack slows enemies down, halving their mo number=2 range=ranged [animation] + [sound] + time=0 + sound=entangle.wav + [/sound] [frame] begin=-250 end=0 diff --git a/data/units/Elvish_Shyde.cfg b/data/units/Elvish_Shyde.cfg index aae8ddb4524..a6b5d1ef4be 100644 --- a/data/units/Elvish_Shyde.cfg +++ b/data/units/Elvish_Shyde.cfg @@ -31,7 +31,7 @@ Special Notes: A shyde's entangling attack slows enemies down, halving their movement speed and attack damage. Shydes are capable of healing units around them, and curing them of poison." get_hit_sound=female-hit.wav - + [attack] name=faerie touch icon=attacks/faerie-touch.png @@ -60,7 +60,7 @@ Special Notes: A shyde's entangling attack slows enemies down, halving their mov [/frame] [/animation] [/attack] - + [attack] name=ensnare type=impact @@ -70,6 +70,10 @@ Special Notes: A shyde's entangling attack slows enemies down, halving their mov range=ranged icon=attacks/entangle.png [animation] + [sound] + time=0 + sound=entangle.wav + [/sound] [frame] begin=-200 end=-100 @@ -83,7 +87,7 @@ Special Notes: A shyde's entangling attack slows enemies down, halving their mov [/missile_frame] [/animation] [/attack] - + [attack] name=thorns type=pierce diff --git a/data/units/Elvish_Sorceress.cfg b/data/units/Elvish_Sorceress.cfg index 54d98098766..6fc2d8c3881 100644 --- a/data/units/Elvish_Sorceress.cfg +++ b/data/units/Elvish_Sorceress.cfg @@ -1,191 +1,195 @@ -[unit] - id=Elvish Sorceress - name= _ "female^Elvish Sorceress" - race=elf - gender=female - image="units/elves-wood/sorceress.png" - [defend] - range=melee - [frame] - begin=-150 - end=150 - image="units/elves-wood/sorceress-defend.png" - [/frame] - [/defend] - [defend] - range=ranged - [frame] - begin=-150 - end=150 - image="units/elves-wood/sorceress-ranged-defend.png" - [/frame] - [/defend] - hitpoints=41 - movement_type=woodland - [resistance] - cold=90 - [/resistance] - movement=5 - experience=100 - level=2 - alignment=neutral - advanceto=Elvish Enchantress - cost=34 - usage=mixed fighter - unit_description= _ "Eschewing the study of healing in favor of more aggressive uses of magic, Elvish Sorceresses have become quite proficient at ranged combat. Their entangling attack is notably more effective than that of the Elvish Shaman, and they can call upon bursts of chilling ethereal wind to smite those who oppose them." - get_hit_sound=female-hit.wav - - [attack] - name=staff - type=impact - range=melee - damage=4 - number=2 - range=melee - icon=attacks/druidstaff.png - [animation] - [frame] - begin=-250 - end=-200 - image="units/elves-wood/sorceress-melee1.png" - [/frame] - [frame] - begin=-200 - end=-100 - image="units/elves-wood/sorceress-melee2.png" - [/frame] - [frame] - begin=-100 - end=25 - image="units/elves-wood/sorceress-melee3.png" - [/frame] - [frame] - begin=25 - end=100 - image="units/elves-wood/sorceress-melee4.png" - [/frame] - [frame] - begin=100 - end=150 - image="units/elves-wood/sorceress-melee5.png" - [/frame] - [sound] - time=-100 - sound=staff.wav - [/sound] - [/animation] - [/attack] - - - [attack] - name=entangle - type=impact - special=slow - damage=4 - number=3 - range=ranged - [animation] - [frame] - begin=-450 - end=-380 - image="units/elves-wood/sorceress-entangle1.png" - [/frame] - [frame] - begin=-380 - end=-310 - image="units/elves-wood/sorceress-entangle2.png" - [/frame] - [frame] - begin=-310 - end=-240 - image="units/elves-wood/sorceress-entangle3.png" - [/frame] - [frame] - begin=-240 - end=-170 - image="units/elves-wood/sorceress-entangle4.png" - [/frame] - [frame] - begin=-170 - end=-100 - image="units/elves-wood/sorceress-entangle5.png" - [/frame] - - [missile_frame] - begin=-200 - end=50 - image="projectiles/entangle.png" - image_diagonal="projectiles/entangle.png" - [/missile_frame] - - [frame] - begin=-100 - end=-30 - image="units/elves-wood/sorceress-entangle6.png" - [/frame] - [frame] - begin=-30 - end=40 - image="units/elves-wood/sorceress-entangle7.png" - [/frame] - [/animation] - [/attack] - - [attack] - name=faerie fire - type=cold - damage=7 - number=4 - range=ranged - special=magical - icon=attacks/iceball.png - [animation] - [frame] - begin=-450 - end=-380 - image="units/elves-wood/sorceress-attack1.png" - [/frame] - [frame] - begin=-380 - end=-310 - image="units/elves-wood/sorceress-attack2.png" - [/frame] - [frame] - begin=-310 - end=-240 - image="units/elves-wood/sorceress-attack3.png" - [/frame] - [frame] - begin=-240 - end=-170 - image="units/elves-wood/sorceress-attack4.png" - [/frame] - [frame] - begin=-170 - end=-100 - image="units/elves-wood/sorceress-attack5.png" - [/frame] - - [missile_frame] - begin=-200 - end=50 - image="projectiles/icemissile-n.png" - image_diagonal="projectiles/icemissile-ne.png" - halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100, - halo_x,halo_y=0,0 - [/missile_frame] - - [frame] - begin=-100 - end=-30 - image="units/elves-wood/sorceress-attack6.png" - [/frame] - [frame] - begin=-30 - end=40 - image="units/elves-wood/sorceress-attack7.png" - [/frame] - [/animation] - [/attack] - -[/unit] +[unit] + id=Elvish Sorceress + name= _ "female^Elvish Sorceress" + race=elf + gender=female + image="units/elves-wood/sorceress.png" + [defend] + range=melee + [frame] + begin=-150 + end=150 + image="units/elves-wood/sorceress-defend.png" + [/frame] + [/defend] + [defend] + range=ranged + [frame] + begin=-150 + end=150 + image="units/elves-wood/sorceress-ranged-defend.png" + [/frame] + [/defend] + hitpoints=41 + movement_type=woodland + [resistance] + cold=90 + [/resistance] + movement=5 + experience=100 + level=2 + alignment=neutral + advanceto=Elvish Enchantress + cost=34 + usage=mixed fighter + unit_description= _ "Eschewing the study of healing in favor of more aggressive uses of magic, Elvish Sorceresses have become quite proficient at ranged combat. Their entangling attack is notably more effective than that of the Elvish Shaman, and they can call upon bursts of chilling ethereal wind to smite those who oppose them." + get_hit_sound=female-hit.wav + + [attack] + name=staff + type=impact + range=melee + damage=4 + number=2 + range=melee + icon=attacks/druidstaff.png + [animation] + [frame] + begin=-250 + end=-200 + image="units/elves-wood/sorceress-melee1.png" + [/frame] + [frame] + begin=-200 + end=-100 + image="units/elves-wood/sorceress-melee2.png" + [/frame] + [frame] + begin=-100 + end=25 + image="units/elves-wood/sorceress-melee3.png" + [/frame] + [frame] + begin=25 + end=100 + image="units/elves-wood/sorceress-melee4.png" + [/frame] + [frame] + begin=100 + end=150 + image="units/elves-wood/sorceress-melee5.png" + [/frame] + [sound] + time=-100 + sound=staff.wav + [/sound] + [/animation] + [/attack] + + + [attack] + name=entangle + type=impact + special=slow + damage=4 + number=3 + range=ranged + [animation] + [sound] + time=0 + sound=entangle.wav + [/sound] + [frame] + begin=-450 + end=-380 + image="units/elves-wood/sorceress-entangle1.png" + [/frame] + [frame] + begin=-380 + end=-310 + image="units/elves-wood/sorceress-entangle2.png" + [/frame] + [frame] + begin=-310 + end=-240 + image="units/elves-wood/sorceress-entangle3.png" + [/frame] + [frame] + begin=-240 + end=-170 + image="units/elves-wood/sorceress-entangle4.png" + [/frame] + [frame] + begin=-170 + end=-100 + image="units/elves-wood/sorceress-entangle5.png" + [/frame] + + [missile_frame] + begin=-200 + end=50 + image="projectiles/entangle.png" + image_diagonal="projectiles/entangle.png" + [/missile_frame] + + [frame] + begin=-100 + end=-30 + image="units/elves-wood/sorceress-entangle6.png" + [/frame] + [frame] + begin=-30 + end=40 + image="units/elves-wood/sorceress-entangle7.png" + [/frame] + [/animation] + [/attack] + + [attack] + name=faerie fire + type=cold + damage=7 + number=4 + range=ranged + special=magical + icon=attacks/iceball.png + [animation] + [frame] + begin=-450 + end=-380 + image="units/elves-wood/sorceress-attack1.png" + [/frame] + [frame] + begin=-380 + end=-310 + image="units/elves-wood/sorceress-attack2.png" + [/frame] + [frame] + begin=-310 + end=-240 + image="units/elves-wood/sorceress-attack3.png" + [/frame] + [frame] + begin=-240 + end=-170 + image="units/elves-wood/sorceress-attack4.png" + [/frame] + [frame] + begin=-170 + end=-100 + image="units/elves-wood/sorceress-attack5.png" + [/frame] + + [missile_frame] + begin=-200 + end=50 + image="projectiles/icemissile-n.png" + image_diagonal="projectiles/icemissile-ne.png" + halo=halo/ice-halo1.png:100,halo/ice-halo2.png:100,halo/ice-halo3.png:100,halo/ice-halo4.png:100,halo/ice-halo5.png:100, + halo_x,halo_y=0,0 + [/missile_frame] + + [frame] + begin=-100 + end=-30 + image="units/elves-wood/sorceress-attack6.png" + [/frame] + [frame] + begin=-30 + end=40 + image="units/elves-wood/sorceress-attack7.png" + [/frame] + [/animation] + [/attack] + +[/unit]