From 1bf04c9e68a9fb6e645d204d301b94fb2a028516 Mon Sep 17 00:00:00 2001
From: Richard Proctor <richard@waveney.org>
Date: Sun, 11 May 2014 22:04:43 +0100
Subject: [PATCH] Dragon Save

Nearly there!
---
 badges.js     |  2 +-
 boosts.js     | 83 ++++++++++++++++++++++++++++++++++++++-------------
 castle.js     | 31 +++++++++++--------
 dragons.js    | 82 ++++++++++++++++++++++++++++++++++----------------
 gui.js        |  2 +-
 persist.js    |  1 +
 redundancy.js |  3 +-
 7 files changed, 143 insertions(+), 61 deletions(-)

diff --git a/badges.js b/badges.js
index 50a3a74b7..ebc52b4e9 100644
--- a/badges.js
+++ b/badges.js
@@ -750,7 +750,7 @@ Molpy.DefineBadges = function() {
 	});
 	new Molpy.Badge({
 		name: 'Meaning',
-		desc: 'Reach a ' + Molpy.redactedWord + ' streak of 42'
+		desc: 'Reach a ' + Molpy.Redacted.Word + ' streak of 42'
 	});
 	new Molpy.Badge({
 		name: 'How do I Shot Mustard?',
diff --git a/boosts.js b/boosts.js
index a67234df7..99e615e20 100644
--- a/boosts.js
+++ b/boosts.js
@@ -7704,6 +7704,8 @@ Molpy.DefineBoosts = function() {
 					}
 				}
 				str += '</div>';
+			} else {
+				str += ' It can not have its lining changed while in use.';
 			}
 			return str;
 		},
@@ -7725,8 +7727,8 @@ Molpy.DefineBoosts = function() {
 				var stat1 = 0;
 				var stat2 = 0;
 				for (var line in this.Liners) {
-					if (pair[0] == Molpy.NestLinings[line]) stat1 = this.Liners[line];
-					if (pair[1] == Molpy.NestLinings[line]) stat2 = this.Liners[line];
+					if (pair[0] == Molpy.NestLinings[line] && Molpy.Has(pair[0],Infinity)) stat1 = this.Liners[line];
+					if (pair[1] == Molpy.NestLinings[line] && Molpy.Has(pair[1],Infinity)) stat2 = this.Liners[line];
 				}
 				props[prop] = stat1*stat2/10000;
 			}
