Skip to content

Commit

Permalink
Added support to build Crypts.
Browse files Browse the repository at this point in the history
Closes OpenDungeons#314

I also upgraded the models format and tested the editor to make sure.
  • Loading branch information
Yohann Ferreira committed Nov 13, 2014
1 parent 9706d42 commit 2b3c239
Show file tree
Hide file tree
Showing 29 changed files with 420 additions and 6 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ set(OD_SOURCEFILES
${SRC}/render/TextRenderer.cpp

${SRC}/rooms/Room.cpp
${SRC}/rooms/RoomCrypt.cpp
${SRC}/rooms/RoomDormitory.cpp
${SRC}/rooms/RoomDungeonTemple.cpp
${SRC}/rooms/RoomForge.cpp
Expand Down
13 changes: 12 additions & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file is listing each files present in this repository, its author and its c
Each corresponding license is fully described in the licenses/ folder.
Other text files (.txt, .cpp, .h., ...), except licensing, are licensed using the GPL 3.0 license.

Latest update: 2014/11/01
Latest update: 2014/11/13

=============================
== Configuration: config/ ==
Expand Down Expand Up @@ -99,14 +99,18 @@ textures/
-> AdventurerBed.png PantherOne CC0 http://opengameart.org/content/tent-pack
-> Anvil.png Daniel74, Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=59714#p59714
-> Axe.png Skorpio CC-BY-SA 3.0, GPL 3.0
-> CelticCross.png Yughues CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
-> ChickenCoop_tex.png Dm3d CC-BY-SA 3.0 http://opengameart.org/content/chicken-coop
-> Chimney.png Daniel74, Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=59775#p59775
-> Crypt.png Yughues CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
-> DragonBed.png Dm3d GPL 2.0/GPL 3.0/CC-BY-SA 3.0 http://opengameart.org/content/goldpile
-> Forge.png Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=59714#p59714
-> Foundry.png Daniel74, Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=59775#p59775
-> Grindstone.png Daniel74, Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=59775#p59775
-> Hammock.png Luke.RUSTLTD, Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=59983#p59983
-> ImpBed.png Nobiax CC0 and J. W. Bjerk (magic circle) CC-BY3 or GPL3 - http://opengameart.org/content/painterly-spell-icons-part-3 - http://opengameart.org/users/yughues
-> KnightCoffin.png Yughues CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
-> KnightStatue.png Yughues CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p6071
-> Lamp.png Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?
-> LizardmanBed.png Nobiax, public domain CC0 http://forum.freegamedev.net/viewtopic.php?p=60197#p60197
-> Obsidian.png Reiner Flassig CC-BY-SA/DE 2.0 Obsidian photo source - http://de.wikipedia.org/w/index.php?title=Datei:Obsi.jpg&filetimestamp=20070905143430
Expand All @@ -116,6 +120,7 @@ textures/
-> Spike-trapTexture.png P0ss, Danimal CC-BY 3.0 http://opengameart.org/content/spyke-trap-low-poly
-> Spider.png DennisH2010 CC-BY 3.0 http://www.blendswap.com/blends/view/26798
-> Spiderbed.png Eugeneloza, Nobiax CC0 http://forum.freegamedev.net/viewtopic.php?p=60089#p60089
-> StoneCoffin.png Yughues CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
-> TentacleBed.png West CC0 http://forum.freegamedev.net/viewtopic.php?p=60091#p60091
-> TrainingDummy2_texture.png Danimal CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=59239#p59239
-> TrainingDummy3.png P0ss CC-BY 3.0 http://forum.freegamedev.net/viewtopic.php?p=59351#p59351
Expand All @@ -142,13 +147,15 @@ Bookshelf.mesh Danimal CC-BY-SA 3.0
Cannon.mesh Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0
Cannonball.mesh Andrew Buck CC-BY-SA 3.0
Cavehornet.* Skorpio CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=59058#p59058
CelticCross.mesh Danimal CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
Chair.mesh Skorpio CC-BY-SA 3.0, GPL 3.0
Chicken.* Skorpio CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=59058#p59058
ChickenCoop.mesh Dm3d, Danimal CC-BY-SA 3.0 http://opengameart.org/content/chicken-coop
Chimney.mesh Daniel74 CC0 http://forum.freegamedev.net/viewtopic.php?p=59775#p59775
Claimed* Skorpio CC-BY-SA 3.0, GPL 3.0
Con_worker.* Skorpio CC-BY-SA 3.0, GPL 3.0
Cre_vision_indicator.mesh Andrew Buck CC-BY-SA 3.0
Crypt.mesh Danimal CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
Dirt* Skorpio CC-BY-SA 3.0, GPL 3.0
Dojo.mesh p0ss CC-BY-SA 3.0
DojoRockObject.mesh p0ss CC-BY-SA 3.0
Expand All @@ -173,6 +180,9 @@ Hammock.mesh eugeneloza CC0
ImpBed.mesh eugeneloza CC0 http://forum.freegamedev.net/viewtopic.php?p=60275#p60275
Keeperhand.* Skorpio CC-BY-SA 3.0, GPL 3.0
Knight.* surt CC0 http://opengameart.org/forumtopic/cc0-scraps
KnightCoffin.mesh YD CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
KnightStatue.mesh YD CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
KnightStatue2.mesh YD CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
Kobold.* surt CC0 http://opengameart.org/forumtopic/cc0-scraps
Kreatur.* Skorpio CC-BY-SA 3.0, GPL 3.0
Lamp.mesh Danimal CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=59621#p59621
Expand Down Expand Up @@ -200,6 +210,7 @@ Spiderbed.mesh Eugeneloza CC0
Spiketrap.* Danimal CC-BY 3.0 http://opengameart.org/content/spyke-trap-low-poly
SquareSelector.mesh OD Team CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=59066#p59066
Staff.* Skorpio CC-BY-SA 3.0, GPL 3.0
StoneCoffin.mesh Yughues CC0 http://forum.freegamedev.net/viewtopic.php?p=60771#p60771
Stool.mesh Skorpio CC-BY-SA 3.0, GPL 3.0
TentacleBed.mesh Eugeneloza CC0 http://forum.freegamedev.net/viewtopic.php?p=60091#p60091
Table.mesh Skorpio CC-BY-SA 3.0, GPL 3.0
Expand Down
1 change: 1 addition & 0 deletions gui/OpenDungeonsIcons.imageset
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<Image height="60" name="TreasuryButton" width="60" xPos="187" yPos="97" />
<Image height="60" name="LibraryButton" width="60" xPos="249" yPos="97" />
<Image height="60" name="HatcheryButton" width="60" xPos="322" yPos="97" />
<Image height="60" name="CryptButton" width="60" xPos="382" yPos="97" />
<Image height="60" name="DestroyRoomButton" width="60" xPos="450" yPos="97" />

<Image height="60" name="CannonButton" width="60" xPos="132" yPos="159" />
Expand Down
Binary file modified gui/OpenDungeonsIcons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions gui/OpenDungeonsMenuRooms.layout
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
<Property name="TooltipText" value="Build a Hatchery" />
<Property name="InheritsAlpha" value="False" />
</Window>
<Window type="OD/ImageButton" name="CryptButton" >
<Property name="Area" value="{{0,460},{0,21},{0,520},{0,81}}" />
<Property name="NormalImage" value="OpenDungeonsIcons/CryptButton" />
<Property name="TooltipText" value="Build a Crypt" />
<Property name="InheritsAlpha" value="False" />
</Window>
<Window type="OD/ImageButton" name="DestroyRoomButton" >
<Property name="Area" value="{{0,20},{0,20},{0,80},{0,80}}" />
<Property name="NormalImage" value="OpenDungeonsIcons/DestroyRoomButton" />
Expand Down
42 changes: 42 additions & 0 deletions materials/scripts/CelticCross.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// CelticCross genrated by blender2ogre 0.6.0

material CelticCross
{
receive_shadows on

technique
{
pass CelticCross
{
ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
specular 0.0 0.0 0.0 1.0 62.5
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture CelticCross.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
42 changes: 42 additions & 0 deletions materials/scripts/Crypt.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Cript genrated by blender2ogre 0.6.0

material Cript
{
receive_shadows on

technique
{
pass Cript
{
ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
specular 0.0 0.0 0.0 1.0 12.5
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture Crypt.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
42 changes: 42 additions & 0 deletions materials/scripts/KnightCoffin.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// KnightCoffin genrated by blender2ogre 0.6.0

material KnightCoffin
{
receive_shadows on

technique
{
pass KnightCoffin
{
ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
specular 0.10000000149011612 0.10000000149011612 0.10000000149011612 1.0 12.5
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture KnightCoffin.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
42 changes: 42 additions & 0 deletions materials/scripts/KnightStatue2.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// knightStatue2 genrated by blender2ogre 0.6.0

material knightStatue2
{
receive_shadows on

technique
{
pass knightStatue2
{
ambient 0.41092970967292786 0.41092970967292786 0.41092970967292786 1.0
diffuse 0.41092970967292786 0.41092970967292786 0.41092970967292786 1.0
specular 0.4000000059604645 0.4000000059604645 0.4000000059604645 1.0 12.5
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture KnightStatue.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
42 changes: 42 additions & 0 deletions materials/scripts/StoneCoffin.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// StoneCoffin genrated by blender2ogre 0.6.0

material StoneCoffin
{
receive_shadows on

technique
{
pass StoneCoffin
{
ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
specular 0.0 0.0 0.0 1.0 12.5
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture StoneCoffin.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
42 changes: 42 additions & 0 deletions materials/scripts/knightStatue.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// knightStatue genrated by blender2ogre 0.6.0

material knightStatue
{
receive_shadows on

technique
{
pass knightStatue
{
ambient 0.41092970967292786 0.41092970967292786 0.41092970967292786 1.0
diffuse 0.41092970967292786 0.41092970967292786 0.41092970967292786 1.0
specular 0.4060606360435486 0.4060606360435486 0.4060606360435486 1.0 12.5
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture KnightStatue.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
Binary file added materials/textures/CelticCross.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 materials/textures/Crypt.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 materials/textures/KnightCoffin.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 materials/textures/KnightStatue.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 materials/textures/StoneCoffin.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 models/CelticCross.mesh
Binary file not shown.
Binary file added models/Crypt.mesh
Binary file not shown.
Binary file added models/KnightCoffin.mesh
Binary file not shown.
Binary file added models/KnightStatue.mesh
Binary file not shown.
Binary file added models/KnightStatue2.mesh
Binary file not shown.
Binary file added models/StoneCoffin.mesh
Binary file not shown.
11 changes: 11 additions & 0 deletions source/network/ODServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "traps/TrapCannon.h"
#include "traps/TrapSpike.h"
#include "traps/TrapBoulder.h"
#include "rooms/RoomCrypt.h"
#include "rooms/RoomDormitory.h"
#include "rooms/RoomDungeonTemple.h"
#include "rooms/RoomForge.h"
Expand Down Expand Up @@ -1035,6 +1036,11 @@ bool ODServer::processClientNotifications(ODSocketClient* clientSocket)
room = new RoomTreasury(gameMap);
break;
}
case Room::RoomType::crypt:
{
room = new RoomCrypt(gameMap);
break;
}
default:
OD_ASSERT_TRUE_MSG(false, "Unknown enum value : " + Ogre::StringConverter::toString(
static_cast<int>(type)));
Expand Down Expand Up @@ -1463,6 +1469,11 @@ bool ODServer::processClientNotifications(ODSocketClient* clientSocket)
room = new RoomTreasury(gameMap);
break;
}
case Room::RoomType::crypt:
{
room = new RoomCrypt(gameMap);
break;
}
default:
OD_ASSERT_TRUE_MSG(false, "Unknown enum value : " + Ogre::StringConverter::toString(
static_cast<int>(type)));
Expand Down
Loading

0 comments on commit 2b3c239

Please sign in to comment.