From e2a480e582436eef97ea341479480c4df1061ea6 Mon Sep 17 00:00:00 2001
From: rustushki <rustushki>
Date: Sat, 30 Sep 2006 01:42:56 +0000
Subject: [PATCH] added dummy quit eventtype file

---
 consoleview.py                 |  5 ++++-
 data/eventtypes/quit           |  3 +++
 data/job/{archer => blackmage} | 18 +++++++++---------
 data/job/swordsman             |  2 +-
 data/job/thief                 | 18 ------------------
 event.py                       |  2 +-
 fighter.py                     |  3 ++-
 7 files changed, 20 insertions(+), 31 deletions(-)
 create mode 100644 data/eventtypes/quit
 rename data/job/{archer => blackmage} (51%)
 delete mode 100644 data/job/thief

diff --git a/consoleview.py b/consoleview.py
index 790a1cf..37cdb2b 100644
--- a/consoleview.py
+++ b/consoleview.py
@@ -41,7 +41,10 @@ class ConsoleView:
 	def printEvent(self, e):
 		"""Show Event data."""
 
-		print "\033[1;33m[EVENT]\033[1;0m EXECUTOR:" + e.getExecutor().getName() + "\tNAME:" + e.getEventType().getName() + "\tTYPE:" + e.getEventType().getTypeName() 
+
+		#print "\033[1;33m[EVENT]\033[1;0m EXECUTOR:" + e.getExecutor().getName() + "\tNAME:" + e.getEventType().getName() + "\tTYPE:" + e.getEventType().getTypeName() 
+		
+		print e.getExecutor().getName() 
 
 		for t in e.getTransactions():
 			self.printTransaction(t)
diff --git a/data/eventtypes/quit b/data/eventtypes/quit
new file mode 100644
index 0000000..c0283ca
--- /dev/null
+++ b/data/eventtypes/quit
@@ -0,0 +1,3 @@
+quit
+QUIT
+0
diff --git a/data/job/archer b/data/job/blackmage
similarity index 51%
rename from data/job/archer
rename to data/job/blackmage
index ec7ac83..85e5f27 100644
--- a/data/job/archer
+++ b/data/job/blackmage
@@ -1,18 +1,18 @@
-Archer
-.35
-15
-0
-1
+blackmage
+.75
+20
+10
 3
-1
+2
+2
 2
 0
 0
-.6
+.7
 .0
-.5
-.2
+.6
 .3
+.2
 .3
 .0
 .0
diff --git a/data/job/swordsman b/data/job/swordsman
index 9a468ca..485d88f 100644
--- a/data/job/swordsman
+++ b/data/job/swordsman
@@ -1,4 +1,4 @@
-Swordsman
+swordsman
 .75
 50
 0
diff --git a/data/job/thief b/data/job/thief
deleted file mode 100644
index 37a563f..0000000
--- a/data/job/thief
+++ /dev/null
@@ -1,18 +0,0 @@
-Thief
-.40
-20
-0
-1
-4
-3
-6
-0
-0
-.7
-.0
-.4
-.3
-.35
-.25
-.0
-.0
diff --git a/event.py b/event.py
index fc74a4a..76f09d8 100644
--- a/event.py
+++ b/event.py
@@ -62,7 +62,7 @@ class Event:
     def execute(self):
         """Execute event."""
 
-	if self.__eventType.getName == "quit":
+	if self.__eventType.getName() == "quit":
 		sys.exit(0)
 
 	self.__transactions = self.__eventType.detTransactions(self.__executor,self.__targets)
diff --git a/fighter.py b/fighter.py
index 6ac5697..87588d5 100644
--- a/fighter.py
+++ b/fighter.py
@@ -115,6 +115,7 @@ class Fighter:
 				x = randint(0,eparty.sizeOfParty()-1)
 			
 			d = eparty.getFighter(x)
+			
 			t = "ATTACK"
 		
 		self.__timeOfMove += round((1/float(self.getStat("spd").getMax()))*100)
@@ -129,7 +130,7 @@ class Fighter:
 		if self.__jobType == "blackmage":
 			return ["attack","fire1","ice1","harm","poison","quit"]
 		elif self.__jobType == "swordsman":
-			return ["attack","cure1","sleep"]
+			return ["attack","cure1","sleep","quit"]
 		elif self.__name == "Roc":
 			return ["attack","ice1"]
 		elif self.__name == "Imp":
-- 
2.11.4.GIT