Merge pull request #66 from MindRapist/mr-14

Mr 14

.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
 

README.md

@@ -7,7 +7,9 @@ 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.
+ **Fix by Alaric 🙏**
 
 <br>
 <br>

assets/ETC/ymir work/environment/map_n_desert_01.msenv

@@ -28,10 +28,8 @@ Group Material
 
 Group Fog
 {
-    Enable        1
+    foglevel		8
-    NearDistance  2.000000
+    Color         0.674510 0.611765 0.521569 1.000000
-    FarDistance   30000.000000
-    Color         0.709804 0.513726 0.294118 1.000000
 }
 
 Group Filter

assets/ETC/ymir work/environment/spiderdungeon.msenv

@@ -28,9 +28,7 @@ Group Material
 
 Group Fog
 {
-    Enable        0
+    foglevel		2
-    NearDistance  1.000000
-    FarDistance   20000.000000
     Color         0.000000 0.000000 0.000000 1.000000
 }
 

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):