diff --git a/codetower-23.blend b/codetower-23.blend index 957cdb1..3373c77 100644 Binary files a/codetower-23.blend and b/codetower-23.blend differ diff --git a/ct.py b/ct.py index 5196e0f..38b09c4 100644 --- a/ct.py +++ b/ct.py @@ -295,6 +295,7 @@ def terrain_run (): sound_play (sndbuff_click) # Pause + # FIXME : HL alors que c'est avec les touches if scene.objects['Terrain']['run'] == True: scene.objects['Terrain']['run']=False scene.objects['Pause'].setVisible(False,False) @@ -302,11 +303,14 @@ def terrain_run (): scene.objects['Pause-Hl'].setVisible(False,False) scene.objects['Run']. restorePhysics() scene.objects['Run-Hl'].setVisible(True,False) + scene.objects['Cmd_text']['Text']= "Run (F5)" + scene.objects['Cmd_text'].setVisible(True,False) # FIXME : suppresion de du message for obj_i in scene.objects: # Pause des Steerings if "type_minion" in obj_i.getPropertyNames() and "type_towerminion" not in obj_i.getPropertyNames(): obj_i.actuators['Steering'].velocity=0 # Run + # FIXME : HL alors que c'est avec les touches else : scene.objects['Terrain']['run']=True scene.objects['Run'].setVisible(False,False) @@ -314,6 +318,8 @@ def terrain_run (): scene.objects['Run-Hl'].setVisible(False,False) scene.objects['Pause']. restorePhysics() scene.objects['Pause-Hl'].setVisible(True,False) + scene.objects['Cmd_text']['Text']= "Pause (F5)" + scene.objects['Cmd_text'].setVisible(True,False) # Démarrage de la map if scene.objects['Terrain']['thread_run']==False: @@ -379,6 +385,7 @@ def terrain_stop (): scene.objects['Stop'].setVisible(False,False) scene.objects['Stop'].suspendPhysics() scene.objects['Stop-Hl'].setVisible(False,False) + scene.objects['Cmd_text'].setVisible(False,False) # Fin de la map def terrain_end (): @@ -521,7 +528,7 @@ def sound_set (): scene.objects['Sound-cmd']. restorePhysics() scene.objects['Sound-cmd-Hl'].setVisible(True,False) scene.objects['Commands']['sound']=True - scene.objects['Cmd_text']['Text']= "Unset sound" + scene.objects['Cmd_text']['Text']= "Mute" scene.objects['Cmd_text'].setVisible(True,False) # Maj du fichier de config (sound : data/config/sound -> [0][1].text) @@ -537,7 +544,7 @@ def sound_unset (): scene.objects['NoSound-cmd']. restorePhysics() scene.objects['NoSound-cmd-Hl'].setVisible(True,False) scene.objects['Commands']['sound']=False - scene.objects['Cmd_text']['Text']= "Set sound" + scene.objects['Cmd_text']['Text']= "Unmute" scene.objects['Cmd_text'].setVisible(True,False) # Maj du fichier de config (sound : data/config/sound -> [0][1].text) @@ -566,6 +573,7 @@ def cmd_init(): scene.objects['Stop-Hl'].setVisible(False,False) scene.objects['Construc-Hl'].setVisible(False,False) scene.objects['Book-cmd-Hl'].setVisible(False,False) + scene.objects['ResetView-Hl'].setVisible(False,False) scene.objects['About-cmd-Hl'].setVisible(False,False) scene.objects['About'].setVisible(False,True) @@ -637,12 +645,13 @@ def cmd_hl(cont): "Stop":"Stop (F6)", "Pause":"Pause (F5)", "Construc": "Show tower position", + "ResetView": "Reset view (Home key)", "Book-cmd": "Documentation", "About-cmd": "About", "Speed_down": "Speed down (-)", "Speed_up": "Speed up (+)", - "Sound-cmd": "Unset sound", - "NoSound-cmd": "Set sound"} + "Sound-cmd": "Mute", + "NoSound-cmd": "Unmute"} text=text_hl[obj.name] if obj.name == "Construc" and scene.objects['Terrain']['construct_mode']==True: # Bascule le construct text="Hide tower position" @@ -694,12 +703,15 @@ def cmd_click (cont): terrain_stop () if obj.name=="Speed_up" or obj.name=="Speed_down": terrain_speed (obj) - if obj.name=="About-cmd": - about_open () + if obj.name=="ResetView": + manip_reset() if obj.name=="Sound-cmd": sound_unset () if obj.name=="NoSound-cmd": sound_set () + if obj.name=="About-cmd": + about_open () + ############################################################################### # Gestion du clavier diff --git a/ct_config.xml b/ct_config.xml index b8e1978..4784d9c 100644 --- a/ct_config.xml +++ b/ct_config.xml @@ -1,6 +1,6 @@ - 10.0 + 4.0 False \ No newline at end of file