Skip to content

Commit 7a9d9b6

Browse files
committed
Parameter 'haltedAndFall' has been renamed to 'stopAndFall'.
1 parent d24ab6d commit 7a9d9b6

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Console.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class Console {
134134
setTab("default");
135135
nextWidgetPosition_y = y + 175;
136136
appendHalfwidthWidget("showTrail", ctlr.addToggle("Show trail"));
137-
appendHalfwidthWidget("haltedAndFall", ctlr.addToggle("Halted and fall"));
137+
appendHalfwidthWidget("stopAndFall", ctlr.addToggle("Stop and fall"));
138138
appendHalfwidthWidget("allowAerialJump", ctlr.addToggle("Allow aerial jump"));
139139
appendHalfwidthWidget("allowAerialWalk", ctlr.addToggle("Allow aerial walk"));
140140
appendHalfwidthWidget("allowAerialTurn", ctlr.addToggle("Allow aerial turn"));

Jumper.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class Jumper {
108108
}
109109
} else if (!hitBL() && !hitBR()) {
110110
onObstacle = false;
111-
if (!jumping && settings.haltedAndFall) {
111+
if (!jumping && settings.stopAndFall) {
112112
vx = 0;
113113
}
114114
}
@@ -164,7 +164,7 @@ class Jumper {
164164
float ax;
165165
if (jumping || (!onObstacle && !settings.allowAerialWalk)) {
166166
ax = settings.axJumping;
167-
} else if (!jumping && !onObstacle && settings.haltedAndFall) {
167+
} else if (!jumping && !onObstacle && settings.stopAndFall) {
168168
ax = 0;
169169
} else if (Math.signum(vx) != dir) {
170170
ax = settings.axBrake;

Settings.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static class Settings {
99
boolean allowAerialJump = true; // Allow aerial jump or not.
1010
boolean allowAerialWalk = true; // Allow aerial walk or not.
1111
boolean allowAerialTurn = false; // Allow aerial turn or not. (Only affects the visual appearance)
12-
boolean haltedAndFall = false; // The horizontal motion is halted when the jumper goes off the foothold.
12+
boolean stopAndFall = false; // The horizontal motion is halted when the jumper goes off the foothold.
1313
float maxVx = 8; // Maximum horizontal velocity of the jumper.
1414
float maxVy = 30; // Maximum vertical velocity of the jumper. Limits only the falling motion.
1515
float jumpVelocity = 13; // Initial vertical velocity of a jump motion.
@@ -43,7 +43,7 @@ static class Settings {
4343

4444
// Misc. parameters
4545
boolean showVelocityChart = false; // Show velocity chart in the chart canvas.
46-
boolean showAfterimage = false; // Show afterimage instead of red dots when 'showTrail' is true.
46+
boolean showAfterimage = true; // Show afterimage instead of red dots when 'showTrail' is true.
4747

4848
static ArrayList<String> booleanVariables;
4949
static ArrayList<String> floatVariables;

data/default_settings.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"forwardFocus": false,
2121
"gravity": 0.5,
2222
"gravityFalling": 1.2,
23-
"haltedAndFall": false,
23+
"stopAndFall": false,
2424
"jumpAnticipationFrames": 1,
2525
"jumpVelocity": 13,
2626
"jumpVelocityBonus": 0,
@@ -57,7 +57,7 @@
5757
"forwardFocus": false,
5858
"gravity": 0.28,
5959
"gravityFalling": 0.2886,
60-
"haltedAndFall": false,
60+
"stopAndFall": false,
6161
"jumpAnticipationFrames": 0,
6262
"jumpVelocity": 10.86,
6363
"jumpVelocityBonus": 0,
@@ -95,7 +95,7 @@
9595
"forwardFocus": false,
9696
"gravity": 0.5,
9797
"gravityFalling": 0.5,
98-
"haltedAndFall": true,
98+
"stopAndFall": true,
9999
"jumpAnticipationFrames": 0,
100100
"jumpVelocity": 10,
101101
"jumpVelocityBonus": 0,
@@ -132,7 +132,7 @@
132132
"forwardFocus": false,
133133
"gravity": 0.1,
134134
"gravityFalling": 0.1,
135-
"haltedAndFall": false,
135+
"stopAndFall": false,
136136
"jumpAnticipationFrames": 0,
137137
"jumpVelocity": 5.2,
138138
"jumpVelocityBonus": 0,
@@ -170,7 +170,7 @@
170170
"forwardFocus": false,
171171
"gravity": 0.5733333,
172172
"gravityFalling": 1.4693334,
173-
"haltedAndFall": false,
173+
"stopAndFall": false,
174174
"jumpAnticipationFrames": 0,
175175
"jumpVelocity": 11.246667,
176176
"jumpVelocityBonus": 0,
@@ -208,7 +208,7 @@
208208
"forwardFocus": false,
209209
"gravity": 0.4,
210210
"gravityFalling": 0.4,
211-
"haltedAndFall": false,
211+
"stopAndFall": false,
212212
"jumpAnticipationFrames": 1,
213213
"jumpVelocity": 9,
214214
"jumpVelocityBonus": 0,
@@ -246,7 +246,7 @@
246246
"forwardFocus": false,
247247
"gravity": 0.25,
248248
"gravityFalling": 0.25,
249-
"haltedAndFall": false,
249+
"stopAndFall": false,
250250
"jumpAnticipationFrames": 0,
251251
"jumpVelocity": 4.3,
252252
"jumpVelocityBonus": 0,
@@ -284,7 +284,7 @@
284284
"forwardFocus": false,
285285
"gravity": 0.5,
286286
"gravityFalling": 1,
287-
"haltedAndFall": false,
287+
"stopAndFall": false,
288288
"jumpAnticipationFrames": 1,
289289
"jumpVelocity": 12,
290290
"jumpVelocityBonus": 0.2,

0 commit comments

Comments
 (0)