fixed error with negative region offset

Author: kunesj

dwarftest_transformer.py

@@ -107,21 +107,30 @@ def df2mt_pos(self, region_pos, tile_pos):
         return mt_pos
 
     def mt2mt_block_pos(self, mt_pos):
-        mt_block_pos = (
+        mt_block_pos = [
             int(mt_pos[0] / self.MT_BLOCK_NODE_SIZE[0]),
             int(mt_pos[1] / self.MT_BLOCK_NODE_SIZE[1]),
             int(mt_pos[2] / self.MT_BLOCK_NODE_SIZE[2]),
-        )
-        mt_block_node_pos = (
+        ]
+
+        mt_block_node_pos = [
             int(mt_pos[0] - mt_block_pos[0] * self.MT_BLOCK_NODE_SIZE[0]),
             int(mt_pos[1] - mt_block_pos[1] * self.MT_BLOCK_NODE_SIZE[1]),
             int(mt_pos[2] - mt_block_pos[2] * self.MT_BLOCK_NODE_SIZE[2]),
-        )
+        ]
+
+        if mt_block_node_pos[0] < 0:
+            mt_block_node_pos[0] = mt_block_node_pos[0] + self.MT_BLOCK_NODE_SIZE[0]
+        if mt_block_node_pos[1] < 0:
+            mt_block_node_pos[1] = mt_block_node_pos[1] + self.MT_BLOCK_NODE_SIZE[1]
+        if mt_block_node_pos[2] < 0:
+            mt_block_node_pos[2] = mt_block_node_pos[2] + self.MT_BLOCK_NODE_SIZE[2]
+
         mt_block_node_index = mt_block_node_pos[0] + \
             (mt_block_node_pos[1] * self.MT_BLOCK_NODE_SIZE[1]) + \
             (mt_block_node_pos[2] * self.MT_BLOCK_NODE_SIZE[0]*self.MT_BLOCK_NODE_SIZE[1])
 
-        return mt_block_pos, mt_block_node_pos, mt_block_node_index
+        return tuple(mt_block_pos), tuple(mt_block_node_pos), mt_block_node_index
 
     # block manipulation
 
@@ -146,7 +155,8 @@ def set_mt_node(self, mt_pos, val):
 
         # detect out of range
         if mt_block_node_index >= self.mt_blocks[mt_block_pos].size or mt_block_node_index < 0:
-            raise Exception('Node index {} is out of range!'.format(mt_block_node_index))
+            raise Exception('Node index {} is out of range! [mt_pos={}, mt_block_pos={}, mt_block_node_pos={}]'.format(
+                mt_block_node_index, mt_pos, mt_block_pos, mt_block_node_pos))
 
         # set node value
         self.mt_blocks[mt_block_pos][mt_block_node_index] = val

main.py

@@ -15,7 +15,7 @@
 from dfhack_rpc import DFHackRPC
 
 
-def main():  # TODO: map is flopped on X axis!!!
+def main():  # TODO: map is flipped on X axis!!!
     parser = argparse.ArgumentParser(
         description='Dwarftest'
     )
@@ -39,6 +39,10 @@ def main():  # TODO: map is flopped on X axis!!!
         '--skip_block_build',
         action='store_true',
     )
+    parser.add_argument(
+        '--additional_tile_z_offset',
+        type=int, default=37
+    )
     parser.add_argument(
         '--path',
         default='./build',
@@ -127,15 +131,17 @@ def main():  # TODO: map is flopped on X axis!!!
 
     # Init Minetest world and block transformer
 
-    print('Init of Minetest world and block transformer..')
+    print('Init of Minetest world and Dwarftest transformer..')
+
+    df_region_offset = (world_map.center_x, world_map.center_y, world_map.center_z + args.additional_tile_z_offset)
+    print('df_region_offset = {}'.format(df_region_offset))
+
+    complex_block_scale = {'tile_x': 2, 'tile_y': 2, 'tile_z_floor': 1, 'tile_z_wall': 2}
+    print('complex_block_scale = {}'.format(complex_block_scale))
 
     path_world = os.path.join(path_worlds, world_name)
     mw = MinetestWorld(path_world, allow_overwrite=True)
-    dt = DwarftestTransformer(
-        mw,
-        df_region_offset=(world_map.center_x, world_map.center_y, world_map.center_z),
-        complex_block_scale={'tile_x': 2, 'tile_y': 2, 'tile_z_floor': 1, 'tile_z_wall': 2}
-    )
+    dt = DwarftestTransformer(mw, df_region_offset=df_region_offset, complex_block_scale=complex_block_scale)
 
     print('-------------------------------------------')
 
@@ -214,7 +220,7 @@ def main():  # TODO: map is flopped on X axis!!!
 
         dt.dump_mt_blocks()
 
-    print('-------------------------------------------')
+        print('-------------------------------------------')
 
     # save world + close connection
 

minetest_world.py

@@ -97,30 +97,50 @@ def close_sql_connections(self):
     # Init world files
 
     def init_auth_txt(self):
-        with open(os.path.join(self.path, 'auth.txt'), 'w') as f:
+        path = os.path.join(self.path, 'auth.txt')
+        if os.path.exists(path):
+            return
+
+        with open(path, 'w') as f:
             f.write(
                 'singleplayer::server, shout, fly, password, bring, kick, teleport, ban, noclip, debug, '
                 'privs, fast, basic_privs, zoom, give, protection_bypass, rollback, settime, interact\n'
             )
 
     def init_env_meta_txt(self):
-        with open(os.path.join(self.path, 'env_meta.txt'), 'w') as f:
+        path = os.path.join(self.path, 'env_meta.txt')
+        if os.path.exists(path):
+            return
+
+        with open(path, 'w') as f:
             f.write(
                 'game_time = 12000\n'
                 'time_of_day = 12000\n'
                 'EnvArgsEnd\n'
             )
 
     def init_ipban_txt(self):
-        with open(os.path.join(self.path, 'ipban.txt'), 'w') as f:
+        path = os.path.join(self.path, 'ipban.txt')
+        if os.path.exists(path):
+            return
+
+        with open(path, 'w') as f:
             f.write('\n')
 
     def init_map_meta_txt(self):
-        with open(os.path.join(self.path, 'map_meta.txt'), 'w') as f:
+        path = os.path.join(self.path, 'map_meta.txt')
+        if os.path.exists(path):
+            return
+
+        with open(path, 'w') as f:
             f.write('[end_of_params]\n')
 
     def init_world_mt(self):
-        with open(os.path.join(self.path, 'world.mt'), 'w') as f:
+        path = os.path.join(self.path, 'world.mt')
+        if os.path.exists(path):
+            return
+
+        with open(path, 'w') as f:
             f.write(
                 'gameid = {}\n'
                 'creative_mode = true\n'
@@ -195,7 +215,6 @@ def build_map_block(self, nodes):
 
         # zlib-compressed node data
 
-
         num_name_id_mappings = {}
         for n in nodes:
             if n['content_id'] not in num_name_id_mappings: