diff --git a/Src/AvatarFormUnit.dfm b/Src/AvatarFormUnit.dfm index 6bee6fb..3aa5c6e 100644 --- a/Src/AvatarFormUnit.dfm +++ b/Src/AvatarFormUnit.dfm @@ -2725,7 +2725,6 @@ object AvatarForm: TAvatarForm ParentFont = False TabOrder = 4 OnChange = PageControl1Change - ExplicitWidth = 809 object TabSheet1: TTabSheet Caption = 'Equip' end @@ -2859,7 +2858,6 @@ object AvatarForm: TAvatarForm ShowDesignHelper = False SortSettings.DefaultFormat = ssAutomatic Version = '8.4.7.0' - ExplicitWidth = 801 ColWidths = ( 40 40 @@ -3438,7 +3436,6 @@ object AvatarForm: TAvatarForm ShowDesignHelper = False SortSettings.DefaultFormat = ssAutomatic Version = '8.4.7.0' - ExplicitWidth = 787 end end end diff --git a/Src/AvatarFormUnit.pas b/Src/AvatarFormUnit.pas index 940ce2c..47ac142 100644 --- a/Src/AvatarFormUnit.pas +++ b/Src/AvatarFormUnit.pas @@ -113,7 +113,6 @@ TAvatarForm = class(TForm) ColList2: TStringList; RowList2: TDictionary; Row1, Row2: Integer; - HasSound2WZ: Boolean; WzListObj:TObjectList; procedure DumpData2(Entry: TWZIMGEntry); procedure Dump2(Entry: TWZIMGEntry); @@ -719,12 +718,6 @@ procedure TAvatarForm.FormCreate(Sender: TObject); Inventory.ColWidths[1] := 50; //icon Inventory.ColWidths[2] := 140; Inventory.ColWidths[3] := 32; - for var i := 0 to Inventory.ColCount - 1 do - begin - Inventory.CellProperties[i, 0].Alignment := taCenter; - Inventory.CellProperties[i, 0].FontSize := 15; - end; - // DumpRowCount := -1; end; diff --git a/Src/MainUnit.dfm b/Src/MainUnit.dfm index 8d59a2b..220362f 100644 --- a/Src/MainUnit.dfm +++ b/Src/MainUnit.dfm @@ -3,7 +3,7 @@ object MainForm: TMainForm Top = 77 BorderIcons = [biSystemMenu, biMinimize] BorderStyle = bsSingle - Caption = 'MapleStoryGM v3.4' + Caption = 'MapleStoryGM v3.7' ClientHeight = 711 ClientWidth = 2424 Color = clBtnFace @@ -116,7 +116,7 @@ object MainForm: TMainForm ColorTo = clSkyBlue GradientDirection = gdVertical DockDots = True - Caption = #169' 2020 Elem ' + Caption = #169' 2021 Elem ' CaptionGradientDirection = gdVertical FocusCaptionFontColor = clBlack FocusCaptionColor = 9758459 @@ -156,7 +156,7 @@ object MainForm: TMainForm ShowClose = False ShowLock = False Style = esCustom - Version = '1.6.0.2' + Version = '1.7.1.0' OnClick = AdvToolPanel1Click end object AdvGroupBox2: TAdvGroupBox @@ -257,6 +257,7 @@ object MainForm: TMainForm Margins.Right = 0 Margins.Bottom = 0 Align = alClient + FluentUIOpaque = False TabOrder = 2 StyleKind = scspsPanel ScrollButtonWidth = 15 @@ -268,6 +269,8 @@ object MainForm: TMainForm ScrollOffset = 50 ScrollTimerInterval = 50 StorePaintBuffer = False + HorzScrollDirection = scspssdLeftToRight + VertScrollDirection = scspssdTopToBottom TouchScroll = False ExplicitWidth = 2040 object PicInfoButton: TSpeedButton @@ -3429,6 +3432,7 @@ object MainForm: TMainForm Height = 469 Cursor = crDefault Align = alClient + Color = clWhite ColCount = 1 DefaultColWidth = 180 DefaultRowHeight = 15 @@ -3438,14 +3442,17 @@ object MainForm: TMainForm RowCount = 1 FixedRows = 0 Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText + Font.Color = clBlack Font.Height = -12 Font.Name = 'Tahoma' Font.Style = [] GridLineWidth = 0 + Options = [goVertLine, goHorzLine, goRangeSelect, goFixedRowDefAlign] ParentFont = False ScrollBars = ssVertical TabOrder = 0 + GridLineColor = 15987699 + GridFixedLineColor = 15987699 HoverRowCells = [hcNormal, hcSelected] OnClickCell = GridClickCell ActiveCellFont.Charset = DEFAULT_CHARSET @@ -3493,7 +3500,7 @@ object MainForm: TMainForm FixedColWidth = 180 FixedRowHeight = 0 FixedFont.Charset = DEFAULT_CHARSET - FixedFont.Color = clWindowText + FixedFont.Color = clBlack FixedFont.Height = -11 FixedFont.Name = 'Tahoma' FixedFont.Style = [fsBold] @@ -3527,6 +3534,7 @@ object MainForm: TMainForm PrintSettings.PageNumSep = '/' ScrollSynch = True ScrollWidth = 21 + SearchFooter.ColorTo = clWhite SearchFooter.FindNextCaption = 'Find &next' SearchFooter.FindPrevCaption = 'Find &previous' SearchFooter.Font.Charset = DEFAULT_CHARSET @@ -3543,7 +3551,7 @@ object MainForm: TMainForm SearchFooter.ResultFormat = '(%d of %d)' ShowDesignHelper = False SortSettings.DefaultFormat = ssAutomatic - Version = '8.4.2.2' + Version = '8.4.7.0' ColWidths = ( 180) RowHeights = ( @@ -3560,6 +3568,7 @@ object MainForm: TMainForm Height = 469 Cursor = crDefault Align = alClient + Color = clWhite ColCount = 2 DefaultColWidth = 180 DefaultRowHeight = 17 @@ -3568,14 +3577,17 @@ object MainForm: TMainForm RowCount = 1 FixedRows = 0 Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText + Font.Color = clBlack Font.Height = -13 Font.Name = 'Tahoma' Font.Style = [] GridLineWidth = 0 + Options = [goVertLine, goHorzLine, goRangeSelect, goFixedRowDefAlign] ParentFont = False ScrollBars = ssVertical TabOrder = 0 + GridLineColor = 15987699 + GridFixedLineColor = 15987699 HoverRowCells = [hcNormal, hcSelected] OnClickCell = WorldMapGridClickCell ActiveCellFont.Charset = DEFAULT_CHARSET @@ -3623,7 +3635,7 @@ object MainForm: TMainForm FixedColWidth = 180 FixedRowHeight = 17 FixedFont.Charset = DEFAULT_CHARSET - FixedFont.Color = clWindowText + FixedFont.Color = clBlack FixedFont.Height = -11 FixedFont.Name = 'Tahoma' FixedFont.Style = [fsBold] @@ -3656,6 +3668,7 @@ object MainForm: TMainForm PrintSettings.PageNumSep = '/' ScrollSynch = True ScrollWidth = 21 + SearchFooter.ColorTo = clWhite SearchFooter.FindNextCaption = 'Find &next' SearchFooter.FindPrevCaption = 'Find &previous' SearchFooter.Font.Charset = DEFAULT_CHARSET @@ -3672,7 +3685,7 @@ object MainForm: TMainForm SearchFooter.ResultFormat = '(%d of %d)' ShowDesignHelper = False SortSettings.DefaultFormat = ssAutomatic - Version = '8.4.2.2' + Version = '8.4.7.0' ColWidths = ( 180 180) diff --git a/Src/MainUnit.pas b/Src/MainUnit.pas index f397627..bb7ed65 100644 --- a/Src/MainUnit.pas +++ b/Src/MainUnit.pas @@ -775,7 +775,9 @@ procedure TMainForm.CirCleMouseDown; OpenMSFolder.Enabled := False; ComboKey.Enabled := False; end; - + RenderForm.FormResize(Sender); + if (TMAp.ShowUI) then + RenderForm.Cursor := crNone; ActiveControl := nil; end; diff --git a/Src/MapleTV.pas b/Src/MapleTV.pas index bbc22d1..0ae0b5e 100644 --- a/Src/MapleTV.pas +++ b/Src/MapleTV.pas @@ -56,7 +56,7 @@ class procedure TMapleTV.CreateSelf(PosX, PosY, msgX, msgY, adX, adY, ZLayer: In with TMapleTV.Create(SpriteEngine) do begin ImageLib := Images; - ImagePath := 'UI.wz/MapleTV.img/TVmedia/0/0'; + ImagePath := 'UI/MapleTV.img/TVmedia/0/0'; ImageEntry := GetImgEntry('UI/MapleTV.img/TVmedia/0/0'); X := PosX + adX; Y := PosY + adY + PatternHeight; @@ -73,7 +73,7 @@ procedure TMapleTV.DoMove(const Movecount: Single); var Delay: Integer; const - S1 = 'UI.wz/MapleTV.img/TVmedia/'; + S1 = 'UI/MapleTV.img/TVmedia/'; begin inherited; ImagePath := S1 + IntToStr(AD) + '/' + IntToStr(Frame); diff --git a/Src/Mob2.pas b/Src/Mob2.pas index 4603187..8a1b8bf 100644 --- a/Src/Mob2.pas +++ b/Src/Mob2.pas @@ -192,39 +192,6 @@ class procedure TMob.Drop(ID: string; PosX, PosY: Integer; aRX0: Integer = 0; aR TestID: string; begin Randomize; - { - if MobWZ.GetImgFile(ID + '.img') <> nil then - begin - Path1 := 'Mob/'; - InfoPath := 'Mob/'; - PathW := 'Mob.wz/'; - WZ := MobWZ; - end - else if Mob001WZ.GetImgFile(ID + '.img') <> nil then - begin - Path1 := 'Mob001/'; - InfoPath := 'Mob001/'; - PathW := 'Mob001.wz/'; - WZ := Mob001WZ; - end - else if Mob2Wz<> nil then - begin - if Mob2WZ.GetImgFile(ID + '.img') <> nil then - begin - Path1 := 'Mob2/'; - InfoPath := 'Mob2/'; - PathW := 'Mob2.wz/'; - WZ := Mob2WZ; - end - end - else if Mob002WZ.GetImgFile(ID + '.img') <> nil then - begin - Path1 := 'Mob002/'; - InfoPath := 'Mob002/'; - PathW := 'Mob002.wz/'; - WZ := Mob002WZ; - end; - } Entry := GetImgEntry('Mob/' + ID + '.img/info/link'); if not MobList.contains(ID) then @@ -236,35 +203,6 @@ class procedure TMob.Drop(ID: string; PosX, PosY: Integer; aRX0: Integer = 0; aR if Entry <> nil then begin var EntryID: string := Entry.Data; - { - if MobWZ.GetImgFile(EntryID + '.img') <> nil then - begin - Path1 := 'Mob/'; - PathW := 'Mob.wz/'; - WZ := MobWZ; - end - else if Mob001WZ.GetImgFile(EntryID + '.img') <> nil then - begin - Path1 := 'Mob001/'; - PathW := 'Mob001.wz/'; - WZ := Mob001WZ; - end - else if Mob2Wz <> nil then - begin - if Mob2WZ.GetImgFile(EntryID + '.img') <> nil then - begin - Path1 := 'Mob2/'; - PathW := 'Mob2.wz/'; - WZ := Mob2WZ; - end; - end - else if Mob002WZ.GetImgFile(ID + '.img') <> nil then - begin - Path1 := 'Mob002/'; - PathW := 'Mob002.wz/'; - WZ := Mob002WZ; - end; - } if not WzData.ContainsKey('Mob/' + EntryID + '.img') then DumpData(GetImgFile('Mob/'+Entry.Data + '.img').Root, WzData, Images, ColorEffect, Value); end; diff --git a/Src/MobInfo.pas b/Src/MobInfo.pas index e97ad0a..8e91b40 100644 --- a/Src/MobInfo.pas +++ b/Src/MobInfo.pas @@ -96,7 +96,7 @@ class procedure TMobInfo.TargetEvent(Sender: TObject); - for Iter in Wz.GetImgFile('Mob/'+TMob.Moblist[I] + '.img').Root.Get('info').Children do + for Iter in GetImgFile('Mob/'+TMob.Moblist[I] + '.img').Root.Get('info').Children do begin if (Iter.Name = 'category') and (Category.ContainsKey(Iter.Data)) then mData := Category[Iter.Data]