simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-13 22:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into vaults

Browse Source 
# Conflicts:
#	Server/src/main/java/net/simon987/server/game/GameObject.java
#	Server/src/main/java/net/simon987/server/game/World.java
#	Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
This commit is contained in:
simon
2018-03-10 09:53:55 -05:00
parent f8c5dac969 8ed192f8d0
commit dc19176dc8
14 changed files with 331 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Server/src/main/resources/config.properties
View File

@@ -6,8 +6,8 @@ mysql_pass=mar
mysql_url=jdbc:mysql://localhost:3306/mar?useSSL=false
# File management
save_interval=5
clean_interval=10
history_size=10
log_limit=2000000
log_count=10
# Web server port
webSocket_port=8887
webSocket_host=0.0.0.0
@@ -49,6 +49,10 @@ maxBiomassRespawnCount=6
biomassEnergyValue=4000
# Maximum energy of the battery hardware in kJ
battery_max_energy=60000
# Maximum shield power
max_shield=100
# Energy cost per unit to charge shield
shield_energy_cost=50
# Time for biomass respawn in ticks
biomassRespawnTime=64
# Respawn timer will start when biomass count is below this number