Skip to content

Commit 0405f6c

Browse files
kostyabetkostyabet
authored
Merge pull request #21 from kostyabet/dev
Create pipeline for pullrequest
2 parents 3e7fcca + c36d70b commit 0405f6c

File tree

9 files changed

+69
-24
lines changed

9 files changed

+69
-24
lines changed

‎.github/workflows/dev-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ jobs:
99
steps:
1010
- name: Checkout repository
1111
uses: actions/checkout@v4
12+
1213
- name: Install FASM
1314
uses: stevenwdv/setup-fasm@v1
15+
1416
- name: Test fasm
1517
run: fasm main.asm main.exe

‎.github/workflows/prod-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ name: dev-build
22
on:
33
pull_request:
44
branches: ['master']
5-
push:
6-
branches: ['master']
75

86
jobs:
97
build:
108
runs-on: windows-latest
119
steps:
1210
- name: Checkout repository
1311
uses: actions/checkout@v4
12+
1413
- name: Install FASM
1514
uses: stevenwdv/setup-fasm@v1
15+
1616
- name: Build Project
1717
run: fasm main.asm main.exe

‎.github/workflows/release-prod.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: dev-build
2+
on:
3+
push:
4+
tags:
5+
- 'v*'
6+
branches: ['master']
7+
8+
jobs:
9+
build:
10+
runs-on: windows-latest
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v4
14+
15+
- name: Install FASM
16+
uses: stevenwdv/setup-fasm@v1
17+
18+
- name: Test fasm
19+
run: fasm main.asm main.exe
20+
21+
release:
22+
needs: build
23+
runs-on: windows-latest
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v4
27+
28+
- name: Create Release
29+
uses: softprops/action-gh-release@v1
30+
with:
31+
tag_name: ${{ github.ref }}
32+
release_name: Release ${{ github.ref }}
33+
draft: false
34+
prerelease: false
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎Game/Models.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ TicksGameMap dd 882, 219,\ ; main - center 1
133133
959, 853,\ ; center 28
134134
1008, 853,\ ; center 29
135135
1056, 853,\ ; center 30
136-
1105, 853 ; center 31
136+
1105, 853 ; center 31
137137

138138
TicksList_Radiuses dd 17, 15, 12, 7, 2
139139
TicksList_Float_c1 Ticks ?
@@ -142,9 +142,9 @@ TicksList_Float_c3 Ticks ?
142142
TicksList_Float_c4 Ticks ?
143143
TicksList_Float_c5 Ticks ?
144144
TicksList_Float dd 5,\
145-
TicksList_Float_c1, TicksList_Float_c2, TicksList_Float_c3, TicksList_Float_c4, TicksList_Float_c5
145+
TicksList_Float_c1, TicksList_Float_c2, TicksList_Float_c3, TicksList_Float_c4, TicksList_Float_c5
146146
TicksList_Centers dd 32,\
147-
64 dup(?)
147+
64 dup(?)
148148
TicksFontDecorate_Radiuses dd 15, 5
149149
TicksFontDecorate_Float_c1 TicksFont ?
150150
TicksFontDecorate_Float_c2 TicksFont ?

‎Graphics/Animations/Animation.asm

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,14 @@ proc Graphics.Animation uses eax ebx ecx edx
5151
.animationButtonMv:
5252
; move block
5353
mov ebx, [ebx + 4]
54-
mov edi, [ebx] ; coords
55-
mov eax, [ebx + 4]
54+
;stdcall Mouse.CheckIsInShape, [ebx]
55+
56+
;mov edi, [ebx] ; coords
57+
;mov eax, [edi + 4]
58+
;add eax, 100
59+
;mov [edi + 4], eax
60+
61+
.mvExit:
5662
stdcall Graphics.Draw.CoordsRectPrepears.ForAnimations
5763
jmp .exitFromLoop
5864
.exitFromLoop:

‎Graphics/Pages/Pages.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ GamePage = 8
44
AboutPage = 12
55
SettingsPage = 16
66

