Skip to content

Commit

Permalink
Linting
Browse files Browse the repository at this point in the history
  • Loading branch information
tcorbly committed Sep 24, 2024
1 parent 4c6e0f5 commit 1770901
Show file tree
Hide file tree
Showing 38 changed files with 157 additions and 182 deletions.
6 changes: 1 addition & 5 deletions src/simulator/ScriptManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { v4 as uuid } from 'uuid';
import construct from '../util/redux/construct';
import { RawAxisAngle, RawQuaternion, RawReferenceFrame, RawVector3 } from '../util/math/math';
import { Angle, Mass, Distance } from '../util/math/Value';
import {SharedRegistersRobot} from '../programming/SharedRegistersRobot';
import { SharedRegistersRobot } from '../programming/SharedRegistersRobot';


export type Ids = string | string[] | Set<string>;
Expand Down Expand Up @@ -368,10 +368,6 @@ namespace ScriptManager {
this.triggerClick_(event);
break;
}
case Event.Type.Click: {
this.triggerClick_(event);
break;
}
}
}

Expand Down
9 changes: 4 additions & 5 deletions src/simulator/definitions/challenges/jbc1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr'
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand Down Expand Up @@ -56,13 +55,13 @@ export default {
eventId: 'canAIntersects',
},

//Upright Events
// Upright Events
canAUpright: {
type: Expr.Type.Event,
eventId: 'canAUpright',
},

