Created
February 10, 2020 12:20
-
-
Save theultramage/bc1d66082f14cb8a484ce69c9d54f7e7 to your computer and use it in GitHub Desktop.
All code differences between Gemcraft 0 v1.21A (AG) and v1.21 (GiaB/Mochi)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlAmulets.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlAmulets.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlAmulets.as 2020-01-22 08:47:42.387173500 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlAmulets.as 2020-01-22 08:48:23.455888500 +0100 | |
@@ -10,6 +10,7 @@ | |
import com.giab.games.gem0.giab.constants.GameSpecs; | |
import com.giab.games.gem0.giab.constants.LevelSpecId; | |
import com.giab.games.gem0.giab.constants.StatId; | |
+ import com.giab.games.gem0.giab.constants.Url; | |
import com.giab.games.gem0.giab.entity.Player; | |
import com.giab.games.gem0.giab.ingame.Core; | |
import com.giab.games.gem0.giab.mcDyn.McAmuletBattle; | |
@@ -21,6 +22,8 @@ | |
import com.giab.games.gem0.giab.mcStat.McAmulets; | |
import flash.display.MovieClip; | |
import flash.events.MouseEvent; | |
+ import flash.net.URLRequest; | |
+ import flash.net.navigateToURL; | |
public class CtrlAmulets | |
{ | |
@@ -100,54 +93,58 @@ private function buttonsInit() : void | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_DOWN,ehBtnDoneDown,true,0,true); | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_OVER,ehBtnOver,true,0,true); | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_OUT,ehBtnOut,true,0,true); | |
+ this.mc.mcAmuletList.mcArmorNag.addEventListener(MouseEvent.MOUSE_DOWN,ehBtnArmorNagDown,true,0,true); | |
+ MovieClip(this.mc.mcAmuletList.mcArmorNag).useHandCursor = true; | |
+ MovieClip(this.mc.mcAmuletList.mcArmorNag).buttonMode = true; | |
+ } | |
+ | |
+ private function ehBtnArmorNagDown(pE:MouseEvent) : void | |
+ { | |
+ var req:URLRequest = null; | |
+ if(this.screenStatus == ScreenStatus.IDLE) | |
+ { | |
+ this.main.sndTickPress.play(); | |
+ req = new URLRequest(Url.MOREGAMES); | |
+ navigateToURL(req,"_blank"); | |
+ } | |
} | |
private function ehBtnDoneDown(param1:MouseEvent) : void | |
Only in scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl: CtrlHighScores.as | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlMainMenu.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlMainMenu.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlMainMenu.as 2020-01-22 08:47:41.999624300 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlMainMenu.as 2020-01-22 08:48:23.476891200 +0100 | |
@@ -108,8 +108,7 @@ public function buttonsInit() : void | |
this.mc.btnMMTutorial.addEventListener(MouseEvent.CLICK,this.ehBtnTutorialPressed,true,0,true); | |
+ this.mc.btnMMHighScores.addEventListener(MouseEvent.MOUSE_DOWN,this.ehBtnHighScoresPressed,true,0,true); | |
this.mc.btnMMNewGame.addEventListener(MouseEvent.MOUSE_DOWN,this.ehBtnNewGamePressed,true,0,true); | |
this.mc.btnMMLoad.addEventListener(MouseEvent.MOUSE_DOWN,this.ehBtnLoadPressed,true,0,true); | |
this.mc.btnMMCredits.addEventListener(MouseEvent.MOUSE_DOWN,this.ehBtnCreditsPressed,true,0,true); | |
@@ -138,6 +137,7 @@ | |
this.mc.btnMMLoad.y = 630; | |
this.mc.btnMMNewGame.y = 630; | |
this.mc.btnMMTutorial.y = 630; | |
+ this.mc.btnMMHighScores.y = 690; | |
this.mc.btnMMMoreGames.y = 690; | |
this.mc.btnMMCredits.y = 690; | |
this.mc.mcBottomTexts.y = 760; | |
@@ -156,6 +156,7 @@ | |
this.mc.mcTitle.y = Strong2.easeOut(this.screenStep,-400,430,25); | |
this.mc.btnMMNewGame.y = Strong2.easeOut(this.screenStep - 0,755,-300,20); | |
this.mc.btnMMLoad.y = Strong2.easeOut(this.screenStep - 2,755,-300,20); | |
+ this.mc.btnMMHighScores.y = Strong2.easeOut(this.screenStep - 4,755,-300,20); | |
this.mc.btnMMMoreGames.y = Strong2.easeOut(this.screenStep - 6,755,-300,20); | |
this.mc.btnMMCredits.y = Strong2.easeOut(this.screenStep - 8,755,-300,20); | |
this.mc.btnMMTutorial.y = Strong2.easeOut(this.screenStep - 10,755,-300,20); | |
@@ -172,6 +173,7 @@ | |
this.mc.mcTitle.y = Back2.easeIn(this.screenStep - 6,30,-400,26); | |
this.mc.btnMMNewGame.y = this.mc.btnMMNewGame.y + 15; | |
this.mc.btnMMLoad.y = this.mc.btnMMLoad.y + 12; | |
+ this.mc.btnMMHighScores.y = this.mc.btnMMHighScores.y + 14; | |
this.mc.btnMMMoreGames.y = this.mc.btnMMMoreGames.y + 11; | |
this.mc.btnMMCredits.y = this.mc.btnMMCredits.y + 13; | |
this.mc.btnMMTutorial.y = this.mc.btnMMTutorial.y + 10; | |
@@ -193,6 +195,14 @@ | |
{ | |
this.mc.btnMMCredits.y = Math.min(455,this.mc.btnMMCredits.y + 5); | |
} | |
+ if(this.mc.root.mouseX > this.mc.btnMMHighScores.x && this.mc.root.mouseX < this.mc.btnMMHighScores.x + this.mc.btnMMHighScores.width && this.mc.root.mouseY > 445) | |
+ { | |
+ this.mc.btnMMHighScores.y = Math.max(445,this.mc.btnMMHighScores.y - 5); | |
+ } | |
+ else | |
+ { | |
+ this.mc.btnMMHighScores.y = Math.min(455,this.mc.btnMMHighScores.y + 5); | |
+ } | |
if(this.mc.root.mouseX > this.mc.btnMMLoad.x && this.mc.root.mouseX < this.mc.btnMMLoad.x + this.mc.btnMMLoad.width && this.mc.root.mouseY > 445) | |
{ | |
this.mc.btnMMLoad.y = Math.max(445,this.mc.btnMMLoad.y - 5); | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlSkills.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlSkills.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlSkills.as 2020-01-22 08:47:42.610701800 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlSkills.as 2020-01-22 08:48:23.486892500 +0100 | |
@@ -7,10 +7,13 @@ | |
import com.giab.games.gem0.giab.Main; | |
import com.giab.games.gem0.giab.constants.GameSpecs; | |
import com.giab.games.gem0.giab.constants.SkillId; | |
+ import com.giab.games.gem0.giab.constants.Url; | |
import com.giab.games.gem0.giab.mcDyn.McInfoPanel; | |
import com.giab.games.gem0.giab.mcStat.McSkills; | |
import flash.display.MovieClip; | |
import flash.events.MouseEvent; | |
+ import flash.net.URLRequest; | |
+ import flash.net.navigateToURL; | |
public class CtrlSkills | |
{ | |
@@ -270,17 +272,19 @@ public function buttonsInit() : void | |
this.mc["btnSkill" + i].icon.icon.gotoAndStop(i + 1); | |
this.mc["btnSkill" + i].icon.icon.mask = this.mc["btnSkill" + i].icon.maskmc; | |
this.mc["btnSkill" + i].icon.iconBlack.gotoAndStop(i + 1); | |
+ if(i != 18 && i != 19 && i != 20) | |
this.mc["btnSkill" + i].addEventListener(MouseEvent.MOUSE_OVER,ehBtnSkillOver,true,0,true); | |
this.mc["btnSkill" + i].addEventListener(MouseEvent.MOUSE_OUT,ehBtnSkillOut,true,0,true); | |
this.mc["btnSkill" + i].btnPlus.addEventListener(MouseEvent.MOUSE_DOWN,ehSkillPlusDown,false,0,true); | |
this.mc["btnSkill" + i].btnMinus.addEventListener(MouseEvent.MOUSE_DOWN,ehSkillMinusDown,false,0,true); | |
this.mc["btnSkill" + i].btnPlus.addEventListener(MouseEvent.MOUSE_OVER,ehBtnSkillPlusMinusOver,false,0,true); | |
this.mc["btnSkill" + i].btnPlus.addEventListener(MouseEvent.MOUSE_OUT,ehBtnOut,false,0,true); | |
this.mc["btnSkill" + i].btnMinus.addEventListener(MouseEvent.MOUSE_OVER,ehBtnSkillPlusMinusOver,false,0,true); | |
this.mc["btnSkill" + i].btnMinus.addEventListener(MouseEvent.MOUSE_OUT,ehBtnOut,false,0,true); | |
+ } | |
this.mc["btnSkill" + i].btnPlus.gotoAndStop(1); | |
this.mc["btnSkill" + i].btnMinus.gotoAndStop(1); | |
} | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_OVER,ehBtnOver,true,0,true); | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_OUT,ehBtnOut,true,0,true); | |
@@ -288,6 +292,20 @@ | |
this.mc.btnRedist.addEventListener(MouseEvent.MOUSE_OVER,ehBtnOver,true,0,true); | |
this.mc.btnRedist.addEventListener(MouseEvent.MOUSE_OUT,ehBtnOut,true,0,true); | |
this.mc.btnRedist.addEventListener(MouseEvent.MOUSE_DOWN,ehBtnRedistDown,true,0,true); | |
+ this.mc.mcArmorNag.addEventListener(MouseEvent.MOUSE_DOWN,ehBtnArmorNagDown,true,0,true); | |
+ MovieClip(this.mc.mcArmorNag).useHandCursor = true; | |
+ MovieClip(this.mc.mcArmorNag).buttonMode = true; | |
+ } | |
+ | |
+ private function ehBtnArmorNagDown(pE:MouseEvent) : void | |
+ { | |
+ var req:URLRequest = null; | |
+ if(this.screenStatus == ScreenStatus.IDLE) | |
+ { | |
+ this.main.sndTickPress.play(); | |
+ req = new URLRequest(Url.MOREGAMES); | |
+ navigateToURL(req,"_blank"); | |
+ } | |
} | |
public function initiate() : void | |
@@ -404,12 +416,11 @@ | |
this.mc.btnDone.y = Back2.easeOut(this.screenStep - 20,468 + 100,-100,20); | |
this.mc.btnRedist.y = Back2.easeOut(this.screenStep - 17,468 + 100,-100,20); | |
this.mc.mcTitle.x = Strong2.easeOut(this.screenStep,-500,500 + 46,40); | |
+ this.mc.mcArmorNag.y = Back2.easeOut(this.screenStep,54 - 540,540,20); | |
this.mc.mcShade.alpha = Math.min(1,this.mc.mcShade.alpha + 0.05); | |
for(_loc1_ = 0; _loc1_ < GameSpecs.UPGRADEID_NUM; _loc1_++) | |
{ | |
this.mc["btnSkill" + _loc1_].y = Back2.easeOut(this.screenStep - _loc1_,this.mc["btnSkill" + _loc1_].inY - 540,540,20); | |
} | |
} | |
else | |
@@ -427,12 +438,11 @@ | |
this.mc.btnDone.y = Back2.easeIn(this.screenStep - 10,468,100,20); | |
this.mc.btnRedist.y = Back2.easeIn(this.screenStep - 13,468,100,20); | |
this.mc.mcTitle.x = Strong2.easeOut(this.screenStep,1,-500 - 46,15); | |
+ this.mc.mcArmorNag.y = Back2.easeIn(this.screenStep,54,-540,20); | |
this.mc.mcShade.alpha = Math.max(0,this.mc.mcShade.alpha - 0.05); | |
for(_loc1_ = 0; _loc1_ < GameSpecs.UPGRADEID_NUM; _loc1_++) | |
{ | |
this.mc["btnSkill" + _loc1_].y = Back2.easeIn(this.screenStep - _loc1_,this.mc["btnSkill" + _loc1_].inY,-540,20); | |
} | |
} | |
else | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlStatistics.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlStatistics.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlStatistics.as 2020-01-22 08:47:42.310663700 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ctrl/CtrlStatistics.as 2020-01-22 08:48:23.491393000 +0100 | |
@@ -11,9 +11,11 @@ | |
import com.giab.games.gem0.giab.ingame.Core; | |
import com.giab.games.gem0.giab.mcStat.McStatistics; | |
import com.giab.games.gem0.giab.util.PlayerLevelCalculator; | |
+ import com.mochiads.MochiScores; | |
import flash.display.MovieClip; | |
import flash.events.MouseEvent; | |
import flash.media.SoundChannel; | |
+ import flash.text.TextField; | |
public class CtrlStatistics | |
{ | |
@@ -43,6 +45,8 @@ | |
this.mc.mcLevel.inX = this.mc.mcLevel.x; | |
this.mc.mcList.inY = this.mc.mcList.y; | |
this.mc.mcTitle.inY = this.mc.mcTitle.y; | |
+ this.mc.mcSubmit.inX = this.mc.mcSubmit.x; | |
+ this.mc.mcNoSubmit.inX = this.mc.mcNoSubmit.x; | |
} | |
public function ehBtnDoneDown(param1:MouseEvent) : void | |
@@ -54,6 +58,16 @@ | |
this.screenStatus = ScreenStatus.DISAPPEARING; | |
this.main.nextScreen = ScreenId.LEVELSELECTOR; | |
this.main.sndTickPress.play(); | |
+ MochiScores.closeLeaderboard(); | |
+ } | |
+ } | |
+ | |
+ public function ehBtnSubmitDown(param1:MouseEvent) : void | |
+ { | |
+ if(this.screenStatus == ScreenStatus.IDLE) | |
+ { | |
+ this.submitScore(); | |
+ this.main.sndTickPress.play(); | |
} | |
} | |
@@ -73,6 +87,11 @@ | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_DOWN,ehBtnDoneDown,true,0,true); | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_OVER,ehBtnMouseOver,true,0,true); | |
this.mc.btnDone.addEventListener(MouseEvent.MOUSE_OUT,ehBtnMouseOut,true,0,true); | |
+ this.mc.mcSubmit.btnSubmitScore.addEventListener(MouseEvent.MOUSE_DOWN,ehBtnSubmitDown,true,0,true); | |
+ this.mc.mcSubmit.btnSubmitScore.addEventListener(MouseEvent.MOUSE_OVER,ehBtnMouseOver,true,0,true); | |
+ this.mc.mcSubmit.btnSubmitScore.addEventListener(MouseEvent.MOUSE_OUT,ehBtnMouseOut,true,0,true); | |
+ TextField(this.mc.mcSubmit.tfName).maxChars = 20; | |
+ TextField(this.mc.mcSubmit.tfName).restrict = "!-~"; | |
} | |
public function initiate() : void | |
@@ -86,17 +105,28 @@ | |
this.mc.mcLevel.x = -360; | |
this.mc.mcList.y = -400; | |
this.mc.mcTitle.y = -100; | |
+ this.mc.mcSubmit.x = 730; | |
+ this.mc.mcNoSubmit.x = 730; | |
+ this.mc.mcNoSubmit.visible = true; | |
+ this.mc.mcSubmit.visible = true; | |
if(this.main.player.getTotalXp() < 1) | |
{ | |
+ this.mc.mcSubmit.visible = false; | |
+ this.mc.mcNoSubmit.gotoAndStop(1); | |
} | |
else if(this.main.player.lastXpSent >= this.main.player.getTotalXp()) | |
{ | |
+ this.mc.mcSubmit.visible = false; | |
+ this.mc.mcNoSubmit.gotoAndStop(2); | |
} | |
else | |
{ | |
+ this.mc.mcNoSubmit.visible = false; | |
+ this.mc.mcSubmit.tfName.text = this.main.player.lastNameGiven; | |
} | |
for(_loc1_ = 0; _loc1_ < GameSpecs.STATID_NUM; _loc1_++) | |
{ | |
this.mc.mcList["tfStat" + _loc1_].text = 0; | |
} | |
this.mc.mcLevel.tfCurrentLevel.text = 1; | |
this.mc.mcLevel.tfTotalScore.text = 0; | |
@@ -125,6 +153,8 @@ | |
this.mc.mcShade.alpha = Strong2.easeOut(this.screenStep,0,1,15); | |
this.mc.btnDone.y = Back2.easeOut(this.screenStep - 25,600,this.mc.btnDone.inY - 600,15); | |
this.mc.mcLevel.x = Strong2.easeOut(this.screenStep - 10,-360,this.mc.mcLevel.inX + 360,20); | |
+ this.mc.mcSubmit.x = Strong2.easeOut(this.screenStep - 15,this.mc.mcSubmit.inX + 360,-360,20); | |
+ this.mc.mcNoSubmit.x = Strong2.easeOut(this.screenStep - 15,this.mc.mcNoSubmit.inX + 360,-360,20); | |
this.mc.mcList.y = Strong2.easeOut(this.screenStep,-400,this.mc.mcList.inY + 400,20); | |
this.mc.mcTitle.y = Strong2.easeOut(this.screenStep - 25,-100,this.mc.mcTitle.inY + 100,15); | |
} | |
@@ -159,6 +187,8 @@ | |
this.mc.mcList.y = Strong2.easeIn(this.screenStep,this.mc.mcList.inY,-this.mc.mcList.inY - 400,20); | |
this.mc.mcTitle.y = Strong2.easeIn(this.screenStep,this.mc.mcTitle.inY,-this.mc.mcTitle.inY - 100,20); | |
this.mc.mcLevel.x = Strong2.easeIn(this.screenStep - 10,this.mc.mcLevel.inX,-360,20); | |
+ this.mc.mcSubmit.x = Strong2.easeIn(this.screenStep - 15,this.mc.mcSubmit.inX,360,20); | |
+ this.mc.mcNoSubmit.x = Strong2.easeIn(this.screenStep - 15,this.mc.mcNoSubmit.inX,360,20); | |
} | |
else | |
{ | |
@@ -188,5 +216,18 @@ | |
} | |
} | |
} | |
+ | |
+ public function submitScore() : void | |
+ { | |
+ if(this.mc.mcSubmit.tfName.text.length > 0) | |
+ { | |
+ this.main.player.lastNameGiven = this.mc.mcSubmit.tfName.text; | |
+ this.main.player.lastXpSent = this.main.player.getTotalXp(); | |
+ this.main.ctrlHighScores.submitScore(); | |
+ this.mc.mcSubmit.visible = false; | |
+ this.mc.mcNoSubmit.gotoAndStop(3); | |
+ this.mc.mcNoSubmit.visible = true; | |
+ } | |
+ } | |
} | |
} | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/entity/Player.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/entity/Player.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/entity/Player.as 2020-01-22 08:47:42.970747600 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/entity/Player.as 2020-01-22 08:48:23.522397000 +0100 | |
@@ -347,7 +284,14 @@ public function checkLevelsAccess() : void | |
this.levelStatuses[_loc1_] = LevelStatus.AVAILABLE; | |
} | |
} | |
+ } | |
+ for(i = 18; i < 21; i++) | |
+ { | |
+ if(this.getSkill(i) > 0) | |
+ { | |
+ this.setSkillPointsToSpend(this.getSkillPointsToSpend() + [0,5,9,12,14,16,18,21,25,30,36][this.getSkill(i)]); | |
+ this.setSkill(i,0); | |
+ } | |
} | |
} | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ingame/Controller.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ingame/Controller.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/ingame/Controller.as 2020-01-22 08:47:43.529318500 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/ingame/Controller.as 2020-01-22 08:48:23.553901000 +0100 | |
@@ -581,9 +561,12 @@ | |
{ | |
if(this.core.main.player.lostAmulets[param1] < 1) | |
{ | |
+ if(!(param1 == 10 || param1 == 11 || param1 == 14 || param1 == 15 || param1 == 18 || param1 == 19 || param1 == 28 || param1 == 29 || param1 == 32 || param1 == 33 || param1 == 36 || param1 == 37)) | |
+ { | |
this.core.main.vfxEngine.createFloatingText(310,280,"You have found a Lost amulet!",16776977,16,300); | |
this.core.main.sndAwardLostAmulet.play(); | |
this.core.lostAmulets.push(param1); | |
+ } | |
} | |
} | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/Main.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/Main.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/Main.as 2020-01-22 08:47:47.289296000 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/Main.as 2020-01-22 08:48:23.629910600 +0100 | |
@@ -5,33 +5,6 @@ | |
import com.giab.common.constants.ScreenId; | |
import com.giab.common.easing.Back2; | |
import com.giab.common.easing.Strong2; | |
import com.giab.games.gem0.giab.constants.GameSpecs; | |
import com.giab.games.gem0.giab.ctrl.CtrlAmulets; | |
import com.giab.games.gem0.giab.ctrl.CtrlBgr; | |
import com.giab.games.gem0.giab.ctrl.CtrlCredits; | |
+ import com.giab.games.gem0.giab.ctrl.CtrlHighScores; | |
import com.giab.games.gem0.giab.ctrl.CtrlLevelSelector; | |
import com.giab.games.gem0.giab.ctrl.CtrlLoadSave; | |
import com.giab.games.gem0.giab.ctrl.CtrlMainMenu; | |
import com.giab.games.gem0.giab.ctrl.CtrlOptions; | |
import com.giab.games.gem0.giab.ctrl.CtrlPopupPanels; | |
import com.giab.games.gem0.giab.ctrl.CtrlSkills; | |
import com.giab.games.gem0.giab.ctrl.CtrlStartup; | |
import com.giab.games.gem0.giab.ctrl.CtrlStatistics; | |
import com.giab.games.gem0.giab.entity.LevelData; | |
import com.giab.games.gem0.giab.entity.Player; | |
import com.giab.games.gem0.giab.entity.Preferences; | |
import com.giab.games.gem0.giab.ingame.Core; | |
import com.giab.games.gem0.giab.mcDyn.McLeaderBoard; | |
import com.giab.games.gem0.giab.mcDyn.McStoryPanel; | |
import com.giab.games.gem0.giab.mcDyn.McTutorPanel; | |
- import com.giab.games.gem0.giab.mcDyn.McWrongDomain; | |
import com.giab.games.gem0.giab.mcStat.BtnOptions; | |
import com.giab.games.gem0.giab.mcStat.CntBgr; | |
import com.giab.games.gem0.giab.mcStat.CntScreens; | |
import com.giab.games.gem0.giab.mcStat.McOptions; | |
import com.giab.games.gem0.giab.mcStat.McPreloader; | |
import com.giab.games.gem0.giab.mcStat.McSaveError; | |
import com.giab.games.gem0.giab.mcStat.McSeparator; | |
import com.giab.games.gem0.giab.snd.SndArmorReduce1; | |
import com.giab.games.gem0.giab.snd.SndArmorReduce2; | |
import com.giab.games.gem0.giab.snd.SndArmorReduce3; | |
@@ -140,7 +113,36 @@ | |
import com.giab.games.gem0.giab.util.VfxEngine; | |
+ import com.mochiads.MochiBot; | |
+ import com.mochiads.MochiServices; | |
import flash.display.DisplayObject; | |
import flash.display.MovieClip; | |
import flash.events.ContextMenuEvent; | |
@@ -156,7 +158,7 @@ | |
import flash.ui.ContextMenuItem; | |
import flash.utils.getTimer; | |
- public class Main extends MovieClipExt | |
+ public dynamic class Main extends MovieClipExt | |
{ | |
@@ -404,6 +406,8 @@ | |
public var ctrlAmulets:CtrlAmulets; | |
+ public var ctrlHighScores:CtrlHighScores; | |
+ | |
public var ctrlOptions:CtrlOptions; | |
public var ctrlPopupPanels:CtrlPopupPanels; | |
@@ -527,12 +531,6 @@ | |
function initiateApplication(param1:Event) : void | |
{ | |
- var vUrlStartNum:Number = NaN; | |
- var vUrlEndNum:Number = NaN; | |
- var vDomainStr:String = null; | |
- var vDomainArray:Array = null; | |
- var vTopLevelDomain:String = null; | |
- var vSiteLevelDomain:String = null; | |
var pE:Event = param1; | |
if(this.preloaderAdMc != null) | |
{ | |
@@ -566,6 +564,7 @@ | |
this.addChild(this.cntSeparator); | |
this.addChild(this.btnOptions); | |
this.btnOptions.y = 1000; | |
+ MochiServices.connect("e496fb227ac01a6a",this); | |
this.levelCollection = new LevelCollection(); | |
this.isIntroOver = false; | |
this.mcTutorPanel = new McTutorPanel(); | |
@@ -597,34 +596,12 @@ | |
this.ctrlLoadSave = new CtrlLoadSave(this.cntScreens.mcLoadSave,this); | |
this.ctrlStartup = new CtrlStartup(this.cntScreens.mcStartup,this); | |
this.ctrlBgr = new CtrlBgr(this.cntBgr.mcBgr,this); | |
+ this.ctrlHighScores = new CtrlHighScores(this.cntScreens.mcHighScores,this); | |
this.cntScreens.mcLevelSelector.y = 540; | |
this.cntScreens.cntIngame.y = 540; | |
- var vIsGoodDomain:Boolean = false; | |
- var vUrl:String = this.loaderInfo.url; | |
- if(vUrl.indexOf("file://") == 0) | |
- { | |
- if(vUrl.indexOf("d8krhj4kasdu3") != -1) | |
- { | |
- vIsGoodDomain = true; | |
- } | |
- } | |
- else if(vUrl.indexOf("http://") == 0) | |
- { | |
- vUrlStartNum = vUrl.indexOf("://") + 3; | |
- vUrlEndNum = vUrl.indexOf("/",vUrlStartNum); | |
- vDomainStr = vUrl.substring(vUrlStartNum,vUrlEndNum); | |
- vDomainArray = vDomainStr.split("."); | |
- vTopLevelDomain = vDomainArray[vDomainArray.length - 1]; | |
- vSiteLevelDomain = vDomainArray[vDomainArray.length - 2]; | |
- if(vTopLevelDomain == "com" && vSiteLevelDomain == "armorgames") | |
- { | |
- vIsGoodDomain = true; | |
- } | |
- } | |
- if(vIsGoodDomain != true) | |
- { | |
- this.addChild(new McWrongDomain()); | |
- return; | |
- } | |
+ if(this.loaderInfo.url.indexOf("http://armorgames.com/") != 0 && this.loaderInfo.url.indexOf("http://www.armorgames.com/") != 0) | |
+ { | |
+ MochiBot.track(this,"f7a347ca"); | |
+ } | |
this.nextScreen = ScreenId.STARTUP; | |
this.switchScreenVisibility(); | |
@@ -664,6 +641,10 @@ | |
{ | |
this.ctrlMainMenu.doEnterFrame(); | |
} | |
+ else if(this.currentScreen == ScreenId.HIGHSCORES) | |
+ { | |
+ this.ctrlHighScores.doEnterFrame(); | |
+ } | |
else if(this.currentScreen == ScreenId.LEVELSELECTOR) | |
{ | |
this.ctrlLevelSelector.doEnterFrame(); | |
@@ -922,6 +903,10 @@ | |
{ | |
this.ctrlMainMenu.initiate(); | |
} | |
+ else if(this.currentScreen == ScreenId.HIGHSCORES) | |
+ { | |
+ this.ctrlHighScores.initiate(); | |
+ } | |
else if(this.currentScreen == ScreenId.UPGRADES) | |
{ | |
this.ctrlSkills.initiate(); | |
@@ -1092,6 +1077,7 @@ | |
public function ehChapterOneLinkClick(param1:MouseEvent) : void | |
{ | |
+ trace("chapter 1 clicked"); | |
var _loc2_:URLRequest = new URLRequest("http://armorgames.com/play/1716/gemcraft"); | |
navigateToURL(_loc2_,"_blank"); | |
param1.stopPropagation(); | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McEmergencySaveDump.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McEmergencySaveDump.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McEmergencySaveDump.as 2020-01-22 08:47:45.174527400 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McEmergencySaveDump.as 2020-01-22 08:48:23.650413200 +0100 | |
@@ -10,8 +10,6 @@ | |
public var mcShade:MovieClip; | |
- public var tf:TextField; | |
- | |
public var tfDump:TextField; | |
public var btnClose:MovieClip; | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McOutcomePanelVictory.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McOutcomePanelVictory.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McOutcomePanelVictory.as 2020-01-22 08:47:45.466064400 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcDyn/McOutcomePanelVictory.as 2020-01-22 08:48:23.681417200 +0100 | |
@@ -9,8 +9,6 @@ | |
{ | |
- public var tfDesc:TextField; | |
- | |
public var mcPlate:MovieClip; | |
public var mcShade:Sprite; | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McMainMenu.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McMainMenu.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McMainMenu.as 2020-01-22 08:47:45.923122500 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McMainMenu.as 2020-01-22 08:48:23.751426100 +0100 | |
@@ -12,6 +12,8 @@ | |
public var btnMMNewGame:MovieClip; | |
+ public var btnMMHighScores:MovieClip; | |
+ | |
public var btnMMMoreGames:MovieClip; | |
public var btnMMTutorial:MovieClip; | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McSkills.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McSkills.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McSkills.as 2020-01-22 08:47:45.921622300 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McSkills.as 2020-01-22 08:48:23.760927300 +0100 | |
@@ -74,6 +74,8 @@ | |
public var btnSkill27:MovieClip; | |
+ public var mcArmorNag:MovieClip; | |
+ | |
public function McSkills() | |
{ | |
super(); | |
diff -u -r scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McStatistics.as scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McStatistics.as | |
--- scripts-ag-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McStatistics.as 2020-01-22 08:47:45.872116000 +0100 | |
+++ scripts-local-nodebug/scripts/com/giab/games/gem0/giab/mcStat/McStatistics.as 2020-01-22 08:48:23.763927600 +0100 | |
@@ -14,6 +14,10 @@ | |
public var mcLevel:MovieClip; | |
+ public var mcSubmit:MovieClip; | |
+ | |
+ public var mcNoSubmit:MovieClip; | |
+ | |
public var btnDone:MovieClip; | |
public var mcShade:Sprite; | |
Only in scripts-local-nodebug/scripts/com: mochiads | |
Only in scripts-local-nodebug/scripts/gemcraft_fla: mcStatNoSubmit_258.as | |
Only in scripts-ag-nodebug/scripts/gemcraft_fla: preloaderBarNewgrounds_206.as | |
Only in scripts-local-nodebug/scripts/gemcraft_fla: preloaderBarNewgrounds_211.as |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment