[Arianne-commits] stendhal/src/games/stendhal/server StendhalQuestSystem.java,1.3,1.4 StendhalRPAction.java,1.65,1.66

[Miguel A. B. L. <ari...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23922/src/games/stendhal/server

Modified Files:
	StendhalQuestSystem.java StendhalRPAction.java 
Log Message:
Quests and outfit works inside a Jar file.
Changed combat formula.

Index: StendhalRPAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPAction.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** StendhalRPAction.java	13 Nov 2005 09:07:45 -0000	1.65
--- StendhalRPAction.java	13 Nov 2005 18:55:29 -0000	1.66
***************
*** 96,101 ****
              }
  
!           float maxDamage=(float)source.getATK()*(float)source.getATK()+4.0f*(float)weapon;
!           float attackerComponent=0.8f*(float)Rand.roll1D100()/100.0f*(float)source.getATK()*(float)source.getATK()+4.0f*(float)weapon;
  
            if(target.hasShield())
--- 96,101 ----
              }
  
!           float maxDamage=(float)source.getATK()*(float)source.getATK()+4.0f*(float)source.getATK()*(float)weapon;
!           float attackerComponent=0.8f*(float)Rand.roll1D100()/100.0f*(float)source.getATK()*(float)source.getATK()+4.0f*(float)source.getATK()*(float)weapon;
  
            if(target.hasShield())
***************
*** 109,115 ****
              }
  
!           float defenderComponent=0.6f*(float)Rand.roll1D100()/100.0f*(float)target.getDEF()*(float)target.getDEF()+1.5f*(float)shield+2.0f*(float)armor;
            
!           damage=(int)(((attackerComponent-defenderComponent)/maxDamage)*(maxDamage/10.0f));
  
            if(damage>0) // Hit
--- 109,115 ----
              }
  
!           float defenderComponent=0.6f*(float)Rand.roll1D100()/100.0f*(float)target.getDEF()*(float)target.getDEF()+4.0f*(float)target.getDEF()*(float)shield+2.0f*(float)target.getDEF()*(float)armor;
            
!           damage=(int)(((attackerComponent-defenderComponent)/maxDamage)*(maxDamage/(float)source.getATK()));
  
            if(damage>0) // Hit

Index: StendhalQuestSystem.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalQuestSystem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StendhalQuestSystem.java	13 Nov 2005 15:57:59 -0000	1.3
--- StendhalQuestSystem.java	13 Nov 2005 18:55:29 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  import org.apache.log4j.Logger;
  import java.io.File;
+ import java.net.URI;
  import games.stendhal.server.quests.IQuest;
  
***************
*** 19,26 ****
      this.rules=rules;
      
!     File questsFolder=new File("games/stendhal/server/quests");
      String[] files=questsFolder.list();
      
!     if (files == null)
        {
        logger.error("quest folder not found. should be "+questsFolder.getAbsolutePath());
--- 20,44 ----
      this.rules=rules;
      
!     URI url;
!     try
!       {
!       url=this.getClass().getClassLoader().getResource("games/stendhal/server/quests").toURI(); 
!       }
!     catch(java.net.URISyntaxException e)
!       {
!       logger.error("Can't find file: games/stendhal/server/quests",e);
!       return;
!       }
!   
!     if(url==null) 
!       {
!       logger.error("Can't find file: games/stendhal/server/quests");
!       return;
!       }
! 
!     File questsFolder=new File(url);
      String[] files=questsFolder.list();
      
!     if(files == null)
        {
        logger.error("quest folder not found. should be "+questsFolder.getAbsolutePath());