Merged
Conversation
*Moved scanArchonLocation() to RESOURCE_FUNCTIONS for semantic reasons *Made scanArchonLocation() static so it can be accessed by any inner class and any member of RESOURCE_FUNCTIONS *Changed scanArchonLocation() to return null if no Archon is found -Removed Scout.scanArchon() as its functionality is found in RESOURCE_FUNCTIONS.scanArchonLocation() [ie: if it returns null, same as returning false in the prior, if not null, same as true] +Commented RESOURCE_FUNCTIONS.scanArchonLocation()
+New, encrypted RESOURCE_FUNCTIONS.trySendMessage function
androidmage
pushed a commit
that referenced
this pull request
Jan 7, 2016
Merge pull request #10 from Soupdoop/master
androidmage
pushed a commit
that referenced
this pull request
Jan 12, 2016
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
*Moved scanArchonLocation() to RESOURCE_FUNCTIONS for semantic reasons
*Made scanArchonLocation() static so it can be accessed by any inner class and any member of RESOURCE_FUNCTIONS
*Changed scanArchonLocation() to return null if no Archon is found
-Removed Scout.scanArchon() as its functionality is found in RESOURCE_FUNCTIONS.scanArchonLocation() [ie: if it returns null, same as returning false in the prior, if not null, same as true]
-Removed 1 line of white space at bottom
+Commented RESOURCE_FUNCTIONS.scanArchonLocation()
+Added comments for new Global Variables
+Added new function: RESOURCE_FUNCTIONS.trySendMessage()
+takes 56 bits of data (over Tuple of ints), a key for encryption, and a type, and constructs the pair of ints that need to be sent to show said information. I will add decryption method very soon