diff --git a/cat.html b/cat.html
index 4912e4f..1c7b9fe 100644
--- a/cat.html
+++ b/cat.html
@@ -4676,11 +4676,16 @@ var game = {
cury += HELPTEXTYSPACE;
} else if (curlevel == 18) {
var tempslashes;
- cury = this.drawhelpsubtitle(ctx, "Multi-coloured Cats", cury);
+ cury = this.drawhelpsubtitle(ctx, "Mice", cury);
ctx.textAlign = "left";
ctx.textBaseline = "bottom";
- shadowtext(ctx, "Cats can only form parades with cats of the same colour.", HELPTEXTSIZE,helpcol, textxspace, cury);
+ shadowtext(ctx, "Mice are a lot like cats. They can form parades, eat", HELPTEXTSIZE,helpcol, textxspace, cury);
+ cury += HELPTEXTYSPACE;
+ shadowtext(ctx, "cheese, gang up on llamas, and basically act like a cat.", HELPTEXTSIZE,helpcol, textxspace, cury);
+ cury += HELPTEXTYSPACE;
+ cury += HELPTEXTYSPACE;
+ shadowtext(ctx, "However, cats and mice cannot be in the same parade.", HELPTEXTSIZE,helpcol, textxspace, cury);
cury += HELPTEXTYSPACE;
cury += HELPTEXTYSPACE * 1.5;
@@ -4881,9 +4886,9 @@ var game = {
ctx.textAlign = "left";
ctx.textBaseline = "bottom";
- shadowtext(ctx, "Boxes are fantastic. Cats can enter adjacent boxes,", HELPTEXTSIZE,helpcol, textxspace, cury);
+ shadowtext(ctx, "Boxes are fantastic. Cats and mice can enter adjacent", HELPTEXTSIZE,helpcol, textxspace, cury);
cury += HELPTEXTYSPACE;
- shadowtext(ctx, "and can even do so after eating food.", HELPTEXTSIZE,helpcol, textxspace, cury);
+ shadowtext(ctx, "boxes, and can even do so while chomping food.", HELPTEXTSIZE,helpcol, textxspace, cury);
cury += HELPTEXTYSPACE;
// top line of box demo - cat -> box
@@ -4967,18 +4972,10 @@ var game = {
cury = y + gridsize*1.5;
- shadowtext(ctx, "Cats in boxes can chomp food without getting tired.", HELPTEXTSIZE,helpcol, textxspace, cury);
- cury += HELPTEXTYSPACE;
- cury += HELPTEXTYSPACE;
- shadowtext(ctx, "Cats in boxes can join parades of any colour.", HELPTEXTSIZE,helpcol, textxspace, cury);
- cury += HELPTEXTYSPACE;
- cury += HELPTEXTYSPACE;
- shadowtext(ctx, "Parades started by a cat-in-a-box may contain", HELPTEXTSIZE,helpcol, textxspace, cury);
- cury += HELPTEXTYSPACE;
- shadowtext(ctx, "cats of any colour.", HELPTEXTSIZE,helpcol, textxspace, cury);
+ shadowtext(ctx, "Creatures in boxes can chomp food without getting tired.", HELPTEXTSIZE,helpcol, textxspace, cury);
cury += HELPTEXTYSPACE;
- // top line of box parade demo
+ // box eating demo
x = imgsize;
y = cury;
row1y = y;
@@ -4998,11 +4995,57 @@ var game = {
liney[1] = y + imgsize/2;
x += gridsize;
+ drawarrow(ctx, linex[0], liney[0], linex[1], liney[1], PATHLINECOLGOOD, LINEWIDTH, PATHARROWSIZE);
+
+ cury = y;
+ cury += HELPTEXTYSPACE;
+ cury += HELPTEXTYSPACE;
+ cury += HELPTEXTYSPACE;
+ cury += HELPTEXTYSPACE;
+
+ cury = this.drawhelpsubtitle(ctx, "Box Parades", cury);
+ ctx.textAlign = "left";
+ ctx.textBaseline = "bottom";
+ shadowtext(ctx, "Boxes hide whatever is inside, so cats or mice in boxes", HELPTEXTSIZE,helpcol, textxspace, cury);
+ cury += HELPTEXTYSPACE;
+ shadowtext(ctx, "can join parades with each other.", HELPTEXTSIZE,helpcol, textxspace, cury);
+ cury += HELPTEXTYSPACE;
+ cury += HELPTEXTYSPACE;
+ shadowtext(ctx, "Parades started by a lived-in box may contain", HELPTEXTSIZE,helpcol, textxspace, cury);
+ cury += HELPTEXTYSPACE;
+ shadowtext(ctx, "both cats and mice.", HELPTEXTSIZE,helpcol, textxspace, cury);
+ cury += HELPTEXTYSPACE;
+
+ // top line of box parade demo
+ row1y = cury;
+/*
+ x = imgsize;
+ y = cury;
+ row1y = y;
+
+ ctx.drawImage(image['boxback'], x, y, imgsize, imgsize);
+ ctx.drawImage(image['cat'], x, y, imgsize, imgsize);
+ ctx.drawImage(image['boxfront'], x, y, imgsize, imgsize);
+ linex[0] = x + imgsize/2;
+ liney[0] = y + imgsize/2;
+ x += gridsize;
+
+ ctx.drawImage(image['cheese'], x, y, imgsize, imgsize);
+ x += gridsize;
+
+ ctx.drawImage(image['cheese'], x, y, imgsize, imgsize);
+ linex[1] = x + imgsize/2;
+ liney[1] = y + imgsize/2;
+ x += gridsize;
+*/
+
// next line
x = imgsize;
- y += gridsize
+ y = cury + gridsize;
row2y = y;
+ y -= gridsize/2;
+
ctx.drawImage(image['boxback'], x, y, imgsize, imgsize);
ctx.drawImage(image['cat'], x, y, imgsize, imgsize);
ctx.drawImage(image['boxfront'], x, y, imgsize, imgsize);
@@ -5052,17 +5095,16 @@ var game = {
x += gridsize;
ctx.drawImage(image['boxback'], x, y, imgsize, imgsize);
- ctx.drawImage(image['cat'], x, y, imgsize, imgsize);
+ ctx.drawImage(image['cat1'], x, y, imgsize, imgsize);
ctx.drawImage(image['boxfront'], x, y, imgsize, imgsize);
x += gridsize;
- ctx.drawImage(image['cat1'], x, y, imgsize, imgsize);
+ ctx.drawImage(image['cat'], x, y, imgsize, imgsize);
linex[7] = x + imgsize/2;
liney[7] = y + imgsize/2;
x += gridsize;
- drawarrow(ctx, linex[0], liney[0], linex[1], liney[1], PATHLINECOLGOOD, LINEWIDTH, PATHARROWSIZE);
drawarrow(ctx, linex[2], liney[2], linex[3], liney[3], PATHLINECOLGOOD, LINEWIDTH, PATHARROWSIZE);
drawarrow(ctx, linex[4], liney[4], linex[5], liney[5], PATHLINECOLGOOD, LINEWIDTH, PATHARROWSIZE);
drawarrow(ctx, linex[6], liney[6], linex[7], liney[7], PATHLINECOLGOOD, LINEWIDTH, PATHARROWSIZE);
@@ -6950,16 +6992,21 @@ function thing(gridx, gridy, type, text, col) {
this.getdesc = function() {
var desc = "";
if (this.type == "cat") {
+ var noun ="cat";
+ if (this.catcol == 1) {
+ noun = "mouse";
+ }
+
if (this.isscared()) {
if (this.issleepy() == true) {
- desc = "scared sleepy cat";
+ desc = "scared sleepy " + noun;
} else {
- desc = "scared cat";
+ desc = "scared " + noun;
}
} else if (this.issleepy() == true) {
- desc = "sleepy cat";
+ desc = "sleepy " + noun;
} else {
- desc = "cat";
+ desc = noun;
}
} else if (this.type == "llama") {
var num;
diff --git a/images/cat1.png b/images/cat1.png
index ac7d858..f5e234b 100644
Binary files a/images/cat1.png and b/images/cat1.png differ
diff --git a/images/catfull1.png b/images/catfull1.png
index 908ff8f..437ec45 100644
Binary files a/images/catfull1.png and b/images/catfull1.png differ
diff --git a/images/catscared1.png b/images/catscared1.png
index 3e6c32b..2298548 100644
Binary files a/images/catscared1.png and b/images/catscared1.png differ