Changeset a2ac3f915e9adaed428bbabbcd6bca0ba5f5a467

Timestamp:

03/25/07 15:42:07 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[ae11637eff7bd2537af9488073a3fa5a3c422270]

git-author:

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

Message:

QuickQuests? koennen nun mehrere sources und targets haben

Files:

• db/tables/quests_quick.sql (modified) (1 diff)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/admin/QuestsQuick.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/scripting/QuestFunctions.java (modified) (5 diffs)

db/tables/quests_quick.sql

@@ -11 +11 @@
-  `finishtext` text NOT NULL,
-  `notyettext` text NOT NULL,
-int(10) unsigned
+varchar(30)
-  `sourcetype` varchar(20) NOT NULL default 'gtuposten',
-int(10) unsigned
+varchar(30)
-  `targettype` varchar(20) NOT NULL default 'gtuposten',
-  `startitems` text NOT NULL,

db/updates.xml

@@ -225 +225 @@
-                 UPDATE buildings SET module='net.driftingsouls.ds2.server.bases.Waffenfabrik' WHERE module='waffenfabrik';
-        ]]></update>
+        <update type="structure" datum="2007-03-25"><![CDATA[
+                ALTER TABLE quests_quick CHANGE source source VARCHAR(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
+                ALTER TABLE quests_quick CHANGE target target VARCHAR(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
+        ]]></update>
-</updates>

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

@@ -70 +70 @@
-                                pq.close();
-                        }
-
+'
-                        
-                        echo.append("Quest aktiviert<br /><br />");
@@ -164 +164 @@
-                        SQLResultRow qquest = db.first("SELECT * FROM quests_quick WHERE id="+id);
-                        
-
-
+
+
+
+
+
+
+
-                        
-                        String qquest_desc = StringUtils.replace(qquest.getString("desc"), "&", "&amp;");

src/net/driftingsouls/ds2/server/scripting/QuestFunctions.java

@@ -2151 +2151 @@
-                
-                        SQLQuery qquest = db.query("SELECT * FROM quests_quick " +
-
+
+
+
-                        while( qquest.next() ) {
-                                if( qquest.getInt("moreThanOnce") == 0 ) {
@@ -2220 +2222 @@
-                        
-                        SQLQuery qquest = db.query("SELECT * FROM quests_quick " +
-
+
+
+
-                        while( qquest.next() ) {
-                                call(new LoadQuestContext(), db, scriptparser, qquest.getInt("enabled"));
@@ -2277 +2281 @@
-                                scriptparser.log("QQuest: "+scriptparser.getParameter(1)+"\n");
-                                SQLResultRow qquest = db.first("SELECT * FROM quests_quick WHERE id="+Value.Int(scriptparser.getParameter(1)));
-
-
+
-                                        scriptparser.setRegister("#A","0");
-
+
+
+
+
+
+
+
-                                }
-                                
@@ -2367 +2376 @@
-                                scriptparser.log("QQuest: "+scriptparser.getParameter(1)+"\n");
-                                SQLResultRow qquest = db.first("SELECT * FROM quests_quick WHERE id="+Value.Int(scriptparser.getParameter(1)));
-
-
+
-                                        scriptparser.setRegister("#A","0");
-                                        return CONTINUE;        
+                                }
+                                
+                                int[] sourcelist = Common.explodeToInt(",", qquest.getString("source"));
+                                if( !Common.inArray(shipid, sourcelist) ) {
+                                        scriptparser.setRegister("#A","0");
+                                        return CONTINUE;
-                                }
-                                
@@ -2470 +2484 @@
-                                scriptparser.log("QQuest: "+scriptparser.getParameter(1)+"\n");
-                                SQLResultRow qquest = db.first("SELECT * FROM quests_quick WHERE id="+Value.Int(scriptparser.getParameter(1)));
-
-
+
-                                        scriptparser.setRegister("#A","0");
-                                        return CONTINUE;        
+                                }
+                                
+                                int[] sourcelist = Common.explodeToInt(",", qquest.getString("source"));
+                                if( !Common.inArray(shipid, sourcelist) ) {
+                                        scriptparser.setRegister("#A","0");
+                                        return CONTINUE;
-                                }
-