From 41c765619dd8d6a970387346e2531cab63706061 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 9 Nov 2022 21:24:33 +0100 Subject: [PATCH] Creando habitaciones --- Makefile | 6 +- data/enemies/spark.ani | 9 +++ data/enemies/spark.png | Bin 0 -> 187 bytes data/enemies/z80.ani | 9 +++ data/enemies/z80.png | Bin 0 -> 413 bytes data/items/items.png | Bin 1307 -> 1338 bytes data/room/01.room | 18 ++--- data/room/01.tmx | 20 +++--- data/room/36.room | 4 +- data/room/36.tmx | 20 +++--- data/room/37.room | 107 +++++++++++++++++++++++++----- data/room/37.tmx | 20 +++--- data/room/38.room | 31 +++++++-- data/room/38.tmx | 12 ++-- data/tilesets/standard.png | Bin 7860 -> 8130 bytes data/tilesets/standard_zxarne.png | Bin 9460 -> 9765 bytes source/director.cpp | 12 ++++ source/ending2.cpp | 2 + source/enemy.cpp | 1 + source/enemy.h | 2 + source/room.cpp | 14 ++-- todo.txt | 6 +- 22 files changed, 213 insertions(+), 80 deletions(-) create mode 100644 data/enemies/spark.ani create mode 100644 data/enemies/spark.png create mode 100644 data/enemies/z80.ani create mode 100644 data/enemies/z80.png diff --git a/Makefile b/Makefile index 2e53911..25afbfb 100644 --- a/Makefile +++ b/Makefile @@ -5,18 +5,18 @@ macosBundle = ../jaildoctors_dilemma_release/JailDoctor's Dilemma.app/Contents/ windows: @echo off if not exist data\config (mkdir data\config) - g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe + g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded macos: rm -rdf data/config mkdir -p data/config - g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos + g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos macos_f: rm -rdf data/config mkdir -p data/config cp -r data "$(macosBundle)Resources" cp -r "$(macosBundle)/Frameworks" . - clang++ $(source) -std=c++11 -Wall -O2 -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(macosBundle)MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12 + clang++ $(source) -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(macosBundle)MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12 rm -rdf ./Frameworks linux: rm -rdf data/config diff --git a/data/enemies/spark.ani b/data/enemies/spark.ani new file mode 100644 index 0000000..065fd45 --- /dev/null +++ b/data/enemies/spark.ani @@ -0,0 +1,9 @@ +frameWidth=8 +frameHeight=16 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/data/enemies/spark.png b/data/enemies/spark.png new file mode 100644 index 0000000000000000000000000000000000000000..550eedc8c26cb8620f950bebaed7b3c9815fea65 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z1oKjC0#}JRs zqrr}R2NXCK|F1WRyK{&~Lzu&MoUQ9ujUDrU5%gp4%P)Px$S4l)cRA_0809Y$k|xR9wZ|+Y zzaz04o|VkZs~#Z1ks4mjOBzugdVrKH^=m7ikgPoQTdM@;7%dFTPHp;*FM`J-omn%`T0v-n;Op0Az* zJVGNUwNZYC2_LOtctPp<34X@>KatVIMtO64SiKEBz73DmkaiPy@H57SpTr`4nR)RX zAPo?4>r6cS9>Cj?(|YP}B`;}2d3X-6%%jbDg4aC2%U>Y=yI!~Ll2}$Az6p87u z;eD@(@389cZXRibcyE0~>+lX<^8hdZ|7$ENV%1}I{^#NafkUqvID8x600000NkvXX Hu0mjf4JEi^ literal 0 HcmV?d00001 diff --git a/data/items/items.png b/data/items/items.png index 97e01a62c5e7b2de3aa0398eb58777ba333279a6..7ef91c26af20b08eb4235bf75282ecb7351107c3 100644 GIT binary patch delta 1306 zcmV+#1?Bpi3c3oAF@N+)L_t(|ob6gmmfJ84i}P~-E4!OfieLbcvh%tru^C(92c$^K z?acA`!FitN18^M2q1Kg5rGFg9q4w7v+rTx)A?dmIEBqA?wf7caL+%}APXo5=_ILa% z9!@{mWB$&5#qZg5?4V8sPd?dE`|0G}`yHI;-!4Et*fneY_;&bY+L!I7 z{Y9Mls6dmx81T0E?Wsi!Oq;cGBdmTUH>Y< zDcPyYT}M_ne|>1WxrpoTr;=CpoV?ppdeyV?U-9kmd-2ACI+;!|sajMEtkYB#;Pw

bjUZ`zpR)Eu4sP`71fKpISiqQEjDK zSn2XJa(__IPG0fF5%K0)RiGox@;Gd(cG}siTJRf49M-!VPg}QKa_UHRWKtq|U#%tk z)ge{yTo`P3tA$q!xwX4+EnJNN<$tXuZa5Oyz8f=)SEq%UhziI#=(H)Ht_#-5xEZ#4 zuqysEmd^7$Kfdo!Nv$Qqtj97*U-?$HlYV8R;(y=aj(cyJZUR$q%87Jl0_xg!{*+FN zL;33@SUtBtblGUSXm&24ZkQB@D*ig?3?h?7unwXsKC4xHJ-+?ZGt_^-h z!s>YkX-rf)%ugj&+5Y(Rw)C9ZkSoj)RnLfOz+>g6xw%t`+_wCVa`Eqiq#D#&MsFvU zVYZQ=?DHjs>&(L)_AZZIJP!am<9~M*klJ^Fp-ttJZ_S+`oc!+k6_nqBovK<%tEzNo zemV|re&OLb+k9x>KF%KkWxL&=wnec+noknG(175<8cl6@+$BlnKFrvdwQ@}2mK zhqF)qn7{L1@q2ayJE&8^lTUt>Je|CIzk~Dq-37=8yJoE)AAfk$Qwd;_olQBY_GQ0G zzKAm)wb5kn_&Xhpn?}P+Id#FVpsK)is`##S?c6bP?x>1`>I9alM84Qa1?^OztBRcp zOcj&tnNvE1ipwsZ7<^~;abTVi72##Wew0mj24Xcko-B79xrK4|;k#`eSK5x4s>tL= z%@^)~G$T{XvVYtisOvc8pZ$F5b(A^;(|hH+gOu#bF3ESeY$XsCJ9Fd8%Sj(CrChb@#_I`Ngt3FWiRG=F*xY*^zZ^-JUvfwZAVdoQQGxD?KGoEuiA4wo)yu zZ21{EsDEdtulVAK_~cqupd-xsIBctS+L2W)_#H?b*1H=|Ten;a>PU5TQX*Nd){_6~ zkg9hs4EDR#!mEYc+FiI7u10{0zt$2r90}~-jTy$P)51(dZO8@av?-si+pN=ZGi>)@ z)&A31I?wZb`+kQ;YAq3FJJw0|Dz@^S>?gHN5|VCF7hmbB zwOzT=SG+rTaWXgvf2y@^utd;Z5*SPAyF=VXbs!G%&zfn2d~2e9b%KdhwE<_FMo`7~ zJAbhKJ@87IqaQb*(Vwa~XRCCS9*&DE@g3e0xK2w2S4rH3^S_Xigtn>r*=C1d=a3k$ z&WuTOP?1kkNddN?ymbflHTL^gAl_E+PT7F?Z9cw&l-D1Wl5ELh>GuZ>qp*hIEpr{Hw}S z{{JSP2VgC#_s7HEx+v!a<7W9LbUzjRPtCyfP_>9_(Ix9vU-Byn{_qxV{UpNRYFP#T#7iZM{{r&Q_IFFf51+r4=cerkmc27|$1Fp~iV92ofj@C)rzW}5=$B^dw! N002ovPDHLkV1k=lju`*| diff --git a/data/room/01.room b/data/room/01.room index b82ce27..ef9d02f 100644 --- a/data/room/01.room +++ b/data/room/01.room @@ -93,13 +93,13 @@ tileSetFile=printer.png animation=printer.ani width=16 height=16 -x=2 +x=3 y=9 vx=0 vy=0 -x1=2 +x1=3 y1=9 -x2=2 +x2=3 y2=9 color=white [/enemy] @@ -109,13 +109,13 @@ tileSetFile=printer.png animation=printer.ani width=16 height=16 -x=5 +x=6 y=9 vx=0 vy=0 -x1=5 +x1=6 y1=9 -x2=5 +x2=6 y2=9 color=white [/enemy] @@ -126,13 +126,13 @@ animation=lamp.ani width=16 height=16 x=23 -y=5 +y=6 vx=0 vy=0 x1=23 -y1=5 +y1=6 x2=23 -y2=5 +y2=6 color=white [/enemy] diff --git a/data/room/01.tmx b/data/room/01.tmx index 33f0d70..4f9e28c 100644 --- a/data/room/01.tmx +++ b/data/room/01.tmx @@ -3,18 +3,18 @@ -188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188, -188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, -188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164, +164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,164, +164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, +164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, 43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43, 43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, -34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, +43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,34,34,34,0,0,0,0,0,0,0,0,0,0,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,0,0,0,0,0,34,34, +34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, +34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, +34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, +34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,34,138,139,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34, 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/data/room/36.room b/data/room/36.room index c31b13d..ac022a4 100644 --- a/data/room/36.room +++ b/data/room/36.room @@ -1,6 +1,6 @@ -name=no 36 +name=STATIC bgColor=black -border=red +border=bright_cyan tileMapFile=36.tmx tileSetFile=standard.png roomUp=0 diff --git a/data/room/36.tmx b/data/room/36.tmx index ee220e2..6765118 100644 --- a/data/room/36.tmx +++ b/data/room/36.tmx @@ -3,22 +3,22 @@ -25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25, +118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119, +119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118, 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,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,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,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,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,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,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, -25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25 +0,0,119,118,119,118,119,118,119,118,119,118,119,118,119,354,0,118,119,118,119,118,119,118,119,118,119,118,119,118,0,0, +0,0,118,119,118,119,118,119,118,119,118,119,118,119,118,0,354,119,118,119,118,119,118,119,118,119,118,119,118,119,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,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,354,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,354,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,354,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,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119 diff --git a/data/room/37.room b/data/room/37.room index 2e37530..091e5eb 100644 --- a/data/room/37.room +++ b/data/room/37.room @@ -1,33 +1,108 @@ -name=no 37 +name=CHIP'N CHIP bgColor=black -border=red +border=bright_green tileMapFile=37.tmx tileSetFile=standard.png roomUp=0 roomDown=0 roomLeft=38.room roomRight=36.room +itemColor1=green +itemColor2=red [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=z80.png +animation=z80.ani width=16 -height=16 -x=2 -y=2 +height=32 +x=15 +y=1 vx=0 -vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +vy=0.3 +x1=15 +y1=1 +x2=15 +y2=10 +color=bright_green [/enemy] +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=1 +y=8 +vx=0.3 +vy=0 +x1=1 +y1=8 +x2=6 +y2=8 +color=bright_green +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=28 +y=8 +vx=0.3 +vy=0 +x1=25 +y1=8 +x2=30 +y2=8 +color=bright_green +[/enemy] + +[enemy] +tileSetFile=shock.png +animation=shock.ani +width=8 +height=8 +x=8 +y=1 +vx=0 +vy=1 +x1=8 +y1=1 +x2=8 +y2=14 +color=bright_green +[/enemy] + +[enemy] +tileSetFile=shock.png +animation=shock.ani +width=8 +height=8 +x=23 +y=7 +vx=0 +vy=1 +x1=23 +y1=1 +x2=23 +y2=14 +color=bright_green +[/enemy] + + [item] tileSetFile=items.png -tile=1 -x=1 -y=1 +tile=57 +x=3 +y=6 counter=1 +[/item] + +[item] +tileSetFile=items.png +tile=57 +x=26 +y=5 +counter=2 [/item] \ No newline at end of file diff --git a/data/room/37.tmx b/data/room/37.tmx index d644fd8..1171a5c 100644 --- a/data/room/37.tmx +++ b/data/room/37.tmx @@ -3,22 +3,22 @@ -44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44, +114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115, 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,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,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,377,377,377,0,0,0,0,377,377,377,0,0,0,0, +0,0,114,115,0,0,0,0,0,0,0,377,377,377,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,44,44,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,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,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,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, -44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44 +0,0,0,0,0,0,0,0,0,0,377,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,431,432,431,432,431,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,115,114,115,114,115,0, +0,0,0,0,0,0,0,0,0,0,377,377,377,116,0,0,0,0,116,377,377,377,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,140,0,0,0,0,140,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,377,377,377,0,116,0,0,0,0,116,0,377,377,377,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,140,555,555,555,555,140,0,0,0,0,0,0,0,0,0,0,0,0,0, +114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115 diff --git a/data/room/38.room b/data/room/38.room index 281b9b4..4a50c0e 100644 --- a/data/room/38.room +++ b/data/room/38.room @@ -1,5 +1,5 @@ name=THE FINAL CROSSOVER -bgColor=black +bgColor=bright_black border=yellow tileMapFile=38.tmx tileSetFile=standard.png @@ -13,13 +13,13 @@ tileSetFile=arounder_stop.png animation=arounder_stop.ani width=7 height=8 -x=8 +x=9 y=11 vx=0 vy=0 -x1=8 +x1=9 y1=11 -x2=8 +x2=9 y2=11 color=white [/enemy] @@ -49,7 +49,7 @@ x=12 y=1 vx=0.5 vy=0 -x1=9 +x1=11 y1=1 x2=16 y2=1 @@ -57,6 +57,23 @@ color=white flip=true [/enemy] +[enemy] +tileSetFile=arounders_door.png +animation=arounders_door.ani +width=16 +height=16 +x=9 +y=0 +vx=0 +vy=0 +x1=9 +y1=0 +x2=9 +y2=0 +color=yellow +flip=true +[/enemy] + [enemy] tileSetFile=arounder_fly.png animation=arounder_fly.ani @@ -83,11 +100,11 @@ x=12 y=10 vx=0.2 vy=0 -x1=9 +x1=10 y1=10 x2=17 y2=10 -color=yellow +color=bright_yellow flip=true [/enemy] diff --git a/data/room/38.tmx b/data/room/38.tmx index 3a8b484..abea954 100644 --- a/data/room/38.tmx +++ b/data/room/38.tmx @@ -3,8 +3,8 @@ -21,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,0,0,0,21,21,47,48,0,0,0,0,0,0,0,0,47,48,21,21,0,0,0,0,0,0,0,0,0,0,0, +21,21,21,21,21,21,21,23,24,0,0,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,21,21,21,21,21, +21,21,0,0,0,21,21,47,48,0,0,0,0,0,0,0,0,47,48,21,21,21,0,0,0,21,21,21,21,21,0,0, 21,0,0,0,0,0,21,21,223,224,224,224,224,224,224,224,224,224,224,225,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -13,11 +13,11 @@ 21,21,0,0,263,398,398,335,0,0,0,0,397,0,0,0,397,0,0,0,0,0,0,0,0,506,21,21,21,21,0,0, 21,0,0,0,287,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,0,0,0,263,0,0,0, 21,0,0,0,311,0,0,383,0,0,0,0,0,0,0,0,0,0,0,397,399,399,400,397,0,0,0,0,287,0,0,0, -0,0,0,399,397,398,399,400,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,399,397,398,399,400,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,287,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,383,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,556,0,0,0,312,0,0,0,0,0,0,0,0,312,0,0,0,556,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,556,0,0,312,0,0,0,0,0,0,0,0,0,0,0,312,0,556,0,0,0,0,0,311,0,0,0, 218,218,218,219,21,21,21,21,21,21,557,557,557,557,557,557,557,557,21,21,21,21,21,21,21,220,221,221,221,221,221,222 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index d1d88dc05922566b573fc74d6850ed108ff9bc34..fa6ac917a443d627a3873707608ac8bb2a0f42bc 100644 GIT binary patch literal 8130 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 literal 7860 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 diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png index 62c36cbbd66a4375fee418aee8b3368ba3015b46..69a7c9b775c00989d81ecedadd3f129d4c74a74b 100644 GIT binary patch literal 9765 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 LG14y8bc*;tnV~(3 diff --git a/source/director.cpp b/source/director.cpp index 9c1b208..a65eb6f 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -381,11 +381,13 @@ void Director::loadResources(section_t section) textureList.push_back("sam.png"); textureList.push_back("sigmasua.png"); textureList.push_back("spider.png"); + textureList.push_back("spark.png"); textureList.push_back("tuno.png"); textureList.push_back("tv_panel.png"); textureList.push_back("tv.png"); textureList.push_back("shock.png"); textureList.push_back("wave.png"); + textureList.push_back("z80.png"); // Player textureList.push_back("player.png"); @@ -437,11 +439,13 @@ void Director::loadResources(section_t section) animationList.push_back("sam.ani"); animationList.push_back("sigmasua.ani"); animationList.push_back("spider.ani"); + animationList.push_back("spark.ani"); animationList.push_back("tuno.ani"); animationList.push_back("tv_panel.ani"); animationList.push_back("tv.ani"); animationList.push_back("shock.ani"); animationList.push_back("wave.ani"); + animationList.push_back("z80.ani"); // Player animationList.push_back("player.ani"); @@ -532,12 +536,14 @@ void Director::loadResources(section_t section) textureList.push_back("qvoid.png"); textureList.push_back("sam.png"); textureList.push_back("sigmasua.png"); + textureList.push_back("spark.png"); textureList.push_back("spider.png"); textureList.push_back("tuno.png"); textureList.push_back("tv_panel.png"); textureList.push_back("tv.png"); textureList.push_back("shock.png"); textureList.push_back("wave.png"); + textureList.push_back("z80.png"); // Items textureList.push_back("items.png"); @@ -595,12 +601,14 @@ void Director::loadResources(section_t section) animationList.push_back("qvoid.ani"); animationList.push_back("sam.ani"); animationList.push_back("sigmasua.ani"); + animationList.push_back("spark.ani"); animationList.push_back("spider.ani"); animationList.push_back("tuno.ani"); animationList.push_back("tv_panel.ani"); animationList.push_back("tv.ani"); animationList.push_back("shock.ani"); animationList.push_back("wave.ani"); + animationList.push_back("z80.ani"); resource->loadAnimations(animationList); @@ -1193,6 +1201,8 @@ bool Director::setFileList() asset->add(prefix + "/data/enemies/sam.png", t_bitmap); asset->add(prefix + "/data/enemies/sigmasua.ani", t_data); asset->add(prefix + "/data/enemies/sigmasua.png", t_bitmap); + asset->add(prefix + "/data/enemies/spark.ani", t_data); + asset->add(prefix + "/data/enemies/spark.png", t_bitmap); asset->add(prefix + "/data/enemies/spider.ani", t_data); asset->add(prefix + "/data/enemies/spider.png", t_bitmap); asset->add(prefix + "/data/enemies/tuno.ani", t_data); @@ -1205,6 +1215,8 @@ bool Director::setFileList() asset->add(prefix + "/data/enemies/shock.png", t_bitmap); asset->add(prefix + "/data/enemies/wave.ani", t_data); asset->add(prefix + "/data/enemies/wave.png", t_bitmap); + asset->add(prefix + "/data/enemies/z80.ani", t_data); + asset->add(prefix + "/data/enemies/z80.png", t_bitmap); // Jugador asset->add(prefix + "/data/player/player.png", t_bitmap); diff --git a/source/ending2.cpp b/source/ending2.cpp index 059d369..af97b2a 100644 --- a/source/ending2.cpp +++ b/source/ending2.cpp @@ -288,9 +288,11 @@ void Ending2::iniSpriteList() spriteList.push_back("diskette"); spriteList.push_back("bird"); spriteList.push_back("chip"); + spriteList.push_back("spark"); spriteList.push_back("code"); spriteList.push_back("paco"); spriteList.push_back("printer"); + spriteList.push_back("z80"); spriteList.push_back("bell"); spriteList.push_back("dong"); diff --git a/source/enemy.cpp b/source/enemy.cpp index 4c727fc..cc67fdd 100644 --- a/source/enemy.cpp +++ b/source/enemy.cpp @@ -21,6 +21,7 @@ Enemy::Enemy(enemy_t enemy) sprite->setWidth(enemy.w); sprite->setHeight(enemy.h); doFlip = enemy.flip; + mirror = enemy.mirror; if (doFlip) { if (enemy.vx < 0.0f) diff --git a/source/enemy.h b/source/enemy.h index c6ae180..2580788 100644 --- a/source/enemy.h +++ b/source/enemy.h @@ -26,6 +26,7 @@ struct enemy_t int y1; // Limite superior de la ruta en el eje Y int y2; // Limite inferior de la ruta en el eje Y bool flip; // Indica si el enemigo hace flip al terminar su ruta + bool mirror; // Indica si el enemigo está volteado verticalmente std::string color; // Color del enemigo palette_e palette; // Paleta de colores }; @@ -46,6 +47,7 @@ private: int y2; // Limite inferior de la ruta en el eje Y SDL_Rect collider; // Caja de colisión bool doFlip; // Indica si el enemigo hace flip al terminar su ruta + bool mirror; // Indica si el enemigo se dibuja volteado verticalmente // Comprueba si ha llegado al limite del recorrido para darse media vuelta void checkPath(); diff --git a/source/room.cpp b/source/room.cpp index 18ebd1d..252ec0d 100644 --- a/source/room.cpp +++ b/source/room.cpp @@ -78,6 +78,7 @@ room_t loadRoomFile(std::string file_path, bool verbose) { enemy_t enemy; enemy.flip = false; + enemy.mirror = false; enemy.palette = p_zxspectrum; do @@ -316,6 +317,11 @@ bool setEnemy(enemy_t *enemy, std::string var, std::string value) enemy->flip = stringToBool(value); } + else if (var == "mirror") + { + enemy->mirror = stringToBool(value); + } + else if (var == "color") { enemy->color = value; @@ -734,7 +740,7 @@ tile_e Room::getTile(SDL_Point point) // Devuelve el tipo de tile que hay en ese indice tile_e Room::getTile(int index) { - //const bool onRange = (index > -1) && (index < mapWidth * mapHeight); + // const bool onRange = (index > -1) && (index < mapWidth * mapHeight); const bool onRange = (index > -1) && (index < (int)tileMap.size()); if (onRange) @@ -975,7 +981,7 @@ void Room::setTopSurfaces() } } - // Añade un terminador + // Añade un terminador tile.push_back(-1); // Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies @@ -1036,7 +1042,7 @@ void Room::setLeftSurfaces() } } - // Añade un terminador + // Añade un terminador tile.push_back(-1); // Recorre el vector de tiles buscando tiles consecutivos @@ -1084,7 +1090,7 @@ void Room::setRightSurfaces() } } - // Añade un terminador + // Añade un terminador tile.push_back(-1); // Recorre el vector de tiles buscando tiles consecutivos diff --git a/todo.txt b/todo.txt index f0ef122..9472c13 100644 --- a/todo.txt +++ b/todo.txt @@ -56,7 +56,7 @@ x (A) Las vidas del marcador no estan animadas. No cambian de frame (A) Mejorar las cintas. no permitir saltar hacia atras x (A) Cambio de paleta en caliente x (A) Precargar todos los recursos del juego -(A) Deshabilitar el input hasta que se suelten todas las teclas +x (A) Deshabilitar el input hasta que se suelten todas las teclas ## TEMAS @@ -73,7 +73,7 @@ x mini ascii mappy x paco x chirping -abad y batman +x abad y batman x jail counter strike starcraft @@ -84,7 +84,7 @@ molotov tutorials gavina puzzle restorer -qvoid +x qvoid brick roll dante's fall repairing computers