applied stat generation functions to all stats

app.py

@@ -32,6 +32,7 @@ hp = ''
 smash = ''
 pref_traits = ''
 ick_traits = ''
+speed = ''
 
     
 
@@ -42,20 +43,6 @@ def char_description(prompt):
     output1 = pipe(prompt1, return_full_text=False, max_new_tokens=256)
     prompt2 = f"{BACK_SYSTEM_PROMPT}\n\n{output1}\n\nUser prompt: {prompt}\n\nDescribe:"
     output2 = pipe(prompt2, return_full_text=False, max_new_tokens=256)
-    global ac
-    ac = random.randint(2,14)
-    global hp
-    hp = constitution + random.randint(1,6)
-    global smash
-    smash = random.randint(1,30)
-    input_file = open('traits.txt', 'r')
-    traits = input_file.readline()
-    global pref_traits
-    picks = int(random.randint(1,3))
-    pref_traits = random.choice(traits, k=picks)
-    global ick_traits
-    picks = int(random.randint(1,3))
-    ick_traits = random.choice(traits, k=picks)
     return output1[0]["generated_text"].strip(),output2[0]["generated_text"].strip()
 
 @spaces.GPU
@@ -84,6 +71,27 @@ def stats_gen():
     charisma = random.randint(2,12)
     return strength, dexterity, constitution, intelligence, wisdom, charisma
 
+def stats_gen_2():
+    global ac
+    ac = random.randint(2,14)
+    global hp
+    hp = constitution + random.randint(1,6)
+    global speed
+    speed = '25 ft'
+    return ac, hp, speed
+
+def bard_stats_gen():
+    global smash
+    smash = random.randint(1,30)
+    input_file = open('traits.txt', 'r')
+    traits = input_file.readline()
+    global pref_traits
+    picks = int(random.randint(1,3))
+    pref_traits = random.choice(traits, k=picks)
+    global ick_traits
+    picks = int(random.randint(1,3))
+    ick_traits = random.choice(traits, k=picks)
+    return smash, pref_traits, ick_traits
 
 ##UI is fine as-is
 with gr.Blocks() as demo:
@@ -98,7 +106,7 @@ with gr.Blocks() as demo:
             btn = gr.Button("Generate") 
             rand = gr.Button("Random")       
 
-    with gr.Row(equal_height=True):
+    with gr.Row():
 
         with gr.Column(scale = 0):
             stre_box = gr.Textbox(value = strength, label = "Strength", interactive = False)
@@ -108,18 +116,21 @@ with gr.Blocks() as demo:
             wis_box = gr.Textbox(value = wisdom, label = "Wisdom", interactive = False)
             char_box = gr.Textbox(value = charisma, label = "Charisma", interactive = False)
             btn.click(fn = stats_gen, outputs = [stre_box, dex_box, con_box, intl_box, wis_box, char_box])
+            rand.click(fn = stats_gen, outputs = [stre_box, dex_box, con_box, intl_box, wis_box, char_box])
 
         with gr.Column(scale = 2):
             text_out1 = gr.Textbox(label = "Description")
             text_out2 = gr.Textbox(label = "Backstory")
             btn.click(fn = char_description,inputs = text_in, outputs = [text_out1, text_out2])
-            rand.click(fn = rand_char_description,inputs = None, outputs = [text_out1, text_out2])
+            rand.click(fn = rand_char_description, outputs = [text_out1, text_out2])
 
 
         with gr.Column(scale = 0):
             ac_box = gr.Textbox(value = ac, label = "AC", interactive = False)
             hp_box = gr.Textbox(value = hp, label = "HP", interactive = False)
             speed_box = gr.Textbox(value = "25 ft", label = "Speed", interactive = False)
+            btn.click(fn = stats_gen_2, outputs = [ac_box, hp_box, speed_box])
+            rand.click(fn = stats_gen_2, outputs = [ac_box, hp_box, speed_box])
         
     
     with gr.Row():
@@ -129,6 +140,8 @@ with gr.Blocks() as demo:
                 dcs = gr.Textbox(value = smash, label = "DC to Smash")
                 prefs = gr.Textbox(value = pref_traits, label = "Advantage if:")
                 icks = gr.Textbox(value = ick_traits, label = "Disdvantage if:")
+                btn.click(fn = bard_stats_gen, outputs = [dcs, prefs, icks])
+                rand.click(fn = bard_stats_gen, outputs = [dcs, prefs, icks])