diff --git a/tree/canteen.css b/tree/canteen.css index 60cf676..c6f0902 100644 --- a/tree/canteen.css +++ b/tree/canteen.css @@ -110,7 +110,6 @@ div.message1{ border: 0.11vw black solid; border-radius: 25vw; color:black; - cursor:pointer; font-size: 1.4vw; } diff --git a/tree/imgs/square_s/child.png b/tree/imgs/square_s/child.png new file mode 100644 index 0000000..391be28 Binary files /dev/null and b/tree/imgs/square_s/child.png differ diff --git a/tree/imgs/square_s/pill.png b/tree/imgs/square_s/pill.png new file mode 100644 index 0000000..fda9ca8 Binary files /dev/null and b/tree/imgs/square_s/pill.png differ diff --git a/tree/imgs/square_s/woman.png b/tree/imgs/square_s/woman.png new file mode 100644 index 0000000..6498160 Binary files /dev/null and b/tree/imgs/square_s/woman.png differ diff --git a/tree/major_house.css b/tree/major_house.css index 23f0935..463741e 100644 --- a/tree/major_house.css +++ b/tree/major_house.css @@ -56,7 +56,8 @@ span.instructions_arrow{ } #ground_color { - width: 3600px; + /*width: 3600px;*/ + width: 560vh; height: 120%; position:fixed; margin:-100px; @@ -67,7 +68,8 @@ span.instructions_arrow{ #ground{ position:absolute; height:100%; - width:3500px; + /*width:3500px;*/ + width: 560vh; } #groundline { @@ -305,7 +307,7 @@ span.button_text{ z-index:-2; } .bubble1 { - right: 24%; + right: 23.5%; bottom:54%; position: absolute; background: #ffffff; @@ -349,7 +351,7 @@ span.button_text{ } .bubble2 { - right: 24%; + right: 23.5%; bottom:54%; position: absolute; background: #ffffff; diff --git a/tree/major_house.html b/tree/major_house.html index c12a924..c1aa4c9 100644 --- a/tree/major_house.html +++ b/tree/major_house.html @@ -116,7 +116,7 @@ //adjust camera scroll var $div = $('.duo'); var screenLeftMin = 50; - var screenLeftMax = 170; + var screenLeftMax = 500; function adjustScroll() { var playerLeft = parseInt($div.css("left")); @@ -138,7 +138,13 @@ var $div = $('.duo'); $(document).keydown(function(e) { var offset = $div.position(); console.log("offset:", offset); + var parent_width = $("#ground").width(); + var left_val_px = $div.css('left'); + var left_val_only = parseInt(left_val_px); + var left_Percentage = (left_val_only/parent_width) * 100; + console.log ("left %", left_Percentage); + if (left_Percentage < 72) { switch (e.which) { case 37: offset.left -= 20; @@ -151,13 +157,29 @@ $(document).keydown(function(e) { console.log("right"); $div.removeClass("flipped"); break; + } + } + + else { + console.log("70 ora") + $(document).scrollLeft(8000); + $(".message1").hide(); + $(".message2").show(); + setTimeout( function() { + $('.bubble1').show(); + setTimeout( function() { + $('.glasses_bar').show(); + $('.glasses_bar').addClass("glass_appear"); + }, 3000); + }, 2000); + } - } + //check the offset and prevent the character from exceeding screen dimension if (offset.left < 80) { offset.left = 80; } - +/* if (offset.left > $("#ground").width() - 1000) { offset.left = $("#ground").width() - 1000; $(document).scrollLeft(3500); @@ -170,7 +192,7 @@ $(document).keydown(function(e) { $('.glasses_bar').addClass("glass_appear"); }, 3000); }, 2000); - } + }*/ $div.css("left", offset.left); @@ -200,8 +222,5 @@ $(document).keydown(function(e) { - - - \ No newline at end of file diff --git a/tree/monteferro.css b/tree/monteferro.css index 7c85988..11e6337 100644 --- a/tree/monteferro.css +++ b/tree/monteferro.css @@ -78,15 +78,19 @@ div.text_container { padding-left: 10px; padding-right: 10px; font-family: sinistre; - /*-webkit-box-shadow: 0px 0px 8px 8px #ccb3ff; - -moz-box-shadow: 0px 0px 8px 8px #ccb3ff; - box-shadow: 0px 0px 8px 8px #ccb3ff; - font-size: 1.6vw;*/ background-color: white; border: 0.11vw black solid; - border-radius: 25vw; color:black; font-size: 1.4vw; + line-height: normal ; +} + +.game_bar_glow{ + border: 0.11vw transparent solid; + background-color: transparent; + -webkit-box-shadow: 0px 0px 8px 1px black ; + -moz-box-shadow: 0px 0px 8px 1px black ; + box-shadow: 0px 0px 8px 1px black ; } button{ diff --git a/tree/monteferro.html b/tree/monteferro.html index b78b493..aa525e9 100644 --- a/tree/monteferro.html +++ b/tree/monteferro.html @@ -270,6 +270,7 @@ var loose_counter = 0; function check_counters() { if (fluoride_counter == 5) { + $(".game_bar").addClass("game_bar_glow"); $(".field_cover").css("z-index",10); console.log ("you won!"); fluoride_counter = 0; diff --git a/tree/park.css b/tree/park.css index 1be515a..0ff0f81 100644 --- a/tree/park.css +++ b/tree/park.css @@ -509,7 +509,56 @@ text-decoration: underline solid 3px; display: block; } - +#info_button{ + font-size: 3vw; + position:absolute; + left: 30px; + top:30px; + color: #c94dff ; + cursor: pointer; +} +.info_text{ + position: fixed; + color:#c94dff ; + font-family: jolyregular; + background-color: white; + top:7%; + right:4%; + border:1px #c94dff solid; + font-size: 22px; + /*line-height: 30px;*/ + width: 600px; + height: 160px; + border-radius: 10px; + padding: 20px; + z-index: 100; +} +.info_text:after { + content: ''; + position: absolute; + display: block; + width: 0; + z-index: 1; + border-style: solid; + border-color: #ffffff transparent; + border-width: 0 20px 20px; + top: -20px; + left: 80%; + margin-left: -20px; +} +.info_text:before { + content: ''; + position: absolute; + width: 0; + z-index: 0; + border-style: solid; + border-color: #c94dff transparent; + border-width: 0 21px 21px; + top: -21.5px; + left: 80%; + margin-left: -21px; + display: block; +} diff --git a/tree/park.html b/tree/park.html index 15e088e..bc5bc4b 100644 --- a/tree/park.html +++ b/tree/park.html @@ -9,6 +9,13 @@ + +