Changeset 2193fdb03bec86da29b451687ac4f02530f867fd

Timestamp:

09/22/07 13:43:37 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[ee433e0114b5c90c879a0903f3255f8503930e86]

git-author:

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

Message:

Man kann jetzt selbst waehlen, ob Jaeger des Traegers starten sollen.

Files:

• db/tables/ships.sql (modified) (1 diff)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/battles/Battle.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/modules/schiffplugins/CargoDefault.java (modified) (4 diffs)
• src/net/driftingsouls/ds2/server/ships/Ship.java (modified) (2 diffs)
• templates/schiff.cargo.default.html (modified) (1 diff)

db/tables/ships.sql

@@ -40 +40 @@
-  `onmove` text,
-  `respawn` tinyint(4) default NULL,
+  `startFighters` tinyint(3) unsigned NOT NULL default '1',
-  PRIMARY KEY  (`id`),
-  KEY `coords` (`x`,`y`,`system`),

db/updates.xml

@@ -392 +392 @@
-                ALTER TABLE `transmissionen` CHANGE `title` `title` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL 
-        ]]></update>
+        <update type="structure" datum="2007-09-22"><![CDATA[
+                ALTER TABLE `ships` ADD `startFighters` TINYINT UNSIGNED NOT NULL ;
+                ALTER TABLE `ships` CHANGE `startFighters` `startFighters` TINYINT( 3 ) UNSIGNED NOT NULL DEFAULT '1';
+        ]]></update>
+        <update type="structure" datum="2007-09-23"><![CDATA[
+                ALTER TABLE `ship_types` ADD `srs` TINYINT NOT NULL DEFAULT '1';
+                ALTER TABLE `ships_modules` ADD `srs` TINYINT NOT NULL DEFAULT '1';
+        ]]></update>
-</updates>

src/net/driftingsouls/ds2/server/battles/Battle.java

@@ -901 +901 @@
-                        BattleShip ship = battle.enemyShips.get(i);
-                        
-
-
+
+
+
+
-                                ship.getShip().setDocked("");
-                                startlist.add(ship.getId());
@@ -933 +935 @@
-                for( int i=0; i < battle.ownShips.size(); i++ ) {
-                        BattleShip ship = battle.ownShips.get(i);
-
-
-
+
+
+
+
-                                startlist.add(ship.getId());
-                                ship.getShip().setDocked("");

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

@@ -46 +46 @@
-                controller.parameterNumber("load");
-                controller.parameterNumber("setautodeut");
+                controller.parameterNumber("setstartfighter");
-                
-                String act = controller.getString("act");
@@ -52 +53 @@
-                long unload = controller.getInteger("unload");
-                int setautodeut = controller.getInteger("setautodeut");
+                int setstartfighter = controller.getInteger("setstartfighter");
-                
-                if( act.equals("load") ) {
@@ -117 +119 @@
-                        output += "Automatisches Deuteriumsammeln "+(autodeut != 0 ? "":"de")+"aktiviert<br />\n";
-                }
+                else if(setstartfighter != 0)
+                {
+                        controller.parameterNumber("startfighter");
+                        int startfighter = controller.getInteger("startfighter");
+                        
+                        ship.setStartFighters(startfighter != 0 ? true : false);
+                        
+                        output += "Automatisches Starten von JÀgern "+(startfighter != 0 ? "":"de")+"aktiviert<br />\n";
+                }
-                
-                return output;
@@ -136 +147 @@
-                Resources.echoResList( t, reslist, "schiff.cargo.reslist.list" );
-                
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                
-                t.parse(caller.target,"_PLUGIN_"+pluginid);

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

@@ -148 +148 @@
-        private Byte respawn;
-        private int ablativeArmor;
+        private boolean startFighters;
-        
-        /**
@@ -3273 +3274 @@
-                this.ablativeArmor = ablativeArmor;
-        }
+
+        public boolean startFighters() {
+                return startFighters;
+        }
+
+        public void setStartFighters(boolean startFighters) {
+                this.startFighters = startFighters;
+        }
+        
+        /**
+         * Bestimmt, ob ein Schiff sein SRS nutzen kann.
+         * 
+         * @return <code>False</code>, wenn das Schiff kein SRS hat oder gelandet ist. <code>True</code> ansonsten.
+         */
+        public boolean canUseSrs()
+        {
+                if(!getTypeData().hasSrs())
+                {
+                        return false;
+                }
+                
+                String motherShip = getDocked();
+                if(motherShip != null && motherShip.startsWith("l"))
+                {
+                        return false;
+                }
+                
+                return true;
+        }
+        
+        /**
+         * Bestimmt, ob ein Schiff sein SRS nutzen kann.
+         * 
+         * @return <code>False</code>, wenn das Schiff kein SRS hat oder gelandet ist. <code>True</code> ansonsten.
+         */
+        public boolean canUseSrs()
+        {
+                if(!getTypeData().hasSrs())
+                {
+                        return false;
+                }
+                
+                String motherShip = getDocked();
+                if(motherShip != null && motherShip.startsWith("l"))
+                {
+                        return false;
+                }
+                
+                return true;
+        }
-}

templates/schiff.cargo.default.html

@@ -59 +59 @@
-        </form>
-{/endif}
+{if schiff.cargo.traeger}
+        <form action="./ds" method="post">
+                <div>
+                        Automatisch starten:<br />
+                        <input id="cargo_ops_startfighter" name="cargo_ops[startfighter]" type="checkbox" value="1" {if schiff.cargo.traeger.startfighter}checked="checked"{/endif} />
+                        <label for="cargo_ops_startfighter">aktivieren</label>&nbsp;
+                        {!form_create_hidden plugin, ship:$ship.id, plugin:$global.pluginid}
+                        <input type="hidden" name="cargo_ops[setstartfighter]" value="1" />
+                        <input type="submit" value="ok" />
+                </div>
+        </form>
+{/endif}