Skip to content

Commit

Permalink
Merge pull request #103 from mainIine/beta
Browse files Browse the repository at this point in the history 
Beta
  • Loading branch information
Th3OnlyC0D3R authored May 18, 2021
2 parents 999b092 + 6447f5c commit 032d569
Show file tree
Hide file tree
Showing 5 changed files with 289 additions and 3,289 deletions.
18 changes: 17 additions & 1 deletion js/web/_i18n/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,22 @@
"Boxes.GvGMap.Guild.Name": "Gilde",
"Boxes.GvGMap.Guild.Power": "Macht",
"Boxes.GvGMap.Guild.Sectors": "Sektoren",
"Boxes.GvGMap.Log": "Protokoll",
"Boxes.GvGMap.Log.clan_defeated": "Gilde besiegt",
"Boxes.GvGMap.Log.defender_damaged": "VA angeschlagen",
"Boxes.GvGMap.Log.defender_defeated": "VA vernichtet",
"Boxes.GvGMap.Log.defender_deployed": "VA gestellt",
"Boxes.GvGMap.Log.defender_replaced": "VA ersetzt",
"Boxes.GvGMap.Log.headquarter_placed": "HQ platziert",
"Boxes.GvGMap.Log.NPC": "NPC",
"Boxes.GvGMap.Log.sector_conquered": "Sektor erobert",
"Boxes.GvGMap.Log.sector_independence_granted": "Freiheit gewährt",
"Boxes.GvGMap.Log.sector_slot_unlocked": "Slot freigeschaltet",
"Boxes.GvGMap.Log.siege_damaged": "BA angeschlagen",
"Boxes.GvGMap.Log.siege_defeated": "BA vernichtet",
"Boxes.GvGMap.Log.siege_deleted": "BA gelöscht",
"Boxes.GvGMap.Log.siege_deployed": "BA gestellt",
"Boxes.GvGMap.Log.UnknownGuild": "Unbekannte Gilde",
"Boxes.GvGMap.Sector.Beach": "Strand",
"Boxes.GvGMap.Sector.Coords": "Koordinaten",
"Boxes.GvGMap.Sector.Hitpoints": "Lebenspunkte",
Expand Down Expand Up @@ -686,7 +702,7 @@
"Eras.8": "Industriezeitalter",
"Eras.9": "Jahrhundertwende",
"Global.BoxTitle": "FoE Helfer",
"GvG.Independences.Tooltip": "Anzahl der Sektorfreigaben und selbst gestellten Belagerungen seit der letzten Abrechnung.",
"GvG.Independences.Tooltip": "Anzahl der Sektorfreigaben seit der letzten Abrechnung.",
"GvG.Independences.Tooltip.Warning": "Kann ungenau sein, wenn du an mehreren Desktop-Geräten spielst.",
"HiddenRewards.Positions.cityRoadBig": "zweispurige Strasse",
"HiddenRewards.Positions.cityRoadSmall": "einspurige Strasse",
Expand Down
18 changes: 17 additions & 1 deletion js/web/_i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,22 @@
"Boxes.GvGMap.Guild.Name": "Guild",
"Boxes.GvGMap.Guild.Power": "Power",
"Boxes.GvGMap.Guild.Sectors": "Sectors",
"Boxes.GvGMap.Log": "Log",
"Boxes.GvGMap.Log.clan_defeated": "Clan defeated",
"Boxes.GvGMap.Log.defender_damaged": "Defender damaged",
"Boxes.GvGMap.Log.defender_defeated": "Defender defeated",
"Boxes.GvGMap.Log.defender_deployed": "Defender deployed",
"Boxes.GvGMap.Log.defender_replaced": "Defender replaced",
"Boxes.GvGMap.Log.headquarter_placed": "HQ placed",
"Boxes.GvGMap.Log.NPC": "NPC",
"Boxes.GvGMap.Log.sector_conquered": "Sector conquered",
"Boxes.GvGMap.Log.sector_independence_granted": "Independence granted",
"Boxes.GvGMap.Log.sector_slot_unlocked": "Slot unlocked",
"Boxes.GvGMap.Log.siege_damaged": "Siege damaged",
"Boxes.GvGMap.Log.siege_defeated": "Siege defeated",
"Boxes.GvGMap.Log.siege_deleted": "Siege deleted",
"Boxes.GvGMap.Log.siege_deployed": "Siege deployed",
"Boxes.GvGMap.Log.UnknownGuild": "Unknown Guild",
"Boxes.GvGMap.Sector.Beach": "Beach",
"Boxes.GvGMap.Sector.Coords": "Coords",
"Boxes.GvGMap.Sector.Hitpoints": "Hitpoints",
Expand Down Expand Up @@ -679,7 +695,7 @@
"Eras.8": "Industrial Age",
"Eras.9": "Progressive Era",
"Global.BoxTitle": "FoE Helper",
"GvG.Independences.Tooltip": "Amount of Independences granted and sieges you placed yourself since last calculation.",
"GvG.Independences.Tooltip": "Amount of Independences granted since last calculation.",
"GvG.Independences.Tooltip.Warning": "Can be inaccurate, if you play on multiple desktop devices.",
"HiddenRewards.Positions.cityRoadBig": "2-lane Road",
"HiddenRewards.Positions.cityRoadSmall": "Single-lane Road",
Expand Down
20 changes: 13 additions & 7 deletions js/web/_i18n/sv.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"Boxes.Calculator.HelpLink": "https://foe-helper.com/docs/en/cost-calculator/",
"Boxes.Calculator.LGNotConnected": "Byggnaden är inte väg-ansluten.",
"Boxes.Calculator.LGNotOpen": "Denna MB's nästa nivå är LÅST.",
"Boxes.Calculator.LevelWarning": "VARNING! Höjer nivå på MB!",
"Boxes.Calculator.LevelWarning": "VARNING! Nivellerar detta MB!",
"Boxes.Calculator.MaxLevel": "Max nivå",
"Boxes.Calculator.Meds": "Medalj",
"Boxes.Calculator.Profit": "Vinst",
Expand All @@ -106,7 +106,7 @@
"Boxes.Calculator.TTProfit": "Belöning = __nettoreward__<small>(netto vinst)</small> * __arcfactor__%<small>(Ark bonus)</small> = __bruttoreward__<br>Kostnad: __costs__ - Place locked at: __safe__<br>Vinst = __bruttoreward__<small>(belöning)</small> - __costs__<small>(kostnad)</small> = __profit__",
"Boxes.Calculator.TTProfitSelf": "Belöning = __nettoreward__<small>(nettovinst)</small> * __arcfactor__%<small>(Ark bonus)</small> = __bruttoreward__<br>Betalat: __paid__<br>Vinst = __bruttoreward__<small>(belöning)</small> - __paid__<small>(betalat)</small> = __profit__",
"Boxes.Calculator.Title": "Kostnadskalkylator",
"Boxes.Calculator.Up2LevelUp": "Till nästa nivå",
"Boxes.Calculator.Up2LevelUp": "Återstående FP för nivellering",
"Boxes.Campagne.AlreadyDone": " Redan erövrad! Bra gjort :)",
"Boxes.Campagne.DescInStock": "Tillgängliga",
"Boxes.Campagne.DescRequired": "Behov",
Expand Down Expand Up @@ -181,6 +181,7 @@
"Boxes.FPCollector.winterEvent": "Vinterevent",
"Boxes.FPCollector.winterEventGandPrice": "Vinterevent - Första pris",
"Boxes.FPCollector.winterEventGrandPrice": "Vinterevent - Första pris",
"Boxes.General.Export": "Export",
"Boxes.General.ExportCSV": "Exportera som CSV",
"Boxes.General.ExportJSON": "Exportera som jSON",
"Boxes.Gildfights.Count": "i",
Expand Down Expand Up @@ -231,6 +232,7 @@
"Boxes.GreatBuildings.Title": "MB Investering Översikt",
"Boxes.GuildMemberStat.AutoStartOnUpdate": "öppna översikt efter uppdatering",
"Boxes.GuildMemberStat.Battles": "Strider",
"Boxes.GuildMemberStat.ChangeView": "Ändra vy",
"Boxes.GuildMemberStat.ConfirmNo": "Nej",
"Boxes.GuildMemberStat.ConfirmYes": "Ja",
"Boxes.GuildMemberStat.Date": "Datum",
Expand All @@ -252,7 +254,7 @@
"Boxes.GuildMemberStat.GuildMembers": "Imperium-medlemmar",
"Boxes.GuildMemberStat.GuildMessages": "Antal meddelande i gillets meddelande-center",
"Boxes.GuildMemberStat.GuildPower": "Imperium-makt",
"Boxes.GuildMemberStat.GuildSupportBuildings": "Stödpool byggnader",
"Boxes.GuildMemberStat.GuildSupportBuildings": "Stödpool-byggnader",
"Boxes.GuildMemberStat.GuildTreasuryNotification": "Klicka på flik \"Skattkammare\" i gillets profil för att uppdatera datan.",
"Boxes.GuildMemberStat.Inactivity": "Inaktivitet",
"Boxes.GuildMemberStat.Instantly": "omedelbar",
Expand Down Expand Up @@ -282,7 +284,7 @@
"Boxes.Infobox.FilterAuction": "Auktiongit st",
"Boxes.Infobox.FilterGex": "IE",
"Boxes.Infobox.FilterGildFights": "Imperiestrider",
"Boxes.Infobox.FilterLevel": "Ny nivå",
"Boxes.Infobox.FilterLevel": "MB",
"Boxes.Infobox.FilterMessage": "Meddelanden",
"Boxes.Infobox.FilterTrade": "Handel",
"Boxes.Infobox.Messages.Auction": "'<strong>__player__</strong> har precis budat __amount__ Samlarmynt.",
Expand All @@ -302,12 +304,15 @@
"Boxes.Investment.DateParseErrorDesc": "Datum-värdet \"__InvalidDate__\" kunde inte tolkas",
"Boxes.Investment.HiddenGB": "Dolt MB",
"Boxes.Investment.InvestBar": "Investerat FP: ",
"Boxes.Investment.Overview.AdditionalColumns": "Ytterligare kolumner",
"Boxes.Investment.Overview.Blueprints": "Ritningar",
"Boxes.Investment.Overview.Building": "Byggnad",
"Boxes.Investment.Overview.EntryTime": "Tidpunkt",
"Boxes.Investment.Overview.EntryTimeDesc": "När noterades den första depositionen?",
"Boxes.Investment.Overview.HideGB": "Dölj MB från kalkylering och lista.",
"Boxes.Investment.Overview.Invested": "Investerat",
"Boxes.Investment.Overview.InvestedDesc": "Hur många FP har investerats",
"Boxes.Investment.Overview.Medals": "Medaljer",
"Boxes.Investment.Overview.Player": "Spelare",
"Boxes.Investment.Overview.Profit": "Profit",
"Boxes.Investment.Overview.ProfitDesc": "profit uppnådd, gul -> Rank är inte säker, röd/grön -> Förlust/Profit säker",
Expand All @@ -317,7 +322,7 @@
"Boxes.Investment.Overview.RestFPDesc": "Antal FP som återstår för att öka nivån",
"Boxes.Investment.Overview.SettingsEntryTime": "visa tidpunkt",
"Boxes.Investment.Overview.SettingsHiddenGB": "visa dolda MB",
"Boxes.Investment.Overview.SettingsRestFP": "visa återstående FP",
"Boxes.Investment.Overview.SettingsRestFP": "återstående FP",
"Boxes.Investment.Overview.SettingsSave": "Spara",
"Boxes.Investment.Overview.SettingsUnsafeCalc": "kalkylera endast säker profit/förlust",
"Boxes.Investment.PlayerFound": "Nya händelser funna!",
Expand Down Expand Up @@ -472,7 +477,7 @@
"Boxes.OwnpartCalculator.Place": "Plats",
"Boxes.OwnpartCalculator.Places": "Platser",
"Boxes.OwnpartCalculator.PlayerName": "Spelare",
"Boxes.OwnpartCalculator.PowerLeveling": "Kraft nivå-ökande",
"Boxes.OwnpartCalculator.PowerLeveling": "Turbo-nivellering",
"Boxes.OwnpartCalculator.Preview": "Förhandsvisa",
"Boxes.OwnpartCalculator.Step": "Nivå",
"Boxes.OwnpartCalculator.Title": "MB kalkylator",
Expand All @@ -488,7 +493,7 @@
"Boxes.PowerLeveling.P3": "Plats 3",
"Boxes.PowerLeveling.P4": "Plats 4",
"Boxes.PowerLeveling.P5": "Plats 5",
"Boxes.PowerLeveling.Title": "Power leveling",
"Boxes.PowerLeveling.Title": "Turbo-nivellering",
"Boxes.Productions.Done": "Färdigt",
"Boxes.Productions.GoodEraTotal": "Total",
"Boxes.Productions.GuildGoods": "Skattkammare gods",
Expand Down Expand Up @@ -659,6 +664,7 @@
"GvG.Independences.Tooltip.Warning": "Kan vara missvisande, om du spelar på flera olika datorer.",
"HiddenRewards.Positions.cityRoadBig": "Stor väg",
"HiddenRewards.Positions.cityRoadSmall": "Liten väg",
"HiddenRewards.Positions.culturalOutpost": "Skärvor - Bosättning",
"HiddenRewards.Positions.guildExpedition": "Imperieexpedition",
"HiddenRewards.Positions.nature": "Natur",
"HiddenRewards.Positions.shore": "Strand",
Expand Down
54 changes: 47 additions & 7 deletions js/web/gvg/css/gvg.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,37 @@
height: inherit;
display: flex;
align-items: stretch;
overflow: hidden;
justify-content: space-between;
}

