Skip to content

Commit

Permalink
Merge pull request #102 from mainIine/beta
Browse files Browse the repository at this point in the history 
Beta
  • Loading branch information
Th3OnlyC0D3R authored May 17, 2021
2 parents a5789c6 + 0614d80 commit 999b092
Show file tree
Hide file tree
Showing 13 changed files with 4,198 additions and 150 deletions.
8 changes: 4 additions & 4 deletions css/web/boxes.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ p {
white-space: nowrap;
}

.text-warning {
.text-warning, .text-bright {
color: var(--text-bright);
}

Expand Down Expand Up @@ -1126,8 +1126,8 @@ FP-Bar */
}

.tooltip.in {
opacity: 0.9;
filter: alpha(opacity=90);
opacity: 1;
filter: alpha(opacity=100);
}

.tooltip.top {
Expand Down Expand Up @@ -1505,4 +1505,4 @@ SettingsBox */
color: var(--text-normal);
text-shadow: 0 1px 1px var(--black-65);
user-select: none;
}
}
21 changes: 20 additions & 1 deletion js/web/_i18n/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@
"Boxes.FPCollector.Where": "Wo?",
"Boxes.FPCollector.Who": "Wer?",
"Boxes.FPCollector.antiquesDealer": "Antiquitätenhändler",
"Boxes.FPCollector.archeologyEvent": "Archäologie-Event-Vase",
"Boxes.FPCollector.archeologyEventAutoCollect": "Archäologie-Event-Vase",
"Boxes.FPCollector.battlegrounds_conquest": "Gefechts-Belohnung",
"Boxes.FPCollector.chest": "Begegnungsbelohnung",
"Boxes.FPCollector.chestEvent": "Event Belohnung",
Expand All @@ -171,6 +173,7 @@
"Boxes.FPCollector.double_collection": "x2 durch Blaue Galaxie",
"Boxes.FPCollector.guildExpedition": "Relikt",
"Boxes.FPCollector.hiddenReward": "Ereignis",
"Boxes.FPCollector.leagueReward": "Liga-Belohnung",
"Boxes.FPCollector.pickupProduction": "Gebäude Ernte",
"Boxes.FPCollector.plunderReward": "Plünder Belohnung",
"Boxes.FPCollector.reward_calender": "Winterevent - Kalender",
Expand Down Expand Up @@ -283,6 +286,18 @@
"Boxes.GuildMemberStat.TotalGuildGoods": "Summe aller Güter",
"Boxes.GuildMemberStat.TotalGuildPower": "Summe Gildenmacht",
"Boxes.GuildMemberStat.TreasuryGoods": "Güter der Gildenkasse",
"Boxes.GvGMap.Action.Drag": "Ziehen",
"Boxes.GvGMap.Action.Edit": "Bearbeiten",
"Boxes.GvGMap.Action.Zoom": "Zoom",
"Boxes.GvGMap.Guild.Name": "Gilde",
"Boxes.GvGMap.Guild.Power": "Macht",
"Boxes.GvGMap.Guild.Sectors": "Sektoren",
"Boxes.GvGMap.Sector.Beach": "Strand",
"Boxes.GvGMap.Sector.Coords": "Koordinaten",
"Boxes.GvGMap.Sector.Hitpoints": "Lebenspunkte",
"Boxes.GvGMap.Sector.Power": "Macht",
"Boxes.GvGMap.Sector.Protected": "Sektor ist geschützt",
"Boxes.GvGMap.Title": "GvG Karte",
"Boxes.HiddenRewards.Disappears": "Verschwindet",
"Boxes.HiddenRewards.HelpLink": "https://foe-rechner.de/docs/2/incidents",
"Boxes.HiddenRewards.NoEvents": "Keine Ereignisse vorhanden.",
Expand Down Expand Up @@ -590,13 +605,17 @@
"Boxes.Stats.PeriodTitle.today": "Heute gesammelt",
"Boxes.Stats.Rewards.Source.__event": "Event",
"Boxes.Stats.Rewards.Source.battlegrounds_conquest": "Gildengefechte",
"Boxes.Stats.Rewards.Source.diplomaticGifts": "Diplomatische Geschenke",
"Boxes.Stats.Rewards.Source.default": "Ereignisse",
"Boxes.Stats.Rewards.Source.diplomaticGifts": "Dipl. Geschenke",
"Boxes.Stats.Rewards.Source.guildExpedition": "GEX",
"Boxes.Stats.Rewards.Source.shards": "Scherben",
"Boxes.Stats.Rewards.Source.spoilsOfWar": "Kriegsbeute",
"Boxes.Stats.Rewards.SourceTitle.__event": "Eventbelohnungen",
"Boxes.Stats.Rewards.SourceTitle.battlegrounds_conquest": "Belohnungen von den Gildengefechten",
"Boxes.Stats.Rewards.SourceTitle.default": "Belohnungen aus Ereignissen",
"Boxes.Stats.Rewards.SourceTitle.diplomaticGifts": "Vom Weltfraumfrachter gesammelte diplomatische Geschenke",
"Boxes.Stats.Rewards.SourceTitle.guildExpedition": "Belohnungen von der Gildenexpedition, die vom Relikttempel erzeugt wurden",
"Boxes.Stats.Rewards.SourceTitle.shards": "Mysteriöse Scherben von der Fliegenden Insel",
"Boxes.Stats.Rewards.SourceTitle.spoilsOfWar": "Kriegsbeute durch die Burg Himeji",
"Boxes.Stats.SourceTitle.statsGBGPlayers": "Punktestände der Spieler der Gildengefechte",
"Boxes.Stats.SourceTitle.statsRewards": "Deine Belohnungen der Burg Himej, Relikttempel und Gildengefechten",
Expand Down
21 changes: 20 additions & 1 deletion js/web/_i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@
"Boxes.FPCollector.Where": "Where?",
"Boxes.FPCollector.Who": "Who?",
"Boxes.FPCollector.antiquesDealer": "Antiques Dealer",
"Boxes.FPCollector.archeologyEvent": "Archeology Event vase",
"Boxes.FPCollector.archeologyEventAutoCollect": "Archeology Event vase",
"Boxes.FPCollector.battlegrounds_conquest": "GBG (after negotiation or fight)",
"Boxes.FPCollector.chest": "GE reward",
"Boxes.FPCollector.chestEvent": "Event Reward",
Expand All @@ -170,7 +172,8 @@
"Boxes.FPCollector.diplomaticGifts": "Diplomatic Gift",
"Boxes.FPCollector.double_collection": "Blue Galaxy (x2)",
"Boxes.FPCollector.guildExpedition": "GE Relic",
"Boxes.FPCollector.hiddenReward": "Hidden Reward / Event Reward Chest",
"Boxes.FPCollector.hiddenReward": "Hidden Reward",
"Boxes.FPCollector.leagueReward": "League Reward",
"Boxes.FPCollector.pickupProduction": "Town Building Collection",
"Boxes.FPCollector.plunderReward": "Plunder Reward",
"Boxes.FPCollector.reward_calendar": "Event - Calendar",
Expand Down Expand Up @@ -276,6 +279,18 @@
"Boxes.GuildMemberStat.TotalGuildGoods": "Total of all goods",
"Boxes.GuildMemberStat.TotalGuildPower": "Total guild power",
"Boxes.GuildMemberStat.TreasuryGoods": "Treasury Goods",
"Boxes.GvGMap.Action.Drag": "Drag",
"Boxes.GvGMap.Action.Edit": "Edit",
"Boxes.GvGMap.Action.Zoom": "Zoom",
"Boxes.GvGMap.Guild.Name": "Guild",
"Boxes.GvGMap.Guild.Power": "Power",
"Boxes.GvGMap.Guild.Sectors": "Sectors",
"Boxes.GvGMap.Sector.Beach": "Beach",
"Boxes.GvGMap.Sector.Coords": "Coords",
"Boxes.GvGMap.Sector.Hitpoints": "Hitpoints",
"Boxes.GvGMap.Sector.Power": "Power",
"Boxes.GvGMap.Sector.Protected": "Sector is protected",
"Boxes.GvGMap.Title": "GvG Map",
"Boxes.HiddenRewards.Disappears": "Disappears",
"Boxes.HiddenRewards.HelpLink": "https://foe-rechner.de/docs/2/incidents",
"Boxes.HiddenRewards.NoEvents": "No Incidents displayed.",
Expand Down Expand Up @@ -582,14 +597,18 @@
"Boxes.Stats.PeriodTitle.thisMonth": "Collected this month",
"Boxes.Stats.PeriodTitle.today": "Collected Today",
"Boxes.Stats.Rewards.Source.__event": "Event",
"Boxes.Stats.Rewards.Source.default": "Incidents",
"Boxes.Stats.Rewards.Source.battlegrounds_conquest": "GBG",
"Boxes.Stats.Rewards.Source.diplomaticGifts": "Diplomatic Gifts",
"Boxes.Stats.Rewards.Source.guildExpedition": "GE",
"Boxes.Stats.Rewards.Source.shards": "Shards",
"Boxes.Stats.Rewards.Source.spoilsOfWar": "Spoils of War",
"Boxes.Stats.Rewards.SourceTitle.__event": "Rewards from Seasonal or Special Events",
"Boxes.Stats.Rewards.SourceTitle.battlegrounds_conquest": "GBG Rewards",
"Boxes.Stats.Rewards.SourceTitle.default": "Rewards from incidents",
"Boxes.Stats.Rewards.SourceTitle.diplomaticGifts": "Diplomatic Gifts (Space Carrier)",
"Boxes.Stats.Rewards.SourceTitle.guildExpedition": "GE Relic Rewards (Temple of Relic)",
"Boxes.Stats.Rewards.SourceTitle.shards": "Mysterious Shards (Flying Island)",
"Boxes.Stats.Rewards.SourceTitle.spoilsOfWar": "Spoils of War Rewards (Himeji Castle)",
"Boxes.Stats.SourceTitle.statsGBGPlayers": "GBG Players' Scoreboard",
"Boxes.Stats.SourceTitle.statsRewards": "Your Rewards from Himeji Castle, Temple of Relics, Guild Battleground",
Expand Down
4 changes: 0 additions & 4 deletions js/web/eventhandler/css/eventhandler.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
overflow-y: auto;
}