//Start Box Events
// Start Box Events
leaveStartBox: {
type: Expr.Type.Event,
eventId: 'leaveStartBox',
Expand All @@ -88,13 +87,13 @@ export default {
argIds:['leaveStartBoxOnce', 'returnStartBoxOnce'],
},

//Intersects and upright logic
// Intersects and upright logic
aIntersectsUpright: {
type: Expr.Type.And,
argIds: ['canAIntersects', 'canAUpright'],
},

//Success Logic = Can A upright, intersects and touched
// Success Logic = Can A upright, intersects and touched
completion: {
type: Expr.Type.And,
argIds: ['can9Touched', 'aIntersectsUpright', 'startingBox'],
Expand Down
15 changes: 7 additions & 8 deletions src/simulator/definitions/challenges/jbc10.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand All @@ -33,16 +32,16 @@ export default {
description: { [LocalizedString.EN_US]: 'Robot left starting box' },
},
robotTouchingLine: {
name: { [LocalizedString.EN_US]: 'Robot Touching Line B' },
description: { [LocalizedString.EN_US]: 'Robot is touching line B' },
},
name: { [LocalizedString.EN_US]: 'Robot Touching Line B' },
description: { [LocalizedString.EN_US]: 'Robot is touching line B' },
},

},
success: {
exprs: {


//Upright Events
// Upright Events
can1Upright: {
type: Expr.Type.Event,
eventId: 'can1Upright',
Expand All @@ -52,7 +51,7 @@ export default {
argId: 'can1Upright',
},

//Line B Event
// Line B Event
robotTouchingLine: {
type: Expr.Type.Event,
eventId: 'robotTouchingLine',
Expand All @@ -62,13 +61,13 @@ export default {
argId: 'robotTouchingLine',
},

//Can 1 Not Upright and Robot Not Touching Line B
// Can 1 Not Upright and Robot Not Touching Line B
NotUprightNotTouching: {
type: Expr.Type.And,
argIds: ['can1NotUpright', 'robotNotTouchingLine'],
},

//Start Box Events
// Start Box Events
leaveStartBox: {
type: Expr.Type.Event,
eventId: 'leaveStartBox',
Expand Down
15 changes: 7 additions & 8 deletions src/simulator/definitions/challenges/jbc10b.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand All @@ -33,16 +32,16 @@ export default {
description: { [LocalizedString.EN_US]: 'Robot left starting box' },
},
robotTouchingLine: {
name: { [LocalizedString.EN_US]: 'Robot Touching Line B' },
description: { [LocalizedString.EN_US]: 'Robot is touching line B' },
},
name: { [LocalizedString.EN_US]: 'Robot Touching Line B' },
description: { [LocalizedString.EN_US]: 'Robot is touching line B' },
},

},
success: {
exprs: {


//Upright Events
// Upright Events
can1Upright: {
type: Expr.Type.Event,
eventId: 'can1Upright',
Expand All @@ -52,7 +51,7 @@ export default {
argId: 'can1Upright',
},

//Line B Event
// Line B Event
robotTouchingLine: {
type: Expr.Type.Event,
eventId: 'robotTouchingLine',
Expand All @@ -62,13 +61,13 @@ export default {
argId: 'robotTouchingLine',
},

//Can 1 Not Upright and Robot Not Touching Line B
// Can 1 Not Upright and Robot Not Touching Line B
NotUprightNotTouching: {
type: Expr.Type.And,
argIds: ['can1NotUpright', 'robotNotTouchingLine'],
},

//Start Box Events
// Start Box Events
leaveStartBox: {
type: Expr.Type.Event,
eventId: 'leaveStartBox',
Expand Down
4 changes: 2 additions & 2 deletions src/simulator/definitions/challenges/jbc12.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default {
},
success: {
exprs: {
//Upright Events
// Upright Events
can2Upright: {
type: Expr.Type.Event,
eventId: "can2Upright",
Expand All @@ -67,7 +67,7 @@ export default {
},


//Intersects Events
// Intersects Events
can2Intersects: {
type: Expr.Type.Event,
eventId: "can2Intersects",
Expand Down
5 changes: 2 additions & 3 deletions src/simulator/definitions/challenges/jbc13.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand Down Expand Up @@ -95,7 +94,7 @@ export default {
argIds: ['can2Intersects', 'can5Intersects', 'can8Intersects','can10Intersects', 'can11Intersects'],
},

//Upright Events
// Upright Events
can2Upright: {
type: Expr.Type.Event,
eventId: 'can2Upright',
Expand Down Expand Up @@ -123,7 +122,7 @@ export default {
},


//Success Logic = Can A upright, intersects and touched
// Success Logic = Can A upright, intersects and touched
completion: {
type: Expr.Type.And,
argIds: [
Expand Down
3 changes: 1 addition & 2 deletions src/simulator/definitions/challenges/jbc15b.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand Down Expand Up @@ -45,7 +44,7 @@ export default {
},
success: {
exprs: {
//Ream Touching Events
// Ream Touching Events
driveForwardTouch: {
type: Expr.Type.Event,
eventId: 'driveForwardTouch',
Expand Down
3 changes: 1 addition & 2 deletions src/simulator/definitions/challenges/jbc17.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand All @@ -31,7 +30,7 @@ export default {
},
success: {
exprs: {
//Line Following Event
// Line Following Event
lineFollow: {
type: Expr.Type.Event,
eventId: 'lineFollow',
Expand Down
3 changes: 1 addition & 2 deletions src/simulator/definitions/challenges/jbc17b.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand All @@ -31,7 +30,7 @@ export default {
},
success: {
exprs: {
//Line Following Event
// Line Following Event
lineFollow: {
type: Expr.Type.Event,
eventId: 'lineFollow',
Expand Down
7 changes: 3 additions & 4 deletions src/simulator/definitions/challenges/jbc19.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: 'kipr',
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand Down Expand Up @@ -60,7 +59,7 @@ export default {
},
success: {
exprs: {
//Rescued upright can events
// Rescued upright can events
can1Upright: {
type: Expr.Type.Event,
eventId: 'can1Upright',
Expand All @@ -86,7 +85,7 @@ export default {
argId: 'can3Upright',
},

//Rescued intersecting can events
// Rescued intersecting can events
can1Intersects: {
type: Expr.Type.Event,
eventId: 'can1Intersects',
Expand All @@ -112,7 +111,7 @@ export default {
argId: 'can3Intersects',
},

//Intersecting and Upright
// Intersecting and Upright
IntersectingUpright1: {
type: Expr.Type.And,
argIds: ['can1UprightOnce','can1IntersectsOnce'],
Expand Down
11 changes: 5 additions & 6 deletions src/simulator/definitions/challenges/jbc2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default {
author: {
type: Author.Type.Organization,
id: "kipr",
//COMME
},
code: {
'c': ProgrammingLanguage.DEFAULT_CODE.c,
Expand Down Expand Up @@ -77,7 +76,7 @@ export default {
argId: "can6Touched",
},

//Passing side events
// Passing side events
rightSide: {
type: Expr.Type.Event,
eventId: "rightSide",
Expand Down Expand Up @@ -109,13 +108,13 @@ export default {
eventId: "can6Intersects",
},

//Upright Events
// Upright Events
can6Upright: {
type: Expr.Type.Event,
eventId: "can6Upright",
},

//Start Box Events
// Start Box Events
leaveStartBox: {
type: Expr.Type.Event,
eventId: "leaveStartBox",
Expand All @@ -138,13 +137,13 @@ export default {
argIds: ["leaveStartBoxOnce", "returnStartBoxOnce"],
},

//Intersects and upright logic
// Intersects and upright logic
IntersectsUpright: {
type: Expr.Type.And,
argIds: ["can6Intersects", "can6Upright"],
},

//Success Logic = Can A upright, intersects and touched
// Success Logic = Can A upright, intersects and touched
completion: {
type: Expr.Type.And,
argIds: [
Expand Down
Loading

0 comments on commit 1770901

Please sign in to comment.