From 20008cd5a5a0ad851e9c0734fbb888362e4f10f9 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Thu, 29 Feb 2024 13:51:00 +0200 Subject: [PATCH] Replaced premade buttons on hero screen with generated ones --- .../heroWindow/artifactSlotEmpty.png | Bin .../heroWindow}/backpackButtonIcon.png | Bin .../Data/heroWindow/commanderButtonIcon.png | Bin 0 -> 489 bytes Mods/vcmi/Sprites/buttons/backpack.json | 8 -- Mods/vcmi/Sprites/buttons/backpackNormal.png | Bin 3308 -> 0 bytes Mods/vcmi/Sprites/buttons/backpackPressed.png | Bin 3122 -> 0 bytes Mods/vcmi/Sprites/buttons/commander.json | 8 -- Mods/vcmi/Sprites/buttons/commanderNormal.png | Bin 3232 -> 0 bytes .../vcmi/Sprites/buttons/commanderPressed.png | Bin 2858 -> 0 bytes client/windows/CHeroWindow.cpp | 7 +- client/windows/GUIClasses.cpp | 8 +- config/widgets/buttons/heroBackpack.json | 114 ++++++++++++++++++ config/widgets/buttons/heroCommander.json | 114 ++++++++++++++++++ .../buttons/settingsWindow/button190.json | 12 +- .../buttons/settingsWindow/button32.json | 12 +- .../buttons/settingsWindow/button46.json | 12 +- .../buttons/settingsWindow/button80.json | 12 +- 17 files changed, 260 insertions(+), 47 deletions(-) rename Mods/vcmi/{Sprites => Data}/heroWindow/artifactSlotEmpty.png (100%) rename Mods/vcmi/{Sprites/buttons => Data/heroWindow}/backpackButtonIcon.png (100%) create mode 100644 Mods/vcmi/Data/heroWindow/commanderButtonIcon.png delete mode 100644 Mods/vcmi/Sprites/buttons/backpack.json delete mode 100644 Mods/vcmi/Sprites/buttons/backpackNormal.png delete mode 100644 Mods/vcmi/Sprites/buttons/backpackPressed.png delete mode 100644 Mods/vcmi/Sprites/buttons/commander.json delete mode 100644 Mods/vcmi/Sprites/buttons/commanderNormal.png delete mode 100644 Mods/vcmi/Sprites/buttons/commanderPressed.png create mode 100644 config/widgets/buttons/heroBackpack.json create mode 100644 config/widgets/buttons/heroCommander.json diff --git a/Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png b/Mods/vcmi/Data/heroWindow/artifactSlotEmpty.png similarity index 100% rename from Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png rename to Mods/vcmi/Data/heroWindow/artifactSlotEmpty.png diff --git a/Mods/vcmi/Sprites/buttons/backpackButtonIcon.png b/Mods/vcmi/Data/heroWindow/backpackButtonIcon.png similarity index 100% rename from Mods/vcmi/Sprites/buttons/backpackButtonIcon.png rename to Mods/vcmi/Data/heroWindow/backpackButtonIcon.png diff --git a/Mods/vcmi/Data/heroWindow/commanderButtonIcon.png b/Mods/vcmi/Data/heroWindow/commanderButtonIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..aa32487fd0e7a0e21f596116886f7632fe1ec4be GIT binary patch literal 489 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 h+h%m&*v9rQr0HyayCF&J7Wm@(Point(314, 429), AnimationPath::builtin("hsbtns4.def"), CButton::tooltip(heroscrn[0]), [=](){ LOCPLINT->showQuestLog(); }, EShortcut::ADVENTURE_QUEST_LOG); - backpackButton = std::make_shared(Point(424, 429), AnimationPath::builtin("buttons/backpack"), CButton::tooltipLocalized("vcmi.heroWindow.openBackpack"), [=](){ createBackpackWindow(); }, EShortcut::HERO_BACKPACK); - backpackButton->setOverlay(std::make_shared(ImagePath::builtin("buttons/backpackButtonIcon"))); + backpackButton = std::make_shared(Point(424, 429), AnimationPath::builtin("heroBackpack"), CButton::tooltipLocalized("vcmi.heroWindow.openBackpack"), [=](){ createBackpackWindow(); }, EShortcut::HERO_BACKPACK); + backpackButton->setOverlay(std::make_shared(ImagePath::builtin("heroWindow/backpackButtonIcon"))); dismissButton = std::make_shared(Point(534, 429), AnimationPath::builtin("hsbtns2.def"), CButton::tooltip(heroscrn[28]), [=](){ dismissCurrent(); }, EShortcut::HERO_DISMISS); } else @@ -106,7 +106,8 @@ CHeroWindow::CHeroWindow(const CGHeroInstance * hero) if(hero->commander) { - commanderButton = std::make_shared(Point(317, 18), AnimationPath::builtin("buttons/commander"), CButton::tooltipLocalized("vcmi.heroWindow.openCommander"), [&](){ commanderWindow(); }, EShortcut::HERO_COMMANDER); + commanderButton = std::make_shared(Point(317, 18), AnimationPath::builtin("heroCommander"), CButton::tooltipLocalized("vcmi.heroWindow.openCommander"), [&](){ commanderWindow(); }, EShortcut::HERO_COMMANDER); + commanderButton->setOverlay(std::make_shared(ImagePath::builtin("heroWindow/commanderButtonIcon"))); } //right list of heroes diff --git a/client/windows/GUIClasses.cpp b/client/windows/GUIClasses.cpp index a9de69bf9..a870f019d 100644 --- a/client/windows/GUIClasses.cpp +++ b/client/windows/GUIClasses.cpp @@ -878,12 +878,12 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2, std::bind(moveArtifacts, [this](bool equipped, bool baclpack) -> void {controller.swapArtifacts(equipped, baclpack);})); moveArtifactsButtonRight = std::make_shared(Point(425, 154), AnimationPath::builtin(QUICK_EXCHANGE_MOD_PREFIX + "/artLeft.DEF"), CButton::tooltip(CGI->generaltexth->qeModCommands[3]), std::bind(moveArtifacts, [this](bool equipped, bool baclpack) -> void {controller.moveArtifacts(false, equipped, baclpack);})); - backpackButtonLeft = std::make_shared(Point(325, 518), AnimationPath::builtin("buttons/backpack"), CButton::tooltipLocalized("vcmi.heroWindow.openBackpack"), + backpackButtonLeft = std::make_shared(Point(325, 518), AnimationPath::builtin("heroBackpack"), CButton::tooltipLocalized("vcmi.heroWindow.openBackpack"), std::bind(openBackpack, heroInst[0])); - backpackButtonLeft->setOverlay(std::make_shared(ImagePath::builtin("buttons/backpackButtonIcon"))); - backpackButtonRight = std::make_shared(Point(419, 518), AnimationPath::builtin("buttons/backpack"), CButton::tooltipLocalized("vcmi.heroWindow.openBackpack"), + backpackButtonLeft->setOverlay(std::make_shared(ImagePath::builtin("heroWindow/backpackButtonIcon"))); + backpackButtonRight = std::make_shared(Point(419, 518), AnimationPath::builtin("heroBackpack"), CButton::tooltipLocalized("vcmi.heroWindow.openBackpack"), std::bind(openBackpack, heroInst[1])); - backpackButtonRight->setOverlay(std::make_shared(ImagePath::builtin("buttons/backpackButtonIcon"))); + backpackButtonRight->setOverlay(std::make_shared(ImagePath::builtin("heroWindow/backpackButtonIcon"))); auto leftHeroBlock = heroInst[0]->tempOwner != LOCPLINT->cb->getPlayerID(); auto rightHeroBlock = heroInst[1]->tempOwner != LOCPLINT->cb->getPlayerID(); diff --git a/config/widgets/buttons/heroBackpack.json b/config/widgets/buttons/heroBackpack.json new file mode 100644 index 000000000..7cdbb9fa0 --- /dev/null +++ b/config/widgets/buttons/heroBackpack.json @@ -0,0 +1,114 @@ +{ + "normal" : { + "width": 52, + "height": 36, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + { "type" : "line", "a" : { "x" : -2, "y" : 1}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : -1}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + { "type" : "line", "a" : { "x" : -1, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + ] + } + ] + }, + "pressed" : { + "width": 52, + "height": 36, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 1, "y": 1, "w": 51, "h": 35} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 3, "y" : 3}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 96 ] }, + + { "type" : "rectangle", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 48 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 96 ] }, + + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 64 ] }, + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : 2}, "color" : [ 255, 255, 255, 128 ] }, + ] + } + ] + }, + "blocked" : { + "width": 52, + "height": 36, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + { "type" : "line", "a" : { "x" : -2, "y" : 1}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : -1}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + { "type" : "line", "a" : { "x" : -1, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + ] + } + ] + }, + "highlighted" : { + "width": 52, + "height": 36, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 52, "h": 36} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, + + { "type" : "rectangle", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 255, 255, 255, 255 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 255 ] }, + { "type" : "line", "a" : { "x" : -2, "y" : 1}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 255 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, + ] + } + ] + }, +} diff --git a/config/widgets/buttons/heroCommander.json b/config/widgets/buttons/heroCommander.json new file mode 100644 index 000000000..110edde34 --- /dev/null +++ b/config/widgets/buttons/heroCommander.json @@ -0,0 +1,114 @@ +{ + "normal" : { + "width": 92, + "height": 38, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + { "type" : "line", "a" : { "x" : -2, "y" : 1}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : -1}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + { "type" : "line", "a" : { "x" : -1, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + ] + } + ] + }, + "pressed" : { + "width": 92, + "height": 38, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 1, "y": 1, "w": 91, "h": 37} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 3, "y" : 3}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 96 ] }, + + { "type" : "rectangle", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 48 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 96 ] }, + + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 64 ] }, + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : 2}, "color" : [ 255, 255, 255, 128 ] }, + ] + } + ] + }, + "blocked" : { + "width": 92, + "height": 38, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + { "type" : "line", "a" : { "x" : -2, "y" : 1}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, + + { "type" : "line", "a" : { "x" : 0, "y" : -1}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + { "type" : "line", "a" : { "x" : -1, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, + ] + } + ] + }, + "highlighted" : { + "width": 92, + "height": 38, + "items" : [ + { + "type": "texture", + "image": "DiBoxBck", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + }, + { + "type": "graphicalPrimitive", + "rect": {"x": 0, "y": 0, "w": 92, "h": 38} + "primitives" : [ + { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, + + { "type" : "rectangle", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 255, 255, 255, 255 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 255 ] }, + { "type" : "line", "a" : { "x" : -2, "y" : 1}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 255 ] }, + + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, + ] + } + ] + }, +} diff --git a/config/widgets/buttons/settingsWindow/button190.json b/config/widgets/buttons/settingsWindow/button190.json index de1e0f1ed..d2f88ed99 100644 --- a/config/widgets/buttons/settingsWindow/button190.json +++ b/config/widgets/buttons/settingsWindow/button190.json @@ -14,10 +14,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, @@ -46,10 +46,10 @@ { "type" : "rectangle", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 96 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 48 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 96 ] }, - { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : 2}, "color" : [ 255, 255, 255, 128 ] }, ] } @@ -70,10 +70,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, diff --git a/config/widgets/buttons/settingsWindow/button32.json b/config/widgets/buttons/settingsWindow/button32.json index 6d748e7d9..41b8d29b1 100644 --- a/config/widgets/buttons/settingsWindow/button32.json +++ b/config/widgets/buttons/settingsWindow/button32.json @@ -14,10 +14,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, @@ -46,10 +46,10 @@ { "type" : "rectangle", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 96 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 48 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 96 ] }, - { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : 2}, "color" : [ 255, 255, 255, 128 ] }, ] } @@ -70,10 +70,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, diff --git a/config/widgets/buttons/settingsWindow/button46.json b/config/widgets/buttons/settingsWindow/button46.json index 9d9b986d7..046c299ea 100644 --- a/config/widgets/buttons/settingsWindow/button46.json +++ b/config/widgets/buttons/settingsWindow/button46.json @@ -14,10 +14,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, @@ -46,10 +46,10 @@ { "type" : "rectangle", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 96 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 48 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 96 ] }, - { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : 2}, "color" : [ 255, 255, 255, 128 ] }, ] } @@ -70,10 +70,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, diff --git a/config/widgets/buttons/settingsWindow/button80.json b/config/widgets/buttons/settingsWindow/button80.json index c3bb58f03..1afd039a0 100644 --- a/config/widgets/buttons/settingsWindow/button80.json +++ b/config/widgets/buttons/settingsWindow/button80.json @@ -14,10 +14,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] }, @@ -46,10 +46,10 @@ { "type" : "rectangle", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : -1}, "color" : [ 0, 0, 0, 255 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 96 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 48 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 96 ] }, - { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : 2, "y" : -3}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : 2}, "color" : [ 255, 255, 255, 128 ] }, ] } @@ -70,10 +70,10 @@ "primitives" : [ { "type" : "filledBox", "a" : { "x" : 2, "y" : 2}, "b" : { "x" : -3, "y" : -3}, "color" : [ 0, 0, 0, 80 ] }, - { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 128 ] }, + { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 128 ] }, - { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 160 ] }, + { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : 1, "y" : -2}, "color" : [ 255, 255, 255, 80 ] }, { "type" : "line", "a" : { "x" : 1, "y" : 1}, "b" : { "x" : -2, "y" : 1}, "color" : [ 255, 255, 255, 160 ] }, { "type" : "line", "a" : { "x" : 1, "y" : -2}, "b" : { "x" : -2, "y" : -2}, "color" : [ 0, 0, 0, 192 ] },