From b202e2d5007ca9a53b4ffac4cc2224d647119dbc Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.org>
Date: Fri, 18 Sep 2015 16:40:02 +0200
Subject: Add plan for brother/father/mother/sister

---
 prolog/problems/family_relations/brother_2/common.py |  1 -
 prolog/problems/family_relations/brother_2/sl.py     | 17 +++++++++--------
 prolog/problems/family_relations/father_2/common.py  |  1 -
 prolog/problems/family_relations/father_2/sl.py      | 17 +++++++++--------
 prolog/problems/family_relations/mother_2/common.py  |  1 -
 prolog/problems/family_relations/mother_2/sl.py      | 17 +++++++++--------
 prolog/problems/family_relations/sister_2/common.py  |  1 -
 prolog/problems/family_relations/sister_2/sl.py      | 17 +++++++++--------
 8 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'prolog/problems')

diff --git a/prolog/problems/family_relations/brother_2/common.py b/prolog/problems/family_relations/brother_2/common.py
index a8047fb..13f7ab5 100644
--- a/prolog/problems/family_relations/brother_2/common.py
+++ b/prolog/problems/family_relations/brother_2/common.py
@@ -22,7 +22,6 @@ brother(X, Y) :-
 '''
 
 hint_type = {
-    'general_hint': HintSequence('general_hint', 3),
     'x_must_be_male': Hint('x_must_be_male'),
     'common_parent_needed': Hint('common_parent_needed'),
     'Y_can_be_of_any_gender': Hint('Y_can_be_of_any_gender'),
diff --git a/prolog/problems/family_relations/brother_2/sl.py b/prolog/problems/family_relations/brother_2/sl.py
index ad1d6c2..116a968 100644
--- a/prolog/problems/family_relations/brother_2/sl.py
+++ b/prolog/problems/family_relations/brother_2/sl.py
@@ -12,20 +12,21 @@ description = '''\
     X = sally.
 </pre>'''
 
-hint = {
-    'general_hint': ['''\
-<p><img src="Sister-1.png" /></p>
-''', '''\
-<p><img src="Sister-2.png" /></p>
-''', '''\
+plan = [
+    '''\
+<p><img src="Sister-1.png" /></p>''',
+    '''\
+<p><img src="Sister-2.png" /></p>''',
+    '''\
 <p><img src="Sister-2.png" /></p>
 <pre>
 parent(P, X)
 parent(P, Y)
 male(X)
-</pre>
-'''],
+</pre>'''
+]
 
+hint = {
     'x_y_must_be_different': '''\
 <p>Si pomislil, da sta <code>X</code> in <code>Y</code> lahko ista oseba? Poskusi naslednjo poizvedbo:</p>
 <pre>
