jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add: bronze, silver hammer

Browse Source
This commit is contained in:
Jisang Park
2018-10-06 09:26:53 +09:00
parent b95d4ce9d9
commit 89eaf7a0bf
11 changed files with 83 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/typing/whac_a_mole/hammer.js
+59 -7
View File
@@ -44,10 +44,22 @@ Hammer.prototype.showParticle = function() {
particleScale = 2;
break;
case Hammer.TYPE_BRONZE:
particleCount = Hammer.SCORE_BRONZE;
particleTint = Hammer.COLOR_BRONZE;
particleScale = 1;
break;
case Hammer.TYPE_SILVER:
particleCount = Hammer.SCORE_SILVER;
particleTint = Hammer.COLOR_SILVER;
particleScale = 0.8;
break;
case Hammer.TYPE_GOLD:
particleCount = Hammer.SCORE_GOLD;
particleTint = Hammer.COLOR_GOLD;
particleScale = 1;
particleScale = 0.5;
break;
}
@@ -84,6 +96,10 @@ Hammer.prototype.cleanHit = function() {
if(this.hammerType == Hammer.TYPE_PPYONG)
this.changeType(Hammer.TYPE_WOOD);
else if(this.hammerType == Hammer.TYPE_WOOD)
this.changeType(Hammer.TYPE_BRONZE);
else if(this.hammerType == Hammer.TYPE_BRONZE)
this.changeType(Hammer.TYPE_SILVER);
else if(this.hammerType == Hammer.TYPE_SILVER)
this.changeType(Hammer.TYPE_GOLD);
}
@@ -101,6 +117,18 @@ Hammer.prototype.changeType = function(hammerType) {
this.hammer.loadTexture("hammer_wood");
break;
case Hammer.TYPE_BRONZE:
this.hammerType = Hammer.TYPE_BRONZE;
this.upgradeCountdown = Hammer.UPGRADE_COUNT_BRONZE;
this.hammer.loadTexture("hammer_bronze");
break;
case Hammer.TYPE_SILVER:
this.hammerType = Hammer.TYPE_SILVER;
this.upgradeCountdown = Hammer.UPGRADE_COUNT_SILVER;
this.hammer.loadTexture("hammer_silver");
break;
case Hammer.TYPE_GOLD:
this.hammerType = Hammer.TYPE_GOLD;
this.upgradeCountdown = Hammer.UPGRADE_COUNT_GOLD;
@@ -125,6 +153,14 @@ Hammer.prototype.getScore = function(hammerType) {
score = Hammer.SCORE_WOOD;
break;
case Hammer.TYPE_BRONZE:
score = Hammer.SCORE_BRONZE;
break;
case Hammer.TYPE_SILVER:
score = Hammer.SCORE_SILVER;
break;
case Hammer.TYPE_GOLD:
score = Hammer.SCORE_GOLD;
break;
@@ -133,21 +169,37 @@ Hammer.prototype.getScore = function(hammerType) {
return score;
}
Hammer.loadResources = function() {
game.load.image('hammer_ppyong', '../../../resources/image/weapon/hammer_ppyong.png');
game.load.image('hammer_wood', '../../../resources/image/weapon/hammer_wood.png');
game.load.image('hammer_bronze', '../../../resources/image/weapon/hammer_bronze.png');
game.load.image('hammer_silver', '../../../resources/image/weapon/hammer_silver.png');
game.load.image('hammer_gold', '../../../resources/image/weapon/hammer_gold.png');
}
Hammer.TYPE_PPYONG = 1;
Hammer.TYPE_WOOD = 2;
Hammer.TYPE_GOLD = 3;
Hammer.TYPE_BRONZE = 3;
Hammer.TYPE_SILVER = 4;
Hammer.TYPE_GOLD = 5;
Hammer.UPGRADE_COUNT_PPYONG = 10;
Hammer.UPGRADE_COUNT_WOOD = 20;
Hammer.UPGRADE_COUNT_GOLD = 30;
Hammer.UPGRADE_COUNT_PPYONG = 5;
Hammer.UPGRADE_COUNT_WOOD = 10;
Hammer.UPGRADE_COUNT_BRONZE = 15;
Hammer.UPGRADE_COUNT_SILVER = 20;
Hammer.UPGRADE_COUNT_GOLD = 25;
Hammer.SCORE_PPYONG = 1;
Hammer.SCORE_WOOD = 3;
Hammer.SCORE_GOLD = 7;
Hammer.SCORE_BRONZE = 5;
Hammer.SCORE_SILVER = 7;
Hammer.SCORE_GOLD = 9;
Hammer.COLOR_PPYONG = 0x6633FF;
Hammer.COLOR_WOOD = 0xFF0066;
Hammer.COLOR_GOLD = 0xFFdd66;
Hammer.COLOR_BRONZE = 0xcd7f32;
Hammer.COLOR_SILVER = 0xC0C0C0;
Hammer.COLOR_GOLD = 0xFFd700;
Hammer.OFFSET_SCORE_POS_Y = 100;
src/game/typing/whac_a_mole/helmet.js
+11 -1
View File
@@ -49,6 +49,14 @@ Helmet.prototype.change = function(type) {
this.helmet.tint = Hammer.COLOR_WOOD;
break;
case Helmet.TYPE_BRONZE:
this.helmet.tint = Hammer.COLOR_BRONZE;
break;
case Helmet.TYPE_SILVER:
this.helmet.tint = Hammer.COLOR_SILVER;
break;
case Helmet.TYPE_GOLD:
this.helmet.tint = Hammer.COLOR_GOLD;
break;
@@ -66,7 +74,9 @@ Helmet.prototype.dropDownTween = function(drowpDownHeight) {
Helmet.TYPE_PPYONG = 1;
Helmet.TYPE_WOOD = 2;
Helmet.TYPE_GOLD = 3;
Helmet.TYPE_BRONZE = 3;
Helmet.TYPE_SILVER = 4;
Helmet.TYPE_GOLD = 5;
Helmet.START_POS_Y = 200;
Helmet.SHOW_UP_HEIGHT = 100;
src/game/typing/whac_a_mole/loading.js
+2 -5
View File
@@ -31,12 +31,9 @@ var Loading = {
game.load.image('star', '../../../resources/image/ui/star_particle.png');
game.load.image('helmet', '../../../resources/image/weapon/helmet.png');
game.load.image('hammer_ppyong', '../../../resources/image/weapon/hammer_ppyong.png');
game.load.image('hammer_wood', '../../../resources/image/weapon/hammer_wood.png');
game.load.image('hammer_gold', '../../../resources/image/weapon/hammer_gold.png');
Hammer.loadResources();
game.load.image('helmet', '../../../resources/image/weapon/helmet.png');
game.load.image('mole_grey', '../../../resources/image/character/mole_grey.png');
game.load.image('mole_grey_small', '../../../resources/image/character/mole_grey_32x32.png');
game.load.image('mole_peach', '../../../resources/image/character/mole_peach.png');
src/game/typing/whac_a_mole/mole.js
+8
View File
@@ -79,6 +79,14 @@ BigMole.prototype.changeHelmetColor = function(hammerType) {
this.helmet.getSprite().tint = Hammer.COLOR_WOOD;
break;
case Hammer.TYPE_BRONZE:
this.helmet.getSprite().tint = Hammer.COLOR_BRONZE;
break;
case Hammer.TYPE_SILVER:
this.helmet.getSprite().tint = Hammer.COLOR_SILVER;
break;
case Hammer.TYPE_GOLD:
this.helmet.getSprite().tint = Hammer.COLOR_GOLD;
break;
src/web/sql/insert_active_app.sql
+3 -1
View File
@@ -21,4 +21,6 @@ INSERT INTO `active_app` (`ActiveAppID`, `MaestroID`, `AppID`) VALUES
(18, 1, 21),
(19, 1, 30),
(20, 1, 31),
(21, 1, 40);
(21, 1, 40);
(22, 1, 50),
(23, 1, 51);