gridarta-commit — svn commit digest list (high traffic)

[Gridarta-commit] SF.net SVN: gridarta: [684] trunk/crossfire/src/cfeditor/gameobject/ ArchetypeParser.java

[<aki...@us...>]

Revision: 684
          http://svn.sourceforge.net/gridarta/?rev=684&view=rev
Author:   akirschbaum
Date:     2006-11-24 11:51:55 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
Remove obsolete comment.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java	2006-11-24 19:24:37 UTC (rev 683)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java	2006-11-24 19:51:55 UTC (rev 684)
@@ -412,7 +412,6 @@
 
         final String text = gameObject.getObjectText();
         final int len = text.length();
-        // TODO can't this be replaced by archetype = gameObject.getArchetype() ?
         final GameObject archetype = gameObject.getArchetype();
 
         gameObject.resetObjectText();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [683] trunk

[<aki...@us...>]

Revision: 683
          http://svn.sourceforge.net/gridarta/?rev=683&view=rev
Author:   akirschbaum
Date:     2006-11-24 11:24:37 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
Do not crash in cut or delete when the region contains multi-part objects.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/CopyBuffer.java
    trunk/daimonin/src/daieditor/CopyBuffer.java

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2006-11-24 18:29:30 UTC (rev 682)
+++ trunk/crossfire/ChangeLog	2006-11-24 19:24:37 UTC (rev 683)
@@ -1,5 +1,8 @@
-2006-11-24  Andreas Kirschbaum  <kir...@my...>
+2006-11-24  Andreas Kirschbaum
 
+	* Do not crash in cut or delete when the region contains
+	multi-part objects.
+
 	* Make pickmaps work again.
 
 2006-11-02  Andreas Kirschbaum

Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java
===================================================================
--- trunk/crossfire/src/cfeditor/CopyBuffer.java	2006-11-24 18:29:30 UTC (rev 682)
+++ trunk/crossfire/src/cfeditor/CopyBuffer.java	2006-11-24 19:24:37 UTC (rev 683)
@@ -31,8 +31,7 @@
 import cfeditor.map.MapModel;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
 import net.sf.gridarta.Size2D;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
@@ -180,7 +179,7 @@
         // cycle through all tile coordinates which are highlighted:
         final Point pos = new Point();
         mapControl.getMapModel().beginTransaction("Cut / Clear"); // TODO: I18N/L10N
-        final List<GameObject> gameObjectsToDelete = new ArrayList<GameObject>();
+        final HashSet<GameObject> gameObjectsToDelete = new HashSet<GameObject>();
         for (pos.x = startp.x; pos.x - startp.x <= offset.x; pos.x++) {
             for (pos.y = startp.y; pos.y - startp.y <= offset.y; pos.y++) {
                 // do the copying for one tile position:
@@ -207,7 +206,7 @@
                         // For CUT we don't delete multi tails of multis which are left or
                         // above the head (we would miss to copy them otherwise).
                         if (mode == Mode.DO_CLEAR || (gameObject.getMultiX() >= 0 && gameObject.getMultiY() >= 0)) {
-                            gameObjectsToDelete.add(gameObject);
+                            gameObjectsToDelete.add(gameObject.getHead());
                         }
                     }
                 }

Modified: trunk/daimonin/src/daieditor/CopyBuffer.java
===================================================================
--- trunk/daimonin/src/daieditor/CopyBuffer.java	2006-11-24 18:29:30 UTC (rev 682)
+++ trunk/daimonin/src/daieditor/CopyBuffer.java	2006-11-24 19:24:37 UTC (rev 683)
@@ -32,6 +32,7 @@
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.map.MapSquare;
@@ -152,7 +153,7 @@
 
         final Point offset = selRec.getLocation();
         mapControl.getMapModel().beginTransaction("Cut / Clear"); // TODO: I18N/L10N