diff --git a/prolog/problems/family_relations/father_2/common.py b/prolog/problems/family_relations/father_2/common.py
index 1816d56..1342441 100644
--- a/prolog/problems/family_relations/father_2/common.py
+++ b/prolog/problems/family_relations/father_2/common.py
@@ -20,7 +20,6 @@ father(X, Y) :-
 '''
 
 hint_type = {
-    'general_hint': HintSequence('general_hint', 3),
     'or_instead_of_and': Hint('or_instead_of_and'),
     'x_must_be_male': Hint('x_must_be_male'),
     'x_must_be_parent': Hint('x_must_be_parent'),
diff --git a/prolog/problems/family_relations/father_2/sl.py b/prolog/problems/family_relations/father_2/sl.py
index 8fb66c5..ee6893b 100644
--- a/prolog/problems/family_relations/father_2/sl.py
+++ b/prolog/problems/family_relations/father_2/sl.py
@@ -15,17 +15,18 @@ description = '''\
     X = daniela.
 </pre>'''
 
-hint = {
-    'general_hint': ['''\
-<p><img src="Father-1.png" /></p>
-<p>Loni naj zbriše imena relacij (parent, mother) s te slike!</p>
-''', '''\
+plan = [
+    '''\
 <p><img src="Father-1.png" /></p>
-''', '''\
+<p>Loni naj zbriše imena relacij (parent, mother) s te slike!</p>''',
+    '''\
+<p><img src="Father-1.png" /></p>''',
+    '''\
 <p>Če je <code>X</code> ženska in je hkrati <code>X</code> starš od <code>Y</code>,
-potem je <code>X</code> mama od <code>Y</code>.</p>
-'''],
+potem je <code>X</code> mama od <code>Y</code>.</p>'''
+]
 
+hint = {
     'or_instead_of_and': '''\
 <p>Si morda uporabil podpičje (ki pomeni ALI) namesto vejice (ki pomeni IN)?</p>
 ''',
diff --git a/prolog/problems/family_relations/mother_2/common.py b/prolog/problems/family_relations/mother_2/common.py
index 3a7e196..4d198d4 100644
--- a/prolog/problems/family_relations/mother_2/common.py
+++ b/prolog/problems/family_relations/mother_2/common.py
@@ -20,7 +20,6 @@ mother(X, Y) :-
 '''
 
 hint_type = {
-    'general_hint': HintSequence('general_hint', 3),
     'or_instead_of_and': Hint('or_instead_of_and'),
     'x_must_be_female': Hint('x_must_be_female'),
     'x_must_be_parent': Hint('x_must_be_parent'),
diff --git a/prolog/problems/family_relations/mother_2/sl.py b/prolog/problems/family_relations/mother_2/sl.py
index 5922d6c..3494096 100644
--- a/prolog/problems/family_relations/mother_2/sl.py
+++ b/prolog/problems/family_relations/mother_2/sl.py
@@ -14,17 +14,18 @@ description = '''\
     X = daniela.
 </pre>'''
 
-hint = {
-    'general_hint': ['''\
-<p><img src="Mother-1.png" /></p>
-<p>Loni naj zbriše imena relacij (parent, mother) s te slike!</p>
-''', '''\
+plan = [
+    '''\
 <p><img src="Mother-1.png" /></p>
-''', '''\
+<p>Loni naj zbriše imena relacij (parent, mother) s te slike!</p>''',
+    '''\
+<p><img src="Mother-1.png" /></p>''',
+    '''\
 <p>Če je <code>X</code> ženska in je hkrati <code>X</code> starš od <code>Y</code>,
-potem je <code>X</code> mama od <code>Y</code>.</p>
-'''],
+potem je <code>X</code> mama od <code>Y</code>.</p>'''
+]
 
+hint = {
     'or_instead_of_and': '''\
 <p>Si morda uporabil podpičje (ki pomeni ALI) namesto vejice (ki pomeni IN)?</p>
 ''',
diff --git a/prolog/problems/family_relations/sister_2/common.py b/prolog/problems/family_relations/sister_2/common.py
index a1375f2..1ae652a 100644
--- a/prolog/problems/family_relations/sister_2/common.py
+++ b/prolog/problems/family_relations/sister_2/common.py
@@ -22,7 +22,6 @@ sister(X, Y) :-
 '''
 
 hint_type = {
-    'general_hint': HintSequence('general_hint', 3),
     'x_must_be_female': Hint('x_must_be_female'),
     'common_parent_needed': Hint('common_parent_needed'),
     'Y_can_be_of_any_gender': Hint('Y_can_be_of_any_gender'),
diff --git a/prolog/problems/family_relations/sister_2/sl.py b/prolog/problems/family_relations/sister_2/sl.py
index b2683c4..aa66567 100644
--- a/prolog/problems/family_relations/sister_2/sl.py
+++ b/prolog/problems/family_relations/sister_2/sl.py
@@ -11,20 +11,21 @@ description = '''\
     X = patricia.
 </pre>'''
 
-hint = {
-    'general_hint': ['''\
-<p><img src="Sister-1.png" /></p>
-''', '''\
-<p><img src="Sister-2.png" /></p>
-''', '''\
+plan = [
+    '''\
+<p><img src="Sister-1.png" /></p>''',
+    '''\
+<p><img src="Sister-2.png" /></p>''',
+    '''\
 <p><img src="Sister-2.png" /></p>
 <pre>
 parent(P, X)
 parent(P, Y)
 female(X)
-</pre>
-'''],
+</pre>'''
+]
 
+hint = {
     'x_y_must_be_different': '''\
 <p>Si pomislil, da sta <code>X</code> in <code>Y</code> lahko ista oseba? Poskusi naslednjo poizvedbo:</p>
 <pre>
-- 
cgit v1.2.1