Design
/
melawy-plymouth-theme-fenek
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

This commit is contained in:
Valeria Fadeeva 2023-05-08 17:37:11 +05:00
parent b9ba8e0418
commit 36e7dd9905
11 changed files with 102 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
dev/script.js
View File

@ -153,7 +153,7 @@ side_background.x = x0;
side_background.y = y0; side_background.y = y0;
side_background.sprite = Sprite(side_background.image); side_background.sprite = Sprite(side_background.image);
side_background.sprite.SetPosition(side_background.x, side_background.y, 8); side_background.sprite.SetPosition(side_background.x, side_background.y, 1);
side_background.sprite.SetOpacity(1); side_background.sprite.SetOpacity(1);
// Sise Logo // Sise Logo
@ -168,7 +168,7 @@ side_logo.x = (side_background.width - side_logo.width) / 2;
side_logo.y = screen.height - screen.height * 0.25; side_logo.y = screen.height - screen.height * 0.25;
side_logo.sprite = Sprite(side_logo.image); side_logo.sprite = Sprite(side_logo.image);
side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 9); side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 2);
side_logo.sprite.SetOpacity(1); side_logo.sprite.SetOpacity(1);
// **************************************** // // **************************************** //
@ -182,7 +182,7 @@ project_link.sprite = Sprite(project_link.image);
project_link.x = (side_background.width - project_link.width) / 2; project_link.x = (side_background.width - project_link.width) / 2;
project_link.y = side_logo.y + side_logo.height; project_link.y = side_logo.y + side_logo.height;
project_link.sprite.SetPosition(project_link.x, project_link.y, 9); project_link.sprite.SetPosition(project_link.x, project_link.y, 2);
project_link.sprite.SetOpacity(1); project_link.sprite.SetOpacity(1);
// **************************************** // // **************************************** //
@ -197,19 +197,19 @@ logo.y = Percent(10, screen.height); // позиция логотипа
logo.sprite.SetPosition(logo.x, logo.y, 2); logo.sprite.SetPosition(logo.x, logo.y, 2);
logo.sprite.SetOpacity(1); logo.sprite.SetOpacity(1);
// PROGRESS BACKGROUND // PROGRESS FORM
progress_background.image = Image("PROGRESS_BACKGROUND.png"); progress_form.image = Image("PROGRESS_FORM.png");
progress_background.image = progress_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); progress_form.image = progress_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height));
progress_background.width = progress_background.image.GetWidth(); progress_form.width = progress_form.image.GetWidth();
progress_background.height = progress_background.image.GetHeight(); progress_form.height = progress_form.image.GetHeight();
progress_background.x = Percent(50, screen.width) - progress_background.width / 2; progress_form.x = Percent(50, side_background.width) - progress_form.width / 2;
progress_background.y = Percent(99, screen.height) - progress_background.height; progress_form.y = Percent(75, side_background.height) - progress_form.height;
progress_background.sprite = Sprite(progress_background.image); progress_form.sprite = Sprite(progress_form.image);
progress_background.sprite.SetPosition(progress_background.x, progress_background.y, 2); progress_form.sprite.SetPosition(progress_form.x, progress_form.y, 2);
progress_background.sprite.SetOpacity(0.45); progress_form.sprite.SetOpacity(0.45);
// SPINNER // SPINNER
spinner.image = Image("SPINNER.png"); spinner.image = Image("SPINNER.png");
@ -218,11 +218,11 @@ spinner.image = spinner.image.Scale(Percent(1, screen.width), Percent(1, screen.
spinner.width = spinner.image.GetWidth(); spinner.width = spinner.image.GetWidth();
spinner.height = spinner.image.GetHeight(); spinner.height = spinner.image.GetHeight();
spinner.x = progress_background.x + progress_background.width - spinner.width; spinner.x = progress_form.x + progress_form.width - spinner.width;
spinner.y = progress_background.y + spinner.height / 10; spinner.y = progress_form.y + spinner.height / 10;
spinner.sprite = Sprite(spinner.image); spinner.sprite = Sprite(spinner.image);
spinner.sprite.SetPosition(spinner.x, spinner.y, 11); // позиция за или перед spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед
// PROGRESS TEXT // PROGRESS TEXT
@ -231,41 +231,41 @@ progress_text.image = Image.Text(progress_t + "%", 255, 255, 255, 1, progressfon
progress_text.width = progress_text.image.GetWidth(); progress_text.width = progress_text.image.GetWidth();
progress_text.height = progress_text.image.GetHeight(); progress_text.height = progress_text.image.GetHeight();
progress_text.x = progress_background.x + progress_background.width - (4 * Percent(70, progress_text.height)); // позиция % по X progress_text.x = progress_form.x + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X
progress_text.y = progress_background.y + progress_text.height; // позиция % по Y progress_text.y = progress_form.y + progress_text.height; // позиция % по Y
progress_text.sprite = SpriteNew(); progress_text.sprite = SpriteNew();
progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 6); progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3);
// PROGRESS BOX // PROGRESS BOX
progress_box.image = Image("PROGRESS_BOX.png"); progress_box.image = Image("PROGRESS_BOX.png");
progress_box.image = progress_box.image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); progress_box.image = progress_box.image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height));
progress_box.width = progress_box.image.GetWidth(); progress_box.width = progress_box.image.GetWidth();
progress_box.height = progress_box.image.GetHeight(); progress_box.height = progress_box.image.GetHeight();
progress_box.x = Percent(50, screen.width) - progress_box.width / 2; progress_box.x = progress_form.x + (progress_form.width - progress_box.width) / 2;
progress_box.y = Percent(95, screen.height) - progress_box.height / 2; progress_box.y = progress_form.y + (progress_form.height - progress_box.height) / 2;
progress_box.sprite = Sprite(progress_box.image); progress_box.sprite = Sprite(progress_box.image);
progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 5); progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 3);
// PROGRESS BAR // PROGRESS BAR
progress_bar.original_image = Image("PROGRESS_BAR.png"); progress_bar.original_image = Image("PROGRESS_BAR.png");
progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height));
progress_bar.width = progress_bar.original_image.GetWidth(); progress_bar.width = progress_bar.original_image.GetWidth();
progress_bar.height = progress_bar.original_image.GetHeight(); progress_bar.height = progress_bar.original_image.GetHeight();
progress_bar.x = Percent(50, screen.width) - progress_bar.original_image.GetWidth() / 2; progress_bar.x = progress_form.x + (progress_form.width - progress_bar.original_image.GetWidth()) / 2;
progress_bar.y = Percent(95, screen.height) - progress_bar.original_image.GetHeight() / 2; progress_bar.y = progress_form.y + (progress_form.height - progress_bar.original_image.GetHeight()) / 2;
progress_bar.sprite = Sprite(); progress_bar.sprite = Sprite();
progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 6); progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 4);
// PROGRESS FADE // PROGRESS FADE
progress_fade.image = Image("PROGRESS_FADE.png"); progress_fade.image = Image("PROGRESS_FADE.png");
progress_fade.image = progress_fade.image.Scale(Percent(10, progress_background.width), Percent(15, progress_background.height)); progress_fade.image = progress_fade.image.Scale(Percent(10, progress_form.width), Percent(15, progress_form.height));
progress_fade.width = progress_fade.image.GetWidth(); progress_fade.width = progress_fade.image.GetWidth();
progress_fade.height = progress_fade.image.GetHeight(); progress_fade.height = progress_fade.image.GetHeight();
@ -295,35 +295,35 @@ status = "normal";
//count = 0; //count = 0;
function dialog_setup() { function dialog_setup() {
local.box_background; local.box_form;
local.lock; local.lock;
local.entry; local.entry;
local.prompt_sprite; local.prompt_sprite;
box_background.image = Image("BOX.png"); box_form.image = Image("BOX.png");
box_background.image = box_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); box_form.image = box_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height));
box_background.width = box_background.image.GetWidth(); box_form.width = box_form.image.GetWidth();
box_background.height = box_background.image.GetHeight(); box_form.height = box_form.image.GetHeight();
box_background.x = Percent(50, screen.width) - box_background.width / 2; box_form.x = progress_form.x;
box_background.y = progress_background.y - box_background.height - Percent(1, screen.height); box_form.y = progress_form.y - box_form.height - Percent(1, screen.height);
box_background.z = 10000; box_form.z = 10000;
box_background.sprite = Sprite(box_background.image); box_form.sprite = Sprite(box_form.image);
box_background.sprite.SetPosition(box_background.x, box_background.y, box_background.z); box_form.sprite.SetPosition(box_form.x, box_form.y, box_form.z);
box_background.sprite.SetOpacity(0.45); box_form.sprite.SetOpacity(0.45);
entry.image = Image("ENTRY.png"); entry.image = Image("ENTRY.png");
entry.image = entry.image.Scale(Percent(90, box_background.width), Percent(33, box_background.height)); entry.image = entry.image.Scale(Percent(90, box_form.width), Percent(33, box_form.height));
entry.width = entry.image.GetWidth(); entry.width = entry.image.GetWidth();
entry.height = entry.image.GetHeight(); entry.height = entry.image.GetHeight();
entry.x = box_background.x + box_background.width/2 - entry.width/2; entry.x = box_form.x + box_form.width/2 - entry.width/2;
entry.y = box_background.y + box_background.height/2 - entry.height/2; entry.y = box_form.y + box_form.height/2 - entry.height/2;
entry.z = box_background.z + 1; entry.z = box_form.z + 1;
entry.sprite = Sprite(entry.image); entry.sprite = Sprite(entry.image);
entry.sprite.SetPosition(entry.x, entry.y, entry.z); entry.sprite.SetPosition(entry.x, entry.y, entry.z);
@ -336,17 +336,17 @@ function dialog_setup() {
lock.x = entry.x + entry.width - lock.width - (entry.height - lock.height); lock.x = entry.x + entry.width - lock.width - (entry.height - lock.height);
lock.y = entry.y + entry.height/2 - lock.height/2; lock.y = entry.y + entry.height/2 - lock.height/2;
lock.z = box_background.z + 2; lock.z = box_form.z + 2;
lock.sprite = Sprite(lock.image); lock.sprite = Sprite(lock.image);
lock.sprite.SetPosition(lock.x, lock.y, lock.z); lock.sprite.SetPosition(lock.x, lock.y, lock.z);
prompt_sprite = SpriteNew(); prompt_sprite = SpriteNew();
prompt_sprite.SetPosition(entry.x, box_background.y + entry.height/2, box_background.z + 1); prompt_sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1);
global.dialog.box_background = box_background; global.dialog.box_form = box_form;
global.dialog.lock = lock; global.dialog.lock = lock;
global.dialog.entry = entry; global.dialog.entry = entry;
global.dialog.bullet_image = Image("BULLET.png"); global.dialog.bullet_image = Image("BULLET.png");
@ -356,7 +356,7 @@ function dialog_setup() {
function dialog_opacity(opacity) { function dialog_opacity(opacity) {
if (opacity == 0) { if (opacity == 0) {
dialog.box_background.sprite.SetOpacity(opacity); dialog.box_form.sprite.SetOpacity(opacity);
dialog.lock.sprite.SetOpacity(opacity); dialog.lock.sprite.SetOpacity(opacity);
dialog.entry.sprite.SetOpacity(opacity); dialog.entry.sprite.SetOpacity(opacity);
} }
@ -449,12 +449,12 @@ function refreshHandler() {
text_end.sprite = Sprite(text_end.image); text_end.sprite = Sprite(text_end.image);
text_end.x = progress_box.x; text_end.x = progress_box.x;
text_end.y = progress_box.y - progress_text.image.GetHeight() * 2; text_end.y = progress_box.y - progress_text.image.GetHeight() * 2;
text_end.sprite.SetPosition(text_end.x, text_end.y, 6); text_end.sprite.SetPosition(text_end.x, text_end.y, 2);
} }
progress_fade.x = progress_bar.x; progress_fade.x = progress_bar.x;
progress_fade.y = progress_bar.y; progress_fade.y = progress_bar.y;
progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 6); progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 4);
if (fade_dir == 0) { if (fade_dir == 0) {
counter++; counter++;
@ -504,7 +504,7 @@ message_sprite=SpriteNew();
function message_callback(prompt) { function message_callback(prompt) {
message = Image.Text(prompt, 0.5, 0.5, 0.5, 1, ubuntufont); message = Image.Text(prompt, 0.5, 0.5, 0.5, 1, ubuntufont);
message_sprite.SetImage(message); message_sprite.SetImage(message);
message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 9); message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 2);
message_sprite.SetOpacity(1); message_sprite.SetOpacity(1);
} }
@ -515,7 +515,7 @@ Plymouth.SetMessageFunction(message_callback);
for(i=0; i < NUM_SCROLL_LINES; i++) { for(i=0; i < NUM_SCROLL_LINES; i++) {
lines[i]= Image.Text("", 0.5, 0.5, 0.5, 1, ubuntufont); //цвет строк lines[i]= Image.Text("", 0.5, 0.5, 0.5, 1, ubuntufont); //цвет строк
message_sprite[i] = SpriteNew(); message_sprite[i] = SpriteNew();
message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 9); message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 2);
} //высота строк //отступ строк } //высота строк //отступ строк
function StringLength(string) { function StringLength(string) {

57
melawy-fenek/BOX.svg
View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100mm"
height="50mm"
viewBox="0 0 100 50"
version="1.1"
id="svg5"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="BOX.svg"
inkscape:export-filename="BOX.png"
inkscape:export-xdpi="93"
inkscape:export-ydpi="93"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="1.4734708"
inkscape:cx="151.68268"
inkscape:cy="259.59116"
inkscape:window-width="1920"
inkscape:window-height="1002"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Слой 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#1c1b20;fill-opacity:1;stroke:none;stroke-width:0.561054;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
id="rect788"
width="100"
height="50"
x="0"
y="0"
ry="0"
inkscape:export-filename="MESSAGE_BACKGROUND.PNG.png"
inkscape:export-xdpi="25.4"
inkscape:export-ydpi="25.4" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

54
melawy-fenek/BOX1.svg
View File

@ -1,54 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="269mm"
height="46mm"
viewBox="0 0 269 46"
version="1.1"
id="svg848"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="BOX.svg"
inkscape:export-filename="BOX.png"
inkscape:export-xdpi="25.4"
inkscape:export-ydpi="25.4"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview850"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="0.73673541"
inkscape:cx="337.29884"
inkscape:cy="128.26857"
inkscape:window-width="1920"
inkscape:window-height="1006"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs845" />
<g
inkscape:label="Слой 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#000000;stroke-width:0.75692;stroke-linejoin:round;paint-order:fill markers stroke;fill-opacity:0.64999998"
id="rect3510"
width="269"
height="46"
x="0"
y="0"
ry="11.68779" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
melawy-fenek/PROGRESS_BACKGROUND.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 791 B

57
melawy-fenek/PROGRESS_BACKGROUND.svg
View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100mm"
height="50mm"
viewBox="0 0 100 50"
version="1.1"
id="svg5"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="PROGRESS_BACKGROUND.svg"
inkscape:export-filename="PROGRESS_BACKGROUND.png"
inkscape:export-xdpi="93"
inkscape:export-ydpi="93"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="1.4734708"
inkscape:cx="181.54415"
inkscape:cy="259.59116"
inkscape:window-width="1920"
inkscape:window-height="1002"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Слой 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#1c1b20;fill-opacity:1;stroke:none;stroke-width:0.561054;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
id="rect788"
width="100"
height="50"
x="0"
y="0"
ry="0"
inkscape:export-filename="MESSAGE_BACKGROUND.PNG.png"
inkscape:export-xdpi="25.4"
inkscape:export-ydpi="25.4" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
melawy-fenek/PROGRESS_FORM.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 788 B

BIN
melawy-fenek/SIDE_BACKGROUND.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
melawy-fenek/SIDE_BACKGROUND0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

57
melawy-fenek/SIDE_BACKGROUND0.svg
View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100mm"
height="100mm"
viewBox="0 0 100 100"
version="1.1"
id="svg5"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="MESSAGE_BACKGROUND.svg"
inkscape:export-filename="MESSAGE_BACKGROUND.png"
inkscape:export-xdpi="93"
inkscape:export-ydpi="93"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="1.4734708"
inkscape:cx="210.72694"
inkscape:cy="258.91249"
inkscape:window-width="1920"
inkscape:window-height="1006"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Слой 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.79345;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
id="rect788"
width="100"
height="100"
x="0"
y="0"
ry="0"
inkscape:export-filename="MESSAGE_BACKGROUND.PNG.png"
inkscape:export-xdpi="25.4"
inkscape:export-ydpi="25.4" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
melawy-fenek/SIDE_BACKGROUND2.xcf
View File

Binary file not shown.

102
melawy-fenek/script.script
View File

@ -153,7 +153,7 @@ side_background.x = x0;
side_background.y = y0; side_background.y = y0;
side_background.sprite = Sprite(side_background.image); side_background.sprite = Sprite(side_background.image);
side_background.sprite.SetPosition(side_background.x, side_background.y, 8); side_background.sprite.SetPosition(side_background.x, side_background.y, 1);
side_background.sprite.SetOpacity(1); side_background.sprite.SetOpacity(1);
// Sise Logo // Sise Logo
@ -168,7 +168,7 @@ side_logo.x = (side_background.width - side_logo.width) / 2;
side_logo.y = screen.height - screen.height * 0.25; side_logo.y = screen.height - screen.height * 0.25;
side_logo.sprite = Sprite(side_logo.image); side_logo.sprite = Sprite(side_logo.image);
side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 9); side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 2);
side_logo.sprite.SetOpacity(1); side_logo.sprite.SetOpacity(1);
// **************************************** // // **************************************** //
@ -182,7 +182,7 @@ project_link.sprite = Sprite(project_link.image);
project_link.x = (side_background.width - project_link.width) / 2; project_link.x = (side_background.width - project_link.width) / 2;
project_link.y = side_logo.y + side_logo.height; project_link.y = side_logo.y + side_logo.height;
project_link.sprite.SetPosition(project_link.x, project_link.y, 9); project_link.sprite.SetPosition(project_link.x, project_link.y, 2);
project_link.sprite.SetOpacity(1); project_link.sprite.SetOpacity(1);
// **************************************** // // **************************************** //
@ -197,19 +197,19 @@ logo.y = Percent(10, screen.height); // позиция логотипа
logo.sprite.SetPosition(logo.x, logo.y, 2); logo.sprite.SetPosition(logo.x, logo.y, 2);
logo.sprite.SetOpacity(1); logo.sprite.SetOpacity(1);
// PROGRESS BACKGROUND // PROGRESS FORM
progress_background.image = Image("PROGRESS_BACKGROUND.png"); progress_form.image = Image("PROGRESS_FORM.png");
progress_background.image = progress_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); progress_form.image = progress_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height));
progress_background.width = progress_background.image.GetWidth(); progress_form.width = progress_form.image.GetWidth();
progress_background.height = progress_background.image.GetHeight(); progress_form.height = progress_form.image.GetHeight();
progress_background.x = Percent(50, screen.width) - progress_background.width / 2; progress_form.x = Percent(50, side_background.width) - progress_form.width / 2;
progress_background.y = Percent(99, screen.height) - progress_background.height; progress_form.y = Percent(75, side_background.height) - progress_form.height;
progress_background.sprite = Sprite(progress_background.image); progress_form.sprite = Sprite(progress_form.image);
progress_background.sprite.SetPosition(progress_background.x, progress_background.y, 2); progress_form.sprite.SetPosition(progress_form.x, progress_form.y, 2);
progress_background.sprite.SetOpacity(0.45); progress_form.sprite.SetOpacity(0.45);
// SPINNER // SPINNER
spinner.image = Image("SPINNER.png"); spinner.image = Image("SPINNER.png");
@ -218,11 +218,11 @@ spinner.image = spinner.image.Scale(Percent(1, screen.width), Percent(1, screen.
spinner.width = spinner.image.GetWidth(); spinner.width = spinner.image.GetWidth();
spinner.height = spinner.image.GetHeight(); spinner.height = spinner.image.GetHeight();
spinner.x = progress_background.x + progress_background.width - spinner.width; spinner.x = progress_form.x + progress_form.width - spinner.width;
spinner.y = progress_background.y + spinner.height / 10; spinner.y = progress_form.y + spinner.height / 10;
spinner.sprite = Sprite(spinner.image); spinner.sprite = Sprite(spinner.image);
spinner.sprite.SetPosition(spinner.x, spinner.y, 11); // позиция за или перед spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед
// PROGRESS TEXT // PROGRESS TEXT
@ -231,41 +231,41 @@ progress_text.image = Image.Text(progress_t + "%", 255, 255, 255, 1, progressfon
progress_text.width = progress_text.image.GetWidth(); progress_text.width = progress_text.image.GetWidth();
progress_text.height = progress_text.image.GetHeight(); progress_text.height = progress_text.image.GetHeight();
progress_text.x = progress_background.x + progress_background.width - (4 * Percent(70, progress_text.height)); // позиция % по X progress_text.x = progress_form.x + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X
progress_text.y = progress_background.y + progress_text.height; // позиция % по Y progress_text.y = progress_form.y + progress_text.height; // позиция % по Y
progress_text.sprite = SpriteNew(); progress_text.sprite = SpriteNew();
progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 6); progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3);
// PROGRESS BOX // PROGRESS BOX
progress_box.image = Image("PROGRESS_BOX.png"); progress_box.image = Image("PROGRESS_BOX.png");
progress_box.image = progress_box.image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); progress_box.image = progress_box.image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height));
progress_box.width = progress_box.image.GetWidth(); progress_box.width = progress_box.image.GetWidth();
progress_box.height = progress_box.image.GetHeight(); progress_box.height = progress_box.image.GetHeight();
progress_box.x = Percent(50, screen.width) - progress_box.width / 2; progress_box.x = progress_form.x + (progress_form.width - progress_box.width) / 2;
progress_box.y = Percent(95, screen.height) - progress_box.height / 2; progress_box.y = progress_form.y + (progress_form.height - progress_box.height) / 2;
progress_box.sprite = Sprite(progress_box.image); progress_box.sprite = Sprite(progress_box.image);
progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 5); progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 3);
// PROGRESS BAR // PROGRESS BAR
progress_bar.original_image = Image("PROGRESS_BAR.png"); progress_bar.original_image = Image("PROGRESS_BAR.png");
progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height));
progress_bar.width = progress_bar.original_image.GetWidth(); progress_bar.width = progress_bar.original_image.GetWidth();
progress_bar.height = progress_bar.original_image.GetHeight(); progress_bar.height = progress_bar.original_image.GetHeight();
progress_bar.x = Percent(50, screen.width) - progress_bar.original_image.GetWidth() / 2; progress_bar.x = progress_form.x + (progress_form.width - progress_bar.original_image.GetWidth()) / 2;
progress_bar.y = Percent(95, screen.height) - progress_bar.original_image.GetHeight() / 2; progress_bar.y = progress_form.y + (progress_form.height - progress_bar.original_image.GetHeight()) / 2;
progress_bar.sprite = Sprite(); progress_bar.sprite = Sprite();
progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 6); progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 4);
// PROGRESS FADE // PROGRESS FADE
progress_fade.image = Image("PROGRESS_FADE.png"); progress_fade.image = Image("PROGRESS_FADE.png");
progress_fade.image = progress_fade.image.Scale(Percent(10, progress_background.width), Percent(15, progress_background.height)); progress_fade.image = progress_fade.image.Scale(Percent(10, progress_form.width), Percent(15, progress_form.height));
progress_fade.width = progress_fade.image.GetWidth(); progress_fade.width = progress_fade.image.GetWidth();
progress_fade.height = progress_fade.image.GetHeight(); progress_fade.height = progress_fade.image.GetHeight();
@ -295,35 +295,35 @@ status = "normal";
//count = 0; //count = 0;
fun dialog_setup() { fun dialog_setup() {
local.box_background; local.box_form;
local.lock; local.lock;
local.entry; local.entry;
local.prompt_sprite; local.prompt_sprite;
box_background.image = Image("BOX.png"); box_form.image = Image("BOX.png");
box_background.image = box_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); box_form.image = box_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height));
box_background.width = box_background.image.GetWidth(); box_form.width = box_form.image.GetWidth();
box_background.height = box_background.image.GetHeight(); box_form.height = box_form.image.GetHeight();
box_background.x = Percent(50, screen.width) - box_background.width / 2; box_form.x = progress_form.x;
box_background.y = progress_background.y - box_background.height - Percent(1, screen.height); box_form.y = progress_form.y - box_form.height - Percent(1, screen.height);
box_background.z = 10000; box_form.z = 10000;
box_background.sprite = Sprite(box_background.image); box_form.sprite = Sprite(box_form.image);
box_background.sprite.SetPosition(box_background.x, box_background.y, box_background.z); box_form.sprite.SetPosition(box_form.x, box_form.y, box_form.z);
box_background.sprite.SetOpacity(0.45); box_form.sprite.SetOpacity(0.45);
entry.image = Image("ENTRY.png"); entry.image = Image("ENTRY.png");
entry.image = entry.image.Scale(Percent(90, box_background.width), Percent(33, box_background.height)); entry.image = entry.image.Scale(Percent(90, box_form.width), Percent(33, box_form.height));
entry.width = entry.image.GetWidth(); entry.width = entry.image.GetWidth();
entry.height = entry.image.GetHeight(); entry.height = entry.image.GetHeight();
entry.x = box_background.x + box_background.width/2 - entry.width/2; entry.x = box_form.x + box_form.width/2 - entry.width/2;
entry.y = box_background.y + box_background.height/2 - entry.height/2; entry.y = box_form.y + box_form.height/2 - entry.height/2;
entry.z = box_background.z + 1; entry.z = box_form.z + 1;
entry.sprite = Sprite(entry.image); entry.sprite = Sprite(entry.image);
entry.sprite.SetPosition(entry.x, entry.y, entry.z); entry.sprite.SetPosition(entry.x, entry.y, entry.z);
@ -336,17 +336,17 @@ fun dialog_setup() {
lock.x = entry.x + entry.width - lock.width - (entry.height - lock.height); lock.x = entry.x + entry.width - lock.width - (entry.height - lock.height);
lock.y = entry.y + entry.height/2 - lock.height/2; lock.y = entry.y + entry.height/2 - lock.height/2;
lock.z = box_background.z + 2; lock.z = box_form.z + 2;
lock.sprite = Sprite(lock.image); lock.sprite = Sprite(lock.image);
lock.sprite.SetPosition(lock.x, lock.y, lock.z); lock.sprite.SetPosition(lock.x, lock.y, lock.z);
prompt_sprite = SpriteNew(); prompt_sprite = SpriteNew();
prompt_sprite.SetPosition(entry.x, box_background.y + entry.height/2, box_background.z + 1); prompt_sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1);
global.dialog.box_background = box_background; global.dialog.box_form = box_form;
global.dialog.lock = lock; global.dialog.lock = lock;
global.dialog.entry = entry; global.dialog.entry = entry;
global.dialog.bullet_image = Image("BULLET.png"); global.dialog.bullet_image = Image("BULLET.png");
@ -356,7 +356,7 @@ fun dialog_setup() {
fun dialog_opacity(opacity) { fun dialog_opacity(opacity) {
if (opacity == 0) { if (opacity == 0) {
dialog.box_background.sprite.SetOpacity(opacity); dialog.box_form.sprite.SetOpacity(opacity);
dialog.lock.sprite.SetOpacity(opacity); dialog.lock.sprite.SetOpacity(opacity);
dialog.entry.sprite.SetOpacity(opacity); dialog.entry.sprite.SetOpacity(opacity);
} }
@ -449,12 +449,12 @@ fun refreshHandler() {
text_end.sprite = Sprite(text_end.image); text_end.sprite = Sprite(text_end.image);
text_end.x = progress_box.x; text_end.x = progress_box.x;
text_end.y = progress_box.y - progress_text.image.GetHeight() * 2; text_end.y = progress_box.y - progress_text.image.GetHeight() * 2;
text_end.sprite.SetPosition(text_end.x, text_end.y, 6); text_end.sprite.SetPosition(text_end.x, text_end.y, 2);
} }
progress_fade.x = progress_bar.x; progress_fade.x = progress_bar.x;
progress_fade.y = progress_bar.y; progress_fade.y = progress_bar.y;
progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 6); progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 4);
if (fade_dir == 0) { if (fade_dir == 0) {
counter++; counter++;
@ -504,7 +504,7 @@ message_sprite=SpriteNew();
fun message_callback(prompt) { fun message_callback(prompt) {
message = Image.Text(prompt, 0.5, 0.5, 0.5, 1, ubuntufont); message = Image.Text(prompt, 0.5, 0.5, 0.5, 1, ubuntufont);
message_sprite.SetImage(message); message_sprite.SetImage(message);
message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 9); message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 2);
message_sprite.SetOpacity(1); message_sprite.SetOpacity(1);
} }
@ -515,7 +515,7 @@ Plymouth.SetMessageFunction(message_callback);
for(i=0; i < NUM_SCROLL_LINES; i++) { for(i=0; i < NUM_SCROLL_LINES; i++) {
lines[i]= Image.Text("", 0.5, 0.5, 0.5, 1, ubuntufont); //цвет строк lines[i]= Image.Text("", 0.5, 0.5, 0.5, 1, ubuntufont); //цвет строк
message_sprite[i] = SpriteNew(); message_sprite[i] = SpriteNew();
message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 9); message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 2);
} //высота строк //отступ строк } //высота строк //отступ строк
fun StringLength(string) { fun StringLength(string) {