Changeset bed664f93253d22a033cf37799f8f79ef26bbcec

Timestamp:

07/10/07 18:34:20 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[30f818dab988ccb2abce2ac23f68f91148666a59]

git-author:

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

Message:

Erster Teil Werftslots (Abhaengigkeit, ob ein Schiff in einer Werft gebaut werden kann. Bauschlange noch nicht behandelt)

Files:

• db/tables/ship_types.sql (modified) (2 diffs)
• db/tables/ships_baubar.sql (modified) (3 diffs)
• db/tables/ships_modules.sql (modified) (1 diff)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/AdminCommands.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/config/IEDraftShip.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/modules/ItemInfoController.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/modules/KapernController.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/SchiffController.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/SchiffInfoController.java (modified) (15 diffs)
• src/net/driftingsouls/ds2/server/modules/SchiffeController.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/admin/AddShips.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/ks/KSKapernAction.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/SensorsDefault.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/ships/AbstractShipTypeDataWrapper.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/ships/ShipBaubar.java (modified) (5 diffs)
• src/net/driftingsouls/ds2/server/ships/ShipModules.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/ships/ShipType.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/ships/ShipTypeChangeset.java (modified) (4 diffs)
• src/net/driftingsouls/ds2/server/ships/ShipTypeData.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/tick/regular/NPCOrderTick.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/tick/regular/RTCTick.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/werften/BaseWerft.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/ShipWerft.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/werften/WerftObject.java (modified) (11 diffs)
• templates/schiffinfo.html (modified) (2 diffs)
• web/WEB-INF/cfg/items.xml (modified) (4 diffs)

db/tables/ship_types.sql

