diff --git a/.gitignore b/.gitignore index b6f2317f..6588f9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,17 @@ syserr.txt log.txt +packetdump.txt +pdlog.txt ErrorLog.txt + *.eix *.epk *.pck + +/*.inf /*.cfg /*.exe + !/config.exe !/Metin2.exe diff --git a/README.md b/README.md index cdab4632..8170a61b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ This repository contains all client-side data, including locale files, configura ## 📋 Changelog ### 🐛 Bug Fixes - - **Guild window**: Removed the clickable area for the `BASE` tab and adjusted positions and widths for all other Guild window tabs. + - **Fog update**: Adjusted fog settings to work with the updated official version using the 3 classic options. + - **Fog levels**: Adjusted fog level settings for some maps.

diff --git a/assets/ETC/ymir work/environment/map_n_desert_01.msenv b/assets/ETC/ymir work/environment/map_n_desert_01.msenv index 622a25c7..33b4cbeb 100644 --- a/assets/ETC/ymir work/environment/map_n_desert_01.msenv +++ b/assets/ETC/ymir work/environment/map_n_desert_01.msenv @@ -28,10 +28,8 @@ Group Material Group Fog { - Enable 1 - NearDistance 2.000000 - FarDistance 30000.000000 - Color 0.709804 0.513726 0.294118 1.000000 + foglevel 8 + Color 0.674510 0.611765 0.521569 1.000000 } Group Filter diff --git a/assets/ETC/ymir work/environment/spiderdungeon.msenv b/assets/ETC/ymir work/environment/spiderdungeon.msenv index 2be1d18e..150ad28f 100644 --- a/assets/ETC/ymir work/environment/spiderdungeon.msenv +++ b/assets/ETC/ymir work/environment/spiderdungeon.msenv @@ -28,9 +28,7 @@ Group Material Group Fog { - Enable 0 - NearDistance 1.000000 - FarDistance 20000.000000 + foglevel 2 Color 0.000000 0.000000 0.000000 1.000000 } diff --git a/assets/root/uisystemoption.py b/assets/root/uisystemoption.py index 0c5efe49..8050ba3a 100644 --- a/assets/root/uisystemoption.py +++ b/assets/root/uisystemoption.py @@ -111,7 +111,9 @@ class OptionDialog(ui.ScriptWindow): self.__SetCurTilingMode() - self.__ClickRadioButton(self.fogModeButtonList, constInfo.GET_FOG_LEVEL_INDEX()) + # MR-14: Fog update by Alaric + self.__ClickRadioButton(self.fogModeButtonList, systemSetting.GetFogLevel()) + # MR-14: -- END OF -- Fog update by Alaric self.__ClickRadioButton(self.cameraModeButtonList, constInfo.GET_CAMERA_MAX_DISTANCE_INDEX()) if musicInfo.fieldMusic==musicInfo.METIN2THEMA: @@ -170,7 +172,11 @@ class OptionDialog(ui.ScriptWindow): self.__ClickRadioButton(self.cameraModeButtonList, index) def __SetFogLevel(self, index): - constInfo.SET_FOG_LEVEL_INDEX(index) + # MR-14: Fog update by Alaric + # constInfo.SET_FOG_LEVEL_INDEX(index) + systemSetting.SetFogLevel(index) + # MR-14: -- END OF -- Fog update by Alaric + self.__ClickRadioButton(self.fogModeButtonList, index) def __OnClickCameraModeShortButton(self):