Skip to content

Commit

Permalink
Merge pull request #486 from Aidoneus/credits-rework
Browse files Browse the repository at this point in the history
Credits rework
  • Loading branch information
stalkerg authored Aug 30, 2021
2 parents 62dbb9f + 69e59ce commit da1a916
Show file tree
Hide file tree
Showing 40 changed files with 1,352 additions and 193 deletions.
2 changes: 1 addition & 1 deletion data/iscreen/oftr2.scr
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "iscreen/scripts/main.inc"

#include "iscreen/scripts/cr_main1.inc"
#include "iscreen/scripts/cr_main2.inc"

/* ------------------------------ TEXT SECTION ------------------------------ */

Expand Down
182 changes: 164 additions & 18 deletions data/iscreen/scripts/cr0.inc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

#define Credits0_More_Option_PosX 650
#define Credits0_More_Option_PosY 310
#define Credits0_Back_Option_PosX 10
#define Credits0_Back_Option_PosY 280
#define Credits0_More_Option_PosX 330
#define Credits0_More_Option_PosY 270
#define Credits0_Back_Option_PosX -330
#define Credits0_Back_Option_PosY 270

Screen "Credits0"
{
Expand All @@ -19,12 +19,13 @@ Screen "Credits0"
space 2

font 0
s_text "resource/iscreen/credits.txt"
s_text $iSTR_CreditsPathA
}

Object "Back Option"
{
x $Credits0_Back_Option_PosX
align_x center
align_x_offs $Credits0_Back_Option_PosX
y $Credits0_Back_Option_PosY

Element STRING {
Expand Down Expand Up @@ -76,7 +77,8 @@ Screen "Credits0"
}
Object "More Option"
{
x $Credits0_More_Option_PosX
align_x center
align_x_offs $Credits0_More_Option_PosX
y $Credits0_More_Option_PosY

Element STRING {
Expand All @@ -99,7 +101,7 @@ Screen "Credits0"
start_time 0
}
EvComm {
move2screen "Credits3"
move2screen "Credits4"
start_time $PRESS_OBJ_TIME
time $MOVE2SCREEN_TIME
}
Expand All @@ -119,20 +121,21 @@ Screen "Credits0"
time $HIDE_OBJ_TIME
}
EvComm {
move2screen "Credits3"
move2screen "Credits4"
start_time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME }
time $MOVE2SCREEN_TIME
}
}
}
}

#define Credits3_Logo0_PosX 71
#define Credits3_Logo0_PosY 207
#define Credits3_Back_Option_PosX 616
#define Credits3_Back_Option_PosY 254

Screen "Credits3"
#define Credits4_More_Option_PosX 330
#define Credits4_More_Option_PosY 270
#define Credits4_Back_Option_PosX -330
#define Credits4_Back_Option_PosY 270

Screen "Credits4"
{
screen_offs 800

Expand All @@ -143,16 +146,18 @@ Screen "Credits3"
null_level 200
align_x center
y 20

space 2

font 0
s_text "resource/iscreen/credits3.txt"
s_text $iSTR_CreditsPathB
}

Object "Back Option"
{
x $Credits3_Back_Option_PosX
y $Credits3_Back_Option_PosY
align_x center
align_x_offs $Credits4_Back_Option_PosX
y $Credits4_Back_Option_PosY

Element STRING {
align_x center
Expand Down Expand Up @@ -201,9 +206,150 @@ Screen "Credits3"
}
}
}
Object "More Option"
{
align_x center
align_x_offs $Credits4_More_Option_PosX
y $Credits4_More_Option_PosY

Element STRING {
align_x center

terrain_num $TERRAIN2

font 3
space 2
null_level $DEFAULT_NULL
string $iSTR_MORE
}
Event {
key $VK_LBUTTON

time { $PRESS_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
low_obj "More Option"
time $PRESS_OBJ_TIME
start_time 0
}
EvComm {
move2screen "Credits3"
start_time $PRESS_OBJ_TIME
time $MOVE2SCREEN_TIME
}
}
Event {
key $VK_RBUTTON

time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
smooth_obj "More Option" 2
start_time 0
time $SMOOTH_OBJ_TIME
}
EvComm {
hide_obj "More Option"
start_time $SMOOTH_OBJ_TIME
time $HIDE_OBJ_TIME
}
EvComm {
move2screen "Credits3"
start_time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME }
time $MOVE2SCREEN_TIME
}
}
}
}

#define Credits3_Logo0_PosY 177
#define Credits3_Back_Option_PosX 616
#define Credits3_Back_Option_PosY 324

Screen "Credits3"
{
screen_offs 0

block_global_obj
default_obj "Back Option"

Object "Credits Text A"{
null_level 200
align_x center
align_x_offs -200
y 30
space 2

font 0
s_text $iSTR_CreditsPathCA
}

Object "Credits Text B"{
null_level 200
align_x center
align_x_offs 200
y 30
space 2

font 0
s_text $iSTR_CreditsPathCB
}

Object "Back Option"
{
align_x center
align_x_offs 200
y $Credits3_Back_Option_PosY

Element STRING {
align_x center

terrain_num $TERRAIN2

font 3
space 2
null_level $DEFAULT_NULL
string $iSTR_BACK
}
Event {
key $VK_LBUTTON
key $VK_ESCAPE

time { $PRESS_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
low_obj "Back Option"
time $PRESS_OBJ_TIME
start_time 0
}
EvComm {
move2screen "Credits4"
start_time $PRESS_OBJ_TIME
time $MOVE2SCREEN_TIME
}
}
Event {
key $VK_RBUTTON

time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
smooth_obj "Back Option" 2
start_time 0
time $SMOOTH_OBJ_TIME
}
EvComm {
hide_obj "Back Option"
start_time $SMOOTH_OBJ_TIME
time $HIDE_OBJ_TIME
}
EvComm {
move2screen "Credits4"
start_time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME }
time $MOVE2SCREEN_TIME
}
}
}
#define LOGO_OBJ_ID "Logo0"
Object "Logo0" {
x $Credits3_Logo0_PosX
align_x center
align_x_offs 200
y $Credits3_Logo0_PosY

Element BITMAP {
Expand Down
22 changes: 17 additions & 5 deletions data/iscreen/scripts/cr1.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,33 @@ Screen "Credits1"
block_global_obj
default_obj "Back Option"

Object "Credits Text"{
Object "Credits Text A"{
null_level 200
align_x center
y 110
align_x_offs 130
y 30
space 2

font 0
s_text "resource/iscreen/credits1.txt"
s_text $iSTR_CreditsPathDA
}

Object "Credits Text B"{
null_level 200
align_x center
y 90
space 2

font 0
s_text $iSTR_CreditsPathDB
}

Object "Back Option"
{
align_x right
align_x_offs 20
align_y center
align_y_offs 70
align_y_offs 50

Element STRING {
align_x center
Expand Down Expand Up @@ -73,7 +84,8 @@ Screen "Credits1"
#define LOGO_OBJ_ID "Logo1"
Object "Logo1" {
align_x center
y 20
align_x_offs -250
y 10

Element BITMAP {
align_x center
Expand Down
20 changes: 16 additions & 4 deletions data/iscreen/scripts/cr2.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,33 @@ Screen "Credits2"
block_global_obj
default_obj "Back Option"

Object "Credits Text"{
Object "Credits Text A"{
null_level 200
align_x center
y 100
align_x_offs 180
y 35
space 2

font 0
s_text "resource/iscreen/credits2.txt"
s_text $iSTR_CreditsPathEA
}

Object "Credits Text B"{
null_level 200
align_x center
y 90
space 2

font 0
s_text $iSTR_CreditsPathEB
}

Object "Back Option"
{
align_x right
align_x_offs 20
align_y center
align_y_offs -90
align_y_offs -150

Element STRING {
align_x center
Expand Down Expand Up @@ -73,6 +84,7 @@ Screen "Credits2"
#define LOGO_OBJ_ID "Logo2"
Object "Logo2" {
align_x center
align_x_offs -160
y 20

Element BITMAP {
Expand Down
Loading

0 comments on commit da1a916

Please sign in to comment.