More refactoring, updated mongodb driver + transactions on supported clusters

This commit is contained in:
simon
2018-12-22 17:48:29 -05:00
parent b361f87154
commit 5f95c17aed
18 changed files with 83 additions and 49 deletions

View File

@@ -40,7 +40,7 @@ wg_maxCopperCount=2
wg_fluidCenterPointMin=0
wg_fluidCenterPointMax=2
#CPU
tick_length=1000
tick_length=50
org_offset=512
stack_bottom=65536
memory_size=65536
@@ -67,7 +67,7 @@ npc_lifetime=1024
npc_max_factory_distance=3
factory_max_npc_count=16
factory_program_size=1024
settlement_spawn_rate=5
settlement_spawn_rate=35
harvester_hp_max=100
harvester_regen=5
harvester_biomass_drop_count=8

View File

@@ -115,7 +115,6 @@
.bottom-panel {
min-height: 18px;
max-height: 100%;
height: 235px;
width: 100%;
position: fixed;
bottom: 0;

View File

@@ -1368,7 +1368,7 @@ var VaultDoor = (function (_super) {
_this.anchor.set(0.55, 0.55);
_this.inputEnabled = true;
_this.events.onInputDown.add(function (self) {
Debug.goToHex("7FFF", "7FFF", "v" + self.id + "-");
Debug.goToHex("7FFF", "7FFF", "v" + self.id);
document.body.style.cursor = 'default';
document.body.setAttribute("title", "");
}, _this);
@@ -1449,7 +1449,7 @@ var ElectricBox = (function (_super) {
var Portal = (function (_super) {
__extends(Portal, _super);
function Portal(json) {
var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/Portal") || this;
var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/portal") || this;
_this.anchor.set(0.5, 0.3);
_this.tint = config.portal.tint;
_this.setText("Portal");

View File

@@ -118,11 +118,7 @@
#parse("footer.vm")
##Console
<style>
</style>
<div class="bottom-panel">
<div class="bottom-panel" style="height: 0">
<div class="splitter-horizontal"></div>
<div class="console-wrapper">
<div class="console-side-bar">
@@ -151,7 +147,6 @@
<button class="dropdown-item" onclick="mar.client.consoleScreen.setMode(4)">64 chars</button>
</div>
</div>
</p>
<p>
<button id="resetButton" class="btn btn-danger btn-shadow" style="margin-left: 0"
data-container="body" data-toggle="popover" data-trigger="hover"
@@ -163,9 +158,7 @@
<div class="piece scanlines noclick"></div>
<div class="piece glow noclick"></div>
</div>
</div>
</div>
<script>