Skip to content

Commit a8401c8

Browse files
committed
updated manifest location to make custom content updates easier (dropbox)
1 parent e9919f9 commit a8401c8

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "roc-launcher",
3-
"version": "0.9.1",
3+
"version": "0.9.2",
44
"description": "Relics of Corbantis Official SWGEMU Launcher",
55
"main": "main.js",
66
"scripts": {
@@ -21,7 +21,7 @@
2121
"emu",
2222
"swgemu"
2323
],
24-
"author": "Progor",
24+
"author": "Progor at Relics of Corbantis",
2525
"license": "CC0-1.0",
2626
"devDependencies": {
2727
"electron": "~1.6.2",

renderer.js

+11
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ cancelBtn.addEventListener('click', function(event) {
171171

172172
ipc.on('install-selected', function (event, path) {
173173
disableAll();
174+
resetProgress();
174175
install.install(path, config.folder, config.mods);
175176
});
176177

@@ -187,6 +188,13 @@ var lastCompleted = 0;
187188
var lastTime = new Date();
188189
var rate = 0;
189190
var units = " B/s";
191+
192+
function resetProgress() {
193+
lastCompleted = 0;
194+
lastTime = new Date();
195+
rate = 0;
196+
}
197+
190198
install.progress = function(completed, total) {
191199
var time = new Date();
192200
var elapsed = (time - lastTime) / 1000;
@@ -241,17 +249,20 @@ function modListChanged() {
241249
}
242250
saveConfig();
243251
disableAll();
252+
resetProgress();
244253
install.install(config.folder, config.folder, config.mods);
245254
}
246255

247256
fullscanBtn.addEventListener('click', function(event) {
248257
if (fullscanBtn.disabled) return;
249258
disableAll();
259+
resetProgress();
250260
install.install(config.folder, config.folder, config.mods, true);
251261
});
252262

253263
if (fs.existsSync(path.join(config.folder, 'bottom.tre'))) {
254264
disableAll();
265+
resetProgress();
255266
install.install(config.folder, config.folder, config.mods);
256267
} else {
257268
playBtn.disabled = true;

server.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"address": "server.relicsofcorbantis.com",
33
"port": "44453",
4-
"manifestUrl": "https://github.com/dpwhittaker/RoC-Launcher/releases/download/Assets/manifest.json"
4+
"manifestUrl": "https://www.dropbox.com/s/t2sg3dsrujsi3oh/manifest.json?dl=1"
55
}

0 commit comments

Comments
 (0)