Skip to content

Commit d642e9e

Browse files
Z11CodingZ11Coding
committed
Update CharacterEditorState.hx
whoops
1 parent 7e3a4dc commit d642e9e

File tree

1 file changed

+18
-94
lines changed

1 file changed

+18
-94
lines changed

‎source/states/editors/CharacterEditorState.hx‎

Lines changed: 18 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
100100
ghost.visible = false;
101101
ghost.alpha = ghostAlpha;
102102
add(ghost);
103+
103104
animsTxt = new FlxText(10, 32, 400, '');
104105
animsTxt.setFormat(null, 16, FlxColor.WHITE, LEFT, OUTLINE_FAST, FlxColor.BLACK);
105106
animsTxt.scrollFactor.set();
@@ -125,7 +126,7 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
125126
add(healthIcon);
126127
add(animsTxt);
127128

128-
var tipText:FlxText = new FlxText(FlxG.width - 300, FlxG.height - 24, 300, 'Press F1 for Help', 20);
129+
var tipText:FlxText = new FlxText(FlxG.width - 300, FlxG.height - 24, 300, "Press F1 for Help", 20);
129130
tipText.cameras = [camHUD];
130131
tipText.setFormat(null, 16, FlxColor.WHITE, RIGHT, OUTLINE_FAST, FlxColor.BLACK);
131132
tipText.borderColor = FlxColor.BLACK;
@@ -160,11 +161,6 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
160161
updateHealthBar();
161162
character.finishAnimation();
162163

163-
#if TOUCH_CONTROLS_ALLOWED
164-
addTouchPad('LEFT_FULL', 'CHARACTER_EDITOR');
165-
addTouchPadCamera(false);
166-
#end
167-
168164
if(ClientPrefs.data.cacheOnGPU) Paths.clearUnusedMemory();
169165

