Items clean up

data/items.cfg

@@ -11,7 +11,7 @@
 # ITM_BOOK1 ITM_BOOK2 ITM_BOOK3 ITM_BOOK4 ITM_FLOWER1 ITM_FLOWER2
 # ITM_FLOWER3 ITM_FLOWER4 ITM_ORNATE1 ITM_ORNATE2 ITM_ROCK1
 # ITM_ROCK2 ITM_ROCK3 ITM_ROCK4 ITM_DRAGONSTATUE ITM_MONOLITH1
-# ITM_MONOLITH2 ITM_MONOLITH3 ITM_MONOLITH4 ITM_BALL1 ITM_BALL2
+# ITM_MONOLITH2 ITM_MONOLITH3 ITM_MONOLITH4 ITM_BALL_GREEN ITM_BALL_BLUE
 # ITM_BARREL ITM_TREE1 ITM_TREE2 ITM_WELL ITM_WISHINGWELL
 #
 # OBJECTS
@@ -32,7 +32,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-book1.png
+	image=items/book1.png
 	[/item]
 #enddef
 
@@ -40,7 +40,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-book2.png
+	image=items/book2.png
 	[/item]
 #enddef
 
@@ -48,7 +48,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-book3.png
+	image=items/book3.png
 	[/item]
 #enddef
 
@@ -56,7 +56,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-book4.png
+	image=items/book4.png
 	[/item]
 #enddef
 
@@ -64,7 +64,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-flower1.png
+	image=items/flower1.png
 	[/item]
 #enddef
 
@@ -72,7 +72,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-flower2.png
+	image=items/flower2.png
 	[/item]
 #enddef
 
@@ -80,7 +80,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-flower3.png
+	image=items/flower3.png
 	[/item]
 #enddef
 
@@ -88,7 +88,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-flower4.png
+	image=items/flower4.png
 	[/item]
 #enddef
 
@@ -96,7 +96,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-box.png
+	image=items/box.png
 	[/item]
 #enddef
 
@@ -104,7 +104,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-ornate1.png
+	image=items/ornate1.png
 	[/item]
 #enddef
 
@@ -112,7 +112,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-ornate2.png
+	image=items/ornate2.png
 	[/item]
 #enddef
 
@@ -120,7 +120,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-rock1.png
+	image=items/rock1.png
 	[/item]
 #enddef
 
@@ -128,7 +128,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-rock2.png
+	image=items/rock2.png
 	[/item]
 #enddef
 
@@ -136,7 +136,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-rock3.png
+	image=items/rock3.png
 	[/item]
 #enddef
 
@@ -144,7 +144,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-rock4.png
+	image=items/rock4.png
 	[/item]
 #enddef
 
@@ -152,7 +152,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-dragonstatue.png
+	image=items/dragonstatue.png
 	[/item]
 #enddef
 
@@ -160,7 +160,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-monolith1.png
+	image=items/monolith1.png
 	[/item]
 #enddef
 
@@ -168,7 +168,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-monolith2.png
+	image=items/monolith2.png
 	[/item]
 #enddef
 
@@ -176,7 +176,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-monolith3.png
+	image=items/monolith3.png
 	[/item]
 #enddef
 
@@ -184,23 +184,23 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-monolith4.png
+	image=items/monolith4.png
 	[/item]
 #enddef
 
-#define ITM_BALL1 X Y
+#define ITM_BALL_GREEN X Y
 	[item]
 	x={X}
 	y={Y}
-	image=item-ball1.png
+	image=items/ball-green.png
 	[/item]
 #enddef
 
-#define ITM_BALL2 X Y
+#define ITM_BALL_BLUE X Y
 	[item]
 	x={X}
 	y={Y}
-	image=item-ball2.png
+	image=items/ball-blue.png
 	[/item]
 #enddef
 
@@ -208,7 +208,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-barrel.png
+	image=items/barrel.png
 	[/item]
 #enddef
 
@@ -216,7 +216,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-leanto.png
+	image=items/leanto.png
 	[/item]
 #enddef
 
