Menu
▾
▴
gridarta-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
| 2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
| 2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
| 2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
| 2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
| 2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
| 2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
|
From: <aki...@us...> - 2010-05-16 17:06:54
|
Revision: 7810
http://gridarta.svn.sourceforge.net/gridarta/?rev=7810&view=rev
Author: akirschbaum
Date: 2010-05-16 17:06:48 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Suppress some compiler warnings.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 16:19:17 UTC (rev 7809)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-16 17:06:48 UTC (rev 7810)
@@ -283,9 +283,11 @@
*/
private void updateActions() {
aSave.setEnabled(getSaveEnabled() != null);
+ //noinspection CallToSimpleGetterFromWithinClass
aSaveAs.setEnabled(getSaveAsEnabled() != null);
aCreateImage.setEnabled(getCreateImageEnabled() != null);
aRevert.setEnabled(getRevertEnabled() != null);
+ //noinspection CallToSimpleGetterFromWithinClass
aClose.setEnabled(getCloseEnabled() != null);
}
@@ -356,6 +358,7 @@
* Invoked when the user wants to save the map to a file.
*/
public void saveAs() {
+ //noinspection CallToSimpleGetterFromWithinClass
final MapControl<G, A, R> mapControl = getSaveAsEnabled();
if (mapControl != null) {
fileControl.saveAs(mapControl);
@@ -393,6 +396,7 @@
* Invoked when the user wants to close the map.
*/
public void close() {
+ //noinspection CallToSimpleGetterFromWithinClass
final MapView<G, A, R> mapView = getCloseEnabled();
if (mapView != null) {
mapViewsManager.closeMapView(mapView);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 16:19:23
|
Revision: 7809
http://gridarta.svn.sourceforge.net/gridarta/?rev=7809&view=rev
Author: akirschbaum
Date: 2010-05-16 16:19:17 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Improve UI of go location dialog.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/atrinik/ChangeLog 2010-05-16 16:19:17 UTC (rev 7809)
@@ -1,5 +1,8 @@
2010-05-16 Andreas Kirschbaum
+ * Improve UI of go location dialog: to go to coordinates (12,4)
+ press CTRL-L, enter 12, press ENTER, enter 4, press ENTER.
+
* Fix display issues when filtering the map view on mobs within
spawn points.
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/crossfire/ChangeLog 2010-05-16 16:19:17 UTC (rev 7809)
@@ -1,6 +1,9 @@
2010-05-16 Andreas Kirschbaum
- Implement #2385942 (Alert message on exit from unique maps): add
+ * Improve UI of go location dialog: to go to coordinates (12,4)
+ press CTRL-L, enter 12, press ENTER, enter 4, press ENTER.
+
+ * Implement #2385942 (Alert message on exit from unique maps): add
new map validator "Exit path is not absolute" that checks for
exits within 'unique' maps that reference non-absolute map paths.
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/daimonin/ChangeLog 2010-05-16 16:19:17 UTC (rev 7809)
@@ -1,5 +1,8 @@
2010-05-16 Andreas Kirschbaum
+ * Improve UI of go location dialog: to go to coordinates (12,4)
+ press CTRL-L, enter 12, press ENTER, enter 4, press ENTER.
+
* Fix display issues when filtering the map view on mobs within
spawn points.
Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 16:19:17 UTC (rev 7809)
@@ -29,17 +29,19 @@
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
-import javax.swing.JFormattedTextField;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JTextField;
import javax.swing.WindowConstants;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EtchedBorder;
import javax.swing.border.TitledBorder;
+import javax.swing.text.JTextComponent;
import net.sf.gridarta.gui.map.AbstractPerMapDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.utils.GUIConstants;
+import net.sf.gridarta.gui.utils.TextComponentUtils;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
@@ -81,13 +83,13 @@
* The text input field for the x coordinate.
*/
@NotNull
- private final JFormattedTextField xCoordinateField = new JFormattedTextField();
+ private final JTextField xCoordinateField = new JTextField();
/**
* The text input field for the y coordinate.
*/
@NotNull
- private final JFormattedTextField yCoordinateField = new JFormattedTextField();
+ private final JTextField yCoordinateField = new JTextField();
/**
* The {@link JButton} for ok.
@@ -122,6 +124,10 @@
this.mapView = mapView;
setMessage(createPanel());
+ TextComponentUtils.setAutoSelectOnFocus(xCoordinateField);
+ TextComponentUtils.setAutoSelectOnFocus(yCoordinateField);
+ TextComponentUtils.setActionNextFocus(xCoordinateField, yCoordinateField);
+
dialog = createDialog(mapView.getComponent(), ACTION_BUILDER.getString("goLocation.title"));
dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
dialog.getRootPane().setDefaultButton(okButton);
@@ -157,12 +163,12 @@
final Point point = mapView.getMapViewBasic().getMapCursor().getLocation();
coordinatesPanel.add(new JLabel(ACTION_BUILDER.getString("goLocationX")), gbcLabel);
- xCoordinateField.setValue(point == null ? 0 : point.x);
+ xCoordinateField.setText(point == null ? "0" : Integer.toString(point.x));
xCoordinateField.setColumns(3);
coordinatesPanel.add(xCoordinateField, gbcField);
coordinatesPanel.add(new JLabel(ACTION_BUILDER.getString("goLocationY")), gbcLabel);
- yCoordinateField.setValue(point == null ? 0 : point.y);
+ yCoordinateField.setText(point == null ? "0" : Integer.toString(point.y));
yCoordinateField.setColumns(3);
coordinatesPanel.add(yCoordinateField, gbcField);
@@ -224,10 +230,10 @@
* @return the coordinate value
* @throws IllegalArgumentException if the coordinate value is invalid
*/
- private int parseCoordinate(@NotNull final JFormattedTextField textField, final int range) {
+ private int parseCoordinate(@NotNull final JTextComponent textField, final int range) {
final int result;
try {
- result = (Integer) textField.getValue();
+ result = Integer.parseInt(textField.getText());
} catch (final NumberFormatException e) {
ACTION_BUILDER.showMessageDialog(this, "goLocationCoordinateNotANumber");
textField.requestFocus();
Added: trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java 2010-05-16 16:19:17 UTC (rev 7809)
@@ -0,0 +1,82 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.utils;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Utility class for {@link JTextComponent} related functions.
+ * @author Andreas Kirschbaum
+ */
+public class TextComponentUtils {
+
+ /**
+ * Private constructor to prevent instantiation.
+ */
+ private TextComponentUtils() {
+ }
+
+ /**
+ * Selects all text of a {@link JTextComponent} when the component gains the
+ * focus.
+ * @param textComponent the text component
+ */
+ public static void setAutoSelectOnFocus(@NotNull final JTextComponent textComponent) {
+ final FocusListener focusListener = new FocusListener() {
+
+ @Override
+ public void focusGained(@NotNull final FocusEvent e) {
+ textComponent.selectAll();
+ }
+
+ @Override
+ public void focusLost(@NotNull final FocusEvent e) {
+ // ignore
+ }
+
+ };
+ textComponent.addFocusListener(focusListener);
+ }
+
+ /**
+ * Transfers the focus to another component when ENTER is pressed.
+ * @param textField the text field to track
+ * @param nextComponent the component to transfer the focus to
+ */
+ public static void setActionNextFocus(@NotNull final JTextField textField, @NotNull final Component nextComponent) {
+ final ActionListener actionListener = new ActionListener() {
+
+ @Override
+ public void actionPerformed(@NotNull final ActionEvent e) {
+ nextComponent.requestFocusInWindow();
+ }
+
+ };
+ textField.addActionListener(actionListener);
+ }
+
+} // class TextComponentUtils
Property changes on: trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 15:49:14
|
Revision: 7808
http://gridarta.svn.sourceforge.net/gridarta/?rev=7808&view=rev
Author: akirschbaum
Date: 2010-05-16 15:49:08 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Convert field to local variable.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:48:20 UTC (rev 7807)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:49:08 UTC (rev 7808)
@@ -96,12 +96,6 @@
private final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "goLocationOkay", this));
/**
- * The {@link JButton} for apply.
- */
- @NotNull
- private final JButton applyButton = new JButton(ACTION_BUILDER.createAction(false, "goLocationApply", this));
-
- /**
* The {@link JButton} for cancel.
*/
@NotNull
@@ -122,6 +116,7 @@
this.goLocationDialogManager = goLocationDialogManager;
okButton.setDefaultCapable(true);
+ final JButton applyButton = new JButton(ACTION_BUILDER.createAction(false, "goLocationApply", this));
setOptions(new Object[] { okButton, applyButton, cancelButton });
this.mapView = mapView;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 15:48:26
|
Revision: 7807
http://gridarta.svn.sourceforge.net/gridarta/?rev=7807&view=rev
Author: akirschbaum
Date: 2010-05-16 15:48:20 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix incorrect @Nullable annotation.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:45:40 UTC (rev 7806)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:48:20 UTC (rev 7807)
@@ -47,7 +47,6 @@
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* A dialog to ask the user for coordinates to move the cursor to.
@@ -111,8 +110,8 @@
/**
* The {@link JDialog} instance.}
*/
- @Nullable
- private JDialog dialog = null;
+ @NotNull
+ private final JDialog dialog;
/**
* Creates a new instance.
@@ -267,7 +266,7 @@
* Returns the {@link Window} for this instance.
* @return the window
*/
- @Nullable
+ @NotNull
public Window getDialog() {
return dialog;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 15:45:46
|
Revision: 7806
http://gridarta.svn.sourceforge.net/gridarta/?rev=7806&view=rev
Author: akirschbaum
Date: 2010-05-16 15:45:40 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:42:06 UTC (rev 7805)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:45:40 UTC (rev 7806)
@@ -50,70 +50,73 @@
import org.jetbrains.annotations.Nullable;
/**
- * Dialog used to ask the user for coordinates to move the cursor to.
+ * A dialog to ask the user for coordinates to move the cursor to.
* @author Andreas Kirschbaum
*/
public class GoLocationDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JOptionPane {
/**
- * Serial Version UID.
+ * The serial Version UID.
*/
private static final long serialVersionUID = 1L;
/**
- * Action Builder.
+ * The {@link ActionBuilder}.
*/
@NotNull
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
/**
- * The manager for this dialog.
+ * The dialog manager for this dialog.
*/
@NotNull
private final AbstractPerMapDialogManager<G, A, R, GoLocationDialog<G, A, R>> goLocationDialogManager;
/**
- * The affected map view of this go location dialog.
+ * The affected map view this go location dialog affects.
*/
@NotNull
private final MapView<G, A, R> mapView;
/**
- * Textfield for the x coordinate.
+ * The text input field for the x coordinate.
*/
@NotNull
private final JFormattedTextField xCoordinateField = new JFormattedTextField();
/**
- * Textfield for the y coordinate.
+ * The text input field for the y coordinate.
*/
@NotNull
private final JFormattedTextField yCoordinateField = new JFormattedTextField();
/**
- * JButton for ok.
+ * The {@link JButton} for ok.
*/
@NotNull
private final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "goLocationOkay", this));
/**
- * JButton for apply.
+ * The {@link JButton} for apply.
*/
@NotNull
private final JButton applyButton = new JButton(ACTION_BUILDER.createAction(false, "goLocationApply", this));
/**
- * JButton for cancel.
+ * The {@link JButton} for cancel.
*/
@NotNull
private final JButton cancelButton = new JButton(ACTION_BUILDER.createAction(false, "goLocationCancel", this));
+ /**
+ * The {@link JDialog} instance.}
+ */
@Nullable
private JDialog dialog = null;
/**
- * Create a new instance.
- * @param goLocationDialogManager The manager for this dialog.
+ * Creates a new instance.
+ * @param goLocationDialogManager the dialog manager for this dialog
* @param mapView the map view to change the cursor
*/
public GoLocationDialog(@NotNull final AbstractPerMapDialogManager<G, A, R, GoLocationDialog<G, A, R>> goLocationDialogManager, @NotNull final MapView<G, A, R> mapView) {
@@ -135,7 +138,7 @@
}
/**
- * Create the GUI.
+ * Creates the GUI.
* @return the panel containing the GUI
*/
@NotNull
@@ -202,7 +205,7 @@
}
/**
- * Move the cursor to the given coordinates.
+ * Moves the cursor to the given coordinates.
* @return <code>true</code> if the cursor was moved, <code>false</code> if
* the coordinates were wrong
*/
@@ -220,10 +223,10 @@
}
/**
- * Parse a coordinate input field.
+ * Parses a coordinate input field.
* @param textField the input text field to parse
* @param range the coordinate value must be between 0 and
- * <code>coordinate-1</code>
+ * <code>range-1</code>
* @return the coordinate value
* @throws IllegalArgumentException if the coordinate value is invalid
*/
@@ -261,8 +264,8 @@
}
/**
- * Return the {@link Window} for this instance.
- * @return The <code>Widnow</code>.
+ * Returns the {@link Window} for this instance.
+ * @return the window
*/
@Nullable
public Window getDialog() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 15:42:12
|
Revision: 7805
http://gridarta.svn.sourceforge.net/gridarta/?rev=7805&view=rev
Author: akirschbaum
Date: 2010-05-16 15:42:06 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename variable name.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:40:33 UTC (rev 7804)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:42:06 UTC (rev 7805)
@@ -211,7 +211,7 @@
try {
point.x = parseCoordinate(xCoordinateField, mapView.getMapControl().getMapModel().getMapSize().getWidth());
point.y = parseCoordinate(yCoordinateField, mapView.getMapControl().getMapModel().getMapSize().getHeight());
- } catch (final IllegalArgumentException e) {
+ } catch (final IllegalArgumentException ignored) {
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 15:40:39
|
Revision: 7804
http://gridarta.svn.sourceforge.net/gridarta/?rev=7804&view=rev
Author: akirschbaum
Date: 2010-05-16 15:40:33 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add @ActionMethod annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:30:22 UTC (rev 7803)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2010-05-16 15:40:33 UTC (rev 7804)
@@ -45,6 +45,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -177,6 +178,7 @@
/**
* Action method for okay.
*/
+ @ActionMethod
public void goLocationOkay() {
if (goLocation()) {
setValue(okButton);
@@ -186,6 +188,7 @@
/**
* Action method for apply.
*/
+ @ActionMethod
public void goLocationApply() {
goLocation();
}
@@ -193,6 +196,7 @@
/**
* Action method for cancel.
*/
+ @ActionMethod
public void goLocationCancel() {
setValue(cancelButton);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 15:30:28
|
Revision: 7803
http://gridarta.svn.sourceforge.net/gridarta/?rev=7803&view=rev
Author: akirschbaum
Date: 2010-05-16 15:30:22 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add tip of the day for CTRL-ALT-E.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod_de.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod_de.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod_de.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod.properties 2010-05-16 11:25:23 UTC (rev 7802)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod.properties 2010-05-16 15:30:22 UTC (rev 7803)
@@ -55,3 +55,4 @@
tod.text.31=<html>You should stick to the default map size (24\xD724).<br>That map size is also best for the server.
tod.text.32=<html>Beware when editing large maps. You might run out of memory.<br>Be sure to increase the heap size (-Xmx parameter) of Gridarta''s Virtual Machine when editing large maps (e.g. 240\xD7240).
tod.text.33=<html>It''s amazing how much archetypes you could find using "Search archetype".<p>Menu: <code>Archetypes -> Find archetype</code>.
+tod.text.34=<html>You can quickly switch to the game object text editor with <code>CTRl-ALT-E</code>. Press these keys again to close it.
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod_de.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod_de.properties 2010-05-16 11:25:23 UTC (rev 7802)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/tod_de.properties 2010-05-16 15:30:22 UTC (rev 7803)
@@ -51,3 +51,4 @@
#tod.text.31=
tod.text.32=<html>Vorsicht beim Bearbeiten von gro\xDFen Karten: der Platz im Hauptspeicher k\xF6nnte nicht ausreichen.<br>Vergr\xF6\xDFern Sie die "heap size" (Parameter -Xmx beim Aufruf von java) von Gridarta, wenn Sie gro\xDFe Karten (bspw. 240\xD7240) bearbeiten m\xF6chten.
tod.text.33=<html>Es ist verbl\xFCffend, wie viele Archetypen man mit "Archetypen finden" entdecken kann.<p>Men\xFC: <code>Archetypen -> Archetypen finden</code>.
+tod.text.34=<html>Sie k\xF6nnen den Objekt-Editor \xFCber die Tastenkombination <code>CTRl-ALT-E</code> \xF6ffnen. Dieselbe Tastenkombination schlie\xDFt ihn wieder.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties 2010-05-16 11:25:23 UTC (rev 7802)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties 2010-05-16 15:30:22 UTC (rev 7803)
@@ -36,3 +36,4 @@
tod.text.12=<html>To attach a map to other maps, you must save it first.
tod.text.13=<html>Beware when editing large maps. You might run out of memory.<br>Be sure to increase the heap size (-Xmx parameter) of Gridarta''s Virtual Machine when editing large maps (e.g. 240\xD7240).
tod.text.14=<html>It''s amazing how much archetypes you could find using "Search archetype".<p>Menu: <code>Archetypes -> Find archetype</code>.
+tod.text.15=<html>You can quickly switch to the game object text editor with <code>CTRl-ALT-E</code>. Press these keys again to close it.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod_de.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod_de.properties 2010-05-16 11:25:23 UTC (rev 7802)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod_de.properties 2010-05-16 15:30:22 UTC (rev 7803)
@@ -36,3 +36,4 @@
tod.text.12=<html>Um eine Karte mit anderen Karten zu verbinden m\xFCssen Sie diese zuerst sichern.
tod.text.13=<html>Vorsicht beim Bearbeiten von gro\xDFen Karten: der Platz im Hauptspeicher k\xF6nnte nicht ausreichen.<br>Vergr\xF6\xDFern Sie die "heap size" (Parameter -Xmx beim Aufruf von java) von Gridarta, wenn Sie gro\xDFe Karten (bspw. 240\xD7240) bearbeiten m\xF6chten.
tod.text.14=<html>Es ist verbl\xFCffend, wie viele Archetypen man mit "Archetypen finden" entdecken kann.<p>Men\xFC: <code>Archetypen -> Archetypen finden</code>.
+tod.text.15=<html>Sie k\xF6nnen den Objekt-Editor \xFCber die Tastenkombination <code>CTRl-ALT-E</code> \xF6ffnen. Dieselbe Tastenkombination schlie\xDFt ihn wieder.
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod.properties 2010-05-16 11:25:23 UTC (rev 7802)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod.properties 2010-05-16 15:30:22 UTC (rev 7803)
@@ -55,3 +55,4 @@
tod.text.31=<html>You should stick to the default map size (24\xD724).<br>That map size is also best for the server.
tod.text.32=<html>Beware when editing large maps. You might run out of memory.<br>Be sure to increase the heap size (-Xmx parameter) of Gridarta''s Virtual Machine when editing large maps (e.g. 240\xD7240).
tod.text.33=<html>It''s amazing how much archetypes you could find using "Search archetype".<p>Menu: <code>Archetypes -> Find archetype</code>.
+tod.text.34=<html>You can quickly switch to the game object text editor with <code>CTRl-ALT-E</code>. Press these keys again to close it.
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod_de.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod_de.properties 2010-05-16 11:25:23 UTC (rev 7802)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/tod_de.properties 2010-05-16 15:30:22 UTC (rev 7803)
@@ -51,3 +51,4 @@
#tod.text.31=
tod.text.32=<html>Vorsicht beim Bearbeiten von gro\xDFen Karten: der Platz im Hauptspeicher k\xF6nnte nicht ausreichen.<br>Vergr\xF6\xDFern Sie die "heap size" (Parameter -Xmx beim Aufruf von java) von Gridarta, wenn Sie gro\xDFe Karten (bspw. 240\xD7240) bearbeiten m\xF6chten.
tod.text.33=<html>Es ist verbl\xFCffend, wie viele Archetypen man mit "Archetypen finden" entdecken kann.<p>Men\xFC: <code>Archetypen -> Archetypen finden</code>.
+tod.text.34=<html>Sie k\xF6nnen den Objekt-Editor \xFCber die Tastenkombination <code>CTRl-ALT-E</code> \xF6ffnen. Dieselbe Tastenkombination schlie\xDFt ihn wieder.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 11:25:30
|
Revision: 7802
http://gridarta.svn.sourceforge.net/gridarta/?rev=7802&view=rev
Author: akirschbaum
Date: 2010-05-16 11:25:23 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Implement #2385942 (Alert message on exit from unique maps).
Modified Paths:
--------------
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
trunk/src/doc/ref/GameObjectMatcher.xhtml
Added Paths:
-----------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/NonAbsoluteExitPathError.java
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/crossfire/ChangeLog 2010-05-16 11:25:23 UTC (rev 7802)
@@ -1,5 +1,9 @@
2010-05-16 Andreas Kirschbaum
+ Implement #2385942 (Alert message on exit from unique maps): add
+ new map validator "Exit path is not absolute" that checks for
+ exits within 'unique' maps that reference non-absolute map paths.
+
* Collect resources.
2010-05-14 Andreas Kirschbaum
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-05-16 11:25:23 UTC (rev 7802)
@@ -125,6 +125,7 @@
import net.sf.gridarta.var.crossfire.model.settings.DefaultGlobalSettings;
import net.sf.gridarta.var.crossfire.model.smoothface.SmoothFaces;
import net.sf.gridarta.var.crossfire.resource.DefaultResources;
+import net.sf.gridarta.var.crossfire.validation.checks.NonAbsoluteExitPathChecker;
import net.sf.japi.swing.prefs.PreferencesGroup;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
@@ -281,6 +282,10 @@
final UnsetSlayingChecker<GameObject, MapArchObject, Archetype> unsetSlayingChecker = new UnsetSlayingChecker<GameObject, MapArchObject, Archetype>(Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER);
unsetSlayingChecker.addAllowedValue("player");
mapValidators.addValidators(attributeRangeChecker, new ConnectedInsideContainerChecker<GameObject, MapArchObject, Archetype>(), new ConnectedPickableChecker<GameObject, MapArchObject, Archetype>(), customTypeChecker, new ExitChecker<GameObject, MapArchObject, Archetype>(globalSettings, Archetype.TYPE_EXIT), new MapDifficultyChecker<GameObject, MapArchObject, Archetype>(), new TilePathsChecker<GameObject, MapArchObject, Archetype>(globalSettings, 4), new UndefinedFaceChecker<GameObject, MapArchObject, Archetype>(), new UndefinedArchetypeChecker<GameObject, MapArchObject, Archetype>(), unsetSlayingChecker);
+ final GameObjectMatcher exitMatcher = gameObjectMatchers.getMatcherWarn(errorViewCollector, "system_exit");
+ if (exitMatcher != null) {
+ mapValidators.addValidator(new NonAbsoluteExitPathChecker(exitMatcher));
+ }
}
/**
Added: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java (rev 0)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java 2010-05-16 11:25:23 UTC (rev 7802)
@@ -0,0 +1,92 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.var.crossfire.validation.checks;
+
+import net.sf.gridarta.gui.map.mapactions.MapLocation;
+import net.sf.gridarta.gui.map.mapactions.NoExitPathException;
+import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.map.mapmodel.MapSquare;
+import net.sf.gridarta.model.map.validation.ErrorCollector;
+import net.sf.gridarta.model.match.GameObjectMatcher;
+import net.sf.gridarta.validation.AbstractValidator;
+import net.sf.gridarta.validation.GameObjectValidator;
+import net.sf.gridarta.validation.MapValidator;
+import net.sf.gridarta.validation.checks.NonAbsoluteExitPathError;
+import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
+import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
+import net.sf.gridarta.var.crossfire.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link MapValidator} that checks for relative exit paths within unique
+ * maps. Such paths do not work reliably in Crossfire and Atrinik.
+ * @author Andreas Kirschbaum
+ */
+public class NonAbsoluteExitPathChecker extends AbstractValidator implements GameObjectValidator<GameObject, MapArchObject, Archetype> {
+
+ /**
+ * The {@link GameObjectMatcher} for matching exit objects.
+ */
+ @NotNull
+ private final GameObjectMatcher exitGameObjectMatcher;
+
+ /**
+ * Creates a new instance.
+ * @param exitGameObjectMatcher the game object matcher for matching exit
+ * objects
+ */
+ public NonAbsoluteExitPathChecker(@NotNull final GameObjectMatcher exitGameObjectMatcher) {
+ this.exitGameObjectMatcher = exitGameObjectMatcher;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void validateGameObject(@NotNull final GameObject gameObject, @NotNull final ErrorCollector<GameObject, MapArchObject, Archetype> errorCollector) {
+ if (!exitGameObjectMatcher.isMatching(gameObject)) {
+ return; // not an exit => skip
+ }
+
+ final MapSquare<GameObject, MapArchObject, Archetype> mapSquare = gameObject.getMapSquare();
+ if (mapSquare == null) {
+ return; // not on a map => skip
+ }
+
+ final MapModel<GameObject, MapArchObject, Archetype> mapModel = mapSquare.getMapModel();
+ final MapArchObject mapArchObject = mapModel.getMapArchObject();
+ if (!mapArchObject.isUnique()) {
+ return; // not o a unique map => skip
+ }
+
+ final String exitPath;
+ try {
+ exitPath = MapLocation.getMapPath(gameObject, true);
+ } catch (final NoExitPathException ignored) {
+ return; // unset exit path => skip
+ }
+ if (exitPath.isEmpty() || exitPath.startsWith("/")) {
+ return; // unset exit path or absolute exit path => ok
+ }
+
+ errorCollector.collect(new NonAbsoluteExitPathError<GameObject, MapArchObject, Archetype>(gameObject, exitPath));
+ }
+
+} // class NonAbsoluteExitPathChecker
Property changes on: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java 2010-05-16 11:25:23 UTC (rev 7802)
@@ -122,7 +122,7 @@
* @return the exit map path
* @throws NoExitPathException if the game object is not a valid exit
*/
- private static String getMapPath(@NotNull final BaseObject<?, ?, ?, ?> gameObject, final boolean allowRandomMapParameters) throws NoExitPathException {
+ public static String getMapPath(@NotNull final BaseObject<?, ?, ?, ?> gameObject, final boolean allowRandomMapParameters) throws NoExitPathException {
String path = gameObject.getAttributeString("slaying");
if (allowRandomMapParameters && path.equals("/!")) {
// destination is a random map; extract the final non-random map
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-16 11:25:23 UTC (rev 7802)
@@ -946,6 +946,7 @@
prefs.Validator.Exit=Whether this map validator check is is enabled.
prefs.Validator.MapDifficulty=Whether this map validator check is is enabled.
prefs.Validator.MobOutsideSpawnPoint=Whether this map validator check is is enabled.
+prefs.Validator.NonAbsoluteExitPath=Whether this map validator check is is enabled.
prefs.Validator.PaidItemShopSquare=Whether this map validator check is is enabled.
prefs.Validator.ShopSquare=Whether this map validator check is is enabled.
prefs.Validator.Slaying=Whether this map validator check is is enabled.
@@ -1111,6 +1112,10 @@
Validator.MobOutsideSpawnPoint.title=Mob outside spawn point
Validator.MobOutsideSpawnPoint.msg=<html><h3>{0}</h3><p>On this square there is a mob outside a spawn point.<br>Mobs outside spawn points are okay, but you should perhaps still put the mob inside a spawn point.</p><p>You could:</p><ul><li>Ignore this</li><li>Create a spawn point for this mob</li></ul>
+Validator.NonAbsoluteExitPath.default=true
+Validator.NonAbsoluteExitPath.title=Exit path is not absolute
+Validator.NonAbsoluteExitPath.msg=<html><h3>{0}</h3><p><p>On this square there is an exit which defines an exit path to ''{4}'' that is not absolute.</p><p>Within <em>unique</em> maps exit paths must be absolute (that is, starting with a / character) as relative paths cannot be handled by the server.</p>
+
Validator.PaidItemShopSquare.default=true
Validator.PaidItemShopSquare.title=Shop square contains paid item
Validator.PaidItemShopSquare.msg=<html><h3>{0}</h3><p>On this square there is a shop square which contains a paid item. Usually items on shop squares should be unpaid by default.
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-16 11:25:23 UTC (rev 7802)
@@ -953,6 +953,9 @@
Validator.MobOutsideSpawnPoint.title=Mob au\xDFerhalb Spawn Point
Validator.MobOutsideSpawnPoint.msg=<html><h3>{0}</h3><p>Dieses Feld beinhaltete einen Mob au\xDFerhalb eines Spawn Points.<br>Dies ist erlaubt, aber Sie sollten den Mobs trotzdem in einen Spawn Point einf\xFCgen.</p><p>Sie k\xF6nnen:</p><ul><li>Dieses Problem ignorieren</li><li>Einen Spawn Point f\xFCr diesen Mob erzeugen</li></ul>
+Validator.NonAbsoluteExitPath.title=Kartenpfad ist nicht absolut
+Validator.NonAbsoluteExitPath.msg=<html><h3>{0}</h3><p>Dieses Feld enth\xE4lt einen Ausgang, der auf den Kartenpfad ''{4}'' zeigt. Diese Pfad ist nicht absolut (d.h. er beginnt nicht mit /).</p><p>In Karten, die als ''<em>unique</em>'' gekennzeichnet sind, d\xFCrfen nur absolute Kartenpfade verwendet werden; relative Kartenpfade werden vom Server nicht unterst\xFCtzt.</p>
+
Validator.PaidItemShopSquare.title=Gesch\xE4ftsfl\xE4che mit bezahltem Gegenstand
Validator.PaidItemShopSquare.msg=<html><h3>{0}</h3><p>Dieses Feld ist eine Gesch\xE4ftsfl\xE4che und enth\xE4lt einen bereits bezahlten Gegenstand. In der Regel sollten diese Gegenst\xE4nde unbezahlt sein.
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-16 11:25:23 UTC (rev 7802)
@@ -946,6 +946,9 @@
#Validator.MobOutsideSpawnPoint.title=
#Validator.MobOutsideSpawnPoint.msg=
+#Validator.NonAbsoluteExitPath.title=
+#Validator.NonAbsoluteExitPath.msg=
+
#Validator.PaidItemShopSquare.title=
#Validator.PaidItemShopSquare.msg=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-16 11:25:23 UTC (rev 7802)
@@ -950,6 +950,9 @@
#Validator.MapDifficulty.title=
#Validator.MapDifficulty.msg=
+#Validator.NonAbsoluteExitPath.title=
+#Validator.NonAbsoluteExitPath.msg=
+
#Validator.PaidItemShopSquare.title=
#Validator.PaidItemShopSquare.msg=
Added: trunk/src/app/net/sf/gridarta/validation/checks/NonAbsoluteExitPathError.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/NonAbsoluteExitPathError.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/validation/checks/NonAbsoluteExitPathError.java 2010-05-16 11:25:23 UTC (rev 7802)
@@ -0,0 +1,72 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.validation.checks;
+
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.validation.errors.GameObjectValidationError;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A {@link GameObjectValidationError} that describes an exit {@link GameObject}
+ * having an invalid exit path.
+ * @author Andreas Kirschbaum
+ */
+public class NonAbsoluteExitPathError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends GameObjectValidationError<G, A, R> {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * The incorrect exit path.
+ */
+ @NotNull
+ private final String exitPath;
+
+ /**
+ * Creates a new instance.
+ * @param gameObject the game object having an incorrect exit path
+ * @param exitPath the incorrect exit path
+ */
+ public NonAbsoluteExitPathError(@NotNull final G gameObject, @NotNull final String exitPath) {
+ super(gameObject);
+ this.exitPath = exitPath;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Nullable
+ @Override
+ public String getParameter(final int id) {
+ switch (id) {
+ case 0:
+ return exitPath;
+
+ default:
+ return super.getParameter(id);
+ }
+ }
+
+} // class NonAbsoluteExitPathError
Property changes on: trunk/src/app/net/sf/gridarta/validation/checks/NonAbsoluteExitPathError.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/doc/ref/GameObjectMatcher.xhtml
===================================================================
--- trunk/src/doc/ref/GameObjectMatcher.xhtml 2010-05-16 10:26:09 UTC (rev 7801)
+++ trunk/src/doc/ref/GameObjectMatcher.xhtml 2010-05-16 11:25:23 UTC (rev 7802)
@@ -91,6 +91,11 @@
'system_monster'; no check is performed if the matcher
does not exist.
</li>
+ <li>Checks objects matching the 'system_exit' matcher for
+ "slaying" values which are not absolute
+ paths; no check is performed if the matcher does not
+ exist.
+ </li>
</ul>
</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 10:26:16
|
Revision: 7801
http://gridarta.svn.sourceforge.net/gridarta/?rev=7801&view=rev
Author: akirschbaum
Date: 2010-05-16 10:26:09 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove DelegatingMapValidator.validateSquares().
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
Modified: trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java 2010-05-16 10:13:15 UTC (rev 7800)
+++ trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java 2010-05-16 10:26:09 UTC (rev 7801)
@@ -110,17 +110,6 @@
}
/**
- * Validate a set of map squares.
- * @param mapSquares MapSquares to validate
- * @param errorCollector Error collector to report errors to
- */
- public void validateSquares(@NotNull final MapSquare<G, A, R>[] mapSquares, @NotNull final ErrorCollector<G, A, R> errorCollector) {
- for (final MapSquare<G, A, R> mapSquare : mapSquares) {
- validateSquare(mapSquare, errorCollector);
- }
- }
-
- /**
* {@inheritDoc}
*/
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 10:13:22
|
Revision: 7800
http://gridarta.svn.sourceforge.net/gridarta/?rev=7800&view=rev
Author: akirschbaum
Date: 2010-05-16 10:13:15 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename method names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
trunk/src/app/net/sf/gridarta/validation/GameObjectValidator.java
trunk/src/app/net/sf/gridarta/validation/MapValidator.java
trunk/src/app/net/sf/gridarta/validation/SquareValidator.java
trunk/src/app/net/sf/gridarta/validation/checks/AttributeRangeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedMobOrSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectedInsideContainerChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectedPickableChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectionChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/CustomTypeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/DoubleLayerChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/DoubleTypeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/EmptySpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ExitChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/MapDifficultyChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/MobOutsideSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/PaidItemShopSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ShopSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/SlayingChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/SquareWithoutFloorChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/SysObjectNotOnLayerZeroChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/TilePathsChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/UndefinedArchetypeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/UndefinedFaceChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/UnsetSlayingChecker.java
Modified: trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -70,13 +70,13 @@
*/
public void validateAll(@NotNull final MapModel<G, A, R> mapModel) {
final ErrorCollector<G, A, R> errorCollector = new DefaultErrorCollector<G, A, R>();
- validate(mapModel, errorCollector);
+ validateMap(mapModel, errorCollector);
for (final MapSquare<G, A, R> mapSquare : mapModel) {
- validate(mapSquare, errorCollector);
+ validateSquare(mapSquare, errorCollector);
for (final G archObject : mapSquare) {
- validate(archObject, errorCollector);
+ validateGameObject(archObject, errorCollector);
for (final G invObject : archObject.recursive()) {
- validate(invObject, errorCollector);
+ validateGameObject(invObject, errorCollector);
}
}
}
@@ -87,11 +87,11 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final Validator validator : validators) {
if (validator.isEnabled()) {
if (validator instanceof MapValidator) {
- ((MapValidator<G, A, R>) validator).validate(mapModel, errorCollector);
+ ((MapValidator<G, A, R>) validator).validateMap(mapModel, errorCollector);
}
}
}
@@ -101,10 +101,10 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateSquare(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final Validator validator : validators) {
if (validator.isEnabled() && validator instanceof SquareValidator) {
- ((SquareValidator<G, A, R>) validator).validate(mapSquare, errorCollector);
+ ((SquareValidator<G, A, R>) validator).validateSquare(mapSquare, errorCollector);
}
}
}
@@ -114,9 +114,9 @@
* @param mapSquares MapSquares to validate
* @param errorCollector Error collector to report errors to
*/
- public void validate(@NotNull final MapSquare<G, A, R>[] mapSquares, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateSquares(@NotNull final MapSquare<G, A, R>[] mapSquares, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final MapSquare<G, A, R> mapSquare : mapSquares) {
- validate(mapSquare, errorCollector);
+ validateSquare(mapSquare, errorCollector);
}
}
@@ -124,10 +124,10 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final Validator validator : validators) {
if (validator.isEnabled() && validator instanceof GameObjectValidator) {
- ((GameObjectValidator<G, A, R>) validator).validate(gameObject, errorCollector);
+ ((GameObjectValidator<G, A, R>) validator).validateGameObject(gameObject, errorCollector);
}
}
}
@@ -139,7 +139,7 @@
*/
public void validate(@NotNull final G[] gameObjects, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final G gameObject : gameObjects) {
- validate(gameObject, errorCollector);
+ validateGameObject(gameObject, errorCollector);
}
}
Modified: trunk/src/app/net/sf/gridarta/validation/GameObjectValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/GameObjectValidator.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/GameObjectValidator.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -37,6 +37,6 @@
* @param gameObject GameObject to validate
* @param errorCollector Error collector to report errors to
*/
- void validate(@NotNull G gameObject, @NotNull ErrorCollector<G, A, R> errorCollector);
+ void validateGameObject(@NotNull G gameObject, @NotNull ErrorCollector<G, A, R> errorCollector);
} // interface GameObjectValidator
Modified: trunk/src/app/net/sf/gridarta/validation/MapValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/MapValidator.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/MapValidator.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -38,6 +38,6 @@
* @param mapModel Map to validate
* @param errorCollector Error collector to report errors to
*/
- void validate(@NotNull MapModel<G, A, R> mapModel, @NotNull ErrorCollector<G, A, R> errorCollector);
+ void validateMap(@NotNull MapModel<G, A, R> mapModel, @NotNull ErrorCollector<G, A, R> errorCollector);
} // interface MapValidator
Modified: trunk/src/app/net/sf/gridarta/validation/SquareValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/SquareValidator.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/SquareValidator.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -38,6 +38,6 @@
* @param mapSquare Square to validate
* @param errorCollector Error collector to report errors to
*/
- void validate(@NotNull MapSquare<G, A, R> mapSquare, @NotNull ErrorCollector<G, A, R> errorCollector);
+ void validateSquare(@NotNull MapSquare<G, A, R> mapSquare, @NotNull ErrorCollector<G, A, R> errorCollector);
} // interface SquareValidator
Modified: trunk/src/app/net/sf/gridarta/validation/checks/AttributeRangeChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/AttributeRangeChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/AttributeRangeChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -115,7 +115,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (!gameObject.isHead()) {
return;
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/BlockedMobOrSpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/BlockedMobOrSpawnPointChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/BlockedMobOrSpawnPointChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -71,7 +71,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateSquare(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final G gameObject : mapSquare) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
mobsOrSpawnPoints.add(gameObject);
Modified: trunk/src/app/net/sf/gridarta/validation/checks/BlockedSpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/BlockedSpawnPointChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/BlockedSpawnPointChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -76,7 +76,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final BlockedMatrix<G, A, R> blocked = new BlockedMatrix<G, A, R>(mapModel);
checkSpawnPoints(mapModel, blocked, errorCollector);
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/BlockedSquareChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/BlockedSquareChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/BlockedSquareChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -47,7 +47,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
for (final MapSquare<G, A, R> completelyBlockedSquare : findCompletelyBlockedSquares(mapModel)) {
errorCollector.collect(new BlockedSquareError<G, A, R>(completelyBlockedSquare));
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/ConnectedInsideContainerChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/ConnectedInsideContainerChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/ConnectedInsideContainerChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -39,7 +39,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final CharSequence connection = gameObject.getAttributeString("connected", true);
final boolean connected = connection.length() > 0;
if (connected && gameObject.isInContainer()) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/ConnectedPickableChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/ConnectedPickableChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/ConnectedPickableChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -38,7 +38,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final boolean pickable = gameObject.getAttributeInt("no_pick", true) == 0;
final CharSequence connection = gameObject.getAttributeString("connected", true);
final boolean connected = connection.length() > 0;
Modified: trunk/src/app/net/sf/gridarta/validation/checks/ConnectionChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/ConnectionChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/ConnectionChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -79,7 +79,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final Map<Integer, Rec> info = new HashMap<Integer, Rec>();
for (final Iterable<G> mapSquare : mapModel) {
for (final G gameObject : mapSquare) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/CustomTypeChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/CustomTypeChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/CustomTypeChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -49,7 +49,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final int archetypeTypeNo = gameObject.getArchetype().getTypeNo();
final int gameObjectTypeNo = gameObject.getTypeNo();
if (gameObjectTypeNo != archetypeTypeNo && !isAllowedTypeChange(gameObject, archetypeTypeNo, gameObjectTypeNo)) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/DoubleLayerChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/DoubleLayerChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/DoubleLayerChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -43,7 +43,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateSquare(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final Map<Integer, Object> layers = new HashMap<Integer, Object>();
for (final G archObject : mapSquare) {
final int layer = archObject.getAttributeInt("layer", true);
Modified: trunk/src/app/net/sf/gridarta/validation/checks/DoubleTypeChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/DoubleTypeChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/DoubleTypeChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -42,7 +42,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateSquare(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final Map<Integer, G> gameObjects = new HashMap<Integer, G>();
final Map<Integer, DoubleTypeError<G, A, R>> errors = new HashMap<Integer, DoubleTypeError<G, A, R>>();
for (final G gameObject : mapSquare) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/EmptySpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/EmptySpawnPointChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/EmptySpawnPointChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -55,7 +55,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
if (gameObject.isEmpty()) {
errorCollector.collect(new EmptySpawnPointError<G, A, R>(gameObject));
Modified: trunk/src/app/net/sf/gridarta/validation/checks/ExitChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/ExitChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/ExitChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -61,7 +61,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (gameObject.getTypeNo() != exitTypeNo) {
return;
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/MapDifficultyChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/MapDifficultyChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/MapDifficultyChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -39,7 +39,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final MapArchObject<A> mapArch = mapModel.getMapArchObject();
final int difficulty = mapArch.getDifficulty();
if (difficulty < 1) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/MobOutsideSpawnPointChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/MobOutsideSpawnPointChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/MobOutsideSpawnPointChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -55,7 +55,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
errorCollector.collect(new MobOutsideSpawnPointError<G, A, R>(gameObject));
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/PaidItemShopSquareChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/PaidItemShopSquareChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/PaidItemShopSquareChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -62,7 +62,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final boolean[][] shopSquares = findMatchingSquares(mapModel, shopMatcher);
final boolean[][] noSpellsSquares = findMatchingSquares(mapModel, paidItemMatcher);
final Point point = new Point();
Modified: trunk/src/app/net/sf/gridarta/validation/checks/ShopSquareChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/ShopSquareChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/ShopSquareChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -63,7 +63,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final boolean[][] shopSquares = findMatchingSquares(mapModel, shopMatcher);
final boolean[][] noSpellsSquares = findMatchingSquares(mapModel, noSpellsMatcher);
final Point point = new Point();
Modified: trunk/src/app/net/sf/gridarta/validation/checks/SlayingChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/SlayingChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/SlayingChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -74,7 +74,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
boolean useDefaultRegex = true;
for (final Entry<G, A, R> entry : entries) {
if (entry.validate(gameObject, errorCollector)) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/SquareWithoutFloorChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/SquareWithoutFloorChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/SquareWithoutFloorChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -57,7 +57,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateSquare(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final ErrorCollector<G, A, R> errorCollector) {
boolean floorFound = false;
for (final BaseObject<G, A, R, ?> gameObject : mapSquare) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/SysObjectNotOnLayerZeroChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/SysObjectNotOnLayerZeroChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/SysObjectNotOnLayerZeroChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -38,7 +38,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (gameObject.getAttributeInt("sys_object", true) == 1 && gameObject.getAttributeInt("layer", true) != 0) {
errorCollector.collect(new SysObjectNotOnLayerZeroError<G, A, R>(gameObject));
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/TilePathsChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/TilePathsChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/TilePathsChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -63,7 +63,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateMap(@NotNull final MapModel<G, A, R> mapModel, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final File mapFile = mapModel.getMapFile();
final String mapDir = mapFile == null ? null : mapFile.getParent();
for (int direction = 0; direction < tilePaths; direction++) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/UndefinedArchetypeChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/UndefinedArchetypeChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/UndefinedArchetypeChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -38,7 +38,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (gameObject.hasUndefinedArchetype()) {
errorCollector.collect(new UndefinedArchetypeError<G, A, R>(gameObject));
}
Modified: trunk/src/app/net/sf/gridarta/validation/checks/UndefinedFaceChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/UndefinedFaceChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/UndefinedFaceChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -40,7 +40,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (gameObject.getFaceObjSource() == FaceSource.FACE_NOT_FOUND) {
final String animName = gameObject.getAnimName();
if (animName != null && !animName.equals("NONE")) {
Modified: trunk/src/app/net/sf/gridarta/validation/checks/UnsetSlayingChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/UnsetSlayingChecker.java 2010-05-16 10:08:31 UTC (rev 7799)
+++ trunk/src/app/net/sf/gridarta/validation/checks/UnsetSlayingChecker.java 2010-05-16 10:13:15 UTC (rev 7800)
@@ -70,7 +70,7 @@
* {@inheritDoc}
*/
@Override
- public void validate(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
+ public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
final String slayingArchetype = gameObject.getArchetype().getAttributeString("slaying");
if (!allowedValues.contains(slayingArchetype)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 10:08:38
|
Revision: 7799
http://gridarta.svn.sourceforge.net/gridarta/?rev=7799&view=rev
Author: akirschbaum
Date: 2010-05-16 10:08:31 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add assert statements.
Modified Paths:
--------------
trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java
Modified: trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java 2010-05-16 10:07:55 UTC (rev 7798)
+++ trunk/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java 2010-05-16 10:08:31 UTC (rev 7799)
@@ -57,9 +57,13 @@
* Test case for {@link AbstractValidator#setEnabled(boolean)}.
*/
public void testEnabled() {
+ assert oUT != null;
oUT.setEnabled(false);
+ assert oUT != null;
assertFalse(oUT.isEnabled());
+ assert oUT != null;
oUT.setEnabled(true);
+ assert oUT != null;
assertTrue(oUT.isEnabled());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 10:08:02
|
Revision: 7798
http://gridarta.svn.sourceforge.net/gridarta/?rev=7798&view=rev
Author: akirschbaum
Date: 2010-05-16 10:07:55 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove DelegatingMapValidator.getAllValidators().
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
Modified: trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java 2010-05-16 10:02:03 UTC (rev 7797)
+++ trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java 2010-05-16 10:07:55 UTC (rev 7798)
@@ -165,15 +165,6 @@
}
/**
- * Get all Validators.
- * @return all validators
- */
- @NotNull
- public Validator[] getAllValidators() {
- return validators.toArray(new Validator[validators.size()]);
- }
-
- /**
* {@inheritDoc}
*/
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 10:02:09
|
Revision: 7797
http://gridarta.svn.sourceforge.net/gridarta/?rev=7797&view=rev
Author: akirschbaum
Date: 2010-05-16 10:02:03 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove TestFilterControl.
Removed Paths:
-------------
trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java
Deleted: trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java 2010-05-16 10:00:47 UTC (rev 7796)
+++ trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java 2010-05-16 10:02:03 UTC (rev 7797)
@@ -1,108 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2010 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.filter;
-
-import javax.swing.JMenu;
-import net.sf.gridarta.model.archetype.TestArchetype;
-import net.sf.gridarta.model.filter.Filter;
-import net.sf.gridarta.model.filter.FilterConfigListener;
-import net.sf.gridarta.model.gameobject.TestGameObject;
-import net.sf.gridarta.model.map.maparchobject.TestMapArchObject;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A {@link FilterControl} implementation for testing purposes.
- * @author Andreas Kirschbaum
- */
-public class TestFilterControl implements FilterControl<TestGameObject, TestMapArchObject, TestArchetype> {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addConfigListener(@NotNull final FilterConfigListener listener) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeConfigListener(@NotNull final FilterConfigListener listener) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void createMenuEntries(@NotNull final JMenu menu) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void newSquare(@NotNull final FilterState filterState) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isHighlightedSquare(@NotNull final FilterState filterState, final int path) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void objectInSquare(@NotNull final FilterState filterState, @NotNull final TestGameObject gameObject) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean canShow(@NotNull final TestGameObject gameObject) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addFilter(@NotNull final String name, @NotNull final Filter<?, ?> filter) {
- throw new AssertionError();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeFilter(@NotNull final String name) {
- throw new AssertionError();
- }
-
-} // class TestFilterControl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 10:00:53
|
Revision: 7796
http://gridarta.svn.sourceforge.net/gridarta/?rev=7796&view=rev
Author: akirschbaum
Date: 2010-05-16 10:00:47 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Add @NotNull annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/filter/DefaultFilterControl.java
trunk/src/app/net/sf/gridarta/gui/filter/FilterControl.java
trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/filter/DefaultFilterControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/filter/DefaultFilterControl.java 2010-05-16 09:58:55 UTC (rev 7795)
+++ trunk/src/app/net/sf/gridarta/gui/filter/DefaultFilterControl.java 2010-05-16 10:00:47 UTC (rev 7796)
@@ -50,17 +50,22 @@
//TODO allow implementation of own filter
public class DefaultFilterControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements FilterControl<G, A, R> {
+ @NotNull
private final NamedFilter filterList;
+ @NotNull
private final NamedFilterConfig filterOutConfig;
+ @NotNull
private final NamedFilterConfig[] highlightConfig;
/**
* The {@link FilterConfigListener}s to notify.
*/
+ @NotNull
private final EventListenerList2<FilterConfigListener> configListeners = new EventListenerList2<FilterConfigListener>(FilterConfigListener.class);
+ @NotNull
private final FilterConfigListener filterConfigListener = new FilterConfigListener() {
/** {@inheritDoc} */
@@ -78,7 +83,7 @@
* filterOut anything
* @param filterList the filter list instance to use
*/
- public DefaultFilterControl(final NamedFilter filterList) {
+ public DefaultFilterControl(@NotNull final NamedFilter filterList) {
this.filterList = filterList;
filterOutConfig = filterList.createConfig();
highlightConfig = new NamedFilterConfig[MAX_HIGHLIGHT];
@@ -111,7 +116,7 @@
* {@inheritDoc}
*/
@Override
- public void createMenuEntries(final JMenu menu) {
+ public void createMenuEntries(@NotNull final JMenu menu) {
final JMenuItem menuItem = new MenuItemCreator(filterOutConfig).getMenuItem();
menuItem.setText("Filter view");
menu.add(menuItem);
@@ -162,7 +167,7 @@
* {@inheritDoc}
*/
@Override
- public boolean canShow(final G gameObject) {
+ public boolean canShow(@NotNull final G gameObject) {
return !filterOutConfig.isEnabled() || filterList.canShow(gameObject, filterOutConfig);
}
@@ -170,7 +175,7 @@
* {@inheritDoc}
*/
@Override
- public void addFilter(final String name, final Filter<?, ?> filter) {
+ public void addFilter(@NotNull final String name, @NotNull final Filter<?, ?> filter) {
filterList.addFilter(name, filter);
}
@@ -178,7 +183,7 @@
* {@inheritDoc}
*/
@Override
- public void removeFilter(final String name) {
+ public void removeFilter(@NotNull final String name) {
filterList.removeFilter(name);
}
Modified: trunk/src/app/net/sf/gridarta/gui/filter/FilterControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/filter/FilterControl.java 2010-05-16 09:58:55 UTC (rev 7795)
+++ trunk/src/app/net/sf/gridarta/gui/filter/FilterControl.java 2010-05-16 10:00:47 UTC (rev 7796)
@@ -46,7 +46,7 @@
*/
void removeConfigListener(@NotNull FilterConfigListener listener);
- void createMenuEntries(JMenu menu);
+ void createMenuEntries(@NotNull JMenu menu);
void newSquare(@NotNull FilterState filterState);
@@ -54,10 +54,10 @@
void objectInSquare(@NotNull FilterState filterState, @NotNull G gameObject);
- boolean canShow(G gameObject);
+ boolean canShow(@NotNull G gameObject);
- void addFilter(String name, Filter<?, ?> filter);
+ void addFilter(@NotNull String name, @NotNull Filter<?, ?> filter);
- void removeFilter(String name);
+ void removeFilter(@NotNull String name);
} // interface FilterControl
Modified: trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java 2010-05-16 09:58:55 UTC (rev 7795)
+++ trunk/src/test/net/sf/gridarta/gui/filter/TestFilterControl.java 2010-05-16 10:00:47 UTC (rev 7796)
@@ -53,7 +53,7 @@
* {@inheritDoc}
*/
@Override
- public void createMenuEntries(final JMenu menu) {
+ public void createMenuEntries(@NotNull final JMenu menu) {
throw new AssertionError();
}
@@ -85,7 +85,7 @@
* {@inheritDoc}
*/
@Override
- public boolean canShow(final TestGameObject gameObject) {
+ public boolean canShow(@NotNull final TestGameObject gameObject) {
throw new AssertionError();
}
@@ -93,7 +93,7 @@
* {@inheritDoc}
*/
@Override
- public void addFilter(final String name, final Filter<?, ?> filter) {
+ public void addFilter(@NotNull final String name, @NotNull final Filter<?, ?> filter) {
throw new AssertionError();
}
@@ -101,7 +101,7 @@
* {@inheritDoc}
*/
@Override
- public void removeFilter(final String name) {
+ public void removeFilter(@NotNull final String name) {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 09:59:01
|
Revision: 7795
http://gridarta.svn.sourceforge.net/gridarta/?rev=7795&view=rev
Author: akirschbaum
Date: 2010-05-16 09:58:55 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename variable names.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-05-16 09:57:51 UTC (rev 7794)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-05-16 09:58:55 UTC (rev 7795)
@@ -159,10 +159,10 @@
return;
}
- final Graphics grfx = backBuffer.getGraphics();
- paintSquare(grfx, borderOffset.x + point.x * IGUIConstants.SQUARE_WIDTH, borderOffset.y + point.y * IGUIConstants.SQUARE_HEIGHT, mapModel.getMapSquare(point));
- paintSquareGrid(grfx, point);
- paintSquareSelection(grfx, point);
+ final Graphics g = backBuffer.getGraphics();
+ paintSquare(g, borderOffset.x + point.x * IGUIConstants.SQUARE_WIDTH, borderOffset.y + point.y * IGUIConstants.SQUARE_HEIGHT, mapModel.getMapSquare(point));
+ paintSquareGrid(g, point);
+ paintSquareSelection(g, point);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2010-05-16 09:57:51 UTC (rev 7794)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2010-05-16 09:58:55 UTC (rev 7795)
@@ -69,18 +69,18 @@
* {@inheritDoc}
*/
@Override
- protected void clearBackground(@NotNull final Graphics grfx) {
- grfx.setColor(getBackground());
- grfx.fillRect(0, 0, getWidth(), getHeight());
+ protected void clearBackground(@NotNull final Graphics g) {
+ g.setColor(getBackground());
+ g.fillRect(0, 0, getWidth(), getHeight());
}
/**
* {@inheritDoc}
*/
@Override
- protected void paintSquare(@NotNull final Graphics2D grfx, final int x, final int y, @NotNull final MapSquare<G, A, R> square) {
+ protected void paintSquare(@NotNull final Graphics2D g, final int x, final int y, @NotNull final MapSquare<G, A, R> square) {
for (final G node : square) {
- paintGameObjectIfVisible(grfx, x, y, node);
+ paintGameObjectIfVisible(g, x, y, node);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 09:57:57
|
Revision: 7794
http://gridarta.svn.sourceforge.net/gridarta/?rev=7794&view=rev
Author: akirschbaum
Date: 2010-05-16 09:57:51 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix typo.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 09:48:43 UTC (rev 7793)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 09:57:51 UTC (rev 7794)
@@ -98,7 +98,7 @@
* @param filterControl the filter to use
* @param mapModel the map model to render
* @param mapGrid Grid to render
- * @param multiPositionData the multi position data to query for mulit-part
+ * @param multiPositionData the multi position data to query for multi-part
* objects
* @param isoMapSquareInfo the iso square info to use
* @param gridMapSquarePainter the grid square painter to use
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 09:48:50
|
Revision: 7793
http://gridarta.svn.sourceforge.net/gridarta/?rev=7793&view=rev
Author: akirschbaum
Date: 2010-05-16 09:48:43 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix display issues when filtering the map view on mobs within spawn points.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-05-16 09:37:09 UTC (rev 7792)
+++ trunk/atrinik/ChangeLog 2010-05-16 09:48:43 UTC (rev 7793)
@@ -1,3 +1,8 @@
+2010-05-16 Andreas Kirschbaum
+
+ * Fix display issues when filtering the map view on mobs within
+ spawn points.
+
2010-05-15 Andreas Kirschbaum
* In game object attributes dialog, improve formatting of bitmask
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-05-16 09:37:09 UTC (rev 7792)
+++ trunk/daimonin/ChangeLog 2010-05-16 09:48:43 UTC (rev 7793)
@@ -1,3 +1,8 @@
+2010-05-16 Andreas Kirschbaum
+
+ * Fix display issues when filtering the map view on mobs within
+ spawn points.
+
2010-05-15 Andreas Kirschbaum
* In game object attributes dialog, improve formatting of bitmask
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 09:37:09 UTC (rev 7792)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 09:48:43 UTC (rev 7793)
@@ -505,47 +505,66 @@
return rec;
}
+ /**
+ * Checks whether a {@link GameObject} is visible according to current
+ * editor settings.
+ * @param gameObject the game object
+ * @return whether the game object is visible
+ */
protected abstract boolean isGameObjectVisible(@NotNull final G gameObject);
/**
+ * Paints a single {@link GameObject} if it is visible according to current
+ * editor settings.
+ * @param g the graphics to paint to
+ * @param xStart the x offset for painting
+ * @param yStart the y offset for painting
+ * @param gameObject the game object to paint
+ */
+ protected void paintGameObjectIfVisible(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject) {
+ final G head = gameObject.getHead();
+ if (isGameObjectVisible(head)) {
+ paintGameObject(g, xStart, yStart, gameObject);
+ }
+ }
+
+ /**
* Paints a single {@link GameObject}.
* @param g the graphics to paint to
* @param xStart the x offset for painting
* @param yStart the y offset for painting
* @param gameObject the game object to paint
*/
- protected void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject) {
+ private void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject) {
final G head = gameObject.getHead();
- if (isGameObjectVisible(head)) {
- final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
- final int yOffset = icon.getIconHeight() - isoMapSquareInfo.getYlen();
- if (head.getMultiRefCount() > 0) {
- // multipart images have to be painted with correct offset
- // TODO: This should be improved, especially regarding multi arch mobs inside spawn points.
- final BaseObject<G, A, R, ?> tmpNode = gameObject.isMulti() ? gameObject : null;
- if (tmpNode != null && tmpNode.isLowestPart() || head.isLowestPart()) {
+ final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
+ final int yOffset = icon.getIconHeight() - isoMapSquareInfo.getYlen();
+ if (head.getMultiRefCount() > 0) {
+ // multipart images have to be painted with correct offset
+ // TODO: This should be improved, especially regarding multi arch mobs inside spawn points.
+ final BaseObject<G, A, R, ?> tmpNode = gameObject.isMulti() ? gameObject : null;
+ if (tmpNode != null && tmpNode.isLowestPart() || head.isLowestPart()) {
+ icon.paintIcon(this, g, xStart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOffset + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
+ } else {
+ final BaseObject<G, A, R, ?> env = head.getContainerGameObject();
+ if (env != null && isSpawnPoint(env)) {
icon.paintIcon(this, g, xStart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOffset + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
- } else {
- final BaseObject<G, A, R, ?> env = head.getContainerGameObject();
- if (env != null && isSpawnPoint(env)) {
- icon.paintIcon(this, g, xStart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOffset + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
- }
}
- } else {
- int xOffset = 0;
- if (icon.getIconWidth() > isoMapSquareInfo.getXlen()) {
- xOffset = (icon.getIconWidth() - isoMapSquareInfo.getXlen()) / 2;
- }
- icon.paintIcon(this, g, xStart - xOffset, yStart - yOffset);
}
- // Paint first object (most likely a mob) in spawn points.
- if (isSpawnPoint(head)) {
- final G mob = head.getFirst();
- if (mob != null) {
- paintGameObject(g, xStart, yStart, mob);
- }
+ } else {
+ int xOffset = 0;
+ if (icon.getIconWidth() > isoMapSquareInfo.getXlen()) {
+ xOffset = (icon.getIconWidth() - isoMapSquareInfo.getXlen()) / 2;
}
+ icon.paintIcon(this, g, xStart - xOffset, yStart - yOffset);
}
+ // Paint first object (most likely a mob) in spawn points.
+ if (isSpawnPoint(head)) {
+ final G mob = head.getFirst();
+ if (mob != null) {
+ paintGameObject(g, xStart, yStart, mob);
+ }
+ }
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 09:37:09 UTC (rev 7792)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 09:48:43 UTC (rev 7793)
@@ -153,7 +153,7 @@
for (final G node : square) {
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node) && isGameObjectVisible(node)) {
- paintGameObject(g, x, y, node);
+ paintGameObjectIfVisible(g, x, y, node);
}
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2010-05-16 09:37:09 UTC (rev 7792)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2010-05-16 09:48:43 UTC (rev 7793)
@@ -80,7 +80,7 @@
@Override
protected void paintSquare(@NotNull final Graphics2D grfx, final int x, final int y, @NotNull final MapSquare<G, A, R> square) {
for (final G node : square) {
- paintGameObject(grfx, x, y, node);
+ paintGameObjectIfVisible(grfx, x, y, node);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 09:37:17
|
Revision: 7792
http://gridarta.svn.sourceforge.net/gridarta/?rev=7792&view=rev
Author: akirschbaum
Date: 2010-05-16 09:37:09 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Declare variable more local.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:59:14 UTC (rev 7791)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 09:37:09 UTC (rev 7792)
@@ -515,7 +515,6 @@
* @param gameObject the game object to paint
*/
protected void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject) {
- final BaseObject<G, A, R, ?> tmpNode = gameObject.isMulti() ? gameObject : null;
final G head = gameObject.getHead();
if (isGameObjectVisible(head)) {
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
@@ -523,6 +522,7 @@
if (head.getMultiRefCount() > 0) {
// multipart images have to be painted with correct offset
// TODO: This should be improved, especially regarding multi arch mobs inside spawn points.
+ final BaseObject<G, A, R, ?> tmpNode = gameObject.isMulti() ? gameObject : null;
if (tmpNode != null && tmpNode.isLowestPart() || head.isLowestPart()) {
icon.paintIcon(this, g, xStart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOffset + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
} else {
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 04:59:14 UTC (rev 7791)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 09:37:09 UTC (rev 7792)
@@ -152,7 +152,7 @@
} else {
for (final G node : square) {
filterControl.objectInSquare(filterState, node);
- if (filterControl.canShow(node) && mapViewSettings.isEditType(node)) {
+ if (filterControl.canShow(node) && isGameObjectVisible(node)) {
paintGameObject(g, x, y, node);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 04:59:23
|
Revision: 7791
http://gridarta.svn.sourceforge.net/gridarta/?rev=7791&view=rev
Author: akirschbaum
Date: 2010-05-16 04:59:14 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove outdated commented code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:57:54 UTC (rev 7790)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:59:14 UTC (rev 7791)
@@ -456,8 +456,6 @@
* @param g the graphics context to paint to
*/
private void paintComponent2(@NotNull final Graphics2D g) {
- //ImageIcon selIcon = mainControl.mapSelIcon;
-
clearBackground(g);
final Rectangle rec = getRepaintRec(getVisibleRect());
final Point pos = new Point();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 04:58:01
|
Revision: 7790
http://gridarta.svn.sourceforge.net/gridarta/?rev=7790&view=rev
Author: akirschbaum
Date: 2010-05-16 04:57:54 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename variable names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:54:18 UTC (rev 7789)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:57:54 UTC (rev 7790)
@@ -391,12 +391,12 @@
clearBackground(bufGrfx);
final Point pos = new Point();
for (pos.y = 0; pos.y < mapHeight; pos.y++) {
- int xstart = origin.x - (pos.y + 1) * isoMapSquareInfo.getXlen2();
- int ystart = origin.y + pos.y * isoMapSquareInfo.getYlen2();
+ int xStart = origin.x - (pos.y + 1) * isoMapSquareInfo.getXlen2();
+ int yStart = origin.y + pos.y * isoMapSquareInfo.getYlen2();
for (pos.x = 0; pos.x < mapWidth; pos.x++) {
- paintSquare(bufGrfx, xstart, ystart, mapModel.getMapSquare(pos));
- xstart += isoMapSquareInfo.getXlen2();
- ystart += isoMapSquareInfo.getYlen2();
+ paintSquare(bufGrfx, xStart, yStart, mapModel.getMapSquare(pos));
+ xStart += isoMapSquareInfo.getXlen2();
+ yStart += isoMapSquareInfo.getYlen2();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 04:54:24
|
Revision: 7789
http://gridarta.svn.sourceforge.net/gridarta/?rev=7789&view=rev
Author: akirschbaum
Date: 2010-05-16 04:54:18 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename variable names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:49:19 UTC (rev 7788)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:54:18 UTC (rev 7789)
@@ -464,14 +464,14 @@
final Point endPos = rec.getLocation();
endPos.translate(rec.width, rec.height);
for (pos.y = rec.y; pos.y < endPos.y; pos.y++) {
- int xstart = origin.x - (pos.y - rec.x + 1) * isoMapSquareInfo.getXlen2();
- int ystart = origin.y + (pos.y + rec.x) * isoMapSquareInfo.getYlen2();
+ int xStart = origin.x - (pos.y - rec.x + 1) * isoMapSquareInfo.getXlen2();
+ int yStart = origin.y + (pos.y + rec.x) * isoMapSquareInfo.getYlen2();
for (pos.x = rec.x; pos.x < endPos.x; pos.x++) {
- if (g.hitClip(xstart, ystart - isoMapSquareInfo.getYlen() * 4, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen() * 5)) {
- paintSquare(g, xstart, ystart, mapModel.getMapSquare(pos));
+ if (g.hitClip(xStart, yStart - isoMapSquareInfo.getYlen() * 4, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen() * 5)) {
+ paintSquare(g, xStart, yStart, mapModel.getMapSquare(pos));
}
- xstart += isoMapSquareInfo.getXlen2();
- ystart += isoMapSquareInfo.getYlen2();
+ xStart += isoMapSquareInfo.getXlen2();
+ yStart += isoMapSquareInfo.getYlen2();
}
}
@@ -567,19 +567,19 @@
*/
private void paintMapSelection(@NotNull final Graphics g) {
for (int y = 0; y < mapSize.getHeight(); y++) {
- int xstart = origin.x - (y + 1) * isoMapSquareInfo.getXlen2();
- int ystart = origin.y + y * isoMapSquareInfo.getYlen2();
+ int xStart = origin.x - (y + 1) * isoMapSquareInfo.getXlen2();
+ int yStart = origin.y + y * isoMapSquareInfo.getYlen2();
for (int x = 0; x < mapSize.getWidth(); x++) {
- if (g.hitClip(xstart, ystart, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen())) {
+ if (g.hitClip(xStart, yStart, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen())) {
final int gridFlags = mapGrid.getFlags(x, y);
- gridMapSquarePainter.paint(g, gridFlags, xstart, ystart, this);
+ gridMapSquarePainter.paint(g, gridFlags, xStart, yStart, this);
} else {
/* DO NOTHING if outside clip region.
- * DO NOT use continue. xstart and ystart are recalculated at the end of the loop.
+ * DO NOT use continue. xStart and yStart are recalculated at the end of the loop.
*/
}
- xstart += isoMapSquareInfo.getXlen2();
- ystart += isoMapSquareInfo.getYlen2();
+ xStart += isoMapSquareInfo.getXlen2();
+ yStart += isoMapSquareInfo.getYlen2();
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 04:49:26
|
Revision: 7788
http://gridarta.svn.sourceforge.net/gridarta/?rev=7788&view=rev
Author: akirschbaum
Date: 2010-05-16 04:49:19 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Rename variables names.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-05-16 04:42:07 UTC (rev 7787)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-05-16 04:49:19 UTC (rev 7788)
@@ -232,7 +232,7 @@
final BufferedImage newBackBuffer;
try {
newBackBuffer = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB);
- } catch (final OutOfMemoryError ex) {
+ } catch (final OutOfMemoryError ignore) {
if (log.isDebugEnabled()) {
log.debug("out of memory creating new back buffer");
}
@@ -248,12 +248,12 @@
* {@inheritDoc}
*/
@Override
- protected void paintSquare(@NotNull final Graphics grfx, final int x, final int y, @NotNull final MapSquare<GameObject, MapArchObject, Archetype> square) {
+ protected void paintSquare(@NotNull final Graphics g, final int x, final int y, @NotNull final MapSquare<GameObject, MapArchObject, Archetype> square) {
filterControl.newSquare(filterState);
if (square.isEmpty()) {
- emptySquareIcon.paintIcon(this, grfx, x, y);
+ emptySquareIcon.paintIcon(this, g, x, y);
} else {
- grfx.fillRect(x, y, IGUIConstants.SQUARE_WIDTH, IGUIConstants.SQUARE_HEIGHT);
+ g.fillRect(x, y, IGUIConstants.SQUARE_WIDTH, IGUIConstants.SQUARE_HEIGHT);
if (mapViewSettings.isSmoothing()) {
int layer = -1;
for (final GameObject node : square) {
@@ -262,42 +262,42 @@
}
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node) && mapViewSettings.isEditType(node)) {
- paintGameObject(grfx, x, y, node);
+ paintGameObject(g, x, y, node);
if (node.getAttributeInt("smoothlevel", true) > 0) {
- smoothingRenderer.paintSmooth(grfx, square.getMapX(), square.getMapY(), node.getAttributeInt("smoothlevel", true), layer, false, borderOffset);
+ smoothingRenderer.paintSmooth(g, square.getMapX(), square.getMapY(), node.getAttributeInt("smoothlevel", true), layer, false, borderOffset);
}
}
if (layer > -1) {
- smoothingRenderer.paintSmooth(grfx, square.getMapX(), square.getMapY(), 1, layer + 1, true, borderOffset);
+ smoothingRenderer.paintSmooth(g, square.getMapX(), square.getMapY(), 1, layer + 1, true, borderOffset);
}
}
} else {
for (final GameObject node : square) {
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node) && mapViewSettings.isEditType(node)) {
- paintGameObject(grfx, x, y, node);
+ paintGameObject(g, x, y, node);
}
}
}
}
for (int i = 0; i < FilterControl.MAX_HIGHLIGHT; i++) {
if (filterControl.isHighlightedSquare(filterState, i)) {
- final Color color = grfx.getColor();
- grfx.setColor(highLightMask[i]);
- grfx.fillRect(x, y, IGUIConstants.SQUARE_WIDTH, IGUIConstants.SQUARE_HEIGHT);
- grfx.setColor(color);
+ final Color color = g.getColor();
+ g.setColor(highLightMask[i]);
+ g.fillRect(x, y, IGUIConstants.SQUARE_WIDTH, IGUIConstants.SQUARE_HEIGHT);
+ g.setColor(color);
}
}
}
/**
* Paints one game object.
- * @param grfx the graphics to paint into
+ * @param g the graphics to paint into
* @param x the x-coordinate to paint at
* @param y the y-coordinate to paint at
* @param node the game object to paint
*/
- private void paintGameObject(@NotNull final Graphics grfx, final int x, final int y, @NotNull final net.sf.gridarta.model.gameobject.GameObject<GameObject, MapArchObject, Archetype> node) {
+ private void paintGameObject(@NotNull final Graphics g, final int x, final int y, @NotNull final net.sf.gridarta.model.gameobject.GameObject<GameObject, MapArchObject, Archetype> node) {
final ImageIcon img = node.getImage(mapViewSettings);
if (!node.isMulti() || (img.getIconWidth() == IGUIConstants.SQUARE_WIDTH && img.getIconHeight() == IGUIConstants.SQUARE_HEIGHT)) {
offset.x = 0;
@@ -308,7 +308,7 @@
offset.x = IGUIConstants.SQUARE_WIDTH * (node.getMultiX() - node.getMinX());
offset.y = IGUIConstants.SQUARE_HEIGHT * (node.getMultiY() - node.getMinY());
}
- grfx.drawImage(img.getImage(), x, y, x + IGUIConstants.SQUARE_WIDTH, y + IGUIConstants.SQUARE_HEIGHT, offset.x, offset.y, offset.x + IGUIConstants.SQUARE_WIDTH, offset.y + IGUIConstants.SQUARE_HEIGHT, this);
+ g.drawImage(img.getImage(), x, y, x + IGUIConstants.SQUARE_WIDTH, y + IGUIConstants.SQUARE_HEIGHT, offset.x, offset.y, offset.x + IGUIConstants.SQUARE_WIDTH, offset.y + IGUIConstants.SQUARE_HEIGHT, this);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:42:07 UTC (rev 7787)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-05-16 04:49:19 UTC (rev 7788)
@@ -438,27 +438,27 @@
/**
* Clears the window to background color if necessary.
- * @param grfx Graphics to use for clearing.
+ * @param g Graphics to use for clearing.
*/
- protected abstract void clearBackground(@NotNull final Graphics grfx);
+ protected abstract void clearBackground(@NotNull final Graphics g);
/**
* Paints one square.
- * @param grfx the graphics context to paint to
+ * @param g the graphics context to paint to
* @param x the square coordinate to paint to
* @param y the square coordinate to paint to
* @param square the square to paint
*/
- protected abstract void paintSquare(@NotNull final Graphics2D grfx, final int x, final int y, @NotNull final MapSquare<G, A, R> square);
+ protected abstract void paintSquare(@NotNull final Graphics2D g, final int x, final int y, @NotNull final MapSquare<G, A, R> square);
/**
* Paints this component.
- * @param grfx the graphics context to paint to
+ * @param g the graphics context to paint to
*/
- private void paintComponent2(@NotNull final Graphics2D grfx) {
+ private void paintComponent2(@NotNull final Graphics2D g) {
//ImageIcon selIcon = mainControl.mapSelIcon;
- clearBackground(grfx);
+ clearBackground(g);
final Rectangle rec = getRepaintRec(getVisibleRect());
final Point pos = new Point();
final Point endPos = rec.getLocation();
@@ -467,30 +467,30 @@
int xstart = origin.x - (pos.y - rec.x + 1) * isoMapSquareInfo.getXlen2();
int ystart = origin.y + (pos.y + rec.x) * isoMapSquareInfo.getYlen2();
for (pos.x = rec.x; pos.x < endPos.x; pos.x++) {
- if (grfx.hitClip(xstart, ystart - isoMapSquareInfo.getYlen() * 4, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen() * 5)) {
- paintSquare(grfx, xstart, ystart, mapModel.getMapSquare(pos));
+ if (g.hitClip(xstart, ystart - isoMapSquareInfo.getYlen() * 4, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen() * 5)) {
+ paintSquare(g, xstart, ystart, mapModel.getMapSquare(pos));
}
xstart += isoMapSquareInfo.getXlen2();
ystart += isoMapSquareInfo.getYlen2();
}
}
- paintMapGrid(grfx);
- paintMapSelection(grfx);
+ paintMapGrid(g);
+ paintMapSelection(g);
}
/**
* Returns smallest {@link Rectangle} on the map that needs to be repaint.
- * @param visRec the visible rectangle
+ * @param visibleRectangle the visible rectangle
* @return the rectangle to repaint
*/
- private Rectangle getRepaintRec(@NotNull final Rectangle visRec) {
+ private Rectangle getRepaintRec(@NotNull final Rectangle visibleRectangle) {
// This Rectangle will be returned
final Rectangle rec = new Rectangle();
// Upper left corner of viewport
- final Point posUL = visRec.getLocation();
+ final Point posUL = visibleRectangle.getLocation();
// Dimension of viewport
- final Dimension visDim = visRec.getSize();
+ final Dimension visDim = visibleRectangle.getSize();
// Other positions of viewport corners
final Point posUR = new Point(posUL.x + visDim.width, posUL.y);
final Point posDL = new Point(posUL.x, posUL.y + visDim.height);
@@ -511,40 +511,40 @@
/**
* Paints a single {@link GameObject}.
- * @param grfx the graphics to paint to
- * @param xstart the x offset for painting
- * @param ystart the y offset for painting
+ * @param g the graphics to paint to
+ * @param xStart the x offset for painting
+ * @param yStart the y offset for painting
* @param gameObject the game object to paint
*/
- protected void paintGameObject(@NotNull final Graphics2D grfx, final int xstart, final int ystart, @NotNull final G gameObject) {
+ protected void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject) {
final BaseObject<G, A, R, ?> tmpNode = gameObject.isMulti() ? gameObject : null;
final G head = gameObject.getHead();
if (isGameObjectVisible(head)) {
- final Icon img = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
- final int yoff = img.getIconHeight() - isoMapSquareInfo.getYlen();
+ final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
+ final int yOffset = icon.getIconHeight() - isoMapSquareInfo.getYlen();
if (head.getMultiRefCount() > 0) {
// multipart images have to be painted with correct offset
// TODO: This should be improved, especially regarding multi arch mobs inside spawn points.
if (tmpNode != null && tmpNode.isLowestPart() || head.isLowestPart()) {
- img.paintIcon(this, grfx, xstart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), ystart - yoff + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
+ icon.paintIcon(this, g, xStart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOffset + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
} else {
final BaseObject<G, A, R, ?> env = head.getContainerGameObject();
if (env != null && isSpawnPoint(env)) {
- img.paintIcon(this, grfx, xstart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), ystart - yoff + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
+ icon.paintIcon(this, g, xStart - multiPositionData.getXOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOffset + multiPositionData.getYOffset(head.getMultiShapeID(), tmpNode == null ? head.getMultiPartNr() : tmpNode.getMultiPartNr()));
}
}
} else {
- int xoff = 0;
- if (img.getIconWidth() > isoMapSquareInfo.getXlen()) {
- xoff = (img.getIconWidth() - isoMapSquareInfo.getXlen()) / 2;
+ int xOffset = 0;
+ if (icon.getIconWidth() > isoMapSquareInfo.getXlen()) {
+ xOffset = (icon.getIconWidth() - isoMapSquareInfo.getXlen()) / 2;
}
- img.paintIcon(this, grfx, xstart - xoff, ystart - yoff);
+ icon.paintIcon(this, g, xStart - xOffset, yStart - yOffset);
}
// Paint first object (most likely a mob) in spawn points.
if (isSpawnPoint(head)) {
final G mob = head.getFirst();
if (mob != null) {
- paintGameObject(grfx, xstart, ystart, mob);
+ paintGameObject(g, xStart, yStart, mob);
}
}
}
@@ -563,16 +563,16 @@
* Paints the selection for the whole map. It's recommended to paint the
* complete selection after the map itself, otherwise map elements actually
* might hide selections.
- * @param grfx the graphics for painting
+ * @param g the graphics for painting
*/
- private void paintMapSelection(@NotNull final Graphics grfx) {
+ private void paintMapSelection(@NotNull final Graphics g) {
for (int y = 0; y < mapSize.getHeight(); y++) {
int xstart = origin.x - (y + 1) * isoMapSquareInfo.getXlen2();
int ystart = origin.y + y * isoMapSquareInfo.getYlen2();
for (int x = 0; x < mapSize.getWidth(); x++) {
- if (grfx.hitClip(xstart, ystart, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen())) {
+ if (g.hitClip(xstart, ystart, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen())) {
final int gridFlags = mapGrid.getFlags(x, y);
- gridMapSquarePainter.paint(grfx, gridFlags, xstart, ystart, this);
+ gridMapSquarePainter.paint(g, gridFlags, xstart, ystart, this);
} else {
/* DO NOTHING if outside clip region.
* DO NOT use continue. xstart and ystart are recalculated at the end of the loop.
@@ -588,20 +588,20 @@
* Paints the grid of the whole map. The grid is not painted if it is
* disabled. It's recommended to paint the complete grid after the map
* itself, otherwise map elements actually might hide parts of the grid.
- * @param grfx the graphics for painting
+ * @param g the graphics for painting
*/
- private void paintMapGrid(@NotNull final Graphics grfx) {
+ private void paintMapGrid(@NotNull final Graphics g) {
if (mapViewSettings.isGridVisible()) {
// draw iso grid
- grfx.setColor(Color.black);
+ g.setColor(Color.black);
final int mapWidth = mapSize.getWidth();
final int mapHeight = mapSize.getHeight();
for (int x = 0; x <= mapWidth; x++) {
- grfx.drawLine(origin.x + x * isoMapSquareInfo.getXlen2() - 1, origin.y + x * isoMapSquareInfo.getYlen2() - 1, origin.x - (mapHeight - x) * isoMapSquareInfo.getXlen2() - 1, origin.y + (mapHeight + x) * isoMapSquareInfo.getYlen2() - 1);
+ g.drawLine(origin.x + x * isoMapSquareInfo.getXlen2() - 1, origin.y + x * isoMapSquareInfo.getYlen2() - 1, origin.x - (mapHeight - x) * isoMapSquareInfo.getXlen2() - 1, origin.y + (mapHeight + x) * isoMapSquareInfo.getYlen2() - 1);
}
for (int y = 0; y <= mapHeight; y++) {
- grfx.drawLine(origin.x - y * isoMapSquareInfo.getXlen2() - 1, origin.y + y * isoMapSquareInfo.getYlen2() - 1, origin.x + (mapWidth - y) * isoMapSquareInfo.getXlen2() - 1, origin.y + (mapWidth + y) * isoMapSquareInfo.getYlen2() - 1);
+ g.drawLine(origin.x - y * isoMapSquareInfo.getXlen2() - 1, origin.y + y * isoMapSquareInfo.getYlen2() - 1, origin.x + (mapWidth - y) * isoMapSquareInfo.getXlen2() - 1, origin.y + (mapWidth + y) * isoMapSquareInfo.getYlen2() - 1);
}
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 04:42:07 UTC (rev 7787)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-05-16 04:49:19 UTC (rev 7788)
@@ -130,7 +130,7 @@
* {@inheritDoc}
*/
@Override
- protected void clearBackground(@NotNull final Graphics grfx) {
+ protected void clearBackground(@NotNull final Graphics g) {
}
/**
@@ -145,22 +145,22 @@
* {@inheritDoc}
*/
@Override
- protected void paintSquare(@NotNull final Graphics2D grfx, final int x, final int y, @NotNull final MapSquare<G, A, R> square) {
+ protected void paintSquare(@NotNull final Graphics2D g, final int x, final int y, @NotNull final MapSquare<G, A, R> square) {
filterControl.newSquare(filterState);
if (square.isEmpty()) {
- emptySquareIcon.paintIcon(this, grfx, x, y);
+ emptySquareIcon.paintIcon(this, g, x, y);
} else {
for (final G node : square) {
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node) && mapViewSettings.isEditType(node)) {
- paintGameObject(grfx, x, y, node);
+ paintGameObject(g, x, y, node);
}
}
}
for (int i = 0; i < FilterControl.MAX_HIGHLIGHT; i++) {
if (filterControl.isHighlightedSquare(filterState, i)) {
- final Color color = grfx.getColor();
- grfx.setColor(highLightMask[i]);
+ final Color color = g.getColor();
+ g.setColor(highLightMask[i]);
xPoints[0] = x + isoMapSquareInfo.getXlen() / 2;
xPoints[1] = x + isoMapSquareInfo.getXlen() - 1;
xPoints[2] = xPoints[0];
@@ -169,8 +169,8 @@
yPoints[1] = y + isoMapSquareInfo.getYlen() / 2;
yPoints[2] = y + isoMapSquareInfo.getYlen() - 1;
yPoints[3] = yPoints[1];
- grfx.fillPolygon(xPoints, yPoints, 4);
- grfx.setColor(color);
+ g.fillPolygon(xPoints, yPoints, 4);
+ g.setColor(color);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-16 04:42:13
|
Revision: 7787
http://gridarta.svn.sourceforge.net/gridarta/?rev=7787&view=rev
Author: akirschbaum
Date: 2010-05-16 04:42:07 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Remove outdated todo comment.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-05-15 22:11:31 UTC (rev 7786)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-05-16 04:42:07 UTC (rev 7787)
@@ -262,7 +262,7 @@
}
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node) && mapViewSettings.isEditType(node)) {
- paintGameObject(grfx, x, y, node); // XXX: cast
+ paintGameObject(grfx, x, y, node);
if (node.getAttributeInt("smoothlevel", true) > 0) {
smoothingRenderer.paintSmooth(grfx, square.getMapX(), square.getMapY(), node.getAttributeInt("smoothlevel", true), layer, false, borderOffset);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-15 22:11:39
|
Revision: 7786
http://gridarta.svn.sourceforge.net/gridarta/?rev=7786&view=rev
Author: akirschbaum
Date: 2010-05-15 22:11:31 +0000 (Sat, 15 May 2010)
Log Message:
-----------
Collect resources.
Modified Paths:
--------------
trunk/crossfire/ChangeLog
trunk/crossfire/resource/conf/animations
trunk/crossfire/resource/conf/animtree
trunk/crossfire/resource/conf/archetypes
trunk/crossfire/resource/conf/bmaps.paths
trunk/crossfire/resource/conf/crossfire.0
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-05-15 22:09:39 UTC (rev 7785)
+++ trunk/crossfire/ChangeLog 2010-05-15 22:11:31 UTC (rev 7786)
@@ -1,3 +1,7 @@
+2010-05-16 Andreas Kirschbaum
+
+ * Collect resources.
+
2010-05-14 Andreas Kirschbaum
* In game object attributes dialog, improve formatting of bitmask
Modified: trunk/crossfire/resource/conf/animations
===================================================================
--- trunk/crossfire/resource/conf/animations 2010-05-15 22:09:39 UTC (rev 7785)
+++ trunk/crossfire/resource/conf/animations 2010-05-15 22:11:31 UTC (rev 7786)
@@ -3058,6 +3058,12 @@
snowball.171
snowball.181
mina
+anim manhole
+manhole.111
+manhole.112
+manhole.113
+manhole.114
+mina
anim masamune
masamune.113
masamune.112
Modified: trunk/crossfire/resource/conf/animtree
===================================================================
--- trunk/crossfire/resource/conf/animtree 2010-05-15 22:09:39 UTC (rev 7785)
+++ trunk/crossfire/resource/conf/animtree 2010-05-15 22:11:31 UTC (rev 7786)
@@ -404,6 +404,7 @@
/spell/Cone/manablast
/spell/Bolt/manabolt
/spell/Bullet/manabullet
+/connect/Hole/manhole
/weapon/artifact/Masamune/masamune
/monster/animal/Dog/mastif
/monster/demon/medium_demon/mdemon
Modified: trunk/crossfire/resource/conf/archetypes
===================================================================
--- trunk/crossfire/resource/conf/archetypes 2010-05-15 22:09:39 UTC (rev 7785)
+++ trunk/crossfire/resource/conf/archetypes 2010-05-15 22:11:31 UTC (rev 7786)
@@ -943,8 +943,8 @@
end
Object dragon_mail
editor_folder armour/mail
-name dragon mail
-name_pl dragon mails
+name red dragon mail
+name_pl red dragon mails
client_type 251
nrof 1
type 16
@@ -2511,6 +2511,73 @@
maxsp 1
ac 1
end
+Object manhole_closed_1
+editor_folder connect/Hole
+name manhole
+type 94
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+face manhole.114
+animation manhole
+is_animated 0
+wc 4
+end
+More
+Object manhole_closed_1a
+face manhole.114
+animation manhole
+x 1
+end
+More
+Object manhole_closed_1b
+face manhole.114
+animation manhole
+y 1
+end
+More
+Object manhole_closed_1c
+face manhole.114
+animation manhole
+x 1
+y 1
+end
+Object manhole_open_1
+editor_folder connect/Hole
+name manhole
+type 94
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+face manhole.111
+animation manhole
+is_animated 0
+move_on walk
+wc 0
+maxsp 1
+end
+More
+Object manhole_open_1a
+face manhole.111
+animation manhole
+maxsp 1
+x 1
+end
+More
+Object manhole_open_1b
+face manhole.111
+animation manhole
+maxsp 1
+y 1
+end
+More
+Object manhole_open_1c
+face manhole.111
+maxsp 1
+animation manhole
+x 1
+y 1
+end
Object pit_closed
editor_folder connect/Hole
name pit
@@ -8694,7 +8761,7 @@
face door_0.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8710,7 +8777,7 @@
face door_1.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8726,7 +8793,7 @@
face door_2.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8742,7 +8809,7 @@
face door_3.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8758,7 +8825,7 @@
face door_4.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8774,7 +8841,7 @@
face door_5.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8790,7 +8857,7 @@
face door_6.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8806,7 +8873,7 @@
face door_7.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8822,7 +8889,7 @@
face door_8.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8838,7 +8905,7 @@
face door_9.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8854,7 +8921,7 @@
face door_A.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8870,7 +8937,7 @@
face door_B.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8886,7 +8953,7 @@
face door_C.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8902,7 +8969,7 @@
face door_D.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8918,7 +8985,7 @@
face door_E.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -8934,7 +9001,7 @@
face door_F.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9252,7 +9319,7 @@
face odoor_1.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9268,7 +9335,7 @@
face odoor_2.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9284,7 +9351,7 @@
face odoor_2_fant_blue-green.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9300,7 +9367,7 @@
face odoor_2_fant_blue-yellow.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9316,7 +9383,7 @@
face odoor_2_fant_brown.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9332,7 +9399,7 @@
face odoor_2_fant_red-white.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9348,7 +9415,7 @@
face odoor_2_fant_red-yellow.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 16
no_pick 1
@@ -9363,7 +9430,7 @@
face wooddoor_1.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 2
no_pick 1
@@ -9378,7 +9445,7 @@
face wooddoor_2.111
hp 400
exp 1
-ac 10
+ac 20
type 23
material 2
no_pick 1
@@ -10019,6 +10086,22 @@
move_on walk fly_low
client_type 25012
end
+Object look_door_exit_1
+editor_folder exit/exit
+name door
+face wooddoor_1.111
+type 66
+no_pick 1
+client_type 25012
+end
+Object look_door_exit_2
+editor_folder exit/exit
+name door
+face wooddoor_2.111
+type 66
+no_pick 1
+client_type 25012
+end
Object perm_magic_portal
editor_folder exit/magic_portal
name magic portal
@@ -10271,12 +10354,12 @@
end
Object dragon_scale
editor_folder flesh/dragon
-name dragon scale
+name red dragon scale
nrof 1
type 73
face dragon_sca.111
weight 25000
-name_pl dragon scales
+name_pl red dragon scales
client_type 627
end
Object blue_dragon_scale
@@ -20400,6 +20483,19 @@
no_drop 1
identified 1
end
+Object NPCGift
+editor_folder misc/Container
+name NPC_Gift_Box
+face present_box_1.111
+type 122
+material 1
+value 0
+container 50000
+weight 1000
+identified 1
+no_drop 1
+client_type 51
+end
Object package
editor_folder misc/Container
name package
@@ -20827,6 +20923,23 @@
dam 5
food 100
end
+Object anchor_1
+editor_folder misc/misc
+can_roll 1
+client_type 8002
+face anchor.111
+material 18
+move_block walk swim boat
+name anchor
+name_pl anchors
+no_pick 1
+weight 500000
+end
+More
+Object anchor_2
+face anchor.111
+x 1
+end
Object blood
editor_folder misc/misc
name puddle of blood
@@ -21901,6 +22014,17 @@
move_slow_penalty 8
material 64
end
+Object shipswheel
+editor_folder misc/misc
+client_type 8002
+face shipswheel.111
+material 18
+move_block walk swim boat
+name ships wheel
+name_pl ships wheels
+no_pick 1
+weight 100000
+end
Object sky
editor_folder misc/sky
name sky
@@ -22201,6 +22325,17 @@
body_range -1
skill use magic item
end
+Object wheelbarrow
+editor_folder misc/misc
+face wheelbarrow.111
+material 16
+weight 100000
+move_block all
+can_roll 1
+move_type 1
+name_pl wheelbarrows
+client_type 8002
+end
Object wplate
editor_folder misc/misc
face wplate.111
@@ -32475,7 +32610,6 @@
monster 1
move_type walk
no_pick 1
-type 120
face gardengnome.111
animation gardengnome
ac 1
@@ -32535,7 +32669,6 @@
monster 1
move_type walk
no_pick 1
-type 120
face gnome.111
animation gnome
ac 5
@@ -32550,7 +32683,7 @@
Pow 1
can_cast_spell 1
Wis 20
-attacktype 4098
+attacktype 3
will_apply 15
hp 75
maxhp 75
@@ -32595,7 +32728,6 @@
monster 1
move_type walk
no_pick 1
-type 120
face gnome2.111
animation gnome2
ac 5
@@ -32610,7 +32742,7 @@
Pow 1
can_cast_spell 1
Wis 20
-attacktype 4098
+attacktype 3
will_apply 15
hp 75
maxhp 75
@@ -41402,7 +41534,7 @@
end
Object potion_cold
editor_folder potion/potion
-name potion of fire resistance
+name potion of cold resistance
nrof 1
face potioncol.111
type 5
@@ -41411,13 +41543,13 @@
weight 1800
value 5800
resist_fire 90
-name_pl potions of fire resistance
+name_pl potions of cold resistance
on_use_yield potion_empty
client_type 651
end
Object potion_cold2
editor_folder potion/potion
-name potion of lava resistance
+name potion of frost resistance
nrof 1
face potioncol.111
type 5
@@ -41426,7 +41558,7 @@
weight 1800
value 28000
resist_fire 95
-name_pl potions of lava resistance
+name_pl potions of frost resistance
on_use_yield potion_empty
client_type 651
end
@@ -41462,7 +41594,7 @@
end
Object potion_fire
editor_folder potion/potion
-name potion of cold resistance
+name potion of fire resistance
nrof 1
face potionfir.111
type 5
@@ -41471,13 +41603,13 @@
weight 1800
value 5200
resist_cold 90
-name_pl potions of cold resistance
+name_pl potions of fire resistance
on_use_yield potion_empty
client_type 651
end
Object potion_fire2
editor_folder potion/potion
-name potion of frost resistance
+name potion of lava resistance
nrof 1
face potionfir.111
type 5
@@ -41486,7 +41618,7 @@
weight 1800
value 28000
resist_cold 95
-name_pl potions of frost resistance
+name_pl potions of lava resistance
on_use_yield potion_empty
client_type 651
end
@@ -54451,6 +54583,7 @@
end
Object event_apply
editor_folder system/system
+face event_apply.111
type 116
subtype 1
invisible 1
@@ -54472,6 +54605,7 @@
end
Object event_death
editor_folder system/system
+face event_death.111
type 116
subtype 3
invisible 1
@@ -54486,6 +54620,7 @@
end
Object event_drop
editor_folder system/system
+face event_drop.111
type 116
subtype 4
invisible 1
@@ -54493,6 +54628,7 @@
end
Object event_pickup
editor_folder system/system
+face event_pickup.111
type 116
subtype 5
invisible 1
@@ -54500,6 +54636,7 @@
end
Object event_say
editor_folder system/system
+face event_say.111
type 116
subtype 6
invisible 1
Modified: trunk/crossfire/resource/conf/bmaps.paths
===================================================================
--- trunk/crossfire/resource/conf/bmaps.paths 2010-05-15 22:09:39 UTC (rev 7785)
+++ trunk/crossfire/resource/conf/bmaps.paths 2010-05-15 22:11:31 UTC (rev 7786)
@@ -118,4895 +118,4907 @@
\00117 ./arch/talisman/amulet_magenta.111
\00118 ./arch/talisman/amulet_red.111
\00119 ./arch/talisman/amulet_white.111
-\00120 ./arch/monster/angel/angel.111
-\00121 ./arch/monster/angel/angel.112
-\00122 ./arch/monster/angel/angel.131
-\00123 ./arch/monster/angel/angel.132
-\00124 ./arch/monster/angel/angel.151
-\00125 ./arch/monster/angel/angel.152
-\00126 ./arch/monster/angel/angel.171
-\00127 ./arch/monster/angel/angel.172
-\00128 ./arch/monster/angel/angel_sword.111
-\00129 ./arch/monster/angel/angel_sword.112
-\00130 ./arch/monster/angel/angel_sword.131
-\00131 ./arch/monster/angel/angel_sword.132
-\00132 ./arch/monster/angel/angel_sword.151
-\00133 ./arch/monster/angel/angel_sword.152
-\00134 ./arch/monster/angel/angel_sword.171
-\00135 ./arch/monster/angel/angel_sword.172
-\00136 ./arch/monster/angel/angelknight.x11
-\00137 ./arch/system/mood_floors/angry_floor.111
-\00138 ./arch/monster/insect/ant/ant.111
-\00139 ./arch/monster/insect/ant/ant.112
-\00140 ./arch/monster/insect/ant/ant_egg.111
-\00141 ./arch/monster/insect/ant/ant_gen.111
-\00142 ./arch/monster/insect/ant/ant_larvae.111
-\00143 ./arch/monster/insect/ant/ant_larvae.112
-\00144 ./arch/monster/animal/ape.131
-\00145 ./arch/monster/animal/ape.132
-\00146 ./arch/monster/animal/ape.171
-\00147 ./arch/monster/animal/ape.172
-\00148 ./arch/food/apple.111
-\00149 ./arch/food/apple_eighth.111
-\00150 ./arch/food/apple_fourth.111
-\00151 ./arch/food/apple_half.111
-\00152 ./arch/monster/angel/archangel.x11
-\00153 ./arch/monster/angel/archangel.x12
-\00154 ./arch/monster/angel/archangel.x13
-\00155 ./arch/exit/archgold.111
-\00156 ./arch/exit/archgreen.111
-\00157 ./arch/monster/chaos/archon.111
-\00158 ./arch/monster/chaos/archon.222
-\00159 ./arch/monster/chaos/archon.333
-\00160 ./arch/monster/chaos/archon.444
-\00161 ./arch/exit/archtree.111
-\00162 ./arch/exit/archwood.111
-\00163 ./arch/flesh/human/arm.111
-\00164 ./arch/monster/humanoid/Human/armless_cook.111
-\00165 ./arch/monster/humanoid/Human/armless_cook.131
-\00166 ./arch/monster/humanoid/Human/armless_cook.151
-\00167 ./arch/monster/humanoid/Human/armless_cook.171
-\00168 ./arch/monster/troll/armourtroll2.111
-\00169 ./arch/monster/troll/armourtroll2.112
-\00170 ./arch/monster/troll/armourtroll3.111
-\00171 ./arch/monster/troll/armourtroll4.111
-\00172 ./arch/weapon/bow/arrow.101
-\00173 ./arch/weapon/bow/arrow.111
-\00174 ./arch/weapon/bow/arrow.121
-\00175 ./arch/weapon/bow/arrow.131
-\00176 ./arch/weapon/bow/arrow.141
-\00177 ./arch/weapon/bow/arrow.151
-\00178 ./arch/weapon/bow/arrow.161
-\00179 ./arch/weapon/bow/arrow.171
-\00180 ./arch/weapon/bow/arrow.181
-\00181 ./arch/inorganic/ashes.111
-\00182 ./arch/spell/Bullet/asteroid.111
-\00183 ./arch/spell/Bullet/asteroid.112
-\00184 ./arch/spell/Bullet/asteroid.121
-\00185 ./arch/spell/Bullet/asteroid.131
-\00186 ./arch/spell/Bullet/asteroid.141
-\00187 ./arch/spell/Bullet/asteroid.151
-\00188 ./arch/spell/Bullet/asteroid.161
-\00189 ./arch/spell/Bullet/asteroid.171
-\00190 ./arch/spell/Bullet/asteroid.181
-\00191 ./arch/misc/Container/attache.111
-\00192 ./arch/spell/Golem/avatar.131
-\00193 ./arch/spell/Golem/avatar.132
-\00194 ./arch/spell/Golem/avatar.171
-\00195 ./arch/spell/Golem/avatar.172
-\00196 ./arch/wall/awall/awall_0.111
-\00197 ./arch/wall/awall/awall_1.111
-\00198 ./arch/wall/awall/awall_1_short.111
-\00199 ./arch/wall/awall/awall_2.111
-\00200 ./arch/wall/awall/awall_2_short.111
-\00201 ./arch/wall/awall/awall_3.111
-\00202 ./arch/wall/awall/awall_4.111
-\00203 ./arch/wall/awall/awall_4_short.111
-\00204 ./arch/wall/awall/awall_5.111
-\00205 ./arch/wall/awall/awall_55.111
-\00206 ./arch/wall/awall/awall_6.111
-\00207 ./arch/wall/awall/awall_7.111
-\00208 ./arch/wall/awall/awall_8.111
-\00209 ./arch/wall/awall/awall_8_short.111
-\00210 ./arch/wall/awall/awall_9.111
-\00211 ./arch/wall/awall/awall_A.111
-\00212 ./arch/wall/awall/awall_AA.111
-\00213 ./arch/wall/awall/awall_B.111
-\00214 ./arch/wall/awall/awall_C.111
-\00215 ./arch/wall/awall/awall_D.111
-\00216 ./arch/wall/awall/awall_E.111
-\00217 ./arch/wall/awall/awall_F.111
-\00218 ./arch/wall/awall/awall_w_0.111
-\00219 ./arch/wall/awall/awall_w_0.112
-\00220 ./arch/wall/awall/awall_w_0.113
-\00221 ./arch/wall/awall/awall_w_0.114
-\00222 ./arch/wall/awall/awall_w_0.115
-\00223 ./arch/wall/awall/awall_w_0.116
-\00224 ./arch/wall/awall/awall_w_0.117
-\00225 ./arch/wall/awall/awall_w_1.111
-\00226 ./arch/wall/awall/awall_w_1.112
-\00227 ./arch/wall/awall/awall_w_1.113
-\00228 ./arch/wall/awall/awall_w_1.114
-\00229 ./arch/wall/awall/awall_w_1.115
-\00230 ./arch/wall/awall/awall_w_1.116
-\00231 ./arch/wall/awall/awall_w_1.117
-\00232 ./arch/wall/awall/awall_w_1.118
-\00233 ./arch/wall/awall/awall_w_1.119
-\00234 ./arch/wall/awall/awall_w_1.11A
-\00235 ./arch/wall/awall/awindow_0.111
-\00236 ./arch/wall/awall/awindow_1.111
-\00237 ./arch/weapon/axe/axe_1.111
-\00238 ./arch/weapon/axe/axe_2.111
-\00239 ./arch/weapon/axe/axe_3.111
-\00240 ./arch/weapon/axe/axe_3_golden.111
-\00241 ./arch/weapon/axe/axe_4.111
-\00242 ./arch/weapon/axe/axe_5.111
-\00243 ./arch/weapon/axe/b_axe1.111
-\00244 ./arch/weapon/sword/b_bsword_1.111
-\00245 ./arch/weapon/sword/b_bsword_2.111
-\00246 ./arch/weapon/sword/b_dagger.111
-\00247 ./arch/armour/helmet/b_fullhelmet.111
-\00248 ./arch/armour/gauntlets/b_gauntlet_s.111
-\00249 ./arch/armour/helmet/b_helmet.111
-\00250 ./arch/armour/helmet/b_hornhelmet.111
-\00251 ./arch/weapon/sword/b_lsword.111
-\00252 ./arch/armour/mail/b_plate_mail.111
-\00253 ./arch/armour/mail/b_scale_mail.111
-\00254 ./arch/weapon/sword/b_scimitar.111
-\00255 ./arch/armour/shield/b_shield.111
-\00256 ./arch/weapon/sword/b_sicklesword.111
-\00257 ./arch/misc/b_slicingknife.111
-\00258 ./arch/armour/shield/b_small_shie.111
-\00259 ./arch/weapon/sword/b_ssword_1.111
-\00260 ./arch/weapon/sword/b_ssword_2.111
-\00261 ./arch/weapon/sword/b_sword_1.111
-\00262 ./arch/weapon/sword/b_sword_2.111
-\00263 ./arch/monster/dragon/baby_drag.111
-\00264 ./arch/monster/dragon/baby_drag.112
-\00265 ./arch/monster/dragon/baby_drag.113
-\00266 ./arch/misc/Container/bag.111
-\00267 ./arch/food/bag_popcorn.111
-\00268 ./arch/misc/Bagpipe/bagpipe.111
-\00269 ./arch/misc/Bagpipe/bagpipe.112
-\00270 ./arch/misc/Bagpipe/bagpipe.113
-\00271 ./arch/misc/Bagpipe/bagpipe.114
-\00272 ./arch/misc/Bagpipe/bagpipe.115
-\00273 ./arch/misc/Bagpipe/bagpipe.116
-\00274 ./arch/misc/Bagpipe/bagpipe.117
-\00275 ./arch/misc/Bagpipe/bagpipe.118
-\00276 ./arch/misc/Bagpipe/bagpipe.119
-\00277 ./arch/misc/Bagpipe/bagpipe.11A
-\00278 ./arch/spell/MovingBall/ball_lightning.111
-\00279 ./arch/spell/MovingBall/ball_lightning.222
-\00280 ./arch/spell/MovingBall/ball_lightning.333
-\00281 ./arch/spell/MovingBall/ball_lightning.444
-\00282 ./arch/spell/Potion/balm_gen.111
-\00283 ./arch/shop/bank.x11
-\00284 ./arch/shop/bank_west.x11
-\00285 ./arch/readable/bankcard.111
-\00286 ./arch/monster/undead/banshee.111
-\00287 ./arch/monster/undead/banshee.112
-\00288 ./arch/player/class/Warrior/barbarian.111
-\00289 ./arch/player/class/Warrior/barbarian.112
-\00290 ./arch/player/class/Warrior/barbarian.131
-\00291 ./arch/player/class/Warrior/barbarian.132
-\00292 ./arch/player/class/Warrior/barbarian.151
-\00293 ./arch/player/class/Warrior/barbarian.152
-\00294 ./arch/player/class/Warrior/barbarian.171
-\00295 ./arch/player/class/Warrior/barbarian.172
-\00296 ./arch/construct/town/barn.x11
-\00297 ./arch/construct/town/barn2.x11
-\00298 ./arch/construct/town/barn2_northwest.x11
-\00299 ./arch/construct/town/barn_west.x11
-\00300 ./arch/construct/barrack/barrack_l.x11
-\00301 ./arch/construct/barrack/barrack_l.x12
-\00302 ./arch/construct/barrack/barrack_s.111
-\00303 ./arch/construct/barrack/barrack_u.x11
-\00304 ./arch/construct/barrack/barrack_u.x12
-\00305 ./arch/indoor/barrel.111
-\00306 ./arch/monster/misc/Baslic/baslic.x31
-\00307 ./arch/monster/misc/Baslic/baslic.x32
-\00308 ./arch/monster/misc/Baslic/baslic.x71
-\00309 ./arch/monster/misc/Baslic/baslic.x72
-\00310 ./arch/monster/animal/bat.111
-\00311 ./arch/monster/animal/bat.112
-\00312 ./arch/monster/animal/bat.113
-\00313 ./arch/monster/animal/bat_gen.111
-\00314 ./arch/flesh/misc/bat_wing.111
-\00315 ./arch/weapon/axe/battle_axe.111
-\00316 ./arch/ground/beach.111
-\00317 ./arch/ground/smooth/beach_S.111
-\00318 ./arch/monster/animal/Bear/bear.x31
-\00319 ./arch/monster/animal/Bear/bear.x32
-\00320 ./arch/monster/animal/Bear/bear.x71
-\00321 ./arch/monster/animal/Bear/bear.x72
-\00322 ./arch/indoor/bed_1.111
-\00323 ./arch/indoor/bed_save.111
-\00324 ./arch/monster/insect/bee/bee.111
-\00325 ./arch/monster/insect/bee/bee.112
-\00326 ./arch/monster/insect/bee/bee_gen.111
-\00327 ./arch/monster/insect/bee/beehive.111
-\00328 ./arch/monster/insect/bee/beehive.112
-\00329 ./arch/monster/humanoid/Arabic/beggar.111
-\00330 ./arch/monster/animal/Behemoth/behemoth.x31
-\00331 ./arch/monster/animal/Behemoth/behemoth.x32
-\00332 ./arch/monster/animal/Behemoth/behemoth.x33
-\00333 ./arch/monster/animal/Behemoth/behemoth.x71
-\00334 ./arch/monster/animal/Behemoth/behemoth.x72
-\00335 ./arch/monster/animal/Behemoth/behemoth.x73
-\00336 ./arch/flesh/misc/behold_eye.111
-\00337 ./arch/monster/beholder/behold_gen.111
-\00338 ./arch/monster/beholder/beholder.111
-\00339 ./arch/monster/beholder/beholder.112
-\00340 ./arch/monster/beholder/beholder.113
-\00341 ./arch/monster/beholder/beholder.114
-\00342 ./arch/monster/beholder/beholder_leader.111
-\00343 ./arch/floor/inlayed/beige-cyan-c-marble.111
-\00344 ./arch/floor/inlayed/beige-cyan-c-marble.112
-\00345 ./arch/floor/inlayed/beige-cyan-c-marble.113
-\00346 ./arch/floor/inlayed/beige-cyan-c-marble.114
-\00347 ./arch/floor/inlayed/beige-green-c-marble.111
-\00348 ./arch/floor/inlayed/beige-green-c-marble.112
-\00349 ./arch/floor/inlayed/beige-green-c-marble.113
-\00350 ./arch/floor/inlayed/beige-green-c-marble.114
-\00351 ./arch/floor/inlayed/beige-pink-c-marble.111
-\00352 ./arch/floor/inlayed/beige-pink-c-marble.112
-\00353 ./arch/floor/inlayed/beige-pink-c-marble.113
-\00354 ./arch/floor/inlayed/beige-pink-c-marble.114
-\00355 ./arch/floor/inlayed/beige-white-c-marble.111
-\00356 ./arch/floor/inlayed/beige-white-c-marble.112
-\00357 ./arch/floor/inlayed/beige-white-c-marble.113
-\00358 ./arch/floor/inlayed/beige-white-c-marble.114
-\00359 ./arch/floor/beigemarble.111
-\00360 ./arch/monster/giant/Belzebub/belzebub.x11
-\00361 ./arch/monster/giant/Belzebub/belzebub.x12
-\00362 ./arch/wall/bench/bench_0.111
-\00363 ./arch/wall/bench/bench_1.111
-\00364 ./arch/wall/bench/bench_2.111
-\00365 ./arch/wall/bench/bench_3.111
-\00366 ./arch/wall/bench/bench_4.111
-\00367 ./arch/wall/bench/bench_5.111
-\00368 ./arch/wall/bench/bench_6.111
-\00369 ./arch/wall/bench/bench_7.111
-\00370 ./arch/wall/bench/bench_8.111
-\00371 ./arch/wall/bench/bench_9.111
-\00372 ./arch/wall/bench/bench_A.111
-\00373 ./arch/wall/bench/bench_B.111
-\00374 ./arch/wall/bench/bench_C.111
-\00375 ./arch/wall/bench/bench_D.111
-\00376 ./arch/wall/bench/bench_E.111
-\00377 ./arch/wall/bench/bench_F.111
-\00378 ./arch/ground/Wood/bforest.111
-\00379 ./arch/weapon/club/big_club.111
-\00380 ./arch/monster/demon/Big_Demon/big_demon.x31
-\00381 ./arch/monster/demon/Big_Demon/big_demon.x71
-\00382 ./arch/flesh/generic/big_eye.111
-\00383 ./arch/monster/humanoid/Arabic/big_slave.111
-\00384 ./arch/monster/giant/Big_Wiz/big_wiz.x11
-\00385 ./arch/monster/giant/Big_Wiz/big_wiz.x12
-\00386 ./arch/monster/giant/Big_Wiz/big_wiz.x13
-\00387 ./arch/monster/giant/Big_Wiz/big_wiz.x14
-\00388 ./arch/monster/giant/Big_Wiz/big_wiz.x15
-\00389 ./arch/monster/giant/Big_Wiz/bigblue_wiz.x11
-\00390 ./arch/monster/giant/Big_Wiz/bigblue_wiz.x12
-\00391 ./arch/monster/giant/Big_Wiz/bigblue_wiz.x13
-\00392 ./arch/monster/giant/Big_Wiz/bigblue_wiz.x14
-\00393 ./arch/monster/giant/Big_Wiz/bigblue_wiz.x15
-\00394 ./arch/transport/biggalleon.x11
-\00395 ./arch/armour/helmet/bighorn_he.111
-\00396 ./arch/monster/animal/bird.111
-\00397 ./arch/monster/animal/bird.112
-\00398 ./arch/monster/animal/bird.131
-\00399 ./arch/monster/animal/bird.132
-\00400 ./arch/monster/animal/bird.151
-\00401 ./arch/monster/animal/bird.152
-\00402 ./arch/monster/animal/bird.171
-\00403 ./arch/monster/animal/bird.172
-\00404 ./arch/monster/animal/bird_gen.111
-\00405 ./arch/monster/humanoid/Dragon/black_dragon2.151
-\00406 ./arch/monster/humanoid/Dragon/black_dragon2.152
-\00407 ./arch/monster/humanoid/Dragon/black_dragon2.171
-\00408 ./arch/monster/humanoid/Dragon/black_dragon2.172
-\00409 ./arch/misc/blackfirebullet.111
-\00410 ./arch/misc/blackfirebullet.121
-\00411 ./arch/misc/blackfirebullet.131
-\00412 ./arch/misc/blackfirebullet.141
-\00413 ./arch/misc/blackfirebullet.151
-\00414 ./arch/misc/blackfirebullet.161
-\00415 ./arch/misc/blackfirebullet.171
-\00416 ./arch/misc/blackfirebullet.181
-\00417 ./arch/floor/blackmarble.111
-\00418 ./arch/ground/blackrock.111
-\00419 ./arch/ground/smooth/blackrock_S.111
-\00420 ./arch/food/blackroot.111
-\00421 ./arch/traps/blades.111
-\00422 ./arch/ground/Lake/blake_0.111
-\00423 ./arch/ground/Lake/blake_1.111
-\00424 ./arch/ground/Lake/blake_1.112
-\00425 ./arch/ground/Lake/blake_1.113
-\00426 ./arch/ground/Lake/blake_1.114
-\00427 ./arch/ground/Lake/blake_2.111
-\00428 ./arch/ground/Lake/blake_2.112
-\00429 ./arch/ground/Lake/blake_2.113
-\00430 ./arch/ground/Lake/blake_2.114
-\00431 ./arch/ground/Lake/blake_3.111
-\00432 ./arch/ground/Lake/blake_3.112
-\00433 ./arch/ground/Lake/blake_3.113
-\00434 ./arch/ground/Lake/blake_3.114
-\00435 ./arch/ground/Lake/blake_4.111
-\00436 ./arch/ground/Lake/blake_4.112
-\00437 ./arch/ground/Lake/blake_4.113
-\00438 ./arch/ground/Lake/blake_4.114
-\00439 ./arch/ground/Lake/blake_5.111
-\00440 ./arch/ground/Lake/blake_5.112
-\00441 ./arch/ground/Lake/blake_5.113
-\00442 ./arch/ground/Lake/blake_5.114
-\00443 ./arch/ground/Lake/blake_6.111
-\00444 ./arch/ground/Lake/blake_6.112
-\00445 ./arch/ground/Lake/blake_6.113
-\00446 ./arch/ground/Lake/blake_6.114
-\00447 ./arch/ground/Lake/blake_7.111
-\00448 ./arch/ground/Lake/blake_7.112
-\00449 ./arch/ground/Lake/blake_7.113
-\00450 ./arch/ground/Lake/blake_7.114
-\00451 ./arch/ground/Lake/blake_8.111
-\00452 ./arch/ground/Lake/blake_8.112
-\00453 ./arch/ground/Lake/blake_8.113
-\00454 ./arch/ground/Lake/blake_8.114
-\00455 ./arch/ground/Lake/blake_9.111
-\00456 ./arch/ground/Lake/blake_9.112
-\00457 ./arch/ground/Lake/blake_9.113
-\00458 ./arch/ground/Lake/blake_9.114
-\00459 ./arch/ground/Lake/blake_A.111
-\00460 ./arch/ground/Lake/blake_A.112
-\00461 ./arch/ground/Lake/blake_A.113
-\00462 ./arch/ground/Lake/blake_A.114
-\00463 ./arch/ground/Lake/blake_B.111
-\00464 ./arch/ground/Lake/blake_B.112
-\00465 ./arch/ground/Lake/blake_B.113
-\00466 ./arch/ground/Lake/blake_B.114
-\00467 ./arch/ground/Lake/blake_C.111
-\00468 ./arch/ground/Lake/blake_C.112
-\00469 ./arch/ground/Lake/blake_C.113
-\00470 ./arch/ground/Lake/blake_C.114
-\00471 ./arch/ground/Lake/blake_D.111
-\00472 ./arch/ground/Lake/blake_D.112
-\00473 ./arch/ground/Lake/blake_D.113
-\00474 ./arch/ground/Lake/blake_D.114
-\00475 ./arch/ground/Lake/blake_E.111
-\00476 ./arch/ground/Lake/blake_E.112
-\00477 ./arch/ground/Lake/blake_E.113
-\00478 ./arch/ground/Lake/blake_E.114
-\00479 ./arch/ground/Lake/blake_F.111
-\00480 ./arch/ground/Lake/blake_F.112
-\00481 ./arch/ground/Lake/blake_F.113
-\00482 ./arch/ground/Lake/blake_F.114
-\00483 ./arch/system/blank.111
-\00484 ./arch/monster/misc/blob.111
-\00485 ./arch/monster/misc/blob.112
-\00486 ./arch/monster/misc/blob.113
-\00487 ./arch/system/blocked.111
-\00488 ./arch/system/blocked_blue.111
-\00489 ./arch/system/blocked_cyan.111
-\00490 ./arch/system/blocked_darkblue.111
-\00491 ./arch/system/blocked_darkmagenta.111
-\00492 ./arch/system/blocked_gray.111
-\00493 ./arch/system/blocked_green.111
-\00494 ./arch/system/blocked_lightgray.111
-\00495 ./arch/system/blocked_lime.111
-\00496 ./arch/system/blocked_magenta.111
-\00497 ./arch/system/blocked_maroon.111
-\00498 ./arch/system/blocked_olive.111
-\00499 ./arch/system/blocked_red.111
-\00500 ./arch/system/blocked_teal.111
-\00501 ./arch/system/blocked_white.111
-\00502 ./arch/system/blocked_yellow.111
-\00503 ./arch/misc/blood.111
-\00504 ./arch/ground/blood_sea.111
-\00505 ./arch/ground/blood_sea.112
-\00506 ./arch/ground/blood_sea.113
-\00507 ./arch/ground/blood_sea.114
-\00508 ./arch/ground/smooth/blood_sea_S.111
-\00509 ./arch/ground/smooth/blood_sea_S.112
-\00510 ./arch/ground/smooth/blood_sea_S.113
-\00511 ./arch/ground/smooth/blood_sea_S.114
-\00512 ./arch/jewel/blue_crystal.111
-\00513 ./arch/monster/humanoid/Dragon/blue_dragon2.151
-\00514 ./arch/monster/humanoid/Dragon/blue_dragon2.152
-\00515 ./arch/monster/humanoid/Dragon/blue_dragon2.171
-\00516 ./arch/monster/humanoid/Dragon/blue_dragon2.172
-\00517 ./arch/armour/mail/bluedragonmail.111
-\00518 ./arch/floor/bluemarble.111
-\00519 ./arch/floor/bluemarblemedium.111
-\00520 ./arch/monster/acid/bluesphere.111
-\00521 ./arch/monster/acid/bluesphere.112
-\00522 ./arch/monster/acid/bluesphere.113
-\00523 ./arch/monster/acid/bluesphere.114
-\00524 ./arch/weapon/bow/bolt.101
-\00525 ./arch/weapon/bow/bolt.111
-\00526 ./arch/weapon/bow/bolt.121
-\00527 ./arch/weapon/bow/bolt.131
-\00528 ./arch/weapon/bow/bolt.141
-\00529 ./arch/weapon/bow/bolt.151
-\00530 ./arch/weapon/bow/bolt.161
-\00531 ./arch/weapon/bow/bolt.171
-\00532 ./arch/weapon/bow/bolt.181
-\00533 ./arch/misc/item/bolt_silk.111
-\00534 ./arch/spell/Bomb/bomb.111
-\00535 ./arch/spell/Bomb/bomb.112
-\00536 ./arch/spell/Bomb/bomb.113
-\00537 ./arch/spell/Bomb/bomb.114
-\00538 ./arch/monster/dragon/bone_drake/bone_drake.x11
-\00539 ./arch/monster/dragon/bone_drake/bone_drake.x12
-\00540 ./arch/monster/demon/bone_head.111
-\00541 ./arch/monster/demon/bone_head.112
-\00542 ./arch/monster/demon/bone_head.113
-\00543 ./arch/weapon/artifact/bonecrush.111
-\00544 ./arch/misc/bones1.111
-\00545 ./arch/misc/bones2.111
-\00546 ./arch/misc/bones3.111
-\00547 ./arch/misc/bones4.111
-\00548 ./arch/misc/bones5.111
-\00549 ./arch/readable/book_clasp.111
-\00550 ./arch/readable/book_read.111
-\00551 ./arch/readable/guide/book_red.111
-\00552 ./arch/misc/Container/bookshelf.111
-\00553 ./arch/misc/Container/bookshelf2.111
-\00554 ./arch/misc/Container/bookshelf_bottom.111
-\00555 ./arch/misc/Container/bookshelf_left.111
-\00556 ./arch/misc/Container/bookshelf_right.111
-\00557 ./arch/food/booze.111
-\00558 ./arch/food/boozebottle_empty.111
-\00559 ./arch/misc/boulder.111
-\00560 ./arch/misc/bouquet.111
-\00561 ./arch/weapon/bow/bow.111
-\00562 ./arch/monster/acid/bpudding.111
-\00563 ./arch/monster/acid/bpudding.112
-\00564 ./arch/monster/acid/bpudding_g.111
-\00565 ./arch/monster/acid/bpudding_g.112
-\00566 ./arch/monster/acid/bpudding_g.113
-\00567 ./arch/monster/acid/bpudding_g.114
-\00568 ./arch/monster/acid/bpudding_g.115
-\00569 ./arch/monster/acid/bpudding_g.116
-\00570 ./arch/monster/acid/bpudding_g.117
-\00571 ./arch/monster/acid/bpudding_g.118
-\00572 ./arch/monster/acid/bpudding_g.119
-\00573 ./arch/monster/acid/bpudding_s.111
-\00574 ./arch/monster/acid/bpudding_s.112
-\00575 ./arch/monster/acid/bpudding_s.113
-\00576 ./arch/monster/acid/bpudding_s.114
-\00577 ./arch/armour/bracers/bracers_ac.111
-\00578 ./arch/armour/bracers/bracersdex.111
-\00579 ./arch/flesh/generic/brain.111
-\00580 ./arch/river/branch_125.111
-\00581 ./arch/river/branch_125.211
-\00582 ./arch/river/branch_135.111
-\00583 ./arch/river/branch_137.111
-\00584 ./arch/river/branch_145.111
-\00585 ./arch/river/branch_145.211
-\00586 ./arch/river/branch_156.111
-\00587 ./arch/river/branch_156.211
-\00588 ./arch/river/branch_157.111
-\00589 ./arch/river/branch_158.111
-\00590 ./arch/river/branch_158.211
-\00591 ./arch/river/branch_237.111
-\00592 ./arch/river/branch_237.211
-\00593 ./arch/river/branch_347.111
-\00594 ./arch/river/branch_347.211
-\00595 ./arch/river/branch_357.111
-\00596 ./arch/river/branch_367.111
-\00597 ./arch/river/branch_367.211
-\00598 ./arch/river/branch_378.111
-\00599 ./arch/river/branch_378.211
-\00600 ./arch/misc/brazier.111
-\00601 ./arch/misc/brazier.112
-\00602 ./arch/misc/brazier.113
-\00603 ./arch/misc/brazier.114
-\00604 ./arch/weapon/axe/brdaxe_1.111
-\00605 ./arch/weapon/axe/brdaxe_1.112
-\00606 ./arch/weapon/axe/brdaxe_1.113
-\00607 ./arch/weapon/axe/brdaxe_1.114
-\00608 ./arch/monster/insect/ant/breeder_ant.x11
-\00609 ./arch/monster/insect/ant/breeder_ant.x12
-\00610 ./arch/ground/brefjell.111
-\00611 ./arch/river/bridge_15.111
-\00612 ./arch/river/bridge_37.111
-\00613 ./arch/wall/gwall/bridge_m0.111
-\00614 ./arch/wall/gwall/bridge_m1.111
-\00615 ./arch/jewel/bronzebar.111
-\00616 ./arch/monster/misc/broo.111
-\00617 ./arch/monster/misc/broo.112
-\00618 ./arch/monster/misc/broo.113
-\00619 ./arch/ground/Wood/brush.111
-\00620 ./arch/weapon/sword/bsword_1.111
-\00621 ./arch/weapon/sword/bsword_2.111
-\00622 ./arch/construct/town/building10_east.x11
-\00623 ./arch/construct/town/building1_east.111
-\00624 ./arch/construct/town/building2_east.x11
-\00625 ./arch/construct/town/building3_east.x11
-\00626 ./arch/construct/town/building4_east.x11
-\00627 ./arch/construct/town/building5_east.x11
-\00628 ./arch/construct/town/building6_east.x11
-\00629 ./arch/construct/town/building7_east.x11
-\00630 ./arch/construct/town/building8_east.x11
-\00631 ./arch/construct/town/building9_east.x11
-\00632 ./arch/wall/bulletwall/bul_wall_0.111
-\00633 ./arch/wall/bulletwall/bul_wall_1.111
-\00634 ./arch/wall/bulletwall/bul_wall_2.111
-\00635 ./arch/wall/bulletwall/bul_wall_3.111
-\00636 ./arch/wall/bulletwall/bul_wall_4.111
-\00637 ./arch/wall/bulletwall/bul_wall_5.111
-\00638 ./arch/wall/bulletwall/bul_wall_6.111
-\00639 ./arch/wall/bulletwall/bul_wall_7.111
-\00640 ./arch/wall/bulletwall/bul_wall_8.111
-\00641 ./arch/spell/Bullet/bullet.111
-\00642 ./arch/spell/Bullet/bullet.112
-\00643 ./arch/spell/Bullet/bullet.121
-\00644 ./arch/spell/Bullet/bullet.131
-\00645 ./arch/spell/Bullet/bullet.141
-\00646 ./arch/spell/Bullet/bullet.151
-\00647 ./arch/spell/Bullet/bullet.161
-\00648 ./arch/spell/Bullet/bullet.171
-\00649 ./arch/spell/Bullet/bullet.181
-\00650 ./arch/construct/bungalow.111
-\00651 ./arch/planes/fire/burning_barn.x11
-\00652 ./arch/planes/fire/burning_cathedral.x11
-\00653 ./arch/planes/fire/burning_church.x11
-\00654 ./arch/planes/fire/burning_collesium.x11
-\00655 ./arch/planes/fire/burning_courthouse.x11
-\00656 ./arch/planes/fire/burning_fort.x11
-\00657 ./arch/planes/fire/burning_fort_sym.111
-\00658 ./arch/planes/fire/burning_fountain.111
-\00659 ./arch/planes/fire/burning_fountain.112
-\00660 ./arch/planes/fire/burning_fountain.113
-\00661 ./arch/planes/fire/burning_guild.x11
-\00662 ./arch/planes/fire/burning_house_1.111
-\00663 ./arch/planes/fire/burning_house_larg.x11
-\00664 ./arch/planes/fire/burning_house_long.x11
-\00665 ./arch/planes/fire/burning_house_up.x11
-\00666 ./arch/planes/fire/burning_housesmall.111
-\00667 ./arch/planes/fire/burning_l_shop1.x11
-\00668 ./arch/planes/fire/burning_market1.111
-\00669 ./arch/planes/fire/burning_market2.111
-\00670 ./arch/planes/fire/burning_market3.111
-\00671 ./arch/planes/fire/burning_shrine.111
-\00672 ./arch/planes/fire/burning_smalltemple.111
-\00673 ./arch/planes/fire/burning_store_alch.x11
-\00674 ./arch/planes/fire/burning_store_armo.x11
-\00675 ./arch/planes/fire/burning_store_gene.x11
-\00676 ./arch/planes/fire/burning_store_magi.x11
-\00677 ./arch/planes/fire/burning_store_weap.x11
-\00678 ./arch/planes/fire/burning_stronghold.x11
-\00679 ./arch/planes/fire/burning_t_house2.x11
-\00680 ./arch/planes/fire/burning_temple1.x11
-\00681 ./arch/gods/items/burning_tail/burningtail.111
-\00682 ./arch/gods/items/burning_tail/burningtail.112
-\00683 ./arch/gods/items/burning_tail/burningtail.113
-\00684 ./arch/planes/fire/burningwall/burningwall_0.111
-\00685 ./arch/planes/fire/burningwall/burningwall_0.112
-\00686 ./arch/planes/fire/burningwall/burningwall_1.111
-\00687 ./arch/planes/fire/burningwall/burningwall_1.112
-\00688 ./arch/planes/fire/burningwall/burningwall_2.111
-\00689 ./arch/planes/fire/burningwall/burningwall_2.112
-\00690 ./arch/planes/fire/burningwall/burningwall_3.111
-\00691 ./arch/planes/fire/burningwall/burningwall_3.112
-\00692 ./arch/planes/fire/burningwall/burningwall_4.111
-\00693 ./arch/planes/fire/burningwall/burningwall_4.112
-\00694 ./arch/planes/fire/burningwall/burningwall_5.111
-\00695 ./arch/planes/fire/burningwall/burningwall_5.112
-\00696 ./arch/planes/fire/burningwall/burningwall_6.111
-\00697 ./arch/planes/fire/burningwall/burningwall_6.112
-\00698 ./arch/planes/fire/burningwall/burningwall_7.111
-\00699 ./arch/planes/fire/burningwall/burningwall_7.112
-\00700 ./arch/planes/fire/burningwall/burningwall_8.111
-\00701 ./arch/planes/fire/burningwall/burningwall_8.112
-\00702 ./arch/planes/fire/burningwall/burningwall_9.111
-\00703 ./arch/planes/fire/burningwall/burningwall_9.112
-\00704 ./arch/planes/fire/burningwall/burningwall_A.111
-\00705 ./arch/planes/fire/burningwall/burningwall_A.112
-\00706 ./arch/planes/fire/burningwall/burningwall_B.111
-\00707 ./arch/planes/fire/burningwall/burningwall_B.112
-\00708 ./arch/planes/fire/burningwall/burningwall_C.111
-\00709 ./arch/planes/fire/burningwall/burningwall_C.112
-\00710 ./arch/planes/fire/burningwall/burningwall_D.111
-\00711 ./arch/planes/fire/burningwall/burningwall_D.112
-\00712 ./arch/planes/fire/burningwall/burningwall_E.111
-\00713 ./arch/planes/fire/burningwall/burningwall_E.112
-\00714 ./arch/planes/fire/burningwall/burningwall_F.111
-\00715 ./arch/planes/fire/burningwall/burningwall_F.112
-\00716 ./arch/spell/Burnout/burnout.111
-\00717 ./arch/spell/Burnout/burnout.112
-\00718 ./arch/spell/Burnout/burnout.113
-\00719 ./arch/spell/Burnout/burnout.114
-\00720 ./arch/spell/Burnout/burnout.115
-\00721 ./arch/spell/Burnout/burnout.116
-\00722 ./arch/spell/Burnout/burnout.117
-\00723 ./arch/spell/Burnout/burnout.118
-\00724 ./arch/spell/Burnout/burnout.119
-\00725 ./arch/spell/Burnout/burnout.11A
-\00726 ./arch/spell/Burnout/burnout.11B
-\00727 ./arch/spell/Burnout/burnout.11C
-\00728 ./arch/spell/Burnout/burnout.11D
-\00729 ./arch/spell/Burnout/burnout.11E
-\00730 ./arch/spell/Burnout/burnout.11F
-\00731 ./arch/spell/Burnout/burnout.11G
-\00732 ./arch/spell/Burnout/burnout.11H
-\00733 ./arch/spell/Burnout/burnout.11J
-\00734 ./arch/spell/Burnout/burnout.11K
-\00735 ./arch/spell/Burnout/burnout.11L
-\00736 ./arch/spell/Burnout/burnout.11M
-\00737 ./arch/spell/Burnout/burnout.11N
-\00738 ./arch/spell/Burnout/burnout.11O
-\00739 ./arch/spell/Burnout/burnout.11P
-\00740 ./arch/spell/Burnout/burnout.11Q
-\00741 ./arch/spell/Burnout/burnout.11R
-\00742 ./arch/weapon/sword/butterflysword_1.111
-\00743 ./arch/weapon/sword/butterflysword_2.111
-\00744 ./arch/connect/button_big.111
-\00745 ./arch/connect/button_big.112
-\00746 ./arch/connect/button_sma.111
-\00747 ./arch/connect/button_sma.112
-\00748 ./arch/wall/bwall/bwall_0.111
-\00749 ./arch/wall/bwall/bwall_1.111
-\00750 ./arch/wall/bwall/bwall_2.111
-\00751 ./arch/wall/bwall/bwall_3.111
-\00752 ./arch/wall/bwall/bwall_4.111
-\00753 ./arch/wall/bwall/bwall_5.111
-\00754 ./arch/wall/bwall/bwall_6.111
-\00755 ./arch/wall/bwall/bwall_7.111
-\00756 ./arch/wall/bwall/bwall_8.111
-\00757 ./arch/wall/bwall/bwall_9.111
-\00758 ./arch/wall/bwall/bwall_A.111
-\00759 ./arch/wall/bwall/bwall_B.111
-\00760 ./arch/wall/bwall/bwall_C.111
-\00761 ./arch/wall/bwall/bwall_D.111
-\00762 ./arch/wall/bwall/bwall_E.111
-\00763 ./arch/wall/bwall/bwall_F.111
-\00764 ./arch/wall/bwall/bwall_hole_5.111
-\00765 ./arch/wall/bwall/bwall_hole_A.111
-\00766 ./arch/wall/bwall/bwall_w_0.111
-\00767 ./arch/wall/bwall/bwall_w_0.112
-\00768 ./arch/wall/bwall/bwall_w_0.113
-\00769 ./arch/wall/bwall/bwall_w_0.114
-\00770 ./arch/wall/bwall/bwall_w_0.115
-\00771 ./arch/wall/bwall/bwall_w_0.116
-\00772 ./arch/wall/bwall/bwall_w_0.117
-\00773 ./arch/wall/bwall/bwall_w_1.111
-\00774 ./arch/wall/bwall/bwall_w_1.112
-\00775 ./arch/wall/bwall/bwall_w_1.113
-\00776 ./arch/wall/bwall/bwall_w_1.114
-\00777 ./arch/wall/bwall/bwall_w_1.115
-\00778 ./arch/wall/bwall/bwall_w_1.116
-\00779 ./arch/wall/bwall/bwall_w_1.117
-\00780 ./arch/monster/giant/byakie/byakie.x11
-\00781 ./arch/monster/giant/byakie/byakie.x12
-\00782 ./arch/monster/misc/c_knight.111
-\00783 ./arch/monster/misc/c_knight.112
-\00784 ./arch/monster/misc/c_priest.131
-\00785 ./arch/monster/misc/c_priest.132
-\00786 ./arch/monster/misc/c_priest.171
-\00787 ./arch/monster/misc/c_priest.172
-\00788 ./arch/food/cabbage.111
-\00789 ./arch/food/cake.111
-\00790 ./arch/system/mood_floors/calm_floor.111
-\00791 ./arch/misc/Camp/campfire.111
-\00792 ./arch/misc/Camp/campfire.112
-\00793 ./arch/misc/Camp/campfire.113
-\00794 ./arch/misc/Camp/campfire.114
-\00795 ./arch/misc/Camp/campfire_out.111
-\00796 ./arch/spell/Bolt/cancellation.111
-\00797 ./arch/spell/Bolt/cancellation.112
-\00798 ./arch/spell/Bolt/cancellation.113
-\00799 ./arch/misc/cannon_0.111
-\00800 ./arch/misc/cannon_1.111
-\00801 ./arch/misc/cannon_2.111
-\00802 ./arch/misc/cannon_3.111
-\00803 ./arch/misc/cannon_4.111
-\00804 ./arch/misc/cannon_5.111
-\00805 ./arch/misc/cannon_6.111
-\00806 ./arch/misc/cannon_7.111
-\00807 ./arch/misc/cannon_8.111
-\00808 ./arch/construct/keep/capitalhold_east.x11
-\00809 ./arch/construct/keep/capitalhold_west.x11
-\00810 ./arch/food/caramel.111
-\00811 ./arch/readable/card.111
-\00812 ./arch/readable/card_crown.111
-\00813 ./arch/readable/card_cup.111
-\00814 ./arch/readable/card_dragon.111
-\00815 ./arch/readable/card_ring.111
-\00816 ./arch/readable/card_skull.111
-\00817 ./arch/readable/card_sword.111
-\00818 ./arch/food/carrot.111
-\00819 ./arch/misc/Container/carton_box_1.111
-\00820 ./arch/misc/Container/carton_box_1_open.111
-\00821 ./arch/construct/castle/castle.111
-\00822 ./arch/construct/castle/castle_a.x11
-\00823 ./arch/construct/castle/castle_a.x12
-\00824 ./arch/construct/castle/castle_a_east.x11
-\00825 ./arch/construct/castle/castle_a_northwest.x11
-\00826 ./arch/construct/castle/castle_a_northwest.x12
-\00827 ./arch/construct/castle/castle_a_western.x11
-\00828 ./arch/construct/castle/castle_a_western.x12
-\00829 ./arch/construct/castle/castle_west.111
-\00830 ./arch/construct/temple/cathedral.x11
-\00831 ./arch/misc/Container/cauldron.111
-\00832 ./arch/misc/Container/cauldron_open.111
-\00833 ./arch/spell/Bullet/cause.111
-\00834 ./arch/spell/Bullet/cause.112
-\00835 ./arch/wall/cave/cave1.111
-\00836 ./arch/wall/cave/cave10.111
-\00837 ./arch/wall/cave/cave11.111
-\00838 ./arch/wall/cave/cave12.111
-\00839 ./arch/wall/cave/cave13.111
-\00840 ./arch/wall/cave/cave14.111
-\00841 ./arch/wall/cave/cave15.111
-\00842 ./arch/wall/cave/cave16.111
-\00843 ./arch/wall/cave/cave17.111
-\00844 ./arch/wall/cave/cave18.111
-\00845 ./arch/wall/cave/cave19.111
-\00846 ./arch/wall/cave/cave2.111
-\00847 ./arch/wall/cave/cave20.111
-\00848 ./arch/wall/cave/cave21.111
-\00849 ./arch/wall/cave/cave22.111
-\00850 ./arch/wall/cave/cave23.111
-\00851 ./arch/wall/cave/cave24.111
-\00852 ./arch/wall/cave/cave25.111
-\00853 ./arch/wall/cave/cave3.111
-\00854 ./arch/wall/cave/cave4.111
-\00855 ./arch/wall/cave/cave5.111
-\00856 ./arch/wall/cave/cave6.111
-\00857 ./arch/wall/cave/cave7.111
-\00858 ./arch/wall/cave/cave8.111
-\00859 ./arch/wall/cave/cave9.111
-\00860 ./arch/wall/cave/cave_0.111
-\00861 ./arch/wall/cave/cave_1.111
-\00862 ./arch/wall/cave/cave_10.111
-\00863 ./arch/wall/cave/cave_11.111
-\00864 ./arch/wall/cave/cave_12.111
-\00865 ./arch/wall/cave/cave_13.111
-\00866 ./arch/wall/cave/cave_14.111
-\00867 ./arch/wall/cave/cave_15.111
-\00868 ./arch/wall/cave/cave_2.111
-\00869 ./arch/wall/cave/cave_3.111
-\00870 ./arch/wall/cave/cave_4.111
-\00871 ./arch/wall/cave/cave_5.111
-\00872 ./arch/wall/cave/cave_6.111
-\00873 ./arch/wall/cave/cave_7.111
-\00874 ./arch/wall/cave/cave_8.111
-\00875 ./arch/wall/cave/cave_9.111
-\00876 ./arch/exit/Up_down/cave_stair_up_2.111
-\00877 ./arch/monster/insect/centipede/centipede.111
-\00878 ./arch/monster/insect/centipede/centipede.112
-\00879 ./arch/monster/insect/centipede/centipede.113
-\00880 ./arch/monster/insect/centipede/centipede.114
-\00881 ./arch/monster/insect/centipede/centipede.121
-\00882 ./arch/monster/insect/centipede/centipede.122
-\00883 ./arch/monster/insect/centipede/centipede.123
-\00884 ./arch/monster/insect/centipede/centipede.124
-\00885 ./arch/monster/insect/centipede/centipede.131
-\00886 ./arch/monster/insect/centipede/centipede.132
-\00887 ./arch/monster/insect/centipede/centipede.133
-\00888 ./arch/monster/insect/centipede/centipede.134
-\00889 ./arch/monster/insect/centipede/centipede.141
-\00890 ./arch/monster/insect/centipede/centipede.142
-\00891 ./arch/monster/insect/centipede/centipede.143
-\00892 ./arch/monster/insect/centipede/centipede.144
-\00893 ./arch/monster/insect/centipede/centipede.151
-\00894 ./arch/monster/insect/centipede/centipede.152
-\00895 ./arch/monster/insect/centipede/centipede.153
-\00896 ./arch/monster/insect/centipede/centipede.154
-\00897 ./arch/monster/insect/centipede/centipede.161
-\00898 ./arch/monster/insect/centipede/centipede.162
-\00899 ./arch/monster/insect/centipede/centipede.163
-\00900 ./arch/monster/insect/centipede/centipede.164
-\00901 ./arch/monster/insect/centipede/centipede.171
-\00902 ./arch/monster/insect/centipede/centipede.172
-\00903 ./arch/monster/insect/centipede/centipede.173
-\00904 ./arch/monster/insect/centipede/centipede.174
-\00905 ./arch/monster/insect/centipede/centipede.181
-\00906 ./arch/monster/insect/centipede/centipede.182
-\00907 ./arch/monster/insect/centipede/centipede.183
-\00908 ./arch/monster/insect/centipede/centipede.184
-\00909 ./arch/monster/insect/centipede/centipede_r.111
-\00910 ./arch/monster/insect/centipede/centipede_r.112
-\00911 ./arch/monster/insect/centipede/centipede_r.113
-\00912 ./arch/ground/Winter/cforest1.111
-\00913 ./arch/ground/Winter/cforest2.111
-\00914 ./arch/ground/Winter/cforest3.111
-\00915 ./arch/ground/Winter/cforest4.111
-\00916 ./arch/ground/Winter/cforest5.111
-\00917 ./arch/ground/Winter/cforest6.111
-\00918 ./arch/monster/misc/Chess/ch_bish.111
-\00919 ./arch/monster/misc/Chess/ch_bish_w.111
-\00920 ./arch/food/ch_burger.111
-\00921 ./arch/monster/misc/Chess/ch_king.111
-\00922 ./arch/monster/misc/Chess/ch_king_w.111
-\00923 ./arch/monster/misc/Chess/ch_knight.111
-\00924 ./arch/monster/misc/Chess/ch_knight_w.111
-\00925 ./arch/monster/misc/Chess/ch_pawn.111
-\00926 ./arch/monster/misc/Chess/ch_pawn_w.111
-\00927 ./arch/monster/misc/Chess/ch_queen.111
-\00928 ./arch/monster/misc/Chess/ch_queen_w.111
-\00929 ./arch/monster/misc/Chess/ch_rook.111
-\00930 ./arch/monster/misc/Chess/ch_rook_w.111
-\00931 ./arch/armour/mail/chainmail.111
-\00932 ./arch/indoor/chair.111
-\00933 ./arch/indoor/chair_1.101
-\00934 ./arch/indoor/chair_1.111
-\00935 ./arch/indoor/chair_1.121
-\00936 ./arch/indoor/chair_1.131
-\00937 ./arch/indoor/chair_2.101
-\00938 ./arch/indoor/chair_2.111
-\00939 ./arch/indoor/chair_2.121
-\00940 ./arch/indoor/chair_2.131
-\00941 ./arch/indoor/chair_3.101
-\00942 ./arch/indoor/chair_3.111
-\00943 ./arch/indoor/chair_bc_2.101
-\00944 ./arch/indoor/chair_bc_2.111
-\00945 ./arch/indoor/chair_bc_2.121
-\00946 ./arch/indoor/chair_bc_2.131
-\00947 ./arch/indoor/chair_cw_1.101
-\00948 ./arch/indoor/chair_cw_1.111
-\00949 ./arch/indoor/chair_cw_1.121
-\00950 ./arch/indoor/chair_cw_1.131
-\00951 ./arch/indoor/chair_gv_1.101
-\00952 ./arch/indoor/chair_gv_1.111
-\00953 ./arch/indoor/chair_gv_1.121
-\00954 ./arch/indoor/chair_gv_1.131
-\00955 ./arch/indoor/chair_wv_1.101
-\00956 ./arch/indoor/chair_wv_1.111
-\00957 ./arch/indoor/chair_wv_1.121
-\00958 ./arch/indoor/chair_wv_1.131
-\00959 ./arch/misc/chalice.111
-\00960 ./arch/misc/chalice.112
-\00961 ./arch/misc/chalice.113
-\00962 ./arch/misc/chalice.114
-\00963 ./arch/misc/chalice_bro.111
-\00964 ./arch/misc/chalice_bro.112
-\00965 ./arch/misc/chalice_bro.113
-\00966 ./arch/misc/chalice_bro.114
-\00967 ./arch/misc/chalice_cop.111
-\00968 ./arch/misc/chalice_cop.112
-\00969 ./arch/misc/chalice_cop.113
-\00970 ./arch/misc/chalice_cop.114
-\00971 ./arch/misc/chalice_iro.111
-\00972 ./arch/misc/chalice_iro.112
-\00973 ./arch/misc/chalice_iro.113
-\00974 ./arch/misc/chalice_iro.114
-\00975 ./arch/misc/chalice_plat.111
-\00976 ./arch/misc/chalice_plat.112
-\00977 ./arch/misc/chalice_plat.113
-\00978 ./arch/misc/chalice_plat.114
-\00979 ./arch/misc/chalice_sil.111
-\00980 ./arch/misc/chalice_sil.112
-\00981 ./arch/misc/chalice_sil.113
-\00982 ./arch/misc/chalice_sil.114
-\00983 ./arch/misc/chalice_tin.111
-\00984 ./arch/misc/chalice_tin.112
-\00985 ./arch/misc/chalice_tin.113
-\00986 ./arch/misc/chalice_tin.114
-\00987 ./arch/misc/chandelier_1.x11
-\00988 ./arch/misc/chandelier_2.111
-\00989 ./arch/misc/chandelier_2.112
-\00990 ./arch/misc/chandelier_2.113
-\00991 ./arch/misc/chandelier_2.114
-\00992 ./arch/misc/chandelier_2_copper.111
-\00993 ./arch/misc/chandelier_2_copper.112
-\00994 ./arch/misc/chandelier_2_copper.113
-\00995 ./arch/misc/chandelier_2_copper.114
-\00996 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x31
-\00997 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x32
-\00998 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x33
-\00999 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x34
-\01000 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x71
-\01001 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x72
-\01002 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x73
-\01003 ./arch/monster/dragon/Chaos_Dra/chaos_dragon.x74
-\01004 ./arch/spell/MoodChange/charm_aura.111
-\01005 ./arch/spell/MoodChange/charm_aura.112
-\01006 ./arch/spell/MoodChange/charm_aura.113
-\01007 ./arch/system/mood_floors/charm_floor.111
-\01008 ./arch/monster/humanoid/Human/charwoman.131
-\01009 ./arch/monster/humanoid/Human/charwoman.132
-\01010 ./arch/monster/humanoid/Human/charwoman.171
-\01011 ./arch/monster/humanoid/Human/charwoman.172
-\01012 ./arch/system/mood_floors/check_floor.111
-\01013 ./arch/connect/check_inv.111
-\01014 ./arch/readable/checkbook.111
-\01015 ./arch/construct/roof/chemney_1.111
-\01016 ./arch/construct/roof/chemney_2.111
-\01017 ./arch/monster/angel/cherub.111
-\01018 ./arch/construct/house/chess_club.111
-\01019 ./arch/misc/Container/chest_1.111
-\01020 ./arch/misc/Container/chest_green_1.111
-\01021 ./arch/misc/Container/chest_jade_1.111
-\01022 ./arch/misc/Container/chest_valriel_1.111
-\01023 ./arch/misc/Container/chest_valriel_1.112
-\01024 ./arch/misc/Container/chest_valriel_1.113
-\01025 ./arch/misc/Container/chest_valriel_1.114
-\01026 ./arch/misc/Container/chest_white_1.111
-\01027 ./arch/monster/animal/farmyard/chicken.131
-\01028 ./arch/monster/animal/farmyard/chicken.132
-\01029 ./arch/monster/animal/farmyard/chicken.171
-\01030 ./arch/monster/animal/farmyard/chicken.172
-\01031 ./arch/monster/humanoid/Human/child.111
-\01032 ./arch/monster/humanoid/Human/child2.111
-\01033 ./arch/monster/dragon/Chinese_Dra/chinese_dr.x31
-\01034 ./arch/monster/dragon/Chinese_Dra/chinese_dr.x32
-\01035 ./arch/monster/dragon/Chinese_Dra/chinese_dr.x33
-\01036 ./arch/monster/dragon/Chinese_Dra/chinese_dr.x71
-\01037 ./arch/monster/dragon/Chinese_Dra/chinese_dr.x72
-\01038 ./arch/monster/dragon/Chinese_Dra/chinese_dr.x73
-\01039 ./arch/monster/dragon/Chinese_Dra/chinese_dr_spellcasting.x31
-\01040 ./arch/monster/dragon/Chinese_Dra/chinese_dr_spellcasting.x32
-\01041 ./arch/monster/dragon/Chinese_Dra/chinese_dr_spellcasting.x71
-\01042 ./arch/monster/dragon/Chinese_Dra/chinese_dr_spellcasting.x72
-\01043 ./arch/food/chocolate.111
-\01044 ./arch/exit/chole_1.111
-\01045 ./arch/exit/chole_2.111
-\01046 ./arch/construct/town/church.x11
-\01047 ./arch/construct/town/church_fant.x11
-\01048 ./arch/inorganic/cinna.111
-\01049 ./arch/construct/tower/city-tower.x11
-\01050 ./arch/construct/tower/city-tower_west.x11
-\01051 ./arch/construct/tower/city_tower_east.x11
-\01052 ./arch/construct/tower/city_tower_fant.x11
-\01053 ./arch/construct/tower/city_tower_northwest.x11
-\01054 ./arch/wall/cwall/cityport_0.111
-\01055 ./arch/wall/cwall/cityport_1.111
-\01056 ./arch/misc/claypipe.111
-\01057 ./arch/player/class/Religious/cleric.111
-\01058 ./arch/player/class/Religious/cleric.112
-\01059 ./arch/player/class/Religious/cleric.131
-\01060 ./arch/player/class/Religious/cleric.132
-\01061 ./arch/player/class/Religious/cleric.151
-\01062 ./arch/player/class/Religious/cleric.152
-\01063 ./arch/player/class/Religious/cleric.171
-\01064 ./arch/player/class/Religious/cleric.172
-\01065 ./arch/armour/cloak/cloak.111
-\01066 ./arch/armour/cloak/cloak_black.111
-\01067 ./arch/armour/cloak/cloak_lblue.111
-\01068 ./arch/armour/cloak/cloak_lgrey.111
-\01069 ./arch/armour/cloak/cloak_purple.111
-\01070 ./arch/armour/cloak/cloak_red.111
-\01071 ./arch/armour/cloak/cloak_trans.112
-\01072 ./arch/armour/cloak/cloak_white.111
-\01073 ./arch/indoor/clock.111
-\01074 ./arch/indoor/clock.112
-\01075 ./arch/indoor/clock_ag.111
-\01076 ./arch/indoor/clock_ag.112
-\01077 ./arch/indoor/clock_cw.111
-\01078 ./arch/indoor/clock_cw.112
-\01079 ./arch/indoor/clock_grand.111
-\01080 ./arch/indoor/clock_grand.112
-\01081 ./arch/misc/Container/close_attache.111
-\01082 ./arch/misc/Container/close_bag.111
-\01083 ./arch/misc/Container/close_dbox.111
-\01084 ./arch/misc/Container/close_desk.111
-\01085 ./arch/misc/Container/close_desk_cw.111
-\01086 ./arch/misc/Container/close_dresser.111
-\01087 ./arch/misc/Container/close_dresser2.111
-\01088 ./arch/misc/Container/close_dresser2_cw.111
-\01089 ./arch/misc/Container/close_dresser_cw.111
-\01090 ./arch/misc/Container/close_keys.111
-\01091 ./arch/misc/Container/close_pouc.111
-\01092 ./arch/misc/Container/close_present_box_1.111
-\01093 ./arch/misc/Container/close_present_box_2.111
-\01094 ./arch/misc/Container/close_present_box_3.111
-\01095 ./arch/misc/Container/close_present_box_4.111
-\01096 ./arch/misc/Container/close_present_box_5.111
-\01097 ./arch/misc/Container/close_present_box_6.111
-\01098 ./arch/misc/Container/close_quiv.111
-\01099 ./arch/misc/Container/close_rsack.111
-\01100 ./arch/misc/Container/close_sack.111
-\01101 ./arch/misc/Container/close_sarcophagus.111
-\01102 ./arch/misc/Container/close_schest.111
-\01103 ./arch/misc/Container/close_wizdesk.111
-\01104 ./arch/misc/Container/closechest.111
-\01105 ./arch/misc/Container/closemail.111
-\01106 ./arch/ground/sky/cloud_1_1.x11
-\01107 ./arch/ground/sky/cloud_1_2.x11
-\01108 ./arch/ground/sky/cloud_1_3.x11
-\01109 ./arch/ground/sky/cloud_2_1.x11
-\01110 ./arch/ground/sky/cloud_2_2.x11
-\01111 ./arch/ground/sky/cloud_2_3.x11
-\01112 ./arch/ground/sky/cloud_3_1.x11
-\01113 ./arch/ground/sky/cloud_3_2.x11
-\01114 ./arch/ground/sky/cloud_3_3.x11
-\01115 ./arch/ground/sky/cloud_4_1.x11
-\01116 ./arch/ground/sky/cloud_4_2.x11
-\01117 ./arch/ground/sky/cloud_4_3.x11
-\01118 ./arch/ground/sky/cloud_5_1.x11
-\01119 ./arch/ground/sky/cloud_5_2.x11
-\01120 ./arch/ground/sky/cloud_5_3.x11
-\01121 ./arch/food/clover.111
-\01122 ./arch/monster/humanoid/Human/clown.111
-\01123 ./arch/weapon/club/club.111
-\01124 ./arch/ground/cmarsh.111
-\01125 ./arch/floor/cobblesto1.111
-\01126 ./arch/floor/cobblesto2.111
-\01127 ./arch/floor/cobblesto3.111
-\01128 ./arch/monster/animal/cobra.x11
-\01129 ./arch/monster/animal/cobra.x12
-\01130 ./arch/monster/animal/cobra.x13
-\01131 ./arch/food/coffee.111
-\01132 ./arch/food/coffee_empty.111
-\01133 ./arch/misc/coffin.111
-\01134 ./arch/monster/dragon/Hatchlings/cold_drag.131
-\01135 ./arch/monster/dragon/Hatchlings/cold_drag.132
-\01136 ./arch/monster/dragon/Hatchlings/cold_drag.171
-\01137 ./arch/monster/dragon/Hatchlings/cold_drag.172
-\01138 ./arch/planes/fire/coldmagma.111
-\01139 ./arch/planes/fire/coldmagma.112
-\01140 ./arch/talisman/collar.111
-\01141 ./arch/talisman/collar.112
-\01142 ./arch/talisman/collar.113
-\01143 ./arch/construct/town/collesium.x11
-\01144 ./arch/weapon/bow/compositebow.111
-\01145 ./arch/spell/Cone/confusion.111
-\01146 ./arch/spell/Cone/confusion.112
-\01147 ./arch/spell/Cone/confusion.113
-\01148 ./arch/spell/Cone/confusion.114
-\01149 ./arch/monster/humanoid/Class/conjurer.111
-\01150 ./arch/monster/humanoid/Class/conjurer.112
-\01151 ./arch/monster/humanoid/Class/conjurer.113
-\01152 ./arch/shop/conv.111
-\01153 ./arch/jewel/copperbar.111
-\01154 ./arch/flesh/human/corpse.111
-\01155 ./arch/flesh/human/corpse1.111
-\01156 ./arch/spell/Cone/counterspell.111
-\01157 ./arch/monster/humanoid/Human/courier.111
-\01158 ./arch/construct/town/courthouse.x11
-\01159 ./arch/misc/cplate.111
-\01160 ./arch/ground/Stone/crater.111
-\01161 ./arch/monster/misc/crawl/crawling_chaos.111
-\01162 ./arch/monster/misc/crawl/crawling_chaos.112
-\01163 ./arch/monster/misc/crawl/crawling_chaos.113
-\01164 ./arch/shop/crea_serp_c.111
-\01165 ./arch/system/creator.111
-\01166 ./arch/monster/humanoid/Human/crone.111
-\01167 ./arch/weapon/bow/crossbow.111
-\01168 ./arch/readable/crossroad.111
-\01169 ./arch/armour/helmet/crown.111
-\01170 ./arch/armour/helmet/crown2.111
-\01171 ./arch/armour/helmet/crown_dark.111
-\01172 ./arch/armour/helmet/crown_gray.111
-\01173 ./arch/armour/helmet/crown_r.111
-\01174 ./arch/armour/helmet/crown_white.111
-\01175 ./arch/misc/crystalball.111
-\01176 ./arch/weapon/club/cudgel.111
-\01177 ./arch/wall/cwall/cwall_0.111
-\01178 ./arch/wall/cwall/cwall_1.111
-\01179 ./arch/wall/cwall/cwall_2.111
-\01180 ./arch/wall/cwall/cwall_3.111
-\01181 ./arch/wall/cwall/cwall_4.111
-\01182 ./arch/wall/cwall/cwall_5.111
-\01183 ./arch/wall/cwall/cwall_6.111
-\01184 ./arch/wall/cwall/cwall_7.111
-\01185 ./arch/wall/cwall/cwall_8.111
-\01186 ./arch/wall/cwall/cwall_9.111
-\01187 ./arch/wall/cwall/cwall_A.111
-\01188 ./arch/wall/cwall/cwall_B.111
-\01189 ./arch/wall/cwall/cwall_C.111
-\01190 ./arch/wall/cwall/cwall_D.111
-\01191 ./arch/wall/cwall/cwall_E.111
-\01192 ./arch/wall/cwall/cwall_F.111
-\01193 ./arch/wall/cwall/cwall_beigemarble.111
-\01194 ./arch/wall/cwall/cwall_bluemarblemedium.111
-\01195 ./arch/wall/cwall/cwall_cyanmarble.111
-\01196 ./arch/wall/cwall/cwall_cyanmarbledark.111
-\01197 ./arch/wall/cwall/cwall_graymarble.111
-\01198 ./arch/wall/cwall/cwall_greenmarble.111
-\01199 ./arch/wall/cwall/cwall_greenmarblemedium.111
-\01200 ./arch/wall/cwall/cwall_magentamarble.111
-\01201 ./arch/wall/cwall/cwall_marble.111
-\01202 ./arch/wall/cwall/cwall_mural_1.111
-\01203 ./arch/wall/cwall/cwall_mural_1.112
-\01204 ./arch/wall/cwall/cwall_mural_1.113
-\01205 ./arch/wall/cwall/cwall_mural_1.114
-\01206 ./arch/wall/cwall/cwall_mural_end_1.111
-\01207 ./arch/wall/cwall/cwall_mural_end_1.112
-\01208 ./arch/wall/cwall/cwall_pinkmarble.111
-\01209 ./arch/wall/cwall/cwall_w_0.111
-\01210 ./arch/wall/cwall/cwall_w_0.112
-\01211 ./arch/wall/cwall/cwall_w_0.113
-\01212 ./arch/wall/cwall/cwall_w_0.114
-\01213 ./arch/wall/cwall/cwall_w_0.115
-\01214 ./arch/wall/cwall/cwall_w_0.116
-\01215 ./arch/wall/cwall/cwall_w_0.117
-\01216 ./arch/wall/cwall/cwall_w_0.118
-\01217 ./arch/wall/cwall/cwall_w_0.119
-\01218 ./arch/wall/cwall/cwall_w_0.11A
-\01219 ./arch/wall/cwall/cwall_w_1.111
-\01220 ./arch/wall/cwall/cwall_w_1.112
-\01221 ./arch/wall/cwall/cwall_w_1.113
-\01222 ./arch/wall/cwall/cwall_w_1.114
-\01223 ./arch/wall/cwall/cwall_w_1.115
-\01224 ./arch/wall/cwall/cwall_w_1.116
-\01225 ./arch/wall/cwall/cwall_w_1.117
-\01226 ./arch/wall/cwall/cwall_w_1.118
-\01227 ./arch/wall/cwall/cwall_w_1.119
-\01228 ./arch/connect/cwallsec.111
-\01229 ./arch/connect/cwallsec.112
-\01230 ./arch/connect/cwallsec.113
-\01231 ./arch/connect/cwallsec.114
-\01232 ./arch/connect/cwallsec.115
-\01233 ./arch/connect/cwallsec.116
-\01234 ./arch/connect/cwallsec.117
-\01235 ./arch/connect/cwallsec.118
-\01236 ./arch/connect/cwallsec_mural_1.111
-\01237 ./arch/connect/cwallsec_mural_1.112
-\01238 ./arch/connect/cwallsec_mural_1.113
-\01239 ./arch/connect/cwallsec_mural_1.114
-\01240 ./arch/connect/cwallsec_mural_1.115
-\01241 ./arch/connect/cwallsec_mural_1.116
-\01242 ./arch/connect/cwallsec_mural_1.117
-\01243 ./arch/connect/cwallsec_mural_1.118
-\01244 ./arch/floor/inlayed/cyan-beige-c-marble.111
-\01245 ./arch/floor/inlayed/cyan-beige-c-marble.112
-\01246 ./arch/floor/inlayed/cyan-beige-c-marble.113
-\01247 ./arch/floor/inlayed/cyan-beige-c-marble.114
-\01248 ./arch/ground/Wood/cyanbrush.111
-\01249 ./arch/ground/cyangrass.111
-\01250 ./arch/ground/smooth/cyangrass_S.111
-\01251 ./arch/ground/cyangrasspond.111
-\01252 ./arch/floor/cyanmarble.111
-\01253 ./arch/monster/giant/cyclops/cyclops.x31
-\01254 ./arch/monster/giant/cyclops/cyclops.x32
-\01255 ./arch/monster/giant/cyclops/cyclops.x71
-\01256 ./arch/monster/giant/cyclops/cyclops.x72
-\01257 ./arch/misc/d_statue.111
-\01258 ./arch/weapon/sword/dagger.111
-\01259 ./arch/weapon/artifact/Fdagger/dagger_f.111
-\01260 ./arch/weapon/artifact/Fdagger/dagger_f.112
-\01261 ./arch/weapon/artifact/Fdagger/dagger_f.113
-\01262 ./arch/weapon/artifact/Fdagger/dagger_f.114
-\01263 ./arch/weapon/sword/dagger_r.111
-\01264 ./arch/monster/humanoid/Arabic/dancing_girl.111
-\01265 ./arch/monster/humanoid/Arabic/dancing_girl.112
-\01266 ./arch/monster/humanoid/Arabic/dancing_girl.113
-\01267 ./arch/monster/misc/dancingsword.111
-\01268 ./arch/monster/misc/dancingsword.112
-\01269 ./arch/monster/misc/dancingsword.113
-\01270 ./arch/system/dark1.111
-\01271 ./arch/system/dark2.111
-\01272 ./arch/system/dark3.111
-\01273 ./arch/monster/humanoid/Elf/dark_elf.111
-\01274 ./arch/monster/humanoid/Elf/dark_elf.112
-\01275 ./arch/monster/humanoid/Elf/dark_elf.131
-\01276 ./arch/monster/humanoid/Elf/dark_elf.132
-\01277 ./arch/monster/humanoid/Elf/dark_elf.171
-\01278 ./arch/monster/humanoid/Elf/dark_elf.172
-\01279 ./arch/monster/humanoid/Elf/dark_elf2.131
-\01280 ./arch/monster/humanoid/Elf/dark_elf2.132
-\01281 ./arch/monster/humanoid/Elf/dark_elf2.171
-\01282 ./arch/monster/humanoid/Elf/dark_e...
[truncated message content] |
