Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add temperature and humidity values to biome #8

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Add temperature and humidity values to biome #8

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0a0adf9
Add temperature and humidity values to biome
RatMoleRat Jun 28, 2020
f790e13
Make requested changes
RatMoleRat Jun 28, 2020
3ffc925
Adjusting temperature facets
RatMoleRat Jul 12, 2020
dd90b48
Start of using block data for facets
RatMoleRat Aug 8, 2020
ffc4b24
More work on block data, still in progress
RatMoleRat Aug 9, 2020
e5765e5
Undo changes related to BiomesAPI, more debugging
RatMoleRat Aug 16, 2020
d1e6792
Merge branch 'terasology-develop' into develop
RatMoleRat Aug 16, 2020
274fdbd
Merge remote-tracking branch 'Terasology/develop' into tempAndHumidity
RatMoleRat Aug 30, 2020
66cfed1
Adjustments to temperature and humidity generation; still being tested
RatMoleRat Aug 30, 2020
24cf391
Simplify imports and adjust noise clamping
RatMoleRat Aug 30, 2020
e2ee616
Make requested changes
RatMoleRat Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/main/java/org/terasology/core/world/CoreBiome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,24 @@
import org.terasology.naming.Name;

public enum CoreBiome implements Biome {
MOUNTAINS("Mountains"),
SNOW("Snow"),
DESERT("Desert"),
FOREST("Forest"),
OCEAN("Ocean"),
BEACH("Beach"),
PLAINS("Plains");
MOUNTAINS("Mountains", .3f, .09f),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks way better from the technical perspective now 👍

SNOW("Snow", .85f, .05f),
DESERT("Desert", .15f, .26f),
FOREST("Forest", .65f, .22f),
OCEAN("Ocean", .9f, .13f),
BEACH("Beach", .8f, .28f),
PLAINS("Plains", .55f, .22f);

private final Name id;
private final String displayName;
private final float humidity;
private final float temperature;

CoreBiome(String displayName) {
CoreBiome(String displayName, float humidity, float temperature) {
this.id = new Name("CoreWorlds:" + name());
this.displayName = displayName;
this.humidity = humidity;
this.temperature = temperature;
}

@Override
Expand All @@ -50,4 +54,13 @@ public String toString() {
return this.displayName;
}

@Override
public float getHumidity() {
return this.humidity;
}

@Override
public float getTemperature() {
return this.temperature;
}
}