diff --git a/tree/imgs/spring_river/army1.gif b/tree/imgs/spring_river/army1.gif new file mode 100644 index 0000000..1dcfd27 Binary files /dev/null and b/tree/imgs/spring_river/army1.gif differ diff --git a/tree/imgs/spring_river/fighter6.gif b/tree/imgs/spring_river/fighter6.gif index 0e2ba85..cc76bf4 100644 Binary files a/tree/imgs/spring_river/fighter6.gif and b/tree/imgs/spring_river/fighter6.gif differ diff --git a/tree/imgs/spring_river/fighter8.gif b/tree/imgs/spring_river/fighter8.gif index 5a72f03..ea24fe4 100644 Binary files a/tree/imgs/spring_river/fighter8.gif and b/tree/imgs/spring_river/fighter8.gif differ diff --git a/tree/imgs/spring_river/fire.gif b/tree/imgs/spring_river/fire.gif new file mode 100644 index 0000000..f204dd8 Binary files /dev/null and b/tree/imgs/spring_river/fire.gif differ diff --git a/tree/imgs/spring_river/fire_once.gif b/tree/imgs/spring_river/fire_once.gif new file mode 100644 index 0000000..7e77d0e Binary files /dev/null and b/tree/imgs/spring_river/fire_once.gif differ diff --git a/tree/monteferro.css b/tree/monteferro.css index 5534cb4..3907f82 100644 --- a/tree/monteferro.css +++ b/tree/monteferro.css @@ -1,8 +1,8 @@ @font-face { font-family: sinistre; - src: url(fonts/Sinistre-S†Caroline.woff), - url(fonts/Sinistre-S†Caroline.otf); + src: url(fonts/Sinistre-StCaroline.woff), + url(fonts/Sinistre-StCaroline.otf); } @font-face { font-family: jolybolditalic; @@ -224,8 +224,20 @@ span.button_text{ display: grid; grid-template-columns: 25% 25% 25% 25% 25%; grid-template-rows: 25% 25% 25% 25%; - + z-index: 1; } +.field_cover { + max-width: 47%; + max-height: 55%; + top: 15%; + bottom: 10%; + left: 31%; + right: 32.5%; + position: absolute; + background-color:transparent; + z-index: 5; +} + img.corn{ max-width: 100%; max-height: 100%; diff --git a/tree/monteferro.html b/tree/monteferro.html index 5904c1c..d79ee70 100644 --- a/tree/monteferro.html +++ b/tree/monteferro.html @@ -30,7 +30,7 @@
- +
@@ -116,6 +116,7 @@ $("#start_button").click (function () { $(".ned_baloon2,.ned_baloon1, .message1, .message2 ").hide(); $(".game_bar").show(); + $(".field_cover").css("z-index",-10); }); // fluoride game @@ -250,6 +251,7 @@ var loose_counter = 0; function check_counters() { if (fluoride_counter == 5) { + $(".field_cover").css("z-index",10); console.log ("you won!"); fluoride_counter = 0; loose_counter = 0; @@ -259,6 +261,7 @@ var loose_counter = 0; } if (loose_counter == 6) { + $(".field_cover").css("z-index",10); console.log ("you lost!"); fluoride_counter = 0; loose_counter = 0; @@ -268,6 +271,7 @@ var loose_counter = 0; } $("#try_again").click (function () { + $(".field_cover").css("z-index",-10); $(".corn").attr('src', "imgs/monteferro/corn.gif"); $('.cobs_collected').html(fluoride_counter); $(".message_lost, .farmer").hide(); diff --git a/tree/park.css b/tree/park.css index 7f874a6..123a237 100644 --- a/tree/park.css +++ b/tree/park.css @@ -191,6 +191,10 @@ a { color: #c94dff; } +.blur_background { + filter: blur(20px); +} + a:hover { background-color:#c94dff; color: white; diff --git a/tree/park.html b/tree/park.html index bbf9f9d..ffc9045 100644 --- a/tree/park.html +++ b/tree/park.html @@ -104,27 +104,27 @@ -
+
-
- - - - - - - - - - - +
+ + + + + + + + + + +
-
+
@@ -171,6 +171,7 @@ $(".open_newspaper_index").click (function(){ $(".message1, .message4").hide(); $("#newspaper, .close").show(); + $(".blur"). addClass("blur_background"); //saves that u opened the newspaper in the local storage window.localStorage.setItem("newspaper","opened") console.log ("newspaper:",localStorage.newspaper) @@ -227,6 +228,7 @@ $("#baloon4").hide(); $(".message1").hide(); $(".message4").show(); + $(".blur"). removeClass("blur_background"); }); $("#fries").click (function(){ diff --git a/tree/river_bank.css b/tree/river_bank.css index 34e52b7..d74dcee 100644 --- a/tree/river_bank.css +++ b/tree/river_bank.css @@ -151,7 +151,7 @@ span.button_text{ z-index: 3; } -#ferryman { +.ferryman { top:46%; left: 48%; position: absolute; diff --git a/tree/river_bank.html b/tree/river_bank.html index e085a27..d8da31a 100644 --- a/tree/river_bank.html +++ b/tree/river_bank.html @@ -16,7 +16,10 @@
- +
+ + +
@@ -62,25 +65,26 @@ // boat animation - $("#ferryman").click (function(){ + $(".ferryman").click (function(){ console.log("ciao"); $(".bubble").show(); setTimeout( function() { - $(".bubble2").show(); + $("#ferryman_good").hide(); + $(".bubble2,#ferryman_evil").show(); setTimeout( function() { $(".bubble2,.bubble").hide(); setTimeout( function() { - $("#boat_empty, #army, #ferryman").hide(); + $("#ferryman_evil").detach(); + $("#boat_empty, #army").hide(); $("#boat_full").show(); $("#player_img").removeClass("player_land"); - //$("#player_img").addClass("player_boat"); $("#player_img").hide(); $(".boat").animate({ left: "100%" }, { duration: 2500 }) .promise().done(function(){ location.href='spring_river.html'; }); - }, 1000); + }, 1500); }, 1000); }, 1000); }); diff --git a/tree/spring_river.css b/tree/spring_river.css index fd4c4c6..0886daa 100644 --- a/tree/spring_river.css +++ b/tree/spring_river.css @@ -58,7 +58,7 @@ } #ground_color { - width: 6100px; + width: 5100px; height: 120%; position:fixed; margin:-100px; @@ -69,7 +69,7 @@ #ground{ position:absolute; height:100%; - width:6000px; + width:5000px; } #groundline { @@ -128,11 +128,11 @@ div#player_img { } .army { - position: fixed; - left:2%; - top: 50px; - height: 380px; - width: 500px; + position: absolute; + top:10%; + left: 5%; + width: 450px; + height: 300px; } @@ -195,15 +195,15 @@ div#player_img { #tree1 { - top:30%; + top:6%; left: 17%; position: absolute; z-index:0; } #tree2 { - bottom:18%; - left: 10%; + top:40%; + left: 14%; position: absolute; z-index:2; } diff --git a/tree/spring_river.html b/tree/spring_river.html index 8e0d371..4248338 100644 --- a/tree/spring_river.html +++ b/tree/spring_river.html @@ -14,24 +14,19 @@
-
-
-
- - - - - - - - - - -
- - - +
+
+ + + + + + + + +
+
@@ -39,40 +34,43 @@ - -
+
-
-
- You and your army arrived at the Spring River Natural Park.
- → Move with the right arrow to find the children! +
+ +
+ You and your army arrived at the Spring River Natural Park.
+ → Move with the right arrow to find the children!
-
+