Changeset 1885

Timestamp:

11/17/08 08:05:14 (2 months ago)

Author:

ddb174

Message:

Fixed up the contributed prp section even more.

Files:

• drizzle/DrizzlePrp/src/automation/fileLists.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/automation/myst5Fixes.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/automation/mystAutomation.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/files/authored/authors&licenses.txt (modified) (1 diff)
• drizzle/DrizzlePrp/src/gui/Gui.form (modified) (4 diffs)
• drizzle/DrizzlePrp/src/gui/Gui.java (modified) (9 diffs)
• drizzle/DrizzlePrp/src/shared/cmap.java (modified) (2 diffs)

drizzle/DrizzlePrp/src/automation/fileLists.java

@@ -40 +40 @@
-    };
-    
+    public static String[] mystvFiles = {
+        "Descent.(others)","Descent.age","Descent.fni","Descent.sum","Descent_dsntBahro_Idle02.prp","Descent_dsntBahro_Idle03.prp","Descent_dsntBahro_Idle04.prp","Descent_dsntBahro_Idle05.prp","Descent_dsntBahro_Idle06.prp","Descent_dsntBahro_Idle07.prp","Descent_dsntBahro_Idle08.prp","Descent_dsntBahro_Idle09.prp","Descent_dsntBahro_Shot02.prp","Descent_dsntBahro_Shot03.prp","Descent_dsntBahro_Shot04.prp","Descent_dsntBahro_Shot05.prp","Descent_dsntBahro_Shot06.prp","Descent_dsntBahro_Shot07.prp","Descent_dsntBahro_Shot08.prp","Descent_dsntBahro_Shot09.prp","Descent_dsntBahro_Tunnel01.prp","Descent_dsntBahro_Tunnel01Idle.prp","Descent_dsntBats.prp","Descent_dsntEsherIdleTopOfShaft.prp","Descent_dsntEsher_BottomOfShaft.prp","Descent_dsntEsher_FirstHub.prp","Descent_dsntEsher_Intro.prp","Descent_dsntEsher_TopOfShaft.prp","Descent_dsntGreatShaftBalcony.prp","Descent_dsntGreatShaftLowerRm.prp","Descent_dsntLowerBats.prp","Descent_dsntMapGUI.prp","Descent_dsntPostBats.prp","Descent_dsntPostShaftNodeAndTunnels.prp","Descent_dsntShaftGeneratorRoom.prp","Descent_dsntShaftTunnelSystem.prp","Descent_dsntTianaCave.prp","Descent_dsntTianaCaveNode2.prp","Descent_dsntTianaCaveTunnel1.prp","Descent_dsntTianaCaveTunnel3.prp","Descent_dsntUpperBats.prp","Descent_dsntUpperShaft.prp","Descent_dsntVolcano.prp","Descent_Textures.prp","Descent_dusttest.prp",
+        "Direbo.(others)","Direbo.age","Direbo.fni","Direbo.sum","Direbo_DragonFly.prp","Direbo_drboEsherIdleDirebo.prp","Direbo_drboEsher_DireboLaki.prp","Direbo_drboEsher_DireboSrln.prp","Direbo_drboEsher_DireboTdlm.prp","Direbo_drboEsher_DireboThgr.prp","Direbo_drboUrwinShape.prp","Direbo_RestAge.prp","Direbo_Textures.prp","Direbo_UrwinIdle.prp","Direbo_UrwinWalk.prp",
+        "Kveer.(others)","Kveer.age","Kveer.fni","Kveer.sum",/*"Kveer_bkMystBookLocked.prp","Kveer_GreatRm.prp","Kveer_KveerBats.prp","Kveer_kverAtrus.prp","Kveer_kverAtrus_1.prp","Kveer_kverAtrus_Idle.prp","Kveer_kverBahroWingsGUI.prp","Kveer_kverBahro_1.prp","Kveer_kverBahro_2.prp","Kveer_kverBahro_Ballroom01.prp","Kveer_kverBahro_Ballroom02.prp","Kveer_kverBahro_Ballroom03.prp","Kveer_kverBahro_Exit01.prp","Kveer_kverBahro_Exit02.prp","Kveer_kverBahro_Idle05.prp","Kveer_kverBahro_Idle06.prp","Kveer_kverBahro_Idle07.prp","Kveer_kverBahro_Idle08.prp","Kveer_kverBahro_Idle09.prp","Kveer_kverBahro_Shot03.prp","Kveer_kverBahro_Shot04.prp","Kveer_kverBahro_Shot05.prp","Kveer_kverBahro_Shot06.prp","Kveer_kverBahro_Shot07.prp","Kveer_kverBahro_Shot08.prp","Kveer_kverBahro_Shot09.prp","Kveer_kverConc3Music.prp","Kveer_kverEsher_1.prp",*/"Kveer_kverReleeshan.prp",/*"Kveer_kverYeesha_1.prp","Kveer_kverYeesha_Conc01.prp","Kveer_kverYeesha_Conc02.prp","Kveer_kverYeesha_Conc03.prp","Kveer_kverYeesha_ConcIntro.prp","Kveer_kverYeesha_ConcIntro2.prp","Kveer_kverYeesha_IdleForIntro.prp","Kveer_kverYeesha_Intro.prp","Kveer_Prison.prp",*/"Kveer_Textures.prp","Kveer_dusttest.prp",
+        "Laki.(others)","Laki.age","Laki.fni","Laki.sum","Laki_Exterior.prp","Laki_LakiArenaVillaInt.prp","Laki_LakiCreatures.prp","Laki_lakiEsher-Arena.prp","Laki_lakiEsher-FighterBeach.prp","Laki_lakiEsher-Keep.prp","Laki_lakiEsher-Villa.prp","Laki_lakiEsherIdleKeep.prp","Laki_lakiEsherIdleVilla.prp","Laki_LakiMaze.prp","Laki_lakiMazeClue.prp","Laki_LakiTrees01.prp","Laki_PirBirdActor.prp","Laki_PirBirdChomp.prp","Laki_PirBirdIdle.prp","Laki_PirBirdSwallow.prp","Laki_PirBirdVocalize.prp","Laki_PirBirdWalk.prp","Laki_Textures.prp","Laki_dusttest.prp",
+        "Myst.(others)","Myst.age","Myst.fni","Myst.sum","Myst_Island.prp","Myst_mystEsher-Conc01.prp","Myst_mystEsher-Conc02.prp","Myst_Textures.prp",
+        //"MystMystV_District_Additions.prp","Direbo_District_Additions.prp", //original authored material.
+        "Siralehn.(others)","Siralehn.age","Siralehn.fni","Siralehn.sum","Siralehn_Birds.prp","Siralehn_Drawing01.prp","Siralehn_Drawing02.prp","Siralehn_Drawing03.prp","Siralehn_Drawing04.prp","Siralehn_Drawing05.prp","Siralehn_Drawing06.prp","Siralehn_Drawing07.prp","Siralehn_Drawing08.prp","Siralehn_Exterior.prp","Siralehn_rock.prp","Siralehn_srlnEsherIdleBeach.prp","Siralehn_srlnEsherIdleLab.prp","Siralehn_srlnEsher_NolobenBeach.prp","Siralehn_srlnEsher_NolobenKeep.prp","Siralehn_srlnEsher_NolobenLab.prp","Siralehn_srlnKeepInter.prp","Siralehn_Textures.prp","Siralehn_tunnels.prp","Siralehn_dusttest.prp",
+        "Tahgira.(others)","Tahgira.age","Tahgira.fni","Tahgira.sum","Tahgira_Exterior.prp","Tahgira_IceCave.prp","Tahgira_Textures.prp","Tahgira_thgrEsherIdleIntro.prp","Tahgira_thgrEsherIdleTake.prp","Tahgira_thgrEsher_TahgiraGrave.prp","Tahgira_thgrEsher_TahgiraIntro.prp","Tahgira_thgrEsher_TahgiraTake.prp","Tahgira_thgrEsher_TahgiraThermals.prp","Tahgira_thgrEsher_TahgiraVillage.prp","Tahgira_dusttest.prp",
+        "Todelmer.(others)","Todelmer.age","Todelmer.fni","Todelmer.sum","Todelmer_Exterior.prp","Todelmer_InteriorPillar1.prp","Todelmer_InteriorPillar3.prp","Todelmer_MiniScope.prp","Todelmer_Pod.prp","Todelmer_Sky.prp","Todelmer_tdlmEsherIdleP3.prp","Todelmer_tdlmEsherIdleRing.prp","Todelmer_tdlmEsher_TodelmerP1.prp","Todelmer_tdlmEsher_TodelmerP3.prp","Todelmer_tdlmEsher_TodelmerRing.prp","Todelmer_Textures.prp","Todelmer_dusttest.prp",
+        "direbo.bik","restStop1.bik","restStop2.bik","restStop3.bik","restStop4.bik",
+    };
+    
-}

