Skip to content
Permalink
Browse files

Merged PR 497: Merge 601_player_holdings to master

Related work items: #601
  • Loading branch information...
realms-mud committed May 1, 2019
1 parent eeb9209 commit 7f8662a04aaf050a17215fe73a7d0a0ad75f7a00
Showing with 582 additions and 5 deletions.
  1. +73 −2 dictionaries/domains/buildings.h
  2. +5 −0 dictionaries/domains/features/domainFeature.c
  3. +13 −0 dictionaries/domains/features/south-castle-tower-exterior.c
  4. +13 −0 dictionaries/domains/features/southeast-castle-tower-exterior.c
  5. +13 −0 dictionaries/domains/features/southeast-castle-wall-exterior.c
  6. +13 −0 dictionaries/domains/features/southwest-castle-tower-exterior.c
  7. +13 −0 dictionaries/domains/features/southwest-castle-wall-exterior.c
  8. +5 −0 dictionaries/domains/layouts/baseLayout.c
  9. +13 −0 dictionaries/domains/layouts/moat.c
  10. +18 −0 dictionaries/domains/player-holding.c
  11. +22 −0 dictionaries/domains/rooms/keep-1x1.c
  12. +22 −0 dictionaries/domains/rooms/keep-1x10.c
  13. +23 −0 dictionaries/domains/rooms/keep-1x11.c
  14. +22 −0 dictionaries/domains/rooms/keep-1x12.c
  15. +22 −0 dictionaries/domains/rooms/keep-1x13.c
  16. +23 −0 dictionaries/domains/rooms/keep-1x14.c
  17. +22 −0 dictionaries/domains/rooms/keep-1x15.c
  18. +22 −0 dictionaries/domains/rooms/keep-1x16.c
  19. +22 −0 dictionaries/domains/rooms/keep-1x17.c
  20. +22 −0 dictionaries/domains/rooms/keep-1x2.c
  21. +22 −0 dictionaries/domains/rooms/keep-1x3.c
  22. +23 −0 dictionaries/domains/rooms/keep-1x4.c
  23. +22 −0 dictionaries/domains/rooms/keep-1x5.c
  24. +22 −0 dictionaries/domains/rooms/keep-1x6.c
  25. +23 −0 dictionaries/domains/rooms/keep-1x7.c
  26. +22 −0 dictionaries/domains/rooms/keep-1x8.c
  27. +27 −0 dictionaries/domains/rooms/keep-1x9.c
  28. +3 −3 environment/environment.c
  29. +17 −0 tests/modules/domains/playerHoldingsTest.c
@@ -4,7 +4,78 @@
//*****************************************************************************

private mapping BuildingBlueprints = ([
"wall":([

"small wooden keep":([
"dimensions": "3x3",
"description": "",
"components":([
"keep": "3x3"
])
]),
"wooden keep":([
"dimensions":"3x3",
"description": "",
"components":([
"keep":"3x3"
])
]),
"wooden motte and bailey":([
"dimensions":"7x7",
"description": "",
"components":([
"keep":"3x3",
"northwest tower": "2x2",
"northwest building": "1x2",
"north tower": "1x2",
"northeast building": "1x2",
"northeast tower": "2x2",
"first western building": "1x2",
"second western building": "1x2",
"west tower": "1x2",
"first eastern building": "1x2",
"second eastern building": "1x2",
"east tower": "1x2",
"southwest tower": "2x2",
"southwest building": "1x2",
"south tower": "1x2",
"southeast building": "1x2",
"southeast tower": "2x2",
])
]),
"small stone keep":([
"dimensions":"3x3",
"description": "",
"components":([
"keep":"3x3"
])
]),
"stone keep":([
"dimensions":"3x3",
"description": "",
"components":([
"keep":"3x3"
])
]),
"stone motte and bailey":([
"dimensions":"7x7",
"description": "",
"components":([
"keep":"3x3",
"northwest tower": "2x2",
"northwest building": "1x2",
"north tower": "1x2",
"northeast building": "1x2",
"northeast tower": "2x2",
"first western building": "1x2",
"second western building": "1x2",
"west tower": "1x2",
"first eastern building": "1x2",
"second eastern building": "1x2",
"east tower": "1x2",
"southwest tower": "2x2",
"southwest building": "1x2",
"south tower": "1x2",
"southeast building": "1x2",
"southeast tower": "2x2",
])
]),
]);
@@ -0,0 +1,5 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/environment/features/baseFeature.c";
@@ -0,0 +1,13 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/features/domainFeature.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
Name("south castle tower exterior");

addDescriptionTemplate("a tower");
}
@@ -0,0 +1,13 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/features/domainFeature.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
Name("southeast castle tower exterior");

addDescriptionTemplate("a tower");
}
@@ -0,0 +1,13 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/features/domainFeature.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
Name("southeast castle wall exterior");

addDescriptionTemplate("a wall");
}
@@ -0,0 +1,13 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/features/domainFeature.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
Name("southwest castle tower exterior");

addDescriptionTemplate("a tower");
}
@@ -0,0 +1,13 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/features/domainFeature.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
Name("southwest castle wall exterior");

addDescriptionTemplate("a wall");
}
@@ -0,0 +1,5 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/environment/terrain/baseTerrain.c";
@@ -0,0 +1,13 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/layouts/baseLayout.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
Name("moat");

addDescriptionTemplate("a moat");
}
@@ -0,0 +1,18 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/environment/environment.c";

/////////////////////////////////////////////////////////////////////////////
protected nomask void setLayout(string layout)
{
setTerrain(layout);
}

/////////////////////////////////////////////////////////////////////////////
protected nomask varargs void addConditionalExit(string layout,
string condition, string direction, string path, string state)
{
addExit(direction, path, state);
}
@@ -0,0 +1,22 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/southwest-castle-tower-exterior.c", "northeast");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "north", "/lib/dictionaries/domains/rooms/keep-2x1.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x2.c");

setCoordinates("keep", 1, 1);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,22 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/south-castle-tower-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x9.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x11.c");

setCoordinates("keep", 1, 10);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,23 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/south-castle-tower-exterior.c", "northwest");
addFeature("/lib/dictionaries/domains/features/southeast-castle-wall-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x10.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x12.c");

setCoordinates("keep", 1, 11);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,22 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/southeast-castle-wall-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x11.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x13.c");

setCoordinates("keep", 1, 12);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,22 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/southeast-castle-wall-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x12.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x14.c");

setCoordinates("keep", 1, 13);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,23 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/southeast-castle-tower-exterior.c", "northeast");
addFeature("/lib/dictionaries/domains/features/southeast-castle-wall-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x13.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x15.c");

setCoordinates("keep", 1, 14);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,22 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/southeast-castle-tower-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x14.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x16.c");

setCoordinates("keep", 1, 15);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
@@ -0,0 +1,22 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
inherit "/lib/dictionaries/domains/player-holding.c";

/////////////////////////////////////////////////////////////////////////////
public void Setup()
{
cloneEnvironment();
setLayout("/lib/dictionaries/domains/layouts/moat.c");
addFeature("/lib/dictionaries/domains/features/southeast-castle-tower-exterior.c", "north");

addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "west", "/lib/dictionaries/domains/rooms/keep-1x15.c");
addConditionalExit("/lib/dictionaries/domains/layouts/moat.c",
"none", "east", "/lib/dictionaries/domains/rooms/keep-1x17.c");

setCoordinates("keep", 1, 16);

setStateMachine("/lib/dictionaries/domains/stateMachine/domainStateMachine.c");
}
Oops, something went wrong.

0 comments on commit 7f8662a

Please sign in to comment.
You can’t perform that action at this time.