@@ -29 +29 @@
-  `flags` text NOT NULL,
-  `groupwrap` tinyint(3) unsigned NOT NULL default '10',
-varchar(16) NOT NULL default '
+int(11) NOT NULL default '0
-  `ow_werft` smallint(5) unsigned NOT NULL default '0',
-  `chance4Loot` tinyint(3) unsigned NOT NULL default '0',
@@ -56 +56 @@
-INSERT INTO `ship_types` (`id`, `nickname`, `picture`, `ru`, `rd`, `ra`, `rm`, `eps`, `cost`, `hull`, `panzerung`, `cargo`, `heat`, `crew`, `weapons`, `maxheat`, `torpedodef`, `shields`, `size`, `jdocks`, `adocks`, `sensorrange`, `hydro`, `recost`, `descrip`, `deutfactor`, `class`, `flags`, `groupwrap`, `werft`, `ow_werft`, `chance4Loot`, `modules`, `shipcount`, `hide`) VALUES (30, 'Anuket', 'data/schiffe/gvt_anuket.png', 0, 6, 0, 12, 50, 2, 4000, 1, 580, 2, 30, '', '', 0, 0, 6, 0, 0, 1, 0, 0, 'Deuterium, das Rohmaterial f¨r Plastik und der Brennstoff f¨r Fusionsreaktoren aller Art, kommt nicht auf Asteroiden vor.\r\nDie Anuket, der vasudanische Tanker, ist etwas behäbiger als das Terranische Gegenst¨ck, hat jedoch mehr Frachtraum.\r\n', 3, 3, '', 10, '', 0, 0, '1:misctanker', 1, 0);
-INSERT INTO `ship_types` (`id`, `nickname`, `picture`, `ru`, `rd`, `ra`, `rm`, `eps`, `cost`, `hull`, `panzerung`, `cargo`, `heat`, `crew`, `weapons`, `maxheat`, `torpedodef`, `shields`, `size`, `jdocks`, `adocks`, `sensorrange`, `hydro`, `recost`, `descrip`, `deutfactor`, `class`, `flags`, `groupwrap`, `werft`, `ow_werft`, `chance4Loot`, `modules`, `shipcount`, `hide`) VALUES (31, 'Ma at', 'data/schiffe/gcp/gvfr_maat.png', 8, 0, 0, 24, 80, 2, 8500, 4, 1000, 4, 30, 'Subach_HL-7=1|Terran_Turret=3', 'Subach_HL-7=5|Terran_Turret=15', 0, 0, 6, 0, 2, 1, 0, 0, 'Die Ma''at war während des Großen Krieges der Standard-Transporter der jetztigen Vasudaner. Seine 4 Laserkanonen konnten frechen einzelgängerischen GTA-Jäger abwehren, jedoch waren die Ma''at gegen eine Vierer-Staffel machtlos.\r\nAuch heute setzen die Vasudaner die Ma''at als billiges bewaffnetes Transportschiff ein.\r\n\r\nJedes angedockte Objekt erhöht die Flugkosten des Schiffes um 1.', 0, 1, '', 10, '', 0, 0, '1:misc', 1, 0);
-'ganymed'
-'pwerft'
+12
+4
-INSERT INTO `ship_types` (`id`, `nickname`, `picture`, `ru`, `rd`, `ra`, `rm`, `eps`, `cost`, `hull`, `panzerung`, `cargo`, `heat`, `crew`, `weapons`, `maxheat`, `torpedodef`, `shields`, `size`, `jdocks`, `adocks`, `sensorrange`, `hydro`, `recost`, `descrip`, `deutfactor`, `class`, `flags`, `groupwrap`, `werft`, `ow_werft`, `chance4Loot`, `modules`, `shipcount`, `hide`) VALUES (37, 'Rahu', 'data/schiffe/shivaner/st_rahu.png', 0, 8, 0, 20, 80, 2, 15000, 2, 450, 5, 30, 'Shivan_Heavy_Laser=3', 'Shivan_Heavy_Laser=15', 0, 0, 6, 0, 0, 0, 0, 0, 'Auch die Shivaner benötigen Nachschub.\r\nDie Rahu entsprechen den Tankern, sind aber, wie jedes shivanische Schiff bewaffnet und hochaggressiv. Die Bewaffnung schlÀgt sich jedoch auf den Laderaum nieder.\r\n', 3, 3, 'jumpdrive_shivan', 10, '', 0, 0, '1:misctanker', 1, 0);
-INSERT INTO `ship_types` (`id`, `nickname`, `picture`, `ru`, `rd`, `ra`, `rm`, `eps`, `cost`, `hull`, `panzerung`, `cargo`, `heat`, `crew`, `weapons`, `maxheat`, `torpedodef`, `shields`, `size`, `jdocks`, `adocks`, `sensorrange`, `hydro`, `recost`, `descrip`, `deutfactor`, `class`, `flags`, `groupwrap`, `werft`, `ow_werft`, `chance4Loot`, `modules`, `shipcount`, `hide`) VALUES (44, 'Charybdis', 'data/schiffe/gts_charybdis.png', 3, 9, 0, 75, 120, 2, 10000, 2, 300, 3, 400, 'standard_flak=2', 'standard_flak=10', 0, 0, 7, 0, 0, 8, 0, 0, 'Die GTA Charybdis ist mit modernsten Tachyon-AWACS-Sensoren ausgestattet, die eine Langstreckenaufklärung ohnegleichen ermöglichen. Charybdis sind jedoch nut schlecht gepanzert und bis auf zwei Flakgeschütze unbewaffnet, so daß sie nie unbewacht fliegen sollten. Auch eine Aufklärung von Nebeln erwies sich als unmöglich, wie schon die Untersuchung im Nebel hinter dem Knoßosportal bewies.', 0, 13, 'srs_awac', 10, '', 0, 0, '1:misc', 1, 0);

db/tables/ships_baubar.sql

