From ccf4912c7d5a9ad7291fad2a85c5a8ae540e6ca7 Mon Sep 17 00:00:00 2001
From: landgreen <rosslandgreen@gmail.com>
Date: Wed, 25 Dec 2019 17:03:54 -0800
Subject: [PATCH] removed pushbody field effect, flechettes balance, energy
 drain balance, starting choosemod code

---
 index.html    | 58 +++++++++++++++-------------------------------
 js/bullets.js | 64 +++++++++++++++++++++++++--------------------------
 js/index.js   | 19 +++++++++++++++
 js/level.js   |  2 +-
 js/mobs.js    |  2 +-
 js/player.js  | 52 ++++++++++++++++++++---------------------
 js/spawn.js   |  5 ++--
 style.css     | 21 +++++++++++++++--
 8 files changed, 118 insertions(+), 105 deletions(-)

diff --git a/index.html b/index.html
index 3700d41..9084ae0 100644
--- a/index.html
+++ b/index.html
@@ -19,12 +19,10 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<meta name="description" content="Browser-based side scrolling video game with the matter.js physics engine.">
 	<meta name="author" content="Ross Landgreen">
-	<meta property="og:description"
-		content="Browser-based side scrolling video game with the matter.js physics engine.">
+	<meta property="og:description" content="Browser-based side scrolling video game with the matter.js physics engine.">
 	<meta property="og:title" content="n-gon">
 	<meta name="twitter:title" content="n-gon">
-	<meta name="twitter:description"
-		content="Browser-based side scrolling video game with the matter.js physics engine.">
+	<meta name="twitter:description" content="Browser-based side scrolling video game with the matter.js physics engine.">
 
 	<title>n-gon</title>
 	<link rel="stylesheet" href="style.css">
@@ -111,8 +109,7 @@
 		<details>
 			<summary>settings</summary>
 			<div style="line-height: 150%;" id="details-div">
-				<label for="difficulty-select"
-					title="effects: number of mobs, damage done by mobs, damage done to mobs, mob speed">combat
+				<label for="difficulty-select" title="effects: number of mobs, damage done by mobs, damage done to mobs, mob speed">combat
 					difficulty:</label>
 				<select name="difficulty-select" id="difficulty-select">
 					<option value="easy">easy</option>
@@ -182,10 +179,8 @@
 								fill: #1B1F23;
 							}
 						</style>
