Pushing back what Cutieguwu pushed
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# @Script: CutieParser.py
|
# @Script: CutieParser.py
|
||||||
# @Date Created: 10 Apr, 2024
|
# @Date Created: 10 Apr, 2024
|
||||||
# @Last Modified: 15 Apr, 2024
|
# @Last Modified: 11 Apr, 2024
|
||||||
# @Last Modified by: Cutieguwu | Olivia Brooks
|
# @Last Modified by: Cutieguwu | Olivia Brooks
|
||||||
|
|
||||||
# ----------------------------------------------------------
|
# ----------------------------------------------------------
|
||||||
@@ -20,7 +20,6 @@
|
|||||||
#
|
#
|
||||||
# ----------------------------------------------------------
|
# ----------------------------------------------------------
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
from os import path
|
from os import path
|
||||||
|
|
||||||
execDir = path.dirname(__file__)
|
execDir = path.dirname(__file__)
|
||||||
@@ -30,9 +29,6 @@ dataEncoded = []
|
|||||||
|
|
||||||
print ("Start")
|
print ("Start")
|
||||||
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
def parse(dataReference, dataEncoded):
|
def parse(dataReference, dataEncoded):
|
||||||
return order(dataReference), order(dataEncoded)
|
return order(dataReference), order(dataEncoded)
|
||||||
|
|
||||||
@@ -52,7 +48,6 @@ with open(execDir + "\\dataReference.txt", "r") as f:
|
|||||||
if dataLanguageChar.lower() not in dataLanguage:
|
if dataLanguageChar.lower() not in dataLanguage:
|
||||||
dataLanguage.append(dataLanguageChar.lower())
|
dataLanguage.append(dataLanguageChar.lower())
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
if dataLanguageChar == "~":
|
if dataLanguageChar == "~":
|
||||||
print (dataLanguage)
|
print (dataLanguage)
|
||||||
break
|
break
|
||||||
@@ -69,11 +64,4 @@ with open(execDir + "\\dataEncoded19.ENC", "r") as f:
|
|||||||
print (dataEncoded)
|
print (dataEncoded)
|
||||||
break
|
break
|
||||||
|
|
||||||
parse(dataLanguageChar, dataEncodedChar)
|
parse(dataLanguageChar, dataEncodedChar)
|
||||||
=======
|
|
||||||
parse(dataLanguage, dataEncoded)
|
|
||||||
=======
|
|
||||||
with open("dataReference.txt", "r") as f:
|
|
||||||
data = f.read()
|
|
||||||
>>>>>>> origin/Decryption-script
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
Reference in New Issue
Block a user