Skip to content

Commit

Permalink
bug fix for get_word_path function inside linconym module
Browse files Browse the repository at this point in the history
  • Loading branch information
@LupaDevStudio
LupaDevStudio committed Feb 13, 2024
1 parent 5d511e0 commit 358b0c5
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 31 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

# Ignore the reports folder
reports
report.html

# Ignore screenshots
screenshot*
Expand Down
76 changes: 45 additions & 31 deletions tools/linconym.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,10 @@ def __init__(self, start_word: str, end_word: str, quest_word: str = None, act_n
self.quest_word: str = quest_word
self.act_name = act_name
self.lvl_name = lvl_name
self.current_position: str = "0" # Positions are strings of comma-separated integers which indicate a path in the nodes
self.position_to_word_id = {self.current_position: 0} # A dictionary to map a (str) position to the index of its word in the words_found list[str]
# Positions are strings of comma-separated integers which indicate a path in the nodes
self.current_position: str = "0"
# A dictionary to map a (str) position to the index of its word in the words_found list[str]
self.position_to_word_id = {self.current_position: 0}
self.words_found: list[str] = [start_word]
self.current_word: str = start_word

Expand All @@ -328,7 +330,7 @@ def get_word(self, position: str) -> str:
"""

return self.words_found[self.position_to_word_id[position]]

def get_word_path(self, position: str) -> list[str]:
"""
Get a list of the words forming the path to the given position.
Expand All @@ -345,8 +347,12 @@ def get_word_path(self, position: str) -> list[str]:
"""

word_path: list[str] = []
for i in range(len(position)):
previous_pos: str = position[:(i+1)]
splitted_position = position.split(",")
for i in range(len(splitted_position)):
splitted_previous_pos: str = splitted_position[:(i + 1)]
previous_pos = splitted_previous_pos[0]
for j in range(1, len(splitted_previous_pos)):
previous_pos += "," + splitted_previous_pos[j]
word_path += [self.get_word(previous_pos)]
return word_path

Expand Down Expand Up @@ -389,7 +395,7 @@ def change_position(self, new_position: str) -> None:

self.current_position = new_position
self.current_word = self.get_word(self.current_position)

def is_valid_and_new_in_path(self, new_word: str, skip_dictionary_check: bool = False) -> bool:
"""
Checks whether a new word is absent from the path leading to the current word and is a valid successor to the current word.
Expand All @@ -407,8 +413,10 @@ def is_valid_and_new_in_path(self, new_word: str, skip_dictionary_check: bool =
True if new_word isn't in the path leading to the current word and is valid, False otherwise.
"""

word_is_valid: bool = is_valid(new_word, self.current_word, skip_dictionary_check)
word_is_new_in_path: bool = not(new_word in self.get_word_path(self.current_position))
word_is_valid: bool = is_valid(
new_word, self.current_word, skip_dictionary_check)
word_is_new_in_path: bool = not (
new_word in self.get_word_path(self.current_position))
return word_is_valid and word_is_new_in_path

def submit_word(self, new_word: str) -> None:
Expand Down Expand Up @@ -440,39 +448,41 @@ def submit_word(self, new_word: str) -> None:

else:
print("Word not valid")

def award_stars_xp(self, solution_10k_exists: bool, nb_words_10k: int, nb_words_300k: int) -> None:
# Only receive stars and xp if the level was completed
if (self.current_word == self.end_word):
solution_found: list[str] = self.get_word_path(self.current_position)
solution_found: list[str] = self.get_word_path(
self.current_position)

# Stars
nb_stars: int = 1 # first star is awarded for finishing the level
nb_stars: int = 1 # first star is awarded for finishing the level
nb_words_found: int = len(solution_found)
if (solution_10k_exists): # easy levels have a solution in the 10k dictionary
if (nb_words_found >= (1.25)*nb_words_10k):
nb_stars += 1 # second star for doing as well as the 10k dictionary + 25%
if (solution_10k_exists): # easy levels have a solution in the 10k dictionary
if (nb_words_found >= (1.25) * nb_words_10k):
nb_stars += 1 # second star for doing as well as the 10k dictionary + 25%
if (nb_words_found >= nb_words_10k):
nb_stars += 1 # third star for doing as well as the 10k dictionary
else: # harder levels don't have a solution in the 10k dictionary, and their stars are defined differently
if (nb_words_found >= (1.30)*nb_words_300k):
nb_stars += 1 # second star for doing as well as the 300k dictionary + 30%
if (nb_words_found >= (1.10)*nb_words_300k):
nb_stars += 1 # third star for doing as well as the 300k dictionary + 10%
nb_stars += 1 # third star for doing as well as the 10k dictionary
else: # harder levels don't have a solution in the 10k dictionary, and their stars are defined differently
if (nb_words_found >= (1.30) * nb_words_300k):
nb_stars += 1 # second star for doing as well as the 300k dictionary + 30%
if (nb_words_found >= (1.10) * nb_words_300k):
nb_stars += 1 # third star for doing as well as the 300k dictionary + 10%

# xp: get a percentage of a certain constant amount depending on proximity to the 300k dictionary solution...
xp_fraction: float = nb_words_300k / nb_words_found
if (xp_fraction > 1):
xp_fraction = 1.0
# ... and get a bonus for passing through the quest word
quest_word_done: bool = ((self.quest_word != None) and (self.quest_word in solution_found))
quest_word_done: bool = ((self.quest_word != None) and (
self.quest_word in solution_found))

### save level progress (TEMP: only for classic mode, should probably make subclasses for classic and daily mode)
# save level progress (TEMP: only for classic mode, should probably make subclasses for classic and daily mode)
# check that the current act has save data
if (not(self.act_name in USER_DATA.classic_mode)):
if (not (self.act_name in USER_DATA.classic_mode)):
USER_DATA.classic_mode[self.act_name] = {}
# check that current level has save data
if (not(self.lvl_name in USER_DATA.classic_mode[self.act_name])):
if (not (self.lvl_name in USER_DATA.classic_mode[self.act_name])):
USER_DATA.classic_mode[self.act_name][self.lvl_name] = {}
# save stars
STARS_KEY: str = "nb_stars"
Expand All @@ -485,33 +495,37 @@ def award_stars_xp(self, solution_10k_exists: bool, nb_words_10k: int, nb_words_
NB_WORDS_KEY: str = "best_solution_nb_words"
nb_words_previous_best: int = 0
if (NB_WORDS_KEY in USER_DATA.classic_mode[self.act_name][self.lvl_name]):
nb_words_previous_best = USER_DATA.classic_mode[self.act_name][self.lvl_name][NB_WORDS_KEY]
nb_words_previous_best = USER_DATA.classic_mode[
self.act_name][self.lvl_name][NB_WORDS_KEY]
if (nb_words_previous_best < nb_words_found):
USER_DATA.classic_mode[self.act_name][self.lvl_name][NB_WORDS_KEY] = nb_words_found
else:
USER_DATA.classic_mode[self.act_name][self.lvl_name][NB_WORDS_KEY] = nb_words_found
previous_xp_fraction: float = 0.0
if (nb_words_previous_best > 0):
previous_xp_fraction = nb_words_300k / nb_words_previous_best
previous_xp_fraction = nb_words_300k / nb_words_previous_best
# save quest word
QUEST_WORD_KEY: str = "quest_word_done"
award_quest_word_xp: bool = False
if (QUEST_WORD_KEY in USER_DATA.classic_mode[self.act_name][self.lvl_name]):
award_quest_word_xp = not(USER_DATA.classic_mode[self.act_name][self.lvl_name][QUEST_WORD_KEY]) and quest_word_done
USER_DATA.classic_mode[self.act_name][self.lvl_name][QUEST_WORD_KEY] = USER_DATA.classic_mode[self.act_name][self.lvl_name][QUEST_WORD_KEY] or quest_word_done
award_quest_word_xp = not (
USER_DATA.classic_mode[self.act_name][self.lvl_name][QUEST_WORD_KEY]) and quest_word_done
USER_DATA.classic_mode[self.act_name][self.lvl_name][QUEST_WORD_KEY] = USER_DATA.classic_mode[
self.act_name][self.lvl_name][QUEST_WORD_KEY] or quest_word_done
else:
award_quest_word_xp = quest_word_done
USER_DATA.classic_mode[self.act_name][self.lvl_name][QUEST_WORD_KEY] = quest_word_done

# award newly acquired xp
XP_KEY: str = "experience"
USER_DATA.user_profile[XP_KEY] += int((xp_fraction - previous_xp_fraction) * XP_PER_LEVEL)
USER_DATA.user_profile[XP_KEY] += int(
(xp_fraction - previous_xp_fraction) * XP_PER_LEVEL)
if (award_quest_word_xp):
USER_DATA.user_profile[XP_KEY] += XP_PER_LEVEL

# save changes
USER_DATA.save_changes()

return


Expand Down

0 comments on commit 358b0c5

Please sign in to comment.