Skip to content

Commit

Permalink
V0.2 update
Browse files Browse the repository at this point in the history
Includes the following:
Added idle, critical and grow animations.
Game cursor will return to the last place the user was on their turn.
Player select screen has some extra infomation and will block starting
a game if there are not enough players selected.
Bug fixes for Current and Next not showing right.
Bug fixes for single frame graphics courption on switching players.
Added first pass box art (blue an black versions, both MegaDrive).
Added the first pass of the tutorial.
  • Loading branch information
thegouldfish committed Jun 3, 2018
1 parent b6e1f1a commit 0b660e2
Show file tree
Hide file tree
Showing 16 changed files with 974 additions and 189 deletions.
2 changes: 2 additions & 0 deletions Atoms/Atoms.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<ClInclude Include="inc\PlayerSelectState.h" />
<ClInclude Include="inc\SimpleState.h" />
<ClInclude Include="inc\Title.h" />
<ClInclude Include="inc\TutorialState.h" />
<ClInclude Include="inc\WinnerScreen.h" />
<ClInclude Include="res\gfx.h" />
<ClInclude Include="res\sound.h" />
Expand All @@ -112,6 +113,7 @@
<ClCompile Include="src\PlayerSelectState.c" />
<ClCompile Include="src\SimpleState.c" />
<ClCompile Include="src\Title.c" />
<ClCompile Include="src\TutorialState.c" />
<ClCompile Include="src\WinnerScreen.c" />
<Resource Include="src\boot\sega.s">
<FileType>Text</FileType>
Expand Down
6 changes: 6 additions & 0 deletions Atoms/Atoms.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<ClInclude Include="inc\WinnerScreen.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="inc\TutorialState.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Resource Include="res\gfx.res">
Expand Down Expand Up @@ -91,6 +94,9 @@
<ClCompile Include="src\WinnerScreen.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\TutorialState.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="Make.ps1">
Expand Down
18 changes: 18 additions & 0 deletions Atoms/inc/TutorialState.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#ifndef TUTORIAL_STATE
#define TUTORIAL_STATE

#include "SimpleState.h"




void TutorialStateStart();
void TutorialStateUpdate();
void TutorialStateEnd();


extern SimpleState TutorialState;



#endif
Binary file added Atoms/res/Sprite/Buttons.bmp
Binary file not shown.
Binary file added Atoms/res/Sprite/players2.bmp
Binary file not shown.
2 changes: 2 additions & 0 deletions Atoms/res/gfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ extern const Image winner_ai3;
extern const Image winner_ai4;
extern const Image winner_ai5;
extern const Image winner_ai6;
extern const Image tutorial_backing;
extern const Image tutorial_backing_2;

#endif // _RES_GFX_H_
7 changes: 5 additions & 2 deletions Atoms/res/gfx.res
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// IMAGE bgb_image "gfx/bgb.png" BEST
IMAGE ingame_back "gfx/ingame_Backing.bmp" BEST
IMAGE atoms "gfx/atoms_24.bmp" NONE
IMAGE atoms "gfx/atoms_anims2.bmp" NONE

IMAGE title_front "gfx/TitleFront.bmp" BEST
IMAGE title_back "gfx/TitleBack.bmp" BEST
Expand All @@ -26,4 +26,7 @@ IMAGE winner_ai2 "gfx/winner/image8.bmp" BEST
IMAGE winner_ai3 "gfx/winner/image9.bmp" BEST
IMAGE winner_ai4 "gfx/winner/image10.bmp" BEST
IMAGE winner_ai5 "gfx/winner/image11.bmp" BEST
IMAGE winner_ai6 "gfx/winner/image11.bmp" BEST
IMAGE winner_ai6 "gfx/winner/image11.bmp" BEST

IMAGE tutorial_backing "gfx/tutorial.bmp" BEST
IMAGE tutorial_backing_2 "gfx/tutorial_backing2.bmp" BEST
Binary file added Atoms/res/gfx/atoms_anims2.bmp
Binary file not shown.
Binary file added Atoms/res/gfx/tutorial.bmp
Binary file not shown.
Binary file added Atoms/res/gfx/tutorial_backing2.bmp
Binary file not shown.
5 changes: 3 additions & 2 deletions Atoms/res/sprite.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#define _RES_SPRITE_H_

extern const SpriteDefinition Cursor;
extern const SpriteDefinition profs_player;
extern const SpriteDefinition profs_robot;
extern const SpriteDefinition playerselect_cursor;
extern const SpriteDefinition profs;
extern const SpriteDefinition robo_pal;
extern const SpriteDefinition controller;

#endif // _RES_SPRITE_H_
7 changes: 4 additions & 3 deletions Atoms/res/sprite.res
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// SPRITE ring_sprite "sprite/ring.png" 2 2 FAST 5
SPRITE Cursor "sprite/Cursor.bmp" 4 4 BEST 10
SPRITE profs_player "sprite/Prof-players.bmp" 6 6 BEST 0
SPRITE profs_robot "sprite/profs-robots.bmp" 6 6 BEST 0
SPRITE playerselect_cursor "sprite/menuCursor.bmp" 6 10 BEST 0
SPRITE playerselect_cursor "sprite/menuCursor.bmp" 6 10 BEST 0
SPRITE profs "sprite/players2.bmp" 6 6 NONE 0
SPRITE robo_pal "sprite/ProfPalette.bmp" 6 6 BEST 0
SPRITE controller "sprite/Buttons.bmp" 3 3 BEST 0
Loading

0 comments on commit 0b660e2

Please sign in to comment.