bug solved (need to clear the scene)

charlie-lutaud · charlie-lutaud · commit 09f929c32b7b · 2013-05-30T04:20:29.000+02:00
diff --git a/Python-Robocode/.datas/lastArena b/Python-Robocode/.datas/lastArena
@@ -5,24 +5,11 @@ I700
 sS'botList'
 p2
 (lp3
-ccharlier
-Charlier
+ccharlie
+Charlie
 p4
 ag4
-ag4
-ag4
-ag4
-ag4
-accharlie
-Charlie
-p5
-ag5
-ag5
-ag5
-ag5
-ag5
-ag5
 asS'height'
-p6
+p5
 I500
 s.
diff --git a/Python-Robocode/GUI/RobotInfo.py b/Python-Robocode/GUI/RobotInfo.py
@@ -35,8 +35,8 @@ def on_progressBar_valueChanged(self, value):
         """
         Slot documentation goes here.
         """
-        green = value*2
-        red = 50 + 200 - value*2
+        green = int(value*2)
+        red = int(50 + 200 - value*2)
         self.progressBar.setStyleSheet("""
         QProgressBar {
         border: 2px solid grey;
diff --git a/Python-Robocode/GUI/window.py b/Python-Robocode/GUI/window.py
@@ -33,6 +33,10 @@ def on_pushButton_clicked(self):
         """
         Start the last battle
         """
+        try:
+            self.scene.clear()
+        except:
+            pass
         with open(os.getcwd() + "/.datas/lastArena",  'rb') as file:
             unpickler = pickle.Unpickler(file)
             dico = unpickler.load()
diff --git a/Python-Robocode/Objects/graph.py b/Python-Robocode/Objects/graph.py
@@ -45,8 +45,11 @@ def AddRobots(self, botList):
 
     def  battleFinished(self):
         print "battle terminated"
-        self.deadBots.append(self.aliveBots[0])
-        self.removeItem(self.aliveBots[0])
+        try:
+            self.deadBots.append(self.aliveBots[0])
+            self.removeItem(self.aliveBots[0])
+        except IndexError:
+            pass
         j = len(self.deadBots)
         for i in range(j):
             print "N°",  j - i , ":", self.deadBots[i]
diff --git a/Python-Robocode/Objects/physics.py b/Python-Robocode/Objects/physics.py
@@ -20,8 +20,7 @@ def __init__(self):
     def reverse(self):
         self.animationList.reverse()     
         
-    def newAnimation(self):
-        
+    def newAnimation(self): 
         self.makeAnimation()
         self.animation.reverse()
         self.animationList.append(self.animation)
diff --git a/Python-Robocode/Objects/robot.py b/Python-Robocode/Objects/robot.py
@@ -242,16 +242,29 @@ def getPosition(self):
         r = self.boundingRect()
         return QtCore.QPointF(p.x() + r.width()/2, p.y()+r.height()/2)
         
+    def getGunHeading(self):
+        return self.gun.rotation()
+        
+    def getHeading(self):
+        return self.gun.rotation()
+        
+    def getRadarHeading(self):
+        return self.gun.rotation()
+        
     def reset(self):
         self.physics.reset()
         
-    def getNbrOfEnemiesLeft(self):
+    def getEnemiesLeft(self):
         return len(self.parent.aliveBots)
         
     def rPrint(self, msg):
         self.info.out.add(str(msg))
         
-        
+    def pause(self, duration):
+        self.stop()
+        for i in range(int(duration)):
+            self.physics.move.append(0)
+        self.stop()
     ###end of functions accessable from robot###
             
     # Calculus
@@ -289,6 +302,7 @@ def wallRebound(self, item):
             y = - self.physics.step*1.1
         self.setPos(self.pos().x() + x, self.pos().y() + y)
         self.changeHealth(self,  -1)
+        self.onHitWall()
        
         
     def robotRebound(self, robot):
@@ -307,6 +321,7 @@ def robotRebound(self, robot):
         robot.setPos(x+dx, y+dy)
         self.changeHealth(robot,  -1)
         self.changeHealth(self,  -1)
+        self.onRobotHit(id(robot))
         
     def bulletRebound(self, bullet):
         self.changeHealth(self,  - bullet.power)
@@ -330,7 +345,7 @@ def death(self):
         self.parent.aliveBots.remove(self)
         self.onRobotDeath()
         self.parent.removeItem(self)
-
+        print  len(self.parent.aliveBots)
         if  len(self.parent.aliveBots) <= 1:
             self.parent.battleFinished()
             
diff --git a/Python-Robocode/Robots/charlie.py b/Python-Robocode/Robots/charlie.py
@@ -21,11 +21,13 @@ def init(self):# NECESARY FOR THE GAME   To initialyse your robot
     def run(self): #NECESARY FOR THE GAME  main loop to command the bot
         
         
-        #self.move(90) # for moving (negative values go back)
-        #self.stop()
-        
+        self.move(90) # for moving (negative values go back)
         self.turn(360) #for turning (negative values turn counter-clockwise)
         self.stop()
+        """
+        the stop command is used to make moving sequences: here the robot will move 90steps and turn 360° at the same time
+        """
+        
         #self.setGunDirection(40) # set the Gun direction (bottom = 0°)
         
         self.fire(9.2) # To Fire (power between 1 and 10)
@@ -36,20 +38,36 @@ def run(self): #NECESARY FOR THE GAME  main loop to command the bot
         
         self.move(180)
         self.turn(180)
-        self.gunTurn(90)
+        self.gunTurn(90) #to turn the gun (negative values turn counter-clockwise)
         self.stop()
         
-        self.radarTurn(180)
+        self.radarTurn(180) #to turn the radar (negative values turn counter-clockwise)
         self.stop()
         
     def sensors(self):  #NECESARY FOR THE GAME
         """Tick each frame to have datas about the game"""
         
         pos = self.getPosition() #return the center of the bot
-        #print pos.x(),  pos.y() 
+        x = pos.x() #get the x coordinate
+        y = pos.y() #get the y coordinate
+        
+        angle = self.getGunHeading() #Returns the direction that the robot's gun is facing
+        angle = self.getHeading() #Returns the direction that the robot is facing
+        angle = self.getRadarHeading() #Returns the direction that the robot's radar is facing
+
+    def onHitWall(self):
+        self.reset() #To reset the run fonction to the begining (auomatically called on hitWall, and robotHit event) 
+        self.pause(100)
+        self.move(-100)
+        self.stop() # DON'T forget this if you want to do not combine this action with the begining of the run fonction
+        
+    def onRobotHit(self, robotId):
+        self.rPrint(robotId)
        
     def onHitByBullet(self, bulletBotId, bulletPower): #NECESARY FOR THE GAME
         """ When i'm hit by a bullet"""
+        self.reset() #To reset the run fonction to the begining (auomatically called on hitWall, and robotHit event) 
+        self.pause(100)
         self.rPrint ("hit by " + str(bulletBotId) + "with power:" +str( bulletPower))
         
     def onBulletHit(self, botId, bulletId):#NECESARY FOR THE GAME
