Changeset f82584a7c1d40eae013b39c8dc47e98480f8dbfe

Timestamp:

08/05/07 12:37:35 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[a89e5107360c444563dcc1f31af8593ffdafc8a6]

git-author:

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

Message:

Handelsposten: Ankauflimits eingebaut

Files:

• db/tables/tradepost_buy_limit.sql (added)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/entities/ResourceLimit.java (added)
• src/net/driftingsouls/ds2/server/modules/TradeController.java (modified) (4 diffs)
• web/WEB-INF/cfg/hibernatemappings.xml (modified) (1 diff)

db/updates.xml

@@ -354 +354 @@
-                ALTER TABLE `academy` DROP INDEX `col`;
-        ]]></update>
+        <update type="structure" datum="2007-08-05"><![CDATA[
+                CREATE TABLE `tradepost_buy_limit` (
+                  `shipid` int(11) NOT NULL,
+                  `resourceid` int(11) NOT NULL,
+                  `limit` int(11) NOT NULL,
+                  PRIMARY KEY  (`shipid`,`resourceid`)
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+                
+                ALTER TABLE tradepost_buy_limit ADD CONSTRAINT tradepost_buy_limit_fk_ships FOREIGN KEY (shipid) REFERENCES ships(id);
+        ]]></update>
-</updates>

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

@@ -24 +24 @@
-import net.driftingsouls.ds2.server.cargo.ResourceList;
-import net.driftingsouls.ds2.server.entities.GtuWarenKurse;
+import net.driftingsouls.ds2.server.entities.ResourceLimit;
-import net.driftingsouls.ds2.server.entities.StatVerkaeufe;
-import net.driftingsouls.ds2.server.entities.User;
+import net.driftingsouls.ds2.server.entities.ResourceLimit.ResourceLimitKey;
-import net.driftingsouls.ds2.server.framework.Common;
-import net.driftingsouls.ds2.server.framework.Context;
@@ -154 +156 @@
-                                long resourceMass = Cargo.getResourceMass(res.getId(), 1);
-                                
+                                //Wir wollen eventuell nur bis zu einem Limit ankaufen
+                                ResourceLimitKey resourceLimitKey = new ResourceLimitKey(posten, res.getId());
+                                ResourceLimit resourceLimit = (ResourceLimit) db.get(ResourceLimit.class, resourceLimitKey);
+                                
+                                long limit = Long.MAX_VALUE;
+                                if(resourceLimit != null) {
+                                        limit = resourceLimit.getLimit();
+                                        //Bereits gelagerte Bestaende abziehen
+                                        limit -= posten.getCargo().getResourceCount(res.getId());
+                                }
+                                
+                                if( tmp > limit ) {
+                                        tmp = limit;
+                                }
+                                
-                                //Nicht mehr ankaufen als Platz da ist
-
-
+
-                                        tmp = freeSpace/resourceMass;
-                                }
@@ -216 +232 @@
-                ResourceList reslist = this.kurse.getResourceList();
-                
-
-
+
-                        t.set_var("is.full", 0);
-                        for( ResourceEntry res : reslist ) {
@@ -241 +256 @@
-                        }
-                }
-
-
+
-                        
-                        t.set_var(      "is.full",              true,

web/WEB-INF/cfg/hibernatemappings.xml

@@ -81 +81 @@
-        <!-- surveys -->
-        <mapping class="net.driftingsouls.ds2.server.tasks.Task" />
+        <mapping class="net.driftingsouls.ds2.server.entities.ResourceLimit" /> 
-        <!-- transmissionen [net.driftingsouls.ds2.server.comm.PM umbauen] -->
-        <mapping class="net.driftingsouls.ds2.server.entities.User" />