Changeset 1835

Timestamp:

10/30/08 00:06:12 (2 months ago)

Author:

ddb174

Message:

More realmyst work. A hack for the Myst5 MystIsland? thunder.

Files:

• drizzle/DrizzlePrp/src/automation/myst5Fixes.java (modified) (1 diff)
• drizzle/DrizzlePrp/src/checker (added)
• drizzle/DrizzlePrp/src/checker/nettimer.java (added)
• drizzle/DrizzlePrp/src/gui/Gui.form (modified) (3 diffs)
• drizzle/DrizzlePrp/src/gui/Gui.java (modified) (8 diffs)
• drizzle/DrizzlePrp/src/realmyst/Flagsen.java (added)
• drizzle/DrizzlePrp/src/realmyst/Sdb.java (modified) (10 diffs)
• drizzle/DrizzlePrp/src/realmyst/TaggedObj.java (added)
• drizzle/DrizzlePrp/src/realmyst/Typeid.java (modified) (3 diffs)
• drizzle/DrizzlePrp/src/realmyst/U1.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/realmyst/X5c3e0f00.java (added)
• drizzle/DrizzlePrp/src/realmyst/info.txt (modified) (1 diff)
• drizzle/DrizzlePrp/src/shared/GuiUtils.java (modified) (2 diffs)
• drizzle/DrizzlePrp/src/uru/moulprp/PlRandomSoundMod.java (modified) (3 diffs)

drizzle/DrizzlePrp/src/automation/myst5Fixes.java

@@ -221 +221 @@
-        {
-            prp.removeObject(Typeid.plSceneObject, "PlanetariumDoorBlocker");
+            
+            PlRandomSoundMod rsm = prp.findObject("cSfxRndThunder", Typeid.plRandomSoundMod).castTo();
+            rsm.parent.state = 0; //turn it on
+            rsm.parent.mode = 3; //must disable the kOneCmd
+            rsm.parent.minDelay = Flt.createFromJavaFloat(4); //just picked a number.
+            rsm.parent.maxDelay = Flt.createFromJavaFloat(30); //just picked a number.
+            
+            //PlRandomSoundMod rs2 = prp.findObject("cSfxRandomCreaks", Typeid.plRandomSoundMod).castTo();
+            //rs2.parent.state = 0;
-        }
-

drizzle/DrizzlePrp/src/gui/Gui.form

@@ -2483 +2483 @@
-                          </Group>
-                      </Group>
-
+
+
+
-                  </Group>
-              </Group>
@@ -2490 +2492 @@
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-
-
-
-
-
-
+
+
+
+
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                          </Group>
-                      </Group>
-51
+47
-                  </Group>
-              </Group>
@@ -2641 +2651 @@
-              </Events>
-            </Component>
+            <Container class="javax.swing.JPanel" name="jPanel36">
+              <Properties>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
+                    <EtchetBorder/>
+                  </Border>
+                </Property>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" attributes="0">
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Group type="102" alignment="0" attributes="0">
+                                  <EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
+                                  <Component id="jButton105" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <EmptySpace min="-2" pref="21" max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" attributes="0">
+                                      <Component id="textfieldState28" alignment="0" min="-2" pref="104" max="-2" attributes="0"/>
+                                      <Component id="textfieldState27" alignment="0" min="-2" pref="111" max="-2" attributes="0"/>
+                                      <Component id="textfieldState26" alignment="0" min="-2" pref="145" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
+                          </Group>
+                          <EmptySpace pref="129" max="32767" attributes="0"/>
+                      </Group>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="1" attributes="0">
+                          <EmptySpace min="-2" pref="31" max="-2" attributes="0"/>
+                          <Component id="textfieldState26" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Component id="textfieldState27" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <Component id="textfieldState28" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace pref="15" max="32767" attributes="0"/>
+                          <Component id="jButton105" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="57" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+              <SubComponents>
+                <Component class="javax.swing.JButton" name="jButton105">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="jButton105"/>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton105ActionPerformed"/>
+                  </Events>
+                </Component>
+                <Component class="shared.State.TextfieldState" name="textfieldState26">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="textfieldState26"/>
+                    <Property name="name" type="java.lang.String" value="address" noResource="true"/>
+                  </Properties>
+                </Component>
+                <Component class="shared.State.TextfieldState" name="textfieldState27">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="30"/>
+                    <Property name="name" type="java.lang.String" value="updateTime" noResource="true"/>
+                  </Properties>
+                </Component>
+                <Component class="shared.State.TextfieldState" name="textfieldState28">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="textfieldState28"/>
+                    <Property name="name" type="java.lang.String" value="searchnet" noResource="true"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
-          </SubComponents>
-        </Container>

