Changeset 8b5930c4a8e83d234eabfc344dc065fe18225e01

Timestamp:

01/01/07 16:30:07 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1167665407 +0100

git-parent:

[5c543f001f919169bbf0d7061b41bcb97c58c70e]

git-author:

Christopher Jung <bktheg@web.de> 1167665407 +0100

Message:

Waffen implementiert

Files:

• src/net/driftingsouls/ds2/server/config/BeamWeapon.java (added)
• src/net/driftingsouls/ds2/server/config/Weapon.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/config/Weapons.java (modified) (4 diffs)
• src/net/driftingsouls/ds2/server/framework/xml/XMLUtils.java (modified) (1 diff)
• web/WEB-INF/cfg/weapons.xml (added)

src/net/driftingsouls/ds2/server/config/Weapon.java

@@ -19 +19 @@
-package net.driftingsouls.ds2.server.config;
-
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
-import net.driftingsouls.ds2.server.framework.db.SQLResultRow;
+import net.driftingsouls.ds2.server.framework.xml.XMLUtils;
-
-/**
@@ -57 +61 @@
-                }
-                
+                /**
+                 * Gibt das zum Flag gehoerende Bitmuster zurueck
+                 * @return Das Bitmuster
+                 */
-                public int getBits() {
-                        return this.bit;
@@ -62 +70 @@
-                
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        public String getName() {
-
-
-
+
+
+
+
+
+
+
-        public int getAPCost() {
-
-
-
+
+
+
+
+
+
+
-        public int getECost() {
-
-
-
+
+
+
+
+
+
+
+
-        public int getBaseDamage(SQLResultRow ownShipType) {
-
-
-
+
+
+
+
+
+
+
+
-        public int getBaseDamageModifier(SQLResultRow enemyShipType) {
-
-
-
+
+
+
+
+
+
+
+
-        public int getShieldDamage(SQLResultRow ownShipType) {
-
-
-
+
+
+
+
+
+
+
+
-        public int getSubDamage(SQLResultRow ownShipType) {
-
-
-
+
+
+
+
+
+
+
-        public int getDefTrefferWS() {
-
-
-
+
+
+
+
+
+
+
-        public int getDefSmallTrefferWS() {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        public int getDefSubWS() {
-
-
-
+
+
+
+
+
+
+
+
+
-        public boolean calcShipTypes(SQLResultRow ownShipType, SQLResultRow enemyShipType) {
-
-
-
+
+
+
+
+
+
+
+
-        public String getAmmoType() {
-
-
-
+
+
+
+
+
+
+
-        public int getSingleShots() {
-
-
-
+
+
+
+
+
+
+
-        public int getAreaDamage() {
-
-
-
+
+
+
+
+
+
+
-        public boolean getDestroyable() {
-
-
-
+
+
+
+
+
+
+
+
-        public boolean hasFlag(Flags flag) {
-throw new RuntimeException("STUB")
+return (this.flags & flag.getBits()) != 0
-        }
-}

src/net/driftingsouls/ds2/server/config/Weapons.java

@@ -19 +19 @@
-package net.driftingsouls.ds2.server.config;
-
+import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.HashMap;
@@ -27 +28 @@
-
-import net.driftingsouls.ds2.server.framework.Common;
+import net.driftingsouls.ds2.server.framework.Configuration;
+import net.driftingsouls.ds2.server.framework.Loggable;
+import net.driftingsouls.ds2.server.framework.xml.XMLUtils;
-
-import org.apache.commons.lang.StringUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-
-/**
@@ -36 +43 @@
- *
- */
-
+,Loggable
-        private Map<String, Weapon> list = new LinkedHashMap<String, Weapon>();
-        private static Weapons instance = new Weapons();
@@ -102 +109 @@
-        
-        static {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}

src/net/driftingsouls/ds2/server/framework/xml/XMLUtils.java

@@ -119 +119 @@
-                return node.getAttributes().getNamedItem(attr).getNodeValue();
-        }
+        
+        /**
+         * Gibt das erste Element mit einem bestimmten Tag-Namen unterhalb eines Knotens zurueck.
+         * Wenn kein Element mit dem Tag direkt unter dem angegebenen Knoten gefunden wird, so wird <code>null</code>
+         * zurueckgegeben.
+         *  
+         * @param node Der Knoten unter dem gesucht werden soll
+         * @param name Der Name des zu suchenden Elements
+         * @return Das erste Element mit dem Namen oder <code>null</code>
+         */
+        public static Node firstNodeByTagName(Node node, String name) {
+                NodeList list = node.getChildNodes();
+                for( int i=0; i < list.getLength(); i++ ) {
+                        if( list.item(i).getNodeType() != Node.ELEMENT_NODE ) {
+                                continue;
+                        }
+                        if( list.item(i).getNodeName().equals(name) ) {
+                                return list.item(i);
+                        }
+                }
+                
+                return null;
+        }
-}