From 95fcefc2d961b292105eb1d68183650c28be9476 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Mon, 20 Feb 2023 17:31:21 +0530
Subject: [PATCH] fix marble and endgame bugs

---
 src/Marble.hx         | 21 +++++++++++++--------
 src/MarbleWorld.hx    |  1 +
 src/gui/EndGameGui.hx |  6 ++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/Marble.hx b/src/Marble.hx
index 9380d150..0558be13 100644
--- a/src/Marble.hx
+++ b/src/Marble.hx
@@ -197,14 +197,6 @@ class Marble extends GameObject {
 
 	public function new() {
 		super();
-		var geom = Sphere.defaultUnitSphere();
-		geom.addUVs();
-		var marbleTexture = ResourceLoader.getFileEntry("data/shapes/balls/base.marble.png").toTexture();
-		var marbleMaterial = Material.create(marbleTexture);
-		marbleMaterial.shadows = false;
-		marbleMaterial.castShadows = true;
-		var obj = new Mesh(geom, marbleMaterial, this);
-		obj.scale(_radius);
 
 		this.velocity = new Vector();
 		this.omega = new Vector();
@@ -239,6 +231,19 @@ class Marble extends GameObject {
 
 	public function init(level:MarbleWorld, onFinish:Void->Void) {
 		this.level = level;
+
+		var marbleDts = new DtsObject();
+		marbleDts.dtsPath = 'data/shapes/balls/ball-superball.dts';
+		marbleDts.showSequences = false;
+		marbleDts.useInstancing = false;
+		marbleDts.init(null, () -> {}); // SYNC
+		for (mat in marbleDts.materials) {
+			mat.castShadows = true;
+			mat.shadows = true;
+			mat.receiveShadows = false;
+		}
+		this.addChild(marbleDts);
+
 		this.forcefield = new DtsObject();
 		this.forcefield.dtsPath = "data/shapes/images/glow_bounce.dts";
 		this.forcefield.useInstancing = true;
diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx
index 6ed4e2df..5e77339d 100644
--- a/src/MarbleWorld.hx
+++ b/src/MarbleWorld.hx
@@ -320,6 +320,7 @@ class MarbleWorld extends Scheduler {
 			"shapes/pads/green.jpg",
 			"shapes/items/gem.dts", // Ew ew
 			"shapes/items/gemshine.png",
+			"shapes/balls/base.marble.png"
 		];
 		for (file in marblefiles) {
 			worker.loadFile(file);
diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx
index 0edff5dc..457ba855 100644
--- a/src/gui/EndGameGui.hx
+++ b/src/gui/EndGameGui.hx
@@ -174,8 +174,10 @@ class EndGameGui extends GuiControl {
 
 		var idx = scoreTimes.indexOf(timeState.gameplayClock);
 
-		if (Settings.progression[mission.difficultyIndex] == mission.index && qualified) {
-			Settings.progression[mission.difficultyIndex]++;
+		if (mission.type != "custom") {
+			if (Settings.progression[mission.difficultyIndex] == mission.index && qualified) {
+				Settings.progression[mission.difficultyIndex]++;
+			}
 		}
 		Settings.save();