-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from MEEPofFaith/slider
A clean slider instead of buttons
- Loading branch information
Showing
2 changed files
with
41 additions
and
185 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| # TimeControl | ||
| Speeds up or slows down Mindustry. | ||
|
|
||
| Supports `x0.25` ~ `x16`. Some buttons can be pressed twice to alternate between different modes. | ||
| Press & hold `x1` to fold/unfold the buttons. | ||
| Supports `x1/256` ~ `x256`. Simply drag the slider to adjust the speed. | ||
|
|
||
| Not intended for multiplayer use. |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,190 +1,47 @@ | ||
| var current = 1; | ||
| const longPress = 90; | ||
| const speedArr = [0.25, 0.5, 1, 2, 4]; | ||
| var folded = false; | ||
|
|
||
| function addSpeed(t, speed){ | ||
| var b = new Button(Styles.logict); | ||
| b.label(prov(() => (current == speed ? "[#a9d8ff]" : "[white]") + "x" + speed + "[]")); | ||
| b.clicked(() => { | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed, 3 * speed)); | ||
| current = speed; | ||
| }); | ||
| return t.add(b).size(50, 40).color(Pal.lancerLaser).pad(1); | ||
| } | ||
|
|
||
|
|
||
| function addSpeedAlt(t, speed, speed2){ | ||
| var b = new Button(Styles.logict); | ||
| b.label(prov(() => (current == speed ? "[#a9d8ff]" : (current == speed2 ? "[accent]" : "[white]")) + "x" + (current == speed2 ? speed2 : speed) + "[]")); | ||
| b.clicked(() => { | ||
| if(current == speed){ | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed2, 3 * speed2)); | ||
| current = speed2; | ||
| b.setColor(Pal.accent); | ||
| } | ||
| else{ | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed, 3 * speed)); | ||
| current = speed; | ||
| b.setColor(Pal.lancerLaser); | ||
| } | ||
| }); | ||
| b.update(() => { | ||
| b.setColor(current == speed2 ? Pal.accent : Pal.lancerLaser); | ||
| }); | ||
| return t.add(b).size(50, 40).color(Pal.lancerLaser).pad(1); | ||
| } | ||
|
|
||
| function addSpeedThree(t, speed, speed2, speed3){ | ||
| var b = new Button(Styles.logict); | ||
| var h3 = 0; | ||
| b.label(prov(() => (current == speed ? "[#a9d8ff]" : (current == speed2 ? "[accent]" : (current == speed3 ? "[green]" : "[white]"))) + "x" + (current == speed2 ? speed2 : (current == speed3 ? speed3 : speed)) + "[]")); | ||
| b.clicked(() => { | ||
| if(h3>longPress) return; | ||
| if(current == speed){ | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed2, 3 * speed2)); | ||
| current = speed2; | ||
| b.setColor(Pal.accent); | ||
| } | ||
| else{ | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed, 3 * speed)); | ||
| current = speed; | ||
| b.setColor(Pal.lancerLaser); | ||
| } | ||
| }); | ||
| b.update(() => { | ||
| if(b.isPressed()){ | ||
| h3 += Core.graphics.getDeltaTime() * 60; | ||
| if(h3>longPress){ | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed3, 3 * speed3)); | ||
| current = speed3; | ||
| b.setColor(Color.green); | ||
| } | ||
| } | ||
| else{ | ||
| h3 = 0; | ||
| } | ||
| b.setColor(current == speed2 ? Pal.accent : (current == speed3 ? Color.green : Pal.lancerLaser)); | ||
| }); | ||
| return t.add(b).size(50, 40).color(Pal.lancerLaser).pad(1); | ||
| } | ||
|
|
||
| function addOne(t, speed){ | ||
| var b = new Button(Styles.logict); | ||
| var h = 0; | ||
| b.label(prov(() => (current == speed ? "[#a9d8ff]" : "[white]") + "x" + speed + "[]")); | ||
| b.clicked(() => { | ||
| if(h>longPress) return; | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speed, 3 * speed)); | ||
| current = speed; | ||
| }); | ||
| b.update(() => { | ||
| if(b.isPressed()){ | ||
| h += Core.graphics.getDeltaTime() * 60; | ||
| if(h>longPress){ | ||
| folded = true; | ||
| mode = speedArr.indexOf(current); | ||
| if(mode < 0) mode = speedArr.length; | ||
| } | ||
| } | ||
| else{ | ||
| h = 0; | ||
| } | ||
| }); | ||
| return t.add(b).size(50, 40).color(Pal.lancerLaser).pad(1); | ||
| } | ||
|
|
||
| var mode = 2; | ||
|
|
||
| function addMini(t, speedlist, showlist){ | ||
| var b = new Button(Styles.logict); | ||
| var h2 = 0; | ||
| b.label(prov(() => (current == 1 ? "[#a9d8ff]" : (current > 1.9 ? "[accent]" : "[orange]")) + showlist[mode] + "[]")); | ||
| b.clicked(() => { | ||
| if(h2>longPress) return; | ||
| mode++; | ||
| if(mode >= speedlist.length) mode = 0; | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * speedlist[mode], 3 * speedlist[mode])); | ||
| current = speedlist[mode]; | ||
| }); | ||
| b.update(() => { | ||
| if(b.isPressed()){ | ||
| h2 += Core.graphics.getDeltaTime() * 60; | ||
| if(h2>longPress) folded = false; | ||
| } | ||
| else{ | ||
| h2 = 0; | ||
| } | ||
| b.setColor(current == 1 ? Pal.lancerLaser : (current > 1.9 ? Pal.accent : Color.orange)); | ||
| }); | ||
| return t.add(b).size(40, 40).color(Pal.lancerLaser).pad(1).padLeft(0).padRight(0); | ||
| } | ||
| //Pink from BetaMindy | ||
| let cols = [Pal.lancerLaser, Pal.accent, Color.valueOf("cc6eaf")]; | ||
|
|
||
| function addTable(table){ | ||
| table.table(Styles.black5, cons(t => { | ||
| t.background(Tex.buttonEdge3); | ||
| if(Vars.mobile){ | ||
| addSpeedThree(t, 0.5, 0.25, 0.125).width(60); | ||
| addOne(t, 1).width(45); | ||
| addSpeedThree(t, 2, 8, 64).width(45); | ||
| addSpeedThree(t, 4, 16, 256).width(45); | ||
| } | ||
| else{ | ||
| addSpeedAlt(t, 0.25, 0.125).width(65); | ||
| addSpeed(t, 0.5); | ||
| addOne(t, 1); | ||
| addSpeedThree(t, 2, 8, 64); | ||
| addSpeedThree(t, 4, 16, 256).width(65); | ||
| } | ||
|
|
||
| //t.visibility = () => !folded; | ||
| })); | ||
| table.fillParent = true; | ||
| table.visibility = () => { | ||
| if(folded) return false; | ||
| if(!Vars.ui.hudfrag.shown) return false; | ||
| if(Vars.ui.minimapfrag.shown()) return false; | ||
| if(!Vars.mobile) return true; | ||
| if(Vars.player.unit().isBuilding()) return false; | ||
| if(Vars.control.input.block != null) return false; | ||
| if(Vars.control.input.mode == PlaceMode.breaking) return false; | ||
| if(!Vars.control.input.selectRequests.isEmpty() && Vars.control.input.lastSchematic != null && !Vars.control.input.selectRequests.isEmpty()) return false; | ||
| return true; | ||
| }; | ||
| table.table(Styles.black5, cons(t => { | ||
| t.background(Tex.buttonEdge3); | ||
| let s = new Slider(-8, 8, 1, false); | ||
| s.setValue(0); | ||
| let l = t.label(() => { | ||
| let v = s.getValue(); | ||
| if(v >= 0){ | ||
| return "x" + Math.pow(2, v); | ||
| }else{ | ||
| return "x1/" + Math.pow(2, Math.abs(v)); | ||
| } | ||
| }).growX().width(8.5 * 8).color(Pal.accent); | ||
| let b = t.button(new TextureRegionDrawable(Icon.refresh), 24, () => s.setValue(0)).padLeft(6).get(); | ||
| b.getStyle().imageUpColor = Pal.accent; | ||
| t.add(s).padLeft(6); | ||
| s.moved(v => { | ||
| let t = Math.pow(2, v); | ||
| Time.setDeltaProvider(() => Math.min(Core.graphics.getDeltaTime() * 60 * t, 3 * t)); | ||
| l.color(Tmp.c1.lerp(cols, (s.getValue() + 8) / 16)); | ||
| }); | ||
| })); | ||
| table.fillParent = true; | ||
| table.visibility = () => { | ||
| if(!Vars.ui.hudfrag.shown) return false; | ||
| if(Vars.ui.minimapfrag.shown()) return false; | ||
| if(!Vars.mobile) return true; | ||
| if(Vars.player.unit().isBuilding()) return false; | ||
| if(Vars.control.input.block != null) return false; | ||
| if(Vars.control.input.mode == PlaceMode.breaking) return false; | ||
| if(!Vars.control.input.selectRequests.isEmpty() && Vars.control.input.lastSchematic != null && !Vars.control.input.selectRequests.isEmpty()) return false; | ||
| return true; | ||
| }; | ||
| } | ||
|
|
||
| function addMiniT(table){ | ||
| table.table(Styles.black5, cons(t => { | ||
| t.background(Tex.buttonEdge3); | ||
| if(Vars.mobile) addMini(t, speedArr, [".25", ".5", "x1", "x2", "x4", "×?"]); | ||
| else addMini(t, speedArr, ["x.25", "x0.5", "x1", "x2", "x4", "x8+"]).width(60); | ||
| })); | ||
| table.fillParent = true; | ||
| table.visibility = () => { | ||
| if(!folded) return false; | ||
| if(!Vars.ui.hudfrag.shown) return false; | ||
| if(Vars.ui.minimapfrag.shown()) return false; | ||
| if(!Vars.mobile) return true; | ||
| if(Vars.player.unit().isBuilding()) return false; | ||
| if(Vars.control.input.block != null) return false; | ||
| if(Vars.control.input.mode == PlaceMode.breaking) return false; | ||
| if(!Vars.control.input.selectRequests.isEmpty() && Vars.control.input.lastSchematic != null && !Vars.control.input.selectRequests.isEmpty()) return false; | ||
| return true; | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| if(!Vars.headless){ | ||
| var ut = new Table(); | ||
| var ft = new Table(); | ||
|
|
||
| var tc = new Table(); | ||
|
|
||
| Events.on(ClientLoadEvent, () => { | ||
| ut.bottom().left(); | ||
| ft.bottom().left(); | ||
| addTable(ut); | ||
| addMiniT(ft); | ||
| Vars.ui.hudGroup.addChild(ut); | ||
| Vars.ui.hudGroup.addChild(ft); | ||
| }); | ||
| Events.on(ClientLoadEvent, () => { | ||
| tc.bottom().left(); | ||
| addTable(tc); | ||
| Vars.ui.hudGroup.addChild(tc); | ||
| }); | ||
| } |