Polar Aerodrome moved to hidden sector
This commit is contained in:
@@ -1 +1 @@
|
|||||||
{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:219,extractionOutpost:213,coastline:164,navalFortress:165,frontier:86,sunkenPier:173,groundZero:170,mycelialBastion:143,facility32m:65,atolls:75,overgrowth:142,testingGrounds:169,frozenForest:64,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:271,nuclearComplex:228,ruinousShores:41,planetaryTerminal:217,impact0078:266,seaPort:214,fallenVessel:95,fungalPass:221,tarFields:99,biomassFacility:23},attackSectors:[0,6,13,16,19,20,24,27,30,47,55,66,67,69,76,92,94,103,111,116,127,133,138,150,157,161,162,176,180,185,191,192,197,200,204,207,225,230,237,242,243,244,245,246,247,248,251,254,259,263,265]}
|
{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:219,extractionOutpost:213,coastline:164,navalFortress:165,frontier:86,sunkenPier:173,groundZero:170,mycelialBastion:143,facility32m:65,atolls:75,overgrowth:142,testingGrounds:169,frozenForest:64,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:271,nuclearComplex:228,ruinousShores:41,planetaryTerminal:217,impact0078:266,seaPort:214,fallenVessel:95,fungalPass:221,tarFields:99,biomassFacility:23},attackSectors:[0,6,13,16,19,20,24,27,30,47,55,66,67,69,76,92,94,103,111,116,127,133,138,150,157,161,162,176,180,185,191,192,197,200,204,207,225,230,237,240,242,243,244,245,246,247,248,251,254,259,263,265]}
|
||||||
@@ -9,7 +9,7 @@ public class SectorPresets{
|
|||||||
public static SectorPreset
|
public static SectorPreset
|
||||||
groundZero,
|
groundZero,
|
||||||
craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields,
|
craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields,
|
||||||
frontier, fungalPass, infestedCanyons, atolls, sunkenPier, mycelialBastion, extractionOutpost, saltFlats, testingGrounds, overgrowth, //polarAerodrome,
|
frontier, fungalPass, infestedCanyons, atolls, sunkenPier, mycelialBastion, extractionOutpost, saltFlats, testingGrounds, overgrowth,
|
||||||
impact0078, desolateRift, fallenVessel, nuclearComplex, planetaryTerminal,
|
impact0078, desolateRift, fallenVessel, nuclearComplex, planetaryTerminal,
|
||||||
coastline, navalFortress, weatheredChannels, seaPort,
|
coastline, navalFortress, weatheredChannels, seaPort,
|
||||||
|
|
||||||
@@ -86,11 +86,6 @@ public class SectorPresets{
|
|||||||
difficulty = 5;
|
difficulty = 5;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
//TODO: removed for now
|
|
||||||
//polarAerodrome = new SectorPreset("polarAerodrome", serpulo, 68){{
|
|
||||||
// difficulty = 7;
|
|
||||||
//}};
|
|
||||||
|
|
||||||
coastline = new SectorPreset("coastline", serpulo, 108){{
|
coastline = new SectorPreset("coastline", serpulo, 108){{
|
||||||
captureWave = 30;
|
captureWave = 30;
|
||||||
difficulty = 5;
|
difficulty = 5;
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ public class SectorSubmissions{
|
|||||||
registerSerpuloSector(20, "Namero", "https://discord.com/channels/391020510269669376/1379926794114961634/1406768731471872162");
|
registerSerpuloSector(20, "Namero", "https://discord.com/channels/391020510269669376/1379926794114961634/1406768731471872162");
|
||||||
registerSerpuloSector(162, "Bravo Tizmo", "https://discord.com/channels/391020510269669376/1379926884606808247/1443239231366500415");
|
registerSerpuloSector(162, "Bravo Tizmo", "https://discord.com/channels/391020510269669376/1379926884606808247/1443239231366500415");
|
||||||
registerSerpuloSector(230, "Jamespire", "https://discord.com/channels/391020510269669376/1379926927585841163/1442675816084406305");
|
registerSerpuloSector(230, "Jamespire", "https://discord.com/channels/391020510269669376/1379926927585841163/1442675816084406305");
|
||||||
|
registerSerpuloSector(240, "hhhi17", "https://discord.com/channels/391020510269669376/1253758616117186590/1253758616117186590");
|
||||||
|
|
||||||
/* UNUSED SECTORS:
|
/* UNUSED SECTORS:
|
||||||
registerHiddenSectors(serpulo,
|
registerHiddenSectors(serpulo,
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ public class Sector{
|
|||||||
|
|
||||||
/** @return whether the enemy has a generated base here. */
|
/** @return whether the enemy has a generated base here. */
|
||||||
public boolean hasEnemyBase(){
|
public boolean hasEnemyBase(){
|
||||||
return ((generateEnemyBase && preset == null) || (preset != null && preset.captureWave == 0)) && (save == null || info.attack);
|
return ((generateEnemyBase && preset == null) || (preset != null && preset.captureWave == 0)) && (save == null || info.attack || !hasBase());
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isBeingPlayed(){
|
public boolean isBeingPlayed(){
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class SectorSelectDialog extends BaseDialog{
|
|||||||
TextField search;
|
TextField search;
|
||||||
|
|
||||||
public SectorSelectDialog(){
|
public SectorSelectDialog(){
|
||||||
super("@content.sector.name");
|
super("@database-category.sector");
|
||||||
|
|
||||||
cont.top();
|
cont.top();
|
||||||
cont.table(s -> {
|
cont.table(s -> {
|
||||||
|
|||||||
@@ -51,6 +51,9 @@ public class TiledFloor extends Floor{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void floorChanged(Tile tile){
|
public void floorChanged(Tile tile){
|
||||||
|
//TODO: none of this state needs to update on servers right now, but it could cause issues if blocks require a certain alignment
|
||||||
|
//either way, this wouldn't be called on map load on servers, so it's broken there
|
||||||
|
if(headless) return;
|
||||||
|
|
||||||
if(!world.isGenerating() && TiledState.changes(state(tile)) != world.floorChanges){
|
if(!world.isGenerating() && TiledState.changes(state(tile)) != world.floorChanges){
|
||||||
scan(tile);
|
scan(tile);
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ public class TiledWall extends StaticWall{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void blockChanged(Tile tile){
|
public void blockChanged(Tile tile){
|
||||||
super.blockChanged(tile);
|
if(headless) return;
|
||||||
|
|
||||||
if(!world.isGenerating() && TiledState.changes(state(tile)) != world.tileChanges){
|
if(!world.isGenerating() && TiledState.changes(state(tile)) != world.tileChanges){
|
||||||
scan(tile);
|
scan(tile);
|
||||||
|
|||||||
Reference in New Issue
Block a user