diff --git a/webroot/css/weatherscan.css b/webroot/css/weatherscan.css index 81b4d48..f758f14 100644 --- a/webroot/css/weatherscan.css +++ b/webroot/css/weatherscan.css @@ -5245,7 +5245,6 @@ label{ mask-position: 0% 100%; mask-repeat: no-repeat; -webkit-mask-repeat: no-repeat; - mask-size:200% 100%; width:67.5%; height:80.5%; bottom: -38.7%; diff --git a/webroot/images/intellistarlogo.png b/webroot/images/intellistarlogo.png index 26abb27..3952e1e 100644 Binary files a/webroot/images/intellistarlogo.png and b/webroot/images/intellistarlogo.png differ diff --git a/webroot/js/audio.js b/webroot/js/audio.js index 3fa2f7a..4d0fbfa 100644 --- a/webroot/js/audio.js +++ b/webroot/js/audio.js @@ -45,7 +45,7 @@ function WeatherAudio() { } else if (audioSettings.order[i] < 78) { arr.push(musicpath + "Trammel Starks 2 Track " + String(audioSettings.order[i]-67) + '.mp3'); } else if (audioSettings.order[i] < 84) { - arr.push(musicpath + "Trammel Starks 2 Track " + String(audioSettings.order[i]-77) + '.mp3'); + arr.push(musicpath + "Trammel Starks 3 Track " + String(audioSettings.order[i]-77) + '.mp3'); } } @@ -168,6 +168,7 @@ function WeatherAudio() { $(document).mousedown( function() { if (!mobilePlaying) { $player.jPlayer("play"); + $player.jPlayer("playHead", 100); mobilePlaying = true; } }); @@ -192,7 +193,7 @@ function WeatherAudio() { // plays the vocal current conditions announcement this.playCurrentConditions = function () { - startPlaying(['/localvocals/narrations/Your_current_conditions.mp3'], false); + startPlaying(['/localvocals/narrations/'+audioSettings.narrationType+'/Your_current_conditions.mp3'], false); } this.playwarningbeep = function () { startPlaying(['/localvocals/narrations/warningbeep.wav'], false); @@ -200,13 +201,13 @@ function WeatherAudio() { this.playLocalRadar = function() { - startPlaying(['/localvocals/narrations/The_local_Doppler_radar.mp3'], false); + startPlaying(['/localvocals/narrations/'+audioSettings.narrationType+'/The_local_Doppler_radar.mp3'], false); } this.playLocalforecasti = function() { - startPlaying(['/localvocals/narrations/Your_local_forecast_1.mp3'], false); + startPlaying(['/localvocals/narrations/'+audioSettings.narrationType+'/Your_local_forecast_1.mp3'], false); } this.playLocalforecastii = function() { - startPlaying(['/localvocals/narrations/Your_local_forecast_2.mp3'], false); + startPlaying(['/localvocals/narrations/'+audioSettings.narrationType+'/Your_local_forecast_2.mp3'], false); } this.severeWarning = function() { startPlaying(['/localvocals/narrations/TSTORM_DEFAULT.wav'], false); diff --git a/webroot/js/config.js b/webroot/js/config.js index 62c6cf9..316d47c 100644 --- a/webroot/js/config.js +++ b/webroot/js/config.js @@ -13,7 +13,7 @@ var apperanceSettings = { corebackgroud:"buildings", //forest, mountain, city, buildings, neighborhood, southwest, ocean. Default is buildings. backgroudType:"",//Set to backgroudURL:"",//If background type set to "custom" will use this url. URL can be a website or local file path. - marqueeAd:[""], + marqueeAd: ["This Weatherscan Emulation is brought to you by the 5D crew. Help from Mapguy11, Goldblazez, TWCBranden, and TWCJon! Please note this emulator is still in beta. If you encounter a bug, report it at https://github.com/buffbears/Weatherscan. To stay up to date with the latest on the emulator, join our Discord Server at https://discord.gg/eWsxxfDtayh.", "You are watching an emulation of the Weatherscan IntelliStar system. Weatherscan is a digital cable and satellite television network that is owned by a consortium owned in turn by NBCUniversal and investment firms The Blackstone Group and Bain Capital. A spinoff of The Weather Channel, Weatherscan features uninterrupted local weather information in graphical format on a continuous loop that is generated by an IntelliStar unit installed at the cable provider's headend; unlike The Weather Channel, Weatherscan does not feature on-air talent of any kind."], } //not functioning var slideloopSettings = { @@ -24,7 +24,8 @@ var audioSettings = { order: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33], //The order the music will play. To include or exclude tracks add or remove their number to the order. Default is 1-33. 34-46 are known 2003 tracks excluding duplicates with 2007. 47-51 are known 2006 tracks excluding duplicates with 2007 and 2003. 52-53 are other weatherscan tracks from unknown year. 54-66 is Trammel Starks 1 not used in any other section. 67-76 is Trammel Starks 2 excluding duplicates. 77-83 is Trammel Starks 3 excluding duplicates. shuffle: false, //Shuffle audio. Default is false. randomStart: true, //Starts the order from a random spot. Default is true. - enableNarrations: true //Play narrations. Default is true. + enableNarrations: true, //Play narrations. Default is true. + narrationType: 'female',//allen or female. Default is female. } var locationSettings = { mainLocation:{ diff --git a/webroot/js/groupull.js b/webroot/js/groupull.js index 19b7ef6..083e395 100644 --- a/webroot/js/groupull.js +++ b/webroot/js/groupull.js @@ -5,13 +5,18 @@ $(function(){ weatherAudio.playCallback = function(tags) { $('.track-info').text('playing "' + tags.title + '" by ' + tags.artist); } - $('#marquee2').text(weatherInfo.ad) setTimeout(function() { - $('#marquee2').marquee({ - speed: 170, pauseOnHover: true - }); + switchMarquee2(0) }, 100) }); +function switchMarquee2(idx) { + $('#marquee2') + .marquee('destroy') + $('#marquee2').text(apperanceSettings.marqueeAd[idx]) + $('#marquee2') + .marquee({speed: 170, pauseOnHover: true}) + .on('finished', function() {switchMarquee2(((idx < apperanceSettings.marqueeAd.length) ? ++idx : 0))}); +} function MarqueeMan() { function switchToWarningMarquee(sidx) { if (weatherInfo.bulletin.severewarnings.length != 0) { diff --git a/webroot/js/loops.js b/webroot/js/loops.js index e663dd9..58bec7e 100644 --- a/webroot/js/loops.js +++ b/webroot/js/loops.js @@ -166,8 +166,8 @@ function Loops() { $('#forecast-shadow').css('box-shadow','0 3px 10px 0 rgba(0, 0, 0, .35)') $('#forecast-text').fadeIn(0) $('#forecast-title').fadeIn(0) - $('#forecast-title').text(weatherInfo.dayDesc.lowerbar.day[0].name + "'S" + " FORECAST"); resizeText(weatherInfo.dayDesc.lowerbar.day[0].desc); + $('#forecast-title').text(weatherInfo.dayDesc.lowerbar.day[0].name + "'S" + " FORECAST"); } }, text2() { @@ -185,8 +185,8 @@ function Loops() { $('#forecast-shadow').css('box-shadow','0 3px 10px 0 rgba(0, 0, 0, .35)') $('#forecast-text').fadeIn(0) $('#forecast-title').fadeIn(0) - $('#forecast-title').text(weatherInfo.dayDesc.lowerbar.day[1].name + "'S" + " FORECAST"); resizeText(weatherInfo.dayDesc.lowerbar.day[1].desc); + $('#forecast-title').text(weatherInfo.dayDesc.lowerbar.day[1].name + "'S" + " FORECAST"); } }, @@ -301,12 +301,14 @@ function Loops() { function resizeText(text){ var s = 41, - $test = $('
') .appendTo('#forecast-text') .css('font-size', s + 'px') .html(text); - $test.width($('#forecast-text').width() ); + $test = $('
') .appendTo('#forecast-text') .css('font-size', s + 'px') .html(text); + $test.css('width',$('#forecast-text').width()); //setTimeout(function() { - while ($test.outerHeight(true) >= ($('#forecast-text').height()) ) { + i = 0 + while ($test.height() >= ($('#forecast-text').height()) && i < 10 ) { s -= 1; $test.css('font-size', s + 'px'); + i += 1 } $('#forecast-text div') .text(text) .css('font-size', s + 'px'); $test.remove(); diff --git a/webroot/js/newweathermanager.js b/webroot/js/newweathermanager.js index 2e853cd..25b0cd1 100644 --- a/webroot/js/newweathermanager.js +++ b/webroot/js/newweathermanager.js @@ -406,7 +406,6 @@ var weatherInfo = { currentCond: { radarTempUnavialable: false, radarWinterLegend: false, reboot: false, - ad: "You are watching an emulation of the Weatherscan IntelliStar system. Weatherscan is a digital cable and satellite television network that is owned by a consortium owned in turn by NBCUniversal and investment firms The Blackstone Group and Bain Capital. A spinoff of The Weather Channel, Weatherscan features uninterrupted local weather information in graphical format on a continuous loop that is generated by an IntelliStar unit installed at the cable provider's headend; unlike The Weather Channel, Weatherscan does not feature on-air talent of any kind." } //start data functions. these are run after their respective location functions finish @@ -1127,7 +1126,7 @@ function grabHealthData() { }) } function grabAirportDelayData() { - $.getJSON('http://127.0.0.1:8081/https://nasstatus.faa.gov/api/airport-events', function(eventdata) { + $.getJSON('http://'+document.location.hostname+':8081/https://nasstatus.faa.gov/api/airport-events', function(eventdata) { for (const airportevent of eventdata) { var airportdelay = {iata:"",type:"",amount:"",reason:""} if (airportevent.airportClosure) { diff --git a/webroot/localvocals/narrations/allen/The_local_Doppler_radar.mp3 b/webroot/localvocals/narrations/allen/The_local_Doppler_radar.mp3 new file mode 100644 index 0000000..b9b93af Binary files /dev/null and b/webroot/localvocals/narrations/allen/The_local_Doppler_radar.mp3 differ diff --git a/webroot/localvocals/narrations/allen/Your_current_conditions.mp3 b/webroot/localvocals/narrations/allen/Your_current_conditions.mp3 new file mode 100644 index 0000000..49e0bfd Binary files /dev/null and b/webroot/localvocals/narrations/allen/Your_current_conditions.mp3 differ diff --git a/webroot/localvocals/narrations/allen/Your_local_forecast_1.mp3 b/webroot/localvocals/narrations/allen/Your_local_forecast_1.mp3 new file mode 100644 index 0000000..2f1dc38 Binary files /dev/null and b/webroot/localvocals/narrations/allen/Your_local_forecast_1.mp3 differ diff --git a/webroot/localvocals/narrations/allen/Your_local_forecast_2.mp3 b/webroot/localvocals/narrations/allen/Your_local_forecast_2.mp3 new file mode 100644 index 0000000..b749f59 Binary files /dev/null and b/webroot/localvocals/narrations/allen/Your_local_forecast_2.mp3 differ diff --git a/webroot/localvocals/narrations/The_local_Doppler_radar.mp3 b/webroot/localvocals/narrations/female/The_local_Doppler_radar.mp3 similarity index 100% rename from webroot/localvocals/narrations/The_local_Doppler_radar.mp3 rename to webroot/localvocals/narrations/female/The_local_Doppler_radar.mp3 diff --git a/webroot/localvocals/narrations/Your_current_conditions.mp3 b/webroot/localvocals/narrations/female/Your_current_conditions.mp3 similarity index 100% rename from webroot/localvocals/narrations/Your_current_conditions.mp3 rename to webroot/localvocals/narrations/female/Your_current_conditions.mp3 diff --git a/webroot/localvocals/narrations/Your_local_forecast_1.mp3 b/webroot/localvocals/narrations/female/Your_local_forecast_1.mp3 similarity index 100% rename from webroot/localvocals/narrations/Your_local_forecast_1.mp3 rename to webroot/localvocals/narrations/female/Your_local_forecast_1.mp3 diff --git a/webroot/localvocals/narrations/Your_local_forecast_2.mp3 b/webroot/localvocals/narrations/female/Your_local_forecast_2.mp3 similarity index 100% rename from webroot/localvocals/narrations/Your_local_forecast_2.mp3 rename to webroot/localvocals/narrations/female/Your_local_forecast_2.mp3