Skip to content
Permalink
Browse files

Merged PR 478: Merge 565_enter_the_lair to master

Related work items: #565, #161
  • Loading branch information...
realms-mud committed Apr 2, 2019
1 parent 3fddc80 commit ab848592d2bfd8b4bf6b040b3d16232921d310e5
Showing with 1,090 additions and 37 deletions.
  1. +252 −15 dictionaries/materials/food.h
  2. +17 −0 instances/items/food/plants/grains/amaranth.c
  3. +17 −0 instances/items/food/plants/grains/barley.c
  4. +17 −0 instances/items/food/plants/grains/basmati-rice.c
  5. +17 −0 instances/items/food/plants/grains/buckwheat.c
  6. +17 −0 instances/items/food/plants/grains/chia.c
  7. +17 −0 instances/items/food/plants/grains/dent-corn.c
  8. +17 −0 instances/items/food/plants/grains/flax.c
  9. +17 −0 instances/items/food/plants/grains/flint-corn.c
  10. +17 −0 instances/items/food/plants/grains/flour-corn.c
  11. +17 −0 instances/items/food/plants/grains/fonio.c
  12. +17 −0 instances/items/food/plants/grains/millet.c
  13. +17 −0 instances/items/food/plants/grains/oat.c
  14. +17 −0 instances/items/food/plants/grains/pod-corn.c
  15. +17 −0 instances/items/food/plants/grains/popcorn.c
  16. +17 −0 instances/items/food/plants/grains/quinoa.c
  17. +17 −0 instances/items/food/plants/grains/rice.c
  18. +17 −0 instances/items/food/plants/grains/rye.c
  19. +17 −0 instances/items/food/plants/grains/sorghum.c
  20. +17 −0 instances/items/food/plants/grains/spelt.c
  21. +17 −0 instances/items/food/plants/grains/striped-maize.c
  22. +17 −0 instances/items/food/plants/grains/sweet-corn.c
  23. +17 −0 instances/items/food/plants/grains/teff.c
  24. +17 −0 instances/items/food/plants/grains/triticale.c
  25. +17 −0 instances/items/food/plants/grains/waxy-corn.c
  26. +17 −0 instances/items/food/plants/grains/wheat.c
  27. +17 −0 instances/items/food/plants/grains/wild-rice.c
  28. +17 −0 instances/items/food/plants/legumes/black-eyed-pea.c
  29. +17 −0 instances/items/food/plants/legumes/black-turtle-bean.c
  30. +17 −0 instances/items/food/plants/legumes/cannellini-bean.c
  31. +17 −0 instances/items/food/plants/legumes/chickpea.c
  32. +17 −0 instances/items/food/plants/legumes/fava-bean.c
  33. +17 −0 instances/items/food/plants/legumes/great-northern-bean.c
  34. +17 −0 instances/items/food/plants/legumes/green-bean.c
  35. +17 −0 instances/items/food/plants/legumes/green-lentil.c
  36. +17 −0 instances/items/food/plants/legumes/kidney-bean.c
  37. +17 −0 instances/items/food/plants/legumes/lima-bean.c
  38. +17 −0 instances/items/food/plants/legumes/lupin-bean.c
  39. +17 −0 instances/items/food/plants/legumes/mung-bean.c
  40. +17 −0 instances/items/food/plants/legumes/navy-bean.c
  41. +17 −0 instances/items/food/plants/legumes/peanut.c
  42. +17 −0 instances/items/food/plants/legumes/pigeon-pea.c
  43. +17 −0 instances/items/food/plants/legumes/pinto-bean.c
  44. +17 −0 instances/items/food/plants/legumes/red-lentil.c
  45. +17 −0 instances/items/food/plants/legumes/runner-bean.c
  46. +17 −0 instances/items/food/plants/legumes/snow-pea.c
  47. +17 −0 instances/items/food/plants/legumes/soybean.c
  48. +17 −0 instances/items/food/plants/legumes/wax-bean.c
  49. +1 −2 tutorial/characters/bregar/bregar.c
  50. +8 −8 tutorial/characters/bregar/startingConversation.c
  51. +0 −1 tutorial/characters/halgaladh/startingConversation.c
  52. +14 −0 tutorial/features/obedience-temple-near.c
  53. +1 −0 tutorial/rooms/battleScene.c
  54. +1 −1 tutorial/rooms/fallenAegis.c
  55. +2 −2 tutorial/rooms/onTheTrailPart1.c
  56. +1 −1 tutorial/rooms/onTheTrailPart1b.c
  57. +1 −1 tutorial/rooms/onTheTrailPart2.c
  58. +1 −1 tutorial/rooms/onTheTrailPart3.c
  59. +1 −1 tutorial/rooms/onTheTrailPart4.c
  60. +1 −1 tutorial/rooms/onTheTrailPart5.c
  61. +1 −1 tutorial/rooms/onTheTrailPart6.c
  62. +1 −1 tutorial/rooms/onTheTrailPart7.c
  63. +4 −1 tutorial/rooms/onTheTrailPart8.c
  64. +1 −0 tutorial/stateMachines/actors.c

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Amaranth");
set("short", "Amaranth");
set("aliases", ({ "amaranth" }));
set("blueprint", "amaranth");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Barley");
set("short", "Barley");
set("aliases", ({ "barley" }));
set("blueprint", "barley");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Basmati Rice");
set("short", "Basmati Rice");
set("aliases", ({ "basmati rice", "rice" }));
set("blueprint", "basmati rice");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Buckwheat");
set("short", "Buckwheat");
set("aliases", ({ "buckwheat" }));
set("blueprint", "buckwheat");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Chia");
set("short", "Chia");
set("aliases", ({ "chia" }));
set("blueprint", "chia");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Dent Corn");
set("short", "Dent Corn");
set("aliases", ({ "dent corn", "corn" }));
set("blueprint", "dent corn");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Flax");
set("short", "Flax");
set("aliases", ({ "flax" }));
set("blueprint", "flax");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Flint Corn");
set("short", "Flint Corn");
set("aliases", ({ "flint corn", "corn" }));
set("blueprint", "flint corn");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Flour Corn");
set("short", "Flour Corn");
set("aliases", ({ "flour corn", "corn" }));
set("blueprint", "flour corn");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Fonio");
set("short", "Fonio");
set("aliases", ({ "fonio" }));
set("blueprint", "fonio");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Millet");
set("short", "Millet");
set("aliases", ({ "millet" }));
set("blueprint", "millet");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Oat");
set("short", "Oat");
set("aliases", ({ "oat" }));
set("blueprint", "oat");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Pod Corn");
set("short", "Pod Corn");
set("aliases", ({ "pod corn", "corn" }));
set("blueprint", "pod corn");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Poporn");
set("short", "Poporn");
set("aliases", ({ "popcorn", "corn" }));
set("blueprint", "popcorn");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Quinoa");
set("short", "Quinoa");
set("aliases", ({ "quinoa" }));
set("blueprint", "quinoa");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Rice");
set("short", "Rice");
set("aliases", ({ "rice" }));
set("blueprint", "rice");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Rye");
set("short", "Rye");
set("aliases", ({ "rye" }));
set("blueprint", "rye");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Sorghum");
set("short", "Sorghum");
set("aliases", ({ "sorghum" }));
set("blueprint", "sorghum");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Spelt");
set("short", "Spelt");
set("aliases", ({ "spelt" }));
set("blueprint", "spelt");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Striped Maize");
set("short", "Striped Maize");
set("aliases", ({ "striped maize", "maize", "corn" }));
set("blueprint", "striped maize");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Sweet Corn");
set("short", "Sweet Corn");
set("aliases", ({ "sweet corn", "corn" }));
set("blueprint", "sweet corn");
}
}
@@ -0,0 +1,17 @@
//*****************************************************************************
// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
// the accompanying LICENSE file for details.
//*****************************************************************************
virtual inherit "/lib/items/food.c";

/////////////////////////////////////////////////////////////////////////////
public void reset(int arg)
{
if (!arg)
{
set("name", "Teff");
set("short", "Teff");
set("aliases", ({ "teff" }));
set("blueprint", "teff");
}
}
Oops, something went wrong.

0 comments on commit ab84859

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