diff --git a/DS_Map/DS Map.csproj b/DS_Map/DS Map.csproj index 0d8beff..54cc3d1 100644 --- a/DS_Map/DS Map.csproj +++ b/DS_Map/DS Map.csproj @@ -455,6 +455,13 @@ + + + + + + + Always diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index 120465e..dfddb29 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -659,6 +659,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap dpthunderstorm1 { + get { + object obj = ResourceManager.GetObject("dpthunderstorm1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1176,6 +1186,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptblueish { + get { + object obj = ResourceManager.GetObject("ptblueish", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1356,6 +1376,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptdarkfog { + get { + object obj = ResourceManager.GetObject("ptdarkfog", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1366,6 +1396,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptdim { + get { + object obj = ResourceManager.GetObject("ptdim", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1386,6 +1426,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptgreenish { + get { + object obj = ResourceManager.GetObject("ptgreenish", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1396,6 +1446,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptheavyfog { + get { + object obj = ResourceManager.GetObject("ptheavyfog", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1406,6 +1466,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptlightfog { + get { + object obj = ResourceManager.GetObject("ptlightfog", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1446,6 +1516,16 @@ namespace DSPRE.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ptredish { + get { + object obj = ResourceManager.GetObject("ptredish", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/DS_Map/Properties/Resources.resx b/DS_Map/Properties/Resources.resx index a22b792..464c110 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -613,4 +613,28 @@ ..\Resources\Graphics\Program Icons\resetListIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\graphics\weather\dppt\dpthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptblueish.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptdarkfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptdim.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptgreenish.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptheavyfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptlightfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\graphics\weather\dppt\ptredish.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptblueish.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptblueish.png new file mode 100644 index 0000000..bcb8d99 Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptblueish.png differ diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptdarkfog.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptdarkfog.png new file mode 100644 index 0000000..cf39d9d Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptdarkfog.png differ diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptdim.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptdim.png new file mode 100644 index 0000000..7edebae Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptdim.png differ diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptgreenish.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptgreenish.png new file mode 100644 index 0000000..c94a50f Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptgreenish.png differ diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptheavyfog.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptheavyfog.png new file mode 100644 index 0000000..8479381 Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptheavyfog.png differ diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptlightfog.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptlightfog.png new file mode 100644 index 0000000..a551b50 Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptlightfog.png differ diff --git a/DS_Map/Resources/Graphics/Weather/DPPt/ptredish.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptredish.png new file mode 100644 index 0000000..fb048db Binary files /dev/null and b/DS_Map/Resources/Graphics/Weather/DPPt/ptredish.png differ diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs index 7a731b5..87f6aba 100644 --- a/DS_Map/Resources/PokeDatabase.cs +++ b/DS_Map/Resources/PokeDatabase.cs @@ -123,19 +123,19 @@ namespace DSPRE.Resources { [15] = "Deep fog", [16] = "Dark, Flash usable", [17] = "Lightning, no rain", - [18] = "Normal [18]", - [19] = "Normal [19]", + [18] = "Light fog", + [19] = "Heavy fog", [20] = "Normal [20]", [21] = "Diamond dust [21]", [22] = "Volcanic ash fall, steady", [23] = "Eterna forest weather", [24] = "Player spotlight [24]", [25] = "Player spotlight [25]", - [26] = "Normal [26]", - [27] = "Normal [27]", - [28] = "Normal [28]", - [29] = "Normal [29]", - [30] = "Normal [30]", + [26] = "Dark fog", + [27] = "Somewhat green", + [28] = "Somewhat red", + [29] = "Somewhat blue", + [30] = "Dim light", [31] = "Normal [31]", [32] = "Rain [32]", [33] = "Normal [33]", @@ -3684,7 +3684,7 @@ namespace DSPRE.Resources { [new byte[] { 22 }] = "dplightsandstorm" }; public static Dictionary ptWeatherImageDict = new Dictionary() { - [new byte[] { 0, 8, 13, 18, 19, 20, 26, 27, 28, 29, 30, 31, 33 } ] = "ptnormal", + [new byte[] { 0, 8, 13, 20, 31, 33 } ] = "ptnormal", [new byte[] { 1 } ] = "ptcloudy", [new byte[] { 2, 32 } ] = "ptrain", [new byte[] { 3 } ] = "ptheavyrain", @@ -3699,9 +3699,21 @@ namespace DSPRE.Resources { [new byte[] { 14, 15 } ] = "ptfog", [new byte[] { 16 } ] = "ptdark", [new byte[] { 17 } ] = "ptlightning", - [new byte[] { 22 } ] = "ptlightsandstorm", - [new byte[] { 23 } ] = "ptforestweather", - [new byte[] { 24, 25 } ] = "ptspotlight", + + [new byte[] { 18 }] = "ptlightfog", + [new byte[] { 19 }] = "ptheavyfog", + + [new byte[] { 22 }] = "ptlightsandstorm", + [new byte[] { 23 }] = "ptforestweather", + [new byte[] { 24, 25 }] = "ptspotlight", + + [new byte[] { 26 }] = "ptdarkfog", + [new byte[] { 27 }] = "ptgreenish", + [new byte[] { 28 }] = "ptredish", + [new byte[] { 29 }] = "ptblueish", + [new byte[] { 30 }] = "ptdim", + + }; public static Dictionary hgssweatherImageDict = new Dictionary() { [new byte[] { 0, 1 }] = "hgssnormal",