From db05c2f2d7feffcf5b006db60a87f1442f1e9988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Thu, 12 Dec 2019 15:14:51 +0900
Subject: [PATCH] Fix: remove unused meat.js, edit chocomae description, update
 files

---
 index.html                               |   2 +-
 src/game/mouse/grilled_meat/meat.js      | 338 -----------------------
 src/game/mouse/grilled_meat/meat_base.js |   6 +-
 src/game/mouse/grilled_meat/smoke.js     |  10 +-
 src/web/client/grilled_meat.html         |  13 +-
 src/web/main/index.html                  |   5 +-
 6 files changed, 18 insertions(+), 356 deletions(-)
 delete mode 100644 src/game/mouse/grilled_meat/meat.js

diff --git a/index.html b/index.html
index 2ae3a1b..0975d16 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
 		<!-- End Google Tag Manager -->
 
 		<title>초코마에</title>
-		<meta name="description" CONTENT="초코마에, 마우스 / 한글 타자, 영문 타자 연습 앱 모음 - Chocomae, Mouse / Korean English Typing practice apps">
+		<meta name="description" CONTENT="쉽고 재미있는 타자 연습, 같은 반 친구들과 함께 즐겨보아요. 마우스 연습도 있어요. 방과후 수업 선생님들을 위한 컨텐츠도 마련했어요. | 초코마에 ‧ Mouse and Korean/English tyiping practice app | ChocoMae">
 
 
 		<script type="text/javascript">
