diff --git a/.DS_Store b/.DS_Store index 5ea200a..07f88fb 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/tree/canteen.css b/tree/canteen.css index cd1f6ed..25c3323 100644 --- a/tree/canteen.css +++ b/tree/canteen.css @@ -38,8 +38,17 @@ body { font-family: jolyregular; font-size: 1.8vw; - } + + #ground{ + width: 120%; + height: 120%; + position:fixed; + margin:-100px; + background-color: white; + z-index:-10; + } + svg { width: 100%; height: 100%; @@ -119,14 +128,29 @@ span.button_text{ z-index: 0; } +#pill{ + bottom: 30%; + left: 8%; + position:absolute ; +} + /*school staff*/ #table { bottom: 50%; left: 45%; position:absolute ; + cursor: pointer; } +#column { + bottom: 50%; + left: 47%; + position:absolute ; +} + + + div.figure1 { top: 20%; left: 30%; @@ -146,19 +170,21 @@ div.figure3 { } div.figure4 { - bottom: 35%; - left: 50%; + bottom: 25%; + left: 54%; position:absolute ; } div.figure5 { - bottom: 25%; - right: 25%; + bottom: 40%; + right: 24%; position:absolute ; } - +.invert_style{ + filter: invert(100%); +} diff --git a/tree/canteen.html b/tree/canteen.html index 6ecd4a7..758a69e 100644 --- a/tree/canteen.html +++ b/tree/canteen.html @@ -4,13 +4,14 @@ canteen - + - + +
- + @@ -18,29 +19,34 @@ -
+
+ + + + +
- - + +
- - + +
- - + +
- - + +
- - + +
@@ -57,10 +63,10 @@
You are now in the school canteen. The staff is there as well: the plan might get more complicated.
- Click on the corn on the table to take it with you. + Click on the corn cobs on the table to take them with you.
- -
+
fluoride: / 5
@@ -85,7 +91,7 @@ window.onload = function() { window.localStorage.setItem("school_canteen","opened"); console.log ("school canteen:",localStorage.school_canteen); - $('.cobs_collected').html("0"); + $('.cobs_collected').html(fluoride); } @@ -96,8 +102,24 @@ var player_img = document.querySelector("#player_img"); player_img.appendChild(img); - //get player name from local storage - + //change characters + invert + + $("#table").click (function(){ + $(".cooking, #table, .message1 ").hide(); + $(".satan, #column, .message2").show(); + $(".invert").addClass("invert_style"); + }); + + //fight + var avatar = $("#player_img"); + var weapon = $("#pill"); + + $(".figure1").click (function(){ + avatar.animate({top:'16%'}, "slow"); + weapon.animate({top:'16%'}, "slow"); + weapon.show(); + fluoride -- ; + }); diff --git a/tree/imgs/canteen/devil_rites_4.gif b/tree/imgs/canteen/devil_rites_4.gif new file mode 100644 index 0000000..6d286e8 Binary files /dev/null and b/tree/imgs/canteen/devil_rites_4.gif differ diff --git a/tree/imgs/canteen/fire_2.gif b/tree/imgs/canteen/fire_2.gif new file mode 100644 index 0000000..50ad34f Binary files /dev/null and b/tree/imgs/canteen/fire_2.gif differ diff --git a/tree/imgs/canteen/fire_5.gif b/tree/imgs/canteen/fire_5.gif new file mode 100644 index 0000000..b11ebae Binary files /dev/null and b/tree/imgs/canteen/fire_5.gif differ diff --git a/tree/imgs/canteen/pill.gif b/tree/imgs/canteen/pill.gif new file mode 100644 index 0000000..51deffc Binary files /dev/null and b/tree/imgs/canteen/pill.gif differ diff --git a/tree/imgs/canteen/pill.png b/tree/imgs/canteen/pill.png new file mode 100644 index 0000000..837f7ff Binary files /dev/null and b/tree/imgs/canteen/pill.png differ diff --git a/tree/imgs/canteen/woman_rites_1.gif b/tree/imgs/canteen/woman_rites_1.gif index d36f788..6818c80 100644 Binary files a/tree/imgs/canteen/woman_rites_1.gif and b/tree/imgs/canteen/woman_rites_1.gif differ diff --git a/tree/imgs/canteen/woman_rites_5 2.gif b/tree/imgs/canteen/woman_rites_5 2.gif new file mode 100644 index 0000000..de21846 Binary files /dev/null and b/tree/imgs/canteen/woman_rites_5 2.gif differ