CS24-Team-Dream · bryant00 · Jan 13, 2020
diff --git a/pytower/assets/Ninja/1x/attack_0.png b/pytower/assets/Ninja/1x/attack_0.png
diff --git a/pytower/assets/Ninja/1x/attack_1.png b/pytower/assets/Ninja/1x/attack_1.png
diff --git a/pytower/assets/Ninja/1x/attack_2.png b/pytower/assets/Ninja/1x/attack_2.png
diff --git a/pytower/assets/Ninja/1x/idle_0.png b/pytower/assets/Ninja/1x/idle_0.png
diff --git a/pytower/assets/Ninja/1x/idle_1.png b/pytower/assets/Ninja/1x/idle_1.png
diff --git a/pytower/assets/Ninja/1x/idle_2.png b/pytower/assets/Ninja/1x/idle_2.png
diff --git a/pytower/assets/Ninja/1x/idle_3.png b/pytower/assets/Ninja/1x/idle_3.png
diff --git a/pytower/assets/Ninja/1x/jump_0.png b/pytower/assets/Ninja/1x/jump_0.png
diff --git a/pytower/assets/Ninja/1x/jump_1.png b/pytower/assets/Ninja/1x/jump_1.png
diff --git a/pytower/assets/Ninja/1x/jump_2.png b/pytower/assets/Ninja/1x/jump_2.png
diff --git a/pytower/assets/Ninja/1x/jump_3.png b/pytower/assets/Ninja/1x/jump_3.png
diff --git a/pytower/assets/Ninja/1x/run_0.png b/pytower/assets/Ninja/1x/run_0.png
diff --git a/pytower/assets/Ninja/1x/run_1.png b/pytower/assets/Ninja/1x/run_1.png
diff --git a/pytower/assets/Ninja/1x/run_2.png b/pytower/assets/Ninja/1x/run_2.png
diff --git a/pytower/assets/Ninja/1x/run_3.png b/pytower/assets/Ninja/1x/run_3.png
diff --git a/pytower/assets/Ninja/1x/run_4.png b/pytower/assets/Ninja/1x/run_4.png
diff --git a/pytower/assets/Ninja/1x/run_5.png b/pytower/assets/Ninja/1x/run_5.png
diff --git a/pytower/assets/Ninja/1x/swim_0.png b/pytower/assets/Ninja/1x/swim_0.png
diff --git a/pytower/assets/Ninja/1x/swim_1.png b/pytower/assets/Ninja/1x/swim_1.png
diff --git a/pytower/assets/Ninja/1x/swim_2.png b/pytower/assets/Ninja/1x/swim_2.png
diff --git a/pytower/assets/Ninja/1x/swim_3.png b/pytower/assets/Ninja/1x/swim_3.png
diff --git a/pytower/assets/Ninja/1x/swim_4.png b/pytower/assets/Ninja/1x/swim_4.png
diff --git a/pytower/assets/Ninja/1x/swim_5.png b/pytower/assets/Ninja/1x/swim_5.png
diff --git a/pytower/assets/Ninja/1x/x_0.png b/pytower/assets/Ninja/1x/x_0.png
diff --git a/pytower/assets/Ninja/1x/x_1.png b/pytower/assets/Ninja/1x/x_1.png
diff --git a/pytower/assets/Ninja/1x/x_2.png b/pytower/assets/Ninja/1x/x_2.png
diff --git a/pytower/assets/Ninja/1x/x_3.png b/pytower/assets/Ninja/1x/x_3.png
diff --git a/pytower/assets/Ninja/2x/attack_0.png b/pytower/assets/Ninja/2x/attack_0.png
diff --git a/pytower/assets/Ninja/2x/attack_1.png b/pytower/assets/Ninja/2x/attack_1.png
diff --git a/pytower/assets/Ninja/2x/attack_2.png b/pytower/assets/Ninja/2x/attack_2.png
diff --git a/pytower/assets/Ninja/2x/idle_0.png b/pytower/assets/Ninja/2x/idle_0.png
diff --git a/pytower/assets/Ninja/2x/idle_1.png b/pytower/assets/Ninja/2x/idle_1.png
diff --git a/pytower/assets/Ninja/2x/idle_2.png b/pytower/assets/Ninja/2x/idle_2.png
diff --git a/pytower/assets/Ninja/2x/idle_3.png b/pytower/assets/Ninja/2x/idle_3.png
diff --git a/pytower/assets/Ninja/2x/jump_0.png b/pytower/assets/Ninja/2x/jump_0.png
diff --git a/pytower/assets/Ninja/2x/jump_1.png b/pytower/assets/Ninja/2x/jump_1.png
diff --git a/pytower/assets/Ninja/2x/jump_2.png b/pytower/assets/Ninja/2x/jump_2.png
diff --git a/pytower/assets/Ninja/2x/jump_3.png b/pytower/assets/Ninja/2x/jump_3.png
diff --git a/pytower/assets/Ninja/2x/run_0.png b/pytower/assets/Ninja/2x/run_0.png
diff --git a/pytower/assets/Ninja/2x/run_1.png b/pytower/assets/Ninja/2x/run_1.png
diff --git a/pytower/assets/Ninja/2x/run_2.png b/pytower/assets/Ninja/2x/run_2.png
diff --git a/pytower/assets/Ninja/2x/run_3.png b/pytower/assets/Ninja/2x/run_3.png
diff --git a/pytower/assets/Ninja/2x/run_4.png b/pytower/assets/Ninja/2x/run_4.png
diff --git a/pytower/assets/Ninja/2x/run_5.png b/pytower/assets/Ninja/2x/run_5.png
diff --git a/pytower/assets/Ninja/2x/swim_0.png b/pytower/assets/Ninja/2x/swim_0.png
diff --git a/pytower/assets/Ninja/2x/swim_1.png b/pytower/assets/Ninja/2x/swim_1.png
diff --git a/pytower/assets/Ninja/2x/swim_2.png b/pytower/assets/Ninja/2x/swim_2.png
diff --git a/pytower/assets/Ninja/2x/swim_3.png b/pytower/assets/Ninja/2x/swim_3.png
diff --git a/pytower/assets/Ninja/2x/swim_4.png b/pytower/assets/Ninja/2x/swim_4.png
diff --git a/pytower/assets/Ninja/2x/swim_5.png b/pytower/assets/Ninja/2x/swim_5.png
diff --git a/pytower/assets/Ninja/2x/x_0.png b/pytower/assets/Ninja/2x/x_0.png
diff --git a/pytower/assets/Ninja/2x/x_1.png b/pytower/assets/Ninja/2x/x_1.png
diff --git a/pytower/assets/Ninja/2x/x_2.png b/pytower/assets/Ninja/2x/x_2.png
diff --git a/pytower/assets/Ninja/2x/x_3.png b/pytower/assets/Ninja/2x/x_3.png
diff --git a/pytower/assets/Ninja/3x/attack_0.png b/pytower/assets/Ninja/3x/attack_0.png
diff --git a/pytower/assets/Ninja/3x/attack_1.png b/pytower/assets/Ninja/3x/attack_1.png
diff --git a/pytower/assets/Ninja/3x/attack_2.png b/pytower/assets/Ninja/3x/attack_2.png
diff --git a/pytower/assets/Ninja/3x/idle_0.png b/pytower/assets/Ninja/3x/idle_0.png
diff --git a/pytower/assets/Ninja/3x/idle_1.png b/pytower/assets/Ninja/3x/idle_1.png
diff --git a/pytower/assets/Ninja/3x/idle_2.png b/pytower/assets/Ninja/3x/idle_2.png
diff --git a/pytower/assets/Ninja/3x/idle_3.png b/pytower/assets/Ninja/3x/idle_3.png
diff --git a/pytower/assets/Ninja/3x/jump_0.png b/pytower/assets/Ninja/3x/jump_0.png
diff --git a/pytower/assets/Ninja/3x/jump_1.png b/pytower/assets/Ninja/3x/jump_1.png
diff --git a/pytower/assets/Ninja/3x/jump_2.png b/pytower/assets/Ninja/3x/jump_2.png
diff --git a/pytower/assets/Ninja/3x/jump_3.png b/pytower/assets/Ninja/3x/jump_3.png
diff --git a/pytower/assets/Ninja/3x/run_0.png b/pytower/assets/Ninja/3x/run_0.png
diff --git a/pytower/assets/Ninja/3x/run_1.png b/pytower/assets/Ninja/3x/run_1.png
diff --git a/pytower/assets/Ninja/3x/run_2.png b/pytower/assets/Ninja/3x/run_2.png
diff --git a/pytower/assets/Ninja/3x/run_3.png b/pytower/assets/Ninja/3x/run_3.png
diff --git a/pytower/assets/Ninja/3x/run_4.png b/pytower/assets/Ninja/3x/run_4.png
diff --git a/pytower/assets/Ninja/3x/run_5.png b/pytower/assets/Ninja/3x/run_5.png
diff --git a/pytower/assets/Ninja/3x/swim_0.png b/pytower/assets/Ninja/3x/swim_0.png
diff --git a/pytower/assets/Ninja/3x/swim_1.png b/pytower/assets/Ninja/3x/swim_1.png
diff --git a/pytower/assets/Ninja/3x/swim_2.png b/pytower/assets/Ninja/3x/swim_2.png
diff --git a/pytower/assets/Ninja/3x/swim_3.png b/pytower/assets/Ninja/3x/swim_3.png
diff --git a/pytower/assets/Ninja/3x/swim_4.png b/pytower/assets/Ninja/3x/swim_4.png
diff --git a/pytower/assets/Ninja/3x/swim_5.png b/pytower/assets/Ninja/3x/swim_5.png
diff --git a/pytower/assets/Ninja/3x/x_0.png b/pytower/assets/Ninja/3x/x_0.png
diff --git a/pytower/assets/Ninja/3x/x_1.png b/pytower/assets/Ninja/3x/x_1.png
diff --git a/pytower/assets/Ninja/3x/x_2.png b/pytower/assets/Ninja/3x/x_2.png
diff --git a/pytower/assets/Ninja/3x/x_3.png b/pytower/assets/Ninja/3x/x_3.png
diff --git a/pytower/assets/Ninja/4x/attack_0.png b/pytower/assets/Ninja/4x/attack_0.png
diff --git a/pytower/assets/Ninja/4x/attack_1.png b/pytower/assets/Ninja/4x/attack_1.png
diff --git a/pytower/assets/Ninja/4x/attack_2.png b/pytower/assets/Ninja/4x/attack_2.png
diff --git a/pytower/assets/Ninja/4x/idle_0.png b/pytower/assets/Ninja/4x/idle_0.png
diff --git a/pytower/assets/Ninja/4x/idle_1.png b/pytower/assets/Ninja/4x/idle_1.png
diff --git a/pytower/assets/Ninja/4x/idle_2.png b/pytower/assets/Ninja/4x/idle_2.png
diff --git a/pytower/assets/Ninja/4x/idle_3.png b/pytower/assets/Ninja/4x/idle_3.png
diff --git a/pytower/assets/Ninja/4x/jump_0.png b/pytower/assets/Ninja/4x/jump_0.png
diff --git a/pytower/assets/Ninja/4x/jump_1.png b/pytower/assets/Ninja/4x/jump_1.png
diff --git a/pytower/assets/Ninja/4x/jump_2.png b/pytower/assets/Ninja/4x/jump_2.png
diff --git a/pytower/assets/Ninja/4x/jump_3.png b/pytower/assets/Ninja/4x/jump_3.png
diff --git a/pytower/assets/Ninja/4x/run_0.png b/pytower/assets/Ninja/4x/run_0.png
diff --git a/pytower/assets/Ninja/4x/run_1.png b/pytower/assets/Ninja/4x/run_1.png
diff --git a/pytower/assets/Ninja/4x/run_2.png b/pytower/assets/Ninja/4x/run_2.png
diff --git a/pytower/assets/Ninja/4x/run_3.png b/pytower/assets/Ninja/4x/run_3.png
diff --git a/pytower/assets/Ninja/4x/run_4.png b/pytower/assets/Ninja/4x/run_4.png
diff --git a/pytower/assets/Ninja/4x/run_5.png b/pytower/assets/Ninja/4x/run_5.png
diff --git a/pytower/assets/Ninja/4x/swim_0.png b/pytower/assets/Ninja/4x/swim_0.png
diff --git a/pytower/assets/Ninja/4x/swim_1.png b/pytower/assets/Ninja/4x/swim_1.png
diff --git a/pytower/assets/Ninja/4x/swim_2.png b/pytower/assets/Ninja/4x/swim_2.png
diff --git a/pytower/assets/Ninja/4x/swim_3.png b/pytower/assets/Ninja/4x/swim_3.png
diff --git a/pytower/assets/Ninja/4x/swim_4.png b/pytower/assets/Ninja/4x/swim_4.png
diff --git a/pytower/assets/Ninja/4x/swim_5.png b/pytower/assets/Ninja/4x/swim_5.png
diff --git a/pytower/assets/Ninja/4x/x_0.png b/pytower/assets/Ninja/4x/x_0.png
diff --git a/pytower/assets/Ninja/4x/x_1.png b/pytower/assets/Ninja/4x/x_1.png
diff --git a/pytower/assets/Ninja/4x/x_2.png b/pytower/assets/Ninja/4x/x_2.png
diff --git a/pytower/assets/Ninja/4x/x_3.png b/pytower/assets/Ninja/4x/x_3.png
diff --git a/pytower/assets/Ninja/5x/attack_0.png b/pytower/assets/Ninja/5x/attack_0.png
diff --git a/pytower/assets/Ninja/5x/attack_1.png b/pytower/assets/Ninja/5x/attack_1.png
diff --git a/pytower/assets/Ninja/5x/attack_2.png b/pytower/assets/Ninja/5x/attack_2.png
diff --git a/pytower/assets/Ninja/5x/idle_0.png b/pytower/assets/Ninja/5x/idle_0.png
diff --git a/pytower/assets/Ninja/5x/idle_1.png b/pytower/assets/Ninja/5x/idle_1.png
diff --git a/pytower/assets/Ninja/5x/idle_2.png b/pytower/assets/Ninja/5x/idle_2.png
diff --git a/pytower/assets/Ninja/5x/idle_3.png b/pytower/assets/Ninja/5x/idle_3.png
diff --git a/pytower/assets/Ninja/5x/jump_0.png b/pytower/assets/Ninja/5x/jump_0.png
diff --git a/pytower/assets/Ninja/5x/jump_1.png b/pytower/assets/Ninja/5x/jump_1.png
diff --git a/pytower/assets/Ninja/5x/jump_2.png b/pytower/assets/Ninja/5x/jump_2.png
diff --git a/pytower/assets/Ninja/5x/jump_3.png b/pytower/assets/Ninja/5x/jump_3.png
diff --git a/pytower/assets/Ninja/5x/run_0.png b/pytower/assets/Ninja/5x/run_0.png
diff --git a/pytower/assets/Ninja/5x/run_1.png b/pytower/assets/Ninja/5x/run_1.png
diff --git a/pytower/assets/Ninja/5x/run_2.png b/pytower/assets/Ninja/5x/run_2.png
diff --git a/pytower/assets/Ninja/5x/run_3.png b/pytower/assets/Ninja/5x/run_3.png
diff --git a/pytower/assets/Ninja/5x/run_4.png b/pytower/assets/Ninja/5x/run_4.png
diff --git a/pytower/assets/Ninja/5x/run_5.png b/pytower/assets/Ninja/5x/run_5.png
diff --git a/pytower/assets/Ninja/5x/swim_0.png b/pytower/assets/Ninja/5x/swim_0.png
diff --git a/pytower/assets/Ninja/5x/swim_1.png b/pytower/assets/Ninja/5x/swim_1.png
diff --git a/pytower/assets/Ninja/5x/swim_2.png b/pytower/assets/Ninja/5x/swim_2.png
diff --git a/pytower/assets/Ninja/5x/swim_3.png b/pytower/assets/Ninja/5x/swim_3.png
diff --git a/pytower/assets/Ninja/5x/swim_4.png b/pytower/assets/Ninja/5x/swim_4.png
diff --git a/pytower/assets/Ninja/5x/swim_5.png b/pytower/assets/Ninja/5x/swim_5.png
diff --git a/pytower/assets/Ninja/5x/x_0.png b/pytower/assets/Ninja/5x/x_0.png
diff --git a/pytower/assets/Ninja/5x/x_1.png b/pytower/assets/Ninja/5x/x_1.png
diff --git a/pytower/assets/Ninja/5x/x_2.png b/pytower/assets/Ninja/5x/x_2.png
diff --git a/pytower/assets/Ninja/5x/x_3.png b/pytower/assets/Ninja/5x/x_3.png
diff --git a/tower_app/static/amir.css b/tower_app/static/amir.css
@@ -0,0 +1,5 @@
+body {
+  background-color: fuchsia;
+  color: fuchsia; }
+  body .wrapper {
+    border: 10 px solid fuchsia; }
diff --git a/tower_app/templates/tower_app/base.html b/tower_app/templates/tower_app/base.html
@@ -3,6 +3,7 @@
   <head>
     <title>PyTower</title>
     <link href="https://fonts.googleapis.com/css?family=Cute+Font&display=swap" rel="stylesheet">
