[ogs-changes] dist/java/ogs/magic MetamagicFeat.java,1.2,1.3 School.java,1.3,1.4 Spell.java,1.4,1.5

[<ele...@us...>]

Update of /cvsroot/ogs/dist/java/ogs/magic
In directory sc8-pr-cvs1:/tmp/cvs-serv9450/java/ogs/magic

Modified Files:
	MetamagicFeat.java School.java Spell.java 
Log Message:
See ChangeLog files (Apr 3-4) for details.


Index: MetamagicFeat.java
===================================================================
RCS file: /cvsroot/ogs/dist/java/ogs/magic/MetamagicFeat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MetamagicFeat.java	27 Feb 2003 01:24:44 -0000	1.2
--- MetamagicFeat.java	4 Apr 2003 20:22:55 -0000	1.3
***************
*** 67,70 ****
--- 67,80 ----
  
    /**
+    * Determine the group that this feat belongs to.  Metamagic feats
+    * feats are magic feats.
+    *
+    * @return Feat.MAGIC
+    */
+   public int getGroup () {
+     return (Feat.MAGIC);
+   }
+ 
+   /**
     * Determine number of levels added to normal spell level.  Metamagic
     * feats use up spell slots higher than a spell's normal level.  These

Index: School.java
===================================================================
RCS file: /cvsroot/ogs/dist/java/ogs/magic/School.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** School.java	27 Feb 2003 22:42:20 -0000	1.3
--- School.java	4 Apr 2003 20:22:55 -0000	1.4
***************
*** 34,59 ****
    public static final int UNIVERSAL = 0;
  
!   /** Spells that provide protection or banish other creatures. */
    public static final int ABJURATION = 1;
  
!   /** Spells that bring creatures or materials to the caster. */
    public static final int CONJURATION = 2;
  
!   /** Spells that reveal information. */
    public static final int DIVINATION = 3;
  
!   /** Spells that enchant items and charm creatures. */
    public static final int ENCHANTMENT = 4;
  
!   /** Spells that manipulate matter and energy. */
    public static final int EVOCATION = 5;
  
!   /** Spells that alter perception and create false images. */
    public static final int ILLUSION = 6;
  
!   /** Spells that manipulate life and death. */
    public static final int NECROMANCY = 7;
  
!   /** Spells that alter physical forms. */
    public static final int TRANSMUTATION = 8;
  
--- 34,99 ----
    public static final int UNIVERSAL = 0;
  
!   /**
!    * Spells that provide protection or banish other creatures.  A
!    * wizard that specializes in this school is prohibited to one of
!    * Conjuration, Enchantment, Evocation, Illusion, or
!    * Transmutation; or both Divination and Necromancy.
!    */
    public static final int ABJURATION = 1;
  
!   /**
!    * Spells that bring creatures or materials to the caster.  A
!    * wizard that specializes in this school is prohibited to any one
!    * of the following: (a) Evocation; (b) any two of Abjuration,
!    * Enchantment, and Illusion; (c) Transmutation; or (d) any three
!    * schools.
!    */
    public static final int CONJURATION = 2;
  
!   /**
!    * Spells that reveal information.  A wizard that specializes in
!    * this school is prohibited to any one of the other schools of
!    * the wizard's choice.
!    */
    public static final int DIVINATION = 3;
  
!   /**
!    * Spells that enchant items and charm creatures.  A wizard that
!    * specializes in this school is prohibited to one of Abjuration,
!    * Conjuration, Evocation, Illusion, or Transmutation; or both
!    * Divination and Necromancy.
!    */
    public static final int ENCHANTMENT = 4;
  
!   /**
!    * Spells that manipulate matter and energy.  A wizard that
!    * specializes in this school is prohibited to one of the
!    * following: (a) Conjuration; (b) Transmutation; (c) any two of
!    * Abjuration, Enchantment, and Illusion; or (d) any three
!    * schools.
!    */
    public static final int EVOCATION = 5;
  
!   /**
!    * Spells that alter perception and create false images.  A wizard
!    * that specializes in this school is prohibited to one of
!    * Abjuration, Conjuration, Enchantment, Evocation, or
!    * Transmutation; or both Divination and Necromancy.
!    */
    public static final int ILLUSION = 6;
  
!   /**
!    * Spells that manipulate life and death.  A wizard that
!    * specializes in this school is prohibited to any other school of
!    * the wizard's choice.
!    */
    public static final int NECROMANCY = 7;
  
!   /**
!    * Spells that alter physical forms.  A wizard that specializes in
!    * this school is prohibited to any one of the following:
!    * (a) Conjuration; (b) Evocation; (c) any two of Abjuration,
!    * Enchantment, and Illusion; or (d) any three schools.
!    */
    public static final int TRANSMUTATION = 8;
  

Index: Spell.java
===================================================================
RCS file: /cvsroot/ogs/dist/java/ogs/magic/Spell.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Spell.java	28 Feb 2003 11:11:26 -0000	1.4
--- Spell.java	4 Apr 2003 20:22:56 -0000	1.5
***************
*** 61,65 ****
     * @return A set of descriptors for this spell.
     */
!   public abstract Descriptors getDescriptors ();
  
    /**
--- 61,67 ----
     * @return A set of descriptors for this spell.
     */
!   public Descriptors getDescriptors () {
!     return (new Descriptors ());
!   }
  
    /**