Merged 13075 13056 13015 13006 12995 into trunk
This commit is contained in:
Isaac Clerencia Perez
parent
f8ea0baf3a
commit
d0711b6a16
22 changed files with 229 additions and 104 deletions
|
|
@ -38,18 +38,13 @@
|
|||
direction=sw,s,se
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-150
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=-50
|
||||
end=-100
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[if]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w2.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
|
|
@ -58,7 +53,7 @@
|
|||
[else]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w2.png"
|
||||
sound={SOUND_LIST:SWORD_SWISH}
|
||||
|
|
@ -69,28 +64,18 @@
|
|||
end=175
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
direction=nw,n,ne
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-150
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=-50
|
||||
end=-100
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[if]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w3.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
|
|
@ -99,7 +84,7 @@
|
|||
[else]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w3.png"
|
||||
sound={SOUND_LIST:SWORD_SWISH}
|
||||
|
|
@ -110,11 +95,6 @@
|
|||
end=175
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
[attack]
|
||||
|
|
@ -248,18 +228,13 @@
|
|||
direction=sw,s,se
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-150
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=-50
|
||||
end=-100
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[if]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w2.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
|
|
@ -268,7 +243,7 @@
|
|||
[else]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w2.png"
|
||||
sound={SOUND_LIST:SWORD_SWISH}
|
||||
|
|
@ -279,28 +254,18 @@
|
|||
end=175
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
direction=nw,n,ne
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-150
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=-50
|
||||
end=-100
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[if]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w3.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
|
|
@ -309,7 +274,7 @@
|
|||
[else]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-50
|
||||
begin=-100
|
||||
end=100
|
||||
image="konrad-lord-attack-w3.png"
|
||||
sound={SOUND_LIST:SWORD_SWISH}
|
||||
|
|
@ -320,11 +285,6 @@
|
|||
end=175
|
||||
image="konrad-lord-attack-w1.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image="konrad-lord.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
[attack]
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 3.2 KiB |
|
|
@ -28,11 +28,16 @@
|
|||
number=3
|
||||
[animation]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-225
|
||||
end=-200
|
||||
image=deoran/junior-commander.png
|
||||
sound=horse-canter.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-100
|
||||
image=deoran/junior-commander-attack.png
|
||||
sound=horse-canter.wav
|
||||
image=deoran/junior-commander-moving.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-100
|
||||
|
|
@ -40,14 +45,29 @@
|
|||
image=deoran/junior-commander-attack.png
|
||||
sound=spear.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image=deoran/junior-commander-moving.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image=deoran/junior-commander.png
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-225
|
||||
end=-200
|
||||
image=deoran/junior-commander.png
|
||||
sound=horse-canter.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-100
|
||||
image=deoran/junior-commander-attack.png
|
||||
sound=horse-canter.wav
|
||||
image=deoran/junior-commander-moving.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-100
|
||||
|
|
@ -55,6 +75,16 @@
|
|||
image=deoran/junior-commander-attack.png
|
||||
sound={SOUND_LIST:MISS}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image=deoran/junior-commander-moving.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image=deoran/junior-commander.png
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
[movement_anim]
|
||||
|
|
@ -64,5 +94,5 @@
|
|||
image=deoran/junior-commander-moving.png
|
||||
[/frame]
|
||||
[/movement_anim]
|
||||
{DEFENSE_ANIM "deoran/junior-commander-defend.png" deoran/junior-commander.png {SOUND_LIST:HORSE_HIT} }
|
||||
{DEFENSE_ANIM "deoran/junior-commander-defend.png" "deoran/junior-commander.png" {SOUND_LIST:HORSE_HIT} }
|
||||
[/unit]
|
||||
|
|
|
|||
|
|
@ -34,11 +34,16 @@
|
|||
number=3
|
||||
[animation]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-225
|
||||
end=-200
|
||||
image=deoran/horseman-commander.png
|
||||
sound=horse-canter.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-100
|
||||
image=deoran/horseman-commander-moving.png
|
||||
sound=horse-canter.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-100
|
||||
|
|
@ -46,14 +51,29 @@
|
|||
image=deoran/horseman-commander-attack.png
|
||||
sound=spear.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image=deoran/horseman-commander-moving.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image=deoran/horseman-commander.png
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-225
|
||||
end=-200
|
||||
image=deoran/horseman-commander.png
|
||||
sound=horse-canter.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-100
|
||||
image=deoran/horseman-commander-moving.png
|
||||
sound=horse-canter.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-100
|
||||
|
|
@ -61,6 +81,16 @@
|
|||
image=deoran/horseman-commander-attack.png
|
||||
sound={SOUND_LIST:MISS}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image=deoran/horseman-commander-moving.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=175
|
||||
end=200
|
||||
image=deoran/horseman-commander.png
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
[movement_anim]
|
||||
|
|
@ -70,5 +100,5 @@
|
|||
image=deoran/horseman-commander-moving.png
|
||||
[/frame]
|
||||
[/movement_anim]
|
||||
{DEFENSE_ANIM "deoran/horseman-commander-defend.png" deoran/horseman-commander.png {SOUND_LIST:HORSE_HIT} }
|
||||
{DEFENSE_ANIM "deoran/horseman-commander-defend.png" "deoran/horseman-commander.png" {SOUND_LIST:HORSE_HIT} }
|
||||
[/unit]
|
||||
|
|
|
|||
|
|
@ -33,30 +33,50 @@
|
|||
hits=yes
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-175
|
||||
image=deoran/dismounted-commander.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-175
|
||||
end=-100
|
||||
image=deoran/dismounted-commander-attack1.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-100
|
||||
end=0
|
||||
end=100
|
||||
image=deoran/dismounted-commander-attack2.png
|
||||
sound=spear.wav
|
||||
sound=spear.ogg
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image=deoran/dismounted-commander.png
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-175
|
||||
image=deoran/dismounted-commander.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-175
|
||||
end=-100
|
||||
image=deoran/dismounted-commander-attack1.png
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-100
|
||||
end=0
|
||||
end=100
|
||||
image=deoran/dismounted-commander-attack2.png
|
||||
sound=spear-miss.ogg
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image=deoran/dismounted-commander.png
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
{DEFENSE_ANIM "deoran/dismounted-commander-defend.png" deoran/dismounted-commander.png {SOUND_LIST:HUMAN_HIT} }
|
||||
{DEFENSE_ANIM "deoran/dismounted-commander-defend.png" "deoran/dismounted-commander.png" {SOUND_LIST:HUMAN_HIT} }
|
||||
[/unit]
|
||||
|
|
|
|||
|
|
@ -30,20 +30,50 @@
|
|||
[animation]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-101
|
||||
end=100
|
||||
begin=-200
|
||||
end=-150
|
||||
image="gerrick/infantry-commander.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=50
|
||||
image="gerrick/infantry-commander-attack.png"
|
||||
sound={SOUND_LIST:SWORD_SWISH}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=50
|
||||
end=150
|
||||
image="gerrick/infantry-commander-attack-shield.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=150
|
||||
end=200
|
||||
image="gerrick/infantry-commander.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-101
|
||||
end=100
|
||||
begin=-200
|
||||
end=-150
|
||||
image="gerrick/infantry-commander.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=50
|
||||
image="gerrick/infantry-commander-attack.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=50
|
||||
end=150
|
||||
image="gerrick/infantry-commander-attack-shield.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=150
|
||||
end=200
|
||||
image="gerrick/infantry-commander.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
{DEFENSE_ANIM "gerrick/infantry-commander-defend.png" "gerrick/infantry-commander.png" {SOUND_LIST:HUMAN_HIT} }
|
||||
|
|
|
|||
|
|
@ -32,20 +32,50 @@
|
|||
[animation]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-101
|
||||
end=100
|
||||
begin=-200
|
||||
end=-150
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=50
|
||||
image="gerrick/assault-commander-attack.png"
|
||||
sound={SOUND_LIST:SWORD_SWISH}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=50
|
||||
end=150
|
||||
image="gerrick/assault-commander-attack-shield.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=150
|
||||
end=200
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-101
|
||||
end=100
|
||||
begin=-200
|
||||
end=-150
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-150
|
||||
end=50
|
||||
image="gerrick/assault-commander-attack.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=50
|
||||
end=150
|
||||
image="gerrick/assault-commander-attack-shield.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=150
|
||||
end=200
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
[attack]
|
||||
|
|
@ -61,20 +91,40 @@
|
|||
[animation]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-101
|
||||
begin=-200
|
||||
end=-125
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-125
|
||||
end=100
|
||||
image="gerrick/assault-commander-attack-shield.png"
|
||||
sound=mace.wav
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[animation]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-101
|
||||
begin=-200
|
||||
end=-125
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=-125
|
||||
end=100
|
||||
image="gerrick/assault-commander-attack-shield.png"
|
||||
sound={SOUND_LIST:MISS}
|
||||
[/frame]
|
||||
[frame]
|
||||
begin=100
|
||||
end=175
|
||||
image="gerrick/assault-commander.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
[/attack]
|
||||
{DEFENSE_ANIM "gerrick/assault-commander-defend.png" "gerrick/assault-commander.png" {SOUND_LIST:HUMAN_HIT} }
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
[/specials]
|
||||
[animation]
|
||||
[frame]
|
||||
begin=-100
|
||||
end=100
|
||||
begin=-175
|
||||
end=175
|
||||
image="lich/demilich-attack.png"
|
||||
sound=wail.wav
|
||||
[/frame]
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ Special Notes: A Desert Shyde's entangling attack slows enemies down, halving th
|
|||
icon=attacks/entangle.png
|
||||
[animation]
|
||||
[missile_frame]
|
||||
begin=-150
|
||||
begin=-200
|
||||
end=0
|
||||
image="projectiles/entangle.png"
|
||||
image_diagonal="projectiles/entangle.png"
|
||||
|
|
@ -96,8 +96,8 @@ Special Notes: A Desert Shyde's entangling attack slows enemies down, halving th
|
|||
[/frame]
|
||||
[frame]
|
||||
sound=entangle.wav
|
||||
begin=0
|
||||
end=1
|
||||
begin=-100
|
||||
end=0
|
||||
image="newelves/desert-elvish-shyde-ftouch-attack3.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ Special Notes: A Desert Star's entangling attack slows enemies down, halving the
|
|||
number=2
|
||||
range=melee
|
||||
icon=attacks/touch-faerie.png
|
||||
[animations]
|
||||
[animation]
|
||||
[frame]
|
||||
begin=-200
|
||||
end=-100
|
||||
|
|
@ -79,7 +79,7 @@ Special Notes: A Desert Star's entangling attack slows enemies down, halving the
|
|||
end=100
|
||||
image=newelves/desert-elvish-shyde-ftouch-attack3.png
|
||||
[/frame]
|
||||
[/animations]
|
||||
[/animation]
|
||||
[/attack]
|
||||
[attack]
|
||||
name=ensnare
|
||||
|
|
@ -105,8 +105,8 @@ Special Notes: A Desert Star's entangling attack slows enemies down, halving the
|
|||
[/frame]
|
||||
[frame]
|
||||
sound=entangle.wav
|
||||
begin=0
|
||||
end=1
|
||||
begin=-100
|
||||
end=0
|
||||
image="newelves/desert-elvish-shyde-ftouch-attack3.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
|
|
|
|||
|
|
@ -95,8 +95,8 @@
|
|||
[/frame]
|
||||
[frame]
|
||||
sound=entangle.wav
|
||||
begin=0
|
||||
end=1
|
||||
begin=-100
|
||||
end=0
|
||||
image="newelves/desert-elvish-shyde-ftouch-attack3.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@
|
|||
[/frame]
|
||||
[frame]
|
||||
sound=entangle.wav
|
||||
begin=0
|
||||
end=1
|
||||
begin=-100
|
||||
end=0
|
||||
image="newelves/desert-elvish-shyde-ftouch-attack3.png"
|
||||
[/frame]
|
||||
[/animation]
|
||||
|
|
|
|||
|
|
@ -673,19 +673,29 @@ What would you like to wish for?"
|
|||
special=magical
|
||||
damage=14
|
||||
number=2
|
||||
|
||||
# this conflicts with the new animation syntax and needs to be changed!
|
||||
[animation]
|
||||
[sound]
|
||||
time=-200
|
||||
sound=lightning.ogg
|
||||
[/sound]
|
||||
[missile_frame]
|
||||
begin=-100
|
||||
end=0
|
||||
image=projectiles/lightning-n.png
|
||||
image_diagonal=projectiles/lightning-ne.png
|
||||
begin=-150
|
||||
end=0
|
||||
image=projectiles/lightning-n.png
|
||||
image_diagonal=projectiles/lightning-ne.png
|
||||
[/missile_frame]
|
||||
[if]
|
||||
hits=no
|
||||
[frame]
|
||||
begin=-200
|
||||
end=100
|
||||
sound=lightning-miss.ogg
|
||||
[/frame]
|
||||
[/if]
|
||||
[else]
|
||||
hits=yes
|
||||
[frame]
|
||||
begin=-200
|
||||
end=100
|
||||
sound=lightning.ogg
|
||||
[/frame]
|
||||
[/else]
|
||||
[/animation]
|
||||
[/effect]
|
||||
[/object]
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
|
|
@ -29,14 +29,9 @@ namespace about
|
|||
|
||||
std::vector<std::string> get_text(std::string campaign) {
|
||||
static const char *credits[] = {
|
||||
"_" N_("+Core Developers"),
|
||||
"_" N_("+ Main Developer"),
|
||||
"- David White (Sirp)",
|
||||
"- ",
|
||||
"_" N_("+ Artwork and graphics designer"),
|
||||
"- Francisco Muñoz (fmunoz)",
|
||||
"- ",
|
||||
"_" N_("+Developers"),
|
||||
"- David White (Sirp)",
|
||||
"- *",
|
||||
"- Alfredo Beaumont (ziberpunk)",
|
||||
"- András Salamon (ott)",
|
||||
"- Benoît Timbert (Noyga)",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue