Skip to content

PullReq #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdekempeneer wants to merge 12 commits into
base: master
Choose a base branch
from
Open

PullReq #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e47c009
Added part 2
VincentDerk Oct 11, 2016
761d36a
Merge pull request #1 from VincentDerk/patch-5
mdekempeneer Oct 11, 2016
2e36e0a
Update OverlevendeTroepen.user.js
VincentDerk Oct 11, 2016
cbceac7
Merge pull request #2 from VincentDerk/patch-6
mdekempeneer Oct 11, 2016
c74cda8
Update intro.pl
SanderCleymans Oct 26, 2016
e976ba8
Update intro.pl
SanderCleymans Oct 26, 2016
ea0da0a
Merge pull request #3 from SanderCleymans/patch-5
mdekempeneer Oct 26, 2016
9dc6b3f
Merge pull request #4 from SanderCleymans/patch-6
mdekempeneer Oct 26, 2016
5396860
Update intro.pl
SanderCleymans Oct 26, 2016
7a472a2
Merge pull request #5 from SanderCleymans/patch-7
mdekempeneer Oct 26, 2016
4a64e91
Update intro.pl
SanderCleymans Oct 26, 2016
18ce862
Merge pull request #6 from SanderCleymans/patch-8
mdekempeneer Oct 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions OverlevendeTroepen.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
// @description Adds survivors to reports and shows gained ODA and ODD
// @icon http://m.img.brothersoft.com/android/405/1352517939_icon.png
// @include https://*.tribalwars.*/game.php?*&screen=report*
// @version 1.6
// @version 1.8
// @grant none
// ==/UserScript==

// Start process
function survivors(table, deff){
var row = table.insertRow(table.rows.length);

Expand Down Expand Up @@ -78,7 +79,7 @@ function calcODD(array, table){
var row2 = table.insertRow(table.rows.length);
var cell1 = row.insertCell(0);
var cell2 = row2.insertCell(0);
cell1.innerHTML = "ODD: " + result;
cell1.innerHTML = "ODD: " + result + " aiaiai miserie miserie miserie";
cell1.style.fontWeight = 'bold';
cell2.innerHTML = "VVDD: " + killed;
cell2.style.fontWeight = 'bold';
Expand Down
19 changes: 18 additions & 1 deletion intro.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
father(anton,bart).
father(anton,daan).
father(anton,maarten).
father(anton,elisa).
father(fabian,anton).

Expand All @@ -15,3 +15,20 @@
mother(M,X),
mother(M,Y),
X \== Y.

/* Part 2 */
a.
b.
c.

edge(a,b).
edge(c,b).

isConnected(A,B) :-
edge(A,B) ; edge(B,A).

edge(a,c).
edge(c,d).

mother(celine, gerda).
mother(gerde, anton).