Skip to content

Commit 2efd257

Browse files
InvalidHandleInvalidHandle
committed
Merge pull request #1 from SanguPackage/master
Merge
2 parents b216035 + 7918651 commit 2efd257

12 files changed

Lines changed: 95 additions & 123 deletions

File tree

‎buildPackage.ahk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ inputFile := "start.user.js"
22
saveAs := "sangupackage.user.js"
33
savePath :=
44

5-
FileEncoding, UTF-8-RAW
5+
FileEncoding, UTF-8-RAW ; If it crashes here, you've got the wrong version of Autohotkey - see readme
66
workingDirectory = %A_WorkingDir%
77
SetWorkingDir, %A_ScriptDir%
88

@@ -23,8 +23,8 @@ GetNewVersion(versionFileName)
2323
currentVersion =
2424
FileRead, currentVersion, %versionFileName%
2525
StringSplit, versionNumber, currentVersion, .
26-
versionNumber3 := versionNumber3 + 1
27-
newVersion = %versionNumber1%.%versionNumber2%.%versionNumber3%
26+
versionNumber4 := versionNumber4 + 1
27+
newVersion = %versionNumber1%.%versionNumber2%.%versionNumber3%.%versionNumber4%
2828

2929
return %newVersion%
3030
}

‎global/activator.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,22 @@ function isSanguCompatible() {
1313
return sangu_version.indexOf(game_data.majorVersion) === 0;
1414
}
1515

