Fix incorrect regexes in autogenerating-colors.txt and update colors.txt yet again

This commit is contained in:
sfan5 2016-01-15 10:20:05 +01:00
parent 0eb653d72b
commit 87292adcb4
2 changed files with 24 additions and 17 deletions

View File

@ -115,15 +115,16 @@ while read -r p; do
fi fi
done < $NODESTXT_PATH > $COLORSTXT_PATH done < $NODESTXT_PATH > $COLORSTXT_PATH
# Use nicer colors for water and lava: # Use nicer colors for water and lava:
sed -re 's/^default:(river_)?water_([a-z]+) [0-9 ]+$/default:\1water_\2 39 66 106 128 224/g' $COLORSTXT_PATH -i sed -re 's/^default:(river_)?water_([^ ]+) [0-9 ]+$/default:\1water_\2 39 66 106 128 224/g' $COLORSTXT_PATH -i
sed -re 's/^default:lava_([a-z]+) [0-9 ]+$/default:lava_\1 255 100 0/g' $COLORSTXT_PATH -i sed -re 's/^default:lava_([^ ]+) [0-9 ]+$/default:lava_\1 255 100 0/g' $COLORSTXT_PATH -i
# Add transparency to glass nodes: # Add transparency to glass nodes:
sed -re 's/^default:([a-z_]*glass) ([0-9 ]+)$/default:\1 \2 64 16/g' $COLORSTXT_PATH -i sed -re 's/^default:(.*glass) ([0-9 ]+)$/default:\1 \2 64 16/g' $COLORSTXT_PATH -i
sed -re 's/^doors:([a-z_]*glass[a-z_]*) ([0-9 ]+)$/doors:\1 \2 64 16/g' $COLORSTXT_PATH -i sed -re 's/^doors:(.*glass[^ ]*) ([0-9 ]+)$/doors:\1 \2 64 16/g' $COLORSTXT_PATH -i
sed -re 's/^xpanes:(pane_[0-9]+|bar_[0-9]+) ([0-9 ]+)$/xpanes:\1 \2 64 16/g' $COLORSTXT_PATH -i # Fix xpanes color:
sed -re 's/^xpanes:(pane_[0-9]+|bar_[0-9]+) [0-9 ]+$/xpanes:\1 194 194 227 64 16/g' $COLORSTXT_PATH -i
==INSTRUCTIONS== ==INSTRUCTIONS==
1) Make sure avgcolors.py outputs the usage instructions 1) Make sure avgcolors.py outputs the usage instructions
2) Add the dumpnodes mod to Minetest 2) Add the dumpnodes mod to Minetest
3) Create a world and load dumpnodes & all mods you want to have a color entry for 3) Create a world and load dumpnodes & all mods you want to generate colors for
4) Execute /dumpnodes ingame 4) Execute /dumpnodes ingame
5) Run the script to generate colors.txt (make sure to replace /path/to/... with the actual path) 5) Run the script to generate colors.txt (make sure to replace /path/to/... with the actual paths)

View File

@ -13,6 +13,10 @@ default:acacia_sapling 87 116 61
default:acacia_tree 188 109 90 default:acacia_tree 188 109 90
default:acacia_wood 146 60 37 default:acacia_wood 146 60 37
default:apple 145 20 9 default:apple 145 20 9
default:aspen_leaves 66 89 38
default:aspen_sapling 82 110 43
default:aspen_tree 218 197 166
default:aspen_wood 209 198 169
default:bookshelf 128 99 55 default:bookshelf 128 99 55
default:brick 117 71 69 default:brick 117 71 69
default:bronzeblock 185 110 15 default:bronzeblock 185 110 15
@ -43,7 +47,7 @@ default:dry_shrub 101 66 17
default:fence_wood 128 99 55 default:fence_wood 128 99 55
default:furnace 100 96 94 default:furnace 100 96 94
default:furnace_active 100 96 94 default:furnace_active 100 96 94
default:glass 194 194 227 64 16 64 16 default:glass 194 194 227 64 16
default:goldblock 230 201 29 default:goldblock 230 201 29
default:grass_1 97 138 53 default:grass_1 97 138 53
default:grass_2 95 136 54 default:grass_2 95 136 54
@ -67,7 +71,7 @@ default:mossycobble 86 90 68
default:nyancat 198 111 167 default:nyancat 198 111 167
default:nyancat_rainbow 123 100 94 default:nyancat_rainbow 123 100 94
default:obsidian 19 21 24 default:obsidian 19 21 24
default:obsidian_glass 19 21 23 64 16 64 16 default:obsidian_glass 19 21 23 64 16
default:obsidianbrick 20 22 24 default:obsidianbrick 20 22 24
default:papyrus 94 132 33 default:papyrus 94 132 33
default:pine_needles 13 36 21 default:pine_needles 13 36 21
@ -100,14 +104,14 @@ default:water_source 39 66 106 128 224
default:wood 128 99 55 default:wood 128 99 55
# doors # doors
doors:door_glass_b_1 192 192 227 doors:door_glass_b_1 192 192 227 64 16
doors:door_glass_b_2 192 192 227 doors:door_glass_b_2 192 192 227 64 16
doors:door_glass_t_1 192 192 227 doors:door_glass_t_1 192 192 227 64 16
doors:door_glass_t_2 192 192 227 doors:door_glass_t_2 192 192 227 64 16
doors:door_obsidian_glass_b_1 16 16 16 doors:door_obsidian_glass_b_1 16 16 16 64 16
doors:door_obsidian_glass_b_2 16 16 16 doors:door_obsidian_glass_b_2 16 16 16 64 16
doors:door_obsidian_glass_t_1 16 16 16 doors:door_obsidian_glass_t_1 16 16 16 64 16
doors:door_obsidian_glass_t_2 16 16 16 doors:door_obsidian_glass_t_2 16 16 16 64 16
doors:door_steel_b_1 142 142 142 doors:door_steel_b_1 142 142 142
doors:door_steel_b_2 142 142 142 doors:door_steel_b_2 142 142 142
doors:door_steel_t_1 142 142 142 doors:door_steel_t_1 142 142 142
@ -163,6 +167,7 @@ flowers:waterlily 102 158 61
# stairs # stairs
stairs:slab_acacia_wood 146 60 37 stairs:slab_acacia_wood 146 60 37
stairs:slab_aspen_wood 209 198 169
stairs:slab_brick 117 71 69 stairs:slab_brick 117 71 69
stairs:slab_bronzeblock 185 110 15 stairs:slab_bronzeblock 185 110 15
stairs:slab_cobble 88 84 82 stairs:slab_cobble 88 84 82
@ -183,6 +188,7 @@ stairs:slab_stonebrick 97 94 93
stairs:slab_straw 211 182 67 stairs:slab_straw 211 182 67
stairs:slab_wood 128 99 55 stairs:slab_wood 128 99 55
stairs:stair_acacia_wood 146 60 37 stairs:stair_acacia_wood 146 60 37
stairs:stair_aspen_wood 209 198 169
stairs:stair_brick 117 71 69 stairs:stair_brick 117 71 69
stairs:stair_bronzeblock 185 110 15 stairs:stair_bronzeblock 185 110 15
stairs:stair_cobble 88 84 82 stairs:stair_cobble 88 84 82