mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2024-11-24 09:49:41 +03:00
Small fixes in Dungeons
git-svn-id: svn://kolibrios.org@5330 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Anton_K
parent
372337c8ce
commit
72b65d63d7
@ -9,6 +9,7 @@ level1:
|
||||
W equ level1.Wall
|
||||
w equ level1.OtherWall
|
||||
_ equ level1.PassableArea
|
||||
. equ level1.OtherPassableArea
|
||||
0 equ level1.NotPassableArea
|
||||
% equ level1.WallWithCrazyWoodDoor
|
||||
I equ level1.IronDoor
|
||||
@ -36,18 +37,18 @@ dd W,_,_,_,W,_,_,_,_,_,_,_,W,W,W,W,W,W,W,W,W,%,W,W
|
||||
dd W,_,_,_,W,W,W,W,q,v,e,W,W,_,_,_,_,_,_,_,_,_,_,W
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,_,W,_,W,W,W,W,W,W,W,W,W,W
|
||||
dd W,_,_,_,W,_,_,_,_,_,_,_,W,o,W,_,_,_,_,_,_,_,_,W
|
||||
dd W,_,_,_,W,W,W,W,W,W,W,W,W,0,W,W,W,W,_,_,_,_,_,W
|
||||
dd W,_,_,_,W,_,_,_,_,_,_,W,_,_,_,_,_,W,w,w,w,w,w,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,W,_,_,_,_,_,_,_,_,_,_,_,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,W,W,W,W,W,_,w,w,_,w,w,_,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,_,_,_,_,w,_,w,_,_,_,w,_,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,_,_,_,_,w,_,_,_,P,_,_,_,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,_,_,_,_,w,_,w,_,_,_,w,_,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,_,_,_,_,w,_,w,w,_,w,w,_,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,_,_,_,_,w,_,_,_,_,_,_,_,w
|
||||
dd W,W,W,W,W,W,W,W,W,W,W,W,W,W,W,w,w,w,w,w,w,w,w,w
|
||||
dd W,_,_,_,W,W,W,W,W,W,W,W,W,0,W,w,w,w,_,_,_,_,_,W
|
||||
dd W,_,_,_,W,_,_,_,_,_,_,w,_,_,w,w,w,w,w,w,w,w,w,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,w,.,.,.,.,.,.,.,.,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,w,.,.,w,w,.,w,w,.,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,_,.,.,w,.,.,.,w,.,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,_,.,.,.,.,P,.,.,.,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,_,.,.,w,.,.,.,w,.,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,w,.,.,w,w,.,w,w,.,w
|
||||
dd W,_,_,_,_,_,_,_,_,_,_,w,_,_,w,.,.,.,.,.,.,.,.,w
|
||||
dd W,W,W,W,W,W,W,W,W,W,W,w,w,w,w,w,w,w,w,w,w,w,w,w
|
||||
|
||||
restore W, w, _, 0, %, I, L, q, v, e, c, o, P
|
||||
restore W, w, _, ., 0, %, I, L, q, v, e, c, o, P
|
||||
|
||||
.Chest akode.Object textures.Chest, <13, 2>, 1, 0
|
||||
.Column1 akode.Object textures.Column1, <16, 5>, 1, 0
|
||||
@ -130,6 +131,14 @@ restore W, w, _, 0, %, I, L, q, v, e, c, o, P
|
||||
<textures.YellowStone1, 0>, \
|
||||
1, 0
|
||||
|
||||
.OtherPassableArea akode.GridCell <0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
<textures.RedStone1, 0>, \
|
||||
<textures.RedStone1, 0>, \
|
||||
1, 0
|
||||
|
||||
.NotPassableArea akode.GridCell <0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
@ -154,12 +163,12 @@ restore W, w, _, 0, %, I, L, q, v, e, c, o, P
|
||||
<textures.YellowStone1, 0>, \
|
||||
1, level1.ogre
|
||||
|
||||
.PortalArea akode.GridCell <0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
<textures.PortalFloor, 0>, \
|
||||
<textures.YellowStone1, 0>, \
|
||||
.PortalArea akode.GridCell <0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
<0, 0>, \
|
||||
<textures.PortalFloor, 0>, \
|
||||
<textures.RedStone1, 0>, \
|
||||
1, level1.portal
|
||||
|
||||
.CoinImagePtr dd 0
|
||||
@ -345,7 +354,17 @@ endp
|
||||
|
||||
proc level1.columns uses ebx ecx, action, cell_x, cell_y
|
||||
mov eax, [action]
|
||||
cmp ax, ACTION.USE_OBJECT
|
||||
|
||||
cmp ax, ACTION.DO_SOMETHING
|
||||
jne @f
|
||||
mov eax, .message_description
|
||||
jmp .exit
|
||||
.message_description langstr0 ru, < \
|
||||
'ŹĄŕĄ¤ ˘ ¬¨ á⮨⠥˘ë᮪ ď Ş®«® á ĺ®ŕ®č® § ¬Ąâ®© ', 10, \
|
||||
' ¤Ż¨áěî. Š®«® á⮨⠧¤Ąáě  Ą ¤«ď Ż®¤¤Ąŕ¦Ş¨ ', 10, \
|
||||
'Ż®â®«Ş ... ' >
|
||||
|
||||
@@: cmp ax, ACTION.USE_OBJECT
|
||||
jne .exit_no_message
|
||||
|
||||
shr eax, 16
|
||||
@ -401,8 +420,8 @@ proc level1.columns uses ebx ecx, action, cell_x, cell_y
|
||||
ret
|
||||
|
||||
.message_activated langstr0 ru, < \
|
||||
'Š®«® ç « ᢥâ¨âěáď áâŕ ë¬ á˘Ąâ®¬, ¤Ż¨áě ', 10, \
|
||||
'¨á祧« .' >
|
||||
'‚ë Ż®«®¦¨«¨ ¬®Ąâă Ş®«®ă ¨ ® ç « ᢥâ¨âěáď ', 10, \
|
||||
'áâŕ ë¬ á˘Ąâ®¬. ' >
|
||||
endp
|
||||
|
||||
proc level1.ogre action, cell_x, cell_y
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 106 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 123 KiB |
@ -3,7 +3,7 @@ Textures/HUD/* - Anton_K, CC BY-SA 4.0
|
||||
Textures/Environment/*.png - CC0 1.0 (Public Domain)
|
||||
Textures/Environment/IronDoor.jpg - CC0 1.0 (Public Domain)
|
||||
Textures/Environment/*Stone*.jpg - p0ss, GNU GPL 2.0, http://opengameart.org/content/117-stone-wall-tilable-textures-in-8-themes
|
||||
Textures/Environment/Portal.jpg - Clint Bellanger, CC BY 3.0, http://opengameart.org/content/teleporter-circle
|
||||
Textures/Environment/Portal.jpg - Clint Bellanger, modified by Anton_K, CC BY 3.0, http://opengameart.org/content/teleporter-circle
|
||||
|
||||
Textures/Objects/*.png - CC0 1.0 (Public Domain)
|
||||
Textures/Objects/Chest.png - Daniel Cook, modified by Anton_K, CC BY 3.0, http://opengameart.org/content/planetcute-chest-closedpng
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
@ -22,6 +22,7 @@ textures:
|
||||
.GreenStone2 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.GreenStone2, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
|
||||
|
||||
.YellowStone1 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.YellowStone1, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
|
||||
.RedStone1 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.RedStone1, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
|
||||
|
||||
.CrazyWoodDoor akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.CrazyWoodDoor, 0, 1, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
|
||||
.IronDoor akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.IronDoor, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
|
||||
@ -48,6 +49,7 @@ texture_files:
|
||||
.GreenStone2 db 'Resources/Textures/Environment/GreenStone2.jpg', 0
|
||||
|
||||
.YellowStone1 db 'Resources/Textures/Environment/YellowStone1.jpg', 0
|
||||
.RedStone1 db 'Resources/Textures/Environment/RedStone1.jpg', 0
|
||||
|
||||
.CrazyWoodDoor db 'Resources/Textures/Environment/CrazyWoodDoor.png', 0
|
||||
.IronDoor db 'Resources/Textures/Environment/IronDoor.jpg', 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user