16+
// Check for new version
17+
var loginMonitor = pers.get("sanguLogin");
18+
if (typeof GM_xmlhttpRequest !== "undefined" && !isSanguCompatible() && loginMonitor !== '') {
19+
var parts = loginMonitor.match(/(\d+)/g);
20+
if (parseInt(parts[2], 10) != (new Date()).getDate()) {
21+
GM_xmlhttpRequest({
22+
method: "GET",
23+
url: "http://www.sangu.be/api/sangupackageversion.php",
24+
onload: function (response) {
25+
console.log(response.status, response.responseText.substring (0, 80));
26+
}
27+
});
28+
29+
}
30+
}
31+
1632
if (pers.get("forceCompatibility") === '' || pers.get("forceCompatibility") === 'false') {
1733
if (isSanguActive) {
1834
// Check compatibility with TW version

‎greasemonkey/imports.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// @include http://sangu.be/*
99
// @include http://www.sangu.be/*
1010
// @version //<!--@@INCLUDE "version.txt" INDENT=0 //-->
11-
// @grant none
11+
// @grant GM_xmlhttpRequest
1212
// ==/UserScript==
1313

1414
//We are Sangu. You will be assimilated. Resistance is Futile.

‎greasemonkey/inject.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
(function (func) {
1+
(function (func, GM_xmlhttpRequest) {
2+
//<!--@@INCLUDE "greasemonkey/updatecheck.js" INDENT=0 //-->
3+
24
var script = document.createElement('script');
35
script.setAttribute("type", "application/javascript");
46
if (window.mozInnerScreenX !== undefined) {
@@ -14,6 +16,6 @@
1416

1517
document.body.appendChild(script); // run the script
1618
document.body.removeChild(script); // clean up
17-
}(sangu_ready));
19+
}(sangu_ready, (typeof GM_xmlhttpRequest === "undefined" ? undefined : GM_xmlhttpRequest)));
1820

1921

‎greasemonkey/sangu_readyStart.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
function sangu_ready() {
1+
function sangu_ready() {

‎greasemonkey/updatecheck.js‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
var lastCheck = sessionStorage.lastUpdateCheck,
2+
currentVersion = '//<!--@@INCLUDE "version.txt" INDENT=0 //-->';
3+
4+
function displayNewVersion() {
5+
var a = document.createElement('a');
6+
var linkText = document.createTextNode(" - Sangu Package Update!");
7+
a.appendChild(linkText);
8+
a.title = "Er is een update voor het Sangu Package beschikbaar!";
9+
a.href = "http://sangu.be";
10+
a.style.color = "black";
11+
a.style.fontWeight = "bolder";
12+
a.style.backgroundColor = "yellow";
13+
14+
document.getElementById("linkContainer").appendChild(a);
15+
}
16+
17+
if (typeof GM_xmlhttpRequest !== "undefined") {
18+
if (!lastCheck) {
19+
sessionStorage.lastUpdateCheck = "done";
20+
try
21+
{
22+
// GM_xmlhttpRequest didn't work when put in sangu_ready
23+
GM_xmlhttpRequest({
24+
method: "GET",
25+
url: "http://www.sangu.be/api/sangupackageversion.php",
26+
synchronous: false,
27+
onload: function(response) {
28+
if (response.responseText !== currentVersion) {
29+
sessionStorage.lastUpdateCheck = "hasNew";
30+
displayNewVersion();
31+
}
32+
}
33+
});
34+
}
35+
catch (e)
36+
{
37+
console.log("error fetching latest version number:");
38+
console.log(e);
39+
}
40+
} else if (lastCheck === "hasNew") {
41+
displayNewVersion();
42+
}
43+
}

‎mergeIt.ahk‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ saveAs := "sangupackage.user.js"
44
; Save current changes
55
Send ^s
66

7-
FileEncoding, UTF-8-RAW
7+
FileEncoding, UTF-8-RAW ; If it crashes here, you've got the wrong version of Autohotkey - see readme
88
workingDirectory = %A_WorkingDir%
99
SetWorkingDir, %A_ScriptDir%
1010

@@ -25,12 +25,13 @@ ParseAndSaveFile(inputFile, savePath, saveAs)
2525

2626
; release version does not include build nr
2727
StringSplit, versionArray, newVersion, .
28-
newReleaseVersion = %versionArray1%.%versionArray2%
28+
newReleaseVersion = %versionArray1%.%versionArray2%.%versionArray3%
2929
UpdateVersion(newReleaseVersion, versionFileName)
3030

3131
; RELEASE COPIES
3232
ParseAndSaveFile("release.user.js", sourceLocation, saveAs)
3333
ParseAndSaveFile(sourceLocation . "index_toMerge.php", sourceLocation, "index.php")
34+
ParseAndSaveFile(sourceLocation . "api\sangupackageversion_toMerge.php", sourceLocation, "api\sangupackageversion.php")
3435

3536
; Autocopy for chrome WEB STORE
3637
ParseAndSaveFile("start.user.js", chromeInstallSavePath, saveAs)
@@ -57,7 +58,7 @@ IfWinExist, ^.* \(\d+\|\d+\) - Tribal Wars - .*$
5758
WinActivate
5859
Send {F5}
5960
}
60-
61+
6162
; Restore system state
6263
SetWorkingDir, workingDirectory
6364

@@ -68,8 +69,8 @@ GetNewVersion(versionFileName)
6869
currentVersion =
6970
FileRead, currentVersion, %versionFileName%
7071
StringSplit, versionNumber, currentVersion, .
71-
versionNumber3 := versionNumber3 + 1
72-
newVersion = %versionNumber1%.%versionNumber2%.%versionNumber3%
72+
versionNumber4 := versionNumber4 + 1
73+
newVersion = %versionNumber1%.%versionNumber2%.%versionNumber3%.%versionNumber4%
7374

7475
return %newVersion%
7576
}
@@ -110,7 +111,7 @@ ParseLine(line, indentCount)
110111
StringMid, newIndent, toIncludeFileName, closingQuotePosition + 9 ; Jump to indent
111112
StringMid, newIndent, newIndent, 1, 1 ; Get indent
112113
StringMid, toIncludeFileName, toIncludeFileName, 1, closingQuotePosition - 1 ; Get filename
113-
114+
114115
If toIncludeFileName
115116
{
116117
toIncludeContent := ParseFile(toIncludeFileName, newIndent)
@@ -121,12 +122,12 @@ ParseLine(line, indentCount)
121122
StringReplace, line, line, %found%
122123
}
123124
}
124-
else
125+
else
125126
{
126127
currentDateReplacer := "//<!--@@INCLUDE CURRENTDATE //-->"
127128
IfInString, line, %currentDateReplacer%
128129
{
129-
currentDate =
130+
currentDate =
130131
FormatTime, currentDate, , d MMMM yyyy
131132
StringReplace, line, line, %currentDateReplacer%, %currentDate%
132133
}
@@ -139,7 +140,7 @@ ParseLine(line, indentCount)
139140
}
140141
}
141142
}
142-
143+
143144
return %line%
144145
}
145146

‎mergeIt.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ chromeRunSavePath = C:\Users\Wouter\Documents\OperaUserScripts\
55
chromeInstallSavePath = C:\unix\code\TribalWars\sangupackage-chrome-store\SanguPackage\
66

77
[Site]
8-
sourceLocation = ..\sangupackage-site\
8+
sourceLocation = ..\..\..\wamp\www\sangupackage\

‎overviews/allpages.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ if (user_data.overviews.addFancyImagesToOverviewLinks) {
128128
imageToAdd = "graphic/group_left.png";
129129
break;
130130
case 9:
131-
imageToAdd = "graphic/premium/coinbag_15x15.png";
131+
imageToAdd = "graphic/premium/coinbag_14x14.png";
132132
overviewLink.parent().width(150);
133133
break;
134134
}

‎readme.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Contributing
5353

5454
**The Sangu Package is currently looking for a project maintainer**
5555

56+
Do note that I will make any (legit) pull requests available on sangu.be and on the Google Web Store as soon as possible.
57+
5658
Contact
5759
-------
5860

0 commit comments

Comments
 (0)