Changeset 07a80e0452a3db3c441e627e666c09d5cbcc52e7

Timestamp:

07/07/07 22:35:45 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[15c854d20931d81a8e2bbab52eac1029983a5cfd]

git-author:

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

Message:

Werft: Baukosten pro Tick eingebaut

Files:

• db/tables/werft_queues.sql (modified) (1 diff)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/tick/regular/WerftTick.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/ShipWerft.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/WerftGUI.java (modified) (6 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftObject.java (modified) (7 diffs)
• src/net/driftingsouls/ds2/server/werften/WerftQueueEntry.java (modified) (4 diffs)
• templates/werft.werftgui.html (modified) (4 diffs)

db/tables/werft_queues.sql

@@ -6 +6 @@
-  `remaining` tinyint(4) NOT NULL default '0',
-  `flagschiff` tinyint(1) unsigned NOT NULL default '0',
+  `costsPerTick` varchar(300) NOT NULL default '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,',
+  `energyPerTick` int NOT NULL default '0',
-  PRIMARY KEY  (`werft`,`position`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;

db/updates.xml

@@ -321 +321 @@
-                ALTER TABLE `weaponfactory` ADD PRIMARY KEY ( `col` );
-                ALTER TABLE `weaponfactory` DROP INDEX `col`;
+                ALTER TABLE `werft_queues` ADD COLUMN costsPerTick varchar(300) NOT NULL default '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,';
+                ALTER TABLE `werft_queues` ADD COLUMN energyPerTick int NOT NULL default '0';
-        ]]></update>
-</updates>

src/net/driftingsouls/ds2/server/tick/regular/WerftTick.java

@@ -71 +71 @@
-                                        }
-                                        if( werft.isBuildContPossible() ) {
-decRemainingTime
+continueBuild
-                                                this.log("\tVoraussetzungen erfuellt - bau geht weiter");
-                                        }

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

@@ -398 +398 @@
-        
-        @Override
-
-
+costsPerTick, boolean 
+costsPerTick, 
-                
-                this.ship.recalculateShipStatus();

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

