KevinSoftware/KevinBlast
KevinSoftware
/
KevinBlast
5
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

Add the thousandth of a second to timers. 

remove blindly annoying onPickup from console (was a leftover from debugging)
This commit is contained in:
yellows111 2024-03-12 14:32:44 +00:00
parent 1a759562ad
commit 216add57ed
7 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
marble/client/scripts/default.bind.cs
View File

@ -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($Game::State !$= \"End\"){ClientGroup.getObject(0).respawnPlayer();}"); moveMap.bindCmd(keyboard, "r", "", "if($gamePaused) {return;} if($Game::State !$= \"End\"){LocalClientConnection.respawnPlayer();}");
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Movement Keys // Movement Keys

2
marble/client/scripts/game.cs
View File

@ -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(mFloor(%thousandth / 10) % 10); %thousandthTen = mFloor(%thousandth / 10) % 10;
%thousandthHundred = mFloor(%thousandth / 100); %thousandthHundred = mFloor(%thousandth / 100);
return %isNeg @ %minutesTen @ %minutesOne @ ":" @ return %isNeg @ %minutesTen @ %minutesOne @ ":" @

22
marble/client/scripts/playgui.cs
View File

@ -214,25 +214,27 @@ function PlayGui::updateControls(%this)
%drawNeg = true; %drawNeg = true;
} }
%hundredth = mFloor((%et % 1000) / 10); %thousandth = mFloor(%et % 1000);
%totalSeconds = mFloor(%et / 1000); %totalSeconds = mFloor(%et / 1000);
%seconds = %totalSeconds % 60; %seconds = %totalSeconds % 60;
%minutes = (%totalSeconds - %seconds) / 60; %minutes = %totalSeconds / 60;
%secondsOne = %seconds % 10; %secondsOne = mFloor(%seconds % 10);
%secondsTen = (%seconds - %secondsOne) / 10; %secondsTen = mFloor(%seconds / 10);
%minutesOne = %minutes % 10; %minutesOne = mFloor(%minutes % 10);
%minutesTen = (%minutes - %minutesOne) / 10; %minutesTen = mFloor(%minutes / 10);
%hundredthOne = %hundredth % 10; %thousandthOne = mFloor(%thousandth % 10);
%hundredthTen = (%hundredth - %hundredthOne) / 10; %thousandthTen = mFloor(%thousandth / 10) % 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(%hundredthTen); Sec_Tenth.setNumber(%thousandthHundred);
Sec_Hundredth.setNumber(%hundredthOne); Sec_Hundredth.setNumber(%thousandthTen);
Sec_Thousandth.setNumber(%thousandthOne);
PG_NegSign.setVisible(%drawNeg); PG_NegSign.setVisible(%drawNeg);
} }

32
marble/client/scripts/tttimer.cs
View File

@ -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) - 237) / 2) SPC "62"; position = mfloor((getWord(PlayGui.getExtent(), 0) - 227) / 2) SPC "52";
extent = "237 46"; extent = "237 46";
visible = "0"; visible = "0";
@ -105,6 +105,12 @@ 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);
@ -154,25 +160,27 @@ package TMTimer {
PG_TMTimer.setVisible(%bt); PG_TMTimer.setVisible(%bt);
if (%bt) { if (%bt) {
%hundredth = mFloor((%bt % 1000) / 10); %thousandth = mFloor(%bt % 1000);
%totalSeconds = mFloor(%bt / 1000); %totalSeconds = mFloor(%bt / 1000);
%seconds = %totalSeconds % 60; %seconds = mFloor(%totalSeconds % 60);
%minutes = (%totalSeconds - %seconds) / 60; %minutes = mFloor(%totalSeconds / 60);
%secondsOne = %seconds % 10; %secondsOne = mFloor(%seconds % 10);
%secondsTen = (%seconds - %secondsOne) / 10; %secondsTen = mFloor(%seconds / 10);
%minutesOne = %minutes % 10; %minutesOne = mFloor(%minutes % 10);
%minutesTen = (%minutes - %minutesOne) / 10; %minutesTen = mFloor(%minutes / 10);
%hundredthOne = %hundredth % 10; %thousandthOne = mFloor(%thousandth % 10);
%hundredthTen = (%hundredth - %hundredthOne) / 10; %thousandthTen = mFloor(%thousandth / 10) % 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(%hundredthTen); TMSec_Tenth.setTimeNumber(%thousandthHundred);
TMSec_Hundredth.setTimeNumber(%hundredthOne); TMSec_Hundredth.setTimeNumber(%thousandthTen);
TMSec_Thousandth.setTimeNumber(%thousandthOne);
TMMinSec_Colon.setTimeNumber("colon"); TMMinSec_Colon.setTimeNumber("colon");
TMMinSec_Point.setTimeNumber("point"); TMMinSec_Point.setTimeNumber("point");

1
marble/client/ui/ExitGameDlg.gui
View File

@ -80,6 +80,7 @@ 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";

14
marble/client/ui/playGui.gui
View File

@ -200,7 +200,7 @@ new GameTSCtrl(PlayGUI) {
horizSizing = "center"; horizSizing = "center";
vertSizing = "bottom"; vertSizing = "bottom";
position = "215 1"; position = "215 1";
extent = "210 58"; extent = "230 58";
minExtent = "8 8"; minExtent = "8 8";
visible = "1"; visible = "1";
helpTag = "0"; helpTag = "0";
@ -301,6 +301,18 @@ 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";

1
marble/server/scripts/easterEgg.cs
View File

@ -22,7 +22,6 @@ 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;