diff --git a/index.html b/index.html index 9f672e48..132b256a 100644 --- a/index.html +++ b/index.html @@ -1256,10 +1256,6 @@ - - + + @@ -7878,15 +7874,15 @@ - + - - + + - + diff --git a/modules/dynamic/supporters.js b/modules/dynamic/supporters.js index 038da4d8..c83e10ec 100644 --- a/modules/dynamic/supporters.js +++ b/modules/dynamic/supporters.js @@ -1,44 +1,481 @@ -const capitalize = text => text.charAt(0).toUpperCase() + text.slice(1); - -const format = rawList => - rawList - .replace(/(?:\r\n|\r|\n)/g, "") - .split(",") - .map(name => capitalize(name.trim())) - .sort(); - -export const supporters = format(` - Aaron Meyer,Ahmad Amerih,AstralJacks,aymeric,Billy Dean Goehring,Branndon Edwards,Chase Mayers,Curt Flood,cyninge,Dino Princip, - E.M. White,es,Fondue,Fritjof Olsson,Gatsu,Johan Fröberg,Jonathan Moore,Joseph Miranda,Kate,KC138,Luke Nelson,Markus Finster,Massimo Vella,Mikey, - Nathan Mitchell,Paavi1,Pat,Ryan Westcott,Sasquatch,Shawn Spencer,Sizz_TV,Timothée CALLET,UTG community,Vlad Tomash,Wil Sisney,William Merriott, - Xariun,Gun Metal Games,Scott Marner,Spencer Sherman,Valerii Matskevych,Alloyed Clavicle,Stewart Walsh,Ruthlyn Mollett (Javan),Benjamin Mair-Pratt, - Diagonath,Alexander Thomas,Ashley Wilson-Savoury,William Henry,Preston Brooks,JOSHUA QUALTIERI,Hilton Williams,Katharina Haase,Hisham Bedri, - Ian arless,Karnat,Bird,Kevin,Jessica Thomas,Steve Hyatt,Logicspren,Alfred García,Jonathan Killstring,John Ackley,Invad3r233,Norbert Žigmund,Jennifer, - PoliticsBuff,_gfx_,Maggie,Connor McMartin,Jared McDaris,BlastWind,Franc Casanova Ferrer,Dead & Devil,Michael Carmody,Valerie Elise,naikibens220, - Jordon Phillips,William Pucs,The Dungeon Masters,Brady R Rathbun,J,Shadow,Matthew Tiffany,Huw Williams,Joseph Hamilton,FlippantFeline,Tamashi Toh, - kms,Stephen Herron,MidnightMoon,Whakomatic x,Barished,Aaron bateson,Brice Moss,Diklyquill,PatronUser,Michael Greiner,Steven Bennett,Jacob Harrington, - Miguel C.,Reya C.,Giant Monster Games,Noirbard,Brian Drennen,Ben Craigie,Alex Smolin,Endwords,Joshua E Goodwin,SirTobit ,Allen S. Rout,Allen Bull Bear, - Pippa Mitchell,R K,G0atfather,Ryan Lege,Caner Oleas Pekgönenç,Bradley Edwards,Tertiary ,Austin Miller,Jesse Holmes,Jan Dvořák,Marten F,Erin D. Smale, - Maxwell Hill,Drunken_Legends,rob bee,Jesse Holmes,YYako,Detocroix,Anoplexian,Hannah,Paul,Sandra Krohn,Lucid,Richard Keating,Allen Varney,Rick Falkvinge, - Seth Fusion,Adam Butler,Gus,StroboWolf,Sadie Blackthorne,Zewen Senpai,Dell McKnight,Oneiris,Darinius Dragonclaw Studios,Christopher Whitney,Rhodes HvZ, - Jeppe Skov Jensen,María Martín López,Martin Seeger,Annie Rishor,Aram Sabatés,MadNomadMedia,Eric Foley,Vito Martono,James H. Anthony,Kevin Cossutta, - Thirty-OneR,ThatGuyGW,Dee Chiu,MontyBoosh,Achillain,Jaden,SashaTK,Steve Johnson,Pierrick Bertrand,Jared Kennedy,Dylan Devenny,Kyle Robertson, - Andrew Rostaing,Daniel Gill,Char,Jack,Barna Csíkos,Ian Rousseau,Nicholas Grabstas,Tom Van Orden jr,Bryan Brake,Akylos,Riley Seaman,MaxOliver,Evan-DiLeo, - Alex Debus,Joshua Vaught,Kyle S,Eric Moore,Dean Dunakin,Uniquenameosaurus,WarWizardGames,Chance Mena,Jan Ka,Miguel Alejandro,Dalton Clark,Simon Drapeau, - Radovan Zapletal,Jmmat6,Justa Badge,Blargh Blarghmoomoo,Vanessa Anjos,Grant A. Murray,Akirsop,Rikard Wolff,Jake Fish,teco 47,Antiroo,Jakob Siegel, - Guilherme Aguiar,Jarno Hallikainen,Justin Mcclain,Kristin Chernoff,Rowland Kingman,Esther Busch,Grayson McClead,Austin,Hakon the Viking,Chad Riley, - Cooper Counts,Patrick Jones,Clonetone,PlayByMail.Net,Brad Wardell,Lance Saba,Egoensis,Brea Richards,Tiber,Chris Bloom,Maxim Lowe,Aquelion, - Page One Project,Spencer Morris,Paul Ingram,Dust Bunny,Adrian Wright,Eric Alexander Cartaya,GameNight,Thomas Mortensen Hansen,Zklaus,Drinarius, - Ed Wright,Lon Varnadore,Crys Cain,Heaven N Lee,Jeffrey Henning,Lazer Elf,Jordan Bellah,Alex Beard,Kass Frisson,Petro Lombaard,Emanuel Pietri,Rox, - PinkEvil,Gavin Madrigal,Martin Lorber,Prince of Morgoth,Jaryd Armstrong,Andrew Pirkola,ThyHolyDevil,Gary Smith,Tyshaun Wise,Ethan Cook,Jon Stroman, - Nobody679,良义 金,Chris Gray,Phoenix Boatwright,Mackenzie,Milo Cohen,Jason Matthew Wuerfel,Rasmus Legêne,Andrew Hines,Wexxler,Espen Sæverud,Binks, - Dominick Ormsby,Linn Browning,Václav Švec,Alan Buehne,George J.Lekkas,Alexandre Boivin,Tommy Mayfield,Skylar Mangum-Turner,Karen Blythe,Stefan Gugerel, - Mike Conley,Xavier privé,Hope You're Well,Mark Sprietsma,Robert Landry,Nick Mowry,steve hall,Markell,Josh Wren,Neutrix,BLRageQuit,Rocky, - Dario Spadavecchia,Bas Kroot,John Patrick Callahan Jr,Alexandra Vesey,D,Exp1nt,james,Braxton Istace,w,Rurikid,AntiBlock,Redsauz,BigE0021, - Jonathan Williams,ojacid .,Brian Wilson,A Patreon of the Ahts,Shubham Jakhotiya,www15o,Jan Bundesmann,Angelique Badger,Joshua Xiong,Moist mongol, - Frank Fewkes,jason baldrick,Game Master Pro,Andrew Kircher,Preston Mitchell,Chris Kohut,Emarandzeb,Trentin Bergeron,Damon Gallaty,Pleaseworkforonce, - Jordan,William Markus,Sidr Dim,Alexander Whittaker,The Next Level,Patrick Valverde,Markus Peham,Daniel Cooper,the Beagles of Neorbus,Marley Moule, - Maximilian Schielke,Johnathan Xavier Hutchinson,Ele,Rita,Randy Ross,John Wick,RedSpaz,cameron cannon,Ian Grau-Fay,Kyle Barrett,Charlotte Wiland, - David Kaul,E. Jason Davis,Cyberate,Atenfox,Sea Wolf,Holly Loveless,Roekai,Alden Z,angel carrillo,Sam Spoerle,S A Rudy,Bird Law Expert,Mira Cyr, - Aaron Blair,Neyimadd,RLKZ1022,DerWolf,Kenji Yamada,Zion,Robert Rinne,Actual_Dio,Kyarou -`); +export const supporters = `ken burgan +Sera's Nafitlaan +Richard Rogers +Hylobate +Colin deSousa +Aurelia De La Silla +Maciej Kontny +Ricky L Cain +Iggyflare +Garrett Renner +Michael Harris +Joshua Maly +Nigel Guest +Theo Hodges +BERTHEAS Frédéric +lilMoni +Δημήτρης Μάρκογιαννακης +Lee S. +Chris Dibbs +jarrad tait +Jacen Solo +Hannes Rotestam +Preston Hicks +Лонгин +Will Fink +ControlFreq +IllAngel +John Giardina +Thiago Prado +Zhang Dijon +NoBurny +thibault tersinet +scarletsky +Nich Smith +Omegus +Karl Abrahamsson +Sara Fernandes +peetey897 +Cooper Janse +G F +Glen Aultman-Bettridge +Nathan Rogers +Benjamin Mock +CadmiumMan +Kirk Edwards +Leigh G +Thom Colyer +Frederik +C pstj +Zachary Pecora +Trevor D'Arcey +Ryan Gauvin +Shawn Moore +Jim Channon +Kyarou +Actual_Dio +Jim B Johnson +Robert Rinne +Zion +Kenji Yamada +DerWolf +RLKZ1022 +Neyimadd +Aaron Blair +Mira Cyr +Bird Law Expert +S A Rudy +Sam Spoerle +angel carrillo +Alden Z +Holly Loveless +Sea Wolf +Atenfox +Cyberate +E. Jason Davis +Caro Lyns +David Kaul +Charlotte Wiland +Kyle Barrett +Ian Grau-Fay +cameron cannon +RedSpaz +John Wick +Randy Ross +Rita +Ele +Johnathan Xavier Hutchinson +Andrew Stein +Ghettov Milan +Malke +TameMoon +Daniel Cooper +Markus Peham +The Next Level +Alexander Whittaker +Sidr Dim +William Markus +Jordan +Pleaseworkforonce +Damon Gallaty +Trentin Bergeron +Emarandzeb +Laulajatar +Dale McBane +Chris Kohut +Preston Mitchell +Andrew Kircher +Frank Fewkes +Moist mongol +Joshua Xiong +Jan Bundesmann +www15o +Game Master Pro +jason baldrick +Exp1nt +w +Shubham Jakhotiya +Braxton Istace +LesterThePossum +Rurikid +ojacid . +james +A Patreon of the Ahts +BigE0021 +Angelique Badger +Jonathan Williams +AntiBlock +Redsauz +Florian Kelber +John Patrick Callahan Jr +Alexandra Vesey +Bas Kroot +Dzmitry Malyshau +PedanticSteve +Josh Wren +BLRageQuit +Dario Spadavecchia +Neutrix +Markell +Rocky +Robert Landry +Skylar Mangum-Turner +Nick Mowry +Anjen Pai +Hope You're Well +Alexandre Boivin +Racussa +Mike Conley +Karen Blythe +Mark Sprietsma +Xavier privé +Tommy Mayfield +Václav Švec +Binks +Mackenzie +Linn Browning +Writer's Consultant Page by George J.Lekkas +Andrew Hines +Wexxler +Jason Matthew Wuerfel +Milo Cohen +Alan Buehne +Dominick Ormsby +Espen Sæverud +Rasmus Legêne +rbbalderama +Nobody679 +Prince of Morgoth +Jaryd Armstrong +Gary Smith +ThyHolyDevil +良义 金 +Andrew Pirkola +Dig +Chris Gray +Tyshaun Wise +Phoenix +Ethan Cook +Jordan Bellah +Petro Lombaard +Kass Frisson +Lazer Elf +Gavin Madrigal +Rox +PinkEvil +Martin Lorber +Emanuel Pietri +Alex Beard +Jeffrey Henning +Eric Alexander Cartaya +Dust Bunny +GameNight +Beingus +Crys Cain +Lon Varnadore +Thomas Mortensen Hansen +Drinarius +Ed Wright +Adrian Wright +Zklaus +Chris Bloom +PlayByMail.Net +Maxim Lowe +Aquelion +Tiber +Daydream1013 +Page One Project +Clonetone +Egoensis +Brad Wardell +Heaven N Lee +BarnabyJones +Paul Ingram +Lance Saba +Chad Riley +Austin +Rowland Kingman +Decimus Vitalis +Grayson McClead +Battleturtle1 +Kristin Chernoff +Justin Mcclain +Patrick Jones +Esther Busch +Chance Mena +JimmyTheBob +Antiroo +Dalton Clark +Guilherme Aguiar +Simon Drapeau +Akirsop +Radovan Zapletal +Vanessa Anjos +Rikard Wolff +Justa Badge +teco 47 +Jake +Miguel Alejandro +Blargh Blarghmoomoo +Jakob Siegel +Grant A. Murray +Jarno Hallikainen +Jan Ka +Joshua Vaught +MaxOliver +WarWizardGames +Evan-DiLeo +Eric Moore +Kyle S +Alex Debus +Uniquenameosaurus +Dean Dunakin +Jack +Bryan Brake +McNeil Atticus Inksmudge +Char +Tom Van Orden jr +Kendall Patterson +Akylos +Barna Csíkos +Nicholas Grabstas +OldFarkas +Riley Seaman +Daniel Gill +Kyle Robertson +Natasha Taylor +Pierrick Bertrand +Jared.K +Dylan Devenny +logic_error +SashaTK +Steve Johnson +MontyBoosh +Achillain +Jaden +Vito Martono +Thirty-OneR +Eric Foley +ThatGuyGW +Dee Chiu +James H. Anthony +Kevin Cossutta +MadNomadMedia +Darinius Dragonclaw Studios +Tsahyla (Triston Lightyear) +Christopher Whitney +María Martín López +Annie Rishor +Aram Sabatés +Jeppe Skov Jensen +Martin Seeger +Oneiris (Oni) +EternalDeiwos +Richard Keating +StroboWolf +Rick Falkvinge +Zewen Senpai +Adam Butler +Kassidy +Sadie Blackthorne +ErrorForever +Seth Fusion +Gus +Paul +Lucid +Allen Varney +Hannah May +Sankroh +Eliot Miller +Detocroix +Meg Ziegler +rob bee +Anoplexian +Marten F +Erin D. Smale +Johnpaul Morrow +Roekai +Drunken_Legends +Jesse Holmes +Maxwell Hill +Jan Dvořák +SirTobit +G0atfather +Allen S. Rout +Pippa Mitchell +Austin Miller +Caner Oleas Pekgönenç +Alison Bull Bear +Bradley Edwards +Tertiary +Daniel +Joshua E Goodwin +Shaun Alexander +Ryan Lege +Myrrhlin +Jesper Cockx +Noirbard +Dice +Brian Drennen +Giant Monster Games +Reya C. +Krk +Endwords +Jacob Harrington +RK +Michael Greiner +Steven Bennett +Brice Moss +Whakomatic x +Stephen Herron +kosmobius +ZizRenanim +Barished +Maur Razimtheth +Aaron bateson +Diklyquill +Shawn Taylor +Brady R Rathbun +FlippantFeline +Shadow +J +Tamashi Toh +Huw Williams +Graves +ShadeByTheSea +The Dungeon Masters +Valerie Elise +Empi3 +William Pucs +Michael Carmody +Marco Veldman +naikibens220 +Jordon Phillips +_gfx_ +F. Casanova +Jared McDaris +BlastWind +Taldonix +Connor McMartin +Nexoness +Guy +Maggie +AdvancedAzrielAngel +Alfred García +Norbert Žigmund +Jennifer +Titanium Tomes +John Ackley +Invad3r233 +Jonathan Killstring +Jessica Thomas +Nikita Kondratjuks +Steve Hyatt +PoliticsBuff +Ian arless +Karnat +Hilton Williams +Kevin +Katharina Haase +Hisham Bedri +Bird +JOSHUA QUALTIERI +Preston Brooks +Troy Schuler +DerGeisterbär +L. V. Werneck +Marcus Hellyrr +yami +Daniel Eric Crosby +Augusto Chiarle +Doug Churchman +David Roza +Alexander Thomas +Ashley Wilson-Savoury +Nathan L Myers +Theresa Walsh +JP Roberts III +William Henry +OldbeanOldboy +Javasharp +Diagonath +Gun Metal Games +Scott Marner +Alloyed Clavicle +Valerii Matskevych +Spencer Sherman +Nolan Moore +James Schellenger +Pat +Dino Princip +Shawn Spencer +Timothée CALLET +KC138 +Nylian +Kate +Markus Finster +CanadianGold +AstralJacks +Keith Marshall +Scott Davis +Joseph Miranda +Shaptarshi Joarder +Branndon +EP +Johan Fröberg +Sasquatch +Chase Mayers +Sizz_TV +Ryan Westcott +Nathan Mitchell +Curt Flood +Mikey +E.M. White +Billy +Vlad Tomash +Xariun +Luke Nelson +W Maxwell Cassity-Guilliom +Marty H +Aaron Meyer +Max Amillios +chris +cyninge +Omegavoid +Fritjof Olsson +Crazypedia +Duncan Thomson +William Merriott +Gold Tamarin +Lhoris +Jonathan +Jon +Massimo Vella +Feuver +aymeric +Eric Schumann +Rei +Fondue +Paavi1 +Wil Sisney +David Patterson`; diff --git a/modules/ui/options.js b/modules/ui/options.js index f8ccfb38..403315cd 100644 --- a/modules/ui/options.js +++ b/modules/ui/options.js @@ -77,12 +77,15 @@ document // show popup with a list of Patreon supportes (updated manually) async function showSupporters() { const {supporters} = await import("../dynamic/supporters.js?v=19062022"); + const list = supporters.split("\n").sort(); + const columns = window.innerWidth < 800 ? 2 : 5; + alertMessage.innerHTML = - ""; + `"; $("#alert").dialog({ resizable: false, title: "Patreon Supporters", - width: "54vw", + width: "min-width", position: {my: "center", at: "center", of: "svg"} }); } @@ -602,17 +605,17 @@ function randomizeCultureSet() { function setRendering(value) { viewbox.attr("shape-rendering", value); - if (value === "optimizeSpeed") { - // block some styles - coastline.select("#sea_island").style("filter", "none"); - statesHalo.style("display", "none"); - emblems.style("opacity", 1); - } else { - // remove style block - coastline.select("#sea_island").style("filter", null); - statesHalo.style("display", null); - emblems.style("opacity", null); - } + // if (value === "optimizeSpeed") { + // // block some styles + // coastline.select("#sea_island").style("filter", "none"); + // statesHalo.style("display", "none"); + // emblems.style("opacity", 1); + // } else { + // // remove style block + // coastline.select("#sea_island").style("filter", null); + // statesHalo.style("display", null); + // emblems.style("opacity", null); + // } } // generate current year and era name diff --git a/modules/ui/stylePresets.js b/modules/ui/stylePresets.js index 7353b067..20e1612c 100644 --- a/modules/ui/stylePresets.js +++ b/modules/ui/stylePresets.js @@ -1,14 +1,27 @@ // UI module to control the style presets "use strict"; -const systemPresets = ["default", "ancient", "gloom", "light", "watercolor", "clean", "atlas", "cyberpunk", "monochrome"]; +const systemPresets = [ + "default", + "ancient", + "gloom", + "pale", + "light", + "watercolor", + "clean", + "atlas", + "cyberpunk", + "monochrome" +]; const customPresetPrefix = "fmgStyle_"; // add style presets to list { const systemOptions = systemPresets.map(styleName => ``); const storedStyles = Object.keys(localStorage).filter(key => key.startsWith(customPresetPrefix)); - const customOptions = storedStyles.map(styleName => ``); + const customOptions = storedStyles.map( + styleName => `` + ); const options = systemOptions.join("") + customOptions.join(""); document.getElementById("stylePreset").innerHTML = options; } @@ -37,7 +50,8 @@ async function getStylePreset(desiredPreset) { const isValid = JSON.isValid(storedStyleJSON); if (isValid) return [desiredPreset, JSON.parse(storedStyleJSON)]; - ERROR && console.error(`Custom style ${desiredPreset} stored in localStorage is not valid. Applying default style`); + ERROR && + console.error(`Custom style ${desiredPreset} stored in localStorage is not valid. Applying default style`); presetToLoad = "default"; } } @@ -145,8 +159,31 @@ function addStylePreset() { "#stateBorders": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"], "#provinceBorders": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"], "#cells": ["opacity", "stroke", "stroke-width", "filter", "mask"], - "#gridOverlay": ["opacity", "scale", "dx", "dy", "type", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "transform", "filter", "mask"], - "#coordinates": ["opacity", "data-size", "font-size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"], + "#gridOverlay": [ + "opacity", + "scale", + "dx", + "dy", + "type", + "stroke", + "stroke-width", + "stroke-dasharray", + "stroke-linecap", + "transform", + "filter", + "mask" + ], + "#coordinates": [ + "opacity", + "data-size", + "font-size", + "stroke", + "stroke-width", + "stroke-dasharray", + "stroke-linecap", + "filter", + "mask" + ], "#compass": ["opacity", "transform", "filter", "mask", "shape-rendering"], "#rose": ["transform"], "#relig": ["opacity", "stroke", "stroke-width", "filter"], @@ -174,7 +211,17 @@ function addStylePreset() { "#statesBody": ["opacity", "filter"], "#statesHalo": ["opacity", "data-width", "stroke-width", "filter"], "#provs": ["opacity", "fill", "font-size", "font-family", "filter"], - "#temperature": ["opacity", "font-size", "fill", "fill-opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"], + "#temperature": [ + "opacity", + "font-size", + "fill", + "fill-opacity", + "stroke", + "stroke-width", + "stroke-dasharray", + "stroke-linecap", + "filter" + ], "#ice": ["opacity", "fill", "stroke", "stroke-width", "filter"], "#emblems": ["opacity", "stroke-width", "filter"], "#texture": ["opacity", "filter", "mask"], @@ -184,16 +231,65 @@ function addStylePreset() { "#oceanBase": ["fill"], "#oceanicPattern": ["href", "opacity"], "#terrs": ["opacity", "scheme", "terracing", "skip", "relax", "curve", "filter", "mask"], - "#legend": ["data-size", "font-size", "font-family", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "data-x", "data-y", "data-columns"], + "#legend": [ + "data-size", + "font-size", + "font-family", + "stroke", + "stroke-width", + "stroke-dasharray", + "stroke-linecap", + "data-x", + "data-y", + "data-columns" + ], "#legendBox": ["fill", "fill-opacity"], "#burgLabels > #cities": ["opacity", "fill", "text-shadow", "data-size", "font-size", "font-family"], - "#burgIcons > #cities": ["opacity", "fill", "fill-opacity", "size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap"], + "#burgIcons > #cities": [ + "opacity", + "fill", + "fill-opacity", + "size", + "stroke", + "stroke-width", + "stroke-dasharray", + "stroke-linecap" + ], "#anchors > #cities": ["opacity", "fill", "size", "stroke", "stroke-width"], "#burgLabels > #towns": ["opacity", "fill", "text-shadow", "data-size", "font-size", "font-family"], - "#burgIcons > #towns": ["opacity", "fill", "fill-opacity", "size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap"], + "#burgIcons > #towns": [ + "opacity", + "fill", + "fill-opacity", + "size", + "stroke", + "stroke-width", + "stroke-dasharray", + "stroke-linecap" + ], "#anchors > #towns": ["opacity", "fill", "size", "stroke", "stroke-width"], - "#labels > #states": ["opacity", "fill", "stroke", "stroke-width", "text-shadow", "data-size", "font-size", "font-family", "filter"], - "#labels > #addedLabels": ["opacity", "fill", "stroke", "stroke-width", "text-shadow", "data-size", "font-size", "font-family", "filter"], + "#labels > #states": [ + "opacity", + "fill", + "stroke", + "stroke-width", + "text-shadow", + "data-size", + "font-size", + "font-family", + "filter" + ], + "#labels > #addedLabels": [ + "opacity", + "fill", + "stroke", + "stroke-width", + "text-shadow", + "data-size", + "font-size", + "font-family", + "filter" + ], "#fogging": ["opacity", "fill", "filter"] }; @@ -238,7 +334,8 @@ function addStylePreset() { if (!styleJSON) return tip("Please provide a style JSON", false, "error"); if (!JSON.isValid(styleJSON)) return tip("JSON string is not valid, please check the format", false, "error"); if (!desiredName) return tip("Please provide a preset name", false, "error"); - if (styleSaverTip.innerHTML === "default") return tip("You cannot overwrite default preset, please change the name", false, "error"); + if (styleSaverTip.innerHTML === "default") + return tip("You cannot overwrite default preset, please change the name", false, "error"); const presetName = customPresetPrefix + desiredName; applyOption(stylePreset, presetName, desiredName + " [custom]"); diff --git a/styles/default.json b/styles/default.json index eb4acb69..4c684dc8 100644 --- a/styles/default.json +++ b/styles/default.json @@ -226,7 +226,7 @@ "opacity": 0.4, "data-width": 10, "stroke-width": 10, - "filter": "blur(5px)" + "filter": "blur(3.5px)" }, "#provs": { "opacity": 0.7, diff --git a/styles/light.json b/styles/light.json index 5663d6c8..fb9b838c 100644 --- a/styles/light.json +++ b/styles/light.json @@ -192,18 +192,18 @@ "filter": null }, "#roads": { - "opacity": 0.9, - "stroke": "#3c1d0b", - "stroke-width": 1.37, + "opacity": 0.8, + "stroke": "#95481a", + "stroke-width": 0.8, "stroke-dasharray": 2, "stroke-linecap": "inherit", "filter": null, "mask": null }, "#trails": { - "opacity": 0.9, + "opacity": 0.8, "stroke": "#95481a", - "stroke-width": 0.88, + "stroke-width": 0.5, "stroke-dasharray": ".8 1.6", "stroke-linecap": "butt", "filter": null, diff --git a/styles/pale.json b/styles/pale.json new file mode 100644 index 00000000..e6acdafd --- /dev/null +++ b/styles/pale.json @@ -0,0 +1,389 @@ +{ + "#map": { + "background-color": "#000000", + "filter": null, + "data-filter": null + }, + "#armies": { + "font-size": 9, + "box-size": 4.5, + "stroke": "#000", + "stroke-width": 0, + "fill-opacity": 1, + "filter": "url(#dropShadow05)" + }, + "#biomes": { + "opacity": 0.6, + "filter": null, + "mask": "url(#land)" + }, + "#stateBorders": { + "opacity": 0.6, + "stroke": "#4c483e", + "stroke-width": 0.8, + "stroke-dasharray": "1 2.5", + "stroke-linecap": "square", + "filter": null + }, + "#provinceBorders": { + "opacity": 0.6, + "stroke": "#56566d", + "stroke-width": 0.2, + "stroke-dasharray": 0.5, + "stroke-linecap": "butt", + "filter": null + }, + "#cells": { + "opacity": null, + "stroke": "#808080", + "stroke-width": 0.1, + "filter": null, + "mask": null + }, + "#gridOverlay": { + "opacity": 0.5, + "scale": 1, + "dx": 0, + "dy": 0, + "type": "pointyHex", + "stroke": "#808080", + "stroke-width": 1, + "stroke-dasharray": null, + "stroke-linecap": null, + "transform": null, + "filter": null, + "mask": null + }, + "#coordinates": { + "opacity": 0.7, + "data-size": 15, + "font-size": 15, + "stroke": "#734d37", + "stroke-width": 1.5, + "stroke-dasharray": 5, + "stroke-linecap": "square", + "filter": null, + "mask": "" + }, + "#compass": { + "opacity": 0.6, + "transform": null, + "filter": null, + "mask": "url(#water)", + "shape-rendering": "optimizespeed" + }, + "#rose": { + "transform": null + }, + "#relig": { + "opacity": 0.5, + "stroke": null, + "stroke-width": 0, + "filter": null + }, + "#cults": { + "opacity": 0.5, + "stroke": "#777777", + "stroke-width": 0, + "stroke-dasharray": null, + "stroke-linecap": null, + "filter": null + }, + "#landmass": { + "opacity": 1, + "fill": "#f4f2f0", + "filter": null + }, + "#markers": { + "opacity": null, + "rescale": 1, + "filter": null + }, + "#prec": { + "opacity": null, + "stroke": "#000000", + "stroke-width": 0.1, + "fill": "#2554ef", + "filter": null + }, + "#population": { + "opacity": null, + "stroke-width": 1.6, + "stroke-dasharray": null, + "stroke-linecap": "butt", + "filter": null + }, + "#rural": { + "stroke": "#0000ff" + }, + "#urban": { + "stroke": "#ff0000" + }, + "#freshwater": { + "opacity": 0.8, + "fill": "#98b6cd", + "stroke": "#718798", + "stroke-width": 0.5, + "filter": "url(#dropShadow05)" + }, + "#salt": { + "opacity": 0.5, + "fill": "#409b8a", + "stroke": "#388985", + "stroke-width": 0.7, + "filter": null + }, + "#sinkhole": { + "opacity": 1, + "fill": "#5bc9fd", + "stroke": "#53a3b0", + "stroke-width": 0.7, + "filter": null + }, + "#frozen": { + "opacity": 0.95, + "fill": "#cdd4e7", + "stroke": "#cfe0eb", + "stroke-width": 0, + "filter": null + }, + "#lava": { + "opacity": 0.7, + "fill": "#90270d", + "stroke": "#f93e0c", + "stroke-width": 2, + "filter": "url(#crumpled)" + }, + "#dry": { + "opacity": 1, + "fill": "#c9bfa7", + "stroke": "#8e816f", + "stroke-width": 0.7, + "filter": null + }, + "#sea_island": { + "opacity": 1, + "stroke": "#242424", + "stroke-width": 0.1, + "filter": "url(#dropShadow)", + "auto-filter": 1 + }, + "#lake_island": { + "opacity": 1, + "stroke": "#7c8eaf", + "stroke-width": 0.1, + "filter": null + }, + "#terrain": { + "opacity": 0.8, + "set": "simple", + "size": 0.7, + "density": 0.3, + "filter": null, + "mask": "" + }, + "#rivers": { + "opacity": 1, + "filter": null, + "fill": "#6dabba" + }, + "#ruler": { + "opacity": null, + "filter": null + }, + "#roads": { + "opacity": 0.9, + "stroke": "#d06324", + "stroke-width": 0.6, + "stroke-dasharray": "1 2", + "stroke-linecap": "round", + "filter": null, + "mask": null + }, + "#trails": { + "opacity": 0.9, + "stroke": "#d06324", + "stroke-width": 0.5, + "stroke-dasharray": ".5 2", + "stroke-linecap": "round", + "filter": null, + "mask": null + }, + "#searoutes": { + "opacity": 1, + "stroke": "#e5edff", + "stroke-width": 0.5, + "stroke-dasharray": "2 3", + "stroke-linecap": "round", + "filter": null, + "mask": null + }, + "#statesBody": { + "opacity": 0.15, + "filter": null + }, + "#statesHalo": { + "opacity": 0.3, + "data-width": 10, + "stroke-width": 10, + "filter": "blur(3.5px)" + }, + "#provs": { + "opacity": 0.4, + "fill": "#000000", + "font-size": 8, + "font-family": "Arima Madurai", + "filter": null + }, + "#temperature": { + "opacity": null, + "font-size": "8px", + "fill": "#000000", + "fill-opacity": 0.3, + "stroke": null, + "stroke-width": 1.8, + "stroke-dasharray": null, + "stroke-linecap": null, + "filter": null + }, + "#ice": { + "opacity": 0.9, + "fill": "#e8f0f6", + "stroke": "#e8f0f6", + "stroke-width": 0.1, + "filter": "url(#dropShadow05)" + }, + "#emblems": { + "opacity": 0.9, + "stroke-width": 1, + "filter": null + }, + "#texture": { + "opacity": 0.39, + "filter": null, + "mask": "url(#land)" + }, + "#textureImage": { + "x": 0, + "y": 0 + }, + "#zones": { + "opacity": 0.6, + "stroke": "#333333", + "stroke-width": 0, + "stroke-dasharray": null, + "stroke-linecap": "butt", + "filter": null, + "mask": null + }, + "#oceanLayers": { + "filter": "url(#dropShadow05)", + "layers": "-6,-3,-1" + }, + "#oceanBase": { + "fill": "#7ca4b6" + }, + "#oceanicPattern": { + "href": "./images/kiwiroo.png", + "opacity": 0.3 + }, + "#terrs": { + "opacity": 0.7, + "scheme": "bright", + "terracing": 0, + "skip": 2, + "relax": 1, + "curve": 0, + "filter": "", + "mask": "url(#land)" + }, + "#legend": { + "data-size": 13, + "font-size": 13, + "font-family": "Arima Madurai", + "stroke": "#812929", + "stroke-width": 2.5, + "stroke-dasharray": "0 4 10 4", + "stroke-linecap": "round", + "data-x": 54.73, + "data-y": 62.98, + "data-columns": 8 + }, + "#burgLabels > #cities": { + "opacity": 0.8, + "fill": "#3a3a3a", + "text-shadow": "white 0px 0px 4px", + "data-size": 7, + "font-size": 7, + "font-family": "Arima Madurai" + }, + "#burgIcons > #cities": { + "opacity": 1, + "fill": "#ffffff", + "fill-opacity": 0.7, + "size": 1.5, + "stroke": "#4f4f4f", + "stroke-width": 0.2, + "stroke-dasharray": "", + "stroke-linecap": "butt" + }, + "#anchors > #cities": { + "opacity": 1, + "fill": "#ffffff", + "size": 3, + "stroke": "#3e3e4b", + "stroke-width": 1.2 + }, + "#burgLabels > #towns": { + "opacity": 0.8, + "fill": "#3e3e4b", + "text-shadow": "white 0px 0px 4px", + "data-size": 4, + "font-size": 4, + "font-family": "Arima Madurai" + }, + "#burgIcons > #towns": { + "opacity": 1, + "fill": "#ffffff", + "fill-opacity": 0.7, + "size": 0.6, + "stroke": "#4f4f4f", + "stroke-width": 0.12, + "stroke-dasharray": "", + "stroke-linecap": "butt" + }, + "#anchors > #towns": { + "opacity": 1, + "fill": "#ffffff", + "size": 1.2, + "stroke": "#3e3e4b", + "stroke-width": 1 + }, + "#labels > #states": { + "opacity": 0.8, + "fill": "#3e3e3e", + "stroke": "#000000", + "stroke-width": 0, + "text-shadow": "white 0px 0px 6px", + "data-size": 14, + "font-size": 14, + "font-family": "Arima Madurai", + "filter": null + }, + "#labels > #addedLabels": { + "opacity": 1, + "fill": "#f24706", + "stroke": "#701b05", + "stroke-width": 0.1, + "text-shadow": "white 0px 0px 4px", + "data-size": 6, + "font-size": 6, + "font-family": "Arima Madurai", + "filter": null + }, + "#fogging": { + "opacity": 1, + "fill": "#30426f", + "filter": null + } +} diff --git a/versioning.js b/versioning.js index 15336b1f..9e10745c 100644 --- a/versioning.js +++ b/versioning.js @@ -1,7 +1,7 @@ "use strict"; // version and caching control -const version = "1.89.10"; // generator version, update each time +const version = "1.89.12"; // generator version, update each time { document.title += " v" + version;