-						<path class="st0"
-							d="M142.8 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11s-4.6-11-10.2-11zM106.3 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11 .1-6.1-4.5-11-10.2-11z" />
-						<path class="st0"
-							d="M191.4 36.9h-134c-11.3 0-20.5 9.2-20.5 20.5v134c0 11.3 9.2 20.5 20.5 20.5h113.4l-5.3-18.3 12.8 11.8 12.1 11.1 21.6 18.7V57.4c-.1-11.3-9.3-20.5-20.6-20.5zm-38.6 129.5s-3.6-4.3-6.6-8c13.1-3.7 18.1-11.8 18.1-11.8-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.4-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.6-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.2-1.8-1-2.8-1.7-2.8-1.7s4.8 7.9 17.5 11.7c-3 3.8-6.7 8.2-6.7 8.2-22.1-.7-30.5-15.1-30.5-15.1 0-31.9 14.4-57.8 14.4-57.8 14.4-10.7 28-10.4 28-10.4l1 1.2c-18 5.1-26.2 13-26.2 13s2.2-1.2 5.9-2.8c10.7-4.7 19.2-5.9 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.5 0 0-7.9-7.5-24.9-12.6l1.4-1.6s13.7-.3 28 10.4c0 0 14.4 25.9 14.4 57.8 0-.1-8.4 14.3-30.5 15zM303.8 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1h33.2c17.8.1 34.5-8.8 34.5-29.2v-29.8c.1-20.8-16.6-29.9-34.4-29.9zm174 59.7v-30.6c0-11 19.8-13.5 25.8-2.5l18.3-7.4c-7.2-15.8-20.3-20.4-31.2-20.4-17.8 0-35.4 10.3-35.4 30.3v30.6c0 20.2 17.6 30.3 35 30.3 11.2 0 24.6-5.5 32-19.9l-19.6-9c-4.8 12.3-24.9 9.3-24.9-1.4zM417.3 113c-6.9-1.5-11.5-4-11.8-8.3.4-10.3 16.3-10.7 25.6-.8l14.7-11.3c-9.2-11.2-19.6-14.2-30.3-14.2-16.3 0-32.1 9.2-32.1 26.6 0 16.9 13 26 27.3 28.2 7.3 1 15.4 3.9 15.2 8.9-.6 9.5-20.2 9-29.1-1.8l-14.2 13.3c8.3 10.7 19.6 16.1 30.2 16.1 16.3 0 34.4-9.4 35.1-26.6 1-21.7-14.8-27.2-30.6-30.1zm-67 55.5h22.4V79.7h-22.4v88.8zM728 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1H728c17.8.1 34.5-8.8 34.5-29.2v-29.8c0-20.8-16.7-29.9-34.5-29.9zm-162.9-1.2c-18.4 0-36.7 10-36.7 30.5v30.3c0 20.3 18.4 30.5 36.9 30.5 18.4 0 36.7-10.2 36.7-30.5V109c0-20.4-18.5-30.5-36.9-30.5zm14.4 60.8c0 6.4-7.2 9.7-14.3 9.7-7.2 0-14.4-3.1-14.4-9.7V109c0-6.5 7-10 14-10 7.3 0 14.7 3.1 14.7 10v30.3zM682.4 109c-.5-20.8-14.7-29.2-33-29.2h-35.5v88.8h22.7v-28.2h4l20.6 28.2h28L665 138.1c10.7-3.4 17.4-12.7 17.4-29.1zm-32.6 12h-13.2v-20.3h13.2c14.1 0 14.1 20.3 0 20.3z" />
+						<path class="st0" d="M142.8 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11s-4.6-11-10.2-11zM106.3 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11 .1-6.1-4.5-11-10.2-11z" />
+						<path class="st0" d="M191.4 36.9h-134c-11.3 0-20.5 9.2-20.5 20.5v134c0 11.3 9.2 20.5 20.5 20.5h113.4l-5.3-18.3 12.8 11.8 12.1 11.1 21.6 18.7V57.4c-.1-11.3-9.3-20.5-20.6-20.5zm-38.6 129.5s-3.6-4.3-6.6-8c13.1-3.7 18.1-11.8 18.1-11.8-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.4-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.6-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.2-1.8-1-2.8-1.7-2.8-1.7s4.8 7.9 17.5 11.7c-3 3.8-6.7 8.2-6.7 8.2-22.1-.7-30.5-15.1-30.5-15.1 0-31.9 14.4-57.8 14.4-57.8 14.4-10.7 28-10.4 28-10.4l1 1.2c-18 5.1-26.2 13-26.2 13s2.2-1.2 5.9-2.8c10.7-4.7 19.2-5.9 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.5 0 0-7.9-7.5-24.9-12.6l1.4-1.6s13.7-.3 28 10.4c0 0 14.4 25.9 14.4 57.8 0-.1-8.4 14.3-30.5 15zM303.8 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1h33.2c17.8.1 34.5-8.8 34.5-29.2v-29.8c.1-20.8-16.6-29.9-34.4-29.9zm174 59.7v-30.6c0-11 19.8-13.5 25.8-2.5l18.3-7.4c-7.2-15.8-20.3-20.4-31.2-20.4-17.8 0-35.4 10.3-35.4 30.3v30.6c0 20.2 17.6 30.3 35 30.3 11.2 0 24.6-5.5 32-19.9l-19.6-9c-4.8 12.3-24.9 9.3-24.9-1.4zM417.3 113c-6.9-1.5-11.5-4-11.8-8.3.4-10.3 16.3-10.7 25.6-.8l14.7-11.3c-9.2-11.2-19.6-14.2-30.3-14.2-16.3 0-32.1 9.2-32.1 26.6 0 16.9 13 26 27.3 28.2 7.3 1 15.4 3.9 15.2 8.9-.6 9.5-20.2 9-29.1-1.8l-14.2 13.3c8.3 10.7 19.6 16.1 30.2 16.1 16.3 0 34.4-9.4 35.1-26.6 1-21.7-14.8-27.2-30.6-30.1zm-67 55.5h22.4V79.7h-22.4v88.8zM728 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1H728c17.8.1 34.5-8.8 34.5-29.2v-29.8c0-20.8-16.7-29.9-34.5-29.9zm-162.9-1.2c-18.4 0-36.7 10-36.7 30.5v30.3c0 20.3 18.4 30.5 36.9 30.5 18.4 0 36.7-10.2 36.7-30.5V109c0-20.4-18.5-30.5-36.9-30.5zm14.4 60.8c0 6.4-7.2 9.7-14.3 9.7-7.2 0-14.4-3.1-14.4-9.7V109c0-6.5 7-10 14-10 7.3 0 14.7 3.1 14.7 10v30.3zM682.4 109c-.5-20.8-14.7-29.2-33-29.2h-35.5v88.8h22.7v-28.2h4l20.6 28.2h28L665 138.1c10.7-3.4 17.4-12.7 17.4-29.1zm-32.6 12h-13.2v-20.3h13.2c14.1 0 14.1 20.3 0 20.3z" />
 					</svg>
 				</a>
 				Chat about n-gon in the <a href="https://discord.gg/2eC9pgJ">discord</a>.<br> Let me know about ideas,
