Merge branch 'master' into qol-chat

src/client/ui/templates/options/styles.less

@@ -28,6 +28,19 @@
 			display: flex;
 			flex-direction: column;
 
+			.heading {
+				height: 30px;
+				color: @blueA;
+			}
+
+			.heading:before {
+				content: "- ";
+			}
+
+			.heading:after {
+				content: " -";
+			}
+
 			.item {
 				height: 30px;
 				display: flex;

src/client/ui/templates/options/template.html

@@ -4,10 +4,16 @@
 	</div>
 	<div class="bottom">
 		<div class="list">
+			<div class="heading game">Game</div>
 			<div class="item screen">
 				<div class="name">Fullscreen</div>
 				<div class="value">Off</div>
 			</div>
+			<div class="item audio">
+				<div class="name">Audio</div>
+				<div class="value">On</div>
+			</div>
+			<div class="heading hud">HUD</div>
 			<div class="item nameplates">
 				<div class="name">Nameplates</div>
 				<div class="value">On</div>
@@ -20,6 +26,7 @@
 				<div class="name">Events</div>
 				<div class="value">On</div>
 			</div>
+			<div class="heading inventory">Inventory</div>
 			<div class="item quality">
 				<div class="name">Quality Indicators</div>
 				<div class="value">Off</div>
@@ -28,10 +35,6 @@
 				<div class="name">Unusable Indicators</div>
 				<div class="value">Off</div>
 			</div>
-			<div class="item audio">
-				<div class="name">Audio</div>
-				<div class="value">On</div>
-			</div>
 		</div>
 	</div>
 </div>

src/server/config/spells/spellFireblast.js

@@ -1,4 +1,4 @@
-const getTargetPos = (physics, obj, m) => {
+const getTargetPos = (physics, obj, m, pushback) => {
 	let targetPos = {
 		x: m.x,
 		y: m.y
@@ -14,7 +14,7 @@ const getTargetPos = (physics, obj, m) => {
 
 	dx = ~~(dx / Math.abs(dx));
 	dy = ~~(dy / Math.abs(dy));
-	for (let l = 0; l < this.pushback; l++) {
+	for (let l = 0; l < pushback; l++) {
 		if (physics.isTileBlocking(targetPos.x + dx, targetPos.y + dy)) {
 			if (physics.isTileBlocking(targetPos.x + dx, targetPos.y)) {
 				if (physics.isTileBlocking(targetPos.x, targetPos.y + dy)) 
@@ -89,7 +89,7 @@ module.exports = {
 					else if (!obj.aggro.canAttack(m))
 						continue;
 
-					const targetPos = getTargetPos(physics, obj, m);
+					const targetPos = getTargetPos(physics, obj, m, this.pushback);
 
 					let distance = Math.max(Math.abs(m.x - targetPos.x), Math.abs(m.y - targetPos.y));
 					let ttl = distance * 125;