diff --git a/tree/bus_station.css b/tree/bus_station.css index 21f2a11..b5cfff2 100644 --- a/tree/bus_station.css +++ b/tree/bus_station.css @@ -83,7 +83,7 @@ div.text_container { - bottom: 40px; + bottom: 20px; left:40px; right:40px; position:fixed; @@ -363,6 +363,7 @@ div#player_img { padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .bubble1:after { content: ''; @@ -407,6 +408,7 @@ div#player_img { padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .bubble2:after { content: ''; diff --git a/tree/bus_station.html b/tree/bus_station.html index f21fadb..ae3185a 100644 --- a/tree/bus_station.html +++ b/tree/bus_station.html @@ -105,8 +105,8 @@ - - + +
@@ -281,6 +281,12 @@ $(document).keydown(function(e) { }, 2000); }; } + $(".bubble1").click(function () { + $(".bubble1").toggle(); + }); + $(".bubble2").click(function () { + $(".bubble2").toggle(); + }); $("#meat1").click(function () { console.log ("ora!") @@ -425,33 +431,7 @@ function enter() { }); } - - - - - - -/* -function enter() { - $("#fighter1").hide(); - document.getElementById("fighter1").style.position = "fixed"; - $("#fighter1").css({ left: "82%", top:"40%"}); - setTimeout ( function (){ - $("#fighter1").show(); - $("#fighter1").animate({ top: "100%"}, { - duration: 1000 - }).promise().done(function(){ - $("#fighter1").hide(); - }); - }, 500); -} -*/ - - - - - diff --git a/tree/imgs/.DS_Store b/tree/imgs/.DS_Store index ec46930..fde61e9 100644 Binary files a/tree/imgs/.DS_Store and b/tree/imgs/.DS_Store differ diff --git a/tree/imgs/butchery/.DS_Store b/tree/imgs/butchery/.DS_Store index 4022baf..96aba53 100644 Binary files a/tree/imgs/butchery/.DS_Store and b/tree/imgs/butchery/.DS_Store differ diff --git a/tree/imgs/monteferro/farmer_replace.gif b/tree/imgs/monteferro/farmer_replace.gif new file mode 100644 index 0000000..c8a5bf7 Binary files /dev/null and b/tree/imgs/monteferro/farmer_replace.gif differ diff --git a/tree/imgs/butchery/roasted.gif b/tree/imgs/monteferro/roasted.gif similarity index 100% rename from tree/imgs/butchery/roasted.gif rename to tree/imgs/monteferro/roasted.gif diff --git a/tree/monteferro.css b/tree/monteferro.css index 3907f82..7c85988 100644 --- a/tree/monteferro.css +++ b/tree/monteferro.css @@ -38,10 +38,8 @@ body { font-family: jolyregular; font-size: 1.8vw; - } - .instructions{ font-family:jolyregularitalic; @@ -64,7 +62,7 @@ div.text_container { - bottom: 40px; + bottom: 35px; left:40px; right:40px; position:fixed; @@ -77,7 +75,6 @@ div.text_container { right:80px; position:fixed; border-radius: 25vw; - padding-left: 10px; padding-right: 10px; font-family: sinistre; @@ -89,9 +86,7 @@ div.text_container { border: 0.11vw black solid; border-radius: 25vw; color:black; - cursor:pointer; font-size: 1.4vw; - } button{ @@ -122,6 +117,7 @@ span.button_text{ left: 15%; position:absolute ; z-index: 1; + cursor: pointer; } #player_img { @@ -136,6 +132,7 @@ span.button_text{ right: 7%; position:absolute ; z-index: 5; + cursor: pointer; } #gallina2{ @@ -143,6 +140,15 @@ span.button_text{ right: 20%; position:absolute ; z-index: 5; + cursor: pointer; +} + +#gallina3{ + bottom: 52%; + left: 24%; + position:absolute ; + z-index: 5; + cursor: pointer; } #tree1 { @@ -171,8 +177,8 @@ span.button_text{ font-size: 16px; line-height: 17px; text-align: center; - width: 50px; - height: 20px; + width: 90px; + height: 50px; border-radius: 10px; padding: 18px; border: #000000 solid 1px; @@ -203,7 +209,51 @@ span.button_text{ margin-left: -10px; display: block; } - +#chicken1_baloon { + bottom: 31%; + right: 10%; + position:absolute ; + z-index: 10; + background: #ffffff; + color: #000000; + font-family: sinistre; + font-size: 16px; + line-height: 17px; + text-align: center; + width: 90px; + height: 50px; + border-radius: 10px; + padding: 18px; + border: #000000 solid 1px; + z-index: 50; + cursor: pointer; +} +#chicken1_baloon:after { + content: ''; + position: absolute; + display: block; + width: 0; + z-index: 1; + border-style: solid; + border-width: 0 20px 20px 0; + border-color: transparent #ffffff transparent transparent; + bottom: -20px; + left: 68%; + margin-left: -10px; +} +#chicken1_baloon:before { + content: ''; + position: absolute; + width: 0; + z-index: 0; + border-style: solid; + border-width: 0 21px 21px 0; + border-color: transparent #000000 transparent transparent; + bottom: -22px; + left: 68%; + margin-left: -10px; + display: block; +} #mulino { @@ -253,7 +303,7 @@ img.corn{ .ned_baloon1 { left: 5%; - bottom: 47%; + bottom: 43%; position: absolute; background: #ffffff; color: #000000; @@ -267,6 +317,7 @@ img.corn{ padding: 18px; border: #000000 solid 1px; z-index:10; + cursor: pointer; } .ned_baloon1:after { content: ''; @@ -310,6 +361,7 @@ img.corn{ padding: 18px; border: #000000 solid 1px; z-index: 11; + cursor: pointer; } .ned_baloon2:after { content: ''; diff --git a/tree/monteferro.html b/tree/monteferro.html index d79ee70..b78b493 100644 --- a/tree/monteferro.html +++ b/tree/monteferro.html @@ -15,14 +15,16 @@ - + + - - + + +
- - + +
@@ -58,8 +60,8 @@
- @@ -126,12 +126,13 @@ $(document).keydown(function(e) { }); } - if (left_Percentage > 80) { + if (left_Percentage > 70) { + $("#cat").addClass("flipped"); $("#cat").show(); - $("#cat").animate({ left: "110%" }, { - duration: 2500 + $("#cat").animate({ left: "20%" }, { + duration: 1500 }).promise().done(function(){ - $("#cat").hide(); + $("#cat").hide(); }); } @@ -213,6 +214,9 @@ $(document).keydown(function(e) { $("#woman").click (function(){ + $(".woman_bubble").show(); + }); + $(".woman_bubble").click (function(){ $(".woman_bubble").toggle(); }); @@ -221,40 +225,56 @@ $(document).keydown(function(e) { }); $(".dog_bubble").click (function(){ - $(".message1").hide(); + $(".message1, .dog_bubble").hide(); $(".dog_bubble2, .message_dog").toggle(); - setTimeout ( function() { - $(".dog_bubble2, .message_dog").hide(); - }, 5000) + }); + + $(".dog_bubble2").click (function(){ + $(".message1").hide(); + $(".message_dog, .dog_bubble2").toggle(); }); $("#newspaper_seller").click (function(){ + $(".vendor_bubble").show(); + }); + $(".vendor_bubble").click (function(){ $(".vendor_bubble").toggle(); }); $("#sport1").click (function(){ + $(".fit2_bubble").show(); + }); + $(".fit2_bubble").click (function(){ $(".fit2_bubble").toggle(); }); $("#sport2").click (function(){ + $(".fit1_bubble").show(); + }); + $(".fit1_bubble").click (function(){ $(".fit1_bubble").toggle(); }); $("#ned").click (function(){ - $(".ned_bubble1").toggle(); + $(".ned_bubble1").show(); $(".message2").show(); $(".message1").hide(); - setTimeout (function () { - $(".ned_bubble2").show(); - },2000); + }); + + $(".ned_bubble1").click (function(){ + $(".ned_bubble2").show(); + $(".ned_bubble1").hide(); }); $(".ned_bubble2").click (function(){ - $(".ned_bubble3").toggle(); + $(".ned_bubble2").toggle(); + $(".ned_bubble3").show(); $(".message2").hide(); - setTimeout (function () { - $(".message3").show(); - },3000); + $(".message3").show(); + }); + + $(".ned_bubble3").click (function(){ + $(".ned_bubble3").toggle(); }); diff --git a/tree/park_N_clues.css b/tree/park_N_clues.css index 3a57c23..aa1d637 100644 --- a/tree/park_N_clues.css +++ b/tree/park_N_clues.css @@ -80,7 +80,7 @@ div.text_container { - bottom: 40px; + bottom: 20px; left:40px; right:40px; position:fixed; @@ -336,6 +336,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index:50; + cursor: pointer; } .woman_bubble:after { content: ''; @@ -364,20 +365,21 @@ span.button_text{ display: block; } .dog_bubble { - bottom:33%; - left: 40%; + bottom:38.5%; + left: 36%; position: absolute; background: #ffffff; color: #000000; font-family: sinistre; font-size: 16px; text-align: center; - width:130px; + width:135px; height: 39px; border-radius: 10px; padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .dog_bubble:after { content: ''; @@ -416,12 +418,13 @@ span.button_text{ font-size: 16px; line-height: 17px; text-align: center; - width: 160px; - height: 65px; + width: 170px; + height: 58px; border-radius: 10px; padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .vendor_bubble:after { content: ''; @@ -458,12 +461,13 @@ span.button_text{ font-family: sinistre; font-size: 16px; text-align: center; - width: 150px; - height: 70px; + width: 160px; + height: 65px; border-radius: 10px; padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .woman2_bubble:after { content: ''; @@ -493,7 +497,7 @@ span.button_text{ } .fit2_bubble { - bottom:31%; + bottom:33.5%; left: 64%; position: absolute; background: #ffffff; @@ -501,12 +505,13 @@ span.button_text{ font-family: sinistre; font-size: 16px; text-align: center; - width: 150px; - height: 55px; + width: 170px; + height: 45px; border-radius: 10px; padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .fit2_bubble:after { content: ''; @@ -543,12 +548,13 @@ span.button_text{ font-family: sinistre; font-size: 16px; text-align: center; - width: 150px; - height: 80px; + width: 170px; + height: 60px; border-radius: 10px; padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .fit1_bubble:after { content: ''; @@ -593,6 +599,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index:50; + cursor: pointer; } .ned_bubble1:after { content: ''; @@ -637,6 +644,8 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index:50; + cursor: pointer; + } .ned_bubble2:after { content: ''; @@ -666,7 +675,7 @@ span.button_text{ } .ned_bubble3 { - top:50%; + top:47%; left: 90%; position: absolute; background: #ffffff; @@ -681,6 +690,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index:50; + cursor: pointer; } .ned_bubble3:after { content: ''; diff --git a/tree/park_N_clues.html b/tree/park_N_clues.html index 86ce5bb..2740a9c 100644 --- a/tree/park_N_clues.html +++ b/tree/park_N_clues.html @@ -44,15 +44,15 @@ - - - - - - + + + + + + - - + +
@@ -225,39 +225,65 @@ $(document).keydown(function(e) { $("#woman").click (function(){ + $(".woman_bubble").show(); + }); + + $(".woman_bubble").click (function(){ $(".woman_bubble").toggle(); }); $("#woman2").click (function(){ + $(".woman2_bubble").show(); + }); + $(".woman2_bubble").click (function(){ $(".woman2_bubble").toggle(); }); $("#dog").click (function(){ + $(".dog_bubble").show(); + }); + $(".dog_bubble").click (function(){ $(".dog_bubble").toggle(); }); $("#newspaper_seller").click (function(){ + $(".vendor_bubble").show(); + }); + $(".vendor_bubble").click (function(){ $(".vendor_bubble").toggle(); }); $("#sport1").click (function(){ + $(".fit2_bubble").show(); + }); + $(".fit2_bubble").click (function(){ $(".fit2_bubble").toggle(); }); $("#sport2").click (function(){ + $(".fit1_bubble").show(); + }); + $(".fit1_bubble").click (function(){ $(".fit1_bubble").toggle(); }); $("#ned").click (function(){ - $(".ned_bubble2").toggle(); + $(".ned_bubble2").show(); $(".message1").hide(); + }); + + $(".ned_bubble2").click( function() { + $(".ned_bubble2").hide(); + $(".ned_bubble3").show(); setTimeout (function () { - $(".ned_bubble3").show(); - setTimeout (function () { $(".message3").show(); - },2000); - },2000); + },1000); + }) + + $(".ned_bubble3").click( function() { + $(".ned_bubble3").toggle(); }); + /* $(".ned_more").click (function(){ $(".ned_bubble3").toggle(); diff --git a/tree/park_walk.css b/tree/park_walk.css index c11a693..d066f03 100644 --- a/tree/park_walk.css +++ b/tree/park_walk.css @@ -80,7 +80,7 @@ div.text_container { - bottom: 40px; + bottom: 20px; left:40px; right:40px; position:fixed; @@ -217,7 +217,7 @@ span.button_text{ z-index:4; } #cat{ - bottom: 20%; + bottom: 22%; left: 70%; position: absolute; z-index:3; @@ -314,7 +314,7 @@ span.button_text{ } .woman_bubble { - top:13%; + top:8%; left: 31%; position: absolute; background: #ffffff; @@ -329,6 +329,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .woman_bubble:after { @@ -358,8 +359,8 @@ span.button_text{ display: block; } .dog_bubble { - bottom:33%; - left: 40%; + bottom:35%; + left: 39%; position: absolute; background: #ffffff; color: #000000; @@ -373,6 +374,7 @@ span.button_text{ border: #000000 solid 1px; cursor:pointer; z-index: 50; + cursor: pointer; } .dog_bubble:after { content: ''; @@ -416,6 +418,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .dog_bubble2:after { content: ''; @@ -460,6 +463,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .vendor_bubble:after { content: ''; @@ -503,6 +507,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .fit2_bubble:after { content: ''; @@ -545,6 +550,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index: 50; + cursor: pointer; } .fit1_bubble:after { content: ''; @@ -589,6 +595,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index:50; + cursor: pointer; } .ned_bubble1:after { content: ''; @@ -678,6 +685,7 @@ span.button_text{ padding: 18px; border: #000000 solid 1px; z-index:50; + cursor: pointer; } .ned_bubble3:after { content: ''; diff --git a/tree/saurians_head.css b/tree/saurians_head.css index fd212e8..029b34f 100644 --- a/tree/saurians_head.css +++ b/tree/saurians_head.css @@ -444,9 +444,6 @@ img#cat3{ } - - - /* hide scroll bar */ /* width */ ::-webkit-scrollbar { diff --git a/tree/saurians_head.html b/tree/saurians_head.html index d03575b..decb295 100644 --- a/tree/saurians_head.html +++ b/tree/saurians_head.html @@ -38,7 +38,7 @@
- +
@@ -61,7 +61,7 @@
- +
@@ -85,7 +85,7 @@
- +
@@ -102,7 +102,7 @@
- +