#GvGMapContent {
height: inherit;
overflow: auto;
overflow: hidden;
position: relative;
}

#GvGMapMeta {
position: relative;
height: 40px;
overflow: hidden;
}

#GvGMapWrap {
width: 80%;
height: inherit;
overflow: auto;
background-color: #111213;
border-right: 2px solid var(--text-dark);
overflow: hidden;
position: relative;
}

#gvgOptions {
height: inherit;
overflow: auto;
width: 350px;
min-width: 300px;
flex-grow: 2;
}

#GvGMapInfo {
Expand All @@ -97,9 +113,32 @@
}

#GvGMapActions {
z-index: 100;
position: absolute;
top: 10px;
right: 332px;
left: 7px;
top: 7px;
}

#noGuild.btn-inset {
background: linear-gradient(to top, rgb(183,112,55) 0%,rgb(176,96,38) 1%,rgb(145,72,30) 30%,rgb(130,62,24) 99%,rgb(176,104,50) 100%);
padding: 0.2rem;
}

#noGuild::before {
background: #fff;
content: '';
width: 18px;
height: 18px;
display: inline-block;
border-radius: 10px;
}

#GvGlog {
font-size: 90%;
}

#GvGlog table.foe-table tbody tr:nth-child(odd) {
background-color: inherit;
}