@@ -3 +3 @@
-  `type` int(11) NOT NULL default '0',
-  `costs` varchar(100) NOT NULL default '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,',
-  `linfactor` float NOT NULL default '0',
-  `crew` smallint(6) NOT NULL default '0',
-  `dauer` tinyint(4) NOT NULL default '0',
@@ -12 +11 @@
-  `tr2` int(11) NOT NULL default '0',
-  `tr3` int(11) NOT NULL default '0',
-req` tinytext NOT NULL
+slots` int(11) NOT NULL default '1'
-  `flagschiff` tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (`id`)
@@ -19 +18 @@
-ALTER TABLE ships_baubar ADD CONSTRAINT ships_baubar_type_fk FOREIGN KEY (type) REFERENCES ship_types(id);
- 
-0, 20, 9, 78, 2, 1, 7, 0, 0, 'pwerft ganymed'
-0, 10, 6, 87, 1, 0, 1, 0, 0, 'pwerft ganymed'
-0, 2, 46, 1, 1, 12, 0, 0, 'pwerft ganymed'
-0, 1, 22, 1, 0, 32, 0, 0, 'pwerft ganymed'
-0, 1, 26, 2, 0, 32, 0, 0, 'pwerft ganymed'
-0, 10, 6, 93, 2, 0, 1, 0, 0, 'pwerft ganymed'
-0, 140, 34, 389, 1, 1, 23, 31, 29, 'ganymed'
-0, 30, 16, 371, 1, 1, 34, 0, 0, 'ganymed'
-0, 20, 9, 387, 1, 0, 30, 10, 23, 'pwerft ganymed'
-0.5, 120, 120, 700, 0, 0, 33, 0, 0, 'pwerft ganymed'
-0, 5, 10, 212, 0, 1, 19, 0, 0, 'ganymed'
-0, 140, 60, 800, 0, 1, 43, 0, 0, 'ganymed'
-0, 75, 25, 512, 2, 1, 34, 0, 0, 'ganymed'
-0, 8, 3, 200, 1, 1, 21, 4, 0, 'pwerft ganymed'
-0, 10, 12, 150, 0, 0, 36, 63, 0, 'pwerft ganymed'
-0, 280, 110, 1150, 1, 1, 65, 0, 0, 'ganymed'
-0, 250, 110, 1180, 2, 1, 65, 0, 0, 'ganymed'
-0, 4, 2, 208, 1, 1, 15, 0, 0, 'pwerft ganymed'
+20, 9, 78, 2, 1, 7, 0, 0, 6
+10, 6, 87, 1, 0, 1, 0, 0, 4
+2, 46, 1, 1, 12, 0, 0, 1
+1, 22, 1, 0, 32, 0, 0, 1
+1, 26, 2, 0, 32, 0, 0, 1
+10, 6, 93, 2, 0, 1, 0, 0, 4
+140, 34, 389, 1, 1, 23, 31, 29, 8
+30, 16, 371, 1, 1, 34, 0, 0, 6
+20, 9, 387, 1, 0, 30, 10, 23, 6
+120, 120, 700, 0, 0, 33, 0, 0, 7
+5, 10, 212, 0, 1, 19, 0, 0, 3
+140, 60, 800, 0, 1, 43, 0, 0, 10
+75, 25, 512, 2, 1, 34, 0, 0, 7
+8, 3, 200, 1, 1, 21, 4, 0, 2
+10, 12, 150, 0, 0, 36, 63, 0, 4
+280, 110, 1150, 1, 1, 65, 0, 0, 12
+250, 110, 1180, 2, 1, 65, 0, 0, 12
+4, 2, 208, 1, 1, 15, 0, 0, 1

db/tables/ships_modules.sql

@@ -28 +28 @@
-  `recost` smallint(5) unsigned NOT NULL default '0',
-  `flags` text NOT NULL,
-varchar(16) NOT NULL default '
+int(11) NOT NULL default '0
-  `ow_werft` smallint(6) NOT NULL default '0',
-  PRIMARY KEY  (`id`)

db/updates.xml

@@ -330 +330 @@
-                ALTER TABLE `nebel` ADD PRIMARY KEY ( `system` , `x` , `y` );
-                ALTER TABLE `nebel` DROP INDEX `coords`;
+                
+                ALTER TABLE `ships_baubar` DROP `linfactor`;
+                ALTER TABLE `ships_baubar` DROP `werftreq`;
+                ALTER TABLE `ships_baubar` ADD `werftslots` INT NOT NULL DEFAULT '1' AFTER `tr3` ;
+                -- Die Werte fuer ships_baubar-Eintraege sind der entsprechenden Tabelle zu entnehmen
+                
+                ALTER TABLE `ship_types` CHANGE `werft` `werft` INT NOT NULL DEFAULT '0';
+                -- Die Werte fuer ship_types-Eintraege sind der entsprechenden Tabelle zu entnehmen
+                
+                ALTER TABLE `ships_modules` CHANGE `werft` `werft` INT( 11 ) NOT NULL DEFAULT '0';
+                -- Schiffe, welche Module mit Werfteffekt haben, beduerfen fuer eine korrekte Funktion ein Aus- und Wiedereinbau des Moduls
-        ]]></update>
-</updates>

src/net/driftingsouls/ds2/server/AdminCommands.java

