Changeset 295 for trunk/game

Timestamp:

10/01/09 07:13:39 (10 years ago)

Author:

eliedebrauwer

Message:

Ticket #103: Patch by Elie De Brauwer, Added possibility to make the player character run, this can be toggled with the run console command, comment[s:trac, t:103]

Location:

trunk/game/scripts

Files:

• console.py (modified) (3 diffs)
• engine.py (modified) (2 diffs)
• objects/actors.py (modified) (1 diff)

trunk/game/scripts/console.py

@@ -25 +25 @@
 
         self.commands = [
-            {"cmd":"exit"  ,"callback":self.handleQuit  ,"help":"Terminate application"},
-            {"cmd":"grid"  ,"callback":self.handleGrid  ,"help":"Toggle grid display  "},
-            {"cmd":"help"  ,"callback":self.handleHelp  ,"help":"Show this help string"},
-            {"cmd":"load"  ,"callback":self.handleLoad  ,"help":"load directory file  "},
-            {"cmd":"python","callback":self.handlePython,"help":"Run some python code "},
-            {"cmd":"quit"  ,"callback":self.handleQuit  ,"help":"Terminate application"},
-            {"cmd":"save"  ,"callback":self.handleSave  ,"help":"save directory file  "},
+            {"cmd":"exit"  ,"callback":self.handleQuit  ,"help":"Terminate application "},
+            {"cmd":"grid"  ,"callback":self.handleGrid  ,"help":"Toggle grid display   "},
+            {"cmd":"run"   ,"callback":self.handleRun   ,"help":"Toggle player run/walk"},
+            {"cmd":"help"  ,"callback":self.handleHelp  ,"help":"Show this help string "},
+            {"cmd":"load"  ,"callback":self.handleLoad  ,"help":"load directory file   "},
+            {"cmd":"python","callback":self.handlePython,"help":"Run some python code  "},
+            {"cmd":"quit"  ,"callback":self.handleQuit  ,"help":"Terminate application "},
+            {"cmd":"save"  ,"callback":self.handleSave  ,"help":"save directory file   "},
         ]
         self.appListener=appListener
@@ -54 +55 @@
         self.appListener.world.activeMap.toggle_renderer('GridRenderer')
         return "Grid toggled"
+
+    def handleRun(self, command):
+        """
+        Toggles run/walk mode of the PC player
+        @type command: string
+        @param command: The command to run.
+        @return: The response"""
+        
+        if self.appListener.model.pc_run==1:
+            self.appListener.model.pc_run=0
+            return "PC is now walking"
+        else:
+            self.appListener.model.pc_run=1
+            return "PC is now running"
+            
 
     def handleHelp(self, command):
@@ -134 +150 @@
         return result 
 
+
     def handleConsoleCommand(self, command):
         """

trunk/game/scripts/engine.py

@@ -50 +50 @@
         self.mapchange = False
         self.gameState = GameState()
+        self.pc_run = 1
 
     def reset(self):
@@ -261 +262 @@
            @param position: Screen position of click
            @return: None"""
-        self.gameState.PC.run(position)
+        if(self.pc_run==1):
+            self.gameState.PC.run(position)
+        else:
+            self.gameState.PC.walk(position)
         
     def changeMap(self, map, targetPosition):

trunk/game/scripts/objects/actors.py

@@ -122 +122 @@
     
     def run(self, location):
-        """@type location: ???
-           @param location: ???
+        """Makes the PC run to a certain location
+           @type location: fife.ScreenPoint
+           @param location: Screen position to run to.
            @return: None"""
         self.state = _AGENT_STATE_RUN
-        self.behaviour.agent.move('run', location, self.behaviour.speed)
-        
+        self.behaviour.agent.move('run', location, self.behaviour.speed+1)
+
+    def walk(self, location):
+        """Makes the PC walk to a certain location.
+           @type location: fife.ScreenPoint
+           @param location: Screen position to walk to.
+           @return: None"""
+        self.state = _AGENT_STATE_RUN
+        self.behaviour.agent.move('walk', location, self.behaviour.speed-1)
+      
     def approach(self, location, action = None):
         """Approaches an npc and then ???.