Changeset 548df42f8807e2be470936e582eb1072ebeed33a

Timestamp:

08/05/07 22:13:18 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[c86520efe0863d81050672baad06de32e5eea40c]

git-author:

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

Message:

Nahrungsversorgung der Schiffe geaendert

Files:

• src/net/driftingsouls/ds2/server/modules/BaseController.java (modified) (4 diffs)
• src/net/driftingsouls/ds2/server/ships/Ship.java (modified) (133 diffs)
• src/net/driftingsouls/ds2/server/tick/regular/SchiffsTick.java (modified) (24 diffs)

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

@@ -45 +45 @@
- * @urlparam Integer col Die ID der Basis
- */
-
+
+
+
-        private Base base;
-        
@@ -96 +98 @@
-                Cargo usercargo = new Cargo( Cargo.Type.STRING, user.getCargo());
-
-100
-100
+NAHRUNG_CHECKOUT_FACTOR
+NAHRUNG_CHECKOUT_FACTOR
-                }
-                
@@ -111 +113 @@
-                
-                cargo.substractResource( Resources.NAHRUNG, count );
-100
+NAHRUNG_CHECKOUT_FACTOR
-        
-                user.setCargo(usercargo.save());
-                base.setCargo(cargo);
-        
-100er Pakete 
+
-        
-                redirect();
@@ -375 +377 @@
-                                tooltiptext.append("<form action='./ds' method='post'>");
-                                tooltiptext.append("<div>");
-in 100er Paketen 
+
-                                tooltiptext.append("<input name='col' type='hidden' value='"+base.getID()+"' />");
-                                tooltiptext.append("<input name='sess' type='hidden' value='"+getString("sess")+"' />");

src/net/driftingsouls/ds2/server/ships/Ship.java

