Update of /cvsroot/vegastrike/data4.x/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19386
Modified Files:
verify_missions.py
Log Message:
cool got it all passing
Index: verify_missions.py
===================================================================
RCS file: /cvsroot/vegastrike/data4.x/modules/verify_missions.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** verify_missions.py 28 Feb 2005 13:27:47 -0000 1.17
--- verify_missions.py 3 Mar 2005 07:23:04 -0000 1.18
***************
*** 13,20 ****
--- 13,24 ----
elif name=='bounty_leader':
mission=BountyLeaderVerifier(args)
+ elif name=='bounty_troop':
+ mission=BountyTroopVerifier(args)
elif name=='bounty':
mission=BountyVerifier(args)
elif name=='cargo_mission':
mission=CargoVerifier(args)
+ elif name=='wrong_escort':
+ mission=WrongEscortVerifier(args)
elif name=='cleansweep':
mission=CleansweepVerifier(args)
***************
*** 41,44 ****
--- 45,50 ----
elif name=='tripatrol':
mission=TripatrolVerifier(args)
+ elif name=='ambush_scan':
+ mission=AmbushScan(args)
if mission is None:
print 'Unsupported mission type'
***************
*** 144,148 ****
def checkValidity(self):
if not isinstance(self.value,str):
! self.warn("Value is not a string")
return False
return True
--- 150,154 ----
def checkValidity(self):
if not isinstance(self.value,str):
! self.warn("Value "+str(self.value)+"is not a string")
return False
return True
***************
*** 215,218 ****
--- 221,226 ----
if temparg.isValid():
return True
+ elif self.value=="menesch_dead" or self.value=="jones_dead" or self.value=="awacs_escort":
+ return True
self.warn("%s is not valid"%self.value)
return False
***************
*** 227,233 ****
--- 235,261 ----
return False
return True
+ class FactionTuple(Argument):
+
+ NAME="Faction"
+
+ def checkValidity(self):
+ if type(self.value)!=type(()) and type(self.value)!=type([]):
+ self.warn(str(self.value)+" is not a tuple")
+ return False
+ for value in self.value:
+ if value not in VS._factions:
+ self.warn("'%s' is not a valid faction"%value)
+ return False
+ return True
class DynFG(String):
NAME="DynFG"
+ class DynFGTuple(String):
+ NAME="DynFG"
+ def checkValidity(self):
+ if type(self.value)!=type(()) and type(self.value)!=type([]):
+ self.warn(str(self.value)+" is not a tuple");
+ return False;
+ return True
***************
*** 286,290 ****
return False
return True
!
class TextList(Argument):
--- 314,328 ----
return False
return True
! class TextListTuple(Argument):
! NAME="TupleTextList"
! def checkValidity(self):
! try:
! for value in self.value:
! temparg=TextList(None,value)
! if temparg.isValid():
! return True
! except:
! self.warn (str(self.value)+" is not iterable")
! return False
class TextList(Argument):
***************
*** 293,297 ****
def checkValidity(self):
if not isinstance(self.value,list):
! self.warn("is not a list type")
return False
for item in self.value:
--- 331,335 ----
def checkValidity(self):
if not isinstance(self.value,list):
! self.warn(str(self.value)+"is not a list type")
return False
for item in self.value:
***************
*** 299,307 ****
if isinstance(item,tuple):
if len(item) == 2:
! if not isinstance(item[0],str) and isinstance(item[1],bool):
self.warn("item is not a (str,bool) pair")
return False
elif len(item) == 3:
! if not (isinstance(item[0],str) and isinstance(item[1],bool) and isinstance(item[2],str)):
self.warn("item %s is not a (str,bool,str) triplet"%str(item))
return False
--- 337,345 ----
if isinstance(item,tuple):
if len(item) == 2:
! if not isinstance(item[0],str) and isinstance(item[1],type(bool(True))):
self.warn("item is not a (str,bool) pair")
return False
elif len(item) == 3:
! if not (isinstance(item[0],str) and isinstance(item[1],type(bool(True))) and isinstance(item[2],str)):
self.warn("item %s is not a (str,bool,str) triplet"%str(item))
return False
***************
*** 373,376 ****
--- 411,417 ----
MISSION_ARGS=[PositiveInt(),PositiveInt(),PositiveInt(),Boolean(),PositiveInt(),Faction(),SystemTuple(None,Default()),SaveVar(None,Default()),DynFG(None,Default()),ShipType(Empty(),Default()),Boolean(None,Default()),DynFG(None,Default()),ShipType(ShipFactionPair(Empty()),Default()),TextList(None,Default()),Argument(None,Default())]#FIXME: last argument is leader_upgrades=[]
+ class BountyTroopVerifier(MissionVerifier):
+ MISSION_ARGS=[PositiveInt(),PositiveInt(),PositiveInt(),Boolean(),PositiveInt(),Faction(),SystemTuple(None,Default()),SaveVar(None,Default()),DynFG(None,Default()),ShipType(Empty(),Default()),Boolean(None,Default()),DynFG(None,Default()),ShipType(ShipFactionPair(Empty()),Default()),TextList(None,Default()),Argument(None,Default()),PositiveInt(None,Default()),PositiveInt(None,Default()),PositiveInt(None,Default())]#FIXME: last argument is leader_upgrades=[]
+
class BountyVerifier(MissionVerifier):
MISSION_ARGS=[PositiveInt(),PositiveInt(),PositiveInt(),Boolean(),PositiveInt(),Faction(),SystemTuple(None,Default()),SaveVar(None,Default()),DynFG(None,Default()),ShipType(Empty(),Default()),Boolean(None,Default()),TextList(None,Default())]
***************
*** 387,390 ****
--- 428,433 ----
class DefendVerifier(MissionVerifier):
MISSION_ARGS=[Faction(),PositiveInt(),PositiveInt(),PositiveNumber(),PositiveNumber(),PositiveInt(),Boolean(),Boolean(),Faction(None,Default()),SystemTuple(None,Default()),SaveVar(None,Default()),DynFG(None,Default()),ShipType(Empty(),Default()),ShipType(Empty(),Default()),PositiveInt(None,Default()), TextList(None,Default())]
+ class DefendDroneVerifier(MissionVerifier):
+ MISSION_ARGS=[ShipType(Empty()),Faction(),System(),ShipType(),Faction(), PositiveInt(),Faction(),SystemTuple(),SaveVar(Empty(),Default()),TextList(None,Default())]
class DirectionsVerifier(MissionVerifier):
***************
*** 397,400 ****
--- 440,446 ----
MISSION_ARGS=[Faction(),PositiveInt(), PositiveNumber(), PositiveNumber(), PositiveNumber(), PositiveInt(), ZeroInt(), PositiveInt(),SystemTuple(),SaveVar(Empty(), Default()),DynFG(Empty(), Default()), ShipType(Empty(), Default())]
+ class WrongEscortVerifier(MissionVerifier):
+ MISSION_ARGS=[Faction(),PositiveInt(), PositiveNumber(), PositiveNumber(), PositiveInt(),SystemTuple(),SaveVar(Empty(), Default()),DynFG(Empty(), Default()), ShipType(None, Default()),SystemTuple(None,Default()),FactionTuple(None,Default()),DynFGTuple(None,Default()),ShipTypeList(None,Default()),TextListTuple(String(),Default()),SaveVar(Empty(),Default())]
+
class PatrolAmbushVerifier(MissionVerifier):
MISSION_ARGS=[PositiveInt(), PositiveNumber(), PositiveInt(), SaveVar(),SystemTuple(),PositiveInt(),Faction(),PositiveInt(),ShipType(Empty(), Default()),DynFG(Empty(), Default()),TextList(String(), Default()),SystemTuple(Empty(), Default()),Destination(Empty(), Default())]
***************
*** 417,418 ****
--- 463,466 ----
class TripatrolVerifier(MissionVerifier):
MISSION_ARGS=[PositiveInt(),PositiveInt(),PositiveNumber(),PositiveInt(),SystemTuple(),SaveVar(),PositiveInt(),PositiveInt(),PositiveFraction(),PositiveFraction(),Faction(FactionList()),Boolean(),Boolean(),TextList()]
+ class AmbushScan(MissionVerifier):
+ MISSION_ARGS=[SaveVar(),SystemTuple(System()),PositiveNumber(),FactionList(),PositiveInt(PositiveIntList()),ShipType(ShipTypeList(Empty()),Default()),DynFG(None,Default()),TextList(None,Default()),SystemTuple(None,Default()),Destination(None,Default()),Boolean(None,Default()),String(),TextList(None,Default())]
|