Rendering tweaks

ricochet1k · Apr 6, 2017 · e4516c0 · e4516c0
1 parent 39b496f
commit e4516c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/scripts/objects/extension.js b/src/scripts/objects/extension.js
@@ -19,7 +19,9 @@ export default class Extension extends GameObject {
 
 		g.lineStyle(0, 0, 0);
 		g.beginFill(0xffff00);
-		g.drawCircle(S(5), S(5), (S(4) - 2) * obj.energy / obj.energyCapacity);
+		let e = (S(4) - 2) * Math.sqrt(obj.energy / obj.energyCapacity);
+		if (e > 0) e = Math.max(1, e);
+		g.drawCircle(S(5), S(5), e);
 		g.endFill();
 	}
 }
diff --git a/src/scripts/objects/source.js b/src/scripts/objects/source.js
@@ -18,7 +18,9 @@ export default class Source extends GameObject {
 		g.drawCircle(S(5), S(5), S(5));
 
 		g.beginFill(0xffff00);
-		g.drawCircle(S(5), S(5), S(5) * Math.ceil(obj.energy / obj.energyCapacity));
+		let e = S(5) * Math.sqrt(obj.energy / obj.energyCapacity);
+		if (e > 0) e = Math.max(1, e);
+		g.drawCircle(S(5), S(5), e);
 		g.endFill();
 	}
 }
diff --git a/src/scripts/objects/spawn.js b/src/scripts/objects/spawn.js
@@ -21,7 +21,9 @@ export default class Spawn extends GameObject {
 
 		g.lineStyle(0, 0, 0);
 		g.beginFill(0xffff00);
-		g.drawCircle(S(5), S(5), S(5) * obj.energy / obj.energyCapacity);
+		let e = (S(5) - 2) * Math.sqrt(obj.energy / obj.energyCapacity);
+		if (e > 0) e = Math.max(1, e);
+		g.drawCircle(S(5), S(5), e);
 		g.endFill();
 	}
 }
diff --git a/src/scripts/skins/original/creep.js b/src/scripts/skins/original/creep.js
@@ -95,7 +95,7 @@ export class CreepSkin {
 		g.lineStyle(0, 0, 0);
 		g.beginFill(0xffff00);
 		let e = S(2.5) * Math.sqrt(obj.energy / obj.energyCapacity);
-		if (obj.energy > 0) e = Math.max(1, e);
+		if (e > 0) e = Math.max(1, e);
 		g.drawCircle(m, m, e);
 		g.endFill();