diff --git a/expertmmregressionsuite.py b/expertmmregressionsuite.py index e0a0fbd..d593e7d 100644 --- a/expertmmregressionsuite.py +++ b/expertmmregressionsuite.py @@ -20,7 +20,11 @@ from expertmm import * # * check for only variable name in quotes (maybe the programmer meant to use the value) # * check for use of os.dirname (should be os.path.dirname) # * mixing width with y (or height or z) and mixing height with x (or width) +# PHP: # * using '+' next to '"' in php seperated only by whitespace (probably meant concatenate operator '.') +# SHELL SCRIPT: +# * don't use '*' inside quotes (fails) +# * using HOME without preceding dollar sign def view_traceback(): ex_type, ex, tb = sys.exc_info() diff --git a/install-chunkymap-on-ubuntu.sh b/install-chunkymap-on-ubuntu.sh index f5a2a92..834edc0 100644 --- a/install-chunkymap-on-ubuntu.sh +++ b/install-chunkymap-on-ubuntu.sh @@ -89,12 +89,14 @@ chmod -x "$CHUNKYMAP_DEST/unused/set-minutely-crontab-job.sh" chmod -x "$CHUNKYMAP_DEST/unused/set-minutely-players-crontab-job.sh" #if [ -f "$HOME/update-chunkymap-on-ubuntu-from-web.sh" ]; then -cp -f "HOME/chunkymap/update-chunkymap-on-ubuntu-from-web.sh" "HOME/update-chunkymap-on-ubuntu-from-web.sh" +cp -f "$HOME/chunkymap/update-chunkymap-on-ubuntu-from-web.sh" "$HOME/" #fi -#cp -f "HOME/chunkymap/install-chunkymap-on-ubuntu-from-web.sh" "HOME/install-chunkymap-on-ubuntu-from-web.sh" -rm "HOME/install-chunkymap-on-ubuntu-from-web.sh" -rm "HOME/mapper-refresh-minetestserver.bat" -rm "HOME/mapper-refresh-minetestserver" +#cp -f "$HOME/chunkymap/install-chunkymap-on-ubuntu-from-web.sh" "$HOME/install-chunkymap-on-ubuntu-from-web.sh" + +#remove deprecated stuff +#rm "$HOME/install-chunkymap-on-ubuntu-from-web.sh" +#rm "$HOME/mapper-refresh-minetestserver.bat" +#rm "$HOME/mapper-refresh-minetestserver" sudo apt-get install python-numpy python-pil python-leveldb echo "" diff --git a/minetestinfo.py b/minetestinfo.py index ec24a98..9b70c5c 100644 --- a/minetestinfo.py +++ b/minetestinfo.py @@ -42,7 +42,13 @@ after_broken["default:stone_with_diamond"] = "default:diamond" #after_broken[""] = "" #after_broken[""] = "" #after_broken[""] = "" -#after_broken[""] = "" + + +after_broken_startswith = {} +after_broken_startswith["pipeworks:mese_tube_"] = "pipeworks:mese_tube_000000" +after_broken_startswith["pipeworks:conductor_tube_off_"] = "pipeworks:conductor_tube_off_1" +after_broken_startswith["pipeworks:tube_"] = "pipeworks:tube_1" +after_broken_startswith["Item pipeworks:accelerator_tube_"] = "pipeworks:accelerator_tube_1" genresult_name_closer_string = "_mapper_result.txt" diff --git a/minetestoffline.py b/minetestoffline.py index fb42eed..90d6223 100644 --- a/minetestoffline.py +++ b/minetestoffline.py @@ -590,6 +590,11 @@ def debug_log_replay_to_offline_player_storage(debug_txt_path, this_players_offl if "digs" in name_ender: if item_string in after_broken: item_string = after_broken[item_string] + else: + for item_startswith in after_broken_startswith: + if item_startswith == item_string[:len(item_startswith)]: + item_string = after_broken_startswith[item_startswith] + break print(" "+item_string) if playerid not in players: players[playerid] = {}