170166
super.create();
@@ -865,41 +861,6 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
865861
override function update(elapsed:Float)
866862
{
867863
super.update(elapsed);
868-
//? pulling key presses
869-
870-
var pressed_I = FlxG.keys.pressed.I;
871-
var pressed_J = FlxG.keys.pressed.J;
872-
var pressed_K = FlxG.keys.pressed.K;
873-
var pressed_L = FlxG.keys.pressed.L;
874-
875-
var pressed_E = FlxG.keys.pressed.E;
876-
var pressed_Q = FlxG.keys.pressed.Q;
877-
878-
var justPressed_F12 = FlxG.keys.justPressed.F12;
879-
var justPressed_F1 = FlxG.keys.justPressed.F1;
880-
var justPressed_ESC = FlxG.keys.justPressed.ESCAPE;
881-
882-
var justPressed_RESET = FlxG.keys.justPressed.R && !FlxG.keys.pressed.CONTROL;
883-
884-
var pressed_SHIFT = FlxG.keys.pressed.SHIFT;
885-
#if TOUCH_CONTROLS_ALLOWED
886-
887-
pressed_I = pressed_I || touchPad.buttonG.pressed && touchPad.buttonUp.pressed;
888-
pressed_J = pressed_J || touchPad.buttonG.pressed && touchPad.buttonLeft.pressed;
889-
pressed_K = pressed_K || touchPad.buttonG.pressed && touchPad.buttonDown.pressed;
890-
pressed_L = pressed_L || touchPad.buttonG.pressed && touchPad.buttonRight.pressed;
891-
892-
pressed_E = pressed_E || touchPad.buttonX.pressed;
893-
pressed_Q = pressed_Q || touchPad.buttonY.pressed;
894-
895-
justPressed_F12 = justPressed_F12 || touchPad.buttonS.justPressed;
896-
justPressed_F1 = justPressed_F1 || touchPad.buttonF.justPressed;
897-
justPressed_ESC = justPressed_ESC || touchPad.buttonB.justPressed;
898-
899-
justPressed_RESET = justPressed_RESET || touchPad.buttonZ.justPressed;
900-
901-
pressed_SHIFT = pressed_SHIFT || touchPad.buttonC.pressed;
902-
#end
903864

904865
if(PsychUIInputText.focusOn != null)
905866
{
@@ -911,26 +872,26 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
911872
var shiftMult:Float = 1;
912873
var ctrlMult:Float = 1;
913874
var shiftMultBig:Float = 1;
914-
if(pressed_SHIFT)
875+
if(FlxG.keys.pressed.SHIFT)
915876
{
916877
shiftMult = 4;
917878
shiftMultBig = 10;
918879
}
919880
if(FlxG.keys.pressed.CONTROL) ctrlMult = 0.25;
920881

921882
// CAMERA CONTROLS
922-
if (pressed_J) FlxG.camera.scroll.x -= elapsed * 500 * shiftMult * ctrlMult;
923-
if (pressed_K) FlxG.camera.scroll.y += elapsed * 500 * shiftMult * ctrlMult;
924-
if (pressed_L) FlxG.camera.scroll.x += elapsed * 500 * shiftMult * ctrlMult;
925-
if (pressed_I) FlxG.camera.scroll.y -= elapsed * 500 * shiftMult * ctrlMult;
883+
if (FlxG.keys.pressed.J) FlxG.camera.scroll.x -= elapsed * 500 * shiftMult * ctrlMult;
884+
if (FlxG.keys.pressed.K) FlxG.camera.scroll.y += elapsed * 500 * shiftMult * ctrlMult;
885+
if (FlxG.keys.pressed.L) FlxG.camera.scroll.x += elapsed * 500 * shiftMult * ctrlMult;
886+
if (FlxG.keys.pressed.I) FlxG.camera.scroll.y -= elapsed * 500 * shiftMult * ctrlMult;
926887

927888
var lastZoom = FlxG.camera.zoom;
928-
if(justPressed_RESET) FlxG.camera.zoom = 1;
929-
else if (pressed_E && FlxG.camera.zoom < 3) {
889+
if(FlxG.keys.justPressed.R && !FlxG.keys.pressed.CONTROL) FlxG.camera.zoom = 1;
890+
else if (FlxG.keys.pressed.E && FlxG.camera.zoom < 3) {
930891
FlxG.camera.zoom += elapsed * FlxG.camera.zoom * shiftMult * ctrlMult;
931892
if(FlxG.camera.zoom > 3) FlxG.camera.zoom = 3;
932893
}
933-
else if (pressed_Q && FlxG.camera.zoom > 0.1) {
894+
else if (FlxG.keys.pressed.Q && FlxG.camera.zoom > 0.1) {
934895
FlxG.camera.zoom -= elapsed * FlxG.camera.zoom * shiftMult * ctrlMult;
935896
if(FlxG.camera.zoom < 0.1) FlxG.camera.zoom = 0.1;
936897
}
@@ -941,13 +902,8 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
941902
var changedAnim:Bool = false;
942903
if(anims.length > 1)
943904
{
944-
#if TOUCH_CONTROLS_ALLOWED
945-
if((FlxG.keys.justPressed.W || touchPad.buttonV.justPressed) && !touchPad.buttonG.pressed && (changedAnim = true)) curAnim--;
946-
else if((FlxG.keys.justPressed.S || touchPad.buttonD.justPressed) && !touchPad.buttonG.pressed && (changedAnim = true)) curAnim++;
947-
#else
948-
if((FlxG.keys.justPressed.W) && (changedAnim = true)) curAnim--;
949-
else if((FlxG.keys.justPressed.S) && (changedAnim = true)) curAnim++;
950-
#end
905+
if(FlxG.keys.justPressed.W && (changedAnim = true)) curAnim--;
906+
else if(FlxG.keys.justPressed.S && (changedAnim = true)) curAnim++;
951907

952908
if(changedAnim)
953909
{
@@ -959,25 +915,16 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
959915
}
960916

961917
var changedOffset = false;
962-
963-
var not_G_pressed = true;
964918
var moveKeysP = [FlxG.keys.justPressed.LEFT, FlxG.keys.justPressed.RIGHT, FlxG.keys.justPressed.UP, FlxG.keys.justPressed.DOWN];
965-
var moveKeys = [FlxG.keys.pressed.LEFT, FlxG.keys.pressed.RIGHT, FlxG.keys.pressed.UP, FlxG.keys.pressed.DOWN];
966-
#if TOUCH_CONTROLS_ALLOWED
967-
if(controls.mobileC){
968-
moveKeysP = [touchPad.buttonLeft.justPressed, touchPad.buttonRight.justPressed, touchPad.buttonUp.justPressed, touchPad.buttonDown.justPressed];
969-
moveKeys = [touchPad.buttonLeft.pressed, touchPad.buttonRight.pressed, touchPad.buttonUp.pressed, touchPad.buttonDown.pressed];
970-
not_G_pressed = !touchPad.buttonG.pressed;
971-
}
972-
#end
973-
if(moveKeysP.contains(true) && not_G_pressed)
919+
var moveKeys = [FlxG.keys.pressed.LEFT, FlxG.keys.pressed.RIGHT, FlxG.keys.pressed.UP, FlxG.keys.pressed.DOWN];
920+
if(moveKeysP.contains(true))
974921
{
975922
character.offset.x += ((moveKeysP[0] ? 1 : 0) - (moveKeysP[1] ? 1 : 0)) * shiftMultBig;
976923
character.offset.y += ((moveKeysP[2] ? 1 : 0) - (moveKeysP[3] ? 1 : 0)) * shiftMultBig;
977924
changedOffset = true;
978925
}
979926

980-
if(moveKeys.contains(true) && not_G_pressed)
927+
if(moveKeys.contains(true))
981928
{
982929
holdingArrowsTime += elapsed;
983930
if(holdingArrowsTime > 0.6)
@@ -1029,15 +976,6 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
1029976
changedOffset = true;
1030977
}
1031978
}
1032-
#if TOUCH_CONTROLS_ALLOWED
1033-
if (touchPad.buttonA.justPressed)
1034-
{
1035-
undoOffsets = [character.offset.x, character.offset.y];
1036-
character.offset.x = copiedOffset[0];
1037-
character.offset.y = copiedOffset[1];
1038-
changedOffset = true;
1039-
}
1040-
#end
1041979

1042980
var anim = anims[curAnim];
1043981
if(changedOffset && anim != null && anim.offsets != null)
@@ -1102,24 +1040,15 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
11021040
frameAdvanceText.color = clr;
11031041

11041042
// OTHER CONTROLS
1105-
if(justPressed_F12)
1043+
if(FlxG.keys.justPressed.F12)
11061044
silhouettes.visible = !silhouettes.visible;
11071045

1108-
if(justPressed_F1 || (helpBg.visible && FlxG.keys.justPressed.ESCAPE))
1046+
if(FlxG.keys.justPressed.F1 || (helpBg.visible && FlxG.keys.justPressed.ESCAPE))
11091047
{
1110-
#if TOUCH_CONTROLS_ALLOWED
1111-
if(controls.mobileC){
1112-
touchPad.forEachAlive(function(button:TouchButton){
1113-
if(button.tag != 'F')
1114-
button.visible = !button.visible;
1115-
});
1116-
}
1117-
#end
1118-
11191048
helpBg.visible = !helpBg.visible;
11201049
helpTexts.visible = helpBg.visible;
11211050
}
1122-
else if(justPressed_ESC)
1051+
else if(FlxG.keys.justPressed.ESCAPE)
11231052
{
11241053
if(!_goToPlayState)
11251054
{
@@ -1375,16 +1304,11 @@ class CharacterEditorState extends MusicBeatState implements PsychUIEventHandler
13751304

13761305
if (data.length > 0)
13771306
{
1378-
#if mobile
1379-
unsavedProgress = false;
1380-
StorageUtil.saveContent('$_char.json', data);
1381-
#else
13821307
_file = new FileReference();
13831308
_file.addEventListener(#if desktop Event.SELECT #else Event.COMPLETE #end, onSaveComplete);
13841309
_file.addEventListener(Event.CANCEL, onSaveCancel);
13851310
_file.addEventListener(IOErrorEvent.IO_ERROR, onSaveError);
13861311
_file.save(data, '$_char.json');
1387-
#end
13881312
}
13891313
}
13901314
}

0 commit comments

Comments
 (0)