diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp index 335b7aecf..dda8fd8ba 100644 --- a/apps/mwiniimporter/importer.cpp +++ b/apps/mwiniimporter/importer.cpp @@ -94,13 +94,12 @@ MwIniImporter::MwIniImporter() "PixelWater:TileCount", "PixelWater:Resolution", - /* + // fonts "Fonts:Font 0", "Fonts:Font 1", "Fonts:Font 2", - */ - /* + // UI colors "FontColor:color_normal", "FontColor:color_normal_over", "FontColor:color_normal_pressed", @@ -146,18 +145,15 @@ MwIniImporter::MwIniImporter() "FontColor:color_positive", "FontColor:color_negative", "FontColor:color_count", - */ - /* + // cursors "Cursors:Cursor 0", "Cursors:Cursor 1", "Cursors:Cursor 2", "Cursors:Cursor 3", "Cursors:Cursor 4", - */ // level up messages - // not used for now "Level Up:Level2", "Level Up:Level3", "Level Up:Level4", @@ -180,7 +176,6 @@ MwIniImporter::MwIniImporter() "Level Up:Default", // character creation multiple choice test - // hardcoded in mwgui/charactercreation.cpp "Question 1:Question", "Question 1:AnswerOne", "Question 1:AnswerTwo", @@ -233,7 +228,6 @@ MwIniImporter::MwIniImporter() "Question 10:Sound", // blood textures and models - // not used for now "Blood:Model 0", "Blood:Model 1", "Blood:Model 2", @@ -245,7 +239,6 @@ MwIniImporter::MwIniImporter() "Blood:Texture Name 2", // movies - // not used for now "Movies:Company Logo", "Movies:Morrowind Logo", "Movies:New Game", @@ -253,10 +246,7 @@ MwIniImporter::MwIniImporter() "Movies:Options Menu", // weather related values - // hardcoded in mwworld/wheather.cpp - // Some are easy to replace, others are used as magic number - // globals "Weather Thunderstorm:Thunder Sound ID 0", "Weather Thunderstorm:Thunder Sound ID 1", "Weather Thunderstorm:Thunder Sound ID 2", @@ -268,7 +258,51 @@ MwIniImporter::MwIniImporter() "Weather:Hours Between Weather Changes", // AKA weather update time "Weather Thunderstorm:Thunder Frequency", "Weather Thunderstorm:Thunder Threshold", - // thunder sound delay? + + "Weather:EnvReduceColor", + "Weather:LerpCloseColor", + "Weather:BumpFadeColor", + "Weather:AlphaReduce", + "Weather:Minimum Time Between Environmental Sounds", + "Weather:Maximum Time Between Environmental Sounds", + "Weather:Sun Glare Fader Max", + "Weather:Sun Glare Fader Angle Max", + "Weather:Sun Glare Fader Color", + "Weather:Timescale Clouds", + "Weather:Precip Gravity", + "Weather:Rain Ripples", + "Weather:Rain Ripple Radius", + "Weather:Rain Ripples Per Drop", + "Weather:Rain Ripple Scale", + "Weather:Rain Ripple Speed", + "Weather:Fog Depth Change Speed", + "Weather:Sky Pre-Sunrise Time", + "Weather:Sky Post-Sunrise Time", + "Weather:Sky Pre-Sunset Time", + "Weather:Sky Post-Sunset Time", + "Weather:Ambient Pre-Sunrise Time", + "Weather:Ambient Post-Sunrise Time", + "Weather:Ambient Pre-Sunset Time", + "Weather:Ambient Post-Sunset Time", + "Weather:Fog Pre-Sunrise Time", + "Weather:Fog Post-Sunrise Time", + "Weather:Fog Pre-Sunset Time", + "Weather:Fog Post-Sunset Time", + "Weather:Sun Pre-Sunrise Time", + "Weather:Sun Post-Sunrise Time", + "Weather:Sun Pre-Sunset Time", + "Weather:Sun Post-Sunset Time", + "Weather:Stars Post-Sunset Start", + "Weather:Stars Pre-Sunrise Finish", + "Weather:Stars Fading Duration", + "Weather:Snow Ripples", + "Weather:Snow Ripple Radius", + "Weather:Snow Ripples Per Flake", + "Weather:Snow Ripple Scale", + "Weather:Snow Ripple Speed", + "Weather:Snow Gravity Scale", + "Weather:Snow High Kill", + "Weather:Snow Low Kill", "Weather Clear:Cloud Texture", "Weather Clear:Clouds Maximum Percent", @@ -295,6 +329,7 @@ MwIniImporter::MwIniImporter() "Weather Clear:Wind Speed", "Weather Clear:Cloud Speed", "Weather Clear:Glare View", + "Weather Clear:Ambient Loop Sound ID", "Weather Cloudy:Cloud Texture", "Weather Cloudy:Clouds Maximum Percent", @@ -321,6 +356,7 @@ MwIniImporter::MwIniImporter() "Weather Cloudy:Wind Speed", "Weather Cloudy:Cloud Speed", "Weather Cloudy:Glare View", + "Weather Cloudy:Ambient Loop Sound ID", "Weather Foggy:Cloud Texture", "Weather Foggy:Clouds Maximum Percent", @@ -347,6 +383,7 @@ MwIniImporter::MwIniImporter() "Weather Foggy:Wind Speed", "Weather Foggy:Cloud Speed", "Weather Foggy:Glare View", + "Weather Foggy:Ambient Loop Sound ID", "Weather Thunderstorm:Cloud Texture", "Weather Thunderstorm:Clouds Maximum Percent", @@ -374,6 +411,15 @@ MwIniImporter::MwIniImporter() "Weather Thunderstorm:Cloud Speed", "Weather Thunderstorm:Glare View", "Weather Thunderstorm:Rain Loop Sound ID", + "Weather Thunderstorm:Using Precip", + "Weather Thunderstorm:Rain Diameter", + "Weather Thunderstorm:Rain Height Min", + "Weather Thunderstorm:Rain Height Max", + "Weather Thunderstorm:Rain Threshold", + "Weather Thunderstorm:Max Raindrops", + "Weather Thunderstorm:Rain Entrance Speed", + "Weather Thunderstorm:Ambient Loop Sound ID", + "Weather Thunderstorm:Flash Decrement", "Weather Rain:Cloud Texture", "Weather Rain:Clouds Maximum Percent", @@ -401,6 +447,14 @@ MwIniImporter::MwIniImporter() "Weather Rain:Cloud Speed", "Weather Rain:Glare View", "Weather Rain:Rain Loop Sound ID", + "Weather Rain:Using Precip", + "Weather Rain:Rain Diameter", + "Weather Rain:Rain Height Min", + "Weather Rain:Rain Height Max", + "Weather Rain:Rain Threshold", + "Weather Rain:Rain Entrance Speed", + "Weather Rain:Ambient Loop Sound ID", + "Weather Rain:Max Raindrops", "Weather Overcast:Cloud Texture", "Weather Overcast:Clouds Maximum Percent", @@ -427,6 +481,7 @@ MwIniImporter::MwIniImporter() "Weather Overcast:Wind Speed", "Weather Overcast:Cloud Speed", "Weather Overcast:Glare View", + "Weather Overcast:Ambient Loop Sound ID", "Weather Ashstorm:Cloud Texture", "Weather Ashstorm:Clouds Maximum Percent", @@ -454,6 +509,7 @@ MwIniImporter::MwIniImporter() "Weather Ashstorm:Cloud Speed", "Weather Ashstorm:Glare View", "Weather Ashstorm:Ambient Loop Sound ID", + "Weather Ashstorm:Storm Threshold", "Weather Blight:Cloud Texture", "Weather Blight:Clouds Maximum Percent", @@ -481,8 +537,7 @@ MwIniImporter::MwIniImporter() "Weather Blight:Cloud Speed", "Weather Blight:Glare View", "Weather Blight:Ambient Loop Sound ID", - - // not used for now (todo) + "Weather Blight:Storm Threshold", "Weather Blight:Disease Chance", // for Bloodmoon @@ -511,6 +566,13 @@ MwIniImporter::MwIniImporter() "Weather Snow:Wind Speed", "Weather Snow:Cloud Speed", "Weather Snow:Glare View", + "Weather Snow:Snow Diameter", + "Weather Snow:Snow Height Min", + "Weather Snow:Snow Height Max", + "Weather Snow:Snow Entrance Speed", + "Weather Snow:Max Snowflakes", + "Weather Snow:Ambient Loop Sound ID", + "Weather Snow:Snow Threshold", // for Bloodmoon "Weather Blizzard:Cloud Texture", @@ -539,125 +601,32 @@ MwIniImporter::MwIniImporter() "Weather Blizzard:Cloud Speed", "Weather Blizzard:Glare View", "Weather Blizzard:Ambient Loop Sound ID", - - // not used - "Weather Clear:Ambient Loop Sound ID", - "Weather Cloudy:Ambient Loop Sound ID", - "Weather Foggy:Ambient Loop Sound ID", - "Weather Overcast:Ambient Loop Sound ID", - "Weather Snow:Ambient Loop Sound ID", - // - "Weather Ashstorm:Storm Threshold", - "Weather Blight:Storm Threshold", - "Weather Snow:Snow Threshold", "Weather Blizzard:Storm Threshold", - // - "Weather Snow:Snow Diameter", - "Weather Snow:Snow Height Min", - "Weather Snow:Snow Height Max", - "Weather Snow:Snow Entrance Speed", - "Weather Snow:Max Snowflakes", - // - "Weather:EnvReduceColor", - "Weather:LerpCloseColor", - "Weather:BumpFadeColor", - "Weather:AlphaReduce", - "Weather:Minimum Time Between Environmental Sounds", - "Weather:Maximum Time Between Environmental Sounds", - "Weather:Sun Glare Fader Max", - "Weather:Sun Glare Fader Angle Max", - "Weather:Sun Glare Fader Color", - "Weather:Timescale Clouds", - "Weather:Precip Gravity", - "Weather:Rain Ripples", - "Weather:Rain Ripple Radius", - "Weather:Rain Ripples Per Drop", - "Weather:Rain Ripple Scale", - "Weather:Rain Ripple Speed", - "Weather:Fog Depth Change Speed", - "Weather:Sky Pre-Sunrise Time", - "Weather:Sky Post-Sunrise Time", - "Weather:Sky Pre-Sunset Time", - "Weather:Sky Post-Sunset Time", - "Weather:Ambient Pre-Sunrise Time", - "Weather:Ambient Post-Sunrise Time", - "Weather:Ambient Pre-Sunset Time", - "Weather:Ambient Post-Sunset Time", - "Weather:Fog Pre-Sunrise Time", - "Weather:Fog Post-Sunrise Time", - "Weather:Fog Pre-Sunset Time", - "Weather:Fog Post-Sunset Time", - "Weather:Sun Pre-Sunrise Time", - "Weather:Sun Post-Sunrise Time", - "Weather:Sun Pre-Sunset Time", - "Weather:Sun Post-Sunset Time", - "Weather:Stars Post-Sunset Start", - "Weather:Stars Pre-Sunrise Finish", - "Weather:Stars Fading Duration", - "Weather:Snow Ripples", - "Weather:Snow Ripple Radius", - "Weather:Snow Ripples Per Flake", - "Weather:Snow Ripple Scale", - "Weather:Snow Ripple Speed", - "Weather:Snow Gravity Scale", - "Weather:Snow High Kill", - "Weather:Snow Low Kill", - // - "Weather Rain:Using Precip", - "Weather Rain:Rain Diameter", - "Weather Rain:Rain Height Min", - "Weather Rain:Rain Height Max", - "Weather Rain:Rain Threshold", - "Weather Rain:Rain Entrance Speed", - "Weather Rain:Ambient Loop Sound ID", - "Weather Rain:Max Raindrops", - // - "Weather Thunderstorm:Using Precip", - "Weather Thunderstorm:Rain Diameter", - "Weather Thunderstorm:Rain Height Min", - "Weather Thunderstorm:Rain Height Max", - "Weather Thunderstorm:Rain Threshold", - "Weather Thunderstorm:Max Raindrops", - "Weather Thunderstorm:Rain Entrance Speed", - "Weather Thunderstorm:Ambient Loop Sound ID", - "Weather Thunderstorm:Flash Decrement", // moons - - // these are hardcoded in mwworld/weather.cpp - // l.642..665 (masser_angle_fade) - "Moons:Secunda Fade Start Angle", // = 50 - "Moons:Secunda Fade End Angle", // = 40 - "Moons:Masser Fade Start Angle", // = 50 - "Moons:Masser Fade End Angle", // = 30 - - // hardcoded in weather.cpp l.635 to 641 (hour_fade) - "Moons:Secunda Fade In Start", // = 14 - "Moons:Secunda Fade In Finish", // = 15 - "Moons:Secunda Fade Out Start", // = 7 - "Moons:Secunda Fade Out Finish", // = 10 - - // same values as Secunda - "Moons:Masser Fade In Start", - "Moons:Masser Fade In Finish", - "Moons:Masser Fade Out Start", - "Moons:Masser Fade Out Finish", - - // color code hardcoded in mwrender/sky.cpp (l.417, mMoonRed) - // as float values (divided by 255) - "Moons:Script Color", - - // not used "Moons:Secunda Size", "Moons:Secunda Axis Offset", "Moons:Secunda Speed", "Moons:Secunda Daily Increment", "Moons:Secunda Moon Shadow Early Fade Angle", + "Moons:Secunda Fade Start Angle", + "Moons:Secunda Fade End Angle", + "Moons:Secunda Fade In Start", + "Moons:Secunda Fade In Finish", + "Moons:Secunda Fade Out Start", + "Moons:Secunda Fade Out Finish", "Moons:Masser Size", "Moons:Masser Axis Offset", "Moons:Masser Speed", "Moons:Masser Daily Increment", "Moons:Masser Moon Shadow Early Fade Angle", + "Moons:Masser Fade Start Angle", + "Moons:Masser Fade End Angle", + "Moons:Masser Fade In Start", + "Moons:Masser Fade In Finish", + "Moons:Masser Fade Out Start", + "Moons:Masser Fade Out Finish", + "Moons:Script Color", 0 };