@@ -195,8 +190,7 @@
 				<br>
 				<a href="https://github.com/landgreen/n-gon">
 					<svg viewBox="0 0 100 16" xmlns="http://www.w3.org/2000/svg" fill="#1B1F23">
-						<path
-							d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
+						<path d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
 						<g stroke='none' font-size="8px" font-family="Arial Black, sans-serif">
 							<text x="19" y="11">Github</text>
 						</g>
@@ -289,33 +283,23 @@
 		<g class="fade-in" transform="translate(100,210) scale(34)" fill='#bbb' stroke='none'>
 			<path d="M0 0  h1  v0.2  h1.7  l0.3 0.3  v2.6  h-1  v-1.7  h-1  v1.7  h-1 z" />
 			<rect x="4" y="1.25" width="1" height="0.5" rx='0.03' />
-			<path transform="translate(6.9,0) scale(1.25)"
-				d="M0 0  h1  l 0.7 0.7  v2.3  l-0.2 0.2 h-1.8 v-0.5 h1.4   L 1.1 2.4   h-1.1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" />
-			<path transform="translate(10.9,0) scale(1.25)"
-				d="M0 0  h1  l 0.7 0.7  v1  l -0.7 0.7  h-1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" />
+			<path transform="translate(6.9,0) scale(1.25)" d="M0 0  h1  l 0.7 0.7  v2.3  l-0.2 0.2 h-1.8 v-0.5 h1.4   L 1.1 2.4   h-1.1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" />
+			<path transform="translate(10.9,0) scale(1.25)" d="M0 0  h1  l 0.7 0.7  v1  l -0.7 0.7  h-1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" />
 			<path transform="translate(14,0)" d="M0 0  h1  v0.2  h1.7  l0.3 0.3  v2.6  h-1  v-1.7  h-1  v1.7  h-1 z" />
 		</g>
-		<g class="draw-lines" transform="translate(100,210) scale(34)" fill='none' stroke='#222' stroke-linejoin="round"
-			stroke-linecap="round">
+		<g class="draw-lines" transform="translate(100,210) scale(34)" fill='none' stroke='#222' stroke-linejoin="round" stroke-linecap="round">
 			<path d="M0 0  h1  v0.2  h1.7  l0.3 0.3  v2.6  h-1  v-1.7  h-1  v1.7  h-1 z" stroke-width='0.0875' />
 			<rect x="4" y="1.25" width="1" height="0.5" stroke-width='0.0875' rx='0.03' />
