large update. cleaned up some code. added new effects for almost everything

2 files changed, 18 insertions, 143 deletions

diff --git a/datasrc/client.dts b/datasrc/client.dts
index eec61fa4..edded536 100644
--- a/datasrc/client.dts
+++ b/datasrc/client.dts
@@ -27,25 +27,10 @@ struct soundset {
 	array:sound sounds = *
 }
 
-struct particleinfo {
-	ptr:sprite spr = sprite@1
-	float color_r = color@1
-	float color_g = color@2
-	float color_b = color@3
-	float color_a = color@4
-	int lifemod = life@1
-}
-
 struct spriteptr {
 	ptr:sprite psprite = @0
 }
 
-struct projectileparticles {
-	int particlespersecond = particlespersecond@1
-	float particlesize = particlesize@1
-	float particlelife = particlelife@1
-}
-
 struct weapon {
 	ptr:sprite sprite_body = sprite_body@1
 	ptr:sprite sprite_cursor = sprite_cursor@1
@@ -85,12 +70,9 @@ struct data_container {
 	array:spriteset spritesets = sprites.*
 	array:sprite sprites = sprites.*.*
 	array:weapon weapons = weapons.*
-	array:particleinfo particles = particles.*
-	array:projectileparticles projectileinfo = projectileparticles.*
 
 	array:soundset sounds = sounds.*
 	array:animation animations = animations.*
-
 }
 
 const array:int weapon = weapons.*
diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds
index 1265dde0..d9e250a9 100644
--- a/datasrc/teewars.ds
+++ b/datasrc/teewars.ds
@@ -223,6 +223,10 @@ images {
 		filename "data/game.png"
 	}
 
+	particles {
+		filename "data/particles.png"
+	}
+
 	cursor {
 		filename "data/gui_cursor.png"
 	}
@@ -240,62 +244,6 @@ images {
 	}
 }
 
-particles {
-	part1 {
-		sprite sprites.game.part1
-		color 0.7 0.7 0.7 1.0
-		life 50
-	}
-
-	part2 {
-		sprite sprites.game.part2
-		color 1.0 1.0 1.0 1.0
-		life 50
-	}
-
-	part3 {
-		sprite sprites.game.part3
-		color 0.8 0.8 0.8 1.0
-		life 50
-	}
-
-	part4 {
-		sprite sprites.game.part4
-		color 0.98 0.1 0.16 1.0
-		life 70
-	}
-
-	part5 {
-		sprite sprites.game.part5
-		color 1.0 1.0 1.0 1.0
-		life 70
-	}
-
-	part6 {
-		sprite sprites.game.part6
-		color 0.6 0.6 0.6 1.0
-		life 100
-	}
-
-	part7 {
-		sprite sprites.game.part7
-		color 1.0 1.0 1.0 1.0
-		life 100
-	}
-	
-	part8 {
-		sprite sprites.game.part8
-		color 0.7 0.7 0.7 1.0
-		life 150
-	}
-	
-	part9 {
-		sprite sprites.game.part9
-		color 1.0 1.0 1.0 1.0
-		life 40
-	}
-}
-
 powerups {
 	health {
 		amount 1
@@ -319,44 +267,6 @@ powerups {
 	}
 }
 
-projectileparticles {
-	gun {
-		particlespersecond 200
-		particlesize 16.0
-		particlelife 0.5
-	}
-	rocket {
-		particlespersecond 100
-		particlesize 22.0
-		particlelife 1.3
-	}
-	shotgun {
-		particlespersecond 100
-		particlesize 16.0
-		particlelife 0.8
-	}
-	empty1 {
-		particlespersecond 300
-		particlesize 8.0
-		particlelife 0.8
-	}
-	empty2 {
-		particlespersecond 300
-		particlesize 8.0
-		particlelife 0.8
-	}
-	empty3 {
-		particlespersecond 300
-		particlesize 8.0
-		particlelife 0.8
-	}
-	sniper {
-		particlespersecond 300
-		particlesize 8.0
-		particlelife 0.8
-	}
-}
-
 weapons {
 	hammer {
 		sprite_body sprites.game.weapon_hammer_body
@@ -507,37 +417,6 @@ weapons {
 		overchargetime 10.0
 	}
 
-	bomb {
-		sprite_body sprites.game.weapon_rocket_body
-		sprite_cursor sprites.game.weapon_rocket_cursor
-		sprite_proj sprites.game.weapon_rocket_proj
-		sprite_muzzles {
-			sprites.game.weapon_shotgun_muzzle1
-			sprites.game.weapon_shotgun_muzzle2
-			sprites.game.weapon_shotgun_muzzle3
-		}
-		
-		nummuzzlesprites 3
-		muzzleoffsetx 0.0
-		muzzleoffsety 0.0
-		maxammo 10
-		costammo 1
-		recoil 10
-		firedelay 800
-		muzzleduration 0
-		visual_size 128
-		offsetx 24.0
-		offsety -2.0
-		meleedamage 0
-		meleereach 0
-		ammoregentime 0
-		duration -1
-		movetime 0
-		velocity 0
-		chargetime 1.0
-		overchargetime 10.0
-	}
-
 	ninja {
 		sprite_body sprites.game.weapon_ninja_body
 		sprite_cursor sprites.game.weapon_ninja_cursor
@@ -572,6 +451,20 @@ weapons {
 }
 	
 sprites {
+
+	particles images.particles 8 8 {
+		part_slice 0 0 1 1
+		part_ball 1 0 1 1
+		part_splat01 2 0 1 1
+		part_splat02 3 0 1 1
+		part_splat03 4 0 1 1
+
+		part_smoke 0 1 1 1
+		part_shell 0 2 2 2
+		part_expl01 0 4 4 4
+		part_airjump 2 2 2 2
+	}
+
 	game images.game 32 16 {
 	
 		health_full 21 0 2 2