DataEditor Complete!(80%)

Buizz · Apr 19, 2019 · cb0cd0f · cb0cd0f
1 parent 7a95063
commit cb0cd0f
Show file tree

Hide file tree

Showing 32 changed files with 1,736 additions and 204 deletions.
diff --git a/EUD Editor 3/Class/Data/ProjectData.vb b/EUD Editor 3/Class/Data/ProjectData.vb
@@ -416,7 +416,7 @@ Public Class ProjectData
                         ReturnStr = scData.PortdataName(index)
 
                     Case SCDatFiles.DatFiles.sfxdata
-                        ReturnStr = scData.SfxName(index)
+                        ReturnStr = scData.SfxCodeName(index)
                     Case SCDatFiles.DatFiles.Icon
                         ReturnStr = scData.IconName(index)
                     Case SCDatFiles.DatFiles.stattxt

diff --git a/EUD Editor 3/Class/Data/StarCraftData.vb b/EUD Editor 3/Class/Data/StarCraftData.vb
@@ -127,13 +127,19 @@ Public Class StarCraftData
             Return pstatusFnVal2
         End Get
     End Property
-
-
+    Private piscriptData As IScript.CIScript
+    Public ReadOnly Property IscriptData As IScript.CIScript
+        Get
+            Return piscriptData
+        End Get
+    End Property
 
 
     Private GRPFiles(SCImageCount) As String
     Private ImageName(SCImageCount) As String
     Private pSfxName(SCSfxdataCount) As String
+    Private pSfxFileName As tblReader
+
     Private pPortdataName(SCPortdataCount) As String
     Private pIconName(SCIconCount) As String
     Private pIscriptName(SCIscriptCount) As String
@@ -154,11 +160,16 @@ Public Class StarCraftData
             Return ImageName(index)
         End Get
     End Property
-    Public ReadOnly Property SfxName(index As Integer) As String
+    Public ReadOnly Property SfxCodeName(index As Integer) As String
         Get
             Return pSfxName(index)
         End Get
     End Property
+    Public ReadOnly Property SfxFileName(index As Integer) As String
+        Get
+            Return pSfxFileName.Strings(index).val1
+        End Get
+    End Property
     Public ReadOnly Property PortdataName(index As Integer) As String
         Get
             Return pPortdataName(index)
@@ -382,11 +393,20 @@ Public Class StarCraftData
         stat_txt_kor_eng = New tblReader(Tool.GetTblFolder & "\stat_txt_kor_eng.tbl")
         stat_txt_kor_kor = New tblReader(Tool.GetTblFolder & "\stat_txt_kor_kor.tbl")
 
+        pSfxFileName = New tblReader(Tool.GetTblFolder & "\sfxdata.tbl")
+
+
         LoadTexts()
 
         ReadActConCode()
+
+        MGRP.GRPMoudleInit()
         LoadMPQData()
 
+        piscriptData = New IScript.CIScript
+        piscriptData.LoadIscriptToBuff(Tool.LoadDataFromMPQ("scripts\iscript.bin"))
+        IScript.readOpcodes()
+
         pstatusFnVal1 = New List(Of UInteger)
         pstatusFnVal2 = New List(Of UInteger)
         statusFnVal1.AddRange({4343040, 4344192, 4346240, 4345616, 4344656, 4344560, 4344512, 4348160, 4343072})
@@ -557,6 +577,7 @@ Public Class StarCraftData
             index += 1
         End While
         sr.Close()
+
     End Sub
     Public Sub LoadMPQData()
         IsLoadMPQ = False
@@ -582,7 +603,7 @@ Public Class StarCraftData
             SDGrpFrame = New GRP("wirefram\grpwire.grp", 0, 0, PalettType.Icons)
             SDTramFrame = New GRP("wirefram\tranwire.grp", 0, 0, PalettType.Icons)
         Catch ex As Exception
-            Tool.ErrorMsgBox(Tool.GetText("Error LoadMPQData Fail"))
+            Tool.ErrorMsgBox(Tool.GetText("Error LoadMPQData Fail"), ex.ToString)
             Return
         End Try