From 39a86b23f2567010f45832f2ce9bec256ac07238 Mon Sep 17 00:00:00 2001
From: KateStearns
Date: Thu, 14 May 2015 19:15:33 -0700
Subject: [PATCH 1/5] html version of game
---
sevenWesterosHTML.html | 100 +++++++++++++++++++++++++++++++++++++
sevenWesterosUpdate.html | 103 ++++++++++++++++++++++++++++++++++-----
2 files changed, 191 insertions(+), 12 deletions(-)
create mode 100644 sevenWesterosHTML.html
diff --git a/sevenWesterosHTML.html b/sevenWesterosHTML.html
new file mode 100644
index 0000000..bdd2e48
--- /dev/null
+++ b/sevenWesterosHTML.html
@@ -0,0 +1,100 @@
+
+
+ A Game of Ice and Fire
+
+
+
+
+
+
A Game of Ice and Fire
+
+
You've seen the show, you may have even read the books. Now test your nerdom in a Game of Ice and Fire!
+ Inspired by George R. R. Martin's series A Song of Ice and Fire , play The Seven Kingdoms of Westeros!
+
+
+ Need a refresher on the names of the kingdoms? Here is a hint, each kingdom has a warden. Connect between the family and the kingdom name to win!
+ If you watch the series you know the families. Below are some hints to refresh your memory
+
+
+ The Seven Warden families.
+
+ The Starks
+
+
+
+ The Arryns
+
+
+ The Tullys
+
+
+ The Lannisters
+
+
+ The Baratheons
+
+
+ The Tyrells
+
+
+ The Martells
+
+
+
+
+
Did you get them all right? Submit your name on the wall of game!
+
+
+
+
+
+ Player Name
+ Score
+
+
+
+
+ Kate
+ 7
+
+
+
+
+
+
+
+ Map image from Game of Thrones Wikia
+
+
+
diff --git a/sevenWesterosUpdate.html b/sevenWesterosUpdate.html
index cd38a7f..8b9041e 100644
--- a/sevenWesterosUpdate.html
+++ b/sevenWesterosUpdate.html
@@ -1,5 +1,83 @@
+
+
+ A Game of Ice and Fire
+
+
+
+
+
+
A Game of Ice and Fire
+
+
You've seen the show, you may have even read the books. Now test your nerdom in a Game of Ice and Fire!
+ Inspired by George R. R. Martin's series A Song of Ice and Fire , play The Seven Kingdoms of Westeros!
+
+
+ Need a refresher on the names of the kingdoms? Here is a hint, each kingdom has a warden. Connect between the family and the kingdom name to win!
+ If you watch the series you know the families. Below are some hints to refresh your memory
+
+
+ The Seven Warden families.
+
+ The Starks
+
+
+
+ The Arryns
+
+
+ The Tullys
+
+
+ The Lannisters
+
+
+ The Baratheons
+
+
+ The Tyrells
+
+
+ The Martells
+
+
+
+
+
Did you get them all right? Submit your name on the wall of game!
+
+
+
+
+
+ Player Name
+ Score
+
+
+
+
+ Kate
+ 7
+
+
+
+
+
+
+
+ Map image from Game of Thrones Wikia
+
+
+
+
@@ -78,3 +156,4 @@
+
From 641eacdf148fa7b0544ec0c26fe7d8cb7a6593a6 Mon Sep 17 00:00:00 2001
From: KateStearns
Date: Fri, 15 May 2015 11:29:20 -0700
Subject: [PATCH 2/5] added meta data tags
---
sevenWesterosUpdate.html | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/sevenWesterosUpdate.html b/sevenWesterosUpdate.html
index 8b9041e..eaeaf51 100644
--- a/sevenWesterosUpdate.html
+++ b/sevenWesterosUpdate.html
@@ -1,11 +1,16 @@
- A Game of Ice and Fire
+
+ A Game of Ice and Fire
+
+
+
+
-
+
A Game of Ice and Fire
You've seen the show, you may have even read the books. Now test your nerdom in a Game of Ice and Fire!
@@ -19,26 +24,26 @@
The Seven Warden families.
The Starks
-
-
+
+
The Arryns
-
+
The Tullys
-
+
The Lannisters
-
+
The Baratheons
-
+
The Tyrells
-
+
The Martells
-
+
@@ -124,7 +129,7 @@
"No, You decide to attend a wedding at the Frey's...and well you know what can happen at Frey weddings!",
"No, thats wrong. A Lannister always pays their debts",
"No, thats wrong. Much like the former castles of Storm's End you crumple and fall.",
- "That answer is like the thorn on a Tyrell rose. Its so wrong it hurts.",
+ "That answer is like the thorn on a Tyrell rose. It's so wrong it hurts.",
"Thats wrong. You're bit by a dornish viper."
];
var kingdomArray = [];
@@ -144,11 +149,12 @@
}
}
}else{
- alert("Whimp")
+ alert("Whimp!!")
}
}
//Will S. helped with building constructor functions!
+
From 0eda50380fd446ae8e5ddb0cb682daa037544db6 Mon Sep 17 00:00:00 2001
From: KateStearns
Date: Fri, 15 May 2015 16:06:25 -0700
Subject: [PATCH 3/5] added DOM structure and manipulation
---
sevenWesterosUpdate.html | 60 +++++++++++++++++++++++++++++++++++-----
1 file changed, 53 insertions(+), 7 deletions(-)
diff --git a/sevenWesterosUpdate.html b/sevenWesterosUpdate.html
index eaeaf51..491d2ce 100644
--- a/sevenWesterosUpdate.html
+++ b/sevenWesterosUpdate.html
@@ -18,7 +18,41 @@
Need a refresher on the names of the kingdoms? Here is a hint, each kingdom has a warden. Connect between the family and the kingdom name to win!
- If you watch the series you know the families. Below are some hints to refresh your memory
+ Don't think about the castle or city they live in, but the name of the land (kingdom)
+
+
+
Ready to put your nerdy knowledge to the test?
+
+ Submit
+
+
+
+ Submit
+
+
+
+ Submit
+
+
+
+ Submit
+
+
+
+ Submit
+
+
+
+ Submit
+
+
+
+ Submit
+
+
The Seven Warden families.
@@ -68,10 +102,6 @@
-
-
-
-
Map image from Game of Thrones Wikia
@@ -79,6 +109,19 @@
From 767054e97ea7af5fcba27782ae077055fdd9cecc Mon Sep 17 00:00:00 2001
From: KateStearns
Date: Fri, 15 May 2015 17:18:37 -0700
Subject: [PATCH 4/5] attempted to manipulate DOM structure for questions.
stumped myself and 2 TAs!
---
sevenWesterosUpdate.html | 54 +++++++++-------------------------------
1 file changed, 12 insertions(+), 42 deletions(-)
diff --git a/sevenWesterosUpdate.html b/sevenWesterosUpdate.html
index 491d2ce..353bdfe 100644
--- a/sevenWesterosUpdate.html
+++ b/sevenWesterosUpdate.html
@@ -22,36 +22,9 @@
Ready to put your nerdy knowledge to the test?
-
- Submit
-
-
-
- Submit
-
-
-
- Submit
-
-
-
- Submit
-
-
-
- Submit
-
-
-
- Submit
-
-
-
- Submit
-
+
+
+ Submit
@@ -109,18 +82,15 @@
-
-
-
-
-
-
-