drizzle/DrizzlePrp/src/gui/Gui.java

@@ -557 +557 @@
-        jTextArea3 = new javax.swing.JTextArea();
-        jButton43 = new javax.swing.JButton();
+        jPanel36 = new javax.swing.JPanel();
+        jButton105 = new javax.swing.JButton();
+        textfieldState26 = new shared.State.TextfieldState();
+        textfieldState27 = new shared.State.TextfieldState();
+        textfieldState28 = new shared.State.TextfieldState();
-        jPanel10 = new javax.swing.JPanel();
-        jButton45 = new javax.swing.JButton();
@@ -2260 +2265 @@
-                });
-
+                jPanel36.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+
+                jButton105.setText("jButton105");
+                jButton105.addActionListener(new java.awt.event.ActionListener() {
+                    public void actionPerformed(java.awt.event.ActionEvent evt) {
+                        jButton105ActionPerformed(evt);
+                    }
+                });
+
+                textfieldState26.setText("textfieldState26");
+                textfieldState26.setName("address"); // NOI18N
+
+                textfieldState27.setText("30");
+                textfieldState27.setName("updateTime"); // NOI18N
+
+                textfieldState28.setText("textfieldState28");
+                textfieldState28.setName("searchnet"); // NOI18N
+
+                javax.swing.GroupLayout jPanel36Layout = new javax.swing.GroupLayout(jPanel36);
+                jPanel36.setLayout(jPanel36Layout);
+                jPanel36Layout.setHorizontalGroup(
+                    jPanel36Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(jPanel36Layout.createSequentialGroup()
+                        .addGroup(jPanel36Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(jPanel36Layout.createSequentialGroup()
+                                .addGap(38, 38, 38)
+                                .addComponent(jButton105))
+                            .addGroup(jPanel36Layout.createSequentialGroup()
+                                .addGap(21, 21, 21)
+                                .addGroup(jPanel36Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                    .addComponent(textfieldState28, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(textfieldState27, javax.swing.GroupLayout.PREFERRED_SIZE, 111, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(textfieldState26, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                        .addContainerGap(129, Short.MAX_VALUE))
+                );
+                jPanel36Layout.setVerticalGroup(
+                    jPanel36Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel36Layout.createSequentialGroup()
+                        .addGap(31, 31, 31)
+                        .addComponent(textfieldState26, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(18, 18, 18)
+                        .addComponent(textfieldState27, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(textfieldState28, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 15, Short.MAX_VALUE)
+                        .addComponent(jButton105)
+                        .addGap(57, 57, 57))
+                );
+
-                javax.swing.GroupLayout jPanel7Layout = new javax.swing.GroupLayout(jPanel7);
-                jPanel7.setLayout(jPanel7Layout);
@@ -2272 +2326 @@
-                                .addGap(142, 142, 142)
-                                .addComponent(jButton43)))
-
+
+
+
-                );
-                jPanel7Layout.setVerticalGroup(
-                    jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel7Layout.createSequentialGroup()
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                );
-
@@ -3901 +3962 @@
-        if(child.getName().toLowerCase().endsWith(".vdb"))
-        {
-
-
-
-
-
-
-
+
-            {
+                int fs = (int)child.length();
+                shared.IBytestream bs = shared.SerialBytestream.createFromFile(child);
+                realmyst.Sdb mdb = new realmyst.Sdb(bs);
+                int offset = bs.getAbsoluteOffset();
+                int bytesleft = bs.getBytesRemaining();
+
+                if (mdb.filesizeMinusHeader!=fs-offset)
+                {
+                    int dummy=0;
+                }
+                if(bytesleft!=0)
+                {
+                    int dummy=0;
+                }
-                int dummy=0;
-            }
-if(bytesleft!=0
+catch(Exception e
-            {
-int dummy=0
+m.warn("Error so skipping file.")
-            }
-            int dummy=0;
-        }
-    }
@@ -3943 +4011 @@
-    
-}//GEN-LAST:event_jButton104ActionPerformed
+
+private void jButton105ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton105ActionPerformed
+    GuiUtils.showTrayIcon("/gui/Pterosaur2b4-16.png");
+    String address = this.textfieldState26.getText();
+    String timer = this.textfieldState27.getText();
+    double timer2 = Double.parseDouble(timer);
+    String search = this.textfieldState28.getText();
+    checker.nettimer.timer(address, timer2, search);
+}//GEN-LAST:event_jButton105ActionPerformed
-    
-/*class c2 extends javax.swing.DefaultListSelectionModel
@@ -4011 +4088 @@
-    private javax.swing.JButton jButton103;
-    private javax.swing.JButton jButton104;
+    private javax.swing.JButton jButton105;
-    private javax.swing.JButton jButton11;
-    private javax.swing.JButton jButton12;
@@ -4167 +4245 @@
-    private javax.swing.JPanel jPanel34;
-    private javax.swing.JPanel jPanel35;
+    private javax.swing.JPanel jPanel36;
-    private javax.swing.JPanel jPanel4;
-    private javax.swing.JPanel jPanel5;
@@ -4222 +4301 @@
-    private shared.State.TextfieldState textfieldState24;
-    private shared.State.TextfieldState textfieldState25;
+    private shared.State.TextfieldState textfieldState26;
+    private shared.State.TextfieldState textfieldState27;
+    private shared.State.TextfieldState textfieldState28;
-    private shared.State.TextfieldState textfieldState3;
-    private shared.State.TextfieldState textfieldState4;

drizzle/DrizzlePrp/src/realmyst/Sdb.java

@@ -58 +58 @@
-            if(u8!=0)
-            {
-m.err("u
+throw new uncaughtexception("U
-            }
-            int count = c.readInt(); //v65
@@ -65 +65 @@
-            if(count2!=0)
-            {
-m.err("u
+throw new uncaughtexception("U
-            }
-            int count3 = c.readInt(); //v72
-            if(count3!=0)
-            {
-m.err("u
+throw new uncaughtexception("U
-            }
-            else
@@ -77 +77 @@
-                if(hasThing!=0)
-                {
-m.err("u
+throw new uncaughtexception("U
-                }
-                int count4 = c.readInt(); //v78
-                if(count4!=0)
-                {
-m.err("u
+throw new uncaughtexception("U
-                }
-                else
@@ -90 +90 @@
-                    if(u11!=0)
-                    {
-m.err("u
+throw new uncaughtexception("U
-                    }
-                    int count5 = c.readInt(); //v84
-                    if(count5!=0)
-                    {
-m.err("u
+throw new uncaughtexception("U
-                    }
-                    else
@@ -102 +102 @@
-                        if(count6!=0)
-                        {
-m.err("u
+throw new uncaughtexception("U
-                        }
-                        else
@@ -109 +109 @@
-                            if(count7!=0)
-                            {
-m.err("u
+throw new uncaughtexception("U
-                            }
-                            else
@@ -116 +116 @@
-                                if(count8!=0)
-                                {
-m.err
+throw new uncaughtexception
-                                }
-                                else
@@ -123 +123 @@
-                                    if(count9!=0)
-                                    {
-m.err
+throw new uncaughtexception
-                                    }
-                                    else
@@ -131 +131 @@
-                                        {
-                                            //m.err("unhandled.");
+                                            if(true) throw new uncaughtexception("unhandled.");
-                                            U1[] u1s = c.readArray(U1.class, count10);
-                                        }
@@ -138 +139 @@
-                                            if(count11!=0)
-                                            {
-m.err
+throw new uncaughtexception
-                                            }
-                                        }

drizzle/DrizzlePrp/src/realmyst/Typeid.java

@@ -6 +6 @@
-package realmyst;
-
-
-
-
-
+
+
-public enum Typeid
-{
@@ -15 +13 @@
-    unknown,
-    sdbstart,
-
+
+
-    ;
-    public static pair[] pairs = {
-        p(0x9469DF4E, sdbstart),
-
+
+
-    };
-    
-    
-
+
+
+
+
+
+
-    public static boolean has(int i)
-    {
@@ -72 +77 @@
-            }
-        }
+        m.warn("Unhandled type in Typeid.");
-        return unknown;
-    }

drizzle/DrizzlePrp/src/realmyst/U1.java

@@ -26 +26 @@
-    int blockSizeMaybe;
-    int sub1;
-
+
+
-    int sub2;
+    //Flagsen[] subs2;
+    TaggedObj[] subs2;
-    
-    public U1(IBytestream c)
@@ -38 +41 @@
-        {
-            //45a950 block
-
+
+
+
-            int dummy=0;
-        }
-        sub2 = c.readInt();
+        subs2 = new TaggedObj[sub2];
-        for(int j=0;j<sub2;j++)
-        {
-            //45a950 block
-            //m.err("unhandled");
-
+
+
-        }
-        

drizzle/DrizzlePrp/src/realmyst/info.txt

@@ +1 @@
+notes:
+Perhaps the sdb file structure just needs U1, and the object after it to read up to the number 8.  Then we read 5 vectors of a preknown type.
+
-5442a0:
-

drizzle/DrizzlePrp/src/shared/GuiUtils.java

@@ -20 +20 @@
-import javax.swing.ActionMap;
-import java.io.File;
+import java.awt.TrayIcon;
+import java.awt.SystemTray;
-
-public class GuiUtils
@@ -25 +27 @@
-    public static boolean onlyUseASingleJFileChooser = true;
-    private static JFileChooser _fc;
+    private static TrayIcon _trayicon;
+    
+    public static void DisplayTrayMessage(String caption, String message)
+    {
+        if(_trayicon==null)
+        {
+            m.err("You must have shown the tray icon first.");
+        }
+        else
+        {
+            _trayicon.displayMessage(caption, message, java.awt.TrayIcon.MessageType.NONE);
+        }
+    }
+    
+    public static void showTrayIcon(String imgpath)
+    {
+        try{
+            if(_trayicon!=null)
+            {
+                //m.err("A tray icon has already been shown; doing nothing.");
+                return;
+            }
+            java.awt.SystemTray tray = java.awt.SystemTray.getSystemTray();
+            //java.awt.Image img = shared.GetResource.getResourceAsImage("/gui/Pterosaur2b4-16.png");
+            java.awt.Image img = shared.GetResource.getResourceAsImage(imgpath);
+            //java.awt.PopupMenu menu = new java.awt.PopupMenu();
+            //menu.add(new java.awt.MenuItem("test"));
+            //java.awt.TrayIcon ti = new java.awt.TrayIcon(img,"Drizzle",menu);
+            java.awt.TrayIcon ti = new java.awt.TrayIcon(img);
+            _trayicon = ti;
+            ti.setImageAutoSize(true);
+            tray.add(ti);
+            //ti.displayMessage("caption", "message", java.awt.TrayIcon.MessageType.NONE);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
-    
-    private static JFileChooser getJFileChooser()

drizzle/DrizzlePrp/src/uru/moulprp/PlRandomSoundMod.java

@@ -41 +41 @@
-    Flt u5;
-    short u6;*/
-
+public 
-    short count;
-    subRandomSoundMod[] subs;
@@ -104 +104 @@
-    {
-        PlSingleModifier parent;
-byte u1
-byte u2
-Flt u3
-Flt u4
+public byte mode
+public byte state
+public Flt minDelay
+public Flt maxDelay
-        
-        public PlRandomCommandMod(context c)
-        {
-            parent = new PlSingleModifier(c);
-u1
-u2
-u3
-u4
+mode
+state
+minDelay
+maxDelay
-        }
-        
@@ -121 +121 @@
-        {
-            parent.compile(c);
-u1
-u2
-u3
-u4
+mode
+state
+minDelay
+maxDelay
-        }
-    }