From f7192d1e90e35e92c466eaf73f1f12bd6a826ab5 Mon Sep 17 00:00:00 2001
From: Daniel van Noord <danielvannoord@me.com>
Date: Sun, 29 Nov 2020 14:57:48 +0100
Subject: [PATCH] Fixed pp-sort breaking for sell-mode

---
 CookieMonster.js | 50 +++++++++++++++++++++++++++++++++++-------------
 src/Disp.js      | 50 +++++++++++++++++++++++++++++++++++-------------
 2 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index 56c7f22..e577246 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1398,21 +1398,32 @@ CM.Disp.UpdateBuildings = function() {
 	
 	// Build array of pointers, sort by pp, use array index (+2) as the grid row number
 	// (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
-	var arr = Object.keys(CM.Cache[target]).map(k =>
-	{
-		var o = CM.Cache[target][k];
-		o.name = k;
-		o.id = Game.Objects[k].id;
-		return o;
-	});
-
-	if (CM.Config.SortBuildings)
+	if (Game.buyMode == 1 && CM.Config.SortBuildings) {
+		var arr = Object.keys(CM.Cache[target]).map(k =>
+		{
+			var o = CM.Cache[target][k];
+			o.name = k;
+			o.id = Game.Objects[k].id;
+			return o;
+		});
 		arr.sort((a, b) => a.pp - b.pp);
-	else
-		arr.sort((a, b) => a.id - b.id);
 
-	for (var x = 0; x < arr.length; x++)
-		Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+		for (var x = 0; x < arr.length; x++) {
+			Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+		}
+	} else {
+		var arr = Object.keys(CM.Cache.Objects).map(k =>
+			{
+				var o = CM.Cache.Objects[k];
+				o.name = k;
+				o.id = Game.Objects[k].id;
+				return o;
+			});
+		arr.sort((a, b) => a.id - b.id);
+		for (var x = 0; x < arr.length; x++) {
+			Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+		}
+	}
 }
 
 CM.Disp.CreateUpgradeBar = function() {
@@ -3102,6 +3113,19 @@ CM.Disp.UpdateAscendState = function() {
 	CM.Disp.UpdateBackground();
 }
 
+CM.Disp.UpdateAuraDescription = function() {
+	return "function(aura)\
+	{\
+		l('dragonAuraInfo').innerHTML=\
+		'<div style=\"min-width:200px;text-align:center;\"><h4>'+Game.dragonAuras[aura].name+'</h4>'+\
+		'<div class=\"line\"></div>'+\
+		Game.dragonAuras[aura].desc+\
+		'<div class=\"line\"></div>'+\
+		CM.\
+		'</div>';\
+	}"
+}
+
 CM.Disp.ToggleSayTime = function() {
 	if (CM.Config.SayTime == 1) {
 		Game.sayTime = CM.Disp.sayTime;
diff --git a/src/Disp.js b/src/Disp.js
index 990e638..5b5eb81 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -660,21 +660,32 @@ CM.Disp.UpdateBuildings = function() {
 	
 	// Build array of pointers, sort by pp, use array index (+2) as the grid row number
 	// (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
-	var arr = Object.keys(CM.Cache[target]).map(k =>
-	{
-		var o = CM.Cache[target][k];
-		o.name = k;
-		o.id = Game.Objects[k].id;
-		return o;
-	});
-
-	if (CM.Config.SortBuildings)
+	if (Game.buyMode == 1 && CM.Config.SortBuildings) {
+		var arr = Object.keys(CM.Cache[target]).map(k =>
+		{
+			var o = CM.Cache[target][k];
+			o.name = k;
+			o.id = Game.Objects[k].id;
+			return o;
+		});
 		arr.sort((a, b) => a.pp - b.pp);
-	else
-		arr.sort((a, b) => a.id - b.id);
 
-	for (var x = 0; x < arr.length; x++)
-		Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+		for (var x = 0; x < arr.length; x++) {
+			Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+		}
+	} else {
+		var arr = Object.keys(CM.Cache.Objects).map(k =>
+			{
+				var o = CM.Cache.Objects[k];
+				o.name = k;
+				o.id = Game.Objects[k].id;
+				return o;
+			});
+		arr.sort((a, b) => a.id - b.id);
+		for (var x = 0; x < arr.length; x++) {
+			Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+		}
+	}
 }
 
 CM.Disp.CreateUpgradeBar = function() {
@@ -2364,6 +2375,19 @@ CM.Disp.UpdateAscendState = function() {
 	CM.Disp.UpdateBackground();
 }
 
+CM.Disp.UpdateAuraDescription = function() {
+	return "function(aura)\
+	{\
+		l('dragonAuraInfo').innerHTML=\
+		'<div style=\"min-width:200px;text-align:center;\"><h4>'+Game.dragonAuras[aura].name+'</h4>'+\
+		'<div class=\"line\"></div>'+\
+		Game.dragonAuras[aura].desc+\
+		'<div class=\"line\"></div>'+\
+		CM.\
+		'</div>';\
+	}"
+}
+
 CM.Disp.ToggleSayTime = function() {
 	if (CM.Config.SayTime == 1) {
 		Game.sayTime = CM.Disp.sayTime;