Merge branch 'develop' of gitlab.cci.drexel.edu:ah3472/cs375_project into map_stuff

homepage_html/game.js

@@ -81,7 +81,7 @@ function startUpGame() {
 	nextY = p1.y;
 	p1.create_p1(app);
 
-	g1 = new gun(p1.x - 40, p1.y - 5, p1.weapon, 10, 50, 10);
+	g1 = new gun(p1.x - 40, p1.y - 5, p1.weapon, 10, 50, 2);
 	g1.create_gun(app, animatedObjects);
 
 	bounds = map.currentRoom.getColliders(app);
@@ -191,7 +191,7 @@ function randomlySpawnMobs(numMobs) {
 	for (let i = 0; i < numMobs; i++) {
 		let x = Math.random() * (maxX - minX) + minX;
 		let y = Math.random() * (maxY - minY) + minY;
-		mob = new Enemy(x, y, 5);
+		mob = new Enemy(x, y, 10);
 		mobList.push(mob);
 		map.currentRoom.enemies.push(mob);
 		mob.addToObjectsList(animatedObjects);
@@ -616,7 +616,7 @@ function pickup(){
 						g1.weapon = "Awp";
 						g1.t_ammo = 20;
 						g1.f_ammo = 5;
-						g1.dmg = 2.4;
+						g1.dmg = 5;
 						wep.textures = gunAnim.awp;
 						wep.play();
 						app.stage.removeChild(box);
@@ -625,7 +625,7 @@ function pickup(){
 						g1.weapon = "smg";
 						g1.t_ammo = 150;
 						g1.f_ammo = 25;
-						g1.dmg = 1.4;
+						g1.dmg = 3;
 						wep.textures = gunAnim.smg;
 						wep.play();
 						app.stage.removeChild(box);