galline

4 years ago · 6bd5e08b7b
parent 52dd07c075
commit 6bd5e08b7b
14 changed files with 32 additions and 29 deletions
--- a/tree/imgs/.DS_Store
+++ b/tree/imgs/.DS_Store
--- a/tree/imgs/monteferro/.DS_Store
+++ b/tree/imgs/monteferro/.DS_Store
--- a/tree/imgs/monteferro/cow.gif
+++ b/tree/imgs/monteferro/cow.gif
--- a/tree/imgs/monteferro/cow2.gif
+++ b/tree/imgs/monteferro/cow2.gif
--- a/tree/imgs/monteferro/farmer1.gif
+++ b/tree/imgs/monteferro/farmer1.gif
--- a/tree/imgs/monteferro/farmer2.gif
+++ b/tree/imgs/monteferro/farmer2.gif
--- a/tree/imgs/monteferro/farmer3.png
+++ b/tree/imgs/monteferro/farmer3.png
--- a/tree/imgs/monteferro/farmer5.gif
+++ b/tree/imgs/monteferro/farmer5.gif
--- a/tree/imgs/monteferro/gallina1.gif
+++ b/tree/imgs/monteferro/gallina1.gif
--- a/tree/imgs/monteferro/gallina2.2.gif
+++ b/tree/imgs/monteferro/gallina2.2.gif
--- a/tree/imgs/monteferro/gallina2.gif
+++ b/tree/imgs/monteferro/gallina2.gif
--- a/tree/imgs/monteferro/ned.gif
+++ b/tree/imgs/monteferro/ned.gif
--- a/tree/monteferro.css
+++ b/tree/monteferro.css
@ -71,14 +71,21 @@ div.text_container {
    top:40px;
    right:80px;
    position:fixed;
-    background-color: #ccb3ff;
    border-radius: 25vw;
-    padding: 3px;
+    
+    padding-left: 10px;
+    padding-right: 10px;
    font-family: sinistre;
-    -webkit-box-shadow: 0px 0px 8px 8px  #ccb3ff;
+    /*-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;
+    font-size: 1.6vw;*/
+    background-color: white;
+    border: 0.11vw black solid;
+    border-radius: 25vw;
+    color:black;
+    cursor:pointer;
+    font-size: 1.4vw;

 }

@ -119,43 +126,38 @@ span.button_text{
    z-index: 0;
 }

-
-#barn {
-    bottom: 16%;
-    right: 4%;
+#gallina1{
+    bottom: 20%;
+    right: 7%;
    position:absolute ;
-    z-index: 10;
+    z-index: 5;
 }

-#tree2 {
-    bottom: 20%;
-    right: 7%;
+#gallina2{
+    bottom: 63%;
+    right: 20%;
    position:absolute ;
    z-index: 5;
 }
+
 #tree1 {
    bottom: 47%;
    left: 8%;
    position:absolute ;

 }
- #cow {
-    bottom: 25%;
-    right: 12%;
-    position:absolute ;
-    
- }
+

 #farmer_figure {
-    bottom: 30%;
-    right: 8%;
+    bottom: 29%;
+    right: 15%;
    position:absolute ;

 }

 #farmer_baloon {
-    bottom: 50%;
-    right: 18%;
+    bottom: 52%;
+    right: 19%;
    position:absolute ;
    z-index: 10;
    background: #ffffff;
@ -211,7 +213,7 @@ span.button_text{
    max-height: 55%;
    top: 15%;
    bottom: 10%;
-    left: 32.5%;
+    left: 31%;
    right: 32.5%;
    position: absolute;
    display: grid;
--- a/tree/monteferro.html
+++ b/tree/monteferro.html
@ -10,13 +10,14 @@
 </head>
 <body>

-    <!--<img  id="barn" src="imgs/monteferro/barn2.png" height="150px">-->
+   
    <img  id="mulino" src="imgs/monteferro/mulino.gif" height="140px">
    <img  id="tree1" src="imgs/monteferro/tree.gif" height="220px">
-    <img  id="tree2" src="imgs/monteferro/bush.gif" height="80px">
-    <!--<img  id="cow" src="imgs/monteferro/cow2.gif" height="140px">-->
+    <img  id="gallina1" src="imgs/monteferro/gallina2.gif" height="60px">
+    <img  id="gallina2" src="imgs/monteferro/gallina2.2.gif" height="60px">
+   

-    <img  class="farmer" id="farmer_figure" src="imgs/monteferro/farmer.gif" style="display: none;" height="120px">  
+    <img  class="farmer" id="farmer_figure" src="imgs/monteferro/farmer5.gif" style="display: none;" height="120px">  
    <div class="farmer" id="farmer_baloon" style="display: none;" >*!!!*</div>

    <div class="baloons">
@ -249,14 +250,14 @@ var loose_counter = 0;
    }
    if (loose_counter == 6) {
        console.log ("you lost!");
+        fluoride_counter = 0;
+        loose_counter = 0;
        $(".message_won").hide();
        $(".message_lost, .farmer").show();
    }
  }

  $("#try_again").click (function () {
-        fluoride_counter = 0;
-        loose_counter = 0;
        $(".corn").attr('src', "imgs/monteferro/corn.gif");
        $('.cobs_collected').html(fluoride_counter);
        $(".message_lost, .farmer").hide();