Skip to content

Commit

Permalink
Commit #56: Release 1.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlackJar72
BlackJar72 committed Jul 15, 2015
1 parent 8320b4a commit 419a2df
Show file tree
Hide file tree
Showing 17 changed files with 1,377 additions and 24 deletions.
2 changes: 1 addition & 1 deletion java/jaredbgreat/dldungeons/Info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public final class Info {
public static final String OLD_ID = "DLDungeonsJBG";
public static final String ID = "dldungeonsjdg";
public static final String NAME = "Doomlike Dungeons";
public static final String VERSION = "1.8.1";
public static final String VERSION = "1.8.2";
public static final String MINECRAFT = "1.7.10";
public static final String CHANNEL = "JBGDungeons";

Expand Down
1 change: 1 addition & 0 deletions java/jaredbgreat/dldungeons/rooms/Cave.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class Cave extends Room {
public Cave(int beginX, int endX, int beginZ, int endZ, int floorY,
int ceilY, Dungeon dungeon, Room parent, Room previous) {
super(beginX, endX, beginZ, endZ, floorY, ceilY, dungeon, previous, previous);
this.degenerate = true;
}


Expand Down
210 changes: 210 additions & 0 deletions resources/jaredbgreat/dldungeons/res/themes/chests.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,219 @@
# What goes in the chests
# Each line contains:
<<<<<<< HEAD
# type, level, id, minimum amount, maximum amount
=======
# type, level, modid.name, minimum amount, maximum amount
>>>>>>> origin/master
#
# type must be gear, heal (food / health), or loot (treasure)
# level must be an integer from 1 to 8 representing the value / difficulty of guarding mobs
# Normally this should be 1 to 7, a value of 8 will appear only in rare teasure chests
<<<<<<< HEAD
# id is the item id "minecraft"
# minimum and maximum determine the stacks sizes

gear, 1, 272, 1, 1
gear, 1, 298, 1, 1
gear, 1, 300, 1, 1
gear, 1, 301, 1, 1
gear, 1, 299, 1, 1
gear, 1, 262, 4, 12
gear, 1, 50, 4, 12

gear, 2, 272, 1, 1
gear, 2, 267, 1, 1
gear, 2, 261, 1, 1
gear, 2, 298, 1, 1
gear, 2, 300, 1, 1
gear, 2, 301, 1, 1
gear, 2, 299, 1, 1
gear, 2, 306, 1, 1
gear, 2, 308, 1, 1
gear, 2, 309, 1, 1
gear, 2, 307, 1, 1
gear, 2, 262, 4, 12
gear, 2, 50, 4, 12

gear, 3, 267, 1, 1
gear, 3, 261, 1, 1
gear, 3, 306, 1, 1
gear, 3, 308, 1, 1
gear, 3, 309, 1, 1
gear, 3, 307, 1, 1
gear, 3, 262, 4, 12
gear, 3, 50, 4, 12
gear, 3, 262, 8, 16
gear, 3, 50, 12, 16

gear, 4, 267, 1, 1
gear, 4, 276, 1, 1
gear, 4, 261, 1, 1
gear, 4, 306, 1, 1
gear, 4, 308, 1, 1
gear, 4, 309, 1, 1
gear, 4, 307, 1, 1
gear, 4, 310, 1, 1
gear, 4, 312, 1, 1
gear, 4, 313, 1, 1
gear, 4, 311, 1, 1
gear, 4, 262, 4, 12
gear, 4, 50, 4, 12
gear, 4, 262, 8, 16
gear, 4, 50, 12, 16

gear, 5, 276, 1, 1
gear, 5, 310, 1, 1
gear, 5, 312, 1, 1
gear, 5, 313, 1, 1
gear, 5, 311, 1, 1
gear, 5, 262, 8, 16
gear, 5, 50, 4, 12
gear, 5, 262, 8, 16
gear, 5, 50, 16, 24

gear, 6, 276, 1, 1
gear, 6, 310, 1, 1
gear, 6, 312, 1, 1
gear, 6, 313, 1, 1
gear, 6, 311, 1, 1
gear, 6, 262, 16, 48
gear, 6, 262, 8, 16
gear, 6, 50, 16, 24

gear, 7, 276, 1, 1
gear, 7, 310, 1, 1
gear, 7, 312, 1, 1
gear, 7, 313, 1, 1
gear, 7, 311, 1, 1
gear, 7, 262, 16, 48
gear, 7, 50, 16, 24

heal, 1, 297, 1, 3

heal, 2, 297, 1, 3
heal, 2, 260, 1, 2
heal, 2, 367, 1, 3

heal, 3, 297, 2, 4
heal, 3, 260, 1, 2
heal, 3, 367, 1, 3
heal, 3, 364, 1, 3
heal, 3, 322, 1, 1
heal, 3 373(8197), 1, 1

heal, 4, 297, 2, 4
heal, 4, 260, 1, 2
heal, 4, 260, 1, 4
heal, 4, 367, 1, 3
heal, 4, 367, 2, 4
heal, 4, 364, 1, 3
heal, 4, 322, 1, 1
heal, 4 373(8197), 1, 1
heal, 4 373(8229), 1, 1
heal, 4 373(8193), 1, 1

heal, 5, 297, 2, 4
heal, 5, 400, 1, 2
heal, 5, 260, 1, 4
heal, 5, 367, 1, 3
heal, 5, 367, 2, 4
heal, 5, 364, 1 3
heal, 5, 364, 2, 4
heal, 5, 322, 1, 1
heal, 5, 322, 1, 2
heal, 5, 373(8229), 1, 1
heal, 5, 373(8193), 1, 1
heal, 5, 373(8257), 1, 1

heal, 6, 400, 1, 2
heal, 6, 260, 1, 4
heal, 6, 400, 1, 4
heal, 6, 364, 2, 4
heal, 6, 322, 1, 1
heal, 6, 322, 1, 2
heal, 6, 373(8229), 1, 1
heal, 6, 373(8225), 1, 1
heal, 6, 373(8257), 1, 1

heal, 7, 260, 1, 4
heal, 7, 364, 2, 4
heal, 7, 322, 1, 1
heal, 7, 322, 1, 2
heal, 7, 373(8229), 1, 1
heal, 7, 373(8225), 1, 1
heal, 7, 373(8257), 1, 1

loot, 1, 265, 1, 8
loot, 1, 266, 1, 1
loot, 1, 340, 1, 1
loot, 1, 260, 1, 3

loot, 2, 340, 1, 1
loot, 2, 340, 2, 5
loot, 2, 265, 1, 8
loot, 2, 266, 1, 1
loot, 2, 266, 2, 5

loot, 3, 340, 2, 5
loot, 3, 266, 2, 5
loot, 3, 264, 1, 1
loot, 3, 265, 3, 12
loot, 3, 388, 1, 1

loot, 4, 322, 1, 1
loot, 4, 369, 1, 3
loot, 4, 340, 3, 8
loot, 4, 368, 1, 9
loot, 4, 265, 3, 12
loot, 4, 266, 2, 5
loot, 4, 264, 1, 1
loot, 4, 264, 1, 4
loot, 4, 388, 1, 1
loot, 4, 388, 1, 4

loot, 5, 340, 3, 8
loot, 5, 369, 1, 3
loot, 5, 322, 1, 1
loot, 5, 381, 1, 2
loot, 5, 368, 1, 9
loot, 5, 265, 3, 12
loot, 5, 266, 3, 8
loot, 5, 264, 1, 4
loot, 5, 388, 1, 1
loot, 5, 388, 1, 4

loot, 6, 340, 3, 8
loot, 6, 381, 1, 2
loot, 6, 368, 1, 9
loot, 6, 322, 1, 3
loot, 6, 265, 3, 12
loot, 6, 266, 3, 8
loot, 6, 264, 1, 4
loot, 6, 388, 1, 4

loot, 7, 266, 3, 8
loot, 7, 264, 1, 4
loot, 7, 388, 1, 4
loot, 7, 381, 1, 2
loot, 7, 322, 1, 1

loot, 8, 2256, 1, 1
loot, 8, 2257, 1, 1
loot, 8, 2258, 1, 1
loot, 8, 2259, 1, 1
loot, 8, 2260, 1, 1
loot, 8, 2261, 1, 1
loot, 8, 2262, 1, 1
loot, 8, 2263, 1, 1
loot, 8, 2265, 1, 1
loot, 8, 2264, 1, 1
loot, 8, 2266, 1, 1
loot, 8, 2267, 1, 1
loot, 8, 399, 1, 1
loot, 8, 322, 1, 3

=======
# modid is the official ID of the mod; for vanilla items the modid is "item"
# name is the in-code, unlocalized name
# minimum and maximum determine the stacks sizes
Expand Down Expand Up @@ -196,3 +405,4 @@ loot, 8, minecraft:diamond_block, 1, 12
loot, 8, minecraft:emerald_block, 1, 12
loot, 8, minecraft:skull(1), 1, 8
loot, 8, minecraft:beacon, 1, 1
>>>>>>> origin/master
89 changes: 88 additions & 1 deletion resources/jaredbgreat/dldungeons/res/themes/classic.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<<<<<<< HEAD
Version 1.5
# Biome types to use this theme in
# Valid types are: FOREST, PLAINS, MOUNTAIN, HILLS, SWAMP, WATER, DESERT, FROZEN, JUNGLE, WASTELAND, NETHER, END, MUSHROOM, and MAGICAL
# (BEACH is consider the same as WATER here.)
#
# Biomes types where it should be used
biomes: FOREST, PLAINS, MOUNTAINS, HILLS, DESERT, FROZEN, WASTELAND
# Biome types where it should never appear, even if the biome also fit one of the above types
NotInBiomes: NETHER, END
=======
Version 1.8
# Biome types to use this theme in
# Valid types are = FOREST, PLAINS, MOUNTAIN, HILLS, SWAMP, WATER, DESERT, FROZEN, JUNGLE, WASTELAND, NETHER, END, MUSHROOM, and MAGICAL
Expand All @@ -7,17 +18,35 @@ Version 1.8
biomes = FOREST, PLAINS, MOUNTAINS, HILLS, DESERT, FROZEN, WASTELAND
# Biome types where it should never appear, even if the biome also fit one of the above types
NotInBiomes = NETHER, END, MESA, SWAMP
>>>>>>> origin/master

# This determines the type of dungeon this should be, for the purpose of adding mobs through the API;
# Its basically like a biome dictionary for dungeons. Valid values includ DUNGEON, NECRO, URBAN, FOREST,
# PLAINS, MOUNTAIN, SWAMP, WATER, DESERT, WASTELAND, JUNGLE, FROZEN, FIERY, NETHER, END, MUSHROOM, MAGICAL,
# SHADOW, and PARADISE. Most should have one or two types, not more than 3 or (very rarely) 4; API user
# should be more liberal with there assigning mosters to types, not the other way around.
<<<<<<< HEAD
Type: DUNGEON
=======
Type = DUNGEON
>>>>>>> origin/master
#
# Altitude ranges
#
# Lowest level a floor can be at
<<<<<<< HEAD
minY: 10
# Highest level a floor can be at
maxY: 50

#
# Size ranges: This should contain 5 numbers, at least one of which must not be 0.
# These are relative probabilities for a tiny, small, medium, large, and huge dungeon (in that oreder)
sizes: 2, 5, 10, 5, 1

#
# Style elements: These must each contain 6 numbers
=======
minY = 30
# Highest level a floor can be at
maxY = 50
Expand All @@ -29,10 +58,36 @@ sizes = 2, 5, 10, 5, 1

#
# Style elements = These must each contain 6 numbers
>>>>>>> origin/master
# in order they must be for none, few, some, plenty, heaps, and always (not literally)
# They are relative probabilites, as before
#
# Roofless, wall-less rooms; mostly for surface dungeons
<<<<<<< HEAD
outside: 25, 0, 0, 0, 0, 0
# Amount of liquid blocks (pools) on the floor
liquids: 1, 30, 50, 20, 10, 0
# Number of extra doors which may lead to rooms off the main route
subrooms: 5, 20, 50, 45, 5, 0
# Frequency of trying to place a mini-room inside a larger room
islands; 5, 50, 10, 50, 20, 0
# How many pillars to use
pillars: 5, 30, 60, 40, 20, 0
# Not used, but will be the number of fences around outdoor rooms
fences: 5, 15, 30, 75, 25, 0
# How generally semetric and organized roosm appear
symmetry: 5, 15, 30, 75, 25, 0
# How much variability in the blocks to be used
variability: 5, 10, 25, 75, 50, 25
# Idea borrowed from Greymerk's Roguelike dungeons; chance of not building over airblocks
degeneracy: 50, 5, 15, 50, 10, 0
# How many feature to add to rooms
complexity: 5, 10, 25, 75, 15, 0
# How much variation in the Y should be found
verticle: 5, 10, 25, 20, 10, 0
# How many entrances to place
entrances: 2, 5, 25, 50, 15, 3
=======
outside = 25, 0, 0, 0, 0, 0
# Amount of liquid blocks (pools) on the floor
liquids = 1, 30, 50, 20, 10, 0
Expand All @@ -57,10 +112,30 @@ verticle = 5, 10, 25, 20, 10, 0
# How many entrances to place
entrances = 2, 5, 25, 50, 15, 3
naturals = 25, 5, 20, 5, 0, 0
>>>>>>> origin/master

#
# Block elements
# Thes are just lists of blocks to uses in building rooms
<<<<<<< HEAD
# Warning: Versions for version for Minecraft before 1.7 are not compatible with 1.7+
# For 1.5.2 or 1.6.4 these must be block ids
# for version 1.7+ these are the proper, in-code names ("unlocalized name") for the blocks
# Each of these must contain at least one block, but can contain as many as you like
#
# The main block for building walls
walls: 98, 4, 24, 45
# The main block for building floors
floors: 98, 4, 3, 1
# The main block for lining ceilings
ceilings: 98, 4, 5, 43
# Blocks to be used as outdoor fences (not yet used)
fencing: 139, 85
# Block to represent liquids; fill pools
liquid: 9, 11
# Block from which to build pillars
pillarBlock: 98, 4, 24, 5, 43
=======
# Warning = Versions for version fo Minecraft before 1.7 are not compatible with 1.7+
# For 1.5.2 or 1.6.4 these must be block ids
# for version 1.7+ these are the proper, in-code names for the blocks
Expand All @@ -80,18 +155,30 @@ liquid = minecraft:water, minecraft:lava
pillarBlock = minecraft:stonebrick, minecraft:cobblestone, minecraft:sandstone, minecraft:planks, minecraft:double_stone_slab
# Block found in cave-like areas
caveblock = minecraft:stone, minecraft:stone, minecraft:sandstone
>>>>>>> origin/master

#
# Mob fields
#
# These are lists of mobs, and most be in their officialm, in code names
#
# Weak, basic mobs; by default
<<<<<<< HEAD
commonMobs: Zombie, Skeleton, Spider
# Tougher mobs everyday mobs
hardMobs: Creeper, Enderman, CaveSpider
# Really tough mobs, Minefantasy brutes, mid-level Dungeons Mobs, and many of Lycanite's mobs go here
bruteMobs: Witch
# The baddest of the bad, Minefantasy dragon, Dungeon Mobs rakshasa, and all bosses go here; empty by default in the overworld
# but for The Nether this has Wither Boss.
eliteMobs:
=======
commonMobs = Zombie, Skeleton, Spider
# Tougher mobs everyday mobs
hardMobs = Creeper, Enderman, CaveSpider
# Really tough mobs, Minefantasy brutes, mid-level Dungeons Mobs, and many of Lycanite's mobs go here
bruteMobs = Witch
# The baddest of the bad, Minefantasy dragon, Dungeon Mobs rakshasa, and all bosses go here; empty by default in the overworld
# but for The Nether this has Wither Boss.
eliteMobs =
eliteMobs =
>>>>>>> origin/master
Loading

0 comments on commit 419a2df

Please sign in to comment.