Remove orphan effects and add headless smoke hooks
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
import os
|
||||
|
||||
import dbg
|
||||
import app
|
||||
import localeInfo
|
||||
@@ -14,6 +16,51 @@ import stringCommander
|
||||
|
||||
#bind_me(locals().values())
|
||||
|
||||
|
||||
def _GetHeadlessScenario():
|
||||
return os.environ.get("M2_HEADLESS_SCENARIO", "").strip().lower()
|
||||
|
||||
|
||||
def _WriteHeadlessTrace(message):
|
||||
scenario = _GetHeadlessScenario()
|
||||
if scenario == "map_load":
|
||||
tracePath = "log/headless_map_load_trace.txt"
|
||||
elif scenario == "gm_teleport":
|
||||
tracePath = "log/headless_gm_teleport_trace.txt"
|
||||
else:
|
||||
return
|
||||
|
||||
try:
|
||||
open(tracePath, "a").write("%s\n" % message)
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
def _GetHeadlessInt(name, default):
|
||||
try:
|
||||
return int(os.environ.get(name, str(default)))
|
||||
except (TypeError, ValueError):
|
||||
return default
|
||||
|
||||
|
||||
def _SetInitialPhase(mainStream):
|
||||
scenario = _GetHeadlessScenario()
|
||||
if scenario == "map_load":
|
||||
mapName = os.environ.get("M2_HEADLESS_MAP_NAME", "").strip()
|
||||
globalX = _GetHeadlessInt("M2_HEADLESS_GLOBAL_X", 460800)
|
||||
globalY = _GetHeadlessInt("M2_HEADLESS_GLOBAL_Y", 960000)
|
||||
|
||||
_WriteHeadlessTrace("Scenario begin map=%s global_x=%d global_y=%d" % (mapName, globalX, globalY))
|
||||
mainStream.SetTestGamePhase(globalX, globalY)
|
||||
return
|
||||
|
||||
if scenario == "gm_teleport":
|
||||
_WriteHeadlessTrace("Scenario begin gm_teleport")
|
||||
mainStream.SetLoginPhase()
|
||||
return
|
||||
|
||||
mainStream.SetLoginPhase()
|
||||
|
||||
def RunApp():
|
||||
musicInfo.LoadLastPlayFieldMusic()
|
||||
|
||||
@@ -47,8 +94,7 @@ def RunApp():
|
||||
mainStream.Create()
|
||||
|
||||
#mainStream.SetLoadingPhase()
|
||||
|
||||
mainStream.SetLoginPhase()
|
||||
_SetInitialPhase(mainStream)
|
||||
#mainStream.SetSelectCharacterPhase()
|
||||
#mainStream.SetCreateCharacterPhase()
|
||||
#mainStream.SetSelectEmpirePhase()
|
||||
@@ -58,4 +104,3 @@ def RunApp():
|
||||
mainStream.Destroy()
|
||||
|
||||
RunApp()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user