.text-bright {
color: var(--text-bright);
}

#moppelhelper .title {
font-size: 115%;
}
Expand Down
5 changes: 4 additions & 1 deletion js/web/fp-collector/js/fp-collector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ FoEproxy.addHandler('RewardService', 'collectReward', (data, postData) => {
return;
}

// default is hiddenreward
// default is hiddenreward or leaguereward
else if(event === 'default')
{
event = 'hiddenReward';
if(postData[0].requestMethod === 'useItem'){
event = 'leagueReward';
}
}

StrategyPoints.insertIntoDB({
Expand Down
134 changes: 133 additions & 1 deletion js/web/gvg/css/gvg.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,136 @@
#gvg-hud .defenders {
background: var(--black-50) url('../../x_img/gvg-defenders.png') no-repeat 6px center;
background-size: 20px 20px;
}
}

#GvGMap {
left: calc(50vw - 285px);
top: calc(50vw - 270px);
width: 570px;
width: 800px;
}

#GvGMapBody {
height: inherit;
display: flex;
align-items: stretch;
}

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

#gvgOptions {
height: inherit;
overflow: auto;
width: 350px;
}

#GvGMapInfo {
position: absolute;
bottom: 0;
left: 0;
}

#GvGMapActions {
position: absolute;
top: 10px;
right: 332px;
}

