Changeset 5e49daa22ec8d86487ddac25102c415a950874e8

Timestamp:

07/20/08 18:15:48 (4 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1216570548 +0200

git-parent:

[a53bf3df2ee843c7dcbff98462aa9c06d33cf7c1]

git-author:

Sebastian Gift <Madison@gt-knm.de> 1216570548 +0200

Message:

[feature] Schiffe koennen direkt vom Flottenmenue aus gebaut werden.

Files:

• src/net/driftingsouls/ds2/server/modules/FleetMgntController.java (modified) (6 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftObject.java (modified) (4 diffs)
• templates/fleetmgnt.html (modified) (3 diffs)

src/net/driftingsouls/ds2/server/modules/FleetMgntController.java

@@ -20 +20 @@
-
-import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
+import java.util.PriorityQueue;
+import java.util.Set;
-
-import net.driftingsouls.ds2.server.Location;
@@ -39 +43 @@
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-import net.driftingsouls.ds2.server.ships.ShipTypes;
+import net.driftingsouls.ds2.server.werften.WerftObject;
-
-import org.apache.commons.lang.StringUtils;
@@ -830 +835 @@
-        
-        /**
+         * Baut ein Schiffstyp n-mal in allen Werften der Flotte, die dazu in der Lage sind
+         */
+        @Action(ActionType.DEFAULT)
+        @SuppressWarnings("unchecked")
+        public void buildAction() {
+                TemplateEngine t = getTemplateEngine();
+                parameterNumber("buildcount");
+                parameterNumber("buildid");
+                
+                int buildCount = getInteger("buildcount");
+                final int buildid = getInteger("buildid");
+                
+                if(buildCount <= 0) {
+                        return;
+                }
+                
+                org.hibernate.Session db = getDB();
+                User user = (User)getUser();
+                List<Ship> shipyards = db.createQuery("from Ship where id>0 and owner=? and fleet=? and shiptype.werft > 0 order by id")
+                .setEntity(0, user)
+                .setEntity(1, this.fleet)
+                .list();
+                
+                for(Iterator<Ship> it = shipyards.iterator(); it.hasNext();) {
+                        Ship ship = it.next();
+                        if(ship.getTypeData().getWerft() == 0) {
+                                it.remove();
+                        }
+                }
+                
+                if(shipyards.isEmpty()) {
+                        return;
+                }
+                
+                //Build
+                while(buildCount > 0) {
+                        int couldNotBuild = 0;
+                        for(Ship ship: shipyards) {
+                                WerftObject shipyard = (WerftObject)db.createQuery("from WerftObject where shipid=?").setInteger(0, ship.getId()).uniqueResult();
+                                if(shipyard.buildShip(buildid, false, false)) {
+                                        buildCount--;
+                                }
+                                else {
+                                        couldNotBuild++;
+                                }
+                                
+                                if(buildCount == 0) {
+                                        break;
+                                }
+                        }
+                        
+                        //No shipyard could build -> stop
+                        if(couldNotBuild == shipyards.size()) {
+                                buildCount = 0;
+                        }
+                }
+                
+                //Reload main page
+                t.setVar("jscript.reloadmain",  1);
+                
+                this.redirect();
+        }
+        
+        /**
-         * Teil eines Formatierungsstrings fuer Schiffsnamen
-         */
@@ -1016 +1085 @@
-                        .setEntity(1, this.fleet)
-                        .list();
+                
+                Set<ShipType> buildableShips = new HashSet<ShipType>();
-                for( Iterator iter=ships.iterator(); iter.hasNext(); ) {
-                        Ship ship = (Ship)iter.next();
@@ -1021 +1092 @@
-                        ShipTypeData shiptype = ship.getTypeData();
-                        Location loc = ship.getLocation();
+                        
+                        if(shiptype.getWerft() > 0) {
+                                WerftObject werft = (WerftObject)db.createQuery("from WerftObject where shipid=?").setInteger(0, ship.getId()).uniqueResult();
+                                buildableShips.addAll(werft.getBuildableShips());
+                        }
-                        
-                        t.setVar(       "ship.id",                      ship.getId(),
@@ -1034 +1110 @@
-                        
-                        t.parse("ships.list", "ships.listitem", true);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-                // Jaegerliste bauen

src/net/driftingsouls/ds2/server/werften/WerftObject.java

@@ -22 +22 @@
-import java.util.Arrays;
-import java.util.HashMap;
+import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
@@ -1029 +1031 @@
-        
-        /**
+         * Gibt die Schiffstypen zurueck, die auf dieser Werft gebaut werden koennen.
+         * 
+         * @return Schiffstypen, die auf dieser Werft gebaut werden koennen.
+         */
+        @SuppressWarnings("unchecked")
+        public Set<ShipType> getBuildableShips() {
+                Context context = ContextMap.getContext();
+                org.hibernate.Session db = context.getDB();
+                User owner = this.getOwner();
+                
+                Set<ShipType> shipTypes = new HashSet<ShipType>();
+                boolean militaryAllowed = Systems.get().system(this.getSystem()).isMilitaryAllowed();
+                boolean flagshipAllowed = owner.hasFlagschiffSpace();
+                
+                String query = "from ShipBaubar where werftslots <= ?";
+                if(!flagshipAllowed) {
+                        query += "!flagschiff ";
+                }
+                if(!militaryAllowed) {
+                        query += "systemReq = 0 ";
+                }
+                query = query.trim();
+                List<ShipBaubar> buildableShips = (List<ShipBaubar>)db.createQuery(query).setInteger(0, this.getWerftSlots()).list();
+                
+                //Allowed by draft
+                Set<IEDraftShip> drafts = getUsableShipDrafts();
+                for(IEDraftShip draft: drafts) {
+                        shipTypes.add((ShipType)db.get(ShipType.class, draft.getShipType()));
+                }
+                
+                
+                //Filter parts which are not database checkable
+                for(ShipBaubar buildableShip: buildableShips) {
+                        if(!Rassen.get().rasse(owner.getRace()).isMemberIn(buildableShip.getRace())) {
+                                continue;
+                        }
+                        
+                        if( !owner.hasResearched(buildableShip.getRes(1)) || !owner.hasResearched(buildableShip.getRes(2)) || !owner.hasResearched(buildableShip.getRes(3))) {
+                                continue;
+                        }
+                        
+                        shipTypes.add(buildableShip.getType());
+                }
+                
+                //Filter disallowed shiptypes
+                Set<ShipType> disabledShips = getDisabledShips();
+                for (Iterator<ShipType> it = shipTypes.iterator(); it.hasNext(); ) {
+                        ShipType shipType = it.next();
+                        if(disabledShips.contains(shipType)) {
+                                it.remove();
+                                continue;
+                        }
+                }
+                
+                return shipTypes;
+        }
+        
+        /**
+         * Gibt alle Schiffstypen zurueck, die diese Werft derzeit nicht bauen kann.
+         * 
+         * @return Schiffstypen, die nicht baubar sind.
+         */
+        private Set<ShipType> getDisabledShips() {
+                Context context = ContextMap.getContext();
+                org.hibernate.Session db = context.getDB();
+                
+                Cargo availablecargo = this.getCargo(false);
+                Cargo allyitems = getAllyItems();
+                Set<ShipType> disabledShips = new HashSet<ShipType>();
+                
+                Cargo allitems = new Cargo();
+                allitems.addCargo(allyitems);
+                allitems.addCargo(availablecargo);
+                
+                for(ItemCargoEntry item: allitems.getItemsWithEffect( ItemEffect.Type.DISABLE_SHIP ))
+                {
+                        IEDisableShip disableShip = (IEDisableShip)item.getItemEffect();
+                        disabledShips.add((ShipType)db.load(ShipType.class, disableShip.getShipType()));
+                }
+                
+                return disabledShips;
+        }
+        
+        private Set<ItemCargoEntry> getAllItems() {
+                Cargo allyitems = getAllyItems();
+                Cargo shipyardCargo = this.getCargo(false);
+                
+                Set<ItemCargoEntry> items = new HashSet<ItemCargoEntry>();
+                items.addAll(allyitems.getItemsWithEffect(ItemEffect.Type.DRAFT_SHIP));
+                items.addAll(shipyardCargo.getItemsWithEffect(ItemEffect.Type.DRAFT_SHIP));
+                
+                return items;
+        }
+        
+        /**
+         * Gibt alle Bauplaene auf der Werft zurueck, die derzeit benutzt werden koennen.
+         * 
+         * @return Nutzbare Bauplaene.
+         */
+        private Set<IEDraftShip> getUsableShipDrafts() {
+                User owner = this.getOwner();
+                Set<IEDraftShip> shipDrafts = new HashSet<IEDraftShip>();
+
+                
+                //All Drafts - ally and local
+                Set<ItemCargoEntry> items = getAllItems();
+                
+                for(ItemCargoEntry item: items) {
+                        if(item.getItemEffect().getType() != ItemEffect.Type.DRAFT_SHIP) {
+                                continue;
+                        }
+                        
+                        IEDraftShip draft = (IEDraftShip)item.getItemEffect();
+                        
+                        if( draft.getWerftSlots() > this.getWerftSlots() ) {
+                                continue;
+                        }
+
+                        if( !owner.hasFlagschiffSpace() && draft.isFlagschiff() ) {
+                                continue;
+                        }
+        
+                        if(!owner.hasResearched(draft.getTechReq(1)) || !owner.hasResearched(draft.getTechReq(2)) || !owner.hasResearched(draft.getTechReq(3))) {
+                                continue;
+                        }
+                        
+                        shipDrafts.add(draft);
+                }
+                
+                return shipDrafts;
+        }
+        
+        private Cargo getAllyItems() {
+                User owner = this.getOwner();
+                if( owner.getAlly() != null ) {
+                        return new Cargo(Cargo.Type.ITEMSTRING, owner.getAlly().getItems());
+                }
+                
+                return new Cargo();
+        }
+        
+        /**
-         * Liefert die Liste aller theoretisch baubaren Schiffe auf dieser Werft.
-         * Das vorhanden sein von Resourcen wird hierbei nicht beruecksichtigt.
@@ -1035 +1179 @@
-         *                      zur Bestimmung ob und wenn ja welcher Bauplan benoetigt wird zum bauen
-         */
+        @Deprecated
-        public SQLResultRow[] getBuildShipList() {
-                List<SQLResultRow> result = new ArrayList<SQLResultRow>();
@@ -1263 +1408 @@
-        
-        /**
+         * Findet heraus welches Item zum Bau benoetigt wird und baut danach das Schiff.
+         * @param typeid Die ID des zu bauenden Schifftyps
+         * @param costsPerTick Sollen die Baukosten pro Tick (<code>true</code>) oder der Gesamtbetrag jetzt (<code>false</code>) abgezogen werden
+         * @param testOnly Soll nur getestet (true) oder wirklich gebaut (false) werden?
+         * @see WerftObject#buildShip
+         * 
+         * @return true, wenn kein Fehler aufgetreten ist.
+         */
+        public boolean buildShip(int typeid, boolean costsPerTick, boolean testOnly) {
+                Context context = ContextMap.getContext();
+                org.hibernate.Session db = context.getDB();
+                int item = -1;
+                ShipType type = (ShipType)db.load(ShipType.class, typeid);
+                ShipBaubar ship = (ShipBaubar)db.createQuery("from ShipBaubar where type=?").setEntity(0, type).uniqueResult();
+                
+                if(ship == null) {
+                        for(ItemCargoEntry entry: getAllItems()) {
+                                if(entry.getItemEffect().getType() == ItemEffect.Type.DRAFT_SHIP) {
+                                        IEDraftShip draft = (IEDraftShip)entry.getItemEffect();
+                                        if(draft.getShipType() == typeid) {
+                                                item = entry.getItemID();
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                else {
+                        item = 0;
+                }
+                
+                //Cannot build without item, correct item not found
+                if(item == -1) {
+                        return false;
+                }
+                
+                if(item > 0) {
+                        return buildShip(0, item, costsPerTick, testOnly);
+                }
+                return buildShip(ship.getId(), item, costsPerTick, testOnly);
+        }
+        
+        /**
-         * Baut ein Schiff in der Werft auf Basis der angegebenen Schiffbau-ID und der
-         * angegebenen Item-ID (Bauplan). {@link DSObject#MESSAGE} enthaelt die Hinweistexte

templates/fleetmgnt.html

@@ -202 +202 @@
-                                                document.getElementById("alarm").style.display = 'none';
-                                        }
+                                        
+                                        if( action == "build" ) {
+                                                document.getElementById("buildcount").style.display = 'inline';
+                                                document.getElementById("buildid").style.display = 'inline';
+                                        }
+                                        else {
+                                                document.getElementById("buildcount").style.display = 'none';
+                                                document.getElementById("buildid").style.display = 'none';
+                                        }
-                                }
-                        -->
@@ -226 +235 @@
-                                        {if fleetcombine.list}
-                                                <option value="fleetcombine">Flotten zusammenlegen</option>
+                                        {/endif}
+                                        {if buildableships.list}
+                                                <option value="build">Schiffe bauen</option>
-                                        {/endif}
-                                        <option value="rename">Flotte umbenennen</option>
@@ -253 +265 @@
-                                        <option value="1">rot</option>
-                                </select>
+                                {if buildableships.list}
+                                <input type="text" id="buildcount" name="buildcount" style="display:none" size="3" maxlength="3" />
+                                <select id="buildid" name="buildid" size="1" style="display:none">
+                                                <!-- BEGIN buildableships.listitem -->
+                                                        <option value="{buildableships.id}">{buildableships.name}</option>
+                                                <!-- END buildableships.listitem -->
+                                </select>
+                                {/endif}
-                                <input type="submit" value="ok" />
-                        </form>