added laser weapon

1 files changed, 20 insertions, 38 deletions

diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds
index d9e250a9..67b67195 100644
--- a/datasrc/teewars.ds
+++ b/datasrc/teewars.ds
@@ -11,13 +11,13 @@ sounds {
 		"data/audio/wp_shotty_fire-03.wv"
 	}
 	
-	sniper_fire {
+	laser_fire {
 		"data/audio/wp_shotty_fire-01.wv"
 		"data/audio/wp_shotty_fire-02.wv"
 		"data/audio/wp_shotty_fire-03.wv"
 	}
 	
-	rocket_fire {
+	grenade_fire {
 		"data/audio/wp_flump_launch-01.wv"
 		"data/audio/wp_flump_launch-02.wv"
 		"data/audio/wp_flump_launch-03.wv"
@@ -41,7 +41,7 @@ sounds {
 		"data/audio/wp_ninja_attack-03.wv"
 	}
 
-	rocket_explode {
+	grenade_explode {
 		"data/audio/wp_flump_explo-01.wv"
 		"data/audio/wp_flump_explo-02.wv"
 		"data/audio/wp_flump_explo-03.wv"
@@ -153,7 +153,7 @@ sounds {
 		"data/audio/sfx_pickup_arm-04.wv"
 	}
 	
-	pickup_rocket {
+	pickup_grenade {
 		"data/audio/sfx_pickup_launcher.wv"
 	}
 	
@@ -279,7 +279,6 @@ weapons {
 		muzzleoffsetx 0.0
 		muzzleoffsety 0.0
 		maxammo 10
-		costammo 0
 		recoil 10
 		firedelay 150
 		muzzleduration 0
@@ -292,8 +291,6 @@ weapons {
 		duration -1
 		movetime 0
 		velocity 0
-		chargetime 0.0
-		overchargetime 0.0
 	}
 	
 	gun {
@@ -310,7 +307,6 @@ weapons {
 		muzzleoffsetx 50.0
 		muzzleoffsety 6.0
 		maxammo 10
-		costammo 1
 		recoil 10
 		firedelay 100
 		muzzleduration 5
@@ -323,8 +319,6 @@ weapons {
 		duration -1
 		movetime 0
 		velocity 0
-		chargetime 0.0
-		overchargetime 0.0
 	}
 	
 	shotgun {
@@ -341,7 +335,6 @@ weapons {
 		muzzleoffsetx 70.0
 		muzzleoffsety 6.0
 		maxammo 10
-		costammo 1
 		recoil 10
 		firedelay 500
 		muzzleduration 5
@@ -354,14 +347,12 @@ weapons {
 		duration -1
 		movetime 0
 		velocity 0
-		chargetime 0.0
-		overchargetime 0.0
 	}
 
-	rocket {
-		sprite_body sprites.game.weapon_rocket_body
-		sprite_cursor sprites.game.weapon_rocket_cursor
-		sprite_proj sprites.game.weapon_rocket_proj
+	grenade {
+		sprite_body sprites.game.weapon_grenade_body
+		sprite_cursor sprites.game.weapon_grenade_cursor
+		sprite_proj sprites.game.weapon_grenade_proj
 		sprite_muzzles {
 		}
 		
@@ -369,7 +360,6 @@ weapons {
 		muzzleoffsetx 0.0
 		muzzleoffsety 0.0
 		maxammo 10
-		costammo 1
 		recoil 10
 		firedelay 600
 		muzzleduration 0
@@ -382,29 +372,23 @@ weapons {
 		duration -1
 		movetime 0
 		velocity 0
-		chargetime 0.0
-		overchargetime 0.0
 	}
 		
-	sniper {
-		sprite_body sprites.game.weapon_rocket_body
-		sprite_cursor sprites.game.weapon_rocket_cursor
-		sprite_proj sprites.game.weapon_rocket_proj
+	laser {
+		sprite_body sprites.game.weapon_laser_body
+		sprite_cursor sprites.game.weapon_laser_cursor
+		sprite_proj sprites.game.weapon_shotgun_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 600
 		muzzleduration 0
-		visual_size 96
+		visual_size 128
 		offsetx 24.0
 		offsety -2.0
 		meleedamage 0
@@ -413,8 +397,6 @@ weapons {
 		duration -1
 		movetime 0
 		velocity 0
-		chargetime 0.5
-		overchargetime 10.0
 	}
 
 	ninja {
@@ -431,7 +413,6 @@ weapons {
 		muzzleoffsetx 40.0
 		muzzleoffsety -4.0
 		maxammo 0
-		costammo 0
 		recoil 0
 		firedelay 800
 		muzzleduration 0
@@ -444,8 +425,6 @@ weapons {
 		duration 15000
 		movetime 200
 		velocity 50
-		chargetime 0.0
-		overchargetime 0.0
 	}
 		
 }
@@ -500,10 +479,10 @@ sprites {
 		weapon_shotgun_muzzle2 16 6 3 2
 		weapon_shotgun_muzzle3 20 6 3 2
 		
-		weapon_rocket_body 2 8 7 2
-		weapon_rocket_cursor 0 8 2 2
-		weapon_rocket_proj 10 8 2 2
-		
+		weapon_grenade_body 2 8 7 2
+		weapon_grenade_cursor 0 8 2 2
+		weapon_grenade_proj 10 8 2 2
+
 		weapon_hammer_body 2 1 4 3
 		weapon_hammer_cursor 0 0 2 2
 		weapon_hammer_proj 0 0 0 0
@@ -511,6 +490,9 @@ sprites {
 		weapon_ninja_body 2 10 7 2
 		weapon_ninja_cursor 0 10 2 2
 		weapon_ninja_proj 0 0 0 0
+
+		weapon_laser_body 2 12 9 3
+		weapon_laser_cursor 0 12 2 2
 		
 		hook_chain 2 0 1 1
 		hook_head 3 0 2 1