.sectorInfo {
position: absolute;
bottom: 10px;
left: 10px;
border-radius: 4px;
padding: 5px;
border: 1px solid var(--text-dark);
background-color: #210b02;
width: 200px;
font-size: 90%;
}

.sectorInfo .guildflag {
float: right;
border-width: 5px;
border-style: solid;
border-radius: 50px;
position: absolute;
bottom: 6px;
right: 2px;
height: 20px;
}

.sectorInfo b {
color: var(--text-bright);
}

.guildflag {
width: 20px;
height: 18px;
border-radius: 2px;
display: inline-block;
margin-right: 3px;
box-shadow: 0 1px 2px var(--black-50);
vertical-align: middle;
background-image: url(../img/flags_small.png);
background-repeat: no-repeat;
}

#GvGGuilds.foe-table tr.active {
background-color: var(--black-50);
}

.guildflag.flag_1 { background-position: -57px -9px; }
.guildflag.flag_2, .guildflag.flag_2_G { background-position: -102px -9px; }
.guildflag.flag_3, .guildflag.flag_3_G { background-position: -148px -9px; }
.guildflag.flag_4 { background-position: -193px -9px; }
.guildflag.flag_5, .guildflag.flag_5_R { background-position: -237px -9px; }
.guildflag.flag_6 { background-position: -282px -9px; }
.guildflag.flag_7 { background-position: -327px -9px; }
.guildflag.flag_8 { background-position: -372px -9px; }
.guildflag.flag_9, .guildflag.flag_9_G { background-position: -418px -9px; }