@@ -7804,7 +7806,8 @@ Molpy.DefineBoosts = function() {
 		},
 		ChangeState: function(newstate, duration) {
 			this.overallState = newstate;
-			this.countdown += (duration || 1);		
+			if (newstate) this.countdown += (duration || 1)
+			else this.countdown = 0;	
 		},
 		clickBeach: function() {
 			if (this.bought && Molpy.DragonDigRate && Molpy.Got('Beach Dragon')) {
@@ -7813,7 +7816,7 @@ Molpy.DefineBoosts = function() {
 		},
 
 		Loose: function(type,num) {
-			loses[type] = (loses[type]||0)+num;
+			this.loses[type] = (this.loses[type]||0)+num;
 			this.totalloses += num;
 			if (this.totalloses >= 20) Molpy.EarnBadge('What\'s the score?');
 			if (this.totalloses >= 144) Molpy.EarnBadge('That\'s gross');
@@ -9721,6 +9724,7 @@ Molpy.DefineBoosts = function() {
 		icon: 'rdkm',
 		desc: function (me) {
 			var str = 'This has lots of useful information that will change as you do things...';
+			var draglevel = Molpy.Level('DQ');
 			if (!me.bought) return str;
 			str += '<br><ul class=rdkm>';
 			if (!Molpy.Level('Eggs')) {
@@ -9730,7 +9734,7 @@ Molpy.DefineBoosts = function() {
 				str += '<li>Linings of Blackprints and Flux Crystals give digging';
 				if (Molpy.Has('Goats',Infinity) && Molpy.Has('Mustard',Infinity)) {
 					str += '<li>Linings of Goats and Mustard give breath effects.';
-					if (Moply.Dragonsx.Level <= Molpy.Dragon['Wyrm'].Level) str += '  When you have the rght types of dragons.';
+					if (draglevel < Molpy.Dragons['Wyrm'].id) str += '  When you have the rght types of dragons.';
 					}
 				if (Molpy.Has('Bonemeal',Infinity) && Molpy.Has('Vacuums',Infinity)) str += '<li>Linings of Bonemeal and Vacuums give magic';
 				if (Molpy.Has('Logicats',Infinity) && Molpy.Has('QQ',Infinity)) str += '<li>Linings of Logicat Levels and QQs give magic';
@@ -9750,7 +9754,6 @@ Molpy.DefineBoosts = function() {
 				str += '<li>If there are too many hatchlings for the NP the strongest will eat the rest';
 				str += '<li>Once released they have to survive the locals and they can then can start digging for treasure';
 			};
-			var draglevel = Molpy.Level('DQ');
 			if (draglevel || Molpy.TotalDragons) {
 				str += '<li>Draglings are feeble creatures, they need looking after';
 				str += '<li>' + Molpy.Dragons['Dragling'].description();
@@ -9772,35 +9775,44 @@ Molpy.DefineBoosts = function() {
 	new Molpy.Boost({
 		name: 'Big Teeth',
 		icon: 'bigteeth',
+		single: 'Big Tooth',
 		desc: function(me) {
 			str = 'Increases the offensive value of Dragons';
-			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' Big Teeth';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
 			return str;
 		},
 		draglvl: 'Dragling',
-		limit: 20,
+		limit: function() {
+			if (Molpy.Level('DQ') == 0) return 4;
+			return 20;
+		},
 		Level: Molpy.BoostFuncs.Bought0Level,
 	});
 
 	new Molpy.Boost({
 		name: 'Spines',
 		icon: 'spines',
+		single: 'Spine',
 		desc: function(me) {
 			str = 'Increases the defense value of Dragons';
-			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' spine' + plural(me.bought);
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
 			return str;
 		},
 		draglvl: 'Dragling',
-		limit: 20,
+		limit: function() {
+			if (Molpy.Level('DQ') == 0) return 4;
+			return 20;
+		},
 		Level: Molpy.BoostFuncs.Bought0Level,
 	});
 
 	new Molpy.Boost({
 		name: 'Tusks',
 		icon: 'tusks',
+		single: 'Tusk',
 		desc: function(me) {
 			str = 'Increases the offensive value of Dragons';
-			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' tusk' + plural(me.bought);
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
 			return str;
 		},
 		draglvl: 'DragonNewt',
@@ -9817,7 +9829,10 @@ Molpy.DefineBoosts = function() {
 			return str;
 		},
 		draglvl: 'DragonNewt',
-		limit: 30,
+		limit: function() {
+			if (Molpy.Level('DQ') == Molpy.Dragons['DragonNewt'].id) return 4;
+			return 30;
+		},
 		Level: Molpy.BoostFuncs.Bought0Level,
 	});
 
@@ -9840,7 +9855,12 @@ Molpy.DefineBoosts = function() {
 	new Molpy.Boost({
 		name: 'Magic Teeth',
 		icon: 'magicteeth',
-		desc: 'Increases the offence value of Dragons',
+		single: 'Magic Tooth',
+		desc: function(me) {
+			str = 'Increases the offence value of Dragons';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
+			return str;
+		},
 		draglvl: 'Dragon',
 		limit: 50,
 		Level: Molpy.BoostFuncs.Bought0Level,
@@ -9874,9 +9894,14 @@ Molpy.DefineBoosts = function() {
 	new Molpy.Boost({
 		name: 'Healing Potion',
 		icon: 'healingpotion',
-		desc: 'Increases Draconic Health and speeds up healing',
+		desc: function(me) {
+			str = 'Increases Draconic Health and speeds up healing';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
+			return str;
+		},
 		draglvl: 'DragonNewt',
 		limit: 20,
+		defStuff: 1,
 		Spend: function() {
 			if (!this.bought) return false;
 			this.bought--;
@@ -9888,9 +9913,14 @@ Molpy.DefineBoosts = function() {
 	new Molpy.Boost({
 		name: 'Strength Potion',
 		icon: 'strengthpotion',
-		desc: 'Increases Draconic Strength',
+		desc: function(me) {
+			str = 'Increases Draconic Strength';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
+			return str;
+		},
 		draglvl: 'Wyrm',
 		limit: 20,
+		defStuff: 1,
 		Spend: function() {
 			if (!this.bought) return false;
 			this.bought--;
@@ -9943,16 +9973,18 @@ Molpy.DefineBoosts = function() {
 	});
 
 	new Molpy.Boost({ // Hook
-		name: 'A Cup Of Tea',
+		name: 'Cup Of Tea',
 		icon: 'cuptea',
+		plural: 'Cups of Tea',
 		desc: function(me) {
 			str = 'Reduces the time dragons need to recover after injury';
-			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' cup' + plural(me.bought) + ' of Tea';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
 			return str;
 		},
 		group: 'bean',
 		draglvl: 'Dragling',
 		limit: 4,
+		defStuff: 1,
 		Spend: function() {
 			if (!this.bought) return false;
 			this.bought--;
@@ -9982,10 +10014,17 @@ Molpy.DefineBoosts = function() {
 	new Molpy.Boost({ 
 		name: 'Camelflarge',
 		icon: 'camel',
-		desc: 'Reduces the time dragons need to hide',
+		desc: function(me) {
+			str = 'Reduces the time dragons need to hide';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
+			return str;
+		},
 		group: 'drac',
 		draglvl: 'Dragling',
-		limit: 10,
+		limit: function() {
+			if (Molpy.Level('DQ') == 0) return 4;
+			return 10;
+		},
 		Level: Molpy.BoostFuncs.Bought0Level,
 	});
 
@@ -10019,7 +10058,11 @@ Molpy.DefineBoosts = function() {
 	new Molpy.Boost({ 
 		name: 'Incubator',
 		icon: 'incubator',
-		desc: 'Reduces the time dragon eggs need before they hatch',
+		desc: function(me) {
+			str = 'Reduces the time dragon eggs need before they hatch';
+			if (me.bought) str += '.  You have ' + Molpify(me.bought) + ' ' + (me.bought>1?me.plural:me.single);
+			return str;
+		},
 		group: 'drac',
 		draglvl: 'DragonNewt',
 		limit: 4,
diff --git a/castle.js b/castle.js
index c64fb4984..3e4d1580f 100644
--- a/castle.js
+++ b/castle.js
@@ -1270,6 +1270,7 @@ Molpy.Up = function() {
 			} else {
 				amount = EvalMaybeFunction(amount, 0, 1);
 				var b = Molpy.Boosts[stuff];
+				if (b && !b.Has) { Molpy.Notify('Errr - ' + b.name,1); return false; };
 				return b && b.Has(amount) && b.Spend(amount, s);
 			}
 		};
@@ -1358,7 +1359,7 @@ Molpy.Up = function() {
 					Molpy.UnlockBoost(this.alias);
 					this.buy();
 				}
-			}
+			},
 		};
 
 		Molpy.boostNeedRepaint = 1;
@@ -2136,19 +2137,25 @@ Molpy.Up = function() {
 					}
 				if(!possible) this.location = 0;
 				
-				// There is at least one valid spawn location, grab a random one
-				//TODO this can be made better by making a list of valid first and selecting from that instead
+				// For Knights selectthe shop if possible
 				var valid = false;
-				var loopNum = 0;
-				var randNum = 0;
-				while(loopNum < 50 && valid == false) {
-					randNum = Math.ceil((this.possibleLocations + 2) * Math.random());
-					if(randNum > this.possibleLocations) randNum = 4;
-					if(this.divList[randNum].is(':visible')) {
-						this.location = randNum;
-						valid = true;
+				if (Molpy.TotalDragons && Molpy.Boosts['DQ'].overallState == 0 && this.divList[3].is(':visible')) { // Redunaknights
+					this.location = 3; // Shop
+					valid = true;
+				} else {
+					// There is at least one valid spawn location, grab a random one
+					//TODO this can be made better by making a list of valid first and selecting from that instead
+					var loopNum = 0;
+					var randNum = 0;
+					while(loopNum < 50 && valid == false) {
+						randNum = Math.ceil((this.possibleLocations + 2) * Math.random());
+						if(randNum > this.possibleLocations) randNum = 4;
+						if(this.divList[randNum].is(':visible')) {
+							this.location = randNum;
+							valid = true;
+						}
+						loopNum ++;
 					}
-					loopNum ++;
 				}
 				
 				// Unlucky RNG, didn't find a valid spawn location 
diff --git a/dragons.js b/dragons.js
index 95f93e9a2..d0c587e1b 100644
--- a/dragons.js
+++ b/dragons.js
@@ -61,7 +61,7 @@ Molpy.DefineDragons = function() {
 		exp: '10K',
 		condition: function() { return true },
 		desc: 'These small timid creatures hide in the shadows and under leaves keeping out of the way of fierce cats',
-		digbase: 0.1,
+		digbase: 1,
 		colour: '00ff00',
 	});
 	new Molpy.Dragon({
@@ -76,7 +76,7 @@ Molpy.DefineDragons = function() {
 		exp: '10M',
 		condition: function() { return false },
 		desc: 'These high spirited diminutive dragons, stand nearly a Q tall and can wield weapons and spades.  They mean well...',
-		digbase: 1,
+		digbase: 100,
 		colour: '0080ff',
 	});
 	new Molpy.Dragon({
@@ -91,7 +91,7 @@ Molpy.DefineDragons = function() {
 		exp: '10T',
 		condition: function() { return false },
 		desc: 'These are monstorous, limbless creatures, with a big bite.',
-		digbase: 100,
+		digbase: 1e4,
 		colour: '0000ff',
 	});
 	new Molpy.Dragon({
@@ -106,7 +106,7 @@ Molpy.DefineDragons = function() {
 		exp: '1T',
 		condition: function() { return false },
 		desc: 'These can fly.  They fight and dig with their legs, some have a bad breath.',
-		digbase: 10000,
+		digbase: 1e6,
 		colour: '8000ff',
 	});
 	new Molpy.Dragon({
@@ -122,7 +122,7 @@ Molpy.DefineDragons = function() {
 		exp: '1T',
 		condition: function() { return false },
 		desc: 'Tradional Welsh Dragon',
-		digbase: 1000000,
+		digbase: 1e8,
 		colour: 'ff00ff',
 	});
 	new Molpy.Dragon({
@@ -139,7 +139,7 @@ Molpy.DefineDragons = function() {
 		exp: '1T',
 		condition: function() { return false },
 		desc: 'Very large magical dragon',
-		digbase: 100000000,
+		digbase: 1e11,
 		colour: 'ff0000',
 	});
 	new Molpy.Dragon({
@@ -156,7 +156,7 @@ Molpy.DefineDragons = function() {
 		exp: '1T',
 		condition: function() { return false },
 		desc: 'These are the makers of ledgends, attacking with many heads in many ways, mortals don\'t want to be in the ssame universe as this.',
-		digbase: 10000000000,
+		digbase: 1e15,
 		colour: '800000',
 	});
 	new Molpy.Dragon({
@@ -173,7 +173,7 @@ Molpy.DefineDragons = function() {
 		exp: '1T',
 		condition: function() { return false },
 		desc: '!', // later
-		digbase: 1000000000000,
+		digbase: 1e20,
 		colour: '000000',
 	});
 
@@ -255,7 +255,7 @@ Molpy.Opponent = function(args) {
 	}
 };
 
-// First char of armed: -(no a), !an, + the, @his, |his|her, else a...
+// First char of armed: -(no a), !an, + the, |his/her, else a...
 Molpy.DefineOpponents = function() {
 	new Molpy.Opponent ({
 		name: 'Serf',
@@ -368,7 +368,7 @@ Molpy.DefineOpponents = function() {
 Molpy.NPdata = [];
 
 Molpy.ClearNPdata = function() {
-	MolpyNPdata = [];
+	Molpy.NPdata = [];
 };
 
 // Digging *********************************************************
@@ -381,7 +381,7 @@ Molpy.TotalNPsWithDragons = 0;
 Molpy.HighestNPwithDragons = 0;
 Molpy.DigTime=0;
 Molpy.DiggingFinds={};
-Molpy.DragonDigMultiplier = 1;
+Molpy.DragonDigMultiplier = 10;
 Molpy.DragonAttackMultiplier = 1;
 Molpy.DragonDefenceMultiplier = 1;
 Molpy.DragonBreathMultiplier = 1;
@@ -389,7 +389,7 @@ Molpy.DragonBreathMultiplier = 1;
 Molpy.DragonDigRecalc = function() {
 	Molpy.DragonDigRecalcNeeded = 0;
 
-	Molpy.DragonDigMultiplier = 1;
+	Molpy.DragonDigMultiplier = 10;
 	if (Molpy.Got('Bucket and Spade')) Molpy.DragonDigMultiplier *=2;
 	if (Molpy.Got('Strength Potion')) Molpy.DragonDigMultiplier *=5;
 	if (Molpy.Got('Lucky Ring')) Molpy.DragonDigMultiplier *=5;
@@ -443,9 +443,12 @@ Molpy.DragonDigging = function(type) { // type:0 = mnp, 1= beach click
 						stuff = 'Silver';
 						n *= 1000;
 					}
+					strs.push(Molpify(n) + ' ' +stuff);
+				} else if (n == 1) {
+					strs.push(Molpify(n) + ' ' +Molpy.Boosts[stuff].single);
+				} else {
+					strs.push(Molpify(n) + ' ' +Molpy.Boosts[stuff].plural);
 				}
-
-				strs.push(Molpify(n) + ' ' +stuff);
 			};
 			if (strs.length == 1) str += strs[0]
 			else {
@@ -480,9 +483,10 @@ Molpy.DragonDigging = function(type) { // type:0 = mnp, 1= beach click
 		var availRewards = [];
 		for( var i in Molpy.Boosts) {
 			var me = Molpy.Boosts[i];
-				if("draglvl" in me && Molpy.Dragons[me.draglvl].id <= dq.Level && me.bought < (me.limit || 1)) {
-					availRewards.push(me);
-				}
+			if("draglvl" in me && Molpy.Dragons[me.draglvl].id <= dq.Level) {
+				var lim = EvalMaybeFunction(me.limit,me,1);      
+				if (me.bought < lim) availRewards.push(me);
+			}
 		}
 //		Molpy.Notify('List length '+ availRewards.length);
 		var thing = GLRschoice(availRewards);
@@ -505,7 +509,7 @@ Molpy.DragonDigging = function(type) { // type:0 = mnp, 1= beach click
 	if (found) {
 //		Molpy.Notify('Found ' + n + ' ' + found,1);
 		var f = dq.finds++;
-		if (f > 100) Molpy.UnlockBoost('Beach Dragon');
+		if (f > 20) Molpy.UnlockBoost('Beach Dragon');
 		if (Molpy.DiggingFinds[found]) {
 			Molpy.DiggingFinds[found] += n;
 		} else {
@@ -689,7 +693,7 @@ Molpy.OpponentsAttack = function(where,from,text) {
 			}
 			var rectime = (dragstats.DragonType+1)*200/factor;
 			if (Molpy.Spend('Healing Potion')) rectime/=5;
-			if (Molpy.Spend('A Cup of Tea')) rectime/=2;
+			if (Molpy.Spend('Cup of Tea')) rectime/=2;
 			rectime = Math.floor(rectime);
 			dq.ChangeState(1,rectime);
 			Molpy.Notify(atktxt + ' You won a very hard fight, ' + 
@@ -701,7 +705,7 @@ Molpy.OpponentsAttack = function(where,from,text) {
 		case 2 : // won a hard fight - need to recover
 			var rectime = (dragstats.DragonType+1)*100/factor;
 			if (Molpy.Spend('Healing Potion')) rectime/=5;
-			if (Molpy.Spend('A Cup of Tea')) rectime/=2;
+			if (Molpy.Spend('Cup of Tea')) rectime/=2;
 			rectime = Math.floor(rectime);
 			dq.ChangeState(1,rectime);
 			Molpy.Notify(atktxt + ' You won a hard fight, but will need to recover for ' + 
@@ -710,9 +714,18 @@ Molpy.OpponentsAttack = function(where,from,text) {
 			break;
 
 		case 3 : // Wipeout for no loss
-			Molpy.Notify(atktxt + ' You wiped ' + (numb==1?['him','her'][local.gender]:'them') + 
+			if (npd.DragonType) {
+				Molpy.Notify(atktxt + ' You wiped ' + (numb==1?['him','her'][local.gender]:'them') + 
 					' out with ease',1);
+			} else {
+				Molpy.Notify(atktxt + ' You scared ' + (numb==1?['him','her'][local.gender]:'them') + 
+					' away with ease',1);
+			}
 			local.takeReward(numb,DeMolpify(local.exp)*numb*2); 
+			if (dq.overallState) {
+				Molpy.Notify('Your heroic victory inspires the others to go back to work',1);
+				dq.ChangeState(0);
+			}
 			break;
 	}
 	Molpy.DragonDigRecalcNeeded = 1;
@@ -720,9 +733,24 @@ Molpy.OpponentsAttack = function(where,from,text) {
 
 Molpy.DragonKnightAttack = function() { // Attack Opponents
 	Molpy.Redacted.onClick();
-	npd = Molpy.NPdata[Molpy.HighestNPwithDragons];
-	Molpy.OpponentsAttack(Molpy.HighestNPwithDragons,Molpy.HighestNPwithDragons+150*(1*Math.log(Molpy.Level('Princesses')+1)),
-			' attacked your ' + Molpy.DragonsById[npd.DragonType].name + plural(npd.ammount) + ' at NP'+Molpy.HighestNPwithDragons);
+	var atk = Molpy.HighestNPwithDragons;
+	if (Math.random()<.25) {
+		var di = Math.random()*Molpy.TotalNPsWithDragons;
+		var found = 0;
+		for (var np=1; np<=atk; np++) {
+			if (Molpy.NPdata[np] && Molpy.NPdata[np].ammount) {
+				found++;
+				if (found >= di) {
+					atk = np;
+					break;
+				}
+			}
+		}
+	}
+
+	npd = Molpy.NPdata[atk];
+	Molpy.OpponentsAttack(atk,atk+150*(1*Math.log(Molpy.Level('Princesses')+1)),
+			' attacked your ' + Molpy.DragonsById[npd.DragonType].name + plural(npd.ammount) + ' at NP'+atk);
 }
 
 Molpy.DragonsHide = function(type) {
@@ -806,8 +834,8 @@ Dragons
 12.1	For classic
 13	Dragon Stats					y	y
 13.1	For Classic
-14	Dragon Overview Pane
-14.1	For classic
+14	Dragon Overview Pane				Not Lanuch
+14.1	For classic					Not Launch
 15	Dragon Upgrades					y	y
 16	Draglings					Y	y
 17	DragonNewts					y	y
@@ -820,6 +848,8 @@ Dragons
 24	Mirror Dragons					Not Launch
 25	Use # appendeges in desciptions			y	y	
 26	Infinite AC runs -how?				y	y
+27	Fix Molpifycountdown				y	y
+
 
 * Mouthwash (to reduce bad breath backfires)
 * Coal (for fires)
diff --git a/gui.js b/gui.js
index a8c949cf2..ab1065690 100644
--- a/gui.js
+++ b/gui.js
@@ -1474,7 +1474,7 @@ Molpy.DefineGUI = function() {
 		g('dragontypestat').innerHTML = Molpy.DragonsById[Molpy.Level('DQ')].name;
 		g('dragonnumbersstat').innerHTML = Molpify(Molpy.TotalDragons, 1);
 		g('npswithdragonsstat').innerHTML = Molpify(Molpy.TotalNPsWithDragons, 1);
-		g('dragondiggingstat').innerHTML = Molpify(Molpy.DragonDigRate, 2);
+		g('dragondiggingstat').innerHTML = Molpify(Molpy.DragonDigRate, 3);
 		g('dragonsloststat').innerHTML = Molpify(Molpy.Boosts['DQ'].totalloses, 2);
 		g('dragonfightstat').innerHTML = Molpify(Molpy.Boosts['DQ'].totalfights, 2);
 
diff --git a/persist.js b/persist.js
index d32c21c56..d9d7d4227 100644
--- a/persist.js
+++ b/persist.js
@@ -851,6 +851,7 @@
 		Molpy.HandlePeriods();
 		Molpy.UpdateBeach();
 		Molpy.RatesRecalculate();
+		Molpy.DragonDigRecalc();
 		Molpy.allNeedRepaint = 1;
 		Molpy.judgeLevel = -1;
 		Molpy.calculateRates();
diff --git a/redundancy.js b/redundancy.js
index 77e344701..baf22e505 100644
--- a/redundancy.js
+++ b/redundancy.js
@@ -89,7 +89,8 @@ function Molpify(number, raftcastle, shrinkify) {
 }
 
 function MolpifyCountdown(mNP, p) {
-	return mNP == 0 ? 'ever' : mNP >= 1000 ? Molpify(mNP / 1000, p) + 'NP' : Molpify(mNP) + 'mNP'
+	var rat = Molpy.NPlength/Molpy.mNPlength;
+	return mNP == 0 ? 'ever' : mNP >= 1000*rat ? Molpify(mNP*rat / 1000, p) + 'NP' : Molpify(mNP) + 'mNP'
 }
 function flandom(n) {
 	return(Math.floor(Math.random() * n));