add screenshot usb + inside tiles

This commit is contained in:
bgiraudr 2021-08-28 01:32:01 +02:00
parent 6303b713d7
commit ffc33d3143
6 changed files with 112 additions and 66 deletions

View File

@ -1,7 +1,7 @@
tileset.png:
type: bopti-image
name: img_tileset
profile:p4
profile:p8
spritesheet.png:
type: bopti-image

View File

@ -1,67 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="12" height="10" tilewidth="16" tileheight="16" infinite="0" nextlayerid="11" nextobjectid="32">
<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="12" height="10" tilewidth="16" tileheight="16" infinite="0" nextlayerid="11" nextobjectid="34">
<editorsettings>
<export target="interior_1.json" format="json"/>
</editorsettings>
<tileset firstgid="1" source="../tileset.tsx"/>
<layer id="5" name="1" width="12" height="10">
<data encoding="csv">
2,3,2,1,3,3,2,3,2,1,1,3,
1,6,6,6,156,157,157,158,2,1,2,2,
3,6,156,157,159,233,235,160,158,3,1,1,
1,6,185,233,234,236,237,235,187,1,6,1,
1,6,185,291,292,265,301,264,187,1,6,1,
1,6,214,215,188,291,292,293,160,158,6,1,
2,6,3,1,214,215,215,215,215,216,6,1,
2,3,2,2,1,5,3,109,2,6,6,3,
2,3,2,1,3,2,3,2,6,6,6,3,
1,2,0,1,2,2,2,1,3,3,1,3
682,683,683,683,683,683,683,683,683,683,683,684,
711,712,712,712,712,712,712,712,712,712,712,713,
740,741,741,741,741,741,741,741,741,741,741,742,
617,617,617,617,617,617,617,617,617,617,617,617,
617,617,617,617,617,617,617,617,617,617,617,617,
617,617,617,617,617,617,617,617,617,617,617,617,
617,617,617,617,617,617,617,617,617,736,736,736,
617,617,617,617,617,617,617,617,736,736,736,736,
617,617,617,617,617,617,617,617,736,736,736,736,
617,617,238,617,617,617,617,617,617,736,736,736
</data>
</layer>
<layer id="1" name="2" width="12" height="10">
<data encoding="csv">
248,249,249,249,249,249,249,249,249,249,249,251,
277,0,0,0,0,0,0,0,0,20,21,280,
277,0,0,0,0,0,0,0,0,49,50,280,
277,0,0,0,0,0,0,0,0,0,0,280,
277,0,0,0,0,0,0,0,0,0,0,280,
277,0,0,26,0,0,0,0,0,0,0,280,
277,0,0,55,0,0,0,0,0,0,0,280,
277,0,0,0,0,0,0,0,0,0,0,280,
277,0,0,0,0,0,0,0,0,0,0,280,
306,278,238,279,250,250,250,250,250,250,250,309
</data>
</layer>
<layer id="9" name="3" width="12" height="10">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,29,0,0,0,0,
0,0,0,0,0,0,0,58,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0
0,0,0,0,0,710,710,0,0,0,0,0,
678,0,701,701,0,739,739,0,0,0,646,647,
707,0,730,730,0,736,736,0,0,0,675,676,
0,0,0,0,0,736,736,0,0,0,0,0,
736,0,702,703,0,0,0,0,248,250,249,250,
736,0,731,732,0,0,0,0,277,704,705,736,
0,0,0,0,0,0,0,0,277,733,734,0,
614,615,615,615,616,0,0,0,0,735,735,678,
643,644,238,644,645,0,0,0,0,0,0,707
</data>
</layer>
<objectgroup id="10" name="dialog">
<object id="25" gid="267" x="112" y="112" width="16" height="16">
<object id="32" gid="267" x="144" y="128" width="16" height="16">
<properties>
<property name="name" value="Tituya"/>
<property name="text">Salutation !
Ça va ?</property>
<property name="name" value="Television"/>
<property name="text" value="La tele diffuse une ancienne;emission : Odyssee"/>
</properties>
</object>
<object id="30" gid="267" x="144" y="48" width="16" height="16">
<object id="33" gid="267" x="160" y="128" width="16" height="16">
<properties>
<property name="text" value="Oui oui c'est un interieur"/>
</properties>
</object>
<object id="31" gid="267" x="160" y="48" width="16" height="16">
<properties>
<property name="text" value="Planete Casio FTW"/>
<property name="name" value="Television"/>
<property name="text" value="La tele diffuse une ancienne;emission : Odyssee"/>
</properties>
</object>
</objectgroup>

View File

