From e47c0093d99ad29952bc0ddf63376adf5fb64195 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 11 Oct 2016 20:44:27 +0200 Subject: [PATCH 1/6] Added part 2 Added part 2 --- intro.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/intro.pl b/intro.pl index d856220..bacd7cc 100644 --- a/intro.pl +++ b/intro.pl @@ -15,3 +15,14 @@ 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). From 2e36e0a81b487a2ed5cdab7db8d299ce74719b74 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 11 Oct 2016 21:15:26 +0200 Subject: [PATCH 2/6] Update OverlevendeTroepen.user.js --- OverlevendeTroepen.user.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OverlevendeTroepen.user.js b/OverlevendeTroepen.user.js index e8a848b..daf06ea 100644 --- a/OverlevendeTroepen.user.js +++ b/OverlevendeTroepen.user.js @@ -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); @@ -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'; From c74cda8d8ee1276cb219ee369a082593727b3f05 Mon Sep 17 00:00:00 2001 From: Sander Cleymans Date: Wed, 26 Oct 2016 17:11:44 +0200 Subject: [PATCH 3/6] Update intro.pl --- intro.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intro.pl b/intro.pl index bacd7cc..b18ec71 100644 --- a/intro.pl +++ b/intro.pl @@ -1,5 +1,5 @@ father(anton,bart). -father(anton,daan). +father(anton,maarten). father(anton,elisa). father(fabian,anton). From e976ba8a30460276ddcc1f2daf324dbdbcdf22e7 Mon Sep 17 00:00:00 2001 From: Sander Cleymans Date: Wed, 26 Oct 2016 17:12:38 +0200 Subject: [PATCH 4/6] Update intro.pl --- intro.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/intro.pl b/intro.pl index bacd7cc..d6192ea 100644 --- a/intro.pl +++ b/intro.pl @@ -26,3 +26,6 @@ isConnected(A,B) :- edge(A,B) ; edge(B,A). + +edge(a,c). +edge(c,d). From 5396860fa76efc8cbc3d185f4ee03c7be2849bc0 Mon Sep 17 00:00:00 2001 From: Sander Cleymans Date: Wed, 26 Oct 2016 17:14:49 +0200 Subject: [PATCH 5/6] Update intro.pl --- intro.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/intro.pl b/intro.pl index 3889ba0..07e8041 100644 --- a/intro.pl +++ b/intro.pl @@ -27,5 +27,8 @@ isConnected(A,B) :- edge(A,B) ; edge(B,A). +father(bart,anton). +father(fabian, bart). + edge(a,c). edge(c,d). From 4a64e91523db64915d2ba7e36c0e6a7e05bb5706 Mon Sep 17 00:00:00 2001 From: Sander Cleymans Date: Wed, 26 Oct 2016 17:15:51 +0200 Subject: [PATCH 6/6] Update intro.pl --- intro.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intro.pl b/intro.pl index 07e8041..1a6929f 100644 --- a/intro.pl +++ b/intro.pl @@ -27,8 +27,8 @@ isConnected(A,B) :- edge(A,B) ; edge(B,A). -father(bart,anton). -father(fabian, bart). - edge(a,c). edge(c,d). + +mother(celine, gerda). +mother(gerde, anton).