Compare commits
No commits in common. "98501c761ddaac5045b456e2722c972d3c7e96e1" and "1a759562ad4794c55481451b08e1e02f219fc856" have entirely different histories.
98501c761d
...
1a759562ad
|
@ -42,7 +42,7 @@ moveMap.bindCmd(keyboard, "escape", "", "escapeFromGame();");
|
||||||
|
|
||||||
// respawn key TODO: make this one remapable
|
// respawn key TODO: make this one remapable
|
||||||
// usage: bindCmd(device, action, onDown, onUp)
|
// usage: bindCmd(device, action, onDown, onUp)
|
||||||
moveMap.bindCmd(keyboard, "r", "", "if($gamePaused) {return;} if($Game::State !$= \"End\"){LocalClientConnection.respawnPlayer();}");
|
moveMap.bindCmd(keyboard, "r", "", "if($Game::State !$= \"End\"){ClientGroup.getObject(0).respawnPlayer();}");
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// Movement Keys
|
// Movement Keys
|
||||||
|
|
|
@ -157,7 +157,7 @@ function formatTime(%time)
|
||||||
//%hundredthOne = mFloor(%hundredth % 10);
|
//%hundredthOne = mFloor(%hundredth % 10);
|
||||||
//%hundredthTen = mFloor(%hundredth / 10);
|
//%hundredthTen = mFloor(%hundredth / 10);
|
||||||
%thousandthOne = mFloor(%thousandth % 10);
|
%thousandthOne = mFloor(%thousandth % 10);
|
||||||
%thousandthTen = mFloor(%thousandth / 10) % 10;
|
%thousandthTen = mFloor(mFloor(%thousandth / 10) % 10);
|
||||||
%thousandthHundred = mFloor(%thousandth / 100);
|
%thousandthHundred = mFloor(%thousandth / 100);
|
||||||
|
|
||||||
return %isNeg @ %minutesTen @ %minutesOne @ ":" @
|
return %isNeg @ %minutesTen @ %minutesOne @ ":" @
|
||||||
|
|
|
@ -214,27 +214,25 @@ function PlayGui::updateControls(%this)
|
||||||
%drawNeg = true;
|
%drawNeg = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
%thousandth = mFloor(%et % 1000);
|
%hundredth = mFloor((%et % 1000) / 10);
|
||||||
%totalSeconds = mFloor(%et / 1000);
|
%totalSeconds = mFloor(%et / 1000);
|
||||||
%seconds = %totalSeconds % 60;
|
%seconds = %totalSeconds % 60;
|
||||||
%minutes = %totalSeconds / 60;
|
%minutes = (%totalSeconds - %seconds) / 60;
|
||||||
|
|
||||||
%secondsOne = mFloor(%seconds % 10);
|
%secondsOne = %seconds % 10;
|
||||||
%secondsTen = mFloor(%seconds / 10);
|
%secondsTen = (%seconds - %secondsOne) / 10;
|
||||||
%minutesOne = mFloor(%minutes % 10);
|
%minutesOne = %minutes % 10;
|
||||||
%minutesTen = mFloor(%minutes / 10);
|
%minutesTen = (%minutes - %minutesOne) / 10;
|
||||||
%thousandthOne = mFloor(%thousandth % 10);
|
%hundredthOne = %hundredth % 10;
|
||||||
%thousandthTen = mFloor(%thousandth / 10) % 10;
|
%hundredthTen = (%hundredth - %hundredthOne) / 10;
|
||||||
%thousandthHundred = mFloor(%thousandth / 100);
|
|
||||||
|
|
||||||
// Update the controls
|
// Update the controls
|
||||||
Min_Ten.setNumber(%minutesTen);
|
Min_Ten.setNumber(%minutesTen);
|
||||||
Min_One.setNumber(%minutesOne);
|
Min_One.setNumber(%minutesOne);
|
||||||
Sec_Ten.setNumber(%secondsTen);
|
Sec_Ten.setNumber(%secondsTen);
|
||||||
Sec_One.setNumber(%secondsOne);
|
Sec_One.setNumber(%secondsOne);
|
||||||
Sec_Tenth.setNumber(%thousandthHundred);
|
Sec_Tenth.setNumber(%hundredthTen);
|
||||||
Sec_Hundredth.setNumber(%thousandthTen);
|
Sec_Hundredth.setNumber(%hundredthOne);
|
||||||
Sec_Thousandth.setNumber(%thousandthOne);
|
|
||||||
PG_NegSign.setVisible(%drawNeg);
|
PG_NegSign.setVisible(%drawNeg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ function initTMTimer() {
|
||||||
profile = "GuiDefaultProfile";
|
profile = "GuiDefaultProfile";
|
||||||
horizSizing = "center";
|
horizSizing = "center";
|
||||||
//HiGuy: Center it!
|
//HiGuy: Center it!
|
||||||
position = mfloor((getWord(PlayGui.getExtent(), 0) - 227) / 2) SPC "52";
|
position = mfloor((getWord(PlayGui.getExtent(), 0) - 237) / 2) SPC "62";
|
||||||
extent = "237 46";
|
extent = "237 46";
|
||||||
visible = "0";
|
visible = "0";
|
||||||
|
|
||||||
|
@ -105,12 +105,6 @@ function initTMTimer() {
|
||||||
extent = "30 38";
|
extent = "30 38";
|
||||||
bitmap = $Con::Root @ "/client/ui/game/numbers/0_green.png";
|
bitmap = $Con::Root @ "/client/ui/game/numbers/0_green.png";
|
||||||
};
|
};
|
||||||
new GuiBitmapCtrl(TMSec_Thousandth) {
|
|
||||||
profile = "GuiDefaultProfile";
|
|
||||||
position = "172 3";
|
|
||||||
extent = "30 38";
|
|
||||||
bitmap = $Con::Root @ "/client/ui/game/numbers/0_green.png";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
//HiGuy: Add it to the PlayGui
|
//HiGuy: Add it to the PlayGui
|
||||||
PlayGui.add(PG_TMTimer);
|
PlayGui.add(PG_TMTimer);
|
||||||
|
@ -160,27 +154,25 @@ package TMTimer {
|
||||||
PG_TMTimer.setVisible(%bt);
|
PG_TMTimer.setVisible(%bt);
|
||||||
|
|
||||||
if (%bt) {
|
if (%bt) {
|
||||||
%thousandth = mFloor(%bt % 1000);
|
%hundredth = mFloor((%bt % 1000) / 10);
|
||||||
%totalSeconds = mFloor(%bt / 1000);
|
%totalSeconds = mFloor(%bt / 1000);
|
||||||
%seconds = mFloor(%totalSeconds % 60);
|
%seconds = %totalSeconds % 60;
|
||||||
%minutes = mFloor(%totalSeconds / 60);
|
%minutes = (%totalSeconds - %seconds) / 60;
|
||||||
|
|
||||||
%secondsOne = mFloor(%seconds % 10);
|
%secondsOne = %seconds % 10;
|
||||||
%secondsTen = mFloor(%seconds / 10);
|
%secondsTen = (%seconds - %secondsOne) / 10;
|
||||||
%minutesOne = mFloor(%minutes % 10);
|
%minutesOne = %minutes % 10;
|
||||||
%minutesTen = mFloor(%minutes / 10);
|
%minutesTen = (%minutes - %minutesOne) / 10;
|
||||||
%thousandthOne = mFloor(%thousandth % 10);
|
%hundredthOne = %hundredth % 10;
|
||||||
%thousandthTen = mFloor(%thousandth / 10) % 10;
|
%hundredthTen = (%hundredth - %hundredthOne) / 10;
|
||||||
%thousandthHundred = mFloor(%thousandth / 100);
|
|
||||||
|
|
||||||
// Update the controls
|
// Update the controls
|
||||||
TMMin_Ten.setTimeNumber(%minutesTen);
|
TMMin_Ten.setTimeNumber(%minutesTen);
|
||||||
TMMin_One.setTimeNumber(%minutesOne);
|
TMMin_One.setTimeNumber(%minutesOne);
|
||||||
TMSec_Ten.setTimeNumber(%secondsTen);
|
TMSec_Ten.setTimeNumber(%secondsTen);
|
||||||
TMSec_One.setTimeNumber(%secondsOne);
|
TMSec_One.setTimeNumber(%secondsOne);
|
||||||
TMSec_Tenth.setTimeNumber(%thousandthHundred);
|
TMSec_Tenth.setTimeNumber(%hundredthTen);
|
||||||
TMSec_Hundredth.setTimeNumber(%thousandthTen);
|
TMSec_Hundredth.setTimeNumber(%hundredthOne);
|
||||||
TMSec_Thousandth.setTimeNumber(%thousandthOne);
|
|
||||||
|
|
||||||
TMMinSec_Colon.setTimeNumber("colon");
|
TMMinSec_Colon.setTimeNumber("colon");
|
||||||
TMMinSec_Point.setTimeNumber("point");
|
TMMinSec_Point.setTimeNumber("point");
|
||||||
|
|
|
@ -80,7 +80,6 @@ new GuiControl(ExitGameDlg) {
|
||||||
command = "Canvas.popDialog(ExitGameDlg); resumeGame(); restartLevel();";
|
command = "Canvas.popDialog(ExitGameDlg); resumeGame(); restartLevel();";
|
||||||
helpTag = "0";
|
helpTag = "0";
|
||||||
text = "button";
|
text = "button";
|
||||||
accelerator = "r";
|
|
||||||
groupNum = "-1";
|
groupNum = "-1";
|
||||||
buttonType = "PushButton";
|
buttonType = "PushButton";
|
||||||
bitmap = "common/ui/restart";
|
bitmap = "common/ui/restart";
|
||||||
|
|
|
@ -200,7 +200,7 @@ new GameTSCtrl(PlayGUI) {
|
||||||
horizSizing = "center";
|
horizSizing = "center";
|
||||||
vertSizing = "bottom";
|
vertSizing = "bottom";
|
||||||
position = "215 1";
|
position = "215 1";
|
||||||
extent = "230 58";
|
extent = "210 58";
|
||||||
minExtent = "8 8";
|
minExtent = "8 8";
|
||||||
visible = "1";
|
visible = "1";
|
||||||
helpTag = "0";
|
helpTag = "0";
|
||||||
|
@ -301,18 +301,6 @@ new GameTSCtrl(PlayGUI) {
|
||||||
bitmap = "./game/numbers/5.png";
|
bitmap = "./game/numbers/5.png";
|
||||||
wrap = "0";
|
wrap = "0";
|
||||||
};
|
};
|
||||||
new GuiBitmapCtrl(Sec_Thousandth) {
|
|
||||||
profile = "GuiDefaultProfile";
|
|
||||||
horizSizing = "right";
|
|
||||||
vertSizing = "bottom";
|
|
||||||
position = "192 0";
|
|
||||||
extent = "43 55";
|
|
||||||
minExtent = "8 8";
|
|
||||||
visible = "1";
|
|
||||||
helpTag = "0";
|
|
||||||
bitmap = "./game/numbers/9.png";
|
|
||||||
wrap = "0";
|
|
||||||
};
|
|
||||||
new GuiBitmapCtrl(PG_NegSign) {
|
new GuiBitmapCtrl(PG_NegSign) {
|
||||||
profile = "GuiDefaultProfile";
|
profile = "GuiDefaultProfile";
|
||||||
horizSizing = "right";
|
horizSizing = "right";
|
||||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 8.4 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 43 KiB |
|
@ -22,6 +22,7 @@ datablock AudioProfile(GotThatEggAlready)
|
||||||
|
|
||||||
function EasterEgg::onPickup(%this,%obj,%user,%amount)
|
function EasterEgg::onPickup(%this,%obj,%user,%amount)
|
||||||
{
|
{
|
||||||
|
echo("onPickup");
|
||||||
Parent::onPickup(%this,%obj,%user,%amount);
|
Parent::onPickup(%this,%obj,%user,%amount);
|
||||||
%user.client.onFoundEasterEgg(%amount);
|
%user.client.onFoundEasterEgg(%amount);
|
||||||
return true;
|
return true;
|
||||||
|
|