Skip to content

Commit

Permalink
feat: Organize filters in tabs, add favorites, add admin buttons and …
Browse files Browse the repository at this point in the history
…many more featchers. Add statistics Module.
  • Loading branch information
Ajick2013 committed Jun 2, 2023
1 parent 5b0f2b3 commit 99ea78d
Show file tree
Hide file tree
Showing 28 changed files with 2,094 additions and 572 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
/.gitignore
/.idea
/players-inventory-window.txt
/*.todo
3 changes: 2 additions & 1 deletion control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Interface = require('scripts/interface')
Logs = require('scripts/logs')
PlayerColor = require('scripts/player_color')
AdminMessage = require('scripts/admin_message')
Chests = require('scripts/chests')
Chests = require('scripts/chests')
Statistics = require('scripts/statistics')
Binary file added graphics/icons/PlayersInventory/ban-black.png
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 graphics/icons/PlayersInventory/ban-white.png
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 graphics/icons/PlayersInventory/demote-black.png
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 graphics/icons/PlayersInventory/demote-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 graphics/icons/PlayersInventory/kick-black.png
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 graphics/icons/PlayersInventory/kick-white.png
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 graphics/icons/PlayersInventory/mute-black.png
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 graphics/icons/PlayersInventory/mute-white.png
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 graphics/icons/PlayersInventory/promote-black.png
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 graphics/icons/PlayersInventory/promote-white.png
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 graphics/icons/PlayersInventory/unban-black.png
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 graphics/icons/PlayersInventory/unban-white.png
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 graphics/icons/PlayersInventory/unfavorite-black.png
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 graphics/icons/PlayersInventory/unfavorite-white.png
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 graphics/icons/PlayersInventory/unmute-black.png
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 graphics/icons/PlayersInventory/unmute-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Fed1sServerMod",
"version": "1.0.29",
"version": "1.0.30",
"title": "Fed1sServerMod",
"author": "danbka33",
"contact": "",
Expand Down
73 changes: 50 additions & 23 deletions locale/en/strings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,62 @@ yellowchest_start_button=Start
yellowchest_stop_button=Stop

[players-inventory]
caption=Players inventory
caption-empty=So empty...
caption-follow=Follow
caption-take=Take all
caption-kick=Kick
caption-ban=Ban
caption-online=Online
caption-offline=Offline
caption-all=All roles
caption-builders=Builders
caption-warriors=Wariors
caption-defenders=Defenders
caption-action=__1__ player __2__?
caption-all=All roles
caption-armor=Armor of player __1__
caption-reason=Reason:
caption-banned=Bunned
caption-builders=Builders
caption-cancel=Cancel
caption-count=Total: [color=#f0ff00]__1__[/color]
label-online=[online]
label-offline=[offline]
label-defender=[color=#0078ff][defender][/color]
label-warrior=[color=#ff8f00][warrior][/color]
label-builder=[color=#138d75][builder-laborer][/color]
label-manager=[color=#00ff18][manager][/color]
label-main-inventory=Main inventory
caption-defenders=Defenders
caption-empty=So empty...
caption-favorites=Favorites
caption-muted=Muted
caption-offline=Offline
caption-online=Online
caption-reason=Reason:
caption-search=Search
caption-button-take-selected=Take all
caption-warnings=Warnings
caption-warriors=Wariors
caption=Players inventory
description-open=Open players inventory
label-admin-badge=[color=#ffff00][admin][/color]
label-ammunition-inventory=Ammunition slots
label-banned-badge=[banned]
label-builder-badge=[color=#138d75][builder-laborer][/color]
label-defender-badge=[color=#0078ff][defender][/color]
label-give=Give an items
label-main-inventory=Main inventory
label-manager-badge=[color=#00ff18][manager][/color]
label-muted-badge=[muted]
label-offline-badge=[offline]
label-online-badge=[online]
label-trash-inventory=Trash slots
description-open=Open players inventory
message-inventory-full=Can't take all items, inventory is full.
tooltip-inventory-button=[color=#7674ff]shift+click[/color] - take one stack\n[color=#7674ff]ctrl+click[/color] - take all\n[color=#7674ff]right click[/color] - select
label-undecided-badge=[undecided]
label-warnings-badge=[warnings: __1__]
label-warnings-info=Already has __1__ warnings.
label-warrior-badge=[color=#ff8f00][warrior][/color]
message-demoted=Player __1__ in no longer a Manager
message-inventory-full=There is no space in the inventory for given items type.
message-no-items=__1__ already don't have items: __2__ __3__
message-promoted=__1__ is now the Manager
tooltip-ban=Ban
tooltip-button-ammo=[color=#7674ff]ctrl+click[/color] - take ammo
tooltip-button-armor-only-show=[color=#7674ff]left click[/color] - show armor
tooltip-button-armor=__1__\n[color=#7674ff]ctrl+click[/color] - take armor
tooltip-button-items=[color=#7674ff]shift+click[/color] - take one stack\n[color=#7674ff]ctrl+click[/color] - take all\n[color=#7674ff]right click[/color] - select
tooltip-button-weapon=[color=#7674ff]ctrl+click[/color] - take weapon
tooltip-demote=Make a regular player
tooltip-favorite=Add to Favorites
tooltip-follow=Follow
tooltip-kick=Kick
tooltip-mute=Mute
tooltip-promote=Make a manager
tooltip-unban=Unban
tooltip-unfavorite=Remove from Favorites
tooltip-unmute=Unmute
tooltip-warn=Warn the player
[entity-name]
yellow-chest=Party Request Resource Chest
Expand Down
73 changes: 50 additions & 23 deletions locale/ru/strings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,62 @@ yellowchest_start_button=Запустить
yellowchest_stop_button=Остановить

[players-inventory]
caption=Закрома игроков
caption-empty=Так пусто...
caption-follow=Следить
caption-take=Раскулачить
caption-kick=Выгнать
caption-ban=Забанить
caption-online=Онлайн
caption-offline=Офлайн
caption-all=Все роли
caption-builders=Строители
caption-warriors=Атакующие
caption-defenders=Защитники
caption-action=__1__ игрока __2__?
caption-all=Все роли
caption-armor=Броня игрока __1__
caption-reason=Причина:
caption-banned=Забаненные
caption-builders=Строители
caption-cancel=Отмена
caption-count=Всего: [color=#f0ff00]__1__[/color]
label-online=[онлайн]
label-offline=[офлайн]
label-defender=[color=#0078ff][защитник][/color]
label-warrior=[color=#ff8f00][атакующий][/color]
label-builder=[color=#138d75][строитель-разнорабочий][/color]
label-manager=[color=#00ff18][руководитель][/color]
label-main-inventory=Главный инвентарь
caption-defenders=Защитники
caption-empty=Так пусто...
caption-favorites=Избранные
caption-muted=Заглушенные
caption-offline=Офлайн
caption-online=Онлайн
caption-reason=Причина:
caption-search=Поиск
caption-button-take-selected=Раскулачить
caption-warnings=Предупреждённые
caption-warriors=Атакующие
caption=Закрома игроков
description-open=Открыть закрома игроков
label-admin-badge=[color=#ffff00][админ][/color]
label-ammunition-inventory=Амуниция
label-banned-badge=[забанен]
label-builder-badge=[color=#138d75][строитель-разнорабочий][/color]
label-defender-badge=[color=#0078ff][защитник][/color]
label-give=Передать предметы
label-main-inventory=Главный инвентарь
label-manager-badge=[color=#00ff18][руководитель][/color]
label-muted-badge=[заглушен]
label-offline-badge=[офлайн]
label-online-badge=[онлайн]
label-trash-inventory=Мусорные слоты
description-open=Открыть закрома игроков
message-inventory-full=Не удалось забрать все предметы, закончилось место в инвентаре.
tooltip-inventory-button=[color=#7674ff]shift+click[/color] - забрать один стак\n[color=#7674ff]ctrl+click[/color] - забрать всё\n[color=#7674ff]right click[/color] - выбрать
label-undecided-badge=[неопределившийся]
label-warnings-badge=[предупреждений: __1__]
label-warnings-info=Уже предупреждений вынесено: __1__
label-warrior-badge=[color=#ff8f00][атакующий][/color]
message-demoted=Игрок __1__ больше не Руководитель
message-inventory-full=В инвентаре больше нет места для перемещаемых предметов.
message-no-items=__1__ уже успел куда-то сныкать все предметы __2__ __3__
message-promoted=__1__ теперь Руководитель
tooltip-ban=Забанить
tooltip-button-ammo=[color=#7674ff]ctrl+click[/color] - забрать боеприпасы
tooltip-button-armor-only-show=[color=#7674ff]left click[/color] - показать броню
tooltip-button-armor=__1__\n[color=#7674ff]ctrl+click[/color] - забрать броню
tooltip-button-items=[color=#7674ff]shift+click[/color] - забрать один стак\n[color=#7674ff]ctrl+click[/color] - забрать всё\n[color=#7674ff]right click[/color] - выбрать
tooltip-button-weapon=[color=#7674ff]ctrl+click[/color] - забрать оружие
tooltip-demote=Сделать обычным игроком
tooltip-favorite=Добавить в Избранные
tooltip-follow=Следить
tooltip-kick=Выгнать
tooltip-mute=Запретить писать сообщения (заглушить)
tooltip-promote=Сделать руководителем
tooltip-unban=Разбанить
tooltip-unfavorite=Удалить из Избранных
tooltip-unmute=Разрешить писать сообщения
tooltip-warn=Вынести предупреждение

[entity-name]
yellow-chest=Сундук запроса ресурсов на нужды партии
Expand Down
183 changes: 183 additions & 0 deletions prototypes/sprite.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
-- PlayersInventory sprites --

data:extend{
{
type = "sprite",
name = "players_inventory_favorite_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/favorite-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_favorite_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/favorite-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},

{
type = "sprite",
name = "players_inventory_unfavorite_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/unfavorite-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_unfavorite_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/unfavorite-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},



{
type = "sprite",
name = "players_inventory_promote_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/promote-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_promote_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/promote-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},

{
type = "sprite",
name = "players_inventory_demote_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/demote-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_demote_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/demote-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},



{
type = "sprite",
name = "players_inventory_mute_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/mute-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_mute_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/mute-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},

{
type = "sprite",
name = "players_inventory_unmute_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/unmute-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_unmute_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/unmute-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},



{
type = "sprite",
name = "players_inventory_ban_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/ban-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_ban_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/ban-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},

{
type = "sprite",
name = "players_inventory_unban_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/unban-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_unban_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/unban-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},



{
type = "sprite",
name = "players_inventory_kick_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/kick-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_kick_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/kick-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},



{
type = "sprite",
name = "players_inventory_warning_white",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/warning-white.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
},
{
type = "sprite",
name = "players_inventory_warning_black",
filename = "__Fed1sServerMod__/graphics/icons/PlayersInventory/warning-black.png",
priority = "extra-high-no-scale",
size = 64,
flags = {"icon"}
}
}
Loading

0 comments on commit 99ea78d

Please sign in to comment.