@@ -224,7 +224,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-pine1.png
+	image=items/pine1.png
 	[/item]
 #enddef
 
@@ -232,7 +232,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-pine2.png
+	image=items/pine2.png
 	[/item]
 #enddef
 
@@ -240,7 +240,7 @@
 	[item]
 	x={X}
 	y={Y}
-	image=item-well.png
+	image=items/well.png
 	[/item]
 #enddef
 
@@ -354,7 +354,7 @@ What would you like to wish for?"
 	[item]
 	x={X}
 	y={Y}
-	image=item-potion2.png
+	image=items/potion-yellow.png
 	[/item]
 
 	[event]
@@ -371,7 +371,7 @@ What would you like to wish for?"
 			[/filter]
 		id={ID}
 		name=Poison
-		image=item-potion2.png
+		image=items/potion-yellow.png
 		duration=level
 		description="Poison is seeping through the veins of this unit at this very moment."
 		cannot_use_message=NONE
@@ -421,7 +421,7 @@ What would you like to wish for?"
 	[item]
 	x={X}
 	y={Y}
-	image=item-potion3.png
+	image=items/potion-red.png
 	[/item]
 
 	[event]
@@ -438,7 +438,7 @@ What would you like to wish for?"
 			[/filter]
 		id={ID}
 		name=Strong
-		image=item-potion3.png
+		image=items/potion-red.png
 		duration=level
 		description="Strength is given to the drinker."
 		cannot_use_message=NONE
@@ -460,7 +460,7 @@ What would you like to wish for?"
 	[item]
 	x={X}
 	y={Y}
-	image=item-potion4.png
+	image=items/potion-blue.png
 	[/item]
 
 	[event]
@@ -477,7 +477,7 @@ What would you like to wish for?"
 			[/filter]
 		id={ID}
 		name=Decay
-		image=item-potion4.png
+		image=items/potion-blue.png
 		duration=level
 		description="This poor unit drank something really bad."
 		cannot_use_message=NONE
@@ -493,7 +493,7 @@ What would you like to wish for?"
 	[item]
 	x={X}
 	y={Y}
-	image=item-ring1.png
+	image=items/ring1.png
 	[/item]
 
 	[event]
@@ -510,7 +510,7 @@ What would you like to wish for?"
 			[/filter]
 		id={ID}
 		name=Ring of Regeneration
-		image=item-ring1.png
+		image=items/ring1.png
 		duration=forever
 		description="This ring will heal the bearer a little each turn."
 		cannot_use_message=NONE
@@ -532,7 +532,7 @@ What would you like to wish for?"
 	[item]
 	x={X}
 	y={Y}
-	image=item-ring2.png
+	image=items/ring2.png
 	[/item]
 
 	[event]
@@ -549,7 +549,7 @@ What would you like to wish for?"
 			[/filter]
 		id={ID}
 		name=Ring of Slowness
-		image=item-ring2.png
+		image=items/ring2.png
 		duration=forever
 		description="The bearer of this ring is slowed."
 		cannot_use_message=NONE
@@ -762,13 +762,13 @@ What would you like to wish for?"
 	[item]
 	x={X1}
 	y={Y1}
-	image=item-ball2.png
+	image=items/ball-blue.png
 	[/item]
 
 	[item]
 	x={X2}
 	y={Y2}
-	image=item-ball1.png
+	image=items/ball-green.png
 	[/item]
 
 	[event]

data/scenario-test.cfg

@@ -52,8 +52,8 @@ ggggggggggggggggggggggggggggggggggggg
 	{ITM_MONOLITH4 5 6}
 	{ITM_WELL 2 7}
 	{ITM_LEANTO 3 7}
-	{ITM_BALL1 4 7}
-	{ITM_BALL2 5 7}
+	{ITM_BALL_GREEN 4 7}
+	{ITM_BALL_BLUE 5 7}
 	{ITM_BOX 2 8}
 	{ITM_WISHINGWELL 10 5}
 
@@ -96,7 +96,7 @@ ggggggggggggggggggggggggggggggggggggg
 
 	[item]
 	x,y=8,8
-	image=sotbe/flag.png
+	image=items/orcish-flag.png
 	[/item]
 	[label]
 	x,y=8,8

data/scenarios/Eastern_Invasion/Captured.cfg

@@ -345,10 +345,7 @@ value={L}
 		{SIDE4 8 4 (Vampire Bat)}
 		
 	#to make sure you know where the door is
-		[item]
-		x,y=10,21
-		image=item-ball1.png
-		[/item]
+		{ITM_BALL_GREEN 10 21}
 	[/event]
 
 
@@ -653,10 +650,8 @@ find_vacant=yes
 				id=msg_cmpgn_ei_14_20
 				message="Huh! A guard. Lets see how quickly we can kill it."
 				[/message]
-				[item]
-				x,y=3,2
-				image=item-barrel.png
-				[/item]
+				#barrel
+				{ITM_BARREL 3 2}
 				[clear_variable]
 				name=D_created
 				[/clear_variable]

data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg

@@ -26,12 +26,12 @@ Defeat:
 	[item]
 	x=17
 	y=9
-	image=sotbe/flag.png 
+	image=items/orcish-flag.png 
 	[/item]
 	[item]
 	x=20
 	y=7
-	image=sotbe/flag.png 
+	image=items/orcish-flag.png 
 	[/item]
 
 	[side]

data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg

@@ -126,7 +126,7 @@ Defeat:
 		[item]
 			x=21
 			y=14
-			image=sotbe/fire.png
+			image=items/fire.png
 		[/item]
 		{ORCISH_SHAMAN 21 15 Pirk}
 		{OLD_ORCISH_SHAMAN 20 14 Gork}
@@ -134,7 +134,7 @@ Defeat:
 		[item]
 			x=15
 			y=17
-			image=sotbe/fire.png
+			image=items/fire.png
 		[/item]
 		[item]
 			x=29

data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg

@@ -26,17 +26,17 @@ Defeat:
 	[item]
 	x=26
 	y=19
-	image=sotbe/flag.png
+	image=items/orcish-flag.png
 	[/item]
 	[item]
 	x=30
 	y=16
-	image=sotbe/flag.png
+	image=items/orcish-flag.png
 	[/item]
 	[item]
 	x=24
 	y=22
-	image=sotbe/flag.png
+	image=items/orcish-flag.png
 	[/item]
 
 	[item]

data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg

@@ -203,12 +203,8 @@ Defeat
 		[/message] 
 	[/event]
 
-	[item]
-	image=item-book1.png
-	x=3
-	y=4
-	[/item]
-		  
+	#the book
+	{ITM_BOOK1 3 4}
 
 	#a secret passage
 	[event]
@@ -517,7 +513,7 @@ Defeat
 	[item]
 	x={X}
 	y={Y}
-	image=item-potion4.png
+	image=items/potion-blue.png
 	[/item]
 
 	[event]
@@ -531,7 +527,7 @@ Defeat
 		[object]
 		id={ID}
 		name=Ice Potion
-		image=item-potion4.png
+		image=items/potion-blue.png
 		duration=level
 		description=This potion contains a strange fluid designed to imbue a weapon with the power of cold.
 

data/units/Elvish_Druid.cfg

@@ -52,7 +52,7 @@ get_hit_sound=female-hit.wav
 		[missile_frame]
 		begin=-200
 		end=0
-		image=entangle.png
+		image=projectiles/entangle.png
 		[/missile_frame]
 	[/attack]
 

data/units/Elvish_Shaman.cfg

@@ -53,7 +53,7 @@ get_hit_sound=female-hit.wav
 		[missile_frame]
 		begin=-250
 		end=0
-		image=entangle.png
+		image=projectiles/entangle.png
 		[/missile_frame]
 	[/attack]
 [/unit]

data/units/Elvish_Shyde.cfg

@@ -61,7 +61,7 @@ get_hit_sound=female-hit.wav
 		[missile_frame]
 		begin=-150
 		end=0
-		image=entangle.png
+		image=projectiles/entangle.png
 		[/missile_frame]
 	[/attack]