Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Turn Based Progress #1
- TB UI for when it's our turn
- TB UI for when it's not our turn
- TB cost to fire
- AI properly interacting with AI
- Interrupt properly working
- TU Reserving
  • Loading branch information
Istrebitel committed Mar 30, 2017
1 parent 3d5e433 commit 01ba517
Show file tree
Hide file tree
Showing 52 changed files with 2,678 additions and 1,244 deletions.
Binary file added data/battle/battlescape-buttons-large.xcf
Binary file not shown.
Binary file added data/battle/battlescape-buttons-res-aim.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/battle/battlescape-buttons-res-auto.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/battle/battlescape-buttons-res-kneel.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/battle/battlescape-buttons-res-snap.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
Binary file modified data/battle/battlescape-icons-fixed-138.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/battle/battlescape-icons-fixed-139.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/battle/battlescape-icons-fixed-305.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 38 additions & 10 deletions data/forms/battle/battle.form
Expand Up @@ -30,26 +30,26 @@ TACBORD9 = Turn-Based Interrupt - NOT USED HERE
</graphicbutton>
<checkbox id="BUTTON_FOLLOW_AGENT">
<position x="4" y="7"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:141:xcom3/tacdata/tactical.pal</imagechecked>
</checkbox>
<checkbox id="BUTTON_TOGGLE_STRATMAP">
<position x="4" y="30"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:133:xcom3/tacdata/tactical.pal</imagechecked>
</checkbox>
<tristatebox id="BUTTON_LAYERING">
<position x="4" y="53"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<image2>battle/battlescape-icons-fixed-139.png</image2>
<image3>battle/battlescape-icons-fixed-138.png</image3>
</tristatebox>
<graphicbutton id="BUTTON_SHOW_OPTIONS">
<position x="4" y="99"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagedepressed>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:136:xcom3/tacdata/tactical.pal</imagedepressed>
</graphicbutton>
Expand Down Expand Up @@ -146,25 +146,25 @@ TACBORD9 = Turn-Based Interrupt - NOT USED HERE
<!-- Time Controls (Disabled in Turn Based) -->
<radiobutton id="BUTTON_SPEED0" groupid="SPEED">
<position x="583" y="7"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:144:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_SPEED1" groupid="SPEED">
<position x="583" y="53"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:146:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_SPEED2" groupid="SPEED">
<position x="583" y="76"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:148:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_SPEED3" groupid="SPEED">
<position x="583" y="99"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:150:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
Expand All @@ -175,9 +175,37 @@ TACBORD9 = Turn-Based Interrupt - NOT USED HERE
<font>smalfont</font>
</label>
<!-- Turn Controls (Disabled in Real Time) -->
<graphicbutton id="BUTTON_ENDTURN">
<tristatebox id="BUTTON_RESERVE_AIMED">
<position x="583" y="7"/>
<size width="54" height="21"/>
<image/>
<image2>battle/battlescape-icons-fixed-305.png</image2>
<image3>battle/battlescape-buttons-res-aim.png</image3>
</tristatebox>
<tristatebox id="BUTTON_RESERVE_SNAP">
<position x="583" y="30"/>
<size width="54" height="21"/>
<image/>
<image2>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:304:xcom3/tacdata/tactical.pal</image2>
<image3>battle/battlescape-buttons-res-snap.png</image3>
</tristatebox>
<tristatebox id="BUTTON_RESERVE_AUTO">
<position x="583" y="53"/>
<size width="54" height="21"/>
<image/>
<image2>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:303:xcom3/tacdata/tactical.pal</image2>
<image3>battle/battlescape-buttons-res-auto.png</image3>
</tristatebox>
<tristatebox id="BUTTON_RESERVE_KNEEL">
<position x="583" y="76"/>
<size width="54" height="21"/>
<image/>
<image2>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:306:xcom3/tacdata/tactical.pal</image2>
<image3>battle/battlescape-buttons-res-kneel.png</image3>
</tristatebox>
<graphicbutton id="BUTTON_ENDTURN">
<position x="583" y="99"/>
<size width="53" height="21"/>
<size width="54" height="21"/>
<image/>
<imagedepressed>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:307:xcom3/tacdata/tactical.pal</imagedepressed>
</graphicbutton>
Expand Down
4 changes: 2 additions & 2 deletions data/forms/battle/battle_rt_tab3.form
Expand Up @@ -27,13 +27,13 @@
<image/>
<imagedepressed>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:317:xcom3/tacdata/tactical.pal</imagedepressed>
</graphicbutton>
<label id="DELAY_TEXT" text="Delay = 6.5s.">
<label id="DELAY_TEXT">
<position x="262" y="40"/>
<size width="116" height="12"/>
<alignment horizontal="centre" vertical="centre"/>
<font>smalfont</font>
</label>
<label id="RANGE_TEXT" text="Range = 4.5m.">
<label id="RANGE_TEXT">
<position x="262" y="91"/>
<size width="116" height="12"/>
<alignment horizontal="centre" vertical="centre"/>
Expand Down
33 changes: 33 additions & 0 deletions data/forms/battle/battle_tb_plan_popup.form
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<openapoc>
<!-- Turn-Based Finishing Action Confirmation -->
<form id="FORM_BATTLE_UI_TB_5">
<style minwidth="640" minheight="128">
<position x="centre" y="bottom"/>
<size width="640" height="128"/>
<backcolour r="128" g="96" b="80"/>
<graphic>
<size width="640" height="128"/>
<image>RAW:xcom3/tacdata/tacbord8.dat:640:128:xcom3/tacdata/tactical.pal</image>
</graphic>
<label id="MESSAGE">
<position x="48" y="5"/>
<size width="544" height="40"/>
<alignment horizontal="centre" vertical="centre"/>
<font>smalfont</font>
</label>
<graphicbutton id="BUTTON_OK">
<position x="224" y="56"/>
<size width="54" height="25"/>
<image/>
<imagedepressed>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:317:xcom3/tacdata/tactical.pal</imagedepressed>
</graphicbutton>
<graphicbutton id="BUTTON_CANCEL">
<position x="339" y="56"/>
<size width="54" height="25"/>
<image/>
<imagedepressed>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:318:xcom3/tacdata/tactical.pal</imagedepressed>
</graphicbutton>
</style>
</form>
</openapoc>
10 changes: 5 additions & 5 deletions data/forms/battle/battle_tb_tab3.form
Expand Up @@ -27,13 +27,13 @@
<image/>
<imagedepressed>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:317:xcom3/tacdata/tactical.pal</imagedepressed>
</graphicbutton>
<label id="DELAY_TEXT" text="Delay = 6.5s.">
<position x="262" y="40"/>
<size width="116" height="12"/>
<label id="DELAY_TEXT">
<position x="273" y="37"/>
<size width="94" height="25"/>
<alignment horizontal="centre" vertical="centre"/>
<font>smalfont</font>
</label>
<label id="RANGE_TEXT" text="Range = 4.5m.">
<label id="RANGE_TEXT">
<position x="262" y="91"/>
<size width="116" height="12"/>
<alignment horizontal="centre" vertical="centre"/>
Expand All @@ -42,7 +42,7 @@
<scroll id="DELAY_SLIDER">
<position x="263" y="78"/>
<size width="114" height="15"/>
<range min="0" max="29"/>
<range min="0" max="5"/>
<gripperimage>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:84:xcom3/tacdata/tactical.pal</gripperimage>
</scroll>
<scroll id="RANGE_SLIDER">
Expand Down
57 changes: 56 additions & 1 deletion data/forms/battle/battle_tb_tab4.form
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openapoc>
<!-- Turn-Based Grenade Prime -->
<!-- Turn-Based Not My Turn -->
<form id="FORM_BATTLE_UI_TB_4">
<style minwidth="640" minheight="128">
<position x="centre" y="bottom"/>
Expand All @@ -10,6 +10,61 @@
<size width="640" height="128"/>
<image>RAW:xcom3/tacdata/tacbord9.dat:640:128:xcom3/tacdata/tactical.pal</image>
</graphic>
<!-- Layers -->
<radiobutton id="BUTTON_LAYER_1" groupid="LAYER">
<position x="314" y="113"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:100:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:33:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_2" groupid="LAYER">
<position x="314" y="104"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:101:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:34:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_3" groupid="LAYER">
<position x="314" y="95"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:102:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:35:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_4" groupid="LAYER">
<position x="314" y="86"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:103:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:36:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_5" groupid="LAYER">
<position x="314" y="77"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:104:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:37:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_6" groupid="LAYER">
<position x="314" y="68"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:105:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:38:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_7" groupid="LAYER">
<position x="314" y="59"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:106:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:39:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_8" groupid="LAYER">
<position x="314" y="50"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:107:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:40:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
<radiobutton id="BUTTON_LAYER_9" groupid="LAYER">
<position x="314" y="41"/>
<size width="13" height="8"/>
<image>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:108:xcom3/tacdata/tactical.pal</image>
<imagechecked>PCK:xcom3/tacdata/icons.pck:xcom3/tacdata/icons.tab:41:xcom3/tacdata/tactical.pal</imagechecked>
</radiobutton>
</style>
</form>
</openapoc>
15 changes: 0 additions & 15 deletions data/forms/battle/battle_tb_tab5.form

This file was deleted.

0 comments on commit 01ba517

Please sign in to comment.