.guildflag.flag_10 { background-position: -11px -45px; }
.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_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_19 { background-position: -418px -45px; }

.guildflag.flag_20, .guildflag.flag_20_R { background-position: -13px -81px; }
.guildflag.flag_21, .guildflag.flag_21_R { background-position: -58px -81px; }
.guildflag.flag_22, .guildflag.flag_22_G { background-position: -102px -80px; }
.guildflag.flag_23 { background-position: -148px -80px; }
.guildflag.flag_24, .guildflag.flag_24_R { background-position: -193px -81px; }
.guildflag.flag_25, .guildflag.flag_25_G { background-position: -237px -80px; }
.guildflag.flag_26 { background-position: -282px -81px; }
.guildflag.flag_27, .guildflag.flag_27_R { background-position: -327px -80px; }
.guildflag.flag_28, .guildflag.flag_28_R { background-position: -373px -80px; }
.guildflag.flag_29 { background-position: -418px -80px; }

.guildflag.flag_30, .guildflag.flag_30_R { background-position: -12px -117px; }
.guildflag.flag_31, .guildflag.flag_31_R { background-position: -57px -116px; }
.guildflag.flag_32, .guildflag.flag_32_G { background-position: -103px -117px; }

.guildflag.premium_flag_1 { background-position: -57px -153px; }
.guildflag.premium_flag_2 { background-position: -102px -153px; }
.guildflag.premium_flag_3 { background-position: -148px -153px; }
.guildflag.premium_flag_4 { background-position: -193px -153px; }
.guildflag.premium_flag_5 { background-position: -237px -153px; }
.guildflag.premium_flag_6 { background-position: -282px -153px; }
.guildflag.premium_flag_7 { background-position: -327px -153px; }
.guildflag.premium_flag_8 { background-position: -372px -153px; }
.guildflag.premium_flag_9 { background-position: -418px -153px; }
.guildflag.premium_flag_10 { background-position: -12px -189px; }
.guildflag.premium_flag_11 { background-position: -57px -189px; }
.guildflag.premium_flag_12 { background-position: -103px -189px; }
Binary file added js/web/gvg/img/flags_medium.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added js/web/gvg/img/flags_small.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 999b092

Please sign in to comment.