@@ -215 +215 @@
-                        
-                        Database database = ContextMap.getContext().getDatabase();
-.length() >
+ !=
-                                SQLResultRow wid = database.first("SELECT id FROM werften WHERE shipid="+ship.getId());
-                                if( wid.isEmpty() ) {

src/net/driftingsouls/ds2/server/config/IEDraftShip.java

@@ -43 +43 @@
-        private int dauer = 0;
-        private int[] techs = null;
-String[] werftreq = null
+int werftslots = 1
-        
-        protected IEDraftShip(boolean allyEffect) {
@@ -127 +127 @@
-        
-        /**
-tags zurueck, die jeweils den Bau des Schiffes ermoeglichen
-tag
+slots zurueck, die zum Bau des Schiffes erforderlich sind
+slot
-         */
-String[] getWerftReq
-req
+int getWerftSlot
+slots
-        }
-        
@@ -164 +164 @@
-                }
-        
-
-
-
-
-
+
-                
-                draft.buildcosts = new UnmodifiableCargo(new Cargo(XMLUtils.getNodeByXPath(effectNode, "buildcosts")));

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

@@ -210 +210 @@
-                }
-                
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                }
-                
@@ -420 +413 @@
-                        t.parse("itemdetails.entrylist", "itemdetails.entry", true);
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                        
-                        t.parse("itemdetails.entrylist", "itemdetails.entry", true);

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

@@ -415 +415 @@
-                                .executeUpdate();
-                        
-.length() >
+ !=
-                                database.update("UPDATE werften SET linked=0 WHERE shipid="+this.targetShip.getId());
-                        }

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

@@ -159 +159 @@
-                pluginMapper.put("cargo", getPluginByName("CargoDefault"));
-                
-.length() >
+ !=
-                        pluginMapper.put("werft", getPluginByName("WerftDefault"));
-                }

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