.sectorInfo {
Expand All @@ -112,6 +151,7 @@
background-color: #210b02;
width: 200px;
font-size: 90%;
z-index: 101;
}

.sectorInfo .guildflag {
Expand Down Expand Up @@ -159,11 +199,11 @@
.guildflag.flag_11, .guildflag.flag_11_G { background-position: -57px -45px; }
.guildflag.flag_12 { background-position: -102px -44px; }
.guildflag.flag_13 { background-position: -148px -45px; }
.guildflag.flag_14 { background-position: -193px -45px; }
.guildflag.flag_14, .guildflag.flag_14_R { background-position: -193px -45px; }
.guildflag.flag_15 { background-position: -237px -45px; }
.guildflag.flag_16, .guildflag.flag_16_G { background-position: -282px -45px; }
.guildflag.flag_17 { background-position: -327px -45px; }
.guildflag.flag_18 { background-position: -372px -46px; }
.guildflag.flag_17, .guildflag.flag_17_G { background-position: -327px -45px; }
.guildflag.flag_18, .guildflag.flag_18_R { background-position: -372px -46px; }
.guildflag.flag_19 { background-position: -418px -45px; }

.guildflag.flag_20, .guildflag.flag_20_R { background-position: -13px -81px; }
Expand Down
Loading

0 comments on commit 032d569

Please sign in to comment.