diff --git a/combined_user_interface.py b/combined_user_interface.py index 1a2356d..3d36aee 100644 --- a/combined_user_interface.py +++ b/combined_user_interface.py @@ -164,6 +164,10 @@ class PrimaryOverlay(threading.Thread): self.SpawnEntry.configure(state=tk.NORMAL) self.spawn_use.set('25') self.Emitter_Box.configure(state=tk.NORMAL) + self.Emitter_Box.configure(values=('multi', 'main', 'mushroom', 'amulett', 'sword', 'staff', 'wand', 'ring')) + self.EmitterLabel.configure(text="Emitter:") + self.SpawnLabel.configure(text="Spawn:") + self.EnergyLabel.configure(text="Runs:") self.emitter_use.set('multi') elif self.rb_int.get() == 2 or self.rb_int.get() == 3: self.EnergyEntry.configure(state=tk.DISABLED) @@ -172,6 +176,9 @@ class PrimaryOverlay(threading.Thread): self.spawn_use.set('') self.Emitter_Box.configure(state=tk.DISABLED) self.emitter_use.set('') + self.EmitterLabel.configure(text="") + self.SpawnLabel.configure(text="") + self.EnergyLabel.configure(text="") elif self.rb_int.get() == 4: self.EnergyEntry.configure(state=tk.DISABLED) self.energy_use.set('') @@ -179,13 +186,20 @@ class PrimaryOverlay(threading.Thread): self.spawn_use.set('100') self.Emitter_Box.configure(state=tk.DISABLED) self.emitter_use.set('') + self.EmitterLabel.configure(text="") + self.SpawnLabel.configure(text="Spawn:") + self.EnergyLabel.configure(text="") elif self.rb_int.get() == 5: self.EnergyEntry.configure(state=tk.NORMAL) self.energy_use.set('100') self.SpawnEntry.configure(state=tk.DISABLED) self.spawn_use.set('') - self.Emitter_Box.configure(state=tk.DISABLED) - self.emitter_use.set('') + self.Emitter_Box.configure(state=tk.NORMAL) + self.Emitter_Box.configure(values=('m25x1', 'm10x2', 'm5x3', 'simple', 'm1x5_T', 'm1x5_X', 'house')) + self.emitter_use.set('simple') + self.EmitterLabel.configure(text="Mode:") + self.SpawnLabel.configure(text="") + self.EnergyLabel.configure(text="Runs:") elif self.rb_int.get() == 6: self.EnergyEntry.configure(state=tk.NORMAL) self.energy_use.set('2') @@ -193,6 +207,9 @@ class PrimaryOverlay(threading.Thread): self.spawn_use.set('') self.Emitter_Box.configure(state=tk.DISABLED) self.emitter_use.set('') + self.EmitterLabel.configure(text="") + self.SpawnLabel.configure(text="") + self.EnergyLabel.configure(text="Runs:") # def get_run_mode(self): diff --git a/craft.py b/craft.py index 6a867cd..6a9b2d8 100644 --- a/craft.py +++ b/craft.py @@ -20,8 +20,8 @@ class Craft: self.overlay = overlay self.config = UserConfigs() - self.mode = str(overlay.mode_use.get()) - self.run_target = int(overlay.crafts_use.get()) + self.mode = str(overlay.emitter_use.get()) + self.run_target = int(overlay.energy_use.get()) self.run_counter = 0 self.dimension = 172