-
Notifications
You must be signed in to change notification settings - Fork 0
Development #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
xerxesman
wants to merge
9
commits into
master
Choose a base branch
from
development
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Development #1
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
04bf26e
addition class has own radius just as other enemy derived classes
b3c919b
moved solution and problem variables to superclass from subclasses
d31e4fd
added radius variable to subtraction class
xerxesman 0983ca6
removed unnecessary super variables from subtraction
xerxesman 1fc675b
simplified string compilation for String problem;
xerxesman d68f7e3
brought multiplication class up to speed with the other classes
xerxesman 6106793
moved methods getproblem & getsolution to parent class
xerxesman 72c7229
removed methods relevant to mouse usage. dead code.
xerxesman ae23909
added a worthless variable
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,24 +1,13 @@ | ||
| public class Addition extends Enemy | ||
| { | ||
| protected String problem; | ||
| protected int solution; | ||
|
|
||
| public Addition() | ||
| { | ||
| super(.6); | ||
| int n1 = (int)(Math.random()*9)+1; | ||
| int n2 = (int)(Math.random()*9)+1; | ||
| solution = n1+n2; | ||
| problem = ""+n1+"+"+n2; | ||
| } | ||
|
|
||
| public String getProblem() | ||
| { | ||
| return problem; | ||
| } | ||
|
|
||
| public int getSolution() | ||
| { | ||
| return solution; | ||
| problem = n1+"+"+n2; | ||
| radius = 5; | ||
| int x7=72; | ||
| } | ||
| } | ||
This file contains hidden or 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,25 +1,12 @@ | ||
| public class BigAddition extends Enemy | ||
| { | ||
| protected String problem; | ||
| protected int solution; | ||
|
|
||
| public BigAddition() | ||
| { | ||
| super(.3); | ||
| int n1 = (int)(Math.random()*90)+10; | ||
| int n2 = (int)(Math.random()*90)+10; | ||
| solution = n1+n2; | ||
| problem = ""+n1+"+"+n2; | ||
| problem = n1+"+"+n2; | ||
| radius = 15; | ||
| } | ||
|
|
||
| public String getProblem() | ||
| { | ||
| return problem; | ||
| } | ||
|
|
||
| public int getSolution() | ||
| { | ||
| return solution; | ||
| } | ||
| } |
This file contains hidden or 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,25 +1,12 @@ | ||
| public class BigMultiplication extends Enemy | ||
| { | ||
| protected String problem; | ||
| protected int solution; | ||
|
|
||
| public BigMultiplication() | ||
| { | ||
| super(.05); | ||
| int n1 = (int)(Math.random()*90)+10; | ||
| int n2 = (int)(Math.random()*90)+10; | ||
| solution = n1*n2; | ||
| problem = ""+n1+"*"+n2; | ||
| problem = n1+"*"+n2; | ||
| radius = 20; | ||
| } | ||
|
|
||
| public String getProblem() | ||
| { | ||
| return problem; | ||
| } | ||
|
|
||
| public int getSolution() | ||
| { | ||
| return solution; | ||
| } | ||
| } |
This file contains hidden or 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,26 +1,13 @@ | ||
| public class Division extends Enemy | ||
| { | ||
| protected String problem; | ||
| protected int solution; | ||
|
|
||
| public Division() | ||
| { | ||
| super(.3); | ||
| int n1 = (int)(Math.random()*9)+1; | ||
| int n2 = (int)(Math.random()*9)+1; | ||
| solution = n1; | ||
| problem = ""+(n1*n2)+"/"+n2; | ||
| problem = n1+"/"+n2; | ||
| radius = 8; | ||
| color = java.awt.Color.RED; | ||
| } | ||
|
|
||
| public String getProblem() | ||
| { | ||
| return problem; | ||
| } | ||
|
|
||
| public int getSolution() | ||
| { | ||
| return solution; | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,25 +1,12 @@ | ||
| public class Multiplication extends Enemy | ||
| { | ||
| protected String problem; | ||
| protected int solution; | ||
|
|
||
| public Multiplication() | ||
| { | ||
| super(.4); | ||
| int n1 = (int)(Math.random()*9)+1; | ||
| int n2 = (int)(Math.random()*9)+1; | ||
| solution = n1*n2; | ||
| problem = ""+n1+"*"+n2; | ||
| problem = n1+"*"+n2; | ||
| radius = 8; | ||
| } | ||
|
|
||
| public String getProblem() | ||
| { | ||
| return problem; | ||
| } | ||
|
|
||
| public int getSolution() | ||
| { | ||
| return solution; | ||
| } | ||
| } |
This file contains hidden or 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,25 +1,13 @@ | ||
| public class Subtraction extends Enemy | ||
| { | ||
| protected String problem; | ||
| protected int solution; | ||
|
|
||
| public Subtraction() | ||
| { | ||
| super(.4); | ||
| int n1 = (int)(Math.random()*9)+1; | ||
| int n2 = (int)(Math.random()*9)+1; | ||
| solution = n1; | ||
| problem = ""+(n1+n2)+"-"+n2; | ||
| problem = n1+"-"+n2; | ||
| color = java.awt.Color.RED; | ||
| } | ||
|
|
||
| public String getProblem() | ||
| { | ||
| return problem; | ||
| } | ||
|
|
||
| public int getSolution() | ||
| { | ||
| return solution; | ||
| radius = 5; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a good change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually its garbage
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ha i hate myself