@@ -833 +833 @@
-                                String astatus = oldstatus[i];
-                                if( !astatus.equals("disable_iff") && !astatus.equals("mangel_nahrung") && 
-
-
+       
+       
-                                        status.add(astatus);
-                                }
@@ -843 +843 @@
-                if( type.getRm() > 0 ) {
-                        long ep = cargo.getResourceCount( Resources.URAN ) * type.getRu() + 
-       
-       
+
+
-                        long er = ep/type.getRm();
-                        
@@ -861 +861 @@
-                        status.add("nocrew");   
-                }
-
+
-                // Die Items nach IFF und Hydros durchsuchen
-                boolean disableIFF = false;
-
+
-                if( cargo.getItemWithEffect(ItemEffect.Type.DISABLE_IFF) != null ) {
-                        disableIFF = true;
@@ -872 +872 @@
-                        status.add("disable_iff");
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                // Ist ein Offizier an Bord?
-                Offizier offi = Offizier.getOffizierByDest('s', this.id);
@@ -898 +878 @@
-                        status.add("offizier");
-                }
-
+
-                ShipModules modules = (ShipModules)db.get(ShipModules.class, this.id);
-                if( modules != null ) {
-                        status.add("tblmodules");
-                }
+
+                if( lackOfFood() ) {
+                        status.add("mangel_nahrung");
+                }
+
+                this.status = Common.implode(" ", status);
+
+                return this.status;
+        }
+
+        private boolean lackOfFood() {
+                if( timeUntilLackOfFood() <= MANGEL_TICKS ) {
+                        return true;
+                }
+
+                return false;
+        }
+
+        private long timeUntilLackOfFood() {
+                Cargo usercargo = new Cargo(Cargo.Type.STRING, this.owner.getCargo());
+                long timeUntilLackOfFood = 0;
+                int foodConsumption = getNettoFoodConsumption();
+
+                if( foodConsumption <= 0 ) {
+                        return Long.MAX_VALUE;
+                }
+
+                //Den Nahrungsverbrauch berechnen
+                if( isUserCargoUsable() ) {
+                        timeUntilLackOfFood = usercargo.getResourceCount(Resources.NAHRUNG) / foodConsumption;
+                }
+                else {
+                        //Basisschiff beruecksichtigen
+                        Ship baseShip = getBaseShip();
+                        if( baseShip != null ) {
+                                timeUntilLackOfFood = baseShip.timeUntilLackOfFood();
+                        }
+
+                        timeUntilLackOfFood += this.cargo.getResourceCount(Resources.NAHRUNG) / foodConsumption;
+                }
+                return timeUntilLackOfFood;
+        }
+
+        /**
+         * Calculates the amount of food a ship consumes.
+         * The calculation is done with respect to hydros.
+         * 
+         * @return Amount of food this ship consumes
+         */
+        private int getFoodConsumption() {
+                ShipTypeData shiptype = this.getTypeData();
+                int scaledCrew = getScaledCrew();
+                int production = shiptype.getHydro();
+                return scaledCrew-production;
+        }
+
+        /**
+         * Calculates the amound of food the ship consumes with respect to docked ships.
+         * 
+         * @return The amount this ship consumes with respect to docked ships.
+         */
+        private int getNettoFoodConsumption() {
+                org.hibernate.Session db = ContextMap.getContext().getDB();
+                int foodConsumption = getFoodConsumption();
-                
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /**
-         * Repraesentiert ein in ein Schiff eingebautes Modul (oder vielmehr die Daten, 
@@ -927 +995 @@
-                 */
-                public final String data;
-
+
-                protected ModuleEntry(int slot, int moduleType, String data) {
-                        this.slot = slot;
@@ -933 +1001 @@
-                        this.data = data;
-                }
-
+
-                @Override
-                public String toString() {
@@ -939 +1007 @@
-                }
-        }
-
+
-        /**
-         * Gibt die Moduleintraege des Schiffes zurueck
@@ -946 +1014 @@
-        public ModuleEntry[] getModules() {
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
+
-                List<Ship.ModuleEntry> result = new ArrayList<ModuleEntry>();
-
+
-                if( this.status.indexOf("tblmodules") == -1 ) {
-                        return new ModuleEntry[0];
-                }
-
+
-                ShipModules moduletbl = (ShipModules)db.get(ShipModules.class, this.id);        
-                if( moduletbl == null ) {
@@ -958 +1026 @@
-                        return new ModuleEntry[0];
-                }
-
+
-                if( moduletbl.getModules().length() != 0 ) {
-                        String[] modulelist = StringUtils.split(moduletbl.getModules(), ';');
@@ -968 +1036 @@
-                        }
-                }
-
+
-                return result.toArray(new ModuleEntry[result.size()]);
-        }
-
+
-        /**
-         * Fuegt ein Modul in das Schiff ein
@@ -982 +1050 @@
-                        throw new UnsupportedOperationException("addModules kann nur bei Schiffen mit positiver ID ausgefuhert werden!");
-                }
-
+
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
@@ -989 +1057 @@
-                        shipModules = new ShipModules(this.id);
-                        db.persist(shipModules);
-
+
-                        if( this.status.length() != 0 ) {
-                                this.status += " tblmodules";   
@@ -1000 +1068 @@
-                        shipModules = (ShipModules)db.get(ShipModules.class, this.id);
-                }
-
+
-                List<ModuleEntry> moduletbl = new ArrayList<ModuleEntry>();
-                moduletbl.addAll(Arrays.asList(getModules()));
-
+
-                //check modules
-
+
-                //rebuild
-                moduletbl.add(new ModuleEntry(slot, moduleid, data ));
-
+
-                ShipTypeData type = Ship.getShipType( this.shiptype.getId(), false, true );
-
+
-                Map<Integer,String[]>slotlist = new HashMap<Integer,String[]>();
-                String[] tmpslotlist = StringUtils.splitPreserveAllTokens(type.getTypeModules(), ';');
@@ -1017 +1085 @@
-                        slotlist.put(Integer.parseInt(aslot[0]), aslot);
-                }
-
+
-                List<Module> moduleobjlist = new ArrayList<Module>();
-                List<String> moduleSlotData = new ArrayList<String>(); 
-
+
-                for( int i=0; i < moduletbl.size(); i++ ) {
-                        ModuleEntry module = moduletbl.get(i);
@@ -1029 +1097 @@
-                                }
-                                moduleobjlist.add(moduleobj);
-
+
-                                moduleSlotData.add(module.slot+":"+module.moduleType+":"+module.data);
-                        }
-                }
-
+
-                for( int i=0; i < moduleobjlist.size(); i++ ) {
-                        type = moduleobjlist.get(i).modifyStats( type, moduleobjlist );         
-                }
-
+
-                shipModules.setModules(Common.implode(";",moduleSlotData));
-                shipModules.setNickname(type.getNickname());
@@ -1067 +1135 @@
-                shipModules.setOneWayWerft(type.getOneWayWerft());
-        }
-
+
-        /**
-         * Entfernt ein Modul aus dem Schiff
@@ -1078 +1146 @@
-                        throw new UnsupportedOperationException("addModules kann nur bei Schiffen mit positiver ID ausgefuhert werden!");
-                }
-
+
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
+
-                if( this.status.indexOf("tblmodules") == -1 ) {
-                        return;
-                }
-
+
-                ShipModules shipModules = (ShipModules)db.get(ShipModules.class, this.id);
-
+
-                List<ModuleEntry> moduletbl = new ArrayList<ModuleEntry>();
-                moduletbl.addAll(Arrays.asList(getModules()));
-
+
-                //check modules
-
+
-                //rebuild       
-                ShipTypeData type = Ship.getShipType( this.shiptype.getId(), false, true );
-
+
-                Map<Integer,String[]>slotlist = new HashMap<Integer,String[]>();
-                String[] tmpslotlist = StringUtils.split(type.getTypeModules(), ';');
@@ -1101 +1169 @@
-                        slotlist.put(Integer.parseInt(aslot[0]), aslot);
-                }
-
+
-                List<Module> moduleobjlist = new ArrayList<Module>();
-                List<String> moduleSlotData = new ArrayList<String>(); 
-
+
-                for( int i=0; i < moduletbl.size(); i++ ) {
-                        ModuleEntry module = moduletbl.get(i);
-                        if( module.moduleType != 0 ) {
-                                Module moduleobj = Modules.getShipModule( module );
-
+
-                                if( moduleobj.isSame(slot, moduleid, data) ) {
-                                        continue;
-                                }
-
+
-                                if( (module.slot > 0) && (slotlist.get(module.slot).length > 2) ) {
-                                        moduleobj.setSlotData(slotlist.get(module.slot)[2]);
-                                }
-                                moduleobjlist.add(moduleobj);
-
+
-                                moduleSlotData.add(module.slot+":"+module.moduleType+":"+module.data);
-                        }
@@ -1126 +1194 @@
-                        type = moduleobjlist.get(i).modifyStats( type, moduleobjlist );         
-                }
-
+
-                if( moduleSlotData.size() > 0 ) {
-                        shipModules.setModules(Common.implode(";",moduleSlotData));
@@ -1162 +1230 @@
-                        String[] status = StringUtils.split(this.status, ' ');
-                        String[] newstatus = new String[status.length-1];
-
+
-                        for( int i=0,j=0; i < status.length; i++ ) {
-                                if( !status[i].equals("tblmodules") ) {
@@ -1168 +1236 @@
-                                }       
-                        }
-
+
-                        this.status = Common.implode(" ",newstatus);
-                }
-        }
-
+
-        /**
-         * Berechnet die durch Module verursachten Effekte des Schiffes neu
@@ -1178 +1246 @@
-        public void recalculateModules() {
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
+
-                if( this.status.indexOf("tblmodules") == -1 ) {
-                        return;
-                }
-
+
-                ShipModules shipModules = (ShipModules)db.get(ShipModules.class, this.id);
-
+
-                List<ModuleEntry> moduletbl = new ArrayList<ModuleEntry>();
-                moduletbl.addAll(Arrays.asList(getModules()));
-
+
-                //check modules
-
+
-                //rebuild       
-                ShipTypeData type = Ship.getShipType( this.shiptype.getId(), false, true );
-
+
-                Map<Integer,String[]>slotlist = new HashMap<Integer,String[]>();
-                String[] tmpslotlist = StringUtils.split(type.getTypeModules(), ';');
@@ -1199 +1267 @@
-                        slotlist.put(Integer.parseInt(aslot[0]), aslot);
-                }
-
+
-                List<Module> moduleobjlist = new ArrayList<Module>();
-                List<String> moduleSlotData = new ArrayList<String>(); 
-
+
-                for( int i=0; i < moduletbl.size(); i++ ) {
-                        ModuleEntry module = moduletbl.get(i);
-                        if( module.moduleType != 0 ) {
-                                Module moduleobj = Modules.getShipModule( module );
-
+
-                                if( (module.slot > 0) && (slotlist.get(module.slot).length > 2) ) {
-                                        moduleobj.setSlotData(slotlist.get(module.slot)[2]);
-                                }
-                                moduleobjlist.add(moduleobj);
-
+
-                                moduleSlotData.add(module.slot+":"+module.moduleType+":"+module.data);
-                        }
@@ -1220 +1288 @@
-                        type = moduleobjlist.get(i).modifyStats( type, moduleobjlist );         
-                }
-
+
-                shipModules.setModules(Common.implode(";",moduleSlotData));
-                shipModules.setNickname(type.getNickname());
@@ -1250 +1318 @@
-                shipModules.setOneWayWerft(type.getOneWayWerft());
-        }
-
+
-        private void handleRedAlert() {
-                User owner = this.owner;
-                Integer[] attackers = redAlertCheck( owner, this.getLocation(), false );
-
+
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
+
-                if( attackers.length > 0 ) {
-                        // Schauen wir mal ob wir noch ein Schiff mit rotem Alarm ohne Schlacht finden (sortiert nach Besitzer-ID)
@@ -1262 +1330 @@
-                                        "system=? and lock is null and docked='' and e>0 and " +
-                                        "owner in ("+Common.implode(",",attackers)+") and alarm=1 and " +
-               
-                       
-                       
-                       
-                       
-                       
-
+
+
+
+
+
+
+
-                        if( eship != null ) {
-                                Battle battle = new Battle();
-                                battle.setStartOwn(true);
-                                battle.create(eship.getOwner().getID(), eship.getId(), this.id);
-
+
-                                MESSAGE.get().append("<span style=\"color:red\">Feindliche Schiffe feuern beim Einflug</span><br />\n");
-                        }
@@ -1281 +1349 @@
-                                                "system=? and lock is null and docked='' and e>0 and " +
-                                                "owner in ("+Common.implode(",",attackers)+") and alarm=1 and " +
-               
-                       
-                       
-                       
-                       
-                       
-
+
+
+
+
+
+
+
-                                if( eship != null ) {
-                                        Battle battle = new Battle();
@@ -1293 +1361 @@
-                                        int oside = (bship.getSide() + 1) % 2 + 1;
-                                        battle.load(eship.getBattle(), this.owner.getID(), 0, 0, oside);
-
+
-                                        int docked = ((Number)db.createQuery("select count(*) from Ship where docked=?")
-
-
-
+       
+       
+
-                                        if( docked != 0 ) {
-                                                List dlist = db.createQuery("from Ship where docked=?")
-       
-       
+
+
-                                                for( Iterator iter=dlist.iterator(); iter.hasNext(); ) {
-                                                        Ship aship = (Ship)iter.next();
-
+
-                                                        battle.addShip( this.owner.getID(), aship.getId() );
-                                                }
-                                        }
-                                        battle.addShip( this.owner.getID(), this.id );
-
+
-                                        if( battle.getEnemyLog(true).length() != 0 ) {
-                                                battle.writeLog();
-                                        }
-
+
-                                        MESSAGE.get().append("<br /><span style=\"color:red\">Feindliche Schiffe feuern beim Einflug</span><br />\n");
-                                }
@@ -1319 +1387 @@
-                }
-        }
-
+
-        /**
-         * Gibt <code>true</code> zurueck, wenn der angegebene Sektor fuer den angegebenen Spieler
@@ -1331 +1399 @@
-        public static boolean getRedAlertStatus( int userid, int system, int x, int y ) {
-                org.hibernate.Session db = ContextMap.getContext().getDB();
-
+
-                User user = (User)db.get(User.class, userid);
-
+
-                Integer[] attackers = redAlertCheck(user, 
-                                new Location(system, x, y), true);
-
+
-                if( attackers.length > 0 ) {
-                        return true;
@@ -1342 +1410 @@
-                return false;
-        }
-
+
-        private static Integer[] redAlertCheck( User user, Location loc, boolean checkonly ) {
-                Context context = ContextMap.getContext();
-                org.hibernate.Session db = context.getDB();
-
+
-                User.Relations relationlist = user.getRelations();
-
+
-                List<Integer> attackers = new ArrayList<Integer>();
-
+
-                List ownerList = db.createQuery("select distinct s.owner from Ship as s where s.id>0 and s.x=? and s.y=? and " +
-               
-       
-       
-       
-       
-       
+
+
+
+
+
+
-                for( Iterator iter=ownerList.iterator(); iter.hasNext(); ) {
-                        User auser = (User)iter.next();
-
+
-                        if( (auser.getVacationCount() != 0) && (auser.getWait4VacationCount() == 0) ) {
-                                continue;       
-                        }
-
+
-                        if( relationlist.fromOther.get(auser.getID()) == User.Relation.ENEMY ) {
-                                attackers.add(auser.getID());
@@ -1372 +1440 @@
-                        } 
-                }
-
+
-                return attackers.toArray(new Integer[attackers.size()]);
-        }
-
+
-        private static class MovementResult {
-                int distance;
-                boolean moved;
-                boolean error;
-
+
-                MovementResult(int distance, boolean moved, boolean error) {
-                        this.distance = distance;
@@ -1387 +1455 @@
-                }
-        }
-
+
-        private static MovementResult moveSingle(Ship ship, ShipTypeData shiptype, Offizier offizier, int direction, int distance, int adocked, boolean forceLowHeat, boolean verbose) {
-                boolean moved = false;
-                boolean error = false;
-                boolean firstOutput = true;
-
+
-                StringBuilder out = MESSAGE.get();
-
+
-                if( ship.getEngine() <= 0 ) {
-                        if(verbose) {
@@ -1400 +1468 @@
-                        }
-                        distance = 0;
-
+
-                        return new MovementResult(distance, moved, true);
-                }
-
+
-                int newe = ship.getEnergy() - shiptype.getCost();
-                int news = ship.getHeat() + shiptype.getHeat();
-
+
-                newe -= adocked;
-                if( shiptype.getCrew()/2 > ship.getCrew() ) {
@@ -1414 +1482 @@
-                        }
-                }
-
+
-                // Antrieb teilweise beschaedigt?
-                if( ship.getEngine() < 20 ) {
@@ -1425 +1493 @@
-                        newe -= 1;
-                }
-
+
-                if( newe < 0 ) {
-                        if(!verbose && firstOutput)
@@ -1434 +1502 @@
-                        out.append("<span style=\"color:#ff0000\">Keine Energie. Stoppe bei "+Ships.getLocationText(ship.getLocation(), true)+"</span><br />\n");
-                        distance = 0;
-
+
-                        return new MovementResult(distance, moved, true);
-                }
@@ -1465 +1533 @@
-                        }
-                }
-
+
-                // Grillen wir uns bei dem Flug eventuell den Antrieb?
-                if( news > 100 )  {
@@ -1484 +1552 @@
-                int x = ship.getX();
-                int y = ship.getY();
-
+
-                if( direction == 1 ) { x--; y--; }
-                else if( direction == 2 ) { y--; }
@@ -1493 +1561 @@
-                else if( direction == 8 ) { y++; }
-                else if( direction == 9 ) { x++; y++; }
-
+
-                StarSystem sys = Systems.get().system(ship.getSystem());
-
+
-                if( x > sys.getWidth()) { 
-                        x = sys.getWidth();
@@ -1512 +1580 @@
-                        distance = 0;
-                }
-
+
-                if( (ship.getX() != x) || (ship.getY() != y) ) {
-                        moved = true;
-
+
-                        if( ship.getHeat() >= 100 ) {
-                                if( !verbose && firstOutput) {
@@ -1522 +1590 @@
-                                }
-                                out.append("<span style=\"color:#ff0000\">Triebwerke &uuml;berhitzt</span><br />\n");
-
+
-                                if( (RandomUtils.nextInt(101)) < 3*(news-100) ) {
-                                        int dmg = (int)( (2*(RandomUtils.nextInt(101)/100d)) + 1 ) * (news-100);
@@ -1537 +1605 @@
-                                }
-                        }
-
+
-                        ship.setX(x);
-                        s