7-
CurentPage dd MainPage; LoadingPage
7+
CurentPage dd LoadingPage
88

99
PagesList dd Draw.Pages.LoadingPage, Draw.Pages.MainPage, Draw.Pages.GamePage, Draw.Pages.AboutPage, Draw.Pages.SettingsPage

‎Graphics/Pages/_components/MainPage.asm

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
proc Draw.Pages.MainPage
22
.book:
3-
stdcall Graphics.Draw.Shapes, book_root_design, book_root_color
3+
stdcall Graphics.Draw.Shapes, book_root_design, book_root_color
44
stdcall Graphics.Draw.Shapes.Rect, book_strk_design, book_strk_color
5-
stdcall Graphics.Draw.Shapes, book_corner_design, book_endg_color
6-
stdcall Graphics.Draw.Shapes, book_brdcrn_design, book_ebrd_color
7-
stdcall Graphics.Draw.Shapes, book_brdfnt_design, book_endg_color
8-
stdcall Graphics.Draw.Shapes, book_endg_design, book_endg_color
9-
stdcall Graphics.Draw.Shapes, book_brd_design, book_ebrd_color
10-
stdcall Graphics.Draw.Shapes, book_flgpl_design, book_flgpl_color
5+
stdcall Graphics.Draw.Shapes, book_corner_design, book_endg_color
6+
stdcall Graphics.Draw.Shapes, book_brdcrn_design, book_ebrd_color
7+
stdcall Graphics.Draw.Shapes, book_brdfnt_design, book_endg_color
8+
stdcall Graphics.Draw.Shapes, book_endg_design, book_endg_color
9+
stdcall Graphics.Draw.Shapes, book_brd_design, book_ebrd_color
10+
stdcall Graphics.Draw.Shapes, book_flgpl_design, book_flgpl_color
1111
.buttons:
12-
stdcall Graphics.Draw.Shapes, button_play_design, play_button_color
12+
stdcall Graphics.Draw.Shapes, button_play_design, brown_text_color
13+
stdcall Graphics.Draw.Shapes, button_about_design, brown_text_color
14+
stdcall Graphics.Draw.Shapes, button_stngs_design, brown_text_color
15+
stdcall Graphics.Draw.Shapes, button_play_design, play_button_color
1316
stdcall Graphics.Draw.Shapes, button_about_design, about_button_color
1417
stdcall Graphics.Draw.Shapes, button_stngs_design, settings_button_color
1518
.headline:

‎Mouse/Controllers/OnClick.asm

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ proc Game.OnClick.PageButton uses eax ebx,\
4141
ret
4242
endp
4343
proc Game.OnClick.TickButton ,\
44-
count, radius, centers
45-
locals
46-
47-
endl
48-
mov ecx, [count]
49-
44+
floatList, matrixTick, coordsMap
45+
5046
ret
5147
endp

‎Mouse/Events.inc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ et_pagebutton = $0101
22
et_windowbutton = $0102
33
et_tick = $0201
44

5+
lp_events dd 0
6+
57
mp_events dd 3,\
68
et_pagebutton, button_play_design, GamePage,\
79
et_pagebutton, button_about_design, AboutPage,\
810
et_pagebutton, button_stngs_design, SettingsPage
911

1012
gp_events dd 1,\
1113
et_pagebutton, exitbtn_font_design, MainPage,\
12-
et_tick, 33, 17, TicksGameMap
14+
et_tick, TicksList_Float, TicksMatrix, TicksGameMap
1315

1416
ap_events dd 1,\
1517
et_pagebutton, exitbtn_font_design, MainPage
1618

1719
sp_events dd 1,\
1820
et_pagebutton, exitbtn_font_design, MainPage
1921

20-
EventsList dd 0, mp_events, gp_events, ap_events, sp_events
22+
EventsList dd lp_events, mp_events, gp_events, ap_events, sp_events

0 commit comments

Comments
 (0)