Planet mining settings interface
* Modified owned planet view to include a field which indicates whether mining settings are specific to the planet or come from the empire; modified "simple" game components accordingly * Modified stored procedures to only allow planet-specific mining settings updates when the planet actually uses planet-specific settings, and added a stored procedure which toggles the source of a planet's settings * Added corresponding parts to mining settings DAO and resources controller * Added session commands and server command handlers that toggle the source of the settings and that upload the settings * Split planet page template into multiple files for clarity and added the mining priorities form to the natural resources tab
This commit is contained in:
parent
51b529a09f
commit
e64f847ec3
25 changed files with 1009 additions and 152 deletions
legacyworlds-server-data/src/main/java/com/deepclone/lw/sqld/game
|
@ -22,7 +22,7 @@ public final class PlanetData
|
|||
|
||||
public AccessType getAccess( )
|
||||
{
|
||||
return access;
|
||||
return this.access;
|
||||
}
|
||||
|
||||
|
||||
|
@ -34,7 +34,7 @@ public final class PlanetData
|
|||
|
||||
public int getX( )
|
||||
{
|
||||
return x;
|
||||
return this.x;
|
||||
}
|
||||
|
||||
|
||||
|
@ -46,7 +46,7 @@ public final class PlanetData
|
|||
|
||||
public int getY( )
|
||||
{
|
||||
return y;
|
||||
return this.y;
|
||||
}
|
||||
|
||||
|
||||
|
@ -58,7 +58,7 @@ public final class PlanetData
|
|||
|
||||
public int getOrbit( )
|
||||
{
|
||||
return orbit;
|
||||
return this.orbit;
|
||||
}
|
||||
|
||||
|
||||
|
@ -70,7 +70,7 @@ public final class PlanetData
|
|||
|
||||
public int getPicture( )
|
||||
{
|
||||
return picture;
|
||||
return this.picture;
|
||||
}
|
||||
|
||||
|
||||
|
@ -82,7 +82,7 @@ public final class PlanetData
|
|||
|
||||
public String getName( )
|
||||
{
|
||||
return name;
|
||||
return this.name;
|
||||
}
|
||||
|
||||
|
||||
|
@ -94,7 +94,7 @@ public final class PlanetData
|
|||
|
||||
public String getTag( )
|
||||
{
|
||||
return tag;
|
||||
return this.tag;
|
||||
}
|
||||
|
||||
|
||||
|
@ -117,7 +117,7 @@ public final class PlanetData
|
|||
|
||||
public long getPopulation( )
|
||||
{
|
||||
return population;
|
||||
return this.population;
|
||||
}
|
||||
|
||||
|
||||
|
@ -129,7 +129,7 @@ public final class PlanetData
|
|||
|
||||
public long getDefence( )
|
||||
{
|
||||
return defence;
|
||||
return this.defence;
|
||||
}
|
||||
|
||||
|
||||
|
@ -141,7 +141,7 @@ public final class PlanetData
|
|||
|
||||
public long getOwnPower( )
|
||||
{
|
||||
return ownPower;
|
||||
return this.ownPower;
|
||||
}
|
||||
|
||||
|
||||
|
@ -153,7 +153,7 @@ public final class PlanetData
|
|||
|
||||
public long getFriendlyPower( )
|
||||
{
|
||||
return friendlyPower;
|
||||
return this.friendlyPower;
|
||||
}
|
||||
|
||||
|
||||
|
@ -165,7 +165,7 @@ public final class PlanetData
|
|||
|
||||
public long getHostilePower( )
|
||||
{
|
||||
return hostilePower;
|
||||
return this.hostilePower;
|
||||
}
|
||||
|
||||
|
||||
|
@ -177,7 +177,7 @@ public final class PlanetData
|
|||
|
||||
public Long getBattle( )
|
||||
{
|
||||
return battle;
|
||||
return this.battle;
|
||||
}
|
||||
|
||||
|
||||
|
@ -197,11 +197,12 @@ public final class PlanetData
|
|||
private boolean renamePossible;
|
||||
private boolean abandonPossible;
|
||||
private Integer abandonTime;
|
||||
private boolean ownSettings;
|
||||
|
||||
|
||||
public int getHappiness( )
|
||||
{
|
||||
return happiness;
|
||||
return this.happiness;
|
||||
}
|
||||
|
||||
|
||||
|
@ -213,7 +214,7 @@ public final class PlanetData
|
|||
|
||||
public int gethChange( )
|
||||
{
|
||||
return hChange;
|
||||
return this.hChange;
|
||||
}
|
||||
|
||||
|
||||
|
@ -225,7 +226,7 @@ public final class PlanetData
|
|||
|
||||
public long getIncome( )
|
||||
{
|
||||
return income;
|
||||
return this.income;
|
||||
}
|
||||
|
||||
|
||||
|
@ -237,7 +238,7 @@ public final class PlanetData
|
|||
|
||||
public long getUpkeep( )
|
||||
{
|
||||
return upkeep;
|
||||
return this.upkeep;
|
||||
}
|
||||
|
||||
|
||||
|
@ -249,7 +250,7 @@ public final class PlanetData
|
|||
|
||||
public boolean isRenamePossible( )
|
||||
{
|
||||
return renamePossible;
|
||||
return this.renamePossible;
|
||||
}
|
||||
|
||||
|
||||
|
@ -261,7 +262,7 @@ public final class PlanetData
|
|||
|
||||
public boolean isAbandonPossible( )
|
||||
{
|
||||
return abandonPossible;
|
||||
return this.abandonPossible;
|
||||
}
|
||||
|
||||
|
||||
|
@ -273,7 +274,7 @@ public final class PlanetData
|
|||
|
||||
public Integer getAbandonTime( )
|
||||
{
|
||||
return abandonTime;
|
||||
return this.abandonTime;
|
||||
}
|
||||
|
||||
|
||||
|
@ -282,6 +283,18 @@ public final class PlanetData
|
|||
this.abandonTime = abandonTime;
|
||||
}
|
||||
|
||||
|
||||
public boolean isOwnSettings( )
|
||||
{
|
||||
return this.ownSettings;
|
||||
}
|
||||
|
||||
|
||||
public void setOwnSettings( boolean ownSettings )
|
||||
{
|
||||
this.ownSettings = ownSettings;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
Reference in a new issue