+    {% load static %}
     <style type="text/css">
 
       html {
@@ -337,11 +338,35 @@
       .strength {
         color: blue;
       }
-
+      .avatar {
+        color : black;
+      }
       .player {
         color : black;
+        max-width: 50%;
+        height: auto;
+        z-index: 3;
+        transform-origin: center center;
+        animation: 1s infinite alternate ease-in-out runabout-animation;
+         position: relative;
+         top: 50%;
+         left: 50%;
+         object-fit: contain;
       }
 
+@keyframes runabout-animation {
+  0% {
+    transform: translate(-50%, -50%) scale(0.9) rotate(0deg) scaleX(-1);
+  }
+
+  100% {
+    transform: translate(-50%, -50%) scale(1.3) rotate(0deg) scaleX(-1);
+  }
+}
+
+
+
+
       /* section.map-wrapper#map {
 
       } */

diff --git a/tower_app/templates/tower_app/play.html b/tower_app/templates/tower_app/play.html
@@ -1,4 +1,4 @@
-{% extends 'tower_app/base.html'%} {% block content %}
+{% extends 'tower_app/base.html'%} {% load static %} {% block content %}
 
 <div class="wrapper">
   <section class="map-wrapper" id="map">
@@ -8,7 +8,8 @@
       <div id="player-stats"> 
 
         <div class="stat">
-          <i class="material-icons player">portrait</i>
+          <i class="material-icons avatar">portrait</i>
+
           <p>{{player.name}}</p>
         </div>
 
@@ -35,69 +36,77 @@ <h2>Inventory</h2>
     <div class="room one">
       <p>{{rooms.9}}</p>
       {% if player.room.id in rm10ids %}
-      <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
       {% endif %}
     </div>
     <div class="room two" style="grid-area: 2 / 1 / 3 / 2; ">
       <p>{{rooms.4}}</p>
       {% if player.room.id in rm5ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room three" style="grid-area: 2 / 2 / 3 / 3; ">
       <p>{{rooms.8}}</p>
       {% if player.room.id in rm9ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room four" style="grid-area: 3 / 2 / 4 / 3; ">
       <p>{{rooms.7}}</p>
       {% if player.room.id in rm8ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room five" style="grid-area: 3 / 3 / 4 / 4; ">
       <p>{{rooms.6}}</p>
       {% if player.room.id in rm7ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room six" style="grid-area: 4 / 2 / 5 / 3;">
       <p>{{rooms.0}}</p>
       {% if player.room.id in rm1ids %}
-      <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room seven" style="grid-area: 4 / 3 / 5 / 4; ">
       <p>{{rooms.1}}</p>
       {% if player.room.id in rm2ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room eight" style="grid-area: 4 / 4 / 5 / 5; ">
       <p>{{rooms.2}}</p>
       {% if player.room.id in rm3ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room nine" style="grid-area: 4 / 5 / 5 / 6; ">
       <p>{{rooms.3}}</p>
       {% if player.room.id in rm4ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="room ten" style="grid-area: 5 / 4 / 6 / 5; ">
       <p>{{rooms.5}}</p>
       {% if player.room.id in rm6ids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     <div class="stair room" style="grid-area: 5 / 5 / 6 / 6; ">
       <p>Stairs</p>
       {% if player.room.id in stairids %}
       <!-- <p>{{player.room.room_name}}</p> -->
-      <i class="material-icons">directions_walk</i>{% endif %}
+      <img class="player" src="{% static 'tower_app/other_squares/runabout.png' %}"/>
+      {% endif %}
     </div>
     {% if player.room.floor == 1 %}
       <div class="outside room" style="grid-area: 4 / 1 / 5 / 2;">