diff --git a/data/font/Coliseum.png b/data/font/Coliseum.png new file mode 100644 index 00000000..7fad3435 Binary files /dev/null and b/data/font/Coliseum.png differ diff --git a/data/font/ColiseumRR Medium.ttf b/data/font/ColiseumRR Medium.ttf new file mode 100644 index 00000000..262fdadd Binary files /dev/null and b/data/font/ColiseumRR Medium.ttf differ diff --git a/data/font/ColiseumRR.fnt b/data/font/ColiseumRR.fnt new file mode 100644 index 00000000..143026d8 --- /dev/null +++ b/data/font/ColiseumRR.fnt @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/tmp/cache.dat b/data/tmp/cache.dat index 579c2c0b..55f76b83 100644 --- a/data/tmp/cache.dat +++ b/data/tmp/cache.dat @@ -1 +1 @@ -by27:font%2FLucida%20Console.fntaoy3:outy34:tmp%2Ffont%2FLucida%20Console.bfnty3:veri1y4:hashy40:b56483df1b8f3d8472856b51459d5ce8f3cdfa09y4:timei1685983312ghy16:font%2FEXPON.fntaoR1y23:tmp%2Ffont%2FEXPON.bfntR3i1R4y40:ba8ecd55d9475ee0f9d20c9a5189fe6a9c9ff727R6i1659272757ghy21:font%2FDomCasualD.fntaoR1y28:tmp%2Ffont%2FDomCasualD.bfntR3i1R4y40:ea40ffbf969a51d3e653a3d09b450143a814c7eeR6i1659272757ghy30:data%2Ffont%2FArial%20Bold.fntaoR1y44:data%2Ftmp%2Fdata%2Ffont%2FArial%20Bold.bfntR3i1R4y40:dce4a5edf92262f9ea5540d55271f8423683d064R6i1659272757ghy23:font%2FArial%20Bold.fntaoR1y30:tmp%2Ffont%2FArial%20Bold.bfntR3i1R4R15R6i1659272757ghy28:data%2Ffont%2FMarkerFelt.fntaoR1y42:data%2Ftmp%2Fdata%2Ffont%2FMarkerFelt.bfntR3i1R4y40:eb239790210478413cc111da54400b3d38aba041R6i1685983312ghy16:font%2Farial.fntaoR1y23:tmp%2Ffont%2Farial.bfntR3i1R4y40:dc7f069d72e0d1b6b7edfd5b9e6af9c22f9c641cR6i1659272757ghy21:font%2FMarkerFelt.fntaoR1y28:tmp%2Ffont%2FMarkerFelt.bfntR3i1R4R20R6i1685983312ghy34:data%2Ffont%2FLucida%20Console.fntaoR1y48:data%2Ftmp%2Fdata%2Ffont%2FLucida%20Console.bfntR3i1R4R5R6i1685983312ghy28:data%2Ffont%2FDomCasualD.fntaoR1y42:data%2Ftmp%2Fdata%2Ffont%2FDomCasualD.bfntR3i1R4R12R6i1659272757ghy23:data%2Ffont%2Farial.fntaoR1y37:data%2Ftmp%2Fdata%2Ffont%2Farial.bfntR3i1R4R23R6i1659272757ghy23:data%2Ffont%2FEXPON.fntaoR1y37:data%2Ftmp%2Fdata%2Ffont%2FEXPON.bfntR3i1R4R9R6i1659272757ghh \ No newline at end of file +by30:data%2Ffont%2FArial%20Bold.fntaoy3:outy44:data%2Ftmp%2Fdata%2Ffont%2FArial%20Bold.bfnty3:veri1y4:hashy40:dce4a5edf92262f9ea5540d55271f8423683d064y4:timei1659272757ghy21:font%2FDomCasualD.fntaoR1y28:tmp%2Ffont%2FDomCasualD.bfntR3i1R4y40:ea40ffbf969a51d3e653a3d09b450143a814c7eeR6i1659272757ghy16:font%2FEXPON.fntaoR1y23:tmp%2Ffont%2FEXPON.bfntR3i1R4y40:ba8ecd55d9475ee0f9d20c9a5189fe6a9c9ff727R6i1659272757ghy27:font%2FLucida%20Console.fntaoR1y34:tmp%2Ffont%2FLucida%20Console.bfntR3i1R4y40:b56483df1b8f3d8472856b51459d5ce8f3cdfa09R6i1685983312ghy28:data%2Ffont%2FColiseumRR.fntaoR4y40:fbeaa449cc1d1c48a6a9cc0eae47fabe1a2aad69R1y42:data%2Ftmp%2Fdata%2Ffont%2FColiseumRR.bfntR6i1687283656R3i1ghy23:font%2FArial%20Bold.fntaoR1y30:tmp%2Ffont%2FArial%20Bold.bfntR3i1R4R5R6i1659272757ghy28:data%2Ffont%2FMarkerFelt.fntaoR1y42:data%2Ftmp%2Fdata%2Ffont%2FMarkerFelt.bfntR3i1R4y40:eb239790210478413cc111da54400b3d38aba041R6i1685983312ghy16:font%2Farial.fntaoR1y23:tmp%2Ffont%2Farial.bfntR3i1R4y40:dc7f069d72e0d1b6b7edfd5b9e6af9c22f9c641cR6i1659272757ghy28:data%2Ffont%2FDomCasualD.fntaoR1y42:data%2Ftmp%2Fdata%2Ffont%2FDomCasualD.bfntR3i1R4R9R6i1659272757ghy34:data%2Ffont%2FLucida%20Console.fntaoR1y48:data%2Ftmp%2Fdata%2Ffont%2FLucida%20Console.bfntR3i1R4R15R6i1685983312ghy21:font%2FMarkerFelt.fntaoR1y28:tmp%2Ffont%2FMarkerFelt.bfntR3i1R4R23R6i1685983312ghy23:data%2Ffont%2FEXPON.fntaoR1y37:data%2Ftmp%2Fdata%2Ffont%2FEXPON.bfntR3i1R4R12R6i1659272757ghy23:data%2Ffont%2Farial.fntaoR1y37:data%2Ftmp%2Fdata%2Ffont%2Farial.bfntR3i1R4R26R6i1659272757ghh \ No newline at end of file diff --git a/data/tmp/data/font/ColiseumRR.bfnt b/data/tmp/data/font/ColiseumRR.bfnt new file mode 100644 index 00000000..f967c1cc Binary files /dev/null and b/data/tmp/data/font/ColiseumRR.bfnt differ diff --git a/data/ui/xbox/BG_NavBarUnderButtons.png b/data/ui/xbox/BG_NavBarUnderButtons.png new file mode 100644 index 00000000..45475e51 Binary files /dev/null and b/data/ui/xbox/BG_NavBarUnderButtons.png differ diff --git a/data/ui/xbox/BG_NavBarUnderButtonsLeft.png b/data/ui/xbox/BG_NavBarUnderButtonsLeft.png new file mode 100644 index 00000000..71465909 Binary files /dev/null and b/data/ui/xbox/BG_NavBarUnderButtonsLeft.png differ diff --git a/data/ui/xbox/BG_fadeOutSoftEdge.png b/data/ui/xbox/BG_fadeOutSoftEdge.png new file mode 100644 index 00000000..9603ac83 Binary files /dev/null and b/data/ui/xbox/BG_fadeOutSoftEdge.png differ diff --git a/data/ui/xbox/DemoOutOfTimeIcon.png b/data/ui/xbox/DemoOutOfTimeIcon.png new file mode 100644 index 00000000..130391dd Binary files /dev/null and b/data/ui/xbox/DemoOutOfTimeIcon.png differ diff --git a/data/ui/xbox/GreenDot.png b/data/ui/xbox/GreenDot.png new file mode 100644 index 00000000..4cc6a23e Binary files /dev/null and b/data/ui/xbox/GreenDot.png differ diff --git a/data/ui/xbox/Ready.png b/data/ui/xbox/Ready.png new file mode 100644 index 00000000..ceb86436 Binary files /dev/null and b/data/ui/xbox/Ready.png differ diff --git a/data/ui/xbox/bgBox.png b/data/ui/xbox/bgBox.png new file mode 100644 index 00000000..cf5be167 Binary files /dev/null and b/data/ui/xbox/bgBox.png differ diff --git a/data/ui/xbox/bgBoxTop.png b/data/ui/xbox/bgBoxTop.png new file mode 100644 index 00000000..93a32d38 Binary files /dev/null and b/data/ui/xbox/bgBoxTop.png differ diff --git a/data/ui/xbox/bgController.png b/data/ui/xbox/bgController.png new file mode 100644 index 00000000..c58f4343 Binary files /dev/null and b/data/ui/xbox/bgController.png differ diff --git a/data/ui/xbox/bgShadeCircle.png b/data/ui/xbox/bgShadeCircle.png new file mode 100644 index 00000000..a4db0134 Binary files /dev/null and b/data/ui/xbox/bgShadeCircle.png differ diff --git a/data/ui/xbox/black.jpg b/data/ui/xbox/black.jpg new file mode 100644 index 00000000..f015740e Binary files /dev/null and b/data/ui/xbox/black.jpg differ diff --git a/data/ui/xbox/blue.jpg b/data/ui/xbox/blue.jpg new file mode 100644 index 00000000..3aa787d0 Binary files /dev/null and b/data/ui/xbox/blue.jpg differ diff --git a/data/ui/xbox/cursorArray.png b/data/ui/xbox/cursorArray.png new file mode 100644 index 00000000..3be91c32 Binary files /dev/null and b/data/ui/xbox/cursorArray.png differ diff --git a/data/ui/xbox/cursorArraySmall.png b/data/ui/xbox/cursorArraySmall.png new file mode 100644 index 00000000..c1eb51b8 Binary files /dev/null and b/data/ui/xbox/cursorArraySmall.png differ diff --git a/data/ui/xbox/cursorButtonArray.png b/data/ui/xbox/cursorButtonArray.png new file mode 100644 index 00000000..b217a45c Binary files /dev/null and b/data/ui/xbox/cursorButtonArray.png differ diff --git a/data/ui/xbox/demoLock.png b/data/ui/xbox/demoLock.png new file mode 100644 index 00000000..76fb8596 Binary files /dev/null and b/data/ui/xbox/demoLock.png differ diff --git a/data/ui/xbox/downArrow.png b/data/ui/xbox/downArrow.png new file mode 100644 index 00000000..3418fba9 Binary files /dev/null and b/data/ui/xbox/downArrow.png differ diff --git a/data/ui/xbox/eggIcon.png b/data/ui/xbox/eggIcon.png new file mode 100644 index 00000000..14396fd4 Binary files /dev/null and b/data/ui/xbox/eggIcon.png differ diff --git a/data/ui/xbox/fade_black.png b/data/ui/xbox/fade_black.png new file mode 100644 index 00000000..5659d22c Binary files /dev/null and b/data/ui/xbox/fade_black.png differ diff --git a/data/ui/xbox/loadingAnimation.png b/data/ui/xbox/loadingAnimation.png new file mode 100644 index 00000000..d2a166c7 Binary files /dev/null and b/data/ui/xbox/loadingAnimation.png differ diff --git a/data/ui/xbox/optionsCursorArray.png b/data/ui/xbox/optionsCursorArray.png new file mode 100644 index 00000000..c5b96877 Binary files /dev/null and b/data/ui/xbox/optionsCursorArray.png differ diff --git a/data/ui/xbox/optionsCursorArraySmall.png b/data/ui/xbox/optionsCursorArraySmall.png new file mode 100644 index 00000000..81cfbd66 Binary files /dev/null and b/data/ui/xbox/optionsCursorArraySmall.png differ diff --git a/data/ui/xbox/optionsCursorArraySmallWide.png b/data/ui/xbox/optionsCursorArraySmallWide.png new file mode 100644 index 00000000..bdae34bf Binary files /dev/null and b/data/ui/xbox/optionsCursorArraySmallWide.png differ diff --git a/data/ui/xbox/pad_bumper_l.english.png b/data/ui/xbox/pad_bumper_l.english.png new file mode 100644 index 00000000..1d0e6da4 Binary files /dev/null and b/data/ui/xbox/pad_bumper_l.english.png differ diff --git a/data/ui/xbox/pad_bumper_r.english.png b/data/ui/xbox/pad_bumper_r.english.png new file mode 100644 index 00000000..7ce342dd Binary files /dev/null and b/data/ui/xbox/pad_bumper_r.english.png differ diff --git a/data/ui/xbox/pad_button_a.png b/data/ui/xbox/pad_button_a.png new file mode 100644 index 00000000..e47e68ec Binary files /dev/null and b/data/ui/xbox/pad_button_a.png differ diff --git a/data/ui/xbox/pad_button_b.png b/data/ui/xbox/pad_button_b.png new file mode 100644 index 00000000..443a2cb6 Binary files /dev/null and b/data/ui/xbox/pad_button_b.png differ diff --git a/data/ui/xbox/pad_button_x.png b/data/ui/xbox/pad_button_x.png new file mode 100644 index 00000000..8a97a068 Binary files /dev/null and b/data/ui/xbox/pad_button_x.png differ diff --git a/data/ui/xbox/pad_button_y.png b/data/ui/xbox/pad_button_y.png new file mode 100644 index 00000000..427b6e6b Binary files /dev/null and b/data/ui/xbox/pad_button_y.png differ diff --git a/data/ui/xbox/pad_smallbumper_l.english.png b/data/ui/xbox/pad_smallbumper_l.english.png new file mode 100644 index 00000000..8922fa7d Binary files /dev/null and b/data/ui/xbox/pad_smallbumper_l.english.png differ diff --git a/data/ui/xbox/pad_smallbumper_r.english.png b/data/ui/xbox/pad_smallbumper_r.english.png new file mode 100644 index 00000000..660e6be1 Binary files /dev/null and b/data/ui/xbox/pad_smallbumper_r.english.png differ diff --git a/data/ui/xbox/pad_smallbutton_a.png b/data/ui/xbox/pad_smallbutton_a.png new file mode 100644 index 00000000..fcd45664 Binary files /dev/null and b/data/ui/xbox/pad_smallbutton_a.png differ diff --git a/data/ui/xbox/pad_smallbutton_b.png b/data/ui/xbox/pad_smallbutton_b.png new file mode 100644 index 00000000..9894e79c Binary files /dev/null and b/data/ui/xbox/pad_smallbutton_b.png differ diff --git a/data/ui/xbox/pad_smallbutton_x.png b/data/ui/xbox/pad_smallbutton_x.png new file mode 100644 index 00000000..b30b9fc3 Binary files /dev/null and b/data/ui/xbox/pad_smallbutton_x.png differ diff --git a/data/ui/xbox/pad_smallbutton_y.png b/data/ui/xbox/pad_smallbutton_y.png new file mode 100644 index 00000000..40359685 Binary files /dev/null and b/data/ui/xbox/pad_smallbutton_y.png differ diff --git a/data/ui/xbox/pad_smallstick_l_tilt.png b/data/ui/xbox/pad_smallstick_l_tilt.png new file mode 100644 index 00000000..7a37a48f Binary files /dev/null and b/data/ui/xbox/pad_smallstick_l_tilt.png differ diff --git a/data/ui/xbox/pad_smallstick_r_tilt.png b/data/ui/xbox/pad_smallstick_r_tilt.png new file mode 100644 index 00000000..c5a06189 Binary files /dev/null and b/data/ui/xbox/pad_smallstick_r_tilt.png differ diff --git a/data/ui/xbox/pad_smalltrigger_l.english.png b/data/ui/xbox/pad_smalltrigger_l.english.png new file mode 100644 index 00000000..097fac9f Binary files /dev/null and b/data/ui/xbox/pad_smalltrigger_l.english.png differ diff --git a/data/ui/xbox/pad_smalltrigger_r.english.png b/data/ui/xbox/pad_smalltrigger_r.english.png new file mode 100644 index 00000000..3ac4c680 Binary files /dev/null and b/data/ui/xbox/pad_smalltrigger_r.english.png differ diff --git a/data/ui/xbox/pad_stick_l_tilt.png b/data/ui/xbox/pad_stick_l_tilt.png new file mode 100644 index 00000000..4092b94a Binary files /dev/null and b/data/ui/xbox/pad_stick_l_tilt.png differ diff --git a/data/ui/xbox/pad_trigger_l.english.png b/data/ui/xbox/pad_trigger_l.english.png new file mode 100644 index 00000000..623a00ea Binary files /dev/null and b/data/ui/xbox/pad_trigger_l.english.png differ diff --git a/data/ui/xbox/pad_trigger_r.english.png b/data/ui/xbox/pad_trigger_r.english.png new file mode 100644 index 00000000..385eb386 Binary files /dev/null and b/data/ui/xbox/pad_trigger_r.english.png differ diff --git a/data/ui/xbox/ping_1.png b/data/ui/xbox/ping_1.png new file mode 100644 index 00000000..bf7a4851 Binary files /dev/null and b/data/ui/xbox/ping_1.png differ diff --git a/data/ui/xbox/ping_2.png b/data/ui/xbox/ping_2.png new file mode 100644 index 00000000..716101c8 Binary files /dev/null and b/data/ui/xbox/ping_2.png differ diff --git a/data/ui/xbox/ping_3.png b/data/ui/xbox/ping_3.png new file mode 100644 index 00000000..5279ce67 Binary files /dev/null and b/data/ui/xbox/ping_3.png differ diff --git a/data/ui/xbox/ping_4.png b/data/ui/xbox/ping_4.png new file mode 100644 index 00000000..1b0141c8 Binary files /dev/null and b/data/ui/xbox/ping_4.png differ diff --git a/data/ui/xbox/popupGUI.png b/data/ui/xbox/popupGUI.png new file mode 100644 index 00000000..c5d60da0 Binary files /dev/null and b/data/ui/xbox/popupGUI.png differ diff --git a/data/ui/xbox/roundedBG.png b/data/ui/xbox/roundedBG.png new file mode 100644 index 00000000..278a146e Binary files /dev/null and b/data/ui/xbox/roundedBG.png differ diff --git a/data/ui/xbox/statIcon.png b/data/ui/xbox/statIcon.png new file mode 100644 index 00000000..2454d0f1 Binary files /dev/null and b/data/ui/xbox/statIcon.png differ diff --git a/data/ui/xbox/textAlternatingBitmap.png b/data/ui/xbox/textAlternatingBitmap.png new file mode 100644 index 00000000..59a501a9 Binary files /dev/null and b/data/ui/xbox/textAlternatingBitmap.png differ diff --git a/data/ui/xbox/upArrow.png b/data/ui/xbox/upArrow.png new file mode 100644 index 00000000..73663f15 Binary files /dev/null and b/data/ui/xbox/upArrow.png differ diff --git a/data/ui/xbox/upsell.png b/data/ui/xbox/upsell.png new file mode 100644 index 00000000..229d3d6a Binary files /dev/null and b/data/ui/xbox/upsell.png differ diff --git a/data/ui/xbox/voiceIcon.png b/data/ui/xbox/voiceIcon.png new file mode 100644 index 00000000..4a1fe218 Binary files /dev/null and b/data/ui/xbox/voiceIcon.png differ diff --git a/data/ui/xbox/voiceIconOff.png b/data/ui/xbox/voiceIconOff.png new file mode 100644 index 00000000..f5f12098 Binary files /dev/null and b/data/ui/xbox/voiceIconOff.png differ diff --git a/data/ui/xbox/voiceIconPity.png b/data/ui/xbox/voiceIconPity.png new file mode 100644 index 00000000..0b3a1016 Binary files /dev/null and b/data/ui/xbox/voiceIconPity.png differ diff --git a/data/ui/xbox/voiceIconSpeak.png b/data/ui/xbox/voiceIconSpeak.png new file mode 100644 index 00000000..1e6d39b7 Binary files /dev/null and b/data/ui/xbox/voiceIconSpeak.png differ diff --git a/data/ui/xbox/void.png b/data/ui/xbox/void.png new file mode 100644 index 00000000..8f19d46d Binary files /dev/null and b/data/ui/xbox/void.png differ diff --git a/data/ui/xbox/xbox_controller.png b/data/ui/xbox/xbox_controller.png new file mode 100644 index 00000000..6a44839d Binary files /dev/null and b/data/ui/xbox/xbox_controller.png differ diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index e6966d5f..52499911 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -504,6 +504,7 @@ class MarbleWorld extends Scheduler { this.oldOrientationQuat = new Quat(); this.newOrientationQuat = new Quat(); this.deselectPowerUp(); + playGui.setCenterText(''); AudioManager.playSound(ResourceLoader.getResource('data/sound/spawn_alternate.wav', ResourceLoader.getAudio, this.soundResources)); @@ -514,15 +515,12 @@ class MarbleWorld extends Scheduler { if (this.outOfBounds) return; // We will update state manually if (this.timeState.currentAttemptTime < 0.5) { - this.playGui.setCenterText('none'); this.marble.setMode(Start); } if ((this.timeState.currentAttemptTime >= 0.5) && (this.timeState.currentAttemptTime < 3.5)) { - this.playGui.setCenterText('none'); this.marble.setMode(Start); } if (this.timeState.currentAttemptTime >= 3.5 && this.finishTime == null) { - this.playGui.setCenterText('none'); this.marble.setMode(Play); } } @@ -1604,10 +1602,10 @@ class MarbleWorld extends Scheduler { } // sky.follow = null; // this.oobCameraPosition = camera.position.clone(); - playGui.setCenterText('outofbounds'); + playGui.setCenterText('Out of Bounds'); // if (this.replay.mode != = 'playback') this.oobSchedule = this.schedule(this.timeState.currentAttemptTime + 2, () -> { - playGui.setCenterText('none'); + playGui.setCenterText(''); return null; }); this.oobSchedule2 = this.schedule(this.timeState.currentAttemptTime + 2.5, () -> { @@ -1699,7 +1697,7 @@ class MarbleWorld extends Scheduler { } } this.playGui.formatGemCounter(this.gemCount, this.totalGems); - this.playGui.setCenterText('none'); + this.playGui.setCenterText(''); this.clearSchedule(); this.outOfBounds = false; this.deselectPowerUp(); // Always deselect first diff --git a/src/gui/PlayGui.hx b/src/gui/PlayGui.hx index de0a1c89..ed2feb51 100644 --- a/src/gui/PlayGui.hx +++ b/src/gui/PlayGui.hx @@ -50,7 +50,8 @@ class PlayGui { var gemCountSlash:GuiImage; var gemHUD:GuiImage; var powerupBox:GuiAnim; - var RSGOCenterText:Anim; + var centerText:GuiText; + var centerTextBg:GuiImage; var helpTextForeground:GuiText; var helpTextBackground:GuiText; @@ -82,7 +83,6 @@ class PlayGui { public function dispose() { if (_init) { playGuiCtrlOuter.dispose(); - RSGOCenterText.remove(); for (textureResource in textureResources) { textureResource.release(); @@ -133,17 +133,8 @@ class PlayGui { for (i in 0...6) { gemCountNumbers.push(new GuiAnim(numberTiles)); } - - var rsgo = []; - rsgo.push(ResourceLoader.getResource("data/ui/game/ready.png", ResourceLoader.getImage, this.imageResources).toTile()); - rsgo.push(ResourceLoader.getResource("data/ui/game/set.png", ResourceLoader.getImage, this.imageResources).toTile()); - rsgo.push(ResourceLoader.getResource("data/ui/game/go.png", ResourceLoader.getImage, this.imageResources).toTile()); - rsgo.push(ResourceLoader.getResource("data/ui/game/outofbounds.png", ResourceLoader.getImage, this.imageResources).toTile()); - RSGOCenterText = new Anim(rsgo, 0, scene2d); - initTimer(); initGemCounter(); - initCenterText(); initPowerupBox(); if (game == 'ultra') initBlastBar(); @@ -245,31 +236,14 @@ class PlayGui { playGuiCtrl.addChild(timerCtrl); } - public function initCenterText() { - RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[0].width * Settings.uiScale / 2; - RSGOCenterText.y = scene2d.height * 0.3; // - RSGOCenterText.frames[0].height / 2; - RSGOCenterText.setScale(Settings.uiScale); - } - - public function setCenterText(identifier:String) { - if (identifier == 'none') { - this.RSGOCenterText.visible = false; - } else if (identifier == 'ready') { - this.RSGOCenterText.visible = true; - this.RSGOCenterText.currentFrame = 0; - RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[0].width * Settings.uiScale / 2; - } else if (identifier == 'set') { - this.RSGOCenterText.visible = true; - this.RSGOCenterText.currentFrame = 1; - RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[1].width * Settings.uiScale / 2; - } else if (identifier == 'go') { - this.RSGOCenterText.visible = true; - this.RSGOCenterText.currentFrame = 2; - RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[2].width * Settings.uiScale / 2; - } else if (identifier == 'outofbounds') { - this.RSGOCenterText.visible = true; - this.RSGOCenterText.currentFrame = 3; - RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[3].width * Settings.uiScale / 2; + public function setCenterText(text:String) { + if (text != "") { + centerText.text.text = text; + centerText.text.visible = true; + centerTextBg.bmp.visible = true; + } else { + centerText.text.visible = false; + centerTextBg.bmp.visible = false; } } @@ -370,6 +344,38 @@ class PlayGui { @:privateAccess arial14b.loader = ResourceLoader.loader; var arial14 = arial14b.toSdfFont(cast 26 * Settings.uiScale, MultiChannel); + var coliseumfontdata = ResourceLoader.getFileEntry("data/font/ColiseumRR.fnt"); + var coliseumb = new BitmapFont(coliseumfontdata.entry); + @:privateAccess coliseumb.loader = ResourceLoader.loader; + var coliseum = coliseumb.toSdfFont(cast 44 * Settings.uiScale, MultiChannel); + + var centerTextCtrl = new GuiControl(); + centerTextCtrl.position = new Vector(0, 0); + centerTextCtrl.extent = new Vector(640, 480); + centerTextCtrl.vertSizing = Center; + centerTextCtrl.horizSizing = Center; + + var centerTextBitmap = new GuiImage(ResourceLoader.getResource("data/ui/xbox/bgShadeCircle.png", ResourceLoader.getImage, this.imageResources) + .toTile()); + centerTextBitmap.position = new Vector(225, 142); + centerTextBitmap.extent = new Vector(200, 64); + centerTextBitmap.vertSizing = Bottom; + centerTextBitmap.horizSizing = Left; + centerTextBg = centerTextBitmap; + centerTextCtrl.addChild(centerTextBitmap); + + var centerTextText = new GuiText(coliseum); + centerTextText.text.textColor = 0xEBEBEB; + centerTextText.position = new Vector(0, 146); + centerTextText.extent = new Vector(640, 80); + centerTextText.vertSizing = Bottom; + centerTextText.horizSizing = Left; + centerTextText.justify = Center; + centerTextCtrl.addChild(centerTextText); + centerText = centerTextText; + + playGuiCtrlOuter.addChild(centerTextCtrl); + var helpTextCtrl = new GuiControl(); helpTextCtrl.position = new Vector(0, playGuiCtrl.extent.y * 190 / 480); helpTextCtrl.extent = new Vector(640, 60);