diff --git a/colors - invisible.txt b/colors - invisible.txt new file mode 100644 index 0000000..d2f6bab --- /dev/null +++ b/colors - invisible.txt @@ -0,0 +1,5 @@ +tsm_mines:dummy +air +ignore +doors:hidden +compassgps:cgpsmap_wall \ No newline at end of file diff --git a/colors missing.txt b/colors missing.txt new file mode 100644 index 0000000..469546b --- /dev/null +++ b/colors missing.txt @@ -0,0 +1,50 @@ +0x0 +0x1 +0x2 +0x3 +0x4 +0x5 +0x6 +0x7 +0x8 +0x9 +0xa +0xb +0xc +0xd +0xe +0xf +0x10 +0x11 +0x12 +0x13 +0x14 +0x15 +0x16 +0x17 +0x18 +0x19 +0x1a +0x1b +0x1c +0x1d +0x1e +0x1f +0x20 +0x21 +0x22 +0x23 +0x24 +0x25 +0x26 +0x27 +0x28 +0x29 +0x2a +0x2b +0x2c +0x2d +0x2e +0x34 +0x37 + diff --git a/colors not in base git 2016-03-08.txt b/colors not in base git 2016-03-08.txt new file mode 100644 index 0000000..f73179c --- /dev/null +++ b/colors not in base git 2016-03-08.txt @@ -0,0 +1,260 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +a +b +c +d +e +f +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +1a +1b +1c +1d +1e +1f +20 +21 + +ethereal:willow_trunk +moretrees:oak_trunk +technic:mineral_lead +moretrees:apple_tree_trunk +ethereal:banana +bushes:BushLeaves1 +bushes:BushLeaves2 +flowers:dandelion_white +ethereal:bush +tsm_pyramids:deco_stone3 +tsm_pyramids:deco_stone2 +whiteshell:whiteshell +ethereal:onion_4 +ethereal:quicksand2 +bushes:youngtree2_bottom +default:stone_with_iron +moretrees:apple_tree_leaves +seacoral:seacoraldirtcyan +ethereal:gray_dirt +seacoral:seacoraldirtlime +youngtrees:youngtree_middle +vines:vine_end +seaplants:seaplantsdirtseagrassgreen +ferns:fern_trunk_big +noairblocks:water_sourcex +ethereal:mushroom_dirt +default:pine_tree +ignore +seacoral:seacoraldirtmagenta +flowers:mushroom_red +ethereal:sandy +ethereal:jungle_dirt +ethereal:mushroom +clams:dirtalgae +flowers:tulip +seacoral:seacoralsandcyan +ethereal:willow_twig +default:sandstonebrick +ferns:tree_fern_leaves_giant +ethereal:orange +moretrees:sequoia_leaves +trunks:twig_9 +trunks:twig_7 +trunks:twig_5 +seacoral:seacoraldirtskyblue +moreores:mineral_silver +ethereal:banana_trunk +moretrees:pine_cone +seacoral:coralredviolet +moretrees:acorn +vines:vine_middle +technic:marble +seacoral:seacoralsandskyblue +ferns:fern_03 +ferns:fern_02 +ferns:fern_01 +moretrees:palm_trunk +seacoral:seacoralsandmagenta +seacoral:seacoralsandlime +default:pine_needles +ferns:fern_trunk_big_top +seaplants:seaplantsdirtkelpbrown +tsm_pyramids:trap +ethereal:birch_trunk +ferns:horsetail_02 +ferns:horsetail_03 +bushes:bushbranches4 +ferns:horsetail_01 +bushes:bushbranches2 +bushes:bushbranches3 +ferns:horsetail_04 +bushes:bushbranches1 +clams:sandalgae +moretrees:oak_leaves +ethereal:mushroom_pore +ferns:tree_fern_leave_big +bakedclay:orange +seacoral:seacoraldirtaqua +moretrees:sequoia_trunk +bakedclay:red +seaplants:seaplantssandkelpgreen +stairs:stair_cobble +ethereal:snowygrass +woodsoils:dirt_with_leaves_1 +moreores:mineral_tin +flowers:seaweed +ethereal:bamboo_leaves +ethereal:palm_trunk +seacoral:seacoralsandaqua +trunks:moss +seaplants:seaplantsdirtseagrassred +default:acacia_tree +default:jungleleaves +flowers:viola +seacoral:seacoralsandredviolet +flowers:rose +ethereal:bamboo +default:stone_with_copper +moretrees:jungletree_leaves_yellow +moretrees:coconut +ethereal:palmleaves +ethereal:green_dirt +seaplants:seaplantssandseagrassgreen +trunks:twig_8 +trunks:moss_fungus +air +flowers:waterlily +ethereal:redwood_leaves +trunks:twig_10 +trunks:twig_11 +trunks:twig_12 +trunks:twig_13 +seacoral:corallime +technic:mineral_zinc +ethereal:strawberry_7 +ethereal:prairie_dirt +default:grass_1 +default:grass_3 +default:grass_2 +default:grass_5 +default:grass_4 +ethereal:coconut +ethereal:bamboo_dirt +cavestuff:desert_pebble_2 +cavestuff:desert_pebble_1 +flowers:geranium +ethereal:bananaleaves +moretrees:jungletree_trunk +flowers:mushroom_brown +bakedclay:grey +default:acacia_leaves +youngtrees:youngtree_bottom +ferns:tree_fern_leave_big_end +lapis:pyrite_ore +flowers:dandelion_yellow +flowers:seaweed_2 +flowers:seaweed_3 +flowers:seaweed_4 +ethereal:orange_leaves +tsm_mines:dummy +moretrees:jungletree_leaves_red +seaplants:seaplantsdirtkelpgreen +ethereal:grove_dirt +tsm_pyramids:spawner_mummy +ethereal:mushroom_trunk +ethereal:fern +ethereal:birch_leaves +moretrees:palm_leaves +seacoral:coralcyan +ethereal:redwood_trunk +seaplants:seaplantssandkelpbrown +youngtrees:youngtree_top +seacoral:seacoraldirtredviolet +seaplants:seaplantssandseagrassred +meze:meze +default:junglewood +4seasons:desertsand_winter +4seasons:grass_autumn +4seasons:grass_spring +4seasons:ice_flowing +4seasons:ice_source +4seasons:leaves_autumn +4seasons:leaves_spring +4seasons:sand_winter +bedrock:bedrock +bedrock:glass +beer:beer_grape +beer:beer_hops +bitchange:mineninth_in_ground +default:apple +default:cactus +default:clay +default:desert_sand +default:desert_stone +default:dirt +default:dirt_with_grass +default:dry_shrub +default:grass_1 +default:grass_2 +default:grass_3 +default:grass_4 +default:grass_5 +default:gravel +default:lava_flowing +default:lava_source +default:leaves +default:nyancat +default:nyancat_rainbow +default:papyrus +default:sand +default:stone +default:stone_with_coal +default:stone_with_copper +default:stone_with_gold +default:stone_with_iron +default:stone_with_mese +default:tree +default:water_flowing +default:water_source +farming:pumpkin +farming_plus:banana +farming_plus:banana_leaves +farming_plus:carrot +farming_plus:cocoa +farming_plus:cocoa_leaves +farming_plus:orange +farming_plus:potato +farming_plus:rhubarb +farming_plus:strawberry +farming_plus:tomato +fire_flowers:fireflower +flowers:dandelion_white +flowers:dandelion_yellow +flowers:geranium +flowers:rose +flowers:tulip +flowers:viola +gloopblocks:stone_mossy +glow:shrooms +glow:stone_with_worms +glowblocks:glowblockwhite_on +moreblocks:super_glow_glass +nature:blossom +smooth:dirt_stone +trail:dirt_with_grass_walked diff --git a/colors/fragments/expertmm.txt b/colors/fragments/expertmm.txt new file mode 100644 index 0000000..f52c28e --- /dev/null +++ b/colors/fragments/expertmm.txt @@ -0,0 +1,23 @@ +protector:door_steel_b_2 142 142 142 +protector:door_steel_b_1 142 142 142 +doors:door_wood_a 66 49 22 +protector:door_wood_b_1 66 49 22 +tsm_pyramids:deco_stone3 161 145 111 +protector:door_wood_b_2 66 49 22 +flowers:sunflower 82 110 23 +moretrees:jungletree_trunk 47 33 11 +flowers:mushroom_brown 101 94 68 +lapis:lapis_block 47 56 153 +tsm_pyramids:deco_stone2 161 145 111 +lapis:pyrite_ore 118 114 98 +protector:door_steel_t_1 142 142 142 +protector:door_steel_t_2 142 142 142 +creatures:zombie_spawner 41 49 54 +tsm_pyramids:spawner_mummy 41 49 54 +protector:protect 86 82 81 +tsm_pyramids:trap 180 162 121 # same as VenessaE's default:sandstone (average color of normal sandstone texture would be 198 193 44) since should look same on map +doors:door_wood_b 66 49 22 +doors:door_steel_b 142 142 142 +flowers:mushroom_red 156 94 76 +protector:door_wood_t_2 120 94 53 +protector:door_wood_t_1 120 94 53 diff --git a/etc/colors-averaging/default_stone.xcf b/etc/colors-averaging/default_stone.xcf new file mode 100644 index 0000000..13aaf84 Binary files /dev/null and b/etc/colors-averaging/default_stone.xcf differ diff --git a/etc/colors-averaging/flowers_mushroom_brown.xcf b/etc/colors-averaging/flowers_mushroom_brown.xcf new file mode 100644 index 0000000..ac582e3 Binary files /dev/null and b/etc/colors-averaging/flowers_mushroom_brown.xcf differ diff --git a/etc/colors-averaging/flowers_mushroom_red.xcf b/etc/colors-averaging/flowers_mushroom_red.xcf new file mode 100644 index 0000000..c328cd0 Binary files /dev/null and b/etc/colors-averaging/flowers_mushroom_red.xcf differ diff --git a/etc/colors-averaging/flowers_sunflower.xcf b/etc/colors-averaging/flowers_sunflower.xcf new file mode 100644 index 0000000..83459b2 Binary files /dev/null and b/etc/colors-averaging/flowers_sunflower.xcf differ diff --git a/etc/colors-averaging/lapis_mineral_pyrite.xcf b/etc/colors-averaging/lapis_mineral_pyrite.xcf new file mode 100644 index 0000000..166b3d3 Binary files /dev/null and b/etc/colors-averaging/lapis_mineral_pyrite.xcf differ diff --git a/etc/colors-averaging/pyramids.xcf b/etc/colors-averaging/pyramids.xcf new file mode 100644 index 0000000..0f3566f Binary files /dev/null and b/etc/colors-averaging/pyramids.xcf differ diff --git a/etc/colors-averaging/testing colors (comparing jungle planks and wood etc).xcf b/etc/colors-averaging/testing colors (comparing jungle planks and wood etc).xcf new file mode 100644 index 0000000..e938c76 Binary files /dev/null and b/etc/colors-averaging/testing colors (comparing jungle planks and wood etc).xcf differ diff --git a/etc/colors-averaging/tsm_pyramids_spawner.xcf b/etc/colors-averaging/tsm_pyramids_spawner.xcf new file mode 100644 index 0000000..4775a1e Binary files /dev/null and b/etc/colors-averaging/tsm_pyramids_spawner.xcf differ diff --git a/generator.py b/generator.py index e70a5d5..42e4eb9 100644 --- a/generator.py +++ b/generator.py @@ -960,12 +960,15 @@ class MTChunks: pass participle = "checking result" is_locked = False + err_count = 0 if os.path.isfile(gen_error_path): ins = open(gen_error_path, 'r') line = True while line: line = ins.readline() if line: + if len(line.strip())>0: + err_count += 1 line_lower = line.lower() if (" lock " in line_lower) or ("/lock " in line_lower): is_locked = True @@ -973,6 +976,8 @@ class MTChunks: result = None break ins.close() + if err_count<1: + os.remove(gen_error_path) if not is_locked: try: is_changed = this_chunk.set_from_genresult(genresult_path) diff --git a/install-chunkymap-on-ubuntu-from-web.sh b/install-chunkymap-on-ubuntu-from-web.sh index a858360..22f087b 100644 --- a/install-chunkymap-on-ubuntu-from-web.sh +++ b/install-chunkymap-on-ubuntu-from-web.sh @@ -39,3 +39,6 @@ chmod +x "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu-from-web.sh" chmod +x "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh" sh "$CHUNKYMAP_INSTALLER_DIR/install-chunkymap-on-ubuntu.sh" + +cp -f "$CHUNKYMAP_INSTALLER_DIR/chunkymap-generator.sh" "$HOME/" +chmod +x "$HOME/chunkymap-generator.sh" diff --git a/minetestinfo.py b/minetestinfo.py index 6055a85..0a3576f 100644 --- a/minetestinfo.py +++ b/minetestinfo.py @@ -418,7 +418,7 @@ def init_minetestinfo(): save_conf_from_dict(dest_colors_txt, merged_colors, assignment_operator=" ") else: - print("Using colors "+dest_colors_txt) + print("Using colors from "+dest_colors_txt) def load_world_and_mod_data(): #if games_path = diff --git a/singleimage.py b/singleimage.py index aa95f40..14b9858 100644 --- a/singleimage.py +++ b/singleimage.py @@ -84,12 +84,15 @@ class ChunkymapOfflineRenderer: www_chunkymapdata_world_path = os.path.join(www_chunkymapdata_worlds_path, self.world_name) is_locked = False + err_count = 0 if os.path.isfile(gen_error_path): ins = open(gen_error_path, 'r') line = True while line: line = ins.readline() if line: + if len(line.strip())>0: + err_count += 1 line_lower = line.lower() if (" lock " in line_lower) or ("/lock " in line_lower): is_locked = True @@ -97,7 +100,8 @@ class ChunkymapOfflineRenderer: result = None break ins.close() - + if err_count<1: + os.remove(gen_error_path) if os.path.isfile(tmp_png_path): if not os.path.isdir(www_chunkymapdata_world_path): os.makedirs(www_chunkymapdata_world_path)