search

BlackJar72 / DoomlikeDungeons

A procedural multi-room dungeon generator for Minecraft
https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-mods/1293843-doomlike-dungeons
MIT License
23 stars 12 forks source link

Remnants of a Git Merge? #11

Closed KAfable closed 6 years ago

KAfable commented 6 years ago

I'm not too familiar with Git overall but I think the mesa.cfg in themes has remnants of a Git Merge?

<<<<<<< HEAD
liquid =  minecraft:water, minecraft:lava, minecraft:air, minecraft:air, minecraft:sand
=======
liquid =  minecraft:water, minecraft:water, minecraft:lava, minecraft:air, minecraft:air, minecraft:sand
liquid =  minecraft:water, minecraft:lava, minecraft:air, minecraft:sand, minecraft:sand
>>>>>>> origin/master
KAfable commented 6 years ago

Also, this cfg file seems to have multiple ceilings, floors, walls, and etc. for its entries - does this add more complexity or choices for generating the dungeon? Or was this also unintentional?

BlackJar72 commented 6 years ago

What game version that from -- yeah, that is why I stopped using git when moving features between game versions, but I can't believe some of it has persisted this long.

As for multiples -- these are lists of blocks, so more to choose from. As for any duplications, it uses a very simple system where each entry is one chance, so the same thing in more than one entry is how things are given different weights.

BlackJar72 commented 6 years ago

I've fixed this in the latest version.

Actually, it may be the final version. I've said that before, and later came back, but my life is changing now, I'll have much less freetime in the very near future.

I hope everything is in good shape now.