-        final List<GameObject> gameObjectsToDelete = new ArrayList<GameObject>();
+        final HashSet<GameObject> gameObjectsToDelete = new HashSet<GameObject>();
         for (final MapSquare<GameObject> square : mapControl.getMapViewFrame().getView().getSelectedSquares()) {
             final int posx = square.getMapX();
             final int posy = square.getMapY();
@@ -175,7 +176,7 @@
                     // For CUT we don't delete multi tails of multis which are left or
                     // above the head (we would miss to copy them otherwise).
                     if (mode == Mode.DO_CLEAR || (gameObject.getMultiX() >= 0 && gameObject.getMultiY() >= 0)) {
-                        gameObjectsToDelete.add(gameObject);
+                        gameObjectsToDelete.add(gameObject.getHead());
                     }
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [682] trunk/crossfire

[<aki...@us...>]

Revision: 682
          http://svn.sourceforge.net/gridarta/?rev=682&view=rev
Author:   akirschbaum
Date:     2006-11-24 10:29:30 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
Make pickmaps work again.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/CPickmapPanel.java

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2006-11-21 21:40:28 UTC (rev 681)
+++ trunk/crossfire/ChangeLog	2006-11-24 18:29:30 UTC (rev 682)
@@ -1,3 +1,7 @@
+2006-11-24  Andreas Kirschbaum  <kir...@my...>
+
+	* Make pickmaps work again.
+
 2006-11-02  Andreas Kirschbaum
 
 	* Fix check for cut off objects when resizing a map: only ask the

Modified: trunk/crossfire/src/cfeditor/CPickmapPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CPickmapPanel.java	2006-11-21 21:40:28 UTC (rev 681)
+++ trunk/crossfire/src/cfeditor/CPickmapPanel.java	2006-11-24 18:29:30 UTC (rev 682)
@@ -274,7 +274,7 @@
 
         final MapControl tmp = pickmaps.get(newName);
         boolean foundMap = false;
-        if (tmp != null && tmp.getMapFileName().equals(newName)) {
+        if (tmp != null && tmp.getMapFileName().endsWith("/"+newName)) {
             // this is the new active pickmap
             currentPickMap = tmp; // <- new pickmap
             foundMap = true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [681] trunk/src/app/net/sf/gridarta/gameobject/ GameObject.java

[<chr...@us...>]

Revision: 681
          http://svn.sourceforge.net/gridarta/?rev=681&view=rev
Author:   christianhujer
Date:     2006-11-21 13:40:28 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
Fixed typo.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gameobject/GameObject.java

Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2006-11-21 21:34:13 UTC (rev 680)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2006-11-21 21:40:28 UTC (rev 681)
@@ -439,7 +439,7 @@
     /**
      * Get the Archetype this GameObject is based on.
      * @return Archetype this GameObject is based on.
-     * @note For Archetypes, this method returns <code>thus</code>.
+     * @note For Archetypes, this method returns <code>this</code>.
      * @note currently this method returns the GameObject that reflects the Archetype data because there is no separate Archetype class.
      * This will change in future, and you should be aware of this fact.
      * @see #isArchetype()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [680] trunk/crossfire/src/cfeditor

[<chr...@us...>]

Revision: 680
          http://svn.sourceforge.net/gridarta/?rev=680&view=rev
Author:   christianhujer
Date:     2006-11-21 13:34:13 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
Replaced manControl.getArchetype(gameObject.getArchetypeName()) with gameObject.getArchetype()

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapArchPanel.java
    trunk/crossfire/src/cfeditor/CMapTileList.java
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java

Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-11-21 21:27:45 UTC (rev 679)
+++ trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-11-21 21:34:13 UTC (rev 680)
@@ -665,11 +665,11 @@
         final boolean hasMessage;
         if (gameObject.getMsgText() == null && gameObject.getArchetypeName() != null) {
             archTextArea.setForeground(Color.black);
-            if (mainControl.getArchetype(gameObject.getArchetypeName()).getMsgText() == null) {
+            if (gameObject.getArchetype().getMsgText() == null) {
                 archTextArea.setText("");
                 hasMessage = false;
             } else {
-                archTextArea.setText(mainControl.getArchetype(gameObject.getArchetypeName()).getMsgText());
+                archTextArea.setText(gameObject.getArchetype().getMsgText());
                 hasMessage = true;
             }
         } else {
@@ -688,13 +688,13 @@
             archFaceField.setText(gameObject.getFaceName());
         } else if (gameObject.getArchetypeName() != null) {
             archFaceField.setForeground(Color.black);
-            archFaceField.setText(mainControl.getArchetype(gameObject.getArchetypeName()).getFaceName());
+            archFaceField.setText(gameObject.getArchetype().getFaceName());
         }   // end face
 
         // *** OBJECT NAME ***
         if (gameObject.getObjName() == null && gameObject.getArchetypeName() != null) {
             archNameField.setForeground(Color.black);
-            if (mainControl.getArchetype(gameObject.getArchetypeName()).getObjName() == null) {
+            if (gameObject.getArchetype().getObjName() == null) {
                 // arch name
                 if (gameObject.getArchetypeName() != null) {
                     archNameField.setText(gameObject.getArchetypeName());
@@ -703,7 +703,7 @@
                 }
             } else {
                 // default name
-                archNameField.setText(mainControl.getArchetype(gameObject.getArchetypeName()).getObjName());
+                archNameField.setText(gameObject.getArchetype().getObjName());
             }
         } else {
             // object name ("special")

Modified: trunk/crossfire/src/cfeditor/CMapTileList.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapTileList.java	2006-11-21 21:27:45 UTC (rev 679)
+++ trunk/crossfire/src/cfeditor/CMapTileList.java	2006-11-21 21:34:13 UTC (rev 680)
@@ -438,7 +438,7 @@
                 } else {
                     final String defname;
                     if (gameObject.getArchetypeName() != null) {
-                        defname = mainControl.getArchetype(gameObject.getArchetypeName()).getObjName();
+                        defname = gameObject.getArchetype().getObjName();
                     } else {
                         defname = null;
                     }

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-11-21 21:27:45 UTC (rev 679)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-11-21 21:34:13 UTC (rev 680)
@@ -361,65 +361,65 @@
     /**
      * Determine which map-squares need to be redrawn after inserting/deleting
      * the given GameObject.
-     * @param arch the arch that is inserted or deleted
+     * @param gameObject the gameObject that is inserted or deleted
      * @return a <code>Point</code> array containing the coords of the tiles
      *         which need to be redrawn
      */
-    @Nullable Point[] calcArchRedraw(GameObject arch) {
-        if (arch == null) {  // safety check
+    @Nullable Point[] calcArchRedraw(GameObject gameObject) {
+        if (gameObject == null) {  // safety check
             return null;
         }
 
         final Point[] redraw;          // return value (coords needing redraw)
 
-        if (mainControl.getAutojoin() && mainControl.getArchetype(arch.getArchetypeName()).getJoinList() != null) {
-            // this arch does autojoining:
+        if (mainControl.getAutojoin() && gameObject.getArchetype().getJoinList() != null) {
+            // this gameObject does autojoining:
 
             // first look how many we need
             int num = 1;
-            if (mapControl.isPointValid(arch.getMapX() + 1, arch.getMapY())) {
+            if (mapControl.isPointValid(gameObject.getMapX() + 1, gameObject.getMapY())) {
                 num++;
             }
-            if (mapControl.isPointValid(arch.getMapX(), arch.getMapY() + 1)) {
+            if (mapControl.isPointValid(gameObject.getMapX(), gameObject.getMapY() + 1)) {
                 num++;
             }
-            if (mapControl.isPointValid(arch.getMapX() - 1, arch.getMapY())) {
+            if (mapControl.isPointValid(gameObject.getMapX() - 1, gameObject.getMapY())) {
                 num++;
             }
-            if (mapControl.isPointValid(arch.getMapX(), arch.getMapY() - 1)) {
+            if (mapControl.isPointValid(gameObject.getMapX(), gameObject.getMapY() - 1)) {
                 num++;
             }
 
             // now get the coordinates
             redraw = new Point[num];    // create instance of needed size
-            redraw[--num] = new Point(arch.getMapX(), arch.getMapY()); // center square
-            if (mapControl.isPointValid(arch.getMapX() + 1, arch.getMapY())) {
-                redraw[--num] = new Point(arch.getMapX() + 1, arch.getMapY());
+            redraw[--num] = new Point(gameObject.getMapX(), gameObject.getMapY()); // center square
+            if (mapControl.isPointValid(gameObject.getMapX() + 1, gameObject.getMapY())) {
+                redraw[--num] = new Point(gameObject.getMapX() + 1, gameObject.getMapY());
             }
-            if (mapControl.isPointValid(arch.getMapX(), arch.getMapY() + 1)) {
-                redraw[--num] = new Point(arch.getMapX(), arch.getMapY() + 1);
+            if (mapControl.isPointValid(gameObject.getMapX(), gameObject.getMapY() + 1)) {
+                redraw[--num] = new Point(gameObject.getMapX(), gameObject.getMapY() + 1);
             }
-            if (mapControl.isPointValid(arch.getMapX() - 1, arch.getMapY())) {
-                redraw[--num] = new Point(arch.getMapX() - 1, arch.getMapY());
+            if (mapControl.isPointValid(gameObject.getMapX() - 1, gameObject.getMapY())) {
+                redraw[--num] = new Point(gameObject.getMapX() - 1, gameObject.getMapY());
             }
-            if (mapControl.isPointValid(arch.getMapX(), arch.getMapY() - 1)) {
-                redraw[--num] = new Point(arch.getMapX(), arch.getMapY() - 1);
+            if (mapControl.isPointValid(gameObject.getMapX(), gameObject.getMapY() - 1)) {
+                redraw[--num] = new Point(gameObject.getMapX(), gameObject.getMapY() - 1);
             }
             assert num == 0;
-        } else if (arch.isMulti()) {
-            arch = arch.getHead(); // make sure we got the head
+        } else if (gameObject.isMulti()) {
+            gameObject = gameObject.getHead(); // make sure we got the head
 
-            int num = arch.getMultiRefCount();  // get number of parts
+            int num = gameObject.getMultiRefCount();  // get number of parts
             redraw = new Point[num];   // create instance of needed size
-            for (GameObject tmp = arch; num > 0 && tmp != null;
+            for (GameObject tmp = gameObject; num > 0 && tmp != null;
                  num--, tmp = tmp.getMultiNext()) {
                 redraw[num - 1] = new Point(tmp.getMapX(), tmp.getMapY());
             }
             assert num == 0;
         } else {
-            // just an ordinary single-square arch
+            // just an ordinary single-square gameObject
             redraw = new Point[1];
-            redraw[0] = new Point(arch.getMapX(), arch.getMapY());
+            redraw[0] = new Point(gameObject.getMapX(), gameObject.getMapY());
         }
 
         return redraw;

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java	2006-11-21 21:27:45 UTC (rev 679)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java	2006-11-21 21:34:13 UTC (rev 680)
@@ -413,7 +413,7 @@
         final String text = gameObject.getObjectText();
         final int len = text.length();
         // TODO can't this be replaced by archetype = gameObject.getArchetype() ?
-        final GameObject archetype = mainControl.getArchetype(gameObject.getArchetypeName());
+        final GameObject archetype = gameObject.getArchetype();
 
         gameObject.resetObjectText();
         for (int i = 0, s = 0; i < len; i++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [679] trunk

[<chr...@us...>]

Revision: 679
          http://svn.sourceforge.net/gridarta/?rev=679&view=rev
Author:   christianhujer
Date:     2006-11-21 13:27:45 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
Fixed bug in build.xml: libraries taken for javadoc were wrong.

Modified Paths:
--------------
    trunk/crossfire/build.xml
    trunk/daimonin/build.xml

Modified: trunk/crossfire/build.xml
===================================================================
--- trunk/crossfire/build.xml	2006-11-19 19:15:54 UTC (rev 678)
+++ trunk/crossfire/build.xml	2006-11-21 21:27:45 UTC (rev 679)
@@ -177,7 +177,8 @@
             link           = "${user.javadoc.link}"
         >
             <classpath>
-                <fileset dir="${lib.dir}" includes="*.jar" />
+                <fileset dir="${lib.dir}" includes="*.jar" excludes="LICENSE-*.jar" />
+                <fileset dir="../lib/"    includes="*.jar" excludes="LICENSE-*.jar" />
             </classpath>
             <sourcepath path="${src.dir}" />
             <packageset

Modified: trunk/daimonin/build.xml
===================================================================
--- trunk/daimonin/build.xml	2006-11-19 19:15:54 UTC (rev 678)
+++ trunk/daimonin/build.xml	2006-11-21 21:27:45 UTC (rev 679)
@@ -220,7 +220,8 @@
             link           = "${user.javadoc.link}"
         >
             <classpath>
-                <fileset dir="${lib.dir}" includes="*.jar" />
+                <fileset dir="${lib.dir}" includes="*.jar" excludes="LICENSE-*.jar" />
+                <fileset dir="../lib/"    includes="*.jar" excludes="LICENSE-*.jar" />
             </classpath>
             <sourcepath path="${src.dir}" />
             <packageset


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [678] trunk/daimonin/src/daieditor/CMapArchPanel.java

[<chr...@us...>]

Revision: 678
          http://svn.sourceforge.net/gridarta/?rev=678&view=rev
Author:   christianhujer
Date:     2006-11-19 11:15:54 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Improved variable naming.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CMapArchPanel.java

Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-19 18:24:33 UTC (rev 677)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-19 19:15:54 UTC (rev 678)
@@ -549,7 +549,7 @@
         return dirPanel;
     }
 
-    private void applyDirectionChanges(final GameObject arch, final int dir) {
+    private void applyDirectionChanges(final GameObject gameObject, final int dir) {
         final StringBuilder newText = new StringBuilder();
         final String text = archEdit.getText();
         final int len = text.length();
@@ -569,15 +569,15 @@
 
         // add our direction
         // direction 0 is a special case: the server default value
-        // of a new arch is direction 0. So, a server defarch has direction 0
-        // even without a direction command in the default arch.
-        if (dir == 0 && arch.getArchetype().getDirection() == 0) {
+        // of a new gameObject is direction 0. So, a server defarch has direction 0
+        // even without a direction command in the archetype.
+        if (dir == 0 && gameObject.getArchetype().getDirection() == 0) {
             archEdit.setText(newText.toString());
         } else {
             archEdit.setText(newText.append("direction ").append(dir).append('\n').toString());
         }
-        applyArchPanelChanges(arch);
-        setMapArchPanelObject(arch);
+        applyArchPanelChanges(gameObject);
+        setMapArchPanelObject(gameObject);
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [677] trunk

[<chr...@us...>]

Revision: 677
          http://svn.sourceforge.net/gridarta/?rev=677&view=rev
Author:   christianhujer
Date:     2006-11-19 10:24:33 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Some Unification of CMapArchPanel.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMapArchPanel.java
    trunk/daimonin/src/daieditor/CMapArchPanel.java

Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-11-19 18:13:08 UTC (rev 676)
+++ trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-11-19 18:24:33 UTC (rev 677)
@@ -308,8 +308,7 @@
         // are taken instead:
         final GameObject gameObject = activeArch.getHead();
 
-        // FIXME cher: shouldn't this be replaced by archetype = gameObject.getArchetype() ?
-        final GameObject archetype = mainControl.getArchetype(gameObject.getArchetypeName());
+        final GameObject archetype = gameObject.getArchetype();
         if (archetype == null) {   // hm, this should NOT happen
             return;
         }
@@ -626,10 +625,10 @@
     /**
      * If an arch is selected, the MapArchPanels (bottom right windows) get
      * updated.
-     * @param activeArch the selected arch
+     * @param activeGameObject the selected arch
      */
-    public void setMapArchPanelObject(final GameObject activeArch) {
-        selectedObject = activeArch;
+    public void setMapArchPanelObject(final GameObject activeGameObject) {
+        selectedObject = activeGameObject;
         // archObjNameText.setText("<html><font color=black>Name:</font></html>");
         // reset panel
         archNameField.setText("");
@@ -643,7 +642,7 @@
         // reset list
         archEdit.setEnabled(false);
         archEdit.setText("");
-        if (activeArch == null) {
+        if (activeGameObject == null) {
             // an empty space has been selected - reset panel to empty state
             if (eventList != null && eventList.getModel() != null && eventList.getModel().getSize() > 0) {
                 eventList.setModel(new DefaultListModel()); // clear script event list
@@ -660,7 +659,7 @@
 
         // If the active arch is part of a multi, the mutli-head's stats
         // are displayed (Only the head can store information!).
-        final GameObject gameObject = activeArch.getHead();
+        final GameObject gameObject = activeGameObject.getHead();
 
         // no text, we try to set the default text
         final boolean hasMessage;
@@ -713,18 +712,24 @@
         } // end ObjName
 
         // set hint for "specials": scripts/inventory/message
-        String specialText = "";
+        final StringBuilder specialText = new StringBuilder();
         final int i;
         if ((i = gameObject.countInvObjects()) > 0) {
-            specialText += "Inv: " + i;
+            specialText.append("Inv: ").append(Integer.toString(i));
         }
         if (gameObject.isScripted()) {
-            specialText += specialText.length() > 0 ? ", Script" : "Script";
+            if (specialText.length() > 0) {
+                specialText.append(", ");
+            }
+            specialText.append("Script");
         }
         if (hasMessage) {
-            specialText += specialText.length() > 0 ? ", Msg" : "Msg";
+            if (specialText.length() > 0) {
+                specialText.append(", ");
+            }
+            specialText.append("Msg");
         }
-        archInvCount.setText(specialText); // set text to label
+        archInvCount.setText(specialText.toString()); // set text to label
 
         archMapPos.setText("Map: " + gameObject.getMapX() + ", " + gameObject.getMapY());
 
@@ -792,19 +797,20 @@
      * script is triggered.
      */
     public void editScriptWanted(final int task) {
-        GameObject arch = mainControl.getMainView().getMapTileSelection(); // get selected arch
-        if (arch != null) {
-            arch = arch.getHead();
+        GameObject gameObject = mainControl.getMainView().getMapTileSelection(); // get selected gameObject
+        if (gameObject == null) {
+            return;
         }
 
+        gameObject = gameObject.getHead();
+
         // check for a valid selection in the event list
-        if (arch != null && eventList.getModel() != null && eventList.getModel().getSize() > 0
-                && eventList.getSelectedIndex() >= 0) {
+        if (eventList.getModel() != null && eventList.getModel().getSize() > 0 && eventList.getSelectedIndex() >= 0) {
             // there
             String eventType = (String) eventList.getSelectedValue();
             if (eventType != null && eventType.length() > 0) {
                 eventType = eventType.trim();
-                arch.modifyEventScript(eventType, task, eventList, this);
+                gameObject.modifyEventScript(eventType, task, eventList, this);
             }
         }
     }
@@ -825,8 +831,7 @@
      * @param pathButton
      * @param removeButton
      */
-    public void setScriptPanelButtonState(final boolean newButton, final boolean modifyButton,
-                                          final boolean pathButton, final boolean removeButton) {
+    public void setScriptPanelButtonState(final boolean newButton, final boolean modifyButton, final boolean pathButton, final boolean removeButton) {
         s_new.setEnabled(newButton);
         s_modify.setEnabled(modifyButton);
         s_path.setEnabled(pathButton);

Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-19 18:13:08 UTC (rev 676)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-19 18:24:33 UTC (rev 677)
@@ -752,9 +752,9 @@
     /**
      * If an arch is selected, the MapArchPanels
      * (bottom right windows) get updated.
-     * @param activeArch the selected arch
+     * @param activeGameObject the selected arch
      */
-    void setMapArchPanelObject(final GameObject activeArch) {
+    void setMapArchPanelObject(final GameObject activeGameObject) {
         // reset panel
         archNameField.setText("");
         archFaceText.setText("Image:");
@@ -765,11 +765,11 @@
         // reset list
         archEdit.setEnabled(false);
         archEdit.setText("");
-        for (JToggleButton button : directionButtons) {
+        for (final JToggleButton button : directionButtons) {
             button.setBackground(null);
         }
 
-        if (activeArch == null) {
+        if (activeGameObject == null) {
             // an empty space has been selected - reset panel to empty state
             if (eventList != null && eventList.getModel() != null && eventList.getModel().getSize() > 0) {
                 eventList.setModel(new DefaultListModel()); // clear script event list
@@ -796,9 +796,9 @@
             return;
         }
 
-        // If the active arch is part of a multi, the mutli-head's stats
+        // If the active gameObject is part of a multi, the mutli-head's stats
         // are displayed (Only the head can store information!).
-        final GameObject arch = activeArch.getHead();
+        final GameObject gameObject = activeGameObject.getHead();
 
         panelDesktop.setForegroundAt(0, blue);
         aInvChange.setEnabled(true);
@@ -806,32 +806,32 @@
         aSubmitChange.setEnabled(true);
 
         // atm we handle direction 0 not here
-        final boolean enableDirButtons = arch.isDirectionSet();
+        final boolean enableDirButtons = gameObject.isDirectionSet();
         directionButtons[0].setSelected(true);
         for (JToggleButton button : directionButtons) {
             button.setEnabled(enableDirButtons);
         }
         if (enableDirButtons) {
-            final JToggleButton button = directionButtons[arch.getDirection()];
+            final JToggleButton button = directionButtons[gameObject.getDirection()];
             button.setSelected(true);
         }
 
-        final GameObject defarch = arch.getArchetype();
+        final GameObject archetype = gameObject.getArchetype();
 
         // no text, we try to set the default text
         final boolean hasMessage;
-        if (arch.getMsgText() == null && defarch != null) {
+        if (gameObject.getMsgText() == null && archetype != null) {
             archTextArea.setForeground(black);
-            if (defarch.getMsgText() == null) {
+            if (archetype.getMsgText() == null) {
                 archTextArea.setText("");
                 hasMessage = false;
             } else {
-                archTextArea.setText(defarch.getMsgText());
+                archTextArea.setText(archetype.getMsgText());
                 hasMessage = true;
             }
         } else {
             archTextArea.setForeground(blue);
-            archTextArea.setText(arch.getMsgText());
+            archTextArea.setText(gameObject.getMsgText());
             hasMessage = true;
         }
         archTextArea.setCaretPosition(0);
@@ -840,54 +840,54 @@
         }
         // end msg text
 
-        if (arch.getAnimName() != null || defarch != null && defarch.getAnimName() != null) {
+        if (gameObject.getAnimName() != null || archetype != null && archetype.getAnimName() != null) {
             panelDesktop.setForegroundAt(3, blue);
         }
 
         // *** OBJECT NAME ***
-        if (arch.getObjName() == null && defarch != null) {
+        if (gameObject.getObjName() == null && archetype != null) {
             archNameField.setForeground(black);
-            if (defarch.getObjName() == null) {
-                // arch name
-                if (arch.getArchetypeName() != null) {
-                    archNameField.setText(arch.getArchetypeName());
+            if (archetype.getObjName() == null) {
+                // gameObject name
+                if (gameObject.getArchetypeName() != null) {
+                    archNameField.setText(gameObject.getArchetypeName());
                 } else {
                     archNameField.setText("");
                 }
             } else {
                 // default name
-                archNameField.setText(defarch.getObjName());
+                archNameField.setText(archetype.getObjName());
             }
         } else {
             // object name ("special")
             archNameField.setForeground(blue);
-            archNameField.setText(arch.getObjName());
+            archNameField.setText(gameObject.getObjName());
         } // end ObjName
 
         /*
-           if(arch.getAnimName()!=null)
+           if(gameObject.getAnimName()!=null)
 
-           else if(arch.getAnimText()!=null)
-           archNameField.setText(arch.getAnimText());
+           else if(gameObject.getAnimText()!=null)
+           archNameField.setText(gameObject.getAnimText());
            else
-           archNameField.setText(mainControl.getArch(arch.getArchetypeName()).getAnimText());
+           archNameField.setText(mainControl.getArch(gameObject.getArchetypeName()).getAnimText());
          */
         // set hint for "specials": scripts/inventory/message
         final StringBuilder specialText = new StringBuilder();
-        specialText.append("Status: in node ").append(arch.getMapX()).append(", ").append(arch.getMapY()).append(' ');
-        if (arch.isScripted()) {
+        specialText.append("Status: in node ").append(gameObject.getMapX()).append(", ").append(gameObject.getMapY()).append(' ');
+        if (gameObject.isScripted()) {
             panelDesktop.setForegroundAt(2, blue);
             specialText.append("(script)");
         }
         if (hasMessage) {
             specialText.append("(msg)");
         }
-        final int invObjects = arch.countInvObjects();
+        final int invObjects = gameObject.countInvObjects();
         if (invObjects > 0) {
             specialText.append(" (inv: ").append(invObjects).append(')');
         }
-        if (arch.isInContainer()) {
-            final GameObject cont = (GameObject) arch.getContainer();
+        if (gameObject.isInContainer()) {
+            final GameObject cont = (GameObject) gameObject.getContainer();
             if (cont.getArchetypeName() != null) {
                 specialText.append(" (env: ").append(cont.getArchetypeName()).append(')');
             } else {
@@ -898,16 +898,16 @@
         archMapPos.setText(specialText.toString());
 
         final StringBuilder typeText = new StringBuilder();
-        if (defarch != null) {
-            typeText.append("Type: ").append(mainControl.getTypeList().getArchTypeName(arch.getArchTypNr())).append(" (").append(arch.getArchTypNr()).append(") [").append(arch.getArchetypeName()).append(']');
+        if (archetype != null) {
+            typeText.append("Type: ").append(mainControl.getTypeList().getArchTypeName(gameObject.getArchTypNr())).append(" (").append(gameObject.getArchTypNr()).append(") [").append(gameObject.getArchetypeName()).append(']');
         } else {
             typeText.append("Type: <unknown>");
         }
 
         // check for multi tile
-        if (arch.isMulti()) {
+        if (gameObject.isMulti()) {
             // multi: print size
-            typeText.append(" [").append(arch.getSizeX()).append('x').append(arch.getSizeY()).append(']');
+            typeText.append(" [").append(gameObject.getSizeX()).append('x').append(gameObject.getSizeY()).append(']');
         } else {
             // single
             typeText.append(" [single]");
@@ -916,11 +916,11 @@
         archTypeText.setText(typeText.toString());
 
         final StringBuilder faceText = new StringBuilder();
-        if (arch.getFaceObjName() == null) {
+        if (gameObject.getFaceObjName() == null) {
             faceText.append("Image: >no face<");
         } else {
-            final GameObject.FaceDesc desc = arch.getFaceObjDesc();
-            faceText.append("Image: ").append(arch.getFaceObjName()).append(" (");
+            final GameObject.FaceDesc desc = gameObject.getFaceObjDesc();
+            faceText.append("Image: ").append(gameObject.getFaceObjName()).append(" (");
             switch (desc) {
             case FACE_NOT_FOUND:
                 faceText.append("face not found");
@@ -929,22 +929,22 @@
                 faceText.append("face");
                 break;
             case DEFARCH_FACE:
-                faceText.append("defarch face");
+                faceText.append("archetype face");
                 break;
             case ANIM:
                 faceText.append("anim");
                 break;
             case DEFARCH_ANIM:
-                faceText.append("defarch anim");
+                faceText.append("archetype anim");
                 break;
             }
         }
         archFaceText.setText(faceText.toString());
 
 
-        String animName = arch.getAnimName();
-        if (animName == null && defarch != null) {
-            animName = defarch.getAnimName();
+        String animName = gameObject.getAnimName();
+        if (animName == null && archetype != null) {
+            animName = archetype.getAnimName();
         }
         final StringBuilder animText = new StringBuilder("Animation: ");
         if (animName != null) {
@@ -956,7 +956,7 @@
         }
         archAnimText.setText(animText.toString());
 
-        // drawing the arch's attributes in the text field (archEdit) at the bottom right
+        // drawing the gameObject's attributes in the text field (archEdit) at the bottom right
         archEdit.setEnabled(true);
         final Style currentAttributes = archEdit.getStyle(StyleContext.DEFAULT_STYLE);
         try {
@@ -967,17 +967,17 @@
 
             // blue: the "special" attributes, differ from the default archetype
             StyleConstants.setForeground(currentAttributes, blue);
-            if (arch.getObjectText() != null) {
-                document.insertString(document.getLength(), arch.getObjectText(), currentAttributes);
+            if (gameObject.getObjectText() != null) {
+                document.insertString(document.getLength(), gameObject.getObjectText(), currentAttributes);
             }
 
-            // document.insertString(document.getLength(), "ID#"+arch.getMyID()+ " inv#: "+arch.countInvObjects()+"\n", currentAttributes);
+            // document.insertString(document.getLength(), "ID#"+gameObject.getMyID()+ " inv#: "+gameObject.countInvObjects()+"\n", currentAttributes);
 
             // black: the attributes from the default archetype
             //        that don't exist among the "special" ones
             StyleConstants.setForeground(currentAttributes, black);
-            if (arch.getObjectText() != null && defarch != null) {
-                document.insertString(document.getLength(), arch.diffArchText(defarch.getObjectText(), true), currentAttributes);
+            if (gameObject.getObjectText() != null && archetype != null) {
+                document.insertString(document.getLength(), gameObject.diffArchText(archetype.getObjectText(), true), currentAttributes);
             }
         } catch (final BadLocationException e) {
             // TODO
@@ -985,9 +985,9 @@
         archEdit.setCaretPosition(0);
 
         // ------ script panel ------
-        if (arch.isScripted()) {
+        if (gameObject.isScripted()) {
             eventList.removeAll();            // clear event list
-            arch.addEventsToJList(eventList); // update JList to display all events
+            gameObject.addEventsToJList(eventList); // update JList to display all events
 
             aModify.setEnabled(true);
             aPath.setEnabled(true);
@@ -1009,19 +1009,19 @@
      * script is triggered.
      */
     public void editScriptWanted(final int task) {
-        GameObject arch = mainControl.getMainView().getMapTileSelection(); // get selected arch
-        if (arch == null) {
+        GameObject gameObject = mainControl.getMainView().getMapTileSelection(); // get selected gameObject
+        if (gameObject == null) {
             return;
         }
 
-        arch = arch.getHead();
+        gameObject = gameObject.getHead();
 
         // check for a valid selection in the event list
         if (eventList.getModel() != null && eventList.getModel().getSize() > 0 && eventList.getSelectedIndex() >= 0) {
             // there
             final int index = eventList.getSelectedIndex();
             if (index >= 0) {
-                if (arch.modifyEventScript(index, task, eventList, this)) {
+                if (gameObject.modifyEventScript(index, task, eventList, this)) {
                     updateMapTileList();
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [676] trunk/daimonin/src/daieditor/CMapArchPanel.java

[<chr...@us...>]

Revision: 676
          http://svn.sourceforge.net/gridarta/?rev=676&view=rev
Author:   christianhujer
Date:     2006-11-19 10:13:08 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Improved variable naming.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/CMapArchPanel.java

Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-19 18:09:54 UTC (rev 675)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-19 18:13:08 UTC (rev 676)
@@ -341,12 +341,13 @@
             return;
         }
 
-        // If the active arch is part of a multi, the mutli-head's stats
+        // If the active gameObject is part of a multi, the mutli-head's stats
         // are taken instead:
-        final GameObject arch = activeArch.getHead();
+        final GameObject gameObject = activeArch.getHead();
 
-        final GameObject defarch = arch.getArchetype();
-        if (defarch == null) {   // hm, this should NOT happen
+        final GameObject archetype = gameObject.getArchetype();
+        if (archetype == null) {   // hm, this should NOT happen
+            System.err.println("trying to change a GameObject with null Archetype"); // TODO: use logging
             return;
         }
 
@@ -354,20 +355,20 @@
         // the obj name:
         if (isNonwhitespaceText(archNameField.getText())) { // there is something in
             // if this equal the default name...
-            if (defarch.getObjName() != null) {
-                if (archNameField.getText().compareTo(defarch.getObjName()) == 0) {
-                    arch.setObjName(null); // yes, we don't need it in map
+            if (archetype.getObjName() != null) {
+                if (archNameField.getText().compareTo(archetype.getObjName()) == 0) {
+                    gameObject.setObjName(null); // yes, we don't need it in map
                 } else {
-                    arch.setObjName(archNameField.getText());    // overrule in map arch
+                    gameObject.setObjName(archNameField.getText());    // overrule in map gameObject
                 }
-            } else if (archNameField.getText().compareTo(arch.getArchetypeName()) == 0) {
-                arch.setObjName(null);
+            } else if (archNameField.getText().compareTo(gameObject.getArchetypeName()) == 0) {
+                gameObject.setObjName(null);
             } else {   // def is null, something is in panel, so we set it
-                arch.setObjName(archNameField.getText());    // overrule in map arch
+                gameObject.setObjName(archNameField.getText());    // overrule in map gameObject
             }
         } else {
-            arch.setObjName(null); // nothing in, nothing in map arch
-            // hm, there is no way yet to overrule a default arch name with "nothing"
+            gameObject.setObjName(null); // nothing in, nothing in map gameObject
+            // hm, there is no way yet to overrule a default gameObject name with "nothing"
             // like <name > ore <name "">..??
         }
 
@@ -375,7 +376,7 @@
         // if there is an entry in the archTextArea (msg window), this
         // overrules the default text (if any)
         if (isNonwhitespaceText(archTextArea.getText())) { // there is something in the msg win
-            if (defarch.getMsgText() != null) {
+            if (archetype.getMsgText() != null) {
                 // trim text from message window
                 String newMsgText = archTextArea.getText();
                 if (newMsgText != null) {
@@ -383,58 +384,58 @@
                 } else {
                     newMsgText = "";
                 }
-                if (newMsgText.equals(defarch.getMsgText().trim())) {
-                    arch.deleteMsgText(); // yes, we don't need it in map
+                if (newMsgText.equals(archetype.getMsgText().trim())) {
+                    gameObject.deleteMsgText(); // yes, we don't need it in map
                 } else {
-                    arch.resetMsgText();
-                    arch.addMsgText(newMsgText);
+                    gameObject.resetMsgText();
+                    gameObject.addMsgText(newMsgText);
                 }
             } else {
-                arch.resetMsgText();
-                arch.addMsgText(archTextArea.getText());
+                gameObject.resetMsgText();
+                gameObject.addMsgText(archTextArea.getText());
             }
         } else { // there is nothing in the msg win
-            arch.deleteMsgText(); // always delete this...
-            if (defarch.getMsgText() != null) {
-                arch.addMsgText(""); // but here we must overrule default with msg/endmsg (empty msg)
+            gameObject.deleteMsgText(); // always delete this...
+            if (archetype.getMsgText() != null) {
+                gameObject.addMsgText(""); // but here we must overrule default with msg/endmsg (empty msg)
             }
         }
 
         // read from archEdit (bottom right textwin) only the attributes
-        // that differ from the default arch. These get stored into
+        // that differ from the default gameObject. These get stored into
         // the arche's archText (and finally in the map).
-        arch.setObjectText(defarch.diffArchText(archEdit.getText(), false));
+        gameObject.setObjectText(archetype.diffArchText(archEdit.getText(), false));
 
         /* check we have a face and set the real face obj for fast access */
-        final String face = arch.getAttributeString("face", false);
+        final String face = gameObject.getAttributeString("face", false);
         // we have a new face name
         if (face != null) {
-            arch.setRealFace(face);
+            gameObject.setRealFace(face);
         }
-        if (arch.getAttributeString("animation", false).length() > 0) {
-            arch.setAnimName(arch.getAttributeString("animation", false));
+        if (gameObject.getAttributeString("animation", false).length() > 0) {
+            gameObject.setAnimName(gameObject.getAttributeString("animation", false));
         } else {
-            arch.setAnimName(defarch.getAnimName());
+            gameObject.setAnimName(archetype.getAnimName());
         }
 
-        if (arch.getAttributeString("direction", false).length() > 0) {
-            final int dir = arch.getAttributeInt("direction", false);
-            if (defarch.getDirection() != dir) {
-                arch.setDirection(dir);
+        if (gameObject.getAttributeString("direction", false).length() > 0) {
+            final int dir = gameObject.getAttributeInt("direction", false);
+            if (archetype.getDirection() != dir) {
+                gameObject.setDirection(dir);
             }
         } else {
-            arch.setDirection(defarch.getDirection());
+            gameObject.setDirection(archetype.getDirection());
         }
-        arch.setObjectFace();
+        gameObject.setObjectFace();
 
         // we look for 'type' in the ArchText. In future maybe type should get
         // a seperate textfield
-        if (arch.getAttributeString("type", false).length() > 0) {
-            arch.setArchTypNr(arch.getAttributeInt("type", false)); // specified type
+        if (gameObject.getAttributeString("type", false).length() > 0) {
+            gameObject.setArchTypNr(gameObject.getAttributeInt("type", false)); // specified type
         }
 
         // Recalculate the editType value. It shall stay 100% accurate ;)
-        arch.calculateEditType(mainControl.getCurrentMap().getActiveEditType());
+        gameObject.calculateEditType(mainControl.getCurrentMap().getActiveEditType());
 
         // there we go!!!!!
         // now here will be the special panels added!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [675] trunk

[<chr...@us...>]

Revision: 675
          http://svn.sourceforge.net/gridarta/?rev=675&view=rev
Author:   christianhujer
Date:     2006-11-19 10:09:54 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Removed daimonin only attribute direction from common code.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/GameObject.java
    trunk/daimonin/src/daieditor/CAttribDialog.java
    trunk/src/app/net/sf/gridarta/gameobject/Archetype.java

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2006-11-19 17:57:43 UTC (rev 674)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2006-11-19 18:09:54 UTC (rev 675)
@@ -466,11 +466,6 @@
         return null;
     }
 
-    /** {@inheritDoc} */
-    public int getDirection() {
-        return 0;
-    }
-
     /**
      * {@inheritDoc}
      * @todo this method is too slow - find a faster way

Modified: trunk/daimonin/src/daieditor/CAttribDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/CAttribDialog.java	2006-11-19 17:57:43 UTC (rev 674)
+++ trunk/daimonin/src/daieditor/CAttribDialog.java	2006-11-19 18:09:54 UTC (rev 675)
@@ -1306,7 +1306,7 @@
         * because we have a better interface in the gameObject panel.
         * But we need to add when needed the gameObject text - we do it here.
         */
-        if (gameObject.getDirection() != archetype.getDirection()) {
+        if (gameObject.getDirection() != ((GameObject) archetype).getDirection()) {
             newArchText = newArchText + "direction " + gameObject.getDirection() + '\n';
         }
         // before we modify the archtext, we look for errors and save them.

Modified: trunk/src/app/net/sf/gridarta/gameobject/Archetype.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/Archetype.java	2006-11-19 17:57:43 UTC (rev 674)
+++ trunk/src/app/net/sf/gridarta/gameobject/Archetype.java	2006-11-19 18:09:54 UTC (rev 675)
@@ -150,13 +150,6 @@
     @Deprecated String getAnimName();
 
     /**
-     * DaiEditor only: Returns the direction.
-     * @return The direction.
-     * @deprecated compatibility method
-     */
-    @Deprecated int getDirection();
-
-    /**
      * Returns the object text of this Archetype as String.
      * @return the object text
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [674] trunk/crossfire/src/cfeditor/map/MapControl. java

[<chr...@us...>]

Revision: 674
          http://svn.sourceforge.net/gridarta/?rev=674&view=rev
Author:   christianhujer
Date:     2006-11-19 09:57:43 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Removed some dead code.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/MapControl.java

Modified: trunk/crossfire/src/cfeditor/map/MapControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapControl.java	2006-11-19 15:13:48 UTC (rev 673)
+++ trunk/crossfire/src/cfeditor/map/MapControl.java	2006-11-19 17:57:43 UTC (rev 674)
@@ -187,28 +187,6 @@
         return mapModel.getMapArchObject().getLore();
     }
 
-    /**
-     * Handles the given error.
-     * @param error a generic error
-     */
-    public void handleErrors(final GridderException error) {
-        mainControl.handleErrors(error);
-    }
-
-    /**
-     * Shows the given message in the UI.
-     * @param strTitle   the title of the message
-     * @param strMessage the message to be shown
-     */
-    public void showMessage(final String strTitle, final String strMessage) {
-        mainControl.showMessage(strTitle, strMessage);
-    }
-
-    /** Refreshes the state of menu items and toolbar buttons. */
-    void refreshMenusAndToolbars() {
-        mainControl.refreshMenusAndToolbars();
-    }
-
     public void levelCloseNotify() {
         levelClosing = true;
         mapModel.levelCloseNotify();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [673] trunk

[<chr...@us...>]

Revision: 673
          http://svn.sourceforge.net/gridarta/?rev=673&view=rev
Author:   christianhujer
Date:     2006-11-19 07:13:48 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Some MapControl unification.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/MapControl.java
    trunk/daimonin/src/daieditor/map/MapControl.java
    trunk/src/app/net/sf/gridarta/map/MapControl.java

Modified: trunk/crossfire/src/cfeditor/map/MapControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapControl.java	2006-11-19 14:54:50 UTC (rev 672)
+++ trunk/crossfire/src/cfeditor/map/MapControl.java	2006-11-19 15:13:48 UTC (rev 673)
@@ -111,22 +111,11 @@
         mapView = new MapViewIFrame(mainControl, this, initial);
     }
 
-    /**
-     * Return flag that indicates whether this is a pickmap or not.
-     * @return flag that indicates whether this is a pickmap or not
-     */
+    /** {@inheritDoc} */
     public boolean isPickmap() {
         return isPickmap;
     }
 
-    public boolean isGridVisible() {
-        return mapView.isGridVisible();
-    }
-
-    public void setGridVisibility(final boolean fVisible) {
-        mapView.setGridVisibility(fVisible);
-    }
-
     /**
      * Return contains the edit types that have already been (requested and)
      * calculated (edit types get calculated only when needed to save time)

Modified: trunk/daimonin/src/daieditor/map/MapControl.java
===================================================================
--- trunk/daimonin/src/daieditor/map/MapControl.java	2006-11-19 14:54:50 UTC (rev 672)
+++ trunk/daimonin/src/daieditor/map/MapControl.java	2006-11-19 15:13:48 UTC (rev 673)
@@ -154,10 +154,7 @@
         }
     }
 
-    /**
-     * Return flag that indicates whether this is a pickmap or not.
-     * @return flag that indicates whether this is a pickmap or not
-     */
+    /** {@inheritDoc} */
     public boolean isPickmap() {
         return isPickmap;
     }

Modified: trunk/src/app/net/sf/gridarta/map/MapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/MapControl.java	2006-11-19 14:54:50 UTC (rev 672)
+++ trunk/src/app/net/sf/gridarta/map/MapControl.java	2006-11-19 15:13:48 UTC (rev 673)
@@ -6,4 +6,10 @@
  */
 public interface MapControl {
 
+    /**
+     * Return flag that indicates whether this is a pickmap or not.
+     * @return flag that indicates whether this is a pickmap or not
+     */
+    boolean isPickmap();
+
 } // interface MapControl


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [672] trunk/src/app/net/sf/gridarta/io

[<chr...@us...>]

Revision: 672
          http://svn.sourceforge.net/gridarta/?rev=672&view=rev
Author:   christianhujer
Date:     2006-11-19 06:54:50 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Added separate exception for invalid file formats.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java
    trunk/src/app/net/sf/gridarta/io/MapReader.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/io/InvalidMapFormatException.java

Modified: trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java	2006-11-19 14:41:03 UTC (rev 671)
+++ trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java	2006-11-19 14:54:50 UTC (rev 672)
@@ -85,13 +85,12 @@
      * @return first <code>GameObject</code> in the list
      * @throws FileNotFoundException in case the requested map file was not found
      * @throws IOException in case the file couldn't be read or is in wrong format
-     * @todo create a separate exception for the wrong format
      */
     @NotNull public List<G> decodeMapFile() throws IOException {
         // first of all we read the map arch (if that fails we throw an exception)
         maparch = createMapArchObject();
         if (!maparch.parseMapArch(myInput, uri)) {
-            throw new IOException("The file '" + uri + "' does not contain a valid Gridarta (Crossfire, Daimonin) map format!\n");
+            throw new InvalidMapFormatException("The file '" + uri + "' does not contain a valid Gridarta (Crossfire, Daimonin) map format!\n");
         }
         //maparch.setName(uri);
 

Added: trunk/src/app/net/sf/gridarta/io/InvalidMapFormatException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/InvalidMapFormatException.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/io/InvalidMapFormatException.java	2006-11-19 14:54:50 UTC (rev 672)
@@ -0,0 +1,19 @@
+package net.sf.gridarta.io;
+
+import java.io.IOException;
+
+/**
+ * Exception that's thrown when a {@link MapReader} read a file and detected that it's in the wrong format.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class InvalidMapFormatException extends IOException {
+
+    /**
+     * Create an InvalidMapFormatException.
+     * @param msg Message text
+     */
+    public InvalidMapFormatException(final String msg) {
+        super(msg);
+    }
+
+} // class InvalidMapFormatException


Property changes on: trunk/src/app/net/sf/gridarta/io/InvalidMapFormatException.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Modified: trunk/src/app/net/sf/gridarta/io/MapReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/MapReader.java	2006-11-19 14:41:03 UTC (rev 671)
+++ trunk/src/app/net/sf/gridarta/io/MapReader.java	2006-11-19 14:54:50 UTC (rev 672)
@@ -25,7 +25,6 @@
      * This method returns a list of GameObjects.
      * @return first <code>GameObject</code> in the list
      * @throws IOException in case the file couldn't be read or is in wrong format
-     * @todo create a separate exception for the wrong format
      */
     @NotNull List<G> decodeMapFile() throws IOException;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [671] trunk

[<chr...@us...>]

Revision: 671
          http://svn.sourceforge.net/gridarta/?rev=671&view=rev
Author:   christianhujer
Date:     2006-11-19 06:41:03 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Fixed bugs in comments.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/io/CMapReader.java
    trunk/crossfire/src/cfeditor/io/CMapWriter.java
    trunk/daimonin/src/daieditor/io/CMapReader.java
    trunk/daimonin/src/daieditor/io/CMapWriter.java

Modified: trunk/crossfire/src/cfeditor/io/CMapReader.java
===================================================================
--- trunk/crossfire/src/cfeditor/io/CMapReader.java	2006-11-19 14:30:09 UTC (rev 670)
+++ trunk/crossfire/src/cfeditor/io/CMapReader.java	2006-11-19 14:41:03 UTC (rev 671)
@@ -31,12 +31,14 @@
 import java.io.IOException;
 import java.util.List;
 import net.sf.gridarta.io.AbstractMapReader;
+import net.sf.gridarta.io.MapReader;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * A MapFileDecoder reads a map file and provides access to the information read from the map file.
+ * {@link MapReader} implementation for Crossfire maps.
+ * A MapReader reads a map file and provides access to the information read from the map file.
  * This class handles the reading of a mapfile and parsing the data
  * into a list of ArchObjects.
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>

Modified: trunk/crossfire/src/cfeditor/io/CMapWriter.java
===================================================================
--- trunk/crossfire/src/cfeditor/io/CMapWriter.java	2006-11-19 14:30:09 UTC (rev 670)
+++ trunk/crossfire/src/cfeditor/io/CMapWriter.java	2006-11-19 14:41:03 UTC (rev 671)
@@ -38,11 +38,12 @@
 import java.util.Map;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.io.AbstractMapWriter;
+import net.sf.gridarta.io.MapWriter;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * The <code>CMapFileEncode</code> is used to write a map to a file.
+ * {@link MapWriter} implementation for Crossfire maps.
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>

Modified: trunk/daimonin/src/daieditor/io/CMapReader.java
===================================================================
--- trunk/daimonin/src/daieditor/io/CMapReader.java	2006-11-19 14:30:09 UTC (rev 670)
+++ trunk/daimonin/src/daieditor/io/CMapReader.java	2006-11-19 14:41:03 UTC (rev 671)
@@ -32,12 +32,14 @@
 import java.io.IOException;
 import java.util.List;
 import net.sf.gridarta.io.AbstractMapReader;
+import net.sf.gridarta.io.MapReader;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * A MapFileDecoder reads a map file and provides access to the information read from the map file.
+ * {@link MapReader} implementation for Daimonin maps.
+ * A MapReader reads a map file and provides access to the information read from the map file.
  * This class handles the reading of a mapfile and parsing the data
  * into a list of ArchObjects.
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>

Modified: trunk/daimonin/src/daieditor/io/CMapWriter.java
===================================================================
--- trunk/daimonin/src/daieditor/io/CMapWriter.java	2006-11-19 14:30:09 UTC (rev 670)
+++ trunk/daimonin/src/daieditor/io/CMapWriter.java	2006-11-19 14:41:03 UTC (rev 671)
@@ -33,10 +33,11 @@
 import java.util.Formatter;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.io.AbstractMapWriter;
+import net.sf.gridarta.io.MapWriter;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * The <code>CMapFileEncode</code> is used to write a map to a file.
+ * {@link MapWriter} implementation for Daimonin maps.
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [670] trunk/lib

[<chr...@us...>]

Revision: 670
          http://svn.sourceforge.net/gridarta/?rev=670&view=rev
Author:   christianhujer
Date:     2006-11-19 06:30:09 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Added JUnit 4.2. JUnit 4.1 is still default because IntelliJ IDEA doesn't support JUnit 4.2 yet.

Added Paths:
-----------
    trunk/lib/LICENSE-junit-4.2.jar
    trunk/lib/junit-4.2.jar

Added: trunk/lib/LICENSE-junit-4.2.jar
===================================================================
--- trunk/lib/LICENSE-junit-4.2.jar	                        (rev 0)
+++ trunk/lib/LICENSE-junit-4.2.jar	2006-11-19 14:30:09 UTC (rev 670)
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+<HEAD>
+<TITLE>Common Public License - v 1.0</TITLE>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</HEAD>
+
+<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
+
+
+<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
+<P><B></B><FONT SIZE="3"></FONT>
+<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"><B>1.  DEFINITIONS</B></FONT>
+<P><FONT SIZE="2">"Contribution" means:</FONT>
+
+<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT">
+b) in the case of each subsequent Contributor:</FONT></UL>
+
+
+<UL><FONT SIZE="2">i)	 	changes to the Program, and</FONT></UL>
+
+
+<UL><FONT SIZE="2">ii)		additions to the Program;</FONT></UL>
+
+
+<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.  </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf.  </FONT><FONT SIZE="2">Contributions do not include additions to the Program which:  (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.  </FONT></UL>
+
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.  </FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
+<P><FONT SIZE="2"><B></B></FONT>
+<P><FONT SIZE="2"><B>2.  GRANT OF RIGHTS</B></FONT>
+
+<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)	</FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) 	Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form.  This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.  The patent license shall not apply to any other combinations which include the Contribution.  No hardware per se is licensed hereunder.   </FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+
+<UL><FONT SIZE="2">c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity.  Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise.  As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any.  For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+
+<UL><FONT SIZE="2">d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
+
+
+<UL><FONT SIZE="2"></FONT></UL>
+
+<P><FONT SIZE="2"><B>3.  REQUIREMENTS</B></FONT>
+<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
+
+<UL><FONT SIZE="2">a)	it complies with the terms and conditions of this Agreement; and</FONT></UL>
+
+
+<UL><FONT SIZE="2">b)	its license agreement:</FONT></UL>
+
+
+<UL><FONT SIZE="2">i)	effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
+
+
+<UL><FONT SIZE="2">ii) 	effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
+
+
+<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
+
+
+<UL><FONT SIZE="2">iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
+
+
+<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
+
+<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
+
+<UL><FONT SIZE="2">a)	it must be made available under this Agreement; and </FONT></UL>
+
+
+<UL><FONT SIZE="2">b)	a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
+
+<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
+<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program.  </FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.  </FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"><B>4.  COMMERCIAL DISTRIBUTION</B></FONT>
+<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like.  While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors.   Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering.  The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement.  In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations.  The Indemnified Contributor may participate in any such claim at its own expense.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X.  That Contributor is then a Commercial Contributor.  If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.  Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
+<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5.  NO WARRANTY</B></FONT>
+<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">.  </FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6.  DISCLAIMER OF LIABILITY</B></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"><B>7.  GENERAL</B></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed.  In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance.  If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable.  However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.  </FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted  and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward.   IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity.  </FONT><FONT SIZE="2">Each new version of the Agreement will be given a distinguishing version number.  The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new </FONT><FONT SIZE="2">version.  </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2">  All rights in the Program not expressly granted under this Agreement are reserved.</FONT>
+<P><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose.  Each party waives its rights to a jury trial in any resulting litigation.</FONT>
+<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
+<P><FONT SIZE="2"></FONT>
+
+</BODY>
+
+</HTML>
\ No newline at end of file


Property changes on: trunk/lib/LICENSE-junit-4.2.jar
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Added: trunk/lib/junit-4.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/lib/junit-4.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [669] trunk/src/doc/start.xhtml

[<chr...@us...>]

Revision: 669
          http://svn.sourceforge.net/gridarta/?rev=669&view=rev
Author:   christianhujer
Date:     2006-11-15 13:55:17 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Added links to CFJavaEditor documentation and download.

Modified Paths:
--------------
    trunk/src/doc/start.xhtml

Modified: trunk/src/doc/start.xhtml
===================================================================
--- trunk/src/doc/start.xhtml	2006-11-13 22:47:26 UTC (rev 668)
+++ trunk/src/doc/start.xhtml	2006-11-15 21:55:17 UTC (rev 669)
@@ -30,11 +30,25 @@
         </p>
         <h2>Download Gridarta</h2>
         <p>
-            Gridarta can't be downloaded yet.
-            To download an executable Gridarta for Daimonin, visit the <a href="http://www.daimonin.net/">Daimonin Website</a>.
-            You can also access the <a href="subversion">latest source code through subversion</a>.
+            We don't yet provide an official download version of Gridarta.
+            The projects that Gridarta is developed for and derived from offer download versions and installation instructions for their versions of Gridarta.
+            Besides, you can always access the <a href="subversion">latest source code through subversion</a>.
             <!--To <em>download Gridarta</em>, go to the <a href="http://sourceforge.net/project/showfiles.php?group_id=166996">Files section of the Gridarta Project Page</a>, choose the desired package, release and file type and download it from a mirror of your choice.-->
         </p>
+        <h3>Get Gridarta4Crossfire</h3>
+        <p>
+            Gridarta4Crossfire is aka CFJavaEditor.
+            The crossfire website has some useful information about this for you, including a link to download an alpha pre-release of Gridarta4Crossfire:
+        </p>
+        <ul>
+            <li><a href="http://crossfire.real-time.com/editors/java-editor/install/linux_debian-v5.html">Java Installation</a></li>
+            <li><a href="http://crossfire.real-time.com/editors/java-editor/install/windows.html">CFJavaEditor Installation - Windows</a></li>
+        </ul>
+        <h3>Get Gridarta4Daimonin</h3>
+        <p>
+            Gridarta4Daimonin is aka DaimoninEditor.
+            An alpha pre-release of Gridarta4Daimonin comes with the <a href="http://www.daimonin.net/index.php?name=PNphpBB2&amp;file=viewtopic&amp;t=2522">Map Maker Package</a>.
+        </p>
         <h2>Gridarta Documentation</h2>
         <ul>
             <li><a href="news/">Gridarta Project News</a></li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [668] trunk

[<chr...@us...>]

Revision: 668
          http://svn.sourceforge.net/gridarta/?rev=668&view=rev
Author:   christianhujer
Date:     2006-11-13 14:47:26 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
Removed unused variables, unused variable initializes and unused variable assignments.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/AutojoinList.java
    trunk/crossfire/src/cfeditor/CAttribBitmask.java
    trunk/crossfire/src/cfeditor/CFArchTypeList.java
    trunk/crossfire/src/cfeditor/CFTreasureListTree.java
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/CMapViewBasic.java
    trunk/crossfire/src/cfeditor/CScriptView.java
    trunk/crossfire/src/cfeditor/JarResources.java
    trunk/crossfire/src/cfeditor/ScriptArchData.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
    trunk/crossfire/src/cfeditor/gameobject/GameObject.java
    trunk/crossfire/src/cfeditor/io/CMapReader.java
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
    trunk/daimonin/src/daieditor/CAttribDialog.java
    trunk/daimonin/src/daieditor/CMapArchPanel.java
    trunk/daimonin/src/daieditor/Spells.java
    trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
    trunk/daimonin/src/daieditor/io/CMapReader.java
    trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java

Modified: trunk/crossfire/src/cfeditor/AutojoinList.java
===================================================================
--- trunk/crossfire/src/cfeditor/AutojoinList.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/AutojoinList.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -202,7 +202,7 @@
         }
 
         // now do the joining in all four directions:
-        GameObject arch = null;
+        GameObject arch;
         if (map.isPointValid(x, y - 1)) {
             if ((arch = findArchOfJoinlist(map, x, y - 1)) != null) {
                 newIndex = addDir(newIndex, NORTH);

Modified: trunk/crossfire/src/cfeditor/CAttribBitmask.java
===================================================================
--- trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/CAttribBitmask.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -181,15 +181,14 @@
         // is bitmask empty?
         if (value <= 0) {
             text += bitName[0];
-            columns = text.length();
         } else {
             // value too big?
             if (value > maxvalue) {
                 log.warn("bitmask value " + value + " is too big.");
             }
 
-            boolean linebreak = false;
-            int linelength = 0;  // length of last line
+            boolean linebreak;
+            int linelength;  // length of last line
 
             for (int i = 1; i < bitName.length; i++) {
                 if (isActive(i, value)) {

Modified: trunk/crossfire/src/cfeditor/CFArchTypeList.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFArchTypeList.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/CFArchTypeList.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -78,8 +78,6 @@
      */
     CFArchTypeList() {
         CFArchType cfType = head;    // index of CFArchType list
-        final boolean headLoaded = false;  // true when the default type (=head) is loaded
-
         // initialize the arrays of "special-data"
         bitmaskTable = new HashMap<String, CAttribBitmask>();
         listTable = new HashMap<String, Vector>();
@@ -137,7 +135,7 @@
                         log.warn("In file '" + IGUIConstants.TYPEDEF_FILE + "': default_type element is missing!");
                     } else {
                         // create a new CFArchType element
-                        final CFArchType newType = new CFArchType(head);
+                        new CFArchType(head);
 
                         // attach the new CFArchType element to the list
                         // if we manage to parse it properly from the file
@@ -216,10 +214,8 @@
     private Vector parseListFromElement(final Element root) {
         final Vector list = new Vector(); // list vector
         int num;        // number for list element
-        String string;  // string for list element
 
         Element elem;
-        Attribute a;
         final List entries = root.getChildren("entry");
         for (int i = 0; entries != null && i < entries.size(); i++) {
             elem = (Element) entries.get(i);
@@ -291,7 +287,6 @@
     public void loadSpellsFromXML() {
         spellName = null;
         spellNum = null;
-        final int spnum = 0;              // number of spells
 
         try {
             // open reading stream to the spells xml file
@@ -305,7 +300,6 @@
                 // retrieve the spell data from the xml
                 final Element root = doc.getRootElement();
                 Element spellElem;
-                Attribute a;
                 if (root == null || !root.getName().equalsIgnoreCase("spells")) {
                     log.warn("File '" + IGUIConstants.SPELL_FILE + "' lacks root element 'spells'.");
                 } else {
@@ -423,7 +417,7 @@
 
                 // reading spellnames one after the other,
                 // this loop is terminated by an EOFException
-                int i = 0;  // index for insertion in the vector
+                int i;  // index for insertion in the vector
                 for (int counter = 0; true; counter++) {
                     IOUtils.readUntil(bufferedReader, "{", "}");
                     IOUtils.readUntil(bufferedReader, "\"", null);

Modified: trunk/crossfire/src/cfeditor/CFTreasureListTree.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFTreasureListTree.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/CFTreasureListTree.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -238,11 +238,9 @@
         try {
             final String baseDir = IGUIConstants.CONFIG_DIR;
             final BufferedReader reader = IOUtils.createReader(baseDir, IGUIConstants.TREASURES_FILE);
-            String line = null; // read line of file
-
             // read the whole file line by line
             TreasureTreeNode node = null;
-            while ((line = reader.readLine()) != null) {
+            for (String line; (line = reader.readLine()) != null;) {
                 line = line.trim();
                 if (line.length() > 0 && !line.startsWith("#")) {
                     // reading outside of treasurelist

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -220,7 +220,7 @@
         readGlobalSettings();
 
         // initialize pickmap panel (needed early during the loading process)
-        final CPickmapPanel pickmappanel = new CPickmapPanel();
+        new CPickmapPanel();
 
         // initialize the script-editor pad
         ScriptEditControl.init(getMapDefaultFolder(), this);
@@ -623,14 +623,14 @@
      */
     public void newLevelWanted(final String filename) {
         CMainStatusbar.getInstance().setText(" Creating new map...");
-        final CNewMapDialog levelDialog = new CNewMapDialog(this, mainView, filename, CNewMapDialog.TYPE_CFMAP);
+        new CNewMapDialog(this, mainView, filename, CNewMapDialog.TYPE_CFMAP);
         CMainStatusbar.getInstance().setText("");
     }
 
     /** Invoked when user wants to open a new pickmap */
     public void newPickmapWanted() {
         CMainStatusbar.getInstance().setText(" Creating new pickmap...");
-        final CNewMapDialog levelDialog = new CNewMapDialog(this, mainView, null, CNewMapDialog.TYPE_PICKMAP);
+        new CNewMapDialog(this, mainView, null, CNewMapDialog.TYPE_PICKMAP);
         CMainStatusbar.getInstance().setText("");
     }
 
@@ -930,7 +930,7 @@
             // types.txt is missing!
             showMessage("File Missing", "The definitions-file \"types.txt\" is missing! The\nattribute interface doesn't work without that file.");
         } else if (arch != null && arch.getArchetypeName() != null) {
-            final CAttribDialog dwin = new CAttribDialog(typeList, arch, this);
+            new CAttribDialog(typeList, arch, this);
         }
     }
 
@@ -1177,7 +1177,7 @@
      */
     void showMapProperties(final MapControl level) {
         if (level != null) {
-            final CMapPropertiesDialog dialog = new CMapPropertiesDialog(this, mainView, level);
+            new CMapPropertiesDialog(this, mainView, level);
         }
     }
 
@@ -1193,7 +1193,7 @@
     }
 
     void optionsWanted() {
-        final COptionDialog dialog = new COptionDialog(this, mainView);
+        new COptionDialog(this, mainView);
     }
 
     /**
@@ -1525,7 +1525,7 @@
                 break;
             }
 
-            int rand = -1;
+            int rand;
             try {
                 rand = Integer.parseInt(input);
             } catch (final NumberFormatException e) {

Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -767,7 +767,6 @@
          * @param y map coordinates for the tile to draw
          */
         public void paintTile(final int x, final int y) {
-            final int xstart, ystart, yoff;
             final Graphics grfx;
             if (isPickmap()) {
                 grfx = getGraphics(); // graphics context for drawing in the mapview
@@ -1110,14 +1109,12 @@
          * @param event the occurred <code>MouseEvent</code>
          */
         public void mouseMoved(final MouseEvent event) {
-            final int xstart, ystart, xp, yp, xt, yt;
+            final int xp, yp;
 
             final Point dragPoint = event.getPoint();
             xp = (int) dragPoint.getX();
             yp = (int) dragPoint.getY();
 
-            final Point temp = renderer.getTileLocationAt(dragPoint);
-
             // draw Mouse coordinates into the status bar (bottom of window)
             if (mapMousePos.x == -1 && mapMousePos.y == -1) {
                 CMainStatusbar.getInstance().setText(" Mouse off Map");
@@ -1133,7 +1130,7 @@
          * @param event the occurred <code>MouseEvent</code>
          */
         public void mouseDragged(final MouseEvent event) {
-            final int xstart, ystart, xp, yp, xt, yt;
+            final int xp, yp;
 
             changedFlagNotify();
             Point[] needRedraw = null;   // array of tile coords which need to be redrawn

Modified: trunk/crossfire/src/cfeditor/CScriptView.java
===================================================================
--- trunk/crossfire/src/cfeditor/CScriptView.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/CScriptView.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -12,7 +12,6 @@
 import cfeditor.gui.CloseableTabbedPane;
 import cfeditor.gui.ScriptManager;
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -251,8 +250,6 @@
         dialog.setModal(true);
         dialog.setTitle(model.getName());
         dialog.getContentPane().removeAll();
-        final Component topLabel = panel;
-        final Component topTxtField = panel;
         //JTextField[] fields = new JTextField[model.getParametersCount()];
         for (int i = 0; i < model.getParametersCount(); i++) {
             log.debug("adding parameter");

Modified: trunk/crossfire/src/cfeditor/JarResources.java
===================================================================
--- trunk/crossfire/src/cfeditor/JarResources.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/JarResources.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -135,8 +135,8 @@
                 }
                 final byte[] b = new byte[(int) size];
                 int rb = 0;
-                int chunk = 0;
-                while (((int) size - rb) > 0) {
+                int chunk;
+                while (size - rb > 0) {
                     chunk = zis.read(b, rb, (int) size - rb);
                     if (chunk == -1) {
                         break;

Modified: trunk/crossfire/src/cfeditor/ScriptArchData.java
===================================================================
--- trunk/crossfire/src/cfeditor/ScriptArchData.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/ScriptArchData.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -288,7 +288,6 @@
                 eventList.set(index, event); // save changes
             } else if (task == CMapArchPanel.SCRIPT_REMOVE) {
                 // first ask for confirmation
-                final boolean breakpath = (event.getFilePath().length() > 15);
                 if (JOptionPane.showConfirmDialog(panelList, "Are you sure you want to remove this \"" + eventType + "\" event which is\n" + "linked to the script: '" + event.getFilePath() + "'?\n" + "(The script file itself is not going to be deleted)", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
                     // remove this event from the GameObject
                     eventList.remove(index);

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -263,8 +263,6 @@
      * @param fname filename
      */
     private void parseDefFace(final String fname) {
-        final int x;
-
         try {
             final BufferedReader myInput = new BufferedReader(new FileReader(fname));
             try {
@@ -276,7 +274,6 @@
                 while ((thisLine2 = myInput.readLine()) != null) {
                     // hm, thats ugly, but i need to cut off the damn white spaces
                     // for the names
-                    String thisLine = thisLine2;
                     /*
                     if (thisLine2.length() > 1) {
                         for (x = 0; x < thisLine2.length(); x++) {
@@ -292,7 +289,7 @@
                         thisLine = thisLine2.substring(x, y+1);
                     }
                     */
-                    thisLine = thisLine2.trim();
+                    final String thisLine = thisLine2.trim();
 
                     // ignore all '#' lines as comment
                     if (!thisLine.regionMatches(0, "#", 0, 1)) {
@@ -466,7 +463,6 @@
      */
     private void addPNGFace(final String fname, final String name) {
         final File f = new File(fname);
-        final long size = f.length();
         faceObjects[faceListCount] = new FaceObject(null, fname, 0, (int) f.length());
 
         // generating the face name:
@@ -540,7 +536,7 @@
             }
 
             final byte[] b = new byte[1024 * 50];
-            int numBytes = 0;
+            int numBytes;
             try {
                 numBytes = fin1.read(b, 0, 50000);
             } catch (final IOException e) {
@@ -560,7 +556,6 @@
             // now write all pngs into the file
             progress.setLabel("Collecting Images...", faceListCount);
             for (int i = 0; i < faceListCount; i++) {
-                numBytes = 0;
 
                 final FileInputStream fin2;
                 try {

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -483,7 +483,7 @@
         }
 
         // Check line by line for comparison
-        String line = "";
+        String line;
         String result = "";
         int i;
         for (i = 0, j = 0; i < atxt.length(); i++) {
@@ -539,16 +539,11 @@
         if (!base.endsWith("\n")) {
             base = base.concat("\n");  // string should end with '\n'
         }
-        String line = "";
-        if (!line.endsWith("\n")) {
-            line = line.concat("\n");  // string should end with '\n'
-        }
-
         // Check line by line for comparison
         int i;
         for (i = 0, j = 0; i < base.length(); i++) {
             if (base.charAt(i) == '\n') {
-                line = base.substring(j, i).trim(); // get one line from base
+                final String line = base.substring(j, i).trim(); // get one line from base
                 if (ignoreValues) {
                     if (str.compareTo(line.substring(0, line.indexOf(" ") + 1)) == 0) {
                         return line;
@@ -814,7 +809,7 @@
                     log.debug("Applying type: " + type.getTypeName());
                 }
 
-                String line = null;
+                String line;
                 do {
                     line = sstream.readLine(); // read one line
 

Modified: trunk/crossfire/src/cfeditor/io/CMapReader.java
===================================================================
--- trunk/crossfire/src/cfeditor/io/CMapReader.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/io/CMapReader.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -158,8 +158,8 @@
                     }
                 } else if (thisLine.equals("end")) {
                     objects.add(gameObject);
-                    archflag = false;
-                    archmore = false;
+                    //archflag = false;
+                    //archmore = false;
 
                     if (log.isDebugEnabled()) {
                         log.debug("LEAVE!: " + gameObject + " - " + thisLine);

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -252,7 +252,7 @@
      * @return true if insertion successful, false if not
      */
     public boolean addArchToMap(String archName, final Point pos, final int intern, final boolean join, final boolean insertBelow) {
-        GameObject newarch, oldarch, startarch; // our new suckers (copys, not ref ptrs)
+        GameObject newarch; // our new suckers (copys, not ref ptrs)
 
         if (archName == null || !isPointValid(pos)) {
             // invalid parameter

Modified: trunk/daimonin/src/daieditor/CAttribDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/CAttribDialog.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/daimonin/src/daieditor/CAttribDialog.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -1076,8 +1076,6 @@
      * @return true if the settings were applied, false if error occurred
      */
     private boolean applySettings() {
-        final String oldArchText = gameObject.getObjectText();  // the old ArchText
-        final String oldMsg = gameObject.getMsgText(); // old gameObject msg
         final CFArchType typeStruct = typelist.getTypeOfArch(gameObject); // the type structure for this gameObject
 
         String newArchText = "";

Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -350,9 +350,6 @@
             return;
         }
 
-        final String oldArchText = arch.getObjectText();
-        final String oldmsg = arch.getMsgText();
-
         // We update all panels: name, face, msg and archText (more to come...)
         // the obj name:
         if (isNonwhitespaceText(archNameField.getText())) { // there is something in

Modified: trunk/daimonin/src/daieditor/Spells.java
===================================================================
--- trunk/daimonin/src/daieditor/Spells.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/daimonin/src/daieditor/Spells.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -135,7 +135,7 @@
         // --------- now write the "spells.def" file ---------
         if (spells.size() > 0) {
             // FIXME: This should use DOM for writing the file.
-            File dfile = null;
+            File dfile;
             // create new file for writing (replaces old one if existent)
             if (IGUIConstants.CONFIG_DIR != null && IGUIConstants.CONFIG_DIR.length() > 0) {
                 final String baseDir = CMainControl.getInstance().getArchDefaultFolder() + File.separator + IGUIConstants.CONFIG_DIR;

Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -163,9 +163,7 @@
         } finally {
             try {
                 treeIn.close();
-            } catch (final Exception e) { /* ignore */ } finally {
-                treeIn = null;
-            }
+            } catch (final Exception e) { /* ignore */ }
         }
     }
 

Modified: trunk/daimonin/src/daieditor/io/CMapReader.java
===================================================================
--- trunk/daimonin/src/daieditor/io/CMapReader.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/daimonin/src/daieditor/io/CMapReader.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -137,7 +137,7 @@
                     }
                 } else if (thisLine.equals("end")) {
                     objects.add(gameObject);
-                    archflag = false;
+                    //archflag = false;
 
                     if (log.isDebugEnabled()) {
                         log.debug("LEAVE!: " + gameObject + " - " + thisLine);

Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java	2006-11-13 22:46:34 UTC (rev 667)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java	2006-11-13 22:47:26 UTC (rev 668)
@@ -1115,10 +1115,9 @@
                 final Element lineElement = map.getElement(i);
                 int lineStart = lineElement.getStartOffset();
                 final int lineEnd = lineElement.getEndOffset() - 1;
-                int lineLen = lineEnd - lineStart;
 
                 lineStart = Math.min(lineStart + start, lineEnd);
-                lineLen = Math.min(end - start, lineEnd - lineStart);
+                int lineLen = Math.min(end - start, lineEnd - lineStart);
 
                 getText(lineStart, lineLen, seg);
                 buf.append(seg.array, seg.offset, seg.count);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [667] trunk/crossfire/src/cfeditor/map/MapControl. java

[<chr...@us...>]

Revision: 667
          http://svn.sourceforge.net/gridarta/?rev=667&view=rev
Author:   christianhujer
Date:     2006-11-13 14:46:34 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
Fixed JavaDoc bug.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/MapControl.java

Modified: trunk/crossfire/src/cfeditor/map/MapControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapControl.java	2006-11-13 00:41:45 UTC (rev 666)
+++ trunk/crossfire/src/cfeditor/map/MapControl.java	2006-11-13 22:46:34 UTC (rev 667)
@@ -248,7 +248,7 @@
      * @param intern
      * @param join
      * @return <code>true</code> if insertion is successful, <code>false</code> if not
-     * @deprecated use {@link #addArchToMap(int, Point, int, boolean, boolean)} instead
+     * @deprecated use {@link #addArchToMap(String, Point, int, boolean, boolean)} instead
      */
     @Deprecated public boolean addArchToMap(final String archname, final int xx, final int yy, final int intern, final boolean join) {
         return addArchToMap(archname, new Point(xx, yy), intern, join, false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [666] trunk/src/app/net/sf/gridarta

[<chr...@us...>]

Revision: 666
          http://svn.sourceforge.net/gridarta/?rev=666&view=rev
Author:   christianhujer
Date:     2006-11-12 16:41:45 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Cared about unused catch parameters.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
    trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java
    trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java
    trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java
    trunk/src/app/net/sf/gridarta/io/AbstractMapWriter.java
    trunk/src/app/net/sf/gridarta/io/IOUtils.java
    trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java

Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -702,8 +702,8 @@
             clone.attributeCache = new HashMap<String, String>(attributeCache);
             return clone;
         } catch (final CloneNotSupportedException e) {
-            assert false;
-            throw new AssertionError();
+            assert false : "This class must be cloneable" + e;
+            throw new AssertionError(e);
         }
     }
 

Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -381,8 +381,8 @@
             clone.initData();
             return clone;
         } catch (final CloneNotSupportedException e) {
-            assert false;
-            throw new AssertionError();
+            assert false : "This class must be cloneable" + e;
+            throw new AssertionError(e);
         }
     }
 

Modified: trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -43,7 +43,7 @@
                     while (!current.hasNext() ) {
                         current = iteratorStack.pop();
                     }
-                } catch (final EmptyStackException e) {
+                } catch (final EmptyStackException ignore) {
                     /* ignore. */
                 }
             }

Modified: trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/io/AbstractMapReader.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -42,8 +42,8 @@
         try {
             myInput = new BufferedReader(new InputStreamReader(getClass().getClassLoader().getResourceAsStream(uri), IOUtils.MAP_ENCODING));
         } catch (final UnsupportedEncodingException e) {
-            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding.";
-            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.");
+            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding." + e;
+            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.", e);
         }
     }
 
@@ -57,8 +57,8 @@
         try {
             myInput = new BufferedReader(new InputStreamReader(new FileInputStream(file), IOUtils.MAP_ENCODING));
         } catch (final UnsupportedEncodingException e) {
-            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding.";
-            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.");
+            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding." + e;
+            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.", e);
         }
     }
 

Modified: trunk/src/app/net/sf/gridarta/io/AbstractMapWriter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/AbstractMapWriter.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/io/AbstractMapWriter.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -36,8 +36,8 @@
         try {
             myOutput = new PrintWriter(new OutputStreamWriter(new FileOutputStream(uri), IOUtils.MAP_ENCODING));
         } catch (final UnsupportedEncodingException e) {
-            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding.";
-            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.");
+            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding." + e;
+            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.", e);
         }
     }
 
@@ -51,8 +51,8 @@
         try {
             myOutput = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), IOUtils.MAP_ENCODING));
         } catch (final UnsupportedEncodingException e) {
-            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding.";
-            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.");
+            assert false : IOUtils.MAP_ENCODING + " must be a valid encoding." + e;
+            throw new Error(IOUtils.MAP_ENCODING + " must be a valid encoding.", e);
         }
     }
 

Modified: trunk/src/app/net/sf/gridarta/io/IOUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/IOUtils.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/io/IOUtils.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -59,12 +59,12 @@
     @NotNull private static InputStream createStreamImpl(@Nullable final String dname, @NotNull final String fname) throws FileNotFoundException {
         try { // 1st try normal binary file relative to specified directory
             return new FileInputStream(new File(dname, fname));
-        } catch (final Exception e) {
+        } catch (final Exception ignore) {
             // ignore
         }
         try { // 2nd try binary file relative to user's current working directory
             return new FileInputStream(fname);
-        } catch (final Exception e) { // 3rd try via system resource from class loader
+        } catch (final Exception ignore) { // 3rd try via system resource from class loader
             // ignore
         }
         final URI currentDir = new File(System.getProperty("user.dir")).toURI();
@@ -76,7 +76,7 @@
             if (stream != null) {
                 return stream;
             }
-        } catch (final Exception e) {
+        } catch (final Exception ignore) {
             // ignore
         }
         try { // 4th try context class loader relative to class loader's top level directory
@@ -84,7 +84,7 @@
             if (stream != null) {
                 return stream;
             }
-        } catch (final Exception e) {
+        } catch (final Exception ignore) {
             // ignore
         }
         try { // 5th try system class loader relative to specified directory
@@ -92,7 +92,7 @@
             if (stream != null) {
                 return stream;
             }
-        } catch (final Exception e) {
+        } catch (final Exception ignore) {
             // ignore
         }
         try { // 6th try system class loader relative to class loader's top level directory
@@ -100,7 +100,7 @@
             if (stream != null) {
                 return stream;
             }
-        } catch (final Exception e) {
+        } catch (final Exception ignore) {
             // ignore
         }
         throw new FileNotFoundException("couldn't find " + new File(dname, fname) + ".");

Modified: trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java	2006-11-12 23:55:36 UTC (rev 665)
+++ trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java	2006-11-13 00:41:45 UTC (rev 666)
@@ -342,7 +342,7 @@
                 final MapSquare<G> square = mapGrid[point / mapSize.getHeight()][point % mapSize.getHeight()];
                 point++;
                 return square;
-            } catch (final ArrayIndexOutOfBoundsException e) {
+            } catch (final ArrayIndexOutOfBoundsException ignore) {
                 throw new NoSuchElementException();
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [665] trunk

[<chr...@us...>]

Revision: 665
          http://svn.sourceforge.net/gridarta/?rev=665&view=rev
Author:   christianhujer
Date:     2006-11-12 15:55:36 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Optimized imports.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CAttribDialog.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
    trunk/daimonin/src/daieditor/gameobject/anim/AnimationObject.java
    trunk/src/app/net/sf/gridarta/gameobject/Collector.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObjects.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -27,8 +27,8 @@
 import cfeditor.gameobject.ArchetypeParser;
 import cfeditor.gameobject.ArchetypeSet;
 import cfeditor.gameobject.GameObject;
+import cfeditor.gameobject.anim.AnimationObjects;
 import cfeditor.gameobject.face.FaceObjects;
-import cfeditor.gameobject.anim.AnimationObjects;
 import cfeditor.io.CMapReader;
 import cfeditor.io.CMapWriter;
 import cfeditor.map.MapArchObject;
@@ -55,8 +55,8 @@
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.Size2D;
+import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gameobject.Collector;
-import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
 import net.sf.japi.swing.ActionFactory;

Modified: trunk/daimonin/src/daieditor/CAttribDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/CAttribDialog.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/daimonin/src/daieditor/CAttribDialog.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -31,8 +31,6 @@
 import static daieditor.gameobject.ArchAttribType.SPELL;
 import static daieditor.gameobject.ArchAttribType.ZSPELL;
 import daieditor.gameobject.GameObject;
-import net.sf.gridarta.gameobject.NamedObject;
-import net.sf.gridarta.gameobject.NamedObjects;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
@@ -95,6 +93,8 @@
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
 import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.NamedObject;
+import net.sf.gridarta.gameobject.NamedObjects;
 import net.sf.gridarta.help.Help;
 import net.sf.japi.swing.ActionFactory;
 import static net.sf.japi.swing.ActionFactory.getFactory;

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -31,8 +31,6 @@
 import daieditor.gameobject.ArchetypeParser;
 import daieditor.gameobject.ArchetypeSet;
 import daieditor.gameobject.GameObject;
-import net.sf.gridarta.gameobject.Collectable;
-import net.sf.gridarta.gameobject.Collector;
 import daieditor.gameobject.anim.AnimationObjects;
 import daieditor.gameobject.face.FaceFacade;
 import daieditor.gameobject.face.FaceObjects;
@@ -113,6 +111,8 @@
 import static javax.swing.KeyStroke.getKeyStroke;
 import javax.swing.filechooser.FileFilter;
 import net.sf.gridarta.MainControl;
+import net.sf.gridarta.gameobject.Collectable;
+import net.sf.gridarta.gameobject.Collector;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.map.MapModelEvent;
 import net.sf.gridarta.map.MapModelListener;

Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -49,7 +49,6 @@
 import java.util.List;
 import javax.swing.ImageIcon;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
-import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gameobject.anim.AnimationParseException;
 import net.sf.gridarta.gameobject.anim.DuplicateAnimationException;
 import net.sf.gridarta.io.IOUtils;

Modified: trunk/daimonin/src/daieditor/gameobject/anim/AnimationObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/anim/AnimationObject.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/daimonin/src/daieditor/gameobject/anim/AnimationObject.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -26,12 +26,12 @@
 
 package daieditor.gameobject.anim;
 
+import daieditor.gameobject.face.FaceFacade;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.ImageIcon;
 import net.sf.gridarta.gameobject.anim.AbstractAnimationObject;
-import javax.swing.ImageIcon;
-import daieditor.gameobject.face.FaceFacade;
 
 /**
  * A single animation object.

Modified: trunk/src/app/net/sf/gridarta/gameobject/Collector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/Collector.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/src/app/net/sf/gridarta/gameobject/Collector.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -1,14 +1,14 @@
 package net.sf.gridarta.gameobject;
 
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.io.File;
-import java.io.IOException;
+import java.util.List;
 import javax.swing.JFrame;
+import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.Progress;
 import net.sf.japi.swing.ProgressDisplay;
-import net.sf.japi.swing.ActionFactory;
 
 /**
  * A Collector is capable of iterating over a collection of {@link Collectable}s and collecting them in a separate Thread with a nice GUI.

Modified: trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -1,7 +1,7 @@
 package net.sf.gridarta.gameobject.anim;
 
+import net.sf.gridarta.gameobject.NamedObject;
 import net.sf.gridarta.gameobject.NamedObjects;
-import net.sf.gridarta.gameobject.NamedObject;
 import net.sf.japi.swing.ActionFactory;
 
 /**

Modified: trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObjects.java	2006-11-12 23:53:21 UTC (rev 664)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObjects.java	2006-11-12 23:55:36 UTC (rev 665)
@@ -1,8 +1,8 @@
 package net.sf.gridarta.gameobject.face;
 
-import net.sf.japi.swing.ActionFactory;
 import net.sf.gridarta.gameobject.NamedObject;
 import net.sf.gridarta.gameobject.NamedObjects;
+import net.sf.japi.swing.ActionFactory;
 
 /**
  * Abstract base implementation of {@link FaceObjects}.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [664] trunk/crossfire/src/cfeditor/gameobject/ ArchetypeSet.java

[<chr...@us...>]

Revision: 664
          http://svn.sourceforge.net/gridarta/?rev=664&view=rev
Author:   christianhujer
Date:     2006-11-12 15:53:21 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Added TODO.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-11-12 19:24:42 UTC (rev 663)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2006-11-12 23:53:21 UTC (rev 664)
@@ -32,6 +32,7 @@
 import cfeditor.CPickmapPanel;
 import cfeditor.IGUIConstants;
 import cfeditor.gameobject.face.FaceObject;
+import cfeditor.gameobject.face.FaceObjects;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -49,7 +50,6 @@
 import javax.swing.ImageIcon;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
 import net.sf.gridarta.gameobject.Archetype;
-import net.sf.gridarta.gameobject.Collectable;
 import net.sf.gridarta.gameobject.anim.DuplicateAnimationException;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.japi.swing.Progress;
@@ -60,6 +60,7 @@
  * The <code>ArchetypeSet</code> contains all the Archetypes.
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
+ * @todo move face storage to {@link FaceObjects}.
  */
 public final class ArchetypeSet extends AbstractArchetypeSet<GameObject> {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [663] trunk/src/app/net/sf/gridarta/action.properties

[<chr...@us...>]

Revision: 663
          http://svn.sourceforge.net/gridarta/?rev=663&view=rev
Author:   christianhujer
Date:     2006-11-12 11:24:42 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Added missing properties.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/action.properties

Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties	2006-11-12 18:58:51 UTC (rev 662)
+++ trunk/src/app/net/sf/gridarta/action.properties	2006-11-12 19:24:42 UTC (rev 663)
@@ -5,3 +5,5 @@
 archCollectAnimationTree=Collecting Animation Tree...
 archCollectImages=Collecting Images...
 archCollectDone=Collect Arches: done
+nameOfAnimationObject=Animation
+nameOfFaceObject=Face


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [662] trunk/src/app/net/sf/gridarta

[<chr...@us...>]

Revision: 662
          http://svn.sourceforge.net/gridarta/?rev=662&view=rev
Author:   christianhujer
Date:     2006-11-12 10:58:51 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Fixed some bundle errors.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gameobject/Collector.java
    trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/action.properties

Added: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/action.properties	2006-11-12 18:58:51 UTC (rev 662)
@@ -0,0 +1,7 @@
+namedTreeNodeWithoutPath=No path! Object Path: {0}  Object Name: {1}  Object Type: {2}
+chooseNamedObject.title=Choose a {0}
+archCollectArches=Collecting Arches...
+archCollectAnimations=Collecting Animations...
+archCollectAnimationTree=Collecting Animation Tree...
+archCollectImages=Collecting Images...
+archCollectDone=Collect Arches: done


Property changes on: trunk/src/app/net/sf/gridarta/action.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Modified: trunk/src/app/net/sf/gridarta/gameobject/Collector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/Collector.java	2006-11-12 18:45:13 UTC (rev 661)
+++ trunk/src/app/net/sf/gridarta/gameobject/Collector.java	2006-11-12 18:58:51 UTC (rev 662)
@@ -17,7 +17,7 @@
 public class Collector implements Runnable {
 
     /** Action Factory. */
-    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
+    private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
 
     /** The Collectables. */
     private List<Collectable> collectables = new ArrayList<Collectable>();

Modified: trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java	2006-11-12 18:45:13 UTC (rev 661)
+++ trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java	2006-11-12 18:58:51 UTC (rev 662)
@@ -50,7 +50,7 @@
 public abstract class NamedObjects<T extends NamedObject> implements Iterable<T> {
 
     /** Action Factory. */
-    private static final ActionFactory ACTION_FACTORY = getFactory("daieditor");
+    private static final ActionFactory ACTION_FACTORY = getFactory("net.sf.gridarta");
 
     /** The localized name of the object type, e.g. used in dialogs. */
     private final String name;

Modified: trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java	2006-11-12 18:45:13 UTC (rev 661)
+++ trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java	2006-11-12 18:58:51 UTC (rev 662)
@@ -122,7 +122,7 @@
     private void append(final String path, final T namedObject) {
         childNodeArray = null;
         if (path == null) {
-            Logger.getLogger("daieditor").log(Level.WARNING, "namedTreeNodeWithoutPath", new Object[]{namedObject.getPath(), namedObject.getName(), namedObject.getClass().getName()});
+            Logger.getLogger("net.sf.gridarta").log(Level.WARNING, "namedTreeNodeWithoutPath", new Object[]{namedObject.getPath(), namedObject.getName(), namedObject.getClass().getName()});
             return;
         }
         assert dir : "append may only be invoked on directory nodes.";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [661] trunk/metrics/lineStat.sh

[<chr...@us...>]

Revision: 661
          http://svn.sourceforge.net/gridarta/?rev=661&view=rev
Author:   christianhujer
Date:     2006-11-12 10:45:13 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Adding shell script to count lines for merge statistics.

Added Paths:
-----------
    trunk/metrics/lineStat.sh

Added: trunk/metrics/lineStat.sh
===================================================================
--- trunk/metrics/lineStat.sh	                        (rev 0)
+++ trunk/metrics/lineStat.sh	2006-11-12 18:45:13 UTC (rev 661)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in src/app/ crossfire/src/ daimonin/src/
+do
+    echo -n "$i: "
+    find $i -name "*.java" | grep -v textedit | xargs cat | wc -l
+done


Property changes on: trunk/metrics/lineStat.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta: [660] trunk

[<chr...@us...>]

Revision: 660
          http://svn.sourceforge.net/gridarta/?rev=660&view=rev
Author:   christianhujer
Date:     2006-11-12 10:14:12 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
Large unification of data stuff.
Attention: This might have broken something.

Modified Paths:
--------------
    trunk/crossfire/build.xml
    trunk/crossfire/resource/conf/archetypes
    trunk/crossfire/resource/conf/crossfire.0
    trunk/crossfire/src/cfeditor/CArchPanelPan.java
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
    trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObject.java
    trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObjects.java
    trunk/crossfire/src/cfeditor/gameobject/face/FaceObject.java
    trunk/daimonin/src/daieditor/CAttribDialog.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
    trunk/daimonin/src/daieditor/gameobject/anim/AnimationObject.java
    trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java
    trunk/daimonin/src/daieditor/gameobject/face/FaceObject.java
    trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/ArchetypeSet.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObject.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AnimationObjects.java

Added Paths:
-----------
    trunk/crossfire/src/cfeditor/gameobject/face/FaceObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/Collectable.java
    trunk/src/app/net/sf/gridarta/gameobject/Collector.java
    trunk/src/app/net/sf/gridarta/gameobject/NamedObject.java
    trunk/src/app/net/sf/gridarta/gameobject/NamedObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObject.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/face/
    trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObject.java
    trunk/src/app/net/sf/gridarta/gameobject/face/AbstractFaceObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/face/FaceObject.java
    trunk/src/app/net/sf/gridarta/gameobject/face/FaceObjects.java

Removed Paths:
-------------
    trunk/daimonin/src/daieditor/gameobject/Collectable.java
    trunk/daimonin/src/daieditor/gameobject/Collector.java
    trunk/daimonin/src/daieditor/gameobject/NamedObject.java
    trunk/daimonin/src/daieditor/gameobject/NamedObjects.java
    trunk/daimonin/src/daieditor/gameobject/NamedTreeNode.java

Modified: trunk/crossfire/build.xml
===================================================================
--- trunk/crossfire/build.xml	2006-11-12 18:07:57 UTC (rev 659)
+++ trunk/crossfire/build.xml	2006-11-12 18:14:12 UTC (rev 660)
@@ -128,6 +128,8 @@
                 <include name="net/sf/japi/util/filter/file/EndingFileFilter.class" />
                 <include name="net/sf/japi/swing/ActionFactory.class" />
                 <include name="net/sf/japi/swing/NamedActionMap.class" />
+                <include name="net/sf/japi/swing/Progress.class" />
+                <include name="net/sf/japi/swing/ProgressDisplay.class" />
             </zipfileset>
             <!-- creating the manifest -->
             <manifest>

Modified: trunk/crossfire/resource/conf/archetypes
===================================================================
--- trunk/crossfire/resource/conf/archetypes	2006-11-12 18:07:57 UTC (rev 659)
+++ trunk/crossfire/resource/conf/archetypes	2006-11-12 18:14:12 UTC (rev 660)
@@ -1,10696 +1,15485 @@
-Object elvenboots
-name elven boots
-name_pl elven boots
-client_type 290
-nrof 1
-face elvenboots.111
-value 30000
-weight 500
-type 99
-exp 3
-material 8
-stealth 1
-editable 5120
-item_power 3
-body_foot -2
-editor_folder armour/boots
+Object door_0
+name door
+face door_0.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
 end
-Object high_boots
-name jack boots
-name_pl jack boots
-client_type 291
-face high_boots.111
-value 60
-weight 6500
-ac 1
-nrof 1
-resist_physical 4
-type 99
-material 8
-editable 1024
-body_foot -2
-gen_sp_armour 4
-editor_folder armour/boots
+Object door_1_1
+name door
+face door_1.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
 end
-Object high_boots_b
-name jack boots
-name_pl jack boots
-client_type 291
-face high_boots_b.111
-value 1700
-weight 6500
-ac 1
-nrof 1
-Cha 1
-resist_death 1
-resist_physical 4
-type 99
-material 8
-materialname black leather
-editable 1024
-body_foot -2
-gen_sp_armour 4
-editor_folder armour/boots
+Object door_1_3
+name door
+face door_2.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
 end
-Object high_boots_b_d
-name jack boots
-name_pl jack boots
-client_type 291
-face high_boots_b.111
-title of death
-value 30000
-weight 13000
-ac 1
-nrof 1
-Cha 1
-resist_death 25
-resist_physical 25
-type 99
+Object door_2_2_1
+name door
+face door_3.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_1_2
+name door
+face door_4.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_2_1_1
+name door
+face door_5.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_2_2_2
+name door
+face door_6.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_3_2
+name door
+face door_7.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_1_4
+name door
+face door_8.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_2_2_4
+name door
+face door_9.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_2_1_2
+name door
+face door_A.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_3_1
+name door
+face door_B.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_2_2_3
+name door
+face door_C.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_3_4
+name door
+face door_D.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_3_3
+name door
+face door_E.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_4
+name door
+face door_F.111
+type 23
+editor_folder door/Door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object locked_door1
+name locked door
+face ldoor1.111
+type 20
+editor_folder door/Locked
+msg
+You need the special key to open this door.
+endmsg
+slaying set_individual_value
+no_pass 1
+no_pick 1
+no_magic 1
+damned 1
+end
+Object locked_door2
+name locked door
+face ldoor2.111
+type 20
+editor_folder door/Locked
+msg
+You need the special key to open this door.
+endmsg
+slaying set_individual_value
+no_pass 1
+no_pick 1
+no_magic 1
+damned 1
+end
+Object key2
+name strange key
+face key2.111
+type 21
+editor_folder door/Locked
+race keys
+slaying set_individual_value
+value 100
+weight 100
+name_pl strange keys
+client_type 810
+end
+Object odoor_2_fant_blue-green
+name door
+face odoor_2_fant_blue-green.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object odoor_2_fant_blue-yellow
+name door
+face odoor_2_fant_blue-yellow.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object odoor_2_fant_brown
+name door
+face odoor_2_fant_brown.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object odoor_2_fant_red-white
+name door
+face odoor_2_fant_red-white.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object odoor_2_fant_red-yellow
+name door
+face odoor_2_fant_red-yellow.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_1
+name door
+face odoor_1.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_2
+name door
+face odoor_2.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+blocksview 1
+hp 400
+exp 1
+ac 10
+material 16
+no_pick 1
+alive 1
+level 1
+end
+Object door_look_1
+name door
+face wooddoor_1.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+hp 400
+exp 1
+ac 10
 material 2
-materialname black steel
-editable 1024
-body_foot -2
-gen_sp_armour 4
-editor_folder armour/boots
+no_pick 1
+alive 1
+level 1
+pass_thru 1
 end
-Object high_boots_w
-name jack boots
-name_pl jack boots
-client_type 291
-face high_boots_w.111
-value 2000
-weight 6500
-ac 1
-nrof 1
-Cha 1
-resist_blind 1
-resist_physical 4
-type 99
-material 8
-materialname white leather
-editable 1024
-body_foot -2
-gen_sp_armour 4
-editor_folder armour/boots
+Object door_look_2
+name door
+face wooddoor_2.111
+type 23
+editor_folder door/door
+randomitems door
+no_pass 1
+hp 400
+exp 1
+ac 10
+material 2
+no_pick 1
+alive 1
+level 1
+pass_thru 1
 end
-Object high_boots_w_l
-name jack boots
-name_pl jack boots
-client_type 291
-face high_boots_w.111
-title of light
-value 40000
-weight 13000
-ac 1
+Object key
+face key1.111
+type 24
+editor_folder door/door
+race keys
 nrof 1
-Cha 1
-resist_blind 25
-resist_physical 25
-type 99
 material 2
-materialname white steel
-editable 1024
-body_foot -2
-gen_sp_armour 4
-editor_folder armour/boots
+value 10
+weight 10
+name_pl keys
+client_type 801
 end
-Object idaten
-name Idaten boots
-name_pl Idaten boots
-client_type 290
-nrof 1
-exp 5
-face idaten.111
-animation idaten
+Object town_1
+name village
+face jcity_0.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+Object town_2
+name small town
+face jcity_2.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+More
+Object town_2.2
+name small town
+face jcity_8.111
+type 66
+no_pick 1
+x 1
+end
+Object town_3
+name small town
+face jcity_4.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+More
+Object town_3.2
+name small town
+face jcity_1.111
+type 66
+no_pick 1
+y 1
+end
+Object town_4
+name medium town
+face jcity_6.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+More
+Object town_4.2
+name medium town
+face jcity_C.111
+type 66
+no_pick 1
+x 1
+end
+More
+Object town_4.3
+name medium town
+face jcity_3.111
+type 66
+no_pick 1
+y 1
+end
+More
+Object town_4.4
+name medium town
+face jcity_9.111
+type 66
+no_pick 1
+x 1
+y 1
+end
+Object town_5
+name city
+face jcity_6.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+More
+Object town_5.2
+name city
+face jcity_E.111
+type 66
+no_pick 1
+x 1
+end
+More
+Object town_5.3
+name city
+face jcity_C.111
+type 66
+no_pick 1
+x 2
+end
+More
+Object town_5.4
+name city
+face jcity_3.111
+type 66
+no_pick 1
+y 1
+end
+More
+Object town_5.5
+name city
+face jcity_B.111
+type 66
+no_pick 1
+x 1
+y 1
+end
+More
+Object town_5.6
+name city
+face jcity_9.111
+type 66
+no_pick 1
+x 2
+y 1
+end
+Object town_6
+name city
+face jcity_6.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+More
+Object town_6.2
+name city
+face jcity_C.111
+type 66
+no_pick 1
+x 1
+end
+More
+Object town_6.3
+name city
+face jcity_7.111
+type 66
+no_pick 1
+y 1
+end
+More
+Object town_6.4
+name city
+face jcity_D.111
+type 66
+no_pick 1
+x 1
+y 1
+end
+More
+Object town_6.5
+name city
+face jcity_3.111
+type 66
+no_pick 1
+y 2
+end
+More
+Object town_6.6
+name city
+face jcity_9.111
+type 66
+no_pick 1
+x 1
+y 2
+end
+Object town_7
+name large city
+face jcity_6.111
+type 66
+editor_folder exit/Town
+no_pick 1
+client_type 25012
+end
+More
+Object town_7.2
+name large city
+face jcity_E.111
+type 66
+no_pick 1
+x 1
+end
+More
+Object town_7.3
+name large city
+face jcity_C.111
+type 66
+no_pick 1
+x 2
+end
+More
+Object town_7.4
+name large city
+face jcity_7.111
+type 66
+no_pick 1
+y 1
+end
+More
+Object town_7.5
+name large city
+face jcity_F.111
+type 66
+no_pick 1
+x 1
+y 1
+end
+More
+Object town_7.6
+name large city
+face jcity_D.111
+type 66
+no_pick 1
+x 2
+y 1
+end
+More
+Object town_7.7
+name large city
+face jcity_3.111
+type 66
+no_pick 1
+y 2
+end
+More
+Object town_7.8
+name large city
+face jcity_B.111
+type 66
+no_pick 1
+x 1
+y 2
+end
+More
+Object town_7.9
+name large city
+face jcity_9.111
+type 66
+no_pick 1
+x 2
+y 2
+end
+Object well
+face well.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object dforest_exit
+face darkforest.111
+type 66
+editor_folder exit/exit
+no_pick 1
+is_floor 1
+walk_on 1
+smoothface darkforest.111 darkforest_S.111
+smoothlevel 136
+client_type 25012
+end
+Object invis_exit
+face exit.113
+type 66
+editor_folder exit/exit
+invisible 1
+no_pick 1
+walk_on 1
+fly_on 1
+client_type 25012
+end
+Object oakdoor
+face oakdoor.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object volcano_high
+name high volcano
+face volcano_hi.111
+type 66
+editor_folder exit/exit
+no_pick 1
+slow_move 20
+blocksview 1
+client_type 25012
+end
+More
+Object volcano_high_2
+name high volcano
+face volcano_hi.211
+type 66
+no_pick 1
+slow_move 20
+blocksview 1
+x 1
+end
+More
+Object volcano_high_3
+name high volcano
+face volcano_hi.311
+type 66
+no_pick 1
+slow_move 20
+blocksview 1
+y 1
+end
+More
+Object volcano_high_4
+name high volcano
+face volcano_hi.411
+type 66
+no_pick 1
+slow_move 20
+blocksview 1
+x 1
+y 1
+end
+Object ladder_down
+name ladder going down
+face ladder_down.111
+type 66
+editor_folder exit/Ladder
+no_pick 1
+client_type 25012
+end
+Object ladder_bi_up
+name ladder going up
+face ladder2_up.111
+type 66
+editor_folder exit/Ladder
+no_pick 1
+client_type 25012
+end
+Object ladder_up
+name ladder going up
+face ladder_up.111
+type 66
+editor_folder exit/Ladder
+no_pick 1
+client_type 25012
+end
+Object ladder_bi_down
+name ladder going down
+face ladder2_do.111
+type 66
+editor_folder exit/Ladder
+no_pick 1
+client_type 25012
+end
+Object volcano_low
+name volcano
+face volcano_lo.111
+type 66
+editor_folder exit/exit
+no_pick 1
+slow_move 15
+blocksview 1
+client_type 25012
+end
+More
+Object volcano_low_2
+name volcano
+face volcano_lo.211
+type 66
+no_pick 1
+slow_move 15
+blocksview 1
+x 1
+end
+Object perm_magic_portal
+name magic portal
+face magic_portal.111
+type 66
+editor_folder exit/magic_portal
+slaying /city/city
+hp 15
+sp 19
 speed 0.3
-exp 20
-value 50000
-weight 5000
-type 99
-material 8
-resist_physical 3
-editable 5120
-body_foot -2
-item_power 25
-editor_folder armour/boots
+no_pick 1
+animation perm_magic_portal
+client_type 25011
 end
-Object levitationboots
-name levitation boots
-name_pl levitation boots
-client_type 290
-nrof 1
-face lev_boots.111
-value 35000
-weight 2500
-type 99
-material 8
-resist_physical 3
-flying 1
-editable 5120
-body_foot -2
-item_power 1
-map_layer item
-editor_folder armour/boots
+Object magic_portal
+face magic_portal.11L
+type 66
+editor_folder exit/magic_portal
+slaying /city/city
+hp 15
+sp 19
+speed 0.3
+no_pick 1
+animation magic_portal
+is_used_up 1
+food 59
+changing 1
+client_type 25011
 end
-Object low_boots
-name shoes
-name_pl shoes
-client_type 291
-face low_boots.111
-value 25
-weight 2000
-nrof 1
-ac 1
-resist_physical 1
-type 99
-material 8
-editable 1024
-body_foot -2
-gen_sp_armour 1
-editor_folder armour/boots
+Object chole_1
+name hole in the ground
+face chole_1.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
 end
-Object sandals
-name sandals
-name_pl sandals
-client_type 291
-face sandals.111
-value 5
-weight 500
-resist_physical 1
-nrof 1
-type 99
-material 8
-editable 1024
-body_foot -2
-gen_sp_armour 1
-editor_folder armour/boots
+Object chole_2
+name hole in the ground
+face chole_2.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
 end
-Object speedboots
-name speed boots
-name_pl speed boots
-client_type 290
-nrof 1
-exp 6
-face speedboots.111
-animation speedboots
+Object whirlwind_exit
+name whirl wind
+face stalkergen.111
+type 66
+editor_folder exit/exit
 speed 0.2
-value 50000
-weight 5000
-type 99
-material 8
-resist_physical 3
-editable 5120
-body_foot -2
-item_power 6
-editor_folder armour/boots
+no_pick 1
+animation whirlwind_exit
+walk_on 1
+fly_on 1
+client_type 25012
 end
-Object bracers_ac
-nrof 1
-name bracers
-name_pl bracers
-client_type 311
-type 104
-face bracers_ac.111
-ac 1
-value 1000
-material 2
-weight 3000
-editable 1024
-body_wrist -2
-editor_folder armour/bracers
+Object fogexit
+name mysterous fog
+face fog.111
+type 66
+editor_folder exit/exit
+speed 0.2
+no_pick 1
+animation fogexit
+walk_on 1
+fly_on 1
+client_type 25012
 end
-Object bracers_dex
-nrof 1
-name bracers
-name_pl bracers
-client_type 311
-title of dexterity
-face bracersdex.111
-type 104
-Dex 2
-value 65000
-weight 3000
-editable 5120
-body_wrist -2
-item_power 2
-editor_folder armour/bracers
+Object pentagram_111
+name pentagram
+face pentagram.111
+type 41
+editor_folder exit/Pentagram
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
 end
-Object cloak
-name cloak
-name_pl cloaks
-client_type 281
-type 87
-face cloak.111
-ac 0
-weight 5000
-value 40
-material 136
-editable 1024
-nrof 1
-body_shoulder -1
-editor_folder armour/cloak
+More
+Object pentagram_112
+name pentagram
+face pentagram.112
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+x 1
 end
-Object magic_resist
-name Cloak of Magic Resistance
-name_pl Cloaks of Magic Resistance
-client_type 280
-nrof 1
-type 87
-face magic_resist.111
-ac 0
-weight 5000
-value 220000
-startequip 1
-no_steal 1
-material 128
-materialname astolare
-resist_magic 95
-editable 5120
-body_shoulder -1
-item_power 4
-editor_folder armour/cloak
+More
+Object pentagram_113
+name pentagram
+face pentagram.113
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+x 2
 end
-Object oilskin
-name oilskin cloak
-name_pl oilskin cloaks
-client_type 280
-type 87
-face oilskin.111
-Dex -1
-ac 1
-resist_physical 3
-weight 1000
-value 120000
-material 8
-editable 5120
+More
+Object pentagram_121
+name pentagram
+face pentagram.121
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+y 1
+end
+More
+Object pentagram_122
+name pentagram
+face pentagram.122
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+x 1
+y 1
+end
+More
+Object pentagram_123
+name pentagram
+face pentagram.123
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+x 2
+y 1
+end
+More
+Object pentagram_131
+name pentagram
+face pentagram.131
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+y 2
+end
+More
+Object pentagram_132
+name pentagram
+face pentagram.132
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+x 1
+y 2
+end
+More
+Object pentagram_133
+name pentagram
+face pentagram.133
+type 41
+speed 0
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+x 2
+y 2
+end
+Object hole
+face hole1.111
+type 66
+editor_folder exit/exit
+no_pick 1
+is_floor 1
+smoothlevel 10
+smoothface hole1.111 grass_S.111
+client_type 25012
+end
+Object sewer_access
+name sewer
+face sewer_access.111
+type 66
+editor_folder exit/exit
+msg
+You open the sewer access
+grid and jump down.
+My god, you are stinking!
+endmsg
+no_pick 1
+client_type 25012
+end
+Object sewer_access2
+name sewer
+face sewer_access.112
+type 66
+editor_folder exit/exit
+msg
+You open the sewer access
+grid and jump down.
+My god, you are stinking!
+endmsg
+no_pick 1
+client_type 25012
+end
+Object ruins
+face ruins.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object archway
+face archwood.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object archway_green
+face archgreen.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object archway_gold
+face archgold.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object archway_tree
+face archtree.111
+type 66
+editor_folder exit/exit
+no_pick 1
+client_type 25012
+end
+Object exit
+face exit.111
+type 66
+editor_folder exit/exit
+speed 0.5
+no_pick 1
+animation exit
+walk_on 1
+fly_on 1
+client_type 25012
+end
+Object teleporter
+face teleporter.111
+type 41
+editor_folder exit/exit
+speed 0.1
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+animation teleporter
+end
+Object stair3_ystone_up
+name stairs going up
+face stair3_ystone_up.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_3_up
+name stairs going up
+face stair3_up.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair2_down
+name stairs going down
+face stair2_do.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair3_gstone_do
+name stairs going down
+face stair3_gstone_do.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair2_up
+name stairs going up
+face stair2_up.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair3_gstone_up
+name stairs going up
+face stair3_gstone_up.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_down
+name stairs going down
+face stair_down.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_up
+name stairs going up
+face stair_up.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_up_1
+name stairs going up
+face stair_up_1.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_up_2
+name stairs going up
+face stair_up_2.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_up_3
+name stairs going up
+face stair_up_3.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_up_4
+name stairs going up
+face stair_up_4.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair3_ystone_do
+name stairs going down
+face stair3_ystone_do.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_3_down
+name stairs going down
+face stair3_do.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_down_1
+name stairs going down
+face stair_down_1.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_down_2
+name stairs going down
+face stair_down_2.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_down_3
+name stairs going down
+face stair_down_3.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object stair_down_4
+name stairs going down
+face stair_down_4.111
+type 66
+editor_folder exit/Up_down
+no_pick 1
+client_type 25012
+end
+Object booze
+face booze.111
+type 54
+editor_folder food/food
+on_use_yield boozebottle_empty
+food 100
 nrof 1
-resist_acid 70
-magic -4
-damned 1
-body_shoulder -1
-editor_folder armour/cloak
+material 32
+value 5
+weight 6500
+identified 1
+name_pl boozes
+client_type 611
+slaying vial_poison:poison
 end
-Object serp_cloak
-name serpent cloak
-name_pl serpent cloaks
-client_type 280
-type 87
-face serp_cloak.111
-ac 1
-weight 700
-resist_poison 30
-value 900
-material 8
-materialname snakeskin
-editable 5120
+Object apple_half
+name apple halve
+face apple_half.111
+type 6
+editor_folder food/food
+name_pl apple halves
+food 12
 nrof 1
-body_shoulder -1
-item_power 2
-editor_folder armour/cloak
+need_an 1
+material 32
+value 1
+weight 50
+identified 1
+client_type 601
+slaying b_slicingknife:2 apple_fourth
 end
-Object b_gauntlets
+Object apple_fourth
+name apple fourth
+face apple_fourth.111
+type 6
+editor_folder food/food
+name_pl apple fourths
+food 6
 nrof 1
-name gauntlets
-client_type 305
-face b_gauntlet_s.111
-type 100
-resist_physical 2
-value 6
-nrof 1
-material 2
-materialname bronze
-weight 1800
-editable 1024
-body_hand -2
-editor_folder armour/gauntlets
+need_an 1
+material 32
+value 1
+weight 25
+identified 1
+client_type 601
+slaying b_slicingknife:2 apple_eighth
 end
-Object gauntlets
+Object apple_eighth
+name apple eighth
+face apple_eighth.111
+type 6
+editor_folder food/food
+name_pl apple eighths
+food 3
 nrof 1
-name gauntlets
-client_type 305
-face gauntlet_s.111
-type 100
-resist_physical 3
-value 25
-nrof 1
-material 2
-weight 1800
-editable 1024
-body_hand -2
-editor_folder armour/gauntlets
+need_an 1
+material 32
+value 1
+weight 12
+identified 1
+client_type 601
 end
-Object gauntlets_dex
+Object cheeseburger
+face ch_burger.111
+type 6
+editor_folder food/food
+food 350
 nrof 1
-name gauntlets
-client_type 305
-title of dexterity
-face gauntlet_s.111
-type 100
-Dex 2
-resist_physical 3
-value 65000
-material 2
-weight 1800
-editable 5120
-body_hand -2
-item_power 1
-editor_folder armour/gauntlets
+material 32
+value 10
+weight 6500
+identified 1
+client_type 601
 end
-Object gauntlets_str
+Object waybread
+face waybread.111
+type 6
+editor_folder food/food
+food 500
 nrof 1
-name gauntlets
-name_pl gauntlets
-client_type 305
-title of strength
-face gauntlet_s.111
-type 100
-Str 1
-resist_physical 3
-value 65000
-material 2
-weight 2000
-editable 5120
-body_hand -2
-item_power 0
-editor_folder armour/gauntlets
+material 32
+value 30
+weight 1000
+identified 1
+name_pl waybreads
+client_type 601
 end
-Object gloves
+Object apple
+face apple.111
+type 6
+editor_folder food/food
+food 25
 nrof 1
-name gloves
-client_type 301
-face gloves.111
-type 100
-resist_physical 1
-nrof 1
-value 4
-material 8
+need_an 1
+material 32
+value 2
 weight 100
-editable 1024
-body_hand -2
-editor_folder armour/gauntlets
+identified 1
+name_pl apples
+client_type 601
+slaying b_slicingknife:2 apple_half
 end
-Object gloves_b
+Object chocolate
+face chocolate.111
+type 6
+editor_folder food/food
+food 50
 nrof 1
-name gloves
-client_type 301
-face gloves_b.111
-type 100
-resist_physical 1
-nrof 1
-value 64
-material 8
-materialname black leather
+material 32
+value 10
 weight 100
-editable 1024
-body_hand -2
-editor_folder armour/gauntlets
+identified 1
+name_pl chocolates
+client_type 601
 end
-Object gloves_w
+Object water
+face water.111
+type 54
+editor_folder food/food
+on_use_yield wbottle_empty
+food 5
 nrof 1
-name gloves
-client_type 301
-face gloves_w.111
-type 100
-resist_physical 1
-Cha 1
-resist_blind 2
-nrof 1
-value 6000
-material 8
-materialname white leather
-weight 100
-editable 1024
-body_hand -2
-editor_folder armour/gauntlets
+material 32
+value 5
+weight 1500
+name_pl waters
+client_type 611
+slaying vial_poison:water_poison
 end
-Object gloves_w_l
+Object orcchop
+name orc chop
+face orcchop.111
+type 6
+editor_folder food/food
+need_an 1
+food 10
 nrof 1
-name gloves
-client_type 301
-face gloves_w.111
-type 100
-resist_physical 20
-Cha 1
-resist_blind 20
-title of light
-nrof 1
-value 42000
-material 2
-materialname white steel
-weight 200
-editable 1024
-body_hand -2
-editor_folder armour/gauntlets
+material 32
+value 1
+weight 650
+identified 1
+name_pl orc chops
+client_type 624
 end
-Object god_finger
+Object food
+face food.111
+type 6
+editor_folder food/food
+food 200
 nrof 1
-name God Finger
-name_pl God Fingers
-client_type 300
-type 100
-face god_finger.111
-animation god_finger
-speed .1
-Str 2
-Dex -1
-resist_physical 3
-dam +3
-make_invisible 1
-value 120000
-material 2
-weight 1800
-editable 5120
-body_hand -2
-item_power 2
-editor_folder armour/gauntlets
+material 32
+value 10
+weight 6500
+identified 1
+name_pl foods
+client_type 601
 end
-Object shining_finger
+Object leg_mutton
+face food.111
+type 6
+editor_folder food/food
+food 150
 nrof 1
-name Shining Finger
-name_pl Shining Fingers
-client_type 300
-type 100
-face shining_finger.111
-animation shining_finger
-speed .1
-Str 2
-resist_physical 3
-dam +3
-value 120000
-material 2
-weight 1800
-editable 5120
-body_hand -2
-item_power 1
-editor_folder armour/gauntlets
+material 32
+value 50
+weight 1500
+identified 1
+name_pl legs of mutton
+name_pl leg of mutton
+client_type 601
 end
-Object girdle_strcon
+Object cake
+face cake.111
+type 6
+editor_folder food/food
+food 125
 nrof 1
-type 113
-name girdle
-name_pl girdles
-client_type 321
-title of fighting
-face gir_strcon.111
-animation girdle_strcon
-speed 0.1
-Str 1
-Con 1
-weight 2500
-value 75000
-material 8
-editable 5120
-body_waist -1
-item_power 1
-editor_folder armour/girdle
+material 32
+value 8
+weight 3000
+identified 1
+name_pl cakes
+client_type 601
 end
-Object girdle_con
+Object s_weasel
+name sizzling weasel on a stick
+face s_weasel.111
+type 6
+editor_folder food/food
+food 30
 nrof 1
-type 113
-name girdle
-name_pl girdles
-client_type 321
-title of constitution
-face girdle_con.111
-animation girdle_con
-speed 0.1
-Con 2
-weight 2500
-value 85000
-material 8
-editable 5120
-body_waist -1
-item_power 1
-editor_folder armour/girdle
+material 32
+value 5
+weight 10
+identified 1
+name_pl sizzling weasels on a stick
+client_type 601
 end
-Object girdle_dam
+Object blackroot
+name blackroot
+face blackroot.111
+type 6
+editor_folder food/food
+food 15
 nrof 1
-type 113
-name girdle
-name_pl girdles
-client_type 321
-title of damage
-face girdle_dam.111
-animation girdle_dam
-speed 0.1
-dam 10
-weight 2500
-value 70000
-material 8
-editable 5120
-body_waist -1
-item_power 1
-editor_folder armour/girdle
+material 32
+value 300
+weight 300
+identified 1
+name_pl blackroot
+client_type 601
 end
-Object girdle_str
+Object uf6
+name uranium hexafluoride gas
+face uf6.111
+type 54
+editor_folder food/food
+on_use_yield wbottle_empty
+food 1
 nrof 1
-type 113
-name girdle
-name_pl girdles
-client_type 321
-title of strength
-face girdle_str.111
-animation girdle_str
-speed 0.1
-Str 2
-weight 2500
-value 80000
-material 8
-editable 5120
-body_waist -1
-item_power 1
-editor_folder armour/girdle
+material 32
+value 155
+weight 11500
+name_pl uranium hexafluoride gas
+client_type 611
 end
-Object a_helmet
-name helmet
-name_pl helmets
-client_type 271
+Object bag_popcorn
+name bag of popcorn
+face bag_popcorn.111
+type 6
+editor_folder food/food
+food 50
 nrof 1
-type 34
-face a_helmet.111
-weight 5000
-ac 1
-resist_physical 5
-value 14
-material 2
-editable 1024
-body_head -1
-gen_sp_armour 5
-editor_folder armour/helmet
+material 32
+value 6
+weight 250
+identified 1
+name_pl bags of popcorn
+client_type 601
 end
-Object b_full_helmet
+Object poison
+name booze
+face booze.111
+type 7
+editor_folder food/food
+on_use_yield boozebottle_empty
 nrof 1
-name full helmet
-name_pl full helmets
-client_type 271
-type 34
-face b_fullhelmet.111
-ac 1
-resist_physical 5
-weight 12000
-value 4
-material 2
-materialname bronze
-editable 1024
-body_head -1
-gen_sp_armour 10
-editor_folder armour/helmet
+material 32
+weight 6500
+identified 0
+name_pl boozes
+client_type 611
+cursed 1
+known_cursed 0
+title of poison
 end
-Object b_helmet
-name helmet
-name_pl helmets
-client_type 271
+Object wine_poison
+name bottle of wine
+face wine.111
+type 7
+editor_folder food/food
+on_use_yield winebottle_empty
+food 75
 nrof 1
-type 34
-face b_helmet.111
-weight 5000
-ac 1
-resist_physical 3
-value 4
-material 2
-materialname bronze
-editable 1024
-body_head -1
-gen_sp_armour 5
-editor_folder armour/helmet
+material 36
+value 10
+weight 1000
+identified 0
+name_pl bottles of wine
+client_type 611
+cursed 1
+known_cursed 0
+title of poison
 end
-Object b_horned_helmet
+Object w_glass_poison
+name glass of wine
+face w_glass.111
+type 7
+editor_folder food/food
+food 10
 nrof 1
-name horned helmet
-name_pl horned helmets
-client_type 271
-type 34
-face b_hornhelmet.111
-ac 1
-resist_physical 1
-weight 6000
-value 3
-material 18
-materialname bronze
-editable 1024
-body_head -1
-gen_sp_armour 2
-editor_folder armour/helmet
+material 36
+value 2
+weight 1000
+identified 0
+name_pl glasses of wine
+client_type 611
+cursed 1
+known_cursed 0
+title of poison
 end
-Object bighorned_helmet
+Object water_poison
+face water.111
+type 7
+editor_folder food/food
+on_use_yield wbottle_empty
+food 5
 nrof 1
-name horned helmet
-name_pl horned helmets
-client_type 271
-type 34
-face bighorn_he.111
-ac 1
-resist_physical 5
-weight 10000
-value 22
-material 18
-editable 1024
-body_head -1
-gen_sp_armour 3
-editor_folder armour/helmet
+material 32
+value 5
+weight 1500
+name_pl waters
+client_type 611
+identified 0
+cursed 1
+known_cursed 0
+title of poison
 end
-Object crown
-name crown
+Object tomato
+name tomato
+face tomato.111
+type 6
+editor_folder food/food
+food 50
 nrof 1
-face crown.111
-type 34
-material 2
-resist_physical 3
-weight 12300
-value 1700
-editable 128
-name_pl crowns
-client_type 271
-body_head -1
-editor_folder armour/helmet
+material 32
+value 7
+weight 1000
+identified 1
+name_pl tomatoes
+client_type 601
 end
-
-Object crown_r
-name crown
+Object tomato_big
+name very large tomato
+face tomato_big.111
+type 6
+editor_folder food/food
+food 200
 nrof 1
-face crown_r.111
-type 34
-material 2
-resist_physical 3
-weight 12300
-value 1700
-editable 128
-name_pl crowns
-client_type 271
-body_head -1
-editor_folder armour/helmet
+material 32
+value 14
+weight 1000
+identified 1
+name_pl very large tomatoes
+client_type 601
 end
-
-Object crown_gray
-name crown
+Object dragon_steak
+name steak
+face drag_steak.111
+type 72
+editor_folder food/food
+food 400
 nrof 1
-face crown_gray.111
-type 34
-material 2
-resist_physical 3
-weight 12300
-value 1700
-editable 128
-name_pl crowns
-client_type 271
-body_head -1
-editor_folder armour/helmet
+material 32
+value 10
+weight 5
+identified 1
+name_pl steaks
+client_type 624
 end
-
-Object crown_white
-name crown
+Object orange
+name orange
+face orange.111
+type 6
+editor_folder food/food
+food 25
 nrof 1
-face crown_white.111
-type 34
-material 2
-resist_physical 3
-weight 12300
-value 1700
-editable 128
-name_pl crowns
-client_type 271
-body_head -1
-editor_folder armour/helmet
+need_an 1
+material 32
+value 2
+weight 100
+identified 1
+name_pl oranges
+client_type 601
 end
-
-Object crown_dark
-name crown
+Object coffee
+name cup of coffee
+face coffee.111
+type 6
+editor_folder food/food
+on_use_yield coffee_empty
+food 10
 nrof 1
-face crown_dark.111
-type 34
-material 2
-resist_physical 3
-weight 12300
-value 1700
-editable 128
-name_pl crowns
-client_type 271
-body_head -1
-editor_folder armour/helmet
+material 32
+value 1
+weight 100
+identified 1
+name_pl cups of coffee
+client_type 601
 end
-Object eyeglasses
+Object mint
+name mint sprig
+face mint.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-name eye glasses
-client_type 275
-type 34
-face eyeglasses.111
-weight 120
-value 1000
-Dex 2
-Cha -2
-material 4
-materialname glass
-editable 1024
-body_head -1
-editor_folder armour/helmet
+material 32
+value 5
+weight 100
+name_pl mint sprigs
+client_type 601
 end
-Object full_helmet
+Object roast_bird
+name roast bird
+face roast_bird.111
+type 6
+editor_folder food/food
+food 450
 nrof 1
-name full helmet
-name_pl full helmets
-client_type 271
-type 34
-face fullhelmet.111
-ac 1
-resist_physical 10
-weight 12000
-value 16
-material 2
-editable 1024
-body_head -1
-gen_sp_armour 10
-editor_folder armour/helmet
+material 32
+value 40
+weight 7500
+identified 1
+name_pl roast birds
+client_type 601
 end
-Object helmet
-name helmet
-name_pl helmets
-client_type 271
+Object rose_pink
+name pink rose
+face rose_pink.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-type 34
-face helmet.111
-weight 5000
-ac 1
-resist_physical 5
-value 14
-material 2
-editable 1024
-body_head -1
-gen_sp_armour 5
-editor_folder armour/helmet
+material 32
+value 60
+weight 2
+name_pl pink roses
+client_type 601
 end
-Object helmet_of_brilliance
-name helmet
-name_pl helmets
-client_type 270
+Object rose_red
+name red rose
+face rose_red.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-title of brilliance
-face helmet_bri.111
-type 34
-weight 7000
-ac 2
-resist_physical 5
-value 95000
-Int 2
-Pow 2
-sp 1
-editable 5120
-body_head -1
-item_power 5
-editor_folder armour/helmet
+material 32
+value 80
+weight 2
+name_pl red roses
+client_type 601
 end
-Object helmet_of_xrays
-name helmet
-name_pl helmets
-client_type 270
+Object rose_white
+name white rose
+face rose_wh.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-title of xray vision
-face helmetxray.111
-animation helmet_of_xrays
-speed 0.05
-type 34
-weight 6000
-ac 2
-resist_physical 5
-value 70000
-material 2
-xrays 1
-editable 5120
-body_head -1
-item_power 3
-editor_folder armour/helmet
+material 32
+value 45
+weight 2
+name_pl white roses
+client_type 601
 end
-Object horned_helmet
+Object rose_yellow
+name yellow rose
+face rose_yel.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-name horned helmet
-name_pl horned helmets
-client_type 271
-type 34
-face hornhelmet.111
-ac 1
-resist_physical 2
-weight 6000
-value 12
-material 18
-editable 1024
-body_head -1
-gen_sp_armour 2
-editor_folder armour/helmet
+material 32
+value 45
+weight 2
+name_pl yellow roses
+client_type 601
 end
-Object kog
-name Kabuto of Geisya
-name_pl Kabutos of Geisya
-client_type 270
+Object rose_black
+name black rose
+face rose_black.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-type 34
-face kog.111
-Wis 1
-Cha 2
-Int 1
-weight 2000
-ac 3
-resist_physical 10
-value 100000
-material 2
-editable 1024
-body_head -1
-gen_sp_armour 5
-item_power 4
-editor_folder armour/helmet
+material 32
+value 160
+weight 2
+name_pl black roses
+client_type 601
 end
-Object turban
-name turban
-name_pl turbans
-client_type 272
+Object mandrake_root
+name mandrake root
+face root.111
+type 6
+editor_folder food/food
+food 15
 nrof 1
-type 34
-face turban.111
-weight 500
-resist_physical 1
-value 8
-material 128
-editable 1024
-body_head -1
-gen_sp_armour 1
-editor_folder armour/helmet
+material 32
+value 300
+weight 300
+identified 1
+name_pl mandrake roots
+client_type 601
 end
-Object wig
-name wig
-name_pl wigs
-client_type 273
+Object clover
+face clover.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-type 34
-face wig.111
-weight 500
-Cha 1
-value 140
 material 32
-editable 1024
-body_head -1
-editor_folder armour/helmet
+value 5
+weight 100
+name_pl clovers
+client_type 601
 end
-Object wiz_hat
-name Wizard Hat
-name_pl Wizard Hats
-client_type 270
+Object wine
+name bottle of wine
+face wine.111
+type 54
+editor_folder food/food
+on_use_yield winebottle_empty
+food 75
 nrof 1
-type 34
-face wiz_hat.111
-animation wiz_hat
-speed 0.1
-last_sp 12
-ac 1
-Int 2
-sp 4
-resist_fire 15
-resist_cold 15
-resist_drain 30
-resist_slow 30
-resist_paralyze 30
+material 36
+value 10
 weight 1000
-value 50000
-material 128
-editable 5120
-body_head -1
-item_power 10
-editor_folder armour/helmet
+identified 1
+name_pl bottles of wine
+client_type 611
+slaying vial_poison:wine_poison
 end
-Object Pdragon_mail
-name Power Dragon Mail
-name_pl Power Dragon Mails
-client_type 251
+Object loaf
+name bread
+face loaf.111
+type 6
+editor_folder food/food
+food 100
 nrof 1
-type 16
-face Pdragonmail.111
-animation Pdragon_mail
-speed 0.2
-last_sp 13
-ac 8
-material 256
-resist_physical 60
-weight 40000
-value 990000
-exp 1
-resist_fire 50
-resist_electricity 30
-magic 4
-editable 5120
+material 32
+value 5
+weight 3000
 identified 1
-body_torso -1
-gen_sp_armour 9
-item_power 12
-editor_folder armour/mail
+name_pl breads
+client_type 601
 end
-Object b_plate_mail
+Object haggis
+name haggis
+face haggis.111
+type 6
+editor_folder food/food
+food 500
 nrof 1
-name plate mail
-name_pl plate mails
-client_type 252
-type 16
-face b_plate_mail.111
-last_sp 7
-material 2
-materialname bronze
-ac 5
-resist_physical 20
-weight 100000
-value 25
-editable 1024
-body_torso -1
-gen_sp_armour 30
-editor_folder armour/mail
+material 32
+value 80
+weight 8000
+identified 1
+name_pl haggises
+client_type 601
 end
-Object b_scale_mail
+Object mushroom_1
+name mushroom
+face mushroom_1.111
+type 6
+editor_folder food/food
+food 50
 nrof 1
-name scale mail
-name_pl scale mails
-client_type 253
-type 16
-face b_scale_mail.111
-last_sp 9
-material 8
-materialname bronze
-ac 3
-resist_physical 10
-weight 20000
-value 8
-editable 1024
-body_torso -1
-gen_sp_armour 10
-editor_folder armour/mail
+material 32
+value 5
+weight 100
+name_pl mushrooms
+client_type 601
 end
-Object chain_mail
+Object mushroom_2
+name mushroom
+face mushroom_2.111
+type 6
+editor_folder food/food
 nrof 1
-name chain mail
-name_pl chain mails
-client_type 253
-type 16
-face chainmail.111
-last_sp 10
-material 2
-ac 4
-resist_physical 30
-weight 60000
-value 75
-editable 1024
-body_torso -1
-gen_sp_armour 15
-editor_folder armour/mail
+material 32
+value 6
+food 55
+weight 100
+name_pl mushrooms
+client_type 601
 end
-Object dragon_mail
-name dragon mail
-name_pl dragon mails
-client_type 251
+Object mushroom_3
+name mushroom
+face mushroom_3.111
+type 6
+editor_folder food/food
+food 60
 nrof 1
-type 16
-face dragonmail.111
-last_sp 13
-ac 6
-resist_physical 50
-material 2048
-materialname dragonscale
-weight 60000
-value 50000
-resist_fire 40
-magic 3
-editable 5120
-identified 1
-body_torso -1
-gen_sp_armour 9
-item_power 5
-editor_folder armour/mail
+material 32
+value 7
+weight 50
+name_pl mushrooms
+client_type 601
 end
-Object dress1
-name dress
-name_pl dresses
-client_type 255
+Object pear
+face pear.111
+type 6
+editor_folder food/food
+food 25
 nrof 1
-type 16
-face dress1.111
-resist_physical 1
-last_sp 5
-Cha 2
-ac 1
-weight 10000
-value 10000
-material 128
-editable 1024
-body_torso -1
-editor_folder armour/mail
+material 32
+value 2
+weight 100
+identified 1
+name_pl pears
+client_type 601
 end
-Object dress2
-name dress
-name_pl dresses
-client_type 255
+Object pipeweed
+name pipeweed
+face pipeweed.111
+type 6
+editor_folder food/food
+food 5
 nrof 1
-type 16
-face dress2.111
-last_sp 8
-ac 1
-Cha 1
-weight 5000
-value 3000
-material 128
-editable 1024
-body_torso -1
-editor_folder armour/mail
+material 32
+value 300
+weight 32
+name_pl pipeweed
+client_type 601
 end
-Object dress3
-name dress
-name_pl dresses
-client_type 255
+Object cabbage
+face cabbage.111
+type 6
+editor_folder food/food
+food 80
 nrof 1
-type 16
-face dress3.111
-last_sp 8
-Cha 1
-weight 4500
-value 1000
-material 128
-editable 1024
-body_torso -1
-editor_folder armour/mail
+material 32
+value 4
+weight 1500
+identified 1
+name_pl cabbages
+client_type 601
 end
-Object elven_robe
-name Elven Robe
-name_pl Elven Robes
-client_type 256
+Object carrot
+name carrots
+face carrot.111
+type 6
+editor_folder food/food
+food 20
 nrof 1
-type 16
-face elven_robe.111
-last_sp 12
-ac 3
-stealth 1
-resist_confusion 60
-Dex 4
-magic 1
-food 4
-weight 5000
-value 3000
-material 128
-editable 5120
-body_torso -1
-item_power 13
-editor_folder armour/mail
+material 32
+value 1
+weight 100
+identified 1
+name_pl carrots
+client_type 601
 end
-Object gale
-name Gale Armour
-name_pl Gale Armours
-client_type 250
+Object w_glass
+name glass of wine
+face w_glass.111
+type 54
+editor_folder food/food
+on_use_yield w_glass_empty
+food 10
 nrof 1
-face gale.111
-Dex 2
-ac 4
-resist_physical 40
-speed 2.000000
-type 16
-resist_electricity 30
-material 8
-value 220000
-weight 10000
-last_sp 50
-editable 5120
-body_torso -1
-item_power 4
-editor_folder armour/mail
+material 36
+value 2
+weight 1000
+identified 1
+name_pl glasses of wine
+client_type 611
+slaying vial_poison:w_glass_poison
 end
-Object lapron
-name apron
-name_pl aprons
-client_type 257
+Object onion
+name onion
+face onion.111
+type 6
+editor_folder food/food
+food 50
 nrof 1
-type 16
-face lapron.111
-last_sp 11
-ac 1
-resist_physical 5
-weight 20000
-nrof 1
-value 10
-material 8
-editable 1024
-body_torso -1
-editor_folder armour/mail
+need_an 1
+material 32
+value 2
+weight 100
+identified 1
+name_pl onions
+client_type 601
 end
-Object leather_armour
+Object potato
+name potatoes
+face potato.111
+type 6
+editor_folder food/food
+food 200
 nrof 1
-name armour
-name_pl armours
-client_type 254
-type 16
-face leather_ar.111
-last_sp 13
-ac 2
-resist_physical 10
-weight 20000
-value 40
-material 8
-editable 1024
-body_torso -1
-gen_sp_armour 8
-editor_folder armour/mail
+material 32
+value 7
+weight 4000
+identified 1
+name_pl potatoes
+client_type 601
 end
-Object mithril_chainmail
+Object gen_mushroom
+name mouldy patch
+face gen_mushroom.111
+editor_folder food/food
+randomitems random_mushroom
+no_pick 1
+alive 1
+exp 1
+level 1
+ac 25
+hp 1
+maxhp 1
+speed -1.0
+invisible 1
+is_used_up 1
+end
+Object fishfood
+name fish
+face fishfood.111
+type 6
+editor_folder food/food
+food 100
 nrof 1
-name mithril chainmail
-name_pl mithril chainmails
-client_type 250
-type 16
-material 2
-materialname mithril
-face mithril_ar.111
-animation mithril_chainmail
-speed 0.1
-ac 6
-resist_physical 35
-last_sp 18
-weight 15000
-value 8000
-editable 5120
-body_torso -1
-gen_sp_armour 5
-item_power 1
-editor_folder armour/mail
+material 32
+value 4
+weight 3500
+identified 1
+name_pl fishes
+client_type 601
 end
-Object mithril_ar_ele
+Object devourers_avatar_info
+name avatar
+type 8
+editor_folder gods/supernatural
+invisible 1
+other_arch devourers_avatar
+end
+Object Valriel
+face archangel.115
+type 50
+editor_folder gods/supernatural
+msg
+Lord of Angels, Duke of the Heavens, Healer and Protector
+endmsg
+title Gorokh
+slaying demon
+race angel
+animation archangle
+Str 30
+Con 30
+Dex 30
+Int 30
+Wis 30
+Pow 30
+is_animated 1
+monster 1
+alive 1
+attacktype 4194304
+path_attuned 1025
+path_denied 393216
+resist_confusion 20
+resist_blind 100
+resist_fear 100
+ac -7
+wc -1
+hp 350
+maxhp 350
+dam 50
+level 15
+speed 0.25
+can_cast_spell 1
+can_use_armour 1
+can_use_weapon 1
+can_use_shield 1
+exp 1
+weight 100000
+randomitems Valriel
+end
+Object gorokh_general_info
+name message
+type 8
+editor_folder gods/supernatural
+msg
+You are filled with a desire to slay all
+angels.
+endmsg
+invisible 1
+end
+Object Gorokh
+face devil.111
+type 50
+editor_folder gods/supernatural
+msg
+Demon King, Duke of Hell, Temptor and Tormentor
+endmsg
+title Valriel
+slaying angel
+race demon
+animation devil
+is_animated 1
+Str 30
+Con 30
+Dex 30
+Int 30
+Wis 30
+Pow 30
+monster 1
+alive 1
+attacktype 16384
+path_attuned 131072
+path_repelled 257
+resist_magic 30
+resist_cold -5
+resist_fear 100
+ac -5
+wc -3
+dam 50
+hp 350
+maxhp 350
+level 15
+speed 0.25
+luck -1
+last_heal -2
+last_sp -1
+can_cast_spell 1
+can_use_armour 1
+can_use_weapon 1
+can_use_shield 1
+exp 1
+weight 400000
+randomitems Gorokh
+end
+Object valriel_avatar_info
+name avatar
+type 8
+editor_folder gods/supernatural
+invisible 1
+other_arch valriel_avatar
+end
+Object valriel_avatar
+face archangel.115
+editor_folder gods/supernatural
+slaying demon
+race angel
+animation archangle
+Str 30
+Con 30
+Dex 30
+Int 30
+Wis 30
+Pow 30
+is_animated 1
+monster 1
+alive 1
+attacktype 4194305
+path_attuned 1025
+path_denied 393216
+resist_confusion 20
+resist_blind 100
+resist_fear 100
+resist_physical 50
+ac -7
+wc -1
+hp 350
+maxhp 350
+dam 40
+level 15
+speed 0.25
+can_cast_spell 1
+can_use_armour 1
+can_use_weapon 1
+can_use_shield 1
+exp 1
+weight 100000
+end
+Object devourers_holy_servant_info
+name holy servant
+type 8
+editor_folder gods/supernatural
+invisible 1
+other_arch wight
+end
+Object gorokh_avatar
+face devil.111
+editor_folder gods/supernatural
+slaying angel
+race demon
+animation devil
+is_animated 1
+Str 30
+Con 30
+Dex 30
+Int 30
+Wis 30
+Pow 30
+monster 1
+alive 1
+attacktype 16385
+path_attuned 393216
+path_denied 1025
+resist_physical 50
+resist_fear 100
+resist_magic 20
+ac -5
+wc -3
+dam 40
+hp 350
+maxhp 350
+level 15
+speed 0.25
+can_cast_spell 1
+can_use_armour 1
+can_use_weapon 1
+can_use_shield 1
+exp 1
+weight 400000
+end
+Object gorokh_avatar_info
+name avatar
+type 8
+editor_folder gods/supernatural
+invisible 1
+other_arch gorokh_avatar
+end
+Object valriel_player_glow
+name valriel's light
+face archangel.115
+type 98
+editor_folder gods/supernatural
+glow_radius 9
+startequip 1
+invisible 1
+end
+Object devourers_general_info
+name message
+type 8
+editor_folder gods/supernatural
+msg
+You feel a bond with all things which are
+undead.
+endmsg
+invisible 1
+end
+Object Devourers
+face grimreaper.112
+type 50
+editor_folder gods/supernatural
+msg
+Soul Eaters, Harbingers of Death, Nameless 
+Lords of the Tomb
+endmsg
+title Gaea
+race undead
+animation grimreaper
+is_animated 1
+monster 1
+alive 1
+Str 30
+Con 30
+Dex 30
+Int 30
+Wis 30
+Pow 30
+attacktype 16973824
+path_attuned 393216
+path_denied 65536
+path_repelled 524547
+resist_drain 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_ghosthit 50
+resist_poison 100
+resist_cold 15
+resist_fire -5
+ac -12
+wc -1
+hp 350
+maxhp 350
+dam 50
+last_eat 60
+last_heal -1
+level 15
+speed 0.35
+can_cast_spell 1
+can_use_weapon 1
+can_use_armour 1
+can_use_shield 1
+undead 1
+can_see_in_dark 1
+exp 1
+weight 1
+randomitems Devourers
+end
+Object valriel_general_info
+name message
+type 8
+editor_folder gods/supernatural
+msg
+You are filled with a desire to slay all
+demons.
+endmsg
+invisible 1
+end
+Object valriel_holy_servant_info
+name holy servant
+type 8
+editor_folder gods/supernatural
+invisible 1
+other_arch angel
+end
+Object gorokh_holy_servant_info
+name holy servant
+type 8
+editor_folder gods/supernatural
+invisible 1
+other_arch devil
+end
+Object devourers_avatar
+face grimreaper.112
+editor_folder gods/supernatural
+race undead
+animation grimreaper
+is_animated 1
+monster 1
+alive 1
+Str 30
+Con 30
+Dex 30
+Int 30
+Wis 30
+Pow 30
+attacktype 196752
+path_attuned 262144
+path_denied 590082
+path_repelled 129
+resist_death 100
+resist_deplete 100
+resist_fear 100
+resist_drain 100
+resist_fire -50
+resist_cold 50
+resist_physical 20
+ac -12
+wc -1
+hp 350
+maxhp 350
+dam 50
+last_eat -3
+last_heal -1
+level 15
+speed 0.35
+can_cast_spell 1
+can_use_weapon 1
+can_use_armour 1
+can_use_shield 1
+undead 1
+can_see_in_dark 1
+exp 1
+weight 1
+end
+Object tear_gaea
+name Gaea's tear
+face tear.111
+type 5
+editor_folder gods/items
+animation tear_gaea
 nrof 1
-name mithril chainmail of lightning
-name_pl mithril chainmails of lightning
-client_type 250
-type 16
-material 2
-materialname mithril
+level 10
+speed 0.25
+sp 35
+weight 10
+name_pl Gaea's tears
+client_type 650
+end
+Object mithril_ar_ele_sorig
+name mithril chainmail of lightning of Sorig
 face mithril_ar_ele.111
+type 16
+editor_folder gods/items
+msg
+Sorig has granted you this fine mail.  It
+  grants great protection from electricity
+  and physical attacks without reducing your
+  mobility. Be warned that what Sorig gives,
+  Sorig can take away.
+endmsg
+nrof 1
 animation mithril_ar_ele
 speed 0.3
 ac 4
 resist_physical 40
-resist_electricity 30
-Cha 1
+resist_electricity 40
+startequip 1
+Dex 1
 Str 1
 exp 1
-magic 3
+magic 5
+gen_sp_armour 2
 last_sp 27
 weight 15000
 value 4000
-editable 5120
+name_pl mithril chainmails of lightning of Sorig
+client_type 250
 body_torso -1
-gen_sp_armour 2
-item_power 9
-editor_folder armour/mail
+item_power 10
 end
-Object plate_mail
-nrof 1
-name plate mail
-name_pl plate mails
-client_type 252
-type 16
+Object mail_mostrai
+name Thorin's Plate Mail
 face plate_mail.111
-last_sp 7
-material 2
-ac 5
-resist_physical 40
-weight 100000
-value 100
-editable 1024
-body_torso -1
-gen_sp_armour 30
-editor_folder armour/mail
-end
-Object ring_mail
-nrof 1
-name hauberk
-name_pl hauberks
-client_type 253
 type 16
-face ring_mail.111
-last_sp 10
-material 2
-ac 4
-resist_physical 25
+editor_folder gods/items
+msg
+This shining plate mail is Mostrai's
+  gift to the bravest of his warriors.
+  It is highly enchanted, increasing the
+  strength of the wearer and protecting
+  against fire.
+endmsg
+name_pl Thorin's Plate Mails
+client_type 250
+ac 3
+Str 1
+nrof 1
+startequip 1
+resist_physical 50
+resist_fire 30
 weight 50000
-value 60
-editable 1024
+magic 2
+gen_sp_armour 9
+last_sp 13
 body_torso -1
-gen_sp_armour 15
-editor_folder armour/mail
+item_power 4
 end
-Object ring_mail2
+Object spear_ixalovh
+name Ixalovh's spear
+face spear_ixalovh.111
+type 15
+editor_folder gods/items
 nrof 1
-name ring mail
-name_pl ring mails
-client_type 253
-type 16
-face ring_mail2.111
-last_sp 11
-material 2
-ac 4
-resist_physical 20
-weight 40000
-value 85
-editable 1024
-body_torso -1
-gen_sp_armour 15
-editor_folder armour/mail
+last_sp 9
+weapontype 5
+animation spear_ixalovh
+speed -0.02
+Pow 1
+sp 1
+material 256
+dam 35
+weight 26500
+value 75000
+magic 12
+resist_magic 10
+resist_fire 15
+attacktype 17
+startequip 1
+name_pl Ixalovh's spears
+client_type 136
+can_impale 1
+glow_radius 2
+body_arm -2
+item_power 20
+skill two handed weapons
 end
-Object robe
-name robe
-name_pl robes
-client_type 256
+Object shield_gaea
+name Gaea's Shield of Earth
+face earth_shield.111
+type 33
+editor_folder gods/items
+msg
+This shield is highly enchanted by the forces
+  of life and nature. It is a personal gift from
+  Gaea, to protect her beloved children.
+endmsg
+animation shield_gaea
+is_animated 1
+ac 4
+speed 0.2
 nrof 1
-type 16
-face robe.111
-last_sp 12
-ac 1
-weight 10000
-value 30
-material 128
-editable 1024
-body_torso -1
-editor_folder armour/mail
+startequip 1
+resist_physical 15
+resist_fire 30
+resist_cold 30
+resist_electricity 30
+resist_ghosthit -20
+weight 20000
+name_pl Gaea's Shields of Earth
+client_type 260
+body_arm -1
 end
-Object robe2 
-name robe
-name_pl robes
-client_type 256
+Object bracers_gnarg
+name bracers
+face bracersdex.111
+type 104
+editor_folder gods/items
+msg
+An exceptional pair of bracers. Not only do
+  they provide the wearer with protection
+  from cold, they also increase the wearer's
+  damage and strength, and help heal the body
+  from damage. A mighty gift from Gnarg sent 
+  to aid you in annihilating His enemies.
+endmsg
 nrof 1
-type 16
-face robe2.111
-last_sp 12
-ac 1
-nrof 1
-weight 10000
-value 9
-material 128
-editable 1024
-body_torso -1
-editor_folder armour/mail
-end
-Object robe_midnight
-name Midnight Robe
-name_pl Midnight Robes
-client_type 250
-nrof 1
-type 16
-face robe_midnight.111
-animation robe_midnight
-speed 0.1
-ac 5
-Dex 1
-Int 2
-Pow 2
-resist_magic 30
-resist_fire 20
+title of strength of Wargs
+Str 2
+resist_physical 30
 resist_cold 20
-resist_drain 20
-resist_slow 20
-resist_paralyze 20
-resist_acid 75
-resist_ghosthit -100
-reflect_spell 1
-magic 5
-weight 5000
-value 100000
-material 128
-editable 5120
-body_torso -1
-item_power 25
-editor_folder armour/mail
+Dam 15
+hp 1
+value 65000
+weight 9000
+startequip 1
+name_pl bracers
+client_type 310
+body_wrist -2
 end
-Object scale_mail
+Object glovesofsun
+name Gloves of the Sun
+face glovesofsun.111
+type 100
+editor_folder gods/items
+msg
+This pair of gloves will aid any of Gaea's 
+  most faithful in seeing her will protected.
+endmsg
+name_pl Gloves of the Sun
+client_type 300
 nrof 1
-name scale mail
-name_pl scale mails
-client_type 253
-type 16
-face scale_mail.111
-last_sp 9
+animation glovesofsun
+speed 0.25
 material 8
+weight 900
+value 20000
+attacktype 5
+ac 1
+dam 2
+Dex 2
+wc 2
+magic 1
+startequip 1
+body_hand -2
+end
+Object helmet_gnarg
+name Gnarg's Orc Helmet
+face bighorn_he.111
+type 34
+editor_folder gods/items
+msg
+This helmet good protection. From mighty
+  Gnarg it is.
+endmsg
+name_pl Gnarg's Orc Helmets
+client_type 270
+Dex 1
 ac 3
+nrof 1
+startequip 1
 resist_physical 20
-weight 20000
-value 30
-editable 1024
-body_torso -1
-gen_sp_armour 10
-editor_folder armour/mail
+resist_poison 30
+weight 7000
+gen_sp_armour 1
+body_head -1
 end
-Object tunic
-name shirt
-name_pl shirts
-client_type 256
-nrof 1
-type 16
-face tunic.111
-last_sp 20
+Object horn_siren
+name horn
+face shellhorn1.111
+type 35
+editor_folder gods/items
+msg
+Putting this shell to your ear, you hear a
+  strange and haunting melody.
+endmsg
+title of the Sirens
+randomitems horn_siren
+level 40
+value 590
+weight 1500
+material 2
+hp 20
+maxhp 20
+speed 0.2
+name_pl horns
+startequip 1
+client_type 721
+body_range -1
+end
+Object pipe_lythander
+name Lythander's pipe
+face claypipe.111
+type 35
+editor_folder gods/items
+msg
+This pipe is the finest you have ever 
+    seen.  Imagine the smoke rings you 
+    could blow with it...
+endmsg
+name_pl Lythander's pipes
+randomitems pipe_lythander
+luck 1
+material 256
+hp 60
+level 35
+maxhp 60
+speed 0.1
+value 58
+weight 40
+name_pl horns
+client_type 721
+body_range -1
+startequip 1
+end
+Object horn_waves
+name horn
+face shellhorn2.111
+type 35
+editor_folder gods/items
+msg
+Putting this shell to your ear, you hear 
+  the crashing sound of ocean waves.
+endmsg
+title of Ocean Waves
+randomitems horn_waves
+level 30
+value 590
 weight 1000
-nrof 1
-value 3
-material 128
-editable 1024
-body_torso -1
-editor_folder armour/mail
+material 2
+hp 24
+maxhp 24
+speed 0.1
+name_pl horns
+client_type 721
+startequip 1
+body_range -1
 end
-Object wdsm
-name White Dragon Scale Mail
-name_pl White Dragon Scale Mails
-client_type 251
+Object burningtail
+name Burning Tail of many lashings of Ruggilli
+face burningtail.111
+type 15
+editor_folder gods/items
 nrof 1
-type 16
-face wdsm.111
-animation wdsm
+last_sp 8
+weapontype 6
+animation burningtail
 speed 0.1
-last_sp 13
-cursed 1
+material 256
+dam 40
+weight 10000
+value 75000
+magic 15
+resist_cold 25
+resist_fire 15
+attacktype 4101
 startequip 1
-no_steal 1
-ac 5
-resist_physical 45
-weight 5000
-value 220000
-resist_cold 30
-resist_fire 95
-magic -3
-editable 5120
-body_torso -1
-gen_sp_armour 9
-item_power 5
-editor_folder armour/mail
+name_pl Burning Tails of many lashings of Ruggilli
+client_type 100
+body_arm -1
+item_power 25
+glow_radius 3
+skill one handed weapons
 end
-Object DShield
-name Demonspawn Shield
-name_pl Demonspawn Shields
-client_type 260
+Object bow_lythander
+name Lythander's Elven Bow
+face elven_bow.111
+type 14
+editor_folder gods/items
+msg
+You look at this wonderful bow with
+  pride. It is only granted to the best
+  of Lythander's disciples.
+endmsg
+name_pl Lythander's Elven Bows
+client_type 150
+race arrows
+luck 1
+sp 70
+dam 30
+wc 3
 nrof 1
-type 33
-material 256
-materialname abyssium
-face DShield.111
-animation DShield
-speed 0.2
+startequip 1
+attacktype 1
+weight 8000
+magic 5
+body_arm -2
+skill missile weapons
+end
+Object gaea_general_info
+name message
+type 8
+editor_folder gods/elemental
 msg
-  There is a evil spirit in the shield.
+You are filled with a desire to slay all
+undead and unnatural creatures.
 endmsg
-Cha -3
-resist_fire 30
-resist_drain 100
-resist_ghosthit 70
-ac 3
-resist_physical 10
-weight 25000
-value 50000
-editable 5120
-body_arm -1
-item_power 5
-editor_folder armour/shield
+invisible 1
 ...
 
[truncated message content]