add seed to ROSE

.gitignore

@@ -15,3 +15,5 @@ Pipfile.lock
 classroom/credentials.json
 classroom/*.csv
 classroom/token.pickle
+
+seed.txt

mydriver.py

@@ -0,0 +1,10 @@
+"""
+This driver does not do any action.
+"""
+from rose.common import obstacles, actions  # NOQA
+
+driver_name = "No Driver"
+
+
+def drive(world):
+    return actions.NONE

rose/client/game.py

@@ -17,20 +17,21 @@
 
 class Game(component.Component):
 
-    def __init__(self, client, name, drive_func):
+    def __init__(self, client, name, drive_func,seed):
         self.client = client
         self.drive_func = drive_func
         self.name = name
         self.track = track.Track()
         self.players = {}
+        self.seed = seed
         self.cars = [car.Car(1),
                      car.Car(2),
                      car.Car(3),
                      car.Car(4)]
         self.world = world.generate_world(self)
-
+    def get_seed(self):
+        return self.seed
     # Component interface
-
     def update(self, info):
         self.track.update(info)
         self.players = {p["name"]: p for p in info['players']}

rose/client/main.py

@@ -1,3 +1,4 @@
+import random
 import argparse
 import imp
 import logging
@@ -41,7 +42,7 @@ class ClientFactory(protocol.ReconnectingClientFactory):
     maxDelay = 2
 
     def __init__(self, name, drive_func):
-        self.game = game.Game(self, name, drive_func)
+        self.game = game.Game(self, name, drive_func, config.track_seed)
         self.client = None
 
     # Client events
@@ -102,9 +103,9 @@ def main():
                         help="The server address to connect to."
                              " For example: '10.20.30.44' or 'my-server.com'."
                              " If not specified, localhost will be used.")
+
     parser.add_argument("driver_file",
                         help="The path to the driver python module")
-
     args = parser.parse_args()
 
     try:

rose/common/config.py

@@ -11,6 +11,8 @@
 game_duration = 60
 number_of_cars = 4
 is_track_random = True
+track_seed = ""
+base_seed = ""
 
 # Matrix
 

rose/server/game.py

@@ -29,6 +29,7 @@ def __init__(self):
         self._rate = config.game_rate
         self.started = False
         self.timeleft = config.game_duration
+        self.seed = config.track_seed
 
     @property
     def rate(self):
@@ -50,6 +51,15 @@ def start(self):
             raise error.GameAlreadyStarted()
         if not self.players:
             raise error.ActionForbidden("start a game with no players.")
+
+        if config.base_seed == "":
+            seed = str(random.randint(1, 1000000))
+        else:
+            seed = config.base_seed
+        self.seed = seed
+        random.seed(self.seed)
+        log.info(f"The seed is {seed}")
+
         self.track.reset()
         for p in six.itervalues(self.players):
             p.reset()
@@ -130,4 +140,6 @@ def state(self):
                 'track': self.track.state(),
                 'players': [p.state() for p in six.itervalues(self.players)],
                 'timeleft': self.timeleft,
-                'rate': self.rate}
+                'rate': self.rate,
+                'seed': "seed:" + self.seed
+                }

rose/server/main.py

@@ -1,3 +1,4 @@
+import random
 import socket
 import logging
 import argparse
@@ -20,6 +21,10 @@ def main():
                         default="random", choices=["random", "same"],
                         help="Definition of driver tracks: random or same."
                              "If not specified, random will be used.")
+    parser.add_argument("--seed", "-s", dest="seed",
+                        default="", type=str,
+                        help="Definition of driver tracks: random or same."
+                             "If not specified, random will be used.")
 
     args = parser.parse_args()
     """
@@ -32,6 +37,22 @@ def main():
     else:
         config.is_track_random = True
 
+    """
+    If the argument is '', the seed will be generated in random, otherwise 
+    the seed will be the seed submitted by the user.
+    """
+
+    seed = args.seed
+    if args.seed == "":
+        seed = str(random.randint(1, 100000))
+        config.base_seed = args.seed
+    else:
+        config.base_seed = args.seed
+
+    log.info(f"The seed is {seed}")
+    config.track_seed = seed
+    random.seed(seed)
+
     log.info('starting server')
     g = game.Game()
     h = net.Hub(g)

rose/web/game.css

@@ -35,11 +35,31 @@ body {
     background-color: #222;
 }
 
-#start, #stop, #music_ctl {
-    width: 120px;
+ #start, #stop, #music_ctl {
+    width: 140px;
     padding: 8px 24px;
     margin: 0;
+
 }
+ #seed{
+    font-family: helvetica, sans-serif;
+    font-size: 20px;
+    line-height: 24px;
+    font-weight: bold;
+    border: 1px solid #666;
+    color: #ccc;
+    background-color: #333;
+    color: #666;
+    width: 140px;
+    padding: 8px 24px;
+    margin: 0;
+ }
+  #seed:hover{
+    transition:0.2s;
+    background-color:#222
+
+  }
+
 
 #rate_ctl {
     position: absolute;
@@ -117,6 +137,8 @@ body {
     top: 50px;
 }
 
+
+
 #time_left {
     width: 105px;
     font-size: 50px;

rose/web/game.js

@@ -131,20 +131,26 @@ var ROSE = (function() {
     }
 
     Controller.prototype.update = function(state) {
+             console.log(state)
+
+
+        $("#seed").text(state.seed);
         if(state.players.length == 0){
-            $("#info").text("No players connected")
+            $("#info").text("No players connected");
             $("#start").attr("disabled", "disabled");
             $("#stop").attr("disabled", "disabled");
         }
         else if (state.started) {
-            $("#info").text("")
+            $("#info").text("");
             $("#start").attr("disabled", "disabled");
             $("#stop").removeAttr("disabled");
+
         } else {
-            $("#info").text("")
+            $("#info").text("");
             $("#start").removeAttr("disabled");
             $("#stop").attr("disabled", "disabled");
         }
+
     }
 
     Controller.prototype.disable = function() {
@@ -254,11 +260,13 @@ var ROSE = (function() {
             if (player.lane == 0) {
                 $("#left.player .name").text(player.name)
                 $("#left.player .score").text(player.score)
+
             }
             if (player.lane == 1) {
                 $("#right.player .name").text(player.name)
                 $("#right.player .score").text(player.score)
             }
+
         }
     }
 
@@ -302,6 +310,8 @@ var ROSE = (function() {
         }
     }
 
+
+
     function Cars(loader) {
         this.players = null;
         this.textures = [null, null, null, null];
@@ -381,6 +391,8 @@ var ROSE = (function() {
         });
     }
 
+
+
     Track.prototype.update = function(state) {
         this.track = state.track;
         if (state.started) {

rose/web/index.html

@@ -15,6 +15,7 @@
         <button id="start" disabled>Start</button>
         <button id="stop"  disabled>Stop</button>
         <button id="music_ctl">Play</button>
+        <h1 id="seed" ></h1>
         <label id="info"></label>
 
         <div id="rate_ctl">
@@ -23,8 +24,11 @@
             <button id="dec_rate" disabled>&ndash;</button>
             <button id="cur_rate" disabled>FPS</button>
             <button id="inc_rate" disabled>+</button>
+
           </span>
+
         </div>
+
       </form>
       <div id="players">
         <div id="left" class="player">

rose/web/o

@@ -0,0 +1,27 @@
+{
+    "started": false,
+    "track": [
+        {
+            "name": "bike",
+            "x": 1,
+            "y": 1
+        },
+        {
+            "name": "bike",
+            "x": 5,
+            "y": 1
+        }
+    ],
+    "players": [
+        {
+            "name": "No Driver",
+            "car": 2,
+            "x": 4,
+            "y": 6,
+            "lane": 1,
+            "score": 20
+        }
+    ],
+    "timeleft": 58,
+    "rate": 1
+}