@@ -49 +49 @@
-import net.driftingsouls.ds2.server.ships.Ship;
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-import net.driftingsouls.ds2.server.ships.Ship.ModuleEntry;
-
-import org.apache.commons.lang.StringUtils;
@@ -91 +90 @@
-                
-                // Baudialog
-
-
-
-
-
+
+
-                }
-                // Werkstadt
@@ -688 +684 @@
-        }
-
-
+
+
+
+
+
-                Cargo cargo = werft.getCargo(false);
-        
@@ -711 +711 @@
-                
-                //Standardresourcen
-
+
+
+
+
-                ResourceList reslist = shipdataCosts.compare( cargo, false );
-                for( ResourceEntry res : reslist ) {
-                        t.set_var(      "res.image",                    res.getImage(),
-                                                "res.plainname",                res.getPlainName(),
+                                                "res.cargo.pertick",    perTickCosts.getResourceCount(res.getId()),
-                                                "res.cargo.available",  res.getCargo2(),
-                                                "res.cargo.needed",             res.getCargo1(),
@@ -721 +725 @@
-                        t.parse("build.res.list", "build.res.listitem", true);
-                }
-                
-                int frei = werft.getCrew();
-        
-                //E-Kosten
+                
+                int ePerTick = (int)Math.ceil(shipdata.getInt("ekosten")/(double)shipdata.getInt("dauer"));
+                
-                t.set_var(      "res.image",            Configuration.getSetting("URL")+"data/interface/energie.gif",
-                                        "res.plainname",        "Energie",
+                                        "res.cargo.pertick",    ePerTick,
-                                        "res.cargo.available",  werft.getEnergy(),
-                                        "res.cargo.needed",     shipdata.getInt("ekosten"),
-                                        "res.cargo.mangel",     (shipdata.getInt("ekosten") > werft.getEnergy() ? shipdata.getInt("ekosten") - werft.getEnergy() : 0) );
-
-
-
+
+
+
+
+
-                t.set_var(      "res.image",                    Configuration.getSetting("URL")+"data/interface/arbeitslos.gif",
-                                        "res.plainname",                "Crew",
+                                        "res.cargo.pertick",    "",
-                                        "res.cargo.available",  frei,
-                                        "res.cargo.needed",             shipdata.getInt("crew"),
@@ -740 +749 @@
-                t.parse("build.othercosts.list", "build.res.listitem", true);
-                
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                return;   

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

@@ -341 +341 @@
-                }
-                
+                // Pruefen, ob ein evt notwendiges Item vorhanden ist
-                if( this.getRequiredItem() > -1 ) {
-                        Context context = ContextMap.getContext();
@@ -357 +358 @@
-                        }
-                }
+                
+                // Pruefen, ob die anfallenden Baukosten bezahlt werden koennen
+                WerftQueueEntry entry = getQueueTopEntry();
+                if( !entry.getCostsPerTick().isEmpty() ) {
+                        Cargo cargo = this.getCargo(false);
+                        ResourceList reslist = entry.getCostsPerTick().compare(cargo, false);
+                        for( ResourceEntry res : reslist ) {
+                                if( res.getDiff() > 0 ) {
+                                        return false;
+                                }
+                        }
+                }
+                
+                if( entry.getEnergyPerTick() != 0 ) {
+                        if( this.getEnergy() < entry.getEnergyPerTick() ) {
+                                return false;
+                        }
+                }
-        
-                return true;
+        }
+        
+        private void substractBuildCosts() {
+                WerftQueueEntry entry = getQueueTopEntry();
+                if( !entry.getCostsPerTick().isEmpty() ) {      
+                        Cargo cargo = this.getCargo(false);
+                        cargo.substractCargo(entry.getCostsPerTick());
+                        this.setCargo(cargo, false);
+                }
+                
+                if( entry.getEnergyPerTick() != 0 ) {
+                        this.setEnergy(this.getEnergy() - entry.getEnergyPerTick());
+                }
+        }
+        
+        /**
+         * <p>Setzt den Bau fort. Dies umfasst u.a. das Dekrementieren
+         * der verbleibenden Bauzeit um 1 sowie des Abzugs der pro Tick
+         * anfallenden Baukosten.</p>
+         * <p>Es wird nicht geprueft, ob die Bedingungen fuer ein fortsetzen des
+         * Baus erfuellt sind</p>
+         * @see #isBuildContPossible()
+         */
+        public void continueBuild() {
+                this.decRemainingTime();
+                this.substractBuildCosts();
-        }
-        
@@ -1356 +1401 @@
-         * @param build Schiffbau-ID
-         * @param item Item-ID
+         * @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?
-         * @return true, wenn kein Fehler aufgetreten ist
-         */
-
+costsPerTick, boolean 
-                StringBuilder output = MESSAGE.get();
-                
@@ -1366 +1412 @@
-                User user = (User)db.get(User.class, this.getOwner());
-        
-
-
+
-        
-                Cargo allyitems = null;
@@ -1450 +1495 @@
-                boolean ok = true;
-                
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                ok = false;
-
-
-
-
-
+
+
+
-        
-                int frei = this.getCrew();
-        
-                //E-Kosten
-                if( shipdata.getInt("ekosten") > this.getEnergy()) {
-                        ok = false;
-                }
-                int e = this.getEnergy() - shipdata.getInt("ekosten");
-        
-                //Crew
@@ -1490 +1539 @@
-                else {
-                        if( this.getOneWayFlag() == 0 ) {
-newbasec
+cargo
-                                this.setEnergy(e);
-                                this.setCrew(frei);
@@ -1533 +1582 @@
-                                this.buildFlagschiff = true;
-                        }
+                        if( costsPerTick ) {
+                                shipdataCosts.multiply(1/(double)shipdata.getInt("dauer"), Cargo.Round.CEIL);
+                                entry.setCostsPerTick(shipdataCosts);
+                                entry.setEnergyPerTick((int)Math.ceil(shipdata.getInt("ekosten")/(double)shipdata.getInt("dauer")));
+                        }
-                        db.persist(entry);
-                        

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

@@ -30 +30 @@
-import javax.persistence.Table;
-
+import org.hibernate.annotations.Type;
+
+import net.driftingsouls.ds2.server.cargo.Cargo;
-import net.driftingsouls.ds2.server.framework.ContextMap;
-import net.driftingsouls.ds2.server.ships.ShipType;
@@ -127 +130 @@
-        private boolean buildFlagschiff = false;
-        private int remaining = 0;
-
+
+
+
+
-        /**
-         * Konstruktor
@@ -147 +153 @@
-                this.buildItem = -1;
-                this.remaining = remaining;
+                this.costsPerTick = new Cargo();
-        }
-        
@@ -254 +261 @@
-                this.remaining = remaining;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

templates/werft.werftgui.html

@@ -174 +174 @@
-                        <table class="noBorderX" cellpadding="2" cellspacing="1" style="margin-left:auto;margin-right:auto">
-                        <tr>
-3
+5
-                        </tr>
-                        <tr>
-                                <td class="noBorderX" style="width:32px"></td>
-                                <td class="noBorderX" style="width:100px;text-align:right">Vorhanden</td>
-
+
+
+
-                        </tr>
-                        <!-- BEGIN build.res.listitem -->
@@ -187 +189 @@
-                                        </td>
-                                        <td class="noBorderX" style="width:100px;text-align:right">{res.cargo.available}</td>
-10
+5
-                                                {if res.cargo.mangel}
-                                                        <a class="error" onmouseover="return overlib('&lt;span style=\'font-size:13px\'&gt;Mehrbedarf:<br />{res.cargo.mangel} Einheiten&lt;/span&gt;',TIMEOUT,0,DELAY,300,WIDTH,100);" onmouseout="return nd();" href="#">
@@ -196 +198 @@
-                                                {/endif}
-                                        </td>
+                                        {if res.cargo.pertick}
+                                                <td class="noBorderX"></td>
+                                                <td class="noBorderX" style="width:40px;text-align:right">{res.cargo.pertick}</td>
+                                        {else}
+                                                <td class="noBorderX" colspan="2"></td>
+                                        {/endif}
-                                </tr>
-                        <!-- END build.res.listitem -->
-                        <tr><td class="noBorderX" colspan="3"></td></tr>
-                        <tr>
-3
+5
-                        </tr>
-                        
@@ -211 +219 @@
-                        <h3>Aktionen</h3>
-                        <div style="margin-top:3px; margin-bottom:3px">
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                {else}
-conf
-a class="ok" href="{werftgui.urlbase}&amp;sess={global.sess}&amp;build={build.id}&amp;item={build.item.id}&amp;conf=ok">{build.type.name} bauen</a
-
-gen&uuml;gend Material vorhanden - beginne
+error
+span class="error">{build.error}</span
+
+alles ok - beginne mit
-                                        {/endif}
-                                {/endif}