Merge
This commit is contained in:
@@ -109,6 +109,7 @@ public class Weathers implements ContentList{
|
||||
particleRegion = "particle";
|
||||
statusGround = false;
|
||||
useWindVector = true;
|
||||
hidden = true;
|
||||
sizeMax = 4f;
|
||||
sizeMin = 1.4f;
|
||||
minAlpha = 0.5f;
|
||||
|
||||
@@ -30,6 +30,7 @@ public class Weather extends UnlockableContent{
|
||||
public Sound sound = Sounds.none;
|
||||
public float soundVol = 0.1f, soundVolMin = 0f;
|
||||
public float soundVolOscMag = 0f, soundVolOscScl = 20f;
|
||||
public boolean hidden = false;
|
||||
|
||||
//internals
|
||||
public Prov<WeatherState> type = WeatherState::create;
|
||||
|
||||
@@ -337,6 +337,7 @@ public class CustomRulesDialog extends BaseDialog{
|
||||
t.background(Tex.button);
|
||||
int i = 0;
|
||||
for(Weather weather : content.<Weather>getBy(ContentType.weather)){
|
||||
if(weather.hidden) continue;
|
||||
|
||||
t.button(weather.localizedName, Styles.cleart, () -> {
|
||||
rules.weather.add(new WeatherEntry(weather));
|
||||
|
||||
Reference in New Issue
Block a user