@@ -40 +40 @@
-import net.driftingsouls.ds2.server.ships.NoSuchShipTypeException;
-import net.driftingsouls.ds2.server.ships.Ship;
+import net.driftingsouls.ds2.server.ships.ShipBaubar;
-import net.driftingsouls.ds2.server.ships.ShipTypeData;
-import net.driftingsouls.ds2.server.ships.ShipTypes;
@@ -53 +54 @@
-        private int shipID = 0;
-        private ShipTypeData ship = null;
-QLResultRow
+hipBaubar
-        
-        /**
@@ -72 +73 @@
-        protected boolean validateAndPrepare(String action) {
-                TemplateEngine t = getTemplateEngine();
-Database db = getDatabase
+org.hibernate.Session db = getDB
-                User user = (User)getUser();
-                int ship = getInteger("ship");
@@ -104 +105 @@
-                }
-                
-QLResultRow
-
-      
+hipBaubar
+
+
-                        //Daten fuer baubare Schiffe laden
-
-
-
-
-
+
+
+
+
-                }
-                
@@ -128 +128 @@
-                if( getUser() != null ) {
-                        for( int i=1; i <= 3; i++ ) {
-Int("tr"+
-Int("tr"+
+Res(
+Res(
-                                                        "FROM forschungen f JOIN user_f uf " +
-("tr"+
+Res(
-                                        String cssClass = "error";
-                                        if( !dat.isEmpty() && dat.getBoolean("research") ) {
@@ -137 +137 @@
-                                        }       
-
-Int("tr"+
+Res(
-                                                                "shiptype.tr"+i+".name" , Common._title(dat.getString("name")),
-                                                                "shiptype.tr"+i+".status", cssClass );
@@ -145 +145 @@
-                else {
-                        for( int i=1; i <= 3; i++ ) {
-Int("tr"+
-Int("tr"+
-
-Int("tr"+
+Res(
+Res(
+
+Res(
-                                                                "shiptype.tr"+i+".name", Common._title(f.getName()) );
-                                }
@@ -154 +154 @@
-                }
-                String race = "???";
-Int("race"
+Race(
-                        race = "Alle";
-                } 
-                else {
-Int("race"
+Race(
-                }
-
@@ -167 +167 @@
-                TemplateEngine t = getTemplateEngine();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-                t.set_block("_SCHIFFINFO","res.listitem","res.list");
-        
-new Cargo( Cargo.Type.STRING, shipBuildData.getString("costs") 
+shipBuildData.getCosts(
-                ResourceList reslist = costs.getResourceList();
-                for( ResourceEntry res  : reslist ) {
@@ -207 +193 @@
-                int visible = -1;
-
-!shipBuildData.isEmpty()
+shipBuildData != null
-                        for( int i=1; i <= 3; i++ ) {
-Int("tr"+
-("tr"+
+Res(
+Res(
-                                        
-                                        if( (research.getInt("visibility") != 1) && 
@@ -216 +202 @@
-                                                 !user.hasResearched(research.getInt("req2")) || !user.hasResearched(research.getInt("req3")) ) ) {
-                                                        
-Int("tr"+
+Res(
-                                        }
-                                }
@@ -223 +209 @@
-
-                if( visible > 0 ) {
-.clear()
+ = null
-                        
-                        if( (user != null) && user.getAccessLevel() >= 10 ) {
@@ -381 +367 @@
-                                        "deuterium.image",              Cargo.getResourceImage(Resources.DEUTERIUM),
-                                        "antimaterie.image",    Cargo.getResourceImage(Resources.ANTIMATERIE),
-.isEmpty() ? 0:1
+ != null
-                                        "shiptype.cost",                ship.getCost(),
-                                        "shiptype.heat",                ship.getHeat(),
@@ -396 +382 @@
-                                        "shiptype.deutfactor",  ship.getDeutFactor(),
-                                        "shiptype.hydro",               ship.getHydro(),
-!shipBuildData.isEmpty() && shipBuildData.getBoolean("flagschiff"
+shipBuildData != null && shipBuildData.isFlagschiff(
-                                        "shiptype.recost",              ship.getReCost(),
-                                        "shiptype.torpedodef",  ship.getTorpedoDef(),
@@ -410 +396 @@
-                }
-                
-!shipBuildData.isEmpty()
+shipBuildData != null
-                        outPrerequisites();
-                }
-
-                //Produktionskosten anzeigen, sofern das Schiff baubar ist
-!shipBuildData.isEmpty()
+shipBuildData != null
-                        outShipCost();
-                }

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

@@ -304 +304 @@
-                                }
-
-.length() >
+ !=
-                                        ShipWerft werft = (ShipWerft)db.createQuery("from ShipWerft where shipid=?")
-                                                .setEntity(0, ship)

src/net/driftingsouls/ds2/server/modules/admin/AddShips.java

@@ -307 +307 @@
-                                query.close();
-                                
-.length() >
+ !=
-                                        db.update("INSERT INTO werften (shipid) VALUES ("+shipid+")");
-                                }

src/net/driftingsouls/ds2/server/modules/ks/KSKapernAction.java

@@ -285 +285 @@
-                                        .setString(1, "s "+dockShip.getId())
-                                        .executeUpdate();
-.length() >
+ !=
-                                        db.createQuery("update ShipWerft set linked=null where shipid=?")
-                                                .setEntity(0, dockShip)
@@ -298 +298 @@
-                                .setString(1, "s "+enemyShip.getId())
-                                .executeUpdate();
-.length() >
+ !=
-                                db.createQuery("update ShipWerft set linked=null where shipid=?")
-                                        .setEntity(0, enemyShip)

src/net/driftingsouls/ds2/server/modules/schiffplugins/SensorsDefault.java

@@ -689 +689 @@
-
-                                        //Schiff in die Werft fliegen
-.length() >
+ !=
-                                                t.set_var("sships.action.repair",1);
-                                        }

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

@@ -192 +192 @@
-        }
-
-String
+int
-                return inner.getWerft();
-        }

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

@@ -48 +48 @@
-        @Type(type="cargo")
-        private Cargo costs;
-        @Column(name="linkfactor")
-        private double linFactor;
-        private int crew;
-        private int dauer;
@@ -60 +58 @@
-        private int tr2;
-        private int tr3;
-req
-String werftReq
+slots
+int werftSlots
-        private boolean flagschiff;
-        
@@ -121 +119 @@
-
-        /**
-         * Gibt den Faktor fuer steigende Kosten zurueck
-         * @return Der Faktor fuer steigende Kosten
-         */
-        public double getLinFactor() {
-                return linFactor;
-        }
-
-        /**
-         * Gibt die Rasse zurueck, die diesen Baueintrag nutzen kann
-         * @return Die Rasse
@@ -158 +148 @@
-                        return tr3;
-                }
-Runtime
+IllegalArgument
-        }
-
@@ -170 +160 @@
-
-        /**
-
+slots
-         * @return Die Werft-Requirements
-         */
-String getWerftReq
-Req
+int getWerftSlots
+Slots
-        }
-        
-        
-}

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

@@ -73 +73 @@
-        private int reCost;
-        private String flags;
-String
+int
-        @Column(name="ow_werft")
-        private int oneWayWerft;
@@ -438 +438 @@
-        }
-
-String
+int
-                return werft;
-        }
@@ -446 +446 @@
-         * @param werft Die Werftdaten
-         */
-String
+int
-                this.werft = werft;
-        }