first version of scramble

app.py

@@ -32,109 +32,40 @@ for word in lexicon:
 print(len(filtered_lexicon))
 
 
-def create_hangman_clue(word, guessed_letters):
+def scrambler_game(current_word, guess: str):
     """
-    Given a word and a list of letters, create the correct clue. 
-    
-    For instance, if the word is 'apple' and the guessed letters are 'a' and 'l', the clue should be 'a _ _ l _'
-    """
-    clue = ''
-    for letter in word:
-        if letter in guessed_letters:
-            clue += letter + ' '
-        else:
-            clue += '_ '
-    return clue
-    
-def free_hint(current_state):
+    If `guess` is the correct word, return 'Correct' and pick a new word. Otherwise, return 'Incorrect'
+    Returns (correct_label, scrambled_word, current_word)
     """
-    Give user a free hint by filling in one randomly-selected letter.
-    """
-    word = current_state['word']
-    guessed_letters = current_state['guessed_letters']
-    
-    hint = random.choice(word)
-    while hint in guessed_letters:
-        hint = random.choice(word)
-        
-    guessed_letters.add(hint)
-    clue = create_hangman_clue(word, guessed_letters)
-    return clue
-      
-    
-def pick_new_word(lexicon):
-    lexicon = list(lexicon)
-    
-    return {
-        'word': random.choice(lexicon),
-        'guessed_letters': set(),
-        'remaining_chances': 6
-    }
-
-
-def hangman_game(current_state, guess):
-    """Update the current state based on the guess."""
-    guess = guess.lower()
-    
-    
-    if guess in current_state['guessed_letters'] or len(guess) > 1:
-        # Illegal guess, do nothing
-        return (current_state, 'Already guessed!')
-    
-    current_state['guessed_letters'].add(guess)
-    
-    if guess not in current_state['word']:
-        # Wrong guess
-        current_state['remaining_chances'] -= 1
-        
-        if current_state['remaining_chances'] == 0:
-            old_word = current_state['word']
-            # No more chances! New word
-            current_state = pick_new_word(filtered_lexicon)
-            return (current_state, 'Out of guesses! The word is: '+old_word)
-        else:
-            return (current_state, 'Wrong guess :(')
-        
+    if guess == current_word['original']:
+        current_word = random_scramble(filtered_lexicon)
+        return ('Correct', current_word['shuffled'], current_word)
     else:
-        
-        # Right guess, check if there's any letters left
-        for letter in current_state['word']:
-            if letter not in current_state['guessed_letters']:
-                # Still letters remaining
-                return (current_state, 'Correct guess!')
-        
-        # If we made it here, there's no letters left.
-        current_state = pick_new_word(filtered_lexicon)
-        return (current_state, 'You win!')
+        return ('Incorrect', current_word['shuffled'], current_word)
     
 
-def state_changed(current_state):
-    clue = create_hangman_clue(current_state['word'], current_state['guessed_letters'])
-    guessed_letters = current_state['guessed_letters']
-    remaining_chances = current_state['remaining_chances']
-    return (clue, guessed_letters, remaining_chances)
-
-
-with gr.Blocks(theme=gr.themes.Soft(), title="Mapudungun Hangman") as hangman:
-    current_word = gr.State(pick_new_word(filtered_lexicon))
+def new_word():
+    current_word = random_scramble(filtered_lexicon)
+    return ('', current_word['shuffled'], current_word)
+                
+                
+with gr.Blocks(theme=gr.themes.Soft(), title="Latin Unscramble") as unscramble:
+    # Start with some initial word
+    current_word = gr.State(random_scramble(filtered_lexicon))
     
-    gr.Markdown("# Mapudungun Hangman")
+    gr.Markdown("# Latin Unscramble")
     
-    with gr.Row():
-        current_word_textbox = gr.Textbox(label="Clue", interactive=False, value=create_hangman_clue(current_word.value['word'], current_word.value['guessed_letters']))
-        guessed_letters_textbox = gr.Textbox(label="Guessed letters", interactive=False)
-        remaining_chances_textbox = gr.Textbox(label="Remaining chances", interactive=False, value=6)
+    # Notice how we set the initial value based on the State
+    scrambled_textbox = gr.Textbox(label="Scrambled", interactive=False, value=current_word.value['shuffled'])
     
     guess_textbox = gr.Textbox(label="Guess")
     guess_button = gr.Button(value="Submit")
-    hint_button = gr.Button(value="Click here for a free hint")
+    
+    new_word_button = gr.Button(value="New Word")
     
     output_textbox = gr.Textbox(label="Result", interactive=False)
-    #hints_textbox = gr.Textbox(label="Would you like a hint?", interactive=False)
-
     
-    guess_button.click(fn=hangman_game, inputs=[current_word, guess_textbox], outputs=[current_word, output_textbox])\
-                .then(fn=state_changed, inputs=[current_word], outputs=[current_word_textbox, guessed_letters_textbox, remaining_chances_textbox])
-    hint_button.click(fn=free_hint, inputs=[current_word], outputs=[current_word_textbox])
+    guess_button.click(fn=scrambler_game, inputs=[current_word, guess_textbox], outputs=[output_textbox, scrambled_textbox, current_word])
+    new_word_button.click(fn=new_word, inputs=[], outputs=[output_textbox, scrambled_textbox, current_word])
     
-hangman.launch(share=True)
+unscramble.launch(share=True)