-			<path transform="translate(6.9,0) scale(1.25)"
-				d="M0 0  h1  l 0.7 0.7  v2.3  l-0.2 0.2 h-1.8 v-0.5 h1.4   L 1.1 2.4   h-1.1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z"
-				stroke-width='0.07' />
-			<path transform="translate(10.9,0) scale(1.25)"
-				d="M0 0  h1  l 0.7 0.7  v1  l -0.7 0.7  h-1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" stroke-width='0.07' />
-			<path transform="translate(14,0)" d="M0 0  h1  v0.2  h1.7  l0.3 0.3  v2.6  h-1  v-1.7  h-1  v1.7  h-1 z"
-				stroke-width='0.0875' />
+			<path transform="translate(6.9,0) scale(1.25)" d="M0 0  h1  l 0.7 0.7  v2.3  l-0.2 0.2 h-1.8 v-0.5 h1.4   L 1.1 2.4   h-1.1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" stroke-width='0.07' />
+			<path transform="translate(10.9,0) scale(1.25)" d="M0 0  h1  l 0.7 0.7  v1  l -0.7 0.7  h-1  l -0.7 -0.7  v-1  l 0.7 -0.7 Z" stroke-width='0.07' />
+			<path transform="translate(14,0)" d="M0 0  h1  v0.2  h1.7  l0.3 0.3  v2.6  h-1  v-1.7  h-1  v1.7  h-1 z" stroke-width='0.0875' />
 		</g>
 		<!-- mouse -->
-		<g class="draw-lines3" transform="translate(290,430) scale(0.28)" stroke-linecap="round" stroke-linejoin="round"
-			stroke-width="10px" stroke="#222" fill="none">
-			<path class="fade-in" d="M832.41,106.64 V323.55 H651.57 V256.64 c0-82.5,67.5-150,150-150 Z"
-				fill="rgb(0, 200, 255)" stroke="none" />
+		<g class="draw-lines3" transform="translate(290,430) scale(0.28)" stroke-linecap="round" stroke-linejoin="round" stroke-width="10px" stroke="#222" fill="none">
+			<path class="fade-in" d="M832.41,106.64 V323.55 H651.57 V256.64 c0-82.5,67.5-150,150-150 Z" fill="rgb(0, 200, 255)" stroke="none" />
 			<!-- <path class="fade-in" d="M832.41,106.64 V323.55 H651.57 V256.64 c0-82.5,67.5-150,150-150 Z" fill="#789" stroke="none" />
 			<path class="fade-in" d="M827,112 h30 a140,140,0,0,1,140,140 v68 h-167 z" fill="#7ce" stroke="none" /> -->
-			<path
-				d="M827,112 h30 a140,140,0,0,1,140,140 v268 a140,140,0,0,1-140,140 h-60 a140,140,0,0,1-140-140v-268 a140,140,0,0,1,140-140h60" />
+			<path d="M827,112 h30 a140,140,0,0,1,140,140 v268 a140,140,0,0,1-140,140 h-60 a140,140,0,0,1-140-140v-268 a140,140,0,0,1,140-140h60" />
 			<path d="M657 317 h 340 h-170 v-207 s 21 -59, -5 -59 S 807 7, 807 7" />
 			<ellipse fill="#fff" cx="827.57" cy="218.64" rx="29" ry="68" />
 		</g>
@@ -335,8 +319,7 @@
 				<!-- <rect x="70" y="70" width="60" height="60" rx='3' /> -->
 				<!-- <rect x="140" y="70" width="60" height="60" rx='3' /> -->
 			</g>
-			<g class="draw-lines4" text-anchor="middle" stroke='#000' fill='none' stroke-width="2" font-size="38px"
-				font-family="Arial Black, sans-serif">
+			<g class="draw-lines4" text-anchor="middle" stroke='#000' fill='none' stroke-width="2" font-size="38px" font-family="Arial Black, sans-serif">
 				<!-- <text class="fade-in" fill='#aaa' stroke="none" x="30" y="45">Q</text>
 				<text class="fade-in" fill='#aaa' stroke="none" x="170" y="45">E</text> -->
 				<text x="30" y="45" stroke-width="2">Q</text>
@@ -367,16 +350,13 @@
 			<text x="420" y="438">fire</text>
 			<text x="599" y="438">field</text>
 		</g>
