From b2efcd928cccac39d50124025355f77c2d561bd8 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 21 Dec 2020 11:14:31 -0300 Subject: Continue remaking the battle interface. We no longer have "4 or 5 units", now we always have only have 4 units. --- game/ATTRIBUTION | 4 +-- game/gfx/actionarea.png | Bin 3127 -> 2877 bytes game/gfx/off.png | Bin 4356 -> 1155 bytes game/gui/battle.rpy | 73 +++++++++++++++++++++++++++--------------------- game/gui/transforms.rpy | 50 ++++++++++++++++++--------------- 5 files changed, 70 insertions(+), 57 deletions(-) diff --git a/game/ATTRIBUTION b/game/ATTRIBUTION index 359b9ca..bb2b7a6 100644 --- a/game/ATTRIBUTION +++ b/game/ATTRIBUTION @@ -64,7 +64,7 @@ Where relevant, you must also include a link to https://tmw2.org in your credit. gfx/cards/bg.png ### ELE gfx/cards/ele/-1.png - gfx/cards/ele/0.png (Chrisdesign) (CC0) (From OpenGameArt/Modified) + gfx/cards/ele/0.png gfx/cards/ele/1.png (Chrisdesign) (CC0) (From OpenGameArt) gfx/cards/ele/2.png (Chrisdesign) (CC0) (From OpenGameArt) gfx/cards/ele/3.png (Chrisdesign) (CC0) (From OpenGameArt) @@ -82,7 +82,7 @@ Where relevant, you must also include a link to https://tmw2.org in your credit. gfx/gui/cog_hover.png (JellyCat) (CC0) (OpenGameArt/Modified) gfx/gui/cog_idle.png (JellyCat) (CC0) (OpenGameArt/Modified) gfx/gui/crystal.png (Phobi) (CC0) (OpenGameArt/Modified) - gfx/gui/ele_0.png + gfx/gui/ele_0.png (Chrisdesign) (CC0) (From OpenGameArt/Modified) gfx/gui/ele_1.png (Chrisdesign) (CC0) (From OpenGameArt) gfx/gui/ele_2.png (Chrisdesign) (CC0) (From OpenGameArt) gfx/gui/ele_3.png (Chrisdesign) (CC0) (From OpenGameArt) diff --git a/game/gfx/actionarea.png b/game/gfx/actionarea.png index cf94be8..d1276b9 100644 Binary files a/game/gfx/actionarea.png and b/game/gfx/actionarea.png differ diff --git a/game/gfx/off.png b/game/gfx/off.png index e06c4a0..020d283 100644 Binary files a/game/gfx/off.png and b/game/gfx/off.png differ diff --git a/game/gui/battle.rpy b/game/gui/battle.rpy index 872dec8..2090894 100644 --- a/game/gui/battle.rpy +++ b/game/gui/battle.rpy @@ -147,6 +147,7 @@ screen battle(): xalign 0.0 yalign 0.0 # Preferences button + null width 20 imagebutton auto "gfx/gui/cog_%s.png" action ShowMenu('preferences') textbutton _("Party") action Function(blayout) null width 20 @@ -205,13 +206,14 @@ screen battle(): # TODO: Gray out and unmovable if dead # One drag group per party member defined in Battle draggroup: - xalign 0.2 + xpos 0.25 + xanchor 1.0 yalign 1.0 - xmaximum 160 - ymaximum 300 # 240 + 60: 30 px each dimension + xmaximum 256 + ymaximum 480 # Display the background drag: - child At("gfx/action.png", c_party1) + child At("gfx/action.png", party1) draggable False droppable False # Display the card (if there's one) @@ -228,12 +230,12 @@ screen battle(): # The action areas drag: drag_name "Skill" - child At("gfx/actionarea.png", c_party1) + child At("gfx/actionarea.png", party1) draggable False ypos 0.0 drag: drag_name "Sphere" - child At("gfx/actionarea.png", c_party1) + child At("gfx/actionarea.png", party1) draggable False yalign 1.0 # Display the sphere @@ -244,16 +246,17 @@ screen battle(): yalign 1.0 xalign 0.5 if (fx1 and Battle["party"][0]["hp"] <= 0): - add At("gfx/off.png", c_party1) + add At("gfx/off.png", party1) # One drag group per party member defined in Battle draggroup: - xalign 0.4 + xpos 0.50 + xanchor 1.0 yalign 1.0 - xmaximum 160 - ymaximum 300 + xmaximum 256 + ymaximum 480 drag: - child At("gfx/action.png", c_party2) + child At("gfx/action.png", party2) draggable False droppable False if (fx2): @@ -268,12 +271,12 @@ screen battle(): ypos 30 drag: drag_name "Skill" - child At("gfx/actionarea.png", c_party2) + child At("gfx/actionarea.png", party2) draggable False ypos 0.0 drag: drag_name "Sphere" - child At("gfx/actionarea.png", c_party2) + child At("gfx/actionarea.png", party2) draggable False yalign 1.0 drag: @@ -284,15 +287,16 @@ screen battle(): xalign 0.5 if (fx2 and Battle["party"][1]["hp"] <= 0): - add At("gfx/off.png", c_party2) + add At("gfx/off.png", party2) # One drag group per party member defined in Battle draggroup: - xalign 0.6 + xpos 0.75 + xanchor 1.0 yalign 1.0 - xmaximum 160 - ymaximum 300 + xmaximum 256 + ymaximum 480 drag: - child At("gfx/action.png", c_party3) + child At("gfx/action.png", party3) draggable False droppable False if (fx3): @@ -307,12 +311,12 @@ screen battle(): ypos 30 drag: drag_name "Skill" - child At("gfx/actionarea.png", c_party3) + child At("gfx/actionarea.png", party3) draggable False ypos 0.0 drag: drag_name "Sphere" - child At("gfx/actionarea.png", c_party3) + child At("gfx/actionarea.png", party3) draggable False yalign 1.0 drag: @@ -323,15 +327,16 @@ screen battle(): xalign 0.5 if (fx3 and Battle["party"][2]["hp"] <= 0): - add At("gfx/off.png", c_party3) + add At("gfx/off.png", party3) # One drag group per party member defined in Battle draggroup: - xalign 0.8 + xpos 1.0 + xanchor 1.0 yalign 1.0 - xmaximum 160 - ymaximum 300 + xmaximum 256 + ymaximum 480 drag: - child At("gfx/action.png", c_party4) + child At("gfx/action.png", party4) draggable False droppable False if (fx4): @@ -346,12 +351,12 @@ screen battle(): ypos 30 drag: drag_name "Skill" - child At("gfx/actionarea.png", c_party4) + child At("gfx/actionarea.png", party4) draggable False ypos 0.0 drag: drag_name "Sphere" - child At("gfx/actionarea.png", c_party4) + child At("gfx/actionarea.png", party4) draggable False yalign 1.0 drag: @@ -362,14 +367,15 @@ screen battle(): xalign 0.5 if (fx4 and Battle["party"][3]["hp"] <= 0): - add At("gfx/off.png", c_party4) + add At("gfx/off.png", party4) #################################################### # Render HPBARs if (fx1): frame: - xalign 0.21 + xpos 0.125 + xanchor 0.5 yalign 1.0 ymaximum 10 xmaximum 120 @@ -377,7 +383,8 @@ screen battle(): if (fx2): frame: - xalign 0.4 + xpos 0.375 + xanchor 0.5 yalign 1.0 ymaximum 10 xmaximum 120 @@ -385,7 +392,8 @@ screen battle(): if (fx3): frame: - xalign 0.6 + xpos 0.625 + xanchor 0.5 yalign 1.0 ymaximum 10 xmaximum 120 @@ -393,7 +401,8 @@ screen battle(): if (fx4): frame: - xalign 0.8 + xpos 0.875 + xanchor 0.5 yalign 1.0 ymaximum 10 xmaximum 120 diff --git a/game/gui/transforms.rpy b/game/gui/transforms.rpy index 2fb2be9..0e17d99 100644 --- a/game/gui/transforms.rpy +++ b/game/gui/transforms.rpy @@ -32,49 +32,53 @@ transform enemy3: yalign 0.5 transform party1: - xalign 0.2 + xpos 0.25 + xanchor 1.0 yalign 1.0 transform party2: - xalign 0.4 + xpos 0.50 + xanchor 1.0 yalign 1.0 transform party3: - xalign 0.6 + xpos 0.75 + xanchor 1.0 yalign 1.0 transform party4: - xalign 0.8 + xpos 1.0 + xanchor 1.0 yalign 1.0 -transform party5: - xalign 1.0 - yalign 1.0 +#transform party5: +# xalign 1.0 +# yalign 1.0 transform c_party1: - xalign 0.2 - yalign 1.0 - zoom 0.25 + xpos 0.25 + xanchor 1.0 + zoom 0.4 transform c_party2: - xalign 0.4 - yalign 1.0 - zoom 0.25 + xpos 0.50 + xanchor 1.0 + zoom 0.4 transform c_party3: - xalign 0.6 - yalign 1.0 - zoom 0.25 + xpos 0.75 + xanchor 1.0 + zoom 0.4 transform c_party4: - xalign 0.8 - yalign 1.0 - zoom 0.25 + xpos 1.0 + xanchor 1.0 + zoom 0.4 -transform c_party5: - xalign 1.0 - yalign 1.0 - zoom 0.25 +#transform c_party5: +# xalign 1.0 +# yalign 1.0 +# zoom 0.25 transform czoom_70: zoom 0.70 -- cgit v1.2.3-70-g09d2