drizzle/DrizzlePrp/src/automation/myst5Fixes.java

@@ -32 +32 @@
-        shared.State.AllStates.setState("removeLadders", true);
-        shared.State.AllStates.setState("automateMystV", true);
-false);
+shared.State.AllStates.getStateAsBoolean("includeAuthoredMaterial")); //this line doesn't really do anything, just there to remind you.
-        
-        //verify folders
@@ -72 +72 @@
-        
-        m.status("Starting conversion...");
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        Vector<String> oggfiles = uru.generics.convertArrayToVector(automation.fileLists.mystvOggsNotInPotsNorMoulofflineMinusSpeeches);
-        files.addAll(oggfiles);

drizzle/DrizzlePrp/src/automation/mystAutomation.java

@@ -2031 +2031 @@
-        
-        
+        //Handle .(others) files...
+        Vector<String> otherfiles = filterFilenamesByExtension(files, ".(others)");
+        for(String filename: otherfiles)
+        {
+            String agename = getAgenameFromFilename(filename);
+            
+            if(shared.State.AllStates.getStateAsBoolean("includeAuthoredMaterial"))
+            {
+                for(Pair<String,Integer> curauthprp: authored.get(agename).getAllElements())
+                {
+                    String pagename = curauthprp.left;
+                    int pagenum = curauthprp.right;
+
+                    String outfilename = replaceAgenameIfApplicable(agename, agenames)+"_District_"+pagename+".prp";
+                    String outfile = outfolder + "/dat/" + outfilename;
+
+                    Bytes bytes = shared.GetResource.getResourceAsBytes("/files/authored/"+outfilename);
+                    bytes.saveAsFile(outfile);
+                }
+            }
+            
+        }
+        
+        
-        //Handle .prp files...
-        Vector<String> prpfiles = filterFilenamesByExtension(files, ".prp");
@@ -2046 +2070 @@
-                bytes.saveAsFile(outfile);
-            }
-
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
+//
-            else
-            {

drizzle/DrizzlePrp/src/files/authored/authors&licenses.txt

@@ +1 @@
+licenses:
-Race's files are available under the GPLv3, or at your option, any later version.
+
+authors:
-Direbo_District_Additions.prp: Race
-MystMystV_District_Addition.prp: Race
+DescentMystV_District_FootRgns.prp: Race
+
+readme:
+To add or update a file:
+  add it to the files.authored package.
+  in mystAutomation.java, add an entry to the "authored" object:  authored.put("Descent","FootRgns",97);  will add the page FootRgns with pagenum 97(as given in the .age file).
+  test

drizzle/DrizzlePrp/src/gui/Gui.form

@@ -359 +359 @@
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="480" y="60" width="80" height="-1"/>
+                        </Constraint>
+                      </Constraints>
+                    </Component>
+                    <Component class="shared.State.CheckboxState" name="checkboxState23">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="Include new content (i.e. footstep sounds)."/>
+                        <Property name="name" type="java.lang.String" value="includeAuthoredMaterial" noResource="true"/>
+                      </Properties>
+                      <Constraints>
+                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                          <AbsoluteConstraints x="110" y="170" width="280" height="-1"/>
-                        </Constraint>
-                      </Constraints>
@@ -1305 +1316 @@
-                              <EmptySpace min="-2" pref="114" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jCheckBox1" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="checkboxState22" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="checkboxState20" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -1338 +1348 @@
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="checkboxState22" min="-2" max="-2" attributes="0"/>
-
-
-
+
-                          </Group>
-                      </Group>
@@ -1396 +1404 @@
-                        <Property name="text" type="java.lang.String" value="Use xyzw for PlPXPhysical orientation."/>
-                        <Property name="name" type="java.lang.String" value="plpxphysicalQuatChange" noResource="true"/>
-                      </Properties>
-                    </Component>
-                    <Component class="javax.swing.JCheckBox" name="jCheckBox1">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Included original authored material(Currently just on MystMystV)"/>
-                        <Property name="name" type="java.lang.String" value="includeAuthoredMaterial" noResource="true"/>
-                      </Properties>
-                    </Component>

drizzle/DrizzlePrp/src/gui/Gui.java

@@ -89 +89 @@
-        listState2.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = {
-
-
-
-
-
-
-
-
+(others)","Descent.
+(others)","Direbo.
+(others)","Kveer.
+(others)","Laki.
+(others)","Myst.
+(others)","Siralehn.
+(others)","Tahgira.
+(others)","Todelmer.
-                "restStop1.bik","restStop2.bik","restStop3.bik","restStop4.bik",
-            };
@@ -401 +401 @@
-        jButton97 = new javax.swing.JButton();
-        jButton98 = new javax.swing.JButton();
+        checkboxState23 = new shared.State.CheckboxState();
-        jPanel35 = new javax.swing.JPanel();
-        jPanel13 = new javax.swing.JPanel();
@@ -477 +478 @@
-        checkboxState20 = new shared.State.CheckboxState();
-        checkboxState22 = new shared.State.CheckboxState();
-        jCheckBox1 = new javax.swing.JCheckBox();
-        jPanel23 = new javax.swing.JPanel();
-        jButton90 = new javax.swing.JButton();
@@ -799 +799 @@
-        jButton98.setBounds(480, 60, 80, 36);
-
+        checkboxState23.setText("Include new content (i.e. footstep sounds).");
+        checkboxState23.setName("includeAuthoredMaterial"); // NOI18N
+        jPanel34.add(checkboxState23);
+        checkboxState23.setBounds(110, 170, 280, 28);
+
-        jTabbedPane1.addTab("MystV", jPanel34);
-
@@ -1364 +1369 @@
-            checkboxState22.setName("plpxphysicalQuatChange"); // NOI18N
-
-            jCheckBox1.setText("Included original authored material(Currently just on MystMystV)");
-            jCheckBox1.setName("includeAuthoredMaterial"); // NOI18N
-
-            javax.swing.GroupLayout jPanel20Layout = new javax.swing.GroupLayout(jPanel20);
-            jPanel20.setLayout(jPanel20Layout);
@@ -1374 +1376 @@
-                    .addGap(114, 114, 114)
-                    .addGroup(jPanel20Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addComponent(jCheckBox1)
-                        .addComponent(checkboxState22, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addComponent(checkboxState20, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -1404 +1405 @@
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(checkboxState22, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-
-
-
+
-            );
-
@@ -4241 +4240 @@
-    private shared.State.CheckboxState checkboxState21;
-    private shared.State.CheckboxState checkboxState22;
+    private shared.State.CheckboxState checkboxState23;
-    private shared.State.CheckboxState checkboxState3;
-    private shared.State.CheckboxState checkboxState4;
@@ -4360 +4360 @@
-    private javax.swing.JButton jButton98;
-    private javax.swing.JButton jButton99;
-    private javax.swing.JCheckBox jCheckBox1;
-    private javax.swing.JComboBox jComboBox1;
-    private javax.swing.JDesktopPane jDesktopPane1;

drizzle/DrizzlePrp/src/shared/cmap.java

@@ -24 +24 @@
-        //child = new ChainedHashMap;
-    }
-Pair<S,T>[]
+ArrayList<Pair<S,T>>
-    {
-        ArrayList<Pair<S,T>> result = new ArrayList();
@@ -33 +33 @@
-            result.add(new Pair(s,t));
-        }
-
+
+
-    }
-    public T get(S key)