-		<g id="gamepad" transform="translate(700,700) scale(0.2)" style="display: none;" stroke="#333"
-			stroke-width="0.5" fill="#444">
+		<g id="gamepad" transform="translate(700,700) scale(0.2)" style="display: none;" stroke="#333" stroke-width="0.5" fill="#444">
 			<path style="fill:#FB7686;" d="M122.578,86.897H68.276c-6.184,0-11.196,5.013-11.196,11.196v12.126h76.692V98.091
 				C133.772,91.908,128.76,86.897,122.578,86.897z" />
-			<rect x="57.08" y="100.766" style="opacity:0.4;fill:#FF4E64;enable-background:new    ;" width="76.69"
-				height="9.453" />
+			<rect x="57.08" y="100.766" style="opacity:0.4;fill:#FF4E64;enable-background:new    ;" width="76.69" height="9.453" />
 			<path style="fill:#FB7686;" d="M389.422,86.897h54.303c6.182,0,11.194,5.013,11.194,11.196v12.126h-76.693V98.091
 				C378.228,91.908,383.241,86.897,389.422,86.897z" />
-			<rect x="378.229" y="100.766" style="opacity:0.4;fill:#FF4E64;enable-background:new    ;" width="76.69"
-				height="9.453" />
+			<rect x="378.229" y="100.766" style="opacity:0.4;fill:#FF4E64;enable-background:new    ;" width="76.69" height="9.453" />
 			<rect x="101.947" y="130.449" style="fill:#89BBE4;" width="308.094" height="144.099" />
 			<path style="opacity:0.1;fill:#145587;enable-background:new    ;" d="M336.726,130.443l-6.391,28.154
 				c-6.438,28.363-7.324,57.602-2.745,86.134H184.41c4.577-28.531,3.692-57.77-2.746-86.134l-6.39-28.154h-73.323v144.103h308.097
diff --git a/js/bullets.js b/js/bullets.js
index d94cf6a..07a0f19 100644
--- a/js/bullets.js
+++ b/js/bullets.js
@@ -839,41 +839,41 @@ const b = {
         }
       }
     },
-
     {
       name: "fléchettes", //3
-      description: "fire a flight of long range needles",
+      description: "fire a volley of <strong>precise</strong> high velocity needles",
       ammo: 0,
-      ammoPack: 16,
+      ammoPack: 60,
       have: false,
       isStarterGun: true,
+      count: 0, //used to track how many shots are in a volley before a big CD
+      lastFireCycle: 0, //use to remember how longs its been since last fire, used to reset count
       fire() {
-        mech.fireCDcycle = mech.cycle + Math.floor(40 * b.modFireRate); // cool down
+        const CD = (mech.crouch) ? 35 : 25
+        if (this.lastFireCycle + CD < mech.cycle) this.count = 0 //reset count if it cycles past the CD
+        this.lastFireCycle = mech.cycle
 
-        function spawnFlechette(dir = mech.angle, speed, size = 1) {
-          const me = bullet.length;
-          bullet[me] = Bodies.rectangle(mech.pos.x + 40 * Math.cos(dir), mech.pos.y + 40 * Math.sin(dir), 32 * size * b.modBulletSize, 0.8 * size * b.modBulletSize, b.fireAttributes(dir));
-          bullet[me].endCycle = game.cycle + Math.floor(180 * b.isModBulletsLastLonger);
-          bullet[me].dmg = 0.13 * size + b.modExtraDmg;
-          bullet[me].do = function () {
-            this.force.y += this.mass * 0.0002; //low gravity
-          };
-          Matter.Body.setVelocity(bullet[me], {
-            x: mech.Vx / 2 + speed * Math.cos(dir),
-            y: mech.Vy / 2 + speed * Math.sin(dir)
-          });
-          World.add(engine.world, bullet[me]); //add bullet to world
-        }
-
-        if (mech.crouch) {
-          for (let i = 0; i < 3; i++) {
-            spawnFlechette(mech.angle + 0.02 * (Math.random() - 0.5), 50 + 4 * i, 1.55)
-          }
+        if (this.count > ((mech.crouch) ? 4 : 1)) {
+          this.count = 0
+          mech.fireCDcycle = mech.cycle + Math.floor(CD * b.modFireRate); // cool down
         } else {
-          for (let i = 0; i < 8; i++) {
-            spawnFlechette(mech.angle + 0.12 * (Math.random() - 0.5), 43 + 8 * Math.random())
-          }
+          this.count++
+          mech.fireCDcycle = mech.cycle + Math.floor(2 * b.modFireRate); // cool down
         }
+
+        const me = bullet.length;
+        bullet[me] = Bodies.rectangle(mech.pos.x + 40 * Math.cos(mech.angle), mech.pos.y + 40 * Math.sin(mech.angle), 50 * b.modBulletSize, 1.3 * b.modBulletSize, b.fireAttributes(mech.angle));
+        bullet[me].endCycle = game.cycle + Math.floor(180 * b.isModBulletsLastLonger);
+        bullet[me].dmg = 0.7 + b.modExtraDmg;
+        bullet[me].do = function () {
+          this.force.y += this.mass * 0.0002; //low gravity
+        };
+        const SPEED = 45
+        Matter.Body.setVelocity(bullet[me], {
+          x: mech.Vx / 2 + SPEED * Math.cos(mech.angle),
+          y: mech.Vy / 2 + SPEED * Math.sin(mech.angle)
+        });
+        World.add(engine.world, bullet[me]); //add bullet to world
       }
     },
     {
@@ -1289,7 +1289,7 @@ const b = {
           bullet[me].endCycle = 2 * i + game.cycle + END
           bullet[me].restitution = 0;
           bullet[me].friction = 1;
-          bullet[me].explodeRad = (mech.crouch ? 70 : 50) + (Math.random() - 0.5) * 50;
+          bullet[me].explodeRad = (mech.crouch ? 85 : 60) + (Math.random() - 0.5) * 50;
           bullet[me].onEnd = b.explode;
           bullet[me].onDmg = function () {
             this.endCycle = 0; //bullet ends cycle after hitting a mob and triggers explosion
@@ -1517,9 +1517,9 @@ const b = {
         const me = bullet.length;
         const dir = mech.angle;
         bullet[me] = Bodies.polygon(mech.pos.x + 30 * Math.cos(mech.angle), mech.pos.y + 30 * Math.sin(mech.angle), 20, 4.5, b.fireAttributes(dir, false));
-        b.fireProps(mech.crouch ? 65 : 45, mech.crouch ? 28 : 14, dir, me); //cd , speed
+        b.fireProps(mech.crouch ? 60 : 40, mech.crouch ? 28 : 14, dir, me); //cd , speed
         Matter.Body.setDensity(bullet[me], 0.000001);
-        bullet[me].endCycle = game.cycle + 100;
+        bullet[me].endCycle = game.cycle + 80;
         bullet[me].frictionAir = 0;
         bullet[me].friction = 0.5;
         bullet[me].restitution = 0.3;
@@ -1527,7 +1527,7 @@ const b = {
         bullet[me].onDmg = function () {};
         bullet[me].do = function () {
           if (!mech.isBodiesAsleep) {
-            const SCALE = 1.017
+            const SCALE = 1.022
             Matter.Body.scale(this, SCALE, SCALE);
             this.frictionAir += 0.00023;
           }
@@ -1611,7 +1611,7 @@ const b = {
             }
 
             if (this.lockedOn && this.lockedOn.alive && mech.fieldMeter > 0.15) { //hit target with laser
-              mech.fieldMeter -= 0.0016
+              mech.fieldMeter -= 0.001
 
               //make sure you can still see target
               const DIST = Vector.magnitude(Vector.sub(this.vertices[0], this.lockedOn.position));
@@ -1941,7 +1941,7 @@ const b = {
       name: "foam", //16
       description: "spray bubbly foam that <strong>sticks</strong> to enemies<br>does <strong class='color-d'>damage</strong> over time and <strong>slows</strong> movement",
       ammo: 0,
-      ammoPack: 90,
+      ammoPack: 100,
       have: false,
       isStarterGun: true,
       fire() {
diff --git a/js/index.js b/js/index.js
index 860045e..7ca9046 100644
--- a/js/index.js
+++ b/js/index.js
@@ -82,6 +82,25 @@ game mechanics
 
 */
 
+//find what mods I don't have
+function doNotHave(who) {
+  let options = [];
+  for (let i = 0; i < who.length; i++) {
+    if (!who[i].have) options.push(i);
+  }
+  if (options.length > 0) return options[Math.floor(Math.random() * options.length)]
+}
+
+
+//give a random mod from the mods I don't have
+let newMod = doNotHave(b.mods)
+
+let t = ""
+for (let i = 0; i < 3; i++) {
+  t += `<div class="choose-grid-module" onclick="build.choosePowerUp(this,${i},'mod')"><div class="grid-title"><div class="circle-grid mod"></div> &nbsp; ${b.mods[i].name}</div> ${b.mods[i].description}</div>`
+}
+// document.getElementById("choose-grid").innerHTML = t
+
 
 //collision groups
 //   cat.player | cat.map | cat.body | cat.bullet | cat.powerUp | cat.mob | cat.mobBullet | cat.mobShield
diff --git a/js/level.js b/js/level.js
index 08624e4..27a4612 100644
--- a/js/level.js
+++ b/js/level.js
@@ -14,7 +14,7 @@ const level = {
   start() {
     if (level.levelsCleared === 0) {
       // game.difficulty = 6; //for testing to simulate possible mobs spawns
-      // b.giveGuns(16)
+      // b.giveGuns(3)
       // mech.fieldUpgrades[2].effect();
       // b.giveMod(21)
 
diff --git a/js/mobs.js b/js/mobs.js
index fb390fb..dfe9319 100644
--- a/js/mobs.js
+++ b/js/mobs.js
@@ -269,7 +269,7 @@ const mobs = {
           // ctx.lineDashOffset = 6*(game.cycle % 215);
           if (this.distanceToPlayer() < this.laserRange && !mech.isStealth) {
             mech.damage(0.0003 * game.dmgScale);
-            if (mech.fieldMeter > 0.1) mech.fieldMeter -= 0.004
+            if (mech.fieldMeter > 0.1) mech.fieldMeter -= 0.003
             ctx.beginPath();
             ctx.moveTo(this.position.x, this.position.y);
             ctx.lineTo(mech.pos.x, mech.pos.y);
diff --git a/js/player.js b/js/player.js
index 6b029fb..6a4dfdd 100644
--- a/js/player.js
+++ b/js/player.js
@@ -927,31 +927,31 @@ const mech = {
       }
     }
   },
-  pushBodyFacing() { // push all body in range and in direction looking
-    for (let i = 0, len = body.length; i < len; ++i) {
-      if (
-        body[i].speed > 12 && body[i].mass > 2 &&
-        Vector.magnitude(Vector.sub(body[i].position, mech.pos)) < mech.grabRange &&
-        mech.lookingAt(body[i]) &&
-        Matter.Query.ray(map, body[i].position, mech.pos).length === 0
-      ) {
-        mech.pushMass(body[i]);
-      }
-    }
-  },
-  pushBody360(range = mech.grabRange * 0.75) { // push all body in range and in direction looking
-    for (let i = 0, len = body.length; i < len; ++i) {
-      if (
-        body[i].speed > 12 && body[i].mass > 2 &&
-        Vector.magnitude(Vector.sub(body[i].position, mech.pos)) < range &&
-        mech.lookingAt(body[i]) &&
-        Matter.Query.ray(map, body[i].position, mech.pos).length === 0 &&
-        body[i].collisionFilter.category === cat.body
-      ) {
-        mech.pushMass(body[i]);
-      }
-    }
-  },
+  // pushBodyFacing() { // push all body in range and in direction looking
+  //   for (let i = 0, len = body.length; i < len; ++i) {
+  //     if (
+  //       body[i].speed > 12 && body[i].mass > 2 &&
+  //       Vector.magnitude(Vector.sub(body[i].position, mech.pos)) < mech.grabRange &&
+  //       mech.lookingAt(body[i]) &&
+  //       Matter.Query.ray(map, body[i].position, mech.pos).length === 0
+  //     ) {
+  //       mech.pushMass(body[i]);
+  //     }
+  //   }
+  // },
+  // pushBody360(range = mech.grabRange * 0.75) { // push all body in range and in direction looking
+  //   for (let i = 0, len = body.length; i < len; ++i) {
+  //     if (
+  //       body[i].speed > 12 && body[i].mass > 2 &&
+  //       Vector.magnitude(Vector.sub(body[i].position, mech.pos)) < range &&
+  //       mech.lookingAt(body[i]) &&
+  //       Matter.Query.ray(map, body[i].position, mech.pos).length === 0 &&
+  //       body[i].collisionFilter.category === cat.body
+  //     ) {
+  //       mech.pushMass(body[i]);
+  //     }
+  //   }
+  // },
   lookForPickUp(range = mech.grabRange) { //find body to pickup
     mech.fieldMeter -= mech.fieldRegen;
     const grabbing = {
@@ -1057,7 +1057,6 @@ const mech = {
             mech.drawField();
             mech.grabPowerUp();
             mech.lookForPickUp();
-            mech.pushBodyFacing();
             mech.pushMobsFacing();
           } else if (mech.holdingTarget && mech.fieldCDcycle < mech.cycle && mech.fieldMeter > 0.05) { //holding, but field button is released
             mech.pickUp();
@@ -1461,7 +1460,6 @@ const mech = {
             mech.grabPowerUp();
             mech.lookForPickUp();
             mech.pushMobsFacing();
-            mech.pushBodyFacing();
           } else if (mech.holdingTarget && mech.fieldCDcycle < mech.cycle && mech.fieldMeter > 0.05) { //holding, but field button is released
             mech.pickUp();
           } else {
diff --git a/js/spawn.js b/js/spawn.js
index 2084028..ca75ddd 100644
--- a/js/spawn.js
+++ b/js/spawn.js
@@ -444,8 +444,7 @@ const spawn = {
         //when player is inside event horizon
         if (Vector.magnitude(Vector.sub(this.position, player.position)) < eventHorizon && !mech.isStealth) {
           mech.damage(0.00015 * game.dmgScale);
-          if (mech.fieldMeter > 0.1) mech.fieldMeter -= 0.007
-
+          if (mech.fieldMeter > 0.1) mech.fieldMeter -= 0.0045
           const angle = Math.atan2(player.position.y - this.position.y, player.position.x - this.position.x);
           player.force.x -= 1.25 * Math.cos(angle) * player.mass * game.g * (mech.onGround ? 1.8 : 1);
           player.force.y -= 0.96 * player.mass * game.g * Math.sin(angle);
@@ -534,7 +533,7 @@ const spawn = {
         //when player is inside event horizon
         if (Vector.magnitude(Vector.sub(this.position, player.position)) < eventHorizon && !mech.isStealth) {
           mech.damage(0.00015 * game.dmgScale);
-          if (mech.fieldMeter > 0.1) mech.fieldMeter -= 0.007
+          if (mech.fieldMeter > 0.1) mech.fieldMeter -= 0.0045
           const angle = Math.atan2(player.position.y - this.position.y, player.position.x - this.position.x);
           player.force.x -= 1.3 * Math.cos(angle) * player.mass * game.g * (mech.onGround ? 1.7 : 1);
           player.force.y -= 1.2 * Math.sin(angle) * player.mass * game.g;
diff --git a/style.css b/style.css
index b48c897..f3667d6 100644
--- a/style.css
+++ b/style.css
@@ -68,7 +68,8 @@ summary {
   bottom: 0px;
   left: 0px;
   z-index: 12;
-  background-color: #c4ccd8;
+  background-color: #444;
+  /* background-color: rgba(68, 68, 68, 0.5); */
 
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(310px, 1fr));
@@ -76,7 +77,23 @@ summary {
   grid-gap: 10px;
   z-index: 12;
   font-size: 1.3em;
-  cursor: "auto";
+  cursor: auto;
+}
+
+.choose-grid-module {
+  /* box-shadow: 0px 1px 4px #234; */
+  padding: 10px;
+  /* margin: 4px; */
+  line-height: 170%;
+  border-radius: 6px;
+  background-color: #fff;
+  /* background-color: rgba(255, 255, 255, 0.5); */
+  font-size: 0.8em;
+  /* display: flex; */
+}
+
+.choose-grid-module:hover {
+  background-color: #efeff5;
 }
 
 #build-grid {