diff --git a/src/game/mouse/grilled_meat/meat.js b/src/game/mouse/grilled_meat/meat.js
deleted file mode 100644
index 12f1396..0000000
--- a/src/game/mouse/grilled_meat/meat.js
+++ /dev/null
@@ -1,338 +0,0 @@
-Meat = function(mainGame) {
-	this.mainGame = mainGame;
-	this.cookingSide = Meat.MEAT_NONE;
-	this.cookingTime = [];
-	this.cookingGrade = [];
-	this.cookingTime[Meat.MEAT_BACK] = 0;
-	this.cookingTime[Meat.MEAT_FRONT] = 0;
-	this.cookingGrade[Meat.MEAT_BACK] = Meat.DONENESS_RARE;
-	this.cookingGrade[Meat.MEAT_FRONT] = Meat.DONENESS_RARE;
-
-
-	this.isActivated = true;
-	this.isStartCook = false;
-	this.isOnHeatPlate = false;
-
-	this.downPositionX;
-	this.downPositionY;
-
-	Phaser.Sprite.call(this, game, this.mainGame.meatPlate.x, this.mainGame.meatPlate.y, 'meat1');
-	this.anchor.set(0.5);
-	this.scale.set(0.5);
-	this.smoothed = false;
-
-	this.inputEnabled = true;
-	this.input.enableDrag();
-	this.events.onInputDown.add(this.onDown, this);
-	this.events.onInputUp.add(this.onUp, this);
-	// this.events.onDragStart.add(this.onDragStart, this);
-	// this.events.onDragStop.add(this.onDragStop, this);
-
-	this.whiteSmokeParticle = new Smoke(Meat.DONENESS_RARE, 0, 0);
-	this.redSmokeParticle = new Smoke(Meat.DONENESS_WELLDONE, 0, 0);
-	this.blackSmokeParticle = new Smoke(Meat.DONENESS_BURN_BLACK, 0, 0);
-
-	game.add.existing(this);
-}
-
-Meat.prototype = Object.create(Phaser.Sprite.prototype);
-Meat.prototype.constructor = Meat;
-Meat.prototype.update = function() {
-	var positionY = this.y;
-
-	if(positionY <= Game.GOD_POSITION_Y)
-		this.scale.set(0.4);
-	else if(positionY > Game.GOD_POSITION_Y && positionY < Game.HEAT_PLATE_POSITION_Y) {
-		var scaleRate = (positionY - Game.GOD_POSITION_Y) / (Game.HEAT_PLATE_POSITION_Y - Game.GOD_POSITION_Y);
-		this.scale.set(0.4 + 0.3 * scaleRate);
-	} else
-		this.scale.set(0.4 + 0.3);
-
-
-	if(this.isOnHeatPlate == true && game.input.mousePointer.isUp == true) {
-		this.cooking();
-	}
-}
-
-
-Meat.prototype.onDown = function(sprite, pointer) {
-	// console.log("-------------------------");
-	// console.log("onDown : " + pointer.x + ", " + pointer.y);
-
-	this.downPositionX = Math.floor(sprite.x);
-	this.downPositionY = Math.floor(sprite.y);
-
-	this.stopCook();
-}
-
-Meat.prototype.onUp = function(sprite, pointer) {
-	// console.log("-------------------------");
-	// console.log("onUp : " + pointer.x + ", " + pointer.y);
-
-	var upPositionX = Math.floor(sprite.x);
-	var upPositionY = Math.floor(sprite.y);
-
-	// console.log("downPositionX : + " + this.downPositionX + ", downPositY : " + this.downPositionY);
-	// console.log("upPositionX : + " + upPositionX + ", upPositionY : " + upPositionY);
-	if(this.isInClickArea(this.downPositionX, this.downPositionY, upPositionX, upPositionY) == true)
-		this.onClickListener();
-	else {
-		this.onDragStopListener();
-	}
-}
-
-
-/*
-Meat.prototype.onDragStart = function(sprite, pointer) {
-	// console.log("onDragStart : " + pointer.x + ", " + pointer.y);
-	console.log("onDragStart");
-
-	this.stopCook();
-}
-
-Meat.prototype.onDragStop = function(sprite, pointer) {
-	// console.log("onDragStop : " + pointer.x + ", " + pointer.y);
-	console.log("onDragStop");
-
-	if(isOverHeatPlate(this.x, this.y, this.width, this.height) == true) {
-		console.log("isOverHeatPlate : " + isOverHeatPlate(this.x, this.y, this.width, this.height));
-		this.startCook();
-	} else {
-		this.stopCook();
-	}
-
-	if(isOverGod(this.x, this.y) == true) {
-		console.log("isOverGod : " + isOverGod(this.x, this.y));
-		godEatMeat(this);
-	}
-
-}
-*/
-
-
-Meat.prototype.isInClickArea = function(downX, downY, upX, upY) {
-	if(downX - 5 < upX && upX < downX + 5 && downY - 5 < upY && upY < downY + 5)
-		return true;
-
-	return false;
-}
-
-Meat.prototype.onClickListener = function(pointer) {
-	// console.log("onClickListener");
-
-	if(this.mainGame.isOverHeatPlate(this.x, this.y, this.width, this.height) == true) {
-		if(this.isFront() == true)
-			this.flipToBack()
-		else
-			this.flipToFront();
-		// console.log("flip cooking side : " + this.cookingSide);
-
-		this.startCook();
-	}
-}
-
-Meat.prototype.onDragStopListener = function(pointer) {
-	// console.log("onDragStop");
-
-	if(this.mainGame.isOverHeatPlate(this.x, this.y, this.width, this.height) == true) {
-		// console.log("isOverHeatPlate : " + isOverHeatPlate(this.x, this.y, this.width, this.height));
-		this.startCook();
-	} else {
-		this.stopCook();
-	}
-
-	if(this.mainGame.isOverGod(this.x, this.y) == true) {
-		// console.log("isOverGod : " + isOverGod(this.x, this.y));
-		this.mainGame.godEatMeat(this);
-	}
-}
-
-
-Meat.prototype.setScale = function(size) {
-	this.scale.set(size);
-	this.backupScale = size;
-}
-
-
-
-Meat.prototype.isFront = function() {
-	if(this.cookingSide == Meat.MEAT_BACK)
-		return true;
-
-	return false;
-}
-
-Meat.prototype.flipToFront = function() {
-	this.cookingSide = Meat.MEAT_BACK;
-	// console.log("flipToFront : " + this.cookingSide);
-
-	this.angle = Meat.ANGLE_FRONT;
-	// console.log("flipToFront");
-	// console.log("back : " + this.getMeatGradeBySide(Meat.MEAT_BACK) + ", front : " + this.getMeatGradeBySide(Meat.MEAT_FRONT));
-	if(this.getMeatGradeBySide(Meat.MEAT_FRONT) == Meat.DONENESS_BURN_BLACK) {
-		this.loadTexture('meat_burn1');
-	} else if(this.getMeatGradeBySide(Meat.MEAT_FRONT) == Meat.DONENESS_WELLDONE) {
-		this.loadTexture('meat_welldone1');
-	} else {
-		this.loadTexture('meat1');
-	}
-}
-
-Meat.prototype.flipToBack = function() {
-	this.cookingSide = Meat.MEAT_FRONT;
-	// console.log("flipToBack : " + this.cookingSide);
-
-	this.angle = Meat.ANGLE_BACK;
-	// console.log("flipToBack");
-	// console.log("back : " + this.getMeatGradeBySide(Meat.MEAT_BACK) + ", front : " + this.getMeatGradeBySide(Meat.MEAT_FRONT));
-	if(this.getMeatGradeBySide(Meat.MEAT_BACK) == Meat.DONENESS_BURN_BLACK) {
-		this.loadTexture('meat_burn1');
-	} else if(this.getMeatGradeBySide(Meat.MEAT_BACK) == Meat.DONENESS_WELLDONE) {
-		this.loadTexture('meat_welldone1');
-	} else {
-		this.loadTexture('meat1');
-	}
-}
-
-Meat.prototype.show = function() {
-	this.isActivated = true;
-	this.alpha = 1;
-}
-
-Meat.prototype.hide = function() {
-	this.isActivated = false;
-	this.alpha = 0;
-	this.stopCook();
-}
-
-Meat.prototype.startCook = function() {
-	this.isStartCook = true;
-	this.isOnHeatPlate = true;
-	// console.log("this.isOnHeatPlate : " + this.isOnHeatPlate);
-
-	// console.log("startCook : " + this.cookingSide);
-	if(this.cookingSide == Meat.MEAT_NONE)
-		this.flipToFront();
-
-	this.startAnimateSmoke();
-}
-
-Meat.prototype.stopCook = function() {
-	this.isOnHeatPlate = false;
-	// console.log("this.isOnHeatPlate : " + this.isOnHeatPlate);
-	this.stopAnimateSmoke();
-}
-
-Meat.prototype.getMeatGrade = function() {
-	if(this.cookingGrade[Meat.MEAT_FRONT] == Meat.DONENESS_WELLDONE && this.cookingGrade[Meat.MEAT_BACK] == Meat.DONENESS_WELLDONE)
-		return Meat.DONENESS_WELLDONE;
-	else if(this.cookingGrade[Meat.MEAT_FRONT] == Meat.DONENESS_BURN_BLACK || this.cookingGrade[Meat.MEAT_BACK] == Meat.DONENESS_BURN_BLACK)
-		return Meat.DONENESS_BURN_BLACK;
-	else
-		return Meat.DONENESS_RARE;
-}
-
-Meat.prototype.getMeatGradeBySide = function(cookingSide) {
-	return this.cookingGrade[cookingSide];
-}
-
-Meat.prototype.setActive = function(isActivated, x, y, meat_type) {
-	this.isActivated = isActivated;
-
-	if(isActivated == false) {
-		this.alpha = 0;
-		this.x = -100;
-		this.y = -100;
-
-		return;
-	}
-
-	this.cookingSide = Meat.MEAT_NONE;
-	this.cookingTime[Meat.MEAT_BACK] = 0;
-	this.cookingTime[Meat.MEAT_FRONT] = 0;
-	this.cookingGrade[Meat.MEAT_BACK] = Meat.DONENESS_RARE;
-	this.cookingGrade[Meat.MEAT_FRONT] = Meat.DONENESS_RARE;
-
-	this.x = x;
-	this.y = y;
-	this.loadTexture('meat1');
-	this.angle = Meat.ANGLE_NONE;
-	this.alpha = 1;
-}
-
-Meat.prototype.cooking = function() {
-	this.cookingTime[this.cookingSide] += 1;
-	// console.log("back : " + this.cookingTime[Meat.MEAT_BACK] + ", front : " + this.cookingTime[Meat.MEAT_FRONT]);
-
-	if(this.cookingTime[Meat.MEAT_BACK] > Meat.COOK_TIME_BURN) {
-		if(this.getMeatGradeBySide(Meat.MEAT_BACK) != Meat.DONENESS_BURN_BLACK) {
-			this.cookingGrade[Meat.MEAT_BACK] = Meat.DONENESS_BURN_BLACK;
-			this.changeAnimateSmokeColor(Meat.DONENESS_BURN_BLACK);
-		}
-	} else if(this.cookingTime[Meat.MEAT_BACK] > Meat.COOK_TIME_WELLDONE) {
-		if(this.getMeatGradeBySide(Meat.MEAT_BACK) != Meat.DONENESS_WELLDONE) {
-			this.cookingGrade[Meat.MEAT_BACK] = Meat.DONENESS_WELLDONE;
-			this.changeAnimateSmokeColor(Meat.DONENESS_WELLDONE);
-		}
-	}
-
-	if(this.cookingTime[Meat.MEAT_FRONT] > Meat.COOK_TIME_BURN) {
-		if(this.getMeatGradeBySide(Meat.MEAT_FRONT) != Meat.DONENESS_BURN_BLACK) {
-			this.cookingGrade[Meat.MEAT_FRONT] = Meat.DONENESS_BURN_BLACK;
-			this.changeAnimateSmokeColor(Meat.DONENESS_BURN_BLACK);
-		}
-	} else if(this.cookingTime[Meat.MEAT_FRONT] > Meat.COOK_TIME_WELLDONE) {
-		if(this.getMeatGradeBySide(Meat.MEAT_FRONT) != Meat.DONENESS_WELLDONE) {
-			this.cookingGrade[Meat.MEAT_FRONT] = Meat.DONENESS_WELLDONE;
-			this.changeAnimateSmokeColor(Meat.DONENESS_WELLDONE);
-		}
-	}
-}
-
-Meat.prototype.stopAnimateSmoke = function() {
-	this.whiteSmokeParticle.stop();
-	this.redSmokeParticle.stop();
-	this.blackSmokeParticle.stop();
-}
-
-Meat.prototype.startAnimateSmoke = function() {
-	var cookingSideGrade = this.cookingGrade[this.cookingSide];
-	this.changeAnimateSmokeColor(cookingSideGrade);
-
-}
-
-Meat.prototype.changeAnimateSmokeColor = function(type) {
-	// console.log("changeAnimateSmokeColor : " + type);
-	this.stopAnimateSmoke();
-
-	switch(type) {
-		case Meat.DONENESS_RARE:
-		this.whiteSmokeParticle.start(this.x, this.y);
-		break;
-
-		case Meat.DONENESS_WELLDONE:
-		this.redSmokeParticle.start(this.x, this.y);
-		break;
-
-		case Meat.DONENESS_BURN_BLACK:
-		this.blackSmokeParticle.start(this.x, this.y);
-		break;
-	}
-}
-
-
-Meat.MEAT_NONE	= 0;
-Meat.MEAT_FRONT	= 1;
-Meat.MEAT_BACK	= 2;
-
-Meat.DONENESS_RARE			= 0;
-Meat.DONENESS_WELLDONE		= 1;
-Meat.DONENESS_BURN_BLACK	= 2;
-Meat.DONENESS_NONE			= 3;
-
-Meat.ANGLE_NONE		= 0;
-Meat.ANGLE_FRONT	= 30;
-Meat.ANGLE_BACK		= -30;
-
-Meat.COOK_TIME_WELLDONE	= 200;
-Meat.COOK_TIME_BURN		= 400;
\ No newline at end of file
diff --git a/src/game/mouse/grilled_meat/meat_base.js b/src/game/mouse/grilled_meat/meat_base.js
index 61898a5..35e1176 100644
--- a/src/game/mouse/grilled_meat/meat_base.js
+++ b/src/game/mouse/grilled_meat/meat_base.js
@@ -10,9 +10,9 @@ function MeatBase() {
 	this.initMeatTypeVariables();
 	this.initMouseEventHandler();
 
-	this.whiteSmokeParticle = new Smoke(Meat.DONENESS_RARE, 0, 0);
-	this.redSmokeParticle = new Smoke(Meat.DONENESS_WELLDONE, 0, 0);
-	this.blackSmokeParticle = new Smoke(Meat.DONENESS_BURN_BLACK, 0, 0);
+	this.whiteSmokeParticle = new Smoke(MeatBase.DONENESS_RARE, 0, 0);
+	this.redSmokeParticle = new Smoke(MeatBase.DONENESS_WELLDONE, 0, 0);
+	this.blackSmokeParticle = new Smoke(MeatBase.DONENESS_BURN_BLACK, 0, 0);
 }
 
 MeatBase.prototype.update = function() {
diff --git a/src/game/mouse/grilled_meat/smoke.js b/src/game/mouse/grilled_meat/smoke.js
index 2498c9c..f13de2e 100644
--- a/src/game/mouse/grilled_meat/smoke.js
+++ b/src/game/mouse/grilled_meat/smoke.js
@@ -11,11 +11,11 @@ Smoke = function(type, x, y) {
 	this.emitter.minParticleScale = 0.5;
 	this.emitter.maxParticleScale = 1;
 	this.emitter.gravity = -300;
-	if(type == Meat.DONENESS_RARE)
+	if(type == MeatBase.DONENESS_RARE)
 		this.emitter.start(false, 1000, 400);
-	else if(type == Meat.DONENESS_WELLDONE)
+	else if(type == MeatBase.DONENESS_WELLDONE)
 		this.emitter.start(false, 1000, 200);
-	else if(type == Meat.DONENESS_BURN_BLACK)
+	else if(type == MeatBase.DONENESS_BURN_BLACK)
 		this.emitter.start(false, 1000, 100);
 	this.stop();
 
@@ -25,9 +25,9 @@ Smoke = function(type, x, y) {
 Smoke.prototype.changeColor = function(type) {
 	var color = 0xf0f0ed;
 
-	if(type == Meat.DONENESS_WELLDONE)
+	if(type == MeatBase.DONENESS_WELLDONE)
 		color = 0xb06060;
-	else if(type == Meat.DONENESS_BURN_BLACK)
+	else if(type == MeatBase.DONENESS_BURN_BLACK)
 		color = 0x333333;
 
 	this.emitter.forEach(
diff --git a/src/web/client/grilled_meat.html b/src/web/client/grilled_meat.html
index 55766d6..3dc5e74 100644
--- a/src/web/client/grilled_meat.html
+++ b/src/web/client/grilled_meat.html
@@ -64,24 +64,23 @@
 		<script src="../../game/lib/realtime_stage_timer.js"></script>
 
 		<!-- Grilled meat : source files -->
-		<script src="../../game/mouse/grilled_meat/loading.js"></script>
+		<script src="../../game/mouse/grilled_meat/loading.js?update=191212"></script>
 
 		<script src="../../game/mouse/grilled_meat/waiter.js"></script>
-		<script src="../../game/mouse/grilled_meat/god.js"></script>
-		<script src="../../game/mouse/grilled_meat/speech_bubble.js"></script>
+		<script src="../../game/mouse/grilled_meat/god.js?update=191212"></script>
+		<script src="../../game/mouse/grilled_meat/speech_bubble.js?update=191212"></script>
 		<script src="../../game/mouse/grilled_meat/plus_score.js"></script>
 
-		<script src="../../game/mouse/grilled_meat/heat_plate.js"></script>
+		<script src="../../game/mouse/grilled_meat/heat_plate.js?update=191212"></script>
 		<script src="../../game/mouse/grilled_meat/stove_dial.js"></script>
 		<script src="../../game/mouse/grilled_meat/trash_can.js"></script>
 
-		<script src="../../game/mouse/grilled_meat/smoke.js"></script>
-		<script src="../../game/mouse/grilled_meat/meat.js"></script>
+		<script src="../../game/mouse/grilled_meat/smoke.js?update=191212"></script>
 		<script src="../../game/mouse/grilled_meat/meat_base.js"></script>
 		<script src="../../game/mouse/grilled_meat/normal_meat.js"></script>
 		<script src="../../game/mouse/grilled_meat/bonus_meat.js"></script>
 
-		<script src="../../game/mouse/grilled_meat/game.js?update=190916"></script>
+		<script src="../../game/mouse/grilled_meat/game.js?update=191212"></script>
 		<script src="../../game/mouse/grilled_meat/main.js"></script>
 
 
diff --git a/src/web/main/index.html b/src/web/main/index.html
index 6e5aa84..2a2859f 100644
--- a/src/web/main/index.html
+++ b/src/web/main/index.html
@@ -24,8 +24,9 @@
 	<!-- End Google Tag Manager -->
 
 	<title>초코마에 | 마우스, 타자 연습</title>
-	<meta name="description" CONTENT="마우스, 한글/영문 타자 연습 앱 | 초코마에 ‧ Mouse and Korean/English tyiping practice app | ChocoMae">
-
+	<meta name="description" CONTENT="쉽고 재미있는 타자 연습, 같은 반 친구들과 함께 즐겨보아요. 마우스 연습도 있어요. 방과후 수업 선생님들을 위한 컨텐츠도 마련했어요. | 초코마에 ‧ Mouse and Korean/English tyiping practice app | ChocoMae">
+<!-- 	<meta name="description" CONTENT="마우스, 한글/영문 타자 연습 앱 | 초코마에 ‧ Mouse and Korean/English tyiping practice app | ChocoMae">
+ -->
 	<link rel="icon" href="/favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />