Changeset 3539

Timestamp:

02/07/10 12:18:14 (6 months ago)

Author:

Dexter

Message:

#125
just fixing an arena message while tube-circle of the game.

Files:

• trunk/twcore/src/twcore/bots/multibot/betrayal/betrayal.java (modified) (15 diffs)

trunk/twcore/src/twcore/bots/multibot/betrayal/betrayal.java

@@ -18 +18 @@
         
         Thanks to D1st0rt who gave me an idea to fix a problem I had with the bot.
+        Thanks to Dezmond who gave me the coords to all circles and tubes of map(5 circles, each circle has 4 tubes)
         Thanks to everyone who helped me on tests.
+
 */
 
-public class betrayal extends MultiModule {
+public class betrayal extends MultiModule
+{
         
         private boolean betrayalGame = false;
-        
         private LinkedList<bannedinfo> bannedPlayer = new LinkedList<bannedinfo>();
         private Map<String, Integer> nameTK = new HashMap<String, Integer>(); //Map to Player and his tk number
@@ -40 +42 @@
         }
         
-        public void handleEvent(PlayerDeath event){
+        public void handleEvent(PlayerDeath event)
+        {
                 if(betrayalGame){ 
                         
@@ -50 +53 @@
                                 m_botAction.specWithoutLock(event.getKilleeID());
                                 m_botAction.sendArenaMessage(pkillee.getPlayerName()+" is out! "+deathPlayer+" deaths!");
+                                
                                 if(pkillee.getFrequency() != pkiller.getFrequency()){
                                         TimerTask checkWin = new TimerTask(){ //it'll check the winner.
@@ -92 +96 @@
                                                                 
                                                                         bannedinfo playerBack = bannedPlayer.getFirst(); //works like a QUEUE, first entered, first who leaves from circle
-                                                                        m_botAction.setFreq(playerBack.getPlayerName(), playerBack.getFreq()); //sets back to old freq
-                                                                        m_botAction.warpTo(playerBack.getPlayerName(), playerBack.getOldX(), playerBack.getOldY()); //warps to some old tube's freq
-                                                                        nameTK.remove(playerBack.getPlayerName()); //resets tk number of player
-                                                                        bannedPlayer.remove(bannedPlayer.getFirst()); //removes him fom banned list(to stop depleting energy)
-                                                                        m_botAction.sendArenaMessage("Hope "+playerBack.getPlayerName()+" has learned his lesson! Back to some tube!");
-                                                                
+                                                                        if(nameTK.containsKey(playerBack.getPlayerName())){
+                                                                                m_botAction.setFreq(playerBack.getPlayerName(), playerBack.getFreq()); //sets back to old freq
+                                                                                m_botAction.warpTo(playerBack.getPlayerName(), playerBack.getOldX(), playerBack.getOldY()); //warps to some old tube's freq
+                                                                                nameTK.remove(playerBack.getPlayerName()); //resets tk number of player
+                                                                                bannedPlayer.remove(bannedPlayer.getFirst()); //removes him fom banned list(to stop depleting energy)
+                                                                                m_botAction.sendArenaMessage(playerBack.getPlayerName()+", get back to old frequence, playing or in spec!" );
+                                                                        }
                                                                 }catch(Exception e){}
                                                         }
@@ -110 +115 @@
                 }//betrayalgame
         }
-        public void handleCommand(String nome, String message){
+        public void handleCommand(String nome, String message)
+        {
                 try{
                         if(message.startsWith("!start")) startBetrayal(nome, message);
@@ -119 +125 @@
                 
         }
-        public void warpMiddle(bannedinfo player){
+        public void warpMiddle(bannedinfo player)
+        {
                 int oldX = -1, oldY = -1;
 
@@ -191 +198 @@
         }
         //deixar start menor
-        public void startBetrayal(String nome, String message){
+        public void startBetrayal(String nome, String message)
+        {
         
                 String commandStart, circle,    TK, DEATH; //it'll analyze what the mod typed. if it is a standard start or customizable one
@@ -268 +276 @@
         }
         
-        public void splitTeam(int freq, int X1, int Y1, int X2, int Y2){
+        public void splitTeam(int freq, int X1, int Y1, int X2, int Y2)
+        {
                 
                         Iterator<Player> freqIterator = m_botAction.getFreqPlayerIterator(freq); //we need an iterator to freq
@@ -303 +312 @@
                 }
 
-        public void changeCircle(String name, String message){
+        public void changeCircle(String name, String message)
+        {
                 
                 if(betrayalGame){
@@ -347 +357 @@
                 }
 
-        public void checkWinner(){
+        public void checkWinner()
+        {
                 if(betrayalGame){
                         
@@ -367 +378 @@
         }
 
-        public void stopBetrayal(String name, String message){
+        public void stopBetrayal(String name, String message)
+        {
                 if(betrayalGame){
                         m_botAction.cancelTasks();
@@ -380 +392 @@
         }
         
-        public int countPlayers(){
+        public int countPlayers()
+        {
                 Iterator<Player> i = m_botAction.getPlayingPlayerIterator();
                 int numplayers = 0;
@@ -387 +400 @@
         }
         
-        public void sendRules(){
+        public void sendRules()
+        {
                 m_botAction.sendArenaMessage("Rules: It's a javelin game!",2);
                 m_botAction.sendArenaMessage("There will be two teams, each spawned within a tube of a circle.");
@@ -393 +407 @@
         }
         
-        public void cancel() {
+        public void cancel() 
+        {
                 m_botAction.cancelTasks();
         }
         
-        public String[] getModHelpMessage() {
+        public String[] getModHelpMessage() 
+        {
                 String opm []= {
                                 "!start                                                                                                                                                                                                 - starts betrayal in circle 1 and teamkill limit 2, 10 deaths",
@@ -412 +428 @@
         
         public void init() {}
-        public boolean isUnloadable() {
+        public boolean isUnloadable() 
+        {
                 return !betrayalGame;
         }
-        public void requestEvents(ModuleEventRequester eventRequester) {
+        public void requestEvents(ModuleEventRequester eventRequester)
+        {
            eventRequester.request(this, EventRequester.PLAYER_DEATH);   
         }