@ -1,35 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="15" height="10" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="32">
<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="15" height="10" tilewidth="16" tileheight="16" infinite="0" nextlayerid="15" nextobjectid="35">
<editorsettings>
<export target="interior_1.json" format="json"/>
</editorsettings>
<tileset firstgid="1" source="../tileset.tsx"/>
<layer id="11" name="1" width="15" height="10">
<data encoding="csv">
94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,
94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,
94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,
94,94,97,123,123,123,123,123,123,123,123,123,96,94,94,
94,94,95,161,162,162,162,162,162,162,162,163,93,94,94,
94,94,95,190,191,191,191,223,191,223,223,192,93,94,94,
94,94,95,219,220,220,193,223,194,220,220,221,93,94,94,
94,94,68,65,65,66,190,191,192,64,65,65,67,94,94,
94,94,94,94,94,95,190,191,192,93,94,94,94,94,94,
94,94,94,94,94,95,190,222,192,93,94,94,94,94,94
682,683,683,683,683,683,683,683,683,683,683,683,683,683,684,
711,712,712,712,712,712,712,712,712,712,712,712,712,712,713,
740,741,741,741,741,741,741,741,741,741,741,741,741,741,742,
617,617,617,617,617,617,617,617,617,617,617,617,617,617,617,
736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,
736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,
736,736,736,736,617,736,736,736,736,736,736,736,736,736,736,
617,617,736,736,617,736,736,736,736,736,736,736,736,736,736,
617,617,736,736,617,736,736,736,736,736,736,736,736,736,736,
736,736,736,736,617,736,736,736,736,736,736,736,736,736,736
</data>
</layer>
<layer id="12" name="2" width="15" height="10">
<data encoding="csv">
224,225,225,225,225,225,225,225,225,225,225,225,225,225,226,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,323,324,325,246,0,0,0,0,0,
0,0,0,0,22,23,352,353,354,275,0,0,0,0,0,
0,0,0,0,51,52,381,382,383,304,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,238,0,0,0,0,0,0,0
0,0,710,710,0,0,679,680,681,0,0,710,710,0,0,
678,0,739,739,0,0,0,0,0,0,0,739,739,646,647,
707,0,0,0,0,0,0,0,0,0,0,0,0,675,676,
0,706,706,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,560,561,0,0,0,0,614,615,615,616,0,
708,709,0,0,589,590,0,0,0,0,643,644,644,645,0,
737,738,0,0,589,590,0,0,0,0,672,673,673,674,0,
0,0,0,0,589,590,614,615,616,0,0,0,0,0,0,
0,0,0,0,589,590,643,238,645,0,0,0,0,0,0
</data>
</layer>
<layer id="13" name="3" width="15" height="10">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,704,705,0,0,0,0,0,0,701,701,0,0,0,677,
0,733,734,0,0,0,0,0,0,730,730,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,702,703,0,0,
0,0,0,0,0,0,0,0,0,0,0,731,732,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,678,0,678,0,0,0,0,0,0,
0,0,0,0,0,0,707,0,707,0,0,0,0,0,0
</data>
</layer>
<objectgroup id="14" name="Calque d'Objets 1">
<object id="32" gid="267" x="16" y="64" width="16" height="16">
<properties>
<property name="name" value="Television"/>
<property name="text" value="La television est eteinte"/>
</properties>
</object>
<object id="34" gid="267" x="32" y="64" width="16" height="16">
<properties>
<property name="name" value="Television"/>
<property name="text" value="Des traces de doigts sont;presentes sur l'ecran"/>
</properties>
</object>
</objectgroup>
</map>

View File

@ -156,10 +156,18 @@
<tile id="380" type="solid"/>
<tile id="381" type="solid"/>
<tile id="382" type="solid"/>
<tile id="559" type="solid"/>
<tile id="560" type="solid"/>
<tile id="588" type="solid"/>
<tile id="589" type="solid"/>
<tile id="617" type="solid"/>
<tile id="618" type="solid"/>
<tile id="634" type="solid"/>
<tile id="635" type="solid"/>
<tile id="636" type="solid"/>
<tile id="637" type="solid"/>
<tile id="645" type="solid"/>
<tile id="646" type="solid"/>
<tile id="655" type="solid"/>
<tile id="656" type="solid"/>
<tile id="657" type="solid"/>
@ -172,6 +180,9 @@
<tile id="664" type="solid"/>
<tile id="665" type="solid"/>
<tile id="666" type="solid"/>
<tile id="674" type="solid"/>
<tile id="675" type="solid"/>
<tile id="677" type="solid"/>
<tile id="684" type="solid"/>
<tile id="685" type="solid"/>
<tile id="686" type="solid"/>
@ -184,6 +195,14 @@
<tile id="693" type="solid"/>
<tile id="694" type="solid"/>
<tile id="695" type="solid"/>
<tile id="700" type="solid"/>
<tile id="701" type="solid"/>
<tile id="702" type="solid"/>
<tile id="703" type="solid"/>
<tile id="704" type="solid"/>
<tile id="706" type="solid"/>
<tile id="707" type="solid"/>
<tile id="708" type="solid"/>
<tile id="713" type="solid"/>
<tile id="714" type="solid"/>
<tile id="715" type="solid"/>
@ -196,6 +215,16 @@
<tile id="722" type="solid"/>
<tile id="723" type="solid"/>
<tile id="724" type="solid"/>
<tile id="729" type="solid"/>
<tile id="730" type="solid"/>
<tile id="731" type="solid"/>
<tile id="732" type="talkable"/>
<tile id="733" type="talkable"/>
<tile id="736" type="solid"/>
<tile id="737" type="solid"/>
<tile id="739" type="solid"/>
<tile id="740" type="solid"/>
<tile id="741" type="solid"/>
<tile id="742" type="solid"/>
<tile id="743" type="door_in"/>
<tile id="744" type="solid"/>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -3,6 +3,8 @@
#include <gint/timer.h>
#include <gint/clock.h>
#include <gint/usb-ff-bulk.h>
#include "game.h"
#include "engine.h"
#include "player.h"
@ -24,6 +26,9 @@ int main(void) {
GINT_CALL(callback_tick, &tick));
if(t >= 0) timer_start(t);
usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL};
usb_open(interfaces, GINT_CALL_NULL);
/*Main loop*/
while(!keydown(KEY_MENU)) {
while(!tick) sleep();
@ -31,6 +36,8 @@ int main(void) {
engine_draw(&game);
dupdate();
if (keydown(KEY_VARS) && usb_is_open())
usb_fxlink_screenshot(1);
int action = get_inputs();
if(action >= 0 && action <= 3)
@ -42,5 +49,6 @@ int main(void) {
}
if(t >= 0) timer_stop(t);
usb_close();
return 0;
}