Skip to content

Commit

Permalink
Update doom with new tiles, add panel tile type
Browse files Browse the repository at this point in the history
Fix nothing tile loading #475
  • Loading branch information
cxong committed Mar 14, 2020
1 parent da30f95 commit f81c9cf
Show file tree
Hide file tree
Showing 21 changed files with 2,418 additions and 112 deletions.
6 changes: 6 additions & 0 deletions graphics/wall/panel/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Derived from

190+ Pixel Art Assets (Sci-fi & Forest)
by Gabsond
https://opengameart.org/content/190-pixel-art-assets-sci-fi-forest
http://creativecommons.org/publicdomain/zero/1.0/
Binary file added graphics/wall/panel/e.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/et.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/h.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/n.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/ne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/nt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/nw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/o.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/se.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/st.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/v.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/w.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/wt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/wall/panel/x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion missions/doom.cdogscpn/campaign.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Version": 13,
"Version": 15,
"Title": "Doom",
"Author": "Cong",
"Description": "Stuck on Mars for insubordination, you are a marine who has just arrived at the dullest assignment in the system. They say your employer, UAC, are performing secret experiments to do with teleportation, but what could go wrong with that?",
Expand Down
72 changes: 36 additions & 36 deletions missions/doom.cdogscpn/characters.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"Version": 12,
"Version": 13,
"Characters": [{
"Class": "Cyber Jones",
"Skin": "b79536",
"Arms": "646464",
"Body": "646464",
"Legs": "646464",
"Hair": "646464",
"Class": "Cyborg",
"Skin": "b79536ff",
"Arms": "646464ff",
"Body": "646464ff",
"Legs": "646464ff",
"Hair": "000000ff",
"speed": 128,
"Gun": "Marine Shotgun",
"maxHealth": 20,
Expand All @@ -17,12 +17,12 @@
"actionDelay": 20
},
{
"Class": "Cyber Smith",
"Skin": "b79536",
"Arms": "b79536",
"Body": "ff8136",
"Legs": "882800",
"Hair": "149c14",
"Class": "Cyborg",
"Skin": "b79536ff",
"Arms": "b79536ff",
"Body": "ff8136ff",
"Legs": "882800ff",
"Hair": "000000ff",
"speed": 192,
"Gun": "Marine Pistol",
"maxHealth": 30,
Expand All @@ -34,11 +34,11 @@
},
{
"Class": "Ogre",
"Skin": "882800",
"Arms": "d25106",
"Body": "d25106",
"Legs": "d25106",
"Hair": "c00000",
"Skin": "882800ff",
"Arms": "d25106ff",
"Body": "d25106ff",
"Legs": "d25106ff",
"Hair": "c00000ff",
"speed": 192,
"Gun": "Imp Fireball",
"maxHealth": 40,
Expand All @@ -49,12 +49,12 @@
"actionDelay": 15
},
{
"Class": "Evil Ogre",
"Skin": "ff76f5",
"Arms": "ff76f5",
"Body": "ff76f5",
"Legs": "ff76f5",
"Hair": "fffffe",
"Class": "Ogre",
"Skin": "ff76f5ff",
"Arms": "ff76f5ff",
"Body": "ff76f5ff",
"Legs": "ff76f5ff",
"Hair": "000000ff",
"speed": 320,
"Gun": "Monster Bite",
"maxHealth": 70,
Expand All @@ -65,12 +65,12 @@
"actionDelay": 13
},
{
"Class": "Evil Ogre",
"Skin": "ff76f5",
"Arms": "ff76f5",
"Body": "ff76f5",
"Legs": "ff76f5",
"Hair": "fffffc",
"Class": "Ogre",
"Skin": "ff76f5ff",
"Arms": "ff76f5ff",
"Body": "ff76f5ff",
"Legs": "ff76f5ff",
"Hair": "000000ff",
"speed": 320,
"Gun": "Monster Bite",
"maxHealth": 70,
Expand All @@ -81,12 +81,12 @@
"actionDelay": 13
},
{
"Class": "Evil Ogre",
"Skin": "ff76f5",
"Arms": "9c5858",
"Body": "ff76f5",
"Legs": "ff8136",
"Hair": "5b5b5b",
"Class": "Ogre",
"Skin": "ff76f5ff",
"Arms": "9c5858ff",
"Body": "ff76f5ff",
"Legs": "ff8136ff",
"Hair": "000000ff",
"speed": 256,
"Gun": "Baron Fireball",
"maxHealth": 500,
Expand Down
2,448 changes: 2,374 additions & 74 deletions missions/doom.cdogscpn/missions.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/cdogs/tile_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void TileClassInitDefault(
}
void TileClassReloadPic(TileClass *t, PicManager *pm)
{
if (t->Name != NULL)
if (t->Name != NULL && strlen(t->Name) != 0)
{
// Generate the pic in case it doesn't exist
PicManagerGenerateMaskedStylePic(
Expand Down

0 comments on commit f81c9cf

Please sign in to comment.