Changeset 22f424c190a129e67cc3e513f13bb7e9dd26e43c

Timestamp:

01/13/08 23:04:21 (9 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[95c122891a96ea07830b4cdaf7ad5f9c317b32c4]

git-author:

Sebastian Gift <Madison@gt-knm.de> 1200261861 +0100

Message:

Spieler koennen nun Waren an Handelsposten ankaufen.

Files:

• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/entities/SellLimit.java (added)
• src/net/driftingsouls/ds2/server/modules/TradeController.java (modified) (6 diffs)
• templates/trade.html (modified) (1 diff)
• web/WEB-INF/cfg/hibernatemappings.xml (modified) (1 diff)

db/updates.xml

@@ -434 +434 @@
-                ) ENGINE=InnoDB DEFAULT CHARSET=utf8; 
-        ]]></update>
+        <update type="structure" datum="2008-01-10"><![CDATA[
+                CREATE TABLE `tradepost_sell` (
+                  `shipid` int(11) NOT NULL,
+                  `resourceid` int(11) NOT NULL,
+                  `price` int(11) NOT NULL,
+                  `limit` int(11) NOT NULL,
+                  PRIMARY KEY  (`shipid`,`resourceid`)
+                ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+                
+                ALTER TABLE tradepost_sell ADD CONSTRAINT tradepost_sell_fk_ships FOREIGN KEY (shipid) REFERENCES ships(id);
+        ]]></update>
-</updates>

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

@@ -19 +19 @@
-package net.driftingsouls.ds2.server.modules;
-
+import java.math.BigInteger;
+
-import net.driftingsouls.ds2.server.ContextCommon;
-import net.driftingsouls.ds2.server.cargo.Cargo;
@@ -25 +27 @@
-import net.driftingsouls.ds2.server.entities.GtuWarenKurse;
-import net.driftingsouls.ds2.server.entities.ResourceLimit;
+import net.driftingsouls.ds2.server.entities.SellLimit;
-import net.driftingsouls.ds2.server.entities.StatVerkaeufe;
-import net.driftingsouls.ds2.server.entities.User;
@@ -116 +119 @@
-                return true;
-        }
+        
+        /**
+         * Kauft die angegebenen Waren vom Handelsposten.
+         */
+        @Action(ActionType.DEFAULT)
+        public void buyAction() {
+                org.hibernate.Session db = getDB();
+                
+                ResourceList resourceList = this.posten.getCargo().getResourceList();
+                Cargo tradepostCargo = this.posten.getCargo();
+                User user = (User)getUser();
+                BigInteger moneyOfBuyer = user.getKonto();
+                long totalRE = 0;
+                
+                for(ResourceEntry resource: resourceList) {
+                        parameterNumber(resource.getId()+"from");
+                        long amountToBuy = getInteger(resource.getId()+"from");
+                        
+                        //Preis und Minimum holen
+                        ResourceLimitKey resourceLimitKey = new ResourceLimitKey(posten, resource.getId());
+                        SellLimit limit = (SellLimit)db.get(SellLimit.class, resourceLimitKey);
+                        
+                        //Ware wird nicht verkauft
+                        if(limit == null) {
+                                continue;
+                        }
+                        
+                        long amountOnPost = tradepostCargo.getResourceCount(resource.getId()) - limit.getMinimum();
+                        if(amountToBuy > amountOnPost) {
+                                amountToBuy = amountOnPost;
+                        }
+                        
+                        long resourceMass = Cargo.getResourceMass(resource.getId(), 1);
+                        long neededSpace = amountToBuy * resourceMass;
+                        long freeSpaceOnShip = ship.getMaxCargo() - shipCargo.getMass();
+                        
+                        if(neededSpace > freeSpaceOnShip) {
+                                amountToBuy = freeSpaceOnShip / resourceMass;
+                        }
+                        
+                        long price = amountToBuy * limit.getPrice();
+                        //Nicht genug Geld da
+                        if( moneyOfBuyer.compareTo(BigInteger.valueOf(price)) < 0 ) {
+                                amountToBuy = moneyOfBuyer.divide(BigInteger.valueOf(price)).longValue();
+                                price = amountToBuy * limit.getPrice();
+                        }
+                        totalRE += price;
+                        moneyOfBuyer.subtract(BigInteger.valueOf(price));
+                        
+                        assert amountToBuy >= 0: "AmountToBuy darf keine negative Zahl sein";
+                        
+                        if(amountToBuy == 0) {
+                                continue;
+                        }
+                        
+                        this.posten.transfer(this.ship, resource.getId(), amountToBuy);
+                        this.shipCargo = this.ship.getCargo();
+                }
+                
+                this.ship.recalculateShipStatus();
+                this.posten.recalculateShipStatus();
+                this.posten.getOwner().transferMoneyFrom(user.getID(), totalRE, "Warenkauf Handelsposten bei "+this.posten.getLocation(), false, User.TRANSFER_SEMIAUTO);
+                redirect();
+        }
-
-        /**
@@ -220 +287 @@
-        }
-        
-
-
+
-                return posten.getTypeData().getCargo() <= posten.getCargo().getMass();
-        }
@@ -232 +298 @@
-        public void defaultAction() {
-                TemplateEngine t = getTemplateEngine();
+                org.hibernate.Session db = getDB();
-                
-                t.setVar("error.none",1);
@@ -267 +334 @@
-                                                "res.msg",              "Dieser Handelsposten ist voll. Bitte beehre uns zu einem spÀteren Zeitpunkt erneut.");
-                }
+                
+                t.setBlock("_TRADE","resbuy.listitem","resbuy.list");
+                
+                ResourceList buyList = this.posten.getCargo().getResourceList();
+                for(ResourceEntry resource: buyList) {
+                        ResourceLimitKey resourceLimitKey = new ResourceLimitKey(posten, resource.getId());
+                        SellLimit limit = (SellLimit)db.get(SellLimit.class, resourceLimitKey);
+                        
+                        if(limit == null) {
+                                continue;
+                        }
+                        
+                        t.setVar(       "resbuy.img",           resource.getImage(),
+                                                "resbuy.id",            resource.getId(),
+                                                "resbuy.name",          resource.getName(),
+                                                "resbuy.cargo", this.posten.getCargo().getResourceCount(resource.getId()),
+                                                "resbuy.re",            limit.getPrice() );
+                        t.parse("resbuy.list","resbuy.listitem",true);
+                }
-        }
-}

templates/trade.html

@@ -45 +45 @@
-        </form>
-{!table_end}
+{if resbuy.list}
+        {!table_begin 430,center}
+                <form action="./ds" method="post">
+                <table class="noBorderX" cellpadding="2" width="100%">
+                <tr>
+                        <td colspan="4" class="noBorderX">
+                                <span style="font-weight:bold">Waren kaufen:</span>
+                        </td>
+                </tr>
+                <!-- BEGIN resbuy.listitem -->
+                        <tr>
+                                <td class="noBorderX"><img src="{resbuy.img}"alt="" />{resbuy.name}</td>
+                                <td class="noBorderX">{resbuy.cargo}</td>
+                                <td class="noBorderX"><input name="{resbuy.id}from" type="text" size="3" value="0" /></td>
+                                <td class="noBorderX">{resbuy.re}</td>
+                        </tr>
+                <!-- END resbuy.listitem -->
+                <tr>
+                        <td class="noBorderX" colspan="4">
+                                <hr noshade="noshade" size="1" style="color:#cccccc" />
+                        </td>
+                </tr>
+                <tr>
+                        <td class="noBorderX" colspan="4" align="center">
+                                {!form_create_hidden buy, ship:$global.shipid, tradepost:$global.tradepost}
+                                <input type="submit" value="kaufen" style="width:200px" />
+                        </td>
+                </tr>
+                </table>
+                </form>
+        {!table_end}
+{/endif}
-<br />
-{!link_to zur&uuml;ck, default, css_class:back, module:schiff, ship:$global.shipid}

web/WEB-INF/cfg/hibernatemappings.xml

@@ -83 +83 @@
-        <mapping class="net.driftingsouls.ds2.server.tasks.Task" />
-        <mapping class="net.driftingsouls.ds2.server.entities.ResourceLimit" /> 
-
+
+
-        <mapping class="net.driftingsouls.ds2.server.entities.User" />
-        <!-- user_f -->