- merge Skree images, add a second facing
- merge Gaelotroll images, tinker with base image set and add a second facing git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@3262 282e977c-c81d-0410-88c4-b93c2d0d6712master
| 
						 | 
				
			
			@ -1,22 +1,29 @@
 | 
			
		|||
Object gaelotroll
 | 
			
		||||
randomitems giant
 | 
			
		||||
race troll
 | 
			
		||||
face gaelotroll.111
 | 
			
		||||
face gaelotroll.x31
 | 
			
		||||
anim
 | 
			
		||||
gaelotroll.111
 | 
			
		||||
gaelotroll.112
 | 
			
		||||
gaelotroll.113
 | 
			
		||||
gaelotroll.112
 | 
			
		||||
gaelotroll.111
 | 
			
		||||
gaelotroll.112
 | 
			
		||||
gaelotroll.113
 | 
			
		||||
gaelotroll.112
 | 
			
		||||
facings 2
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
mina
 | 
			
		||||
resist_fire -100
 | 
			
		||||
 | 
			
		||||
resist_physical 50
 | 
			
		||||
resist_fear 50
 | 
			
		||||
 | 
			
		||||
attacktype 65
 | 
			
		||||
can_see_in_dark 1
 | 
			
		||||
exp 70000
 | 
			
		||||
| 
						 | 
				
			
			@ -32,7 +39,7 @@ maxhp 3000
 | 
			
		|||
level 12
 | 
			
		||||
alive 1
 | 
			
		||||
speed -0.2
 | 
			
		||||
weight 300000
 | 
			
		||||
weight 3000000
 | 
			
		||||
monster 1
 | 
			
		||||
sleep 1
 | 
			
		||||
Wis 13
 | 
			
		||||
| 
						 | 
				
			
			@ -48,102 +55,142 @@ end
 | 
			
		|||
More
 | 
			
		||||
Object gaelotroll_2
 | 
			
		||||
name troll
 | 
			
		||||
face gaelotroll.211
 | 
			
		||||
face gaelotroll.x31
 | 
			
		||||
anim
 | 
			
		||||
gaelotroll.211
 | 
			
		||||
gaelotroll.212
 | 
			
		||||
gaelotroll.213
 | 
			
		||||
gaelotroll.212
 | 
			
		||||
gaelotroll.211
 | 
			
		||||
gaelotroll.212
 | 
			
		||||
gaelotroll.213
 | 
			
		||||
gaelotroll.212
 | 
			
		||||
facings 2
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
mina
 | 
			
		||||
monster 1
 | 
			
		||||
alive 1
 | 
			
		||||
x 1
 | 
			
		||||
weight 300000
 | 
			
		||||
magicmap blue
 | 
			
		||||
end
 | 
			
		||||
More
 | 
			
		||||
Object gaelotroll_3
 | 
			
		||||
name troll
 | 
			
		||||
face gaelotroll.311
 | 
			
		||||
face gaelotroll.x31
 | 
			
		||||
anim
 | 
			
		||||
gaelotroll.311
 | 
			
		||||
gaelotroll.312
 | 
			
		||||
gaelotroll.313
 | 
			
		||||
gaelotroll.312
 | 
			
		||||
gaelotroll.311
 | 
			
		||||
gaelotroll.312
 | 
			
		||||
gaelotroll.313
 | 
			
		||||
gaelotroll.312
 | 
			
		||||
facings 2
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
mina
 | 
			
		||||
monster 1
 | 
			
		||||
alive 1
 | 
			
		||||
y 1
 | 
			
		||||
weight 300000
 | 
			
		||||
magicmap blue
 | 
			
		||||
end
 | 
			
		||||
More
 | 
			
		||||
Object gaelotroll_4
 | 
			
		||||
name troll
 | 
			
		||||
face gaelotroll.411
 | 
			
		||||
face gaelotroll.x31
 | 
			
		||||
anim
 | 
			
		||||
gaelotroll.411
 | 
			
		||||
gaelotroll.412
 | 
			
		||||
gaelotroll.413
 | 
			
		||||
gaelotroll.412
 | 
			
		||||
gaelotroll.411
 | 
			
		||||
gaelotroll.412
 | 
			
		||||
gaelotroll.413
 | 
			
		||||
gaelotroll.412
 | 
			
		||||
facings 2
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
mina
 | 
			
		||||
monster 1
 | 
			
		||||
alive 1
 | 
			
		||||
x 1
 | 
			
		||||
y 1
 | 
			
		||||
weight 300000
 | 
			
		||||
magicmap blue
 | 
			
		||||
end
 | 
			
		||||
More
 | 
			
		||||
Object gaelotroll_5
 | 
			
		||||
name troll
 | 
			
		||||
face gaelotroll.511
 | 
			
		||||
face gaelotroll.x31
 | 
			
		||||
anim
 | 
			
		||||
gaelotroll.511
 | 
			
		||||
gaelotroll.512
 | 
			
		||||
gaelotroll.513
 | 
			
		||||
gaelotroll.512
 | 
			
		||||
gaelotroll.511
 | 
			
		||||
gaelotroll.512
 | 
			
		||||
gaelotroll.513
 | 
			
		||||
gaelotroll.512
 | 
			
		||||
facings 2
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
mina
 | 
			
		||||
monster 1
 | 
			
		||||
alive 1
 | 
			
		||||
y 2
 | 
			
		||||
weight 300000
 | 
			
		||||
magicmap blue
 | 
			
		||||
end
 | 
			
		||||
More
 | 
			
		||||
Object gaelotroll_6
 | 
			
		||||
name troll
 | 
			
		||||
face gaelotroll.611
 | 
			
		||||
face gaelotroll.x31
 | 
			
		||||
anim
 | 
			
		||||
gaelotroll.611
 | 
			
		||||
gaelotroll.612
 | 
			
		||||
gaelotroll.613
 | 
			
		||||
gaelotroll.612
 | 
			
		||||
gaelotroll.611
 | 
			
		||||
gaelotroll.612
 | 
			
		||||
gaelotroll.613
 | 
			
		||||
gaelotroll.612
 | 
			
		||||
facings 2
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x31
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x33
 | 
			
		||||
gaelotroll.x32
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x71
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
gaelotroll.x73
 | 
			
		||||
gaelotroll.x72
 | 
			
		||||
mina
 | 
			
		||||
monster 1
 | 
			
		||||
alive 1
 | 
			
		||||
x 1
 | 
			
		||||
y 2
 | 
			
		||||
weight 300000
 | 
			
		||||
magicmap blue
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
		 Before Width: | Height: | Size: 152 B  | 
| 
		 Before Width: | Height: | Size: 152 B  | 
| 
		 Before Width: | Height: | Size: 152 B  | 
| 
		 Before Width: | Height: | Size: 203 B  | 
| 
		 Before Width: | Height: | Size: 209 B  | 
| 
		 Before Width: | Height: | Size: 224 B  | 
| 
		 Before Width: | Height: | Size: 259 B  | 
| 
		 Before Width: | Height: | Size: 257 B  | 
| 
		 Before Width: | Height: | Size: 255 B  | 
| 
		 Before Width: | Height: | Size: 261 B  | 
| 
		 Before Width: | Height: | Size: 261 B  | 
| 
		 Before Width: | Height: | Size: 242 B  | 
| 
		 Before Width: | Height: | Size: 157 B  | 
| 
		 Before Width: | Height: | Size: 197 B  | 
| 
		 Before Width: | Height: | Size: 184 B  | 
| 
		 Before Width: | Height: | Size: 170 B  | 
| 
		 Before Width: | Height: | Size: 170 B  | 
| 
		 Before Width: | Height: | Size: 170 B  | 
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
Object skree
 | 
			
		||||
face skree.111
 | 
			
		||||
face skree.x31
 | 
			
		||||
race undead
 | 
			
		||||
randomitems skree
 | 
			
		||||
animation skree_1
 | 
			
		||||
| 
						 | 
				
			
			@ -37,29 +37,26 @@ undead 1
 | 
			
		|||
end
 | 
			
		||||
More
 | 
			
		||||
Object skree_2
 | 
			
		||||
face skree.211
 | 
			
		||||
face skree.x31
 | 
			
		||||
animation skree_2
 | 
			
		||||
x 1
 | 
			
		||||
weight 1800000
 | 
			
		||||
alive 1
 | 
			
		||||
color_fg black
 | 
			
		||||
end
 | 
			
		||||
More
 | 
			
		||||
Object skree_3
 | 
			
		||||
face skree.311
 | 
			
		||||
face skree.x31
 | 
			
		||||
animation skree_3
 | 
			
		||||
y 1
 | 
			
		||||
weight 1800000
 | 
			
		||||
alive 1
 | 
			
		||||
color_fg black
 | 
			
		||||
end
 | 
			
		||||
More
 | 
			
		||||
Object skree_4
 | 
			
		||||
face skree.411
 | 
			
		||||
face skree.x31
 | 
			
		||||
animation skree_4
 | 
			
		||||
x 1
 | 
			
		||||
y 1
 | 
			
		||||
weight 1800000
 | 
			
		||||
alive 1
 | 
			
		||||
color_fg black
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
		 Before Width: | Height: | Size: 1.0 KiB  | 
| 
		 Before Width: | Height: | Size: 1.0 KiB  | 
| 
		 Before Width: | Height: | Size: 940 B  | 
| 
		 Before Width: | Height: | Size: 910 B  | 
| 
		 Before Width: | Height: | Size: 899 B  | 
| 
		 Before Width: | Height: | Size: 840 B  | 
| 
		 Before Width: | Height: | Size: 1.1 KiB  | 
| 
		 Before Width: | Height: | Size: 1.0 KiB  | 
| 
		 Before Width: | Height: | Size: 1.1 KiB  | 
| 
		 Before Width: | Height: | Size: 1.1 KiB  | 
| 
		 Before Width: | Height: | Size: 1.0 KiB  | 
| 
		 Before Width: | Height: | Size: 968 B  | 
| 
		 Before Width: | Height: | Size: 240 B  | 
| 
		 Before Width: | Height: | Size: 236 B  | 
| 
		 Before Width: | Height: | Size: 223 B  | 
| 
		 Before Width: | Height: | Size: 236 B  | 
| 
		 Before Width: | Height: | Size: 236 B  | 
| 
		 Before Width: | Height: | Size: 234 B  | 
| 
		 Before Width: | Height: | Size: 262 B  | 
| 
		 Before Width: | Height: | Size: 251 B  | 
| 
		 Before Width: | Height: | Size: 249 B  | 
| 
		 Before Width: | Height: | Size: 264 B  | 
| 
		 Before Width: | Height: | Size: 258 B  | 
| 
		 Before Width: | Height: | Size: 243 B  | 
| 
						 | 
				
			
			@ -1,24 +1,36 @@
 | 
			
		|||
animation skree_1
 | 
			
		||||
facings 1
 | 
			
		||||
skree.111
 | 
			
		||||
skree.112
 | 
			
		||||
skree.113
 | 
			
		||||
facings 2
 | 
			
		||||
skree.x31
 | 
			
		||||
skree.x32
 | 
			
		||||
skree.x33
 | 
			
		||||
skree.x71
 | 
			
		||||
skree.x72
 | 
			
		||||
skree.x73
 | 
			
		||||
mina
 | 
			
		||||
animation skree_2
 | 
			
		||||
facings 1
 | 
			
		||||
skree.211
 | 
			
		||||
skree.212
 | 
			
		||||
skree.213
 | 
			
		||||
facings 2
 | 
			
		||||
skree.x31
 | 
			
		||||
skree.x32
 | 
			
		||||
skree.x33
 | 
			
		||||
skree.x71
 | 
			
		||||
skree.x72
 | 
			
		||||
skree.x73
 | 
			
		||||
mina
 | 
			
		||||
animation skree_3
 | 
			
		||||
facings 1
 | 
			
		||||
skree.311
 | 
			
		||||
skree.312
 | 
			
		||||
skree.313
 | 
			
		||||
facings 2
 | 
			
		||||
skree.x31
 | 
			
		||||
skree.x32
 | 
			
		||||
skree.x33
 | 
			
		||||
skree.x71
 | 
			
		||||
skree.x72
 | 
			
		||||
skree.x73
 | 
			
		||||
mina
 | 
			
		||||
animation skree_4
 | 
			
		||||
facings 1
 | 
			
		||||
skree.411
 | 
			
		||||
skree.412
 | 
			
		||||
skree.413
 | 
			
		||||
facings 2
 | 
			
		||||
skree.x31
 | 
			
		||||
skree.x32
 | 
			
		||||
skree.x33
 | 
			
		||||
skree.x71
 | 
			
		||||
skree.x72
 | 
			
		||||
skree.x73
 | 
			
		||||
mina
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||