|
|
|
@ -21,8 +21,6 @@ importlib.reload(items) |
|
|
|
|
import data |
|
|
|
|
importlib.reload(data) |
|
|
|
|
|
|
|
|
|
BREAK_DISTANCE = 5 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class FindGappleStates: |
|
|
|
|
def idle(self): |
|
|
|
@ -339,7 +337,7 @@ class GatherSandStates: |
|
|
|
|
self.sand = check |
|
|
|
|
break |
|
|
|
|
|
|
|
|
|
if utils.phyp(p, self.sand) > BREAK_DISTANCE: |
|
|
|
|
if utils.phyp(p, self.sand) > blocks.BREAK_DISTANCE: |
|
|
|
|
self.state = self.nav_to_sand |
|
|
|
|
else: |
|
|
|
|
self.state = self.dig_sand |
|
|
|
@ -895,7 +893,7 @@ class ClearLeavesStates: |
|
|
|
|
w = self.g.world |
|
|
|
|
p = utils.pint(self.g.pos) |
|
|
|
|
|
|
|
|
|
for l in w.find_leaves(p, BREAK_DISTANCE): |
|
|
|
|
for l in w.find_leaves(p, blocks.BREAK_DISTANCE): |
|
|
|
|
self.leaves.append(l) |
|
|
|
|
|
|
|
|
|
self.state = self.break_leaves |
|
|
|
@ -1008,160 +1006,84 @@ class GrabSaplingStates: |
|
|
|
|
|
|
|
|
|
class JobStates: |
|
|
|
|
def idle(self): |
|
|
|
|
return None |
|
|
|
|
|
|
|
|
|
def cache_items(self): |
|
|
|
|
s1 = self.cache_items_states |
|
|
|
|
return [] |
|
|
|
|
|
|
|
|
|
if s1.state == s1.idle: |
|
|
|
|
s1.state = s1.init |
|
|
|
|
elif s1.state == s1.done: |
|
|
|
|
self.state = self.idle |
|
|
|
|
|
|
|
|
|
s1.run() |
|
|
|
|
|
|
|
|
|
def find_gapple(self): |
|
|
|
|
s1 = self.find_gapple_states |
|
|
|
|
def init_machines(self): |
|
|
|
|
self.gather_wood_states = GatherWoodStates(self.g) |
|
|
|
|
self.gather_sand_states = GatherSandStates(self.g) |
|
|
|
|
self.sleep_with_bed_states = SleepWithBedStates(self.g) |
|
|
|
|
self.cache_items_states = CacheItemsStates(self.g) |
|
|
|
|
self.find_gapple_states = FindGappleStates(self.g) |
|
|
|
|
self.plant_tree_states = PlantTreeStates(self.g) |
|
|
|
|
self.clear_leaves_states = ClearLeavesStates(self.g) |
|
|
|
|
self.grab_sapling_states = GrabSaplingStates(self.g) |
|
|
|
|
self.grab_sand_states = GrabSandStates(self.g) |
|
|
|
|
|
|
|
|
|
if s1.state == s1.idle: |
|
|
|
|
s1.state = s1.init |
|
|
|
|
elif s1.state == s1.done: |
|
|
|
|
s1.state = s1.tp_to_coord |
|
|
|
|
def run_machines(self, machines): |
|
|
|
|
for m in machines: |
|
|
|
|
if m.state == m.idle: |
|
|
|
|
continue |
|
|
|
|
if m.state != m.done: |
|
|
|
|
m.run() |
|
|
|
|
return |
|
|
|
|
# if we went through them all |
|
|
|
|
for m in machines: |
|
|
|
|
m.state = m.init |
|
|
|
|
|
|
|
|
|
s1.run() |
|
|
|
|
|
|
|
|
|
def gather_sand(self): |
|
|
|
|
s1 = self.gather_sand_states |
|
|
|
|
s2 = self.grab_sand_states |
|
|
|
|
s3 = self.sleep_with_bed_states |
|
|
|
|
s4 = self.cache_items_states |
|
|
|
|
|
|
|
|
|
if s1.state == s1.idle: |
|
|
|
|
s1.state = s1.init |
|
|
|
|
s2.state = s2.init |
|
|
|
|
s3.state = s3.init |
|
|
|
|
s4.state = s4.init |
|
|
|
|
elif s1.state == s1.done: |
|
|
|
|
if s2.state != s2.done: |
|
|
|
|
s2.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
if s3.state != s3.done: |
|
|
|
|
s3.run() |
|
|
|
|
return |
|
|
|
|
machines = [ |
|
|
|
|
self.gather_sand_states, |
|
|
|
|
self.grab_sand_states, |
|
|
|
|
self.cache_items_states, |
|
|
|
|
self.sleep_with_bed_states, |
|
|
|
|
] |
|
|
|
|
return machines |
|
|
|
|
|
|
|
|
|
if s4.state != s4.done: |
|
|
|
|
s4.run() |
|
|
|
|
return |
|
|
|
|
def cache_items(self): |
|
|
|
|
machines = [ |
|
|
|
|
self.cache_items_states, |
|
|
|
|
] |
|
|
|
|
return machines |
|
|
|
|
|
|
|
|
|
s1.state = s1.init |
|
|
|
|
s2.state = s2.init |
|
|
|
|
s3.state = s3.init |
|
|
|
|
s4.state = s4.init |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
s1.run() |
|
|
|
|
def find_gapple(self): |
|
|
|
|
machines = [ |
|
|
|
|
self.find_gapple_states, |
|
|
|
|
] |
|
|
|
|
return machines |
|
|
|
|
|
|
|
|
|
def gather_wood(self): |
|
|
|
|
s1 = self.gather_wood_states |
|
|
|
|
s2 = self.sleep_with_bed_states |
|
|
|
|
s3 = self.cache_items_states |
|
|
|
|
|
|
|
|
|
if s1.state == s1.idle: |
|
|
|
|
s1.state = s1.init |
|
|
|
|
s2.state = s2.init |
|
|
|
|
s3.state = s3.init |
|
|
|
|
elif s1.state == s1.done: |
|
|
|
|
if s2.state != s2.done: |
|
|
|
|
s2.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
if s3.state != s3.done: |
|
|
|
|
s3.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
s1.state = s1.init |
|
|
|
|
s2.state = s2.init |
|
|
|
|
s3.state = s3.init |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
s1.run() |
|
|
|
|
machines = [ |
|
|
|
|
self.gather_wood_states, |
|
|
|
|
self.sleep_with_bed_states, |
|
|
|
|
self.cache_items_states, |
|
|
|
|
] |
|
|
|
|
return machines |
|
|
|
|
|
|
|
|
|
def farm_wood(self): |
|
|
|
|
machines = [ |
|
|
|
|
self.gather_wood_states, |
|
|
|
|
self.plant_tree_states, |
|
|
|
|
self.clear_leaves_states, |
|
|
|
|
self.grab_sapling_states, |
|
|
|
|
self.sleep_with_bed_states, |
|
|
|
|
self.cache_items_states, |
|
|
|
|
] |
|
|
|
|
|
|
|
|
|
self.sleep_with_bed_states.silent = True |
|
|
|
|
self.cache_items_states.silent = True |
|
|
|
|
|
|
|
|
|
s1 = self.gather_wood_states |
|
|
|
|
s2 = self.plant_tree_states |
|
|
|
|
s3 = self.clear_leaves_states |
|
|
|
|
s4 = self.grab_sapling_states |
|
|
|
|
s5 = self.sleep_with_bed_states |
|
|
|
|
s6 = self.cache_items_states |
|
|
|
|
|
|
|
|
|
if s1.state == s1.idle: |
|
|
|
|
s1.state = s1.init |
|
|
|
|
s2.state = s2.init |
|
|
|
|
s3.state = s3.init |
|
|
|
|
s4.state = s4.init |
|
|
|
|
s5.state = s5.init |
|
|
|
|
s6.state = s6.init |
|
|
|
|
elif s1.state == s1.done: |
|
|
|
|
if s2.state != s2.done: |
|
|
|
|
s2.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
if s3.state != s3.done: |
|
|
|
|
s3.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
if s4.state != s4.done: |
|
|
|
|
s4.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
if s5.state != s5.done: |
|
|
|
|
s5.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
if s6.state != s6.done: |
|
|
|
|
s6.run() |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
s1.state = s1.init |
|
|
|
|
s2.state = s2.init |
|
|
|
|
s3.state = s3.init |
|
|
|
|
s4.state = s4.init |
|
|
|
|
s5.state = s5.init |
|
|
|
|
s6.state = s6.init |
|
|
|
|
return |
|
|
|
|
|
|
|
|
|
s1.run() |
|
|
|
|
return machines |
|
|
|
|
|
|
|
|
|
def stop(self): |
|
|
|
|
self.gather_wood_states = GatherWoodStates(self.g) |
|
|
|
|
self.gather_sand_states = GatherSandStates(self.g) |
|
|
|
|
self.sleep_with_bed_states = SleepWithBedStates(self.g) |
|
|
|
|
self.cache_items_states = CacheItemsStates(self.g) |
|
|
|
|
self.find_gapple_states = FindGappleStates(self.g) |
|
|
|
|
self.plant_tree_states = PlantTreeStates(self.g) |
|
|
|
|
self.clear_leaves_states = ClearLeavesStates(self.g) |
|
|
|
|
self.grab_sapling_states = GrabSaplingStates(self.g) |
|
|
|
|
self.grab_sand_states = GrabSandStates(self.g) |
|
|
|
|
self.init_machines() |
|
|
|
|
self.state = self.idle |
|
|
|
|
|
|
|
|
|
def __init__(self, global_state): |
|
|
|
|
self.g = global_state |
|
|
|
|
|
|
|
|
|
self.init_machines() |
|
|
|
|
self.state = self.idle |
|
|
|
|
self.prev_state = None |
|
|
|
|
self.gather_wood_states = GatherWoodStates(self.g) |
|
|
|
|
self.gather_sand_states = GatherSandStates(self.g) |
|
|
|
|
self.sleep_with_bed_states = SleepWithBedStates(self.g) |
|
|
|
|
self.cache_items_states = CacheItemsStates(self.g) |
|
|
|
|
self.find_gapple_states = FindGappleStates(self.g) |
|
|
|
|
self.plant_tree_states = PlantTreeStates(self.g) |
|
|
|
|
self.clear_leaves_states = ClearLeavesStates(self.g) |
|
|
|
|
self.grab_sapling_states = GrabSaplingStates(self.g) |
|
|
|
|
self.grab_sand_states = GrabSandStates(self.g) |
|
|
|
|
|
|
|
|
|
def tick(self): |
|
|
|
|
self.state() |
|
|
|
|
self.run_machines(self.state()) |
|
|
|
|