Skip to content
Permalink
Browse files

Merged PR 458: Merge 377_environmental_element_enhancements to master

Related work items: #377
  • Loading branch information...
realms-mud committed Mar 4, 2019
1 parent b89278d commit 27888a50f18e958bfeb1d30504f9194b0d28eb56
Showing with 372 additions and 10 deletions.
  1. +17 −1 environment/buildings/civic/city-hall.c
  2. +17 −1 environment/buildings/civic/court-house.c
  3. +24 −0 environment/buildings/civic/jail.c
  4. +9 −0 environment/buildings/shops/alchemist.c
  5. +9 −0 environment/buildings/shops/apothecary.c
  6. +9 −0 environment/buildings/shops/armorer.c
  7. +9 −0 environment/buildings/shops/bakery.c
  8. +9 −0 environment/buildings/shops/barber.c
  9. +9 −0 environment/buildings/shops/blacksmith.c
  10. +9 −0 environment/buildings/shops/book-vendor.c
  11. +9 −0 environment/buildings/shops/bowyer.c
  12. +9 −0 environment/buildings/shops/brewer.c
  13. +9 −0 environment/buildings/shops/butcher.c
  14. +9 −0 environment/buildings/shops/carpenter.c
  15. +9 −0 environment/buildings/shops/cartographer.c
  16. +9 −0 environment/buildings/shops/dyer.c
  17. +9 −0 environment/buildings/shops/engraver.c
  18. +9 −0 environment/buildings/shops/furrier.c
  19. +9 −0 environment/buildings/shops/general-shop.c
  20. +9 −0 environment/buildings/shops/glass-blower.c
  21. +9 −0 environment/buildings/shops/grocer.c
  22. +12 −2 environment/buildings/shops/inn.c
  23. +9 −0 environment/buildings/shops/jeweler.c
  24. +9 −0 environment/buildings/shops/leatherworking.c
  25. +9 −0 environment/buildings/shops/luthier.c
  26. +9 −0 environment/buildings/shops/potter.c
  27. +9 −0 environment/buildings/shops/ship-wright.c
  28. +9 −0 environment/buildings/shops/spice-merchant.c
  29. +9 −0 environment/buildings/shops/stonemason.c
  30. +9 −0 environment/buildings/shops/swordsmith.c
  31. +9 −0 environment/buildings/shops/tailor.c
  32. +13 −3 environment/buildings/shops/tavern.c
  33. +9 −0 environment/buildings/shops/vintner.c
  34. +9 −0 environment/buildings/shops/wainwright.c
  35. +10 −0 environment/buildings/shops/weaponsmith.c
  36. +11 −2 environment/buildings/shops/weaver.c
  37. +7 −1 environment/terrain/forest.c
@@ -8,6 +8,22 @@ inherit "/lib/environment/buildings/baseBuilding.c";
public void Setup()
{
Name("city hall");
addDescriptionTemplate("a large limestone building with the carved words, "
addDescriptionTemplate("a large granite building with the carved words, "
"`City Hall' above the massive double doors");
addNearDarkDescriptionTemplate("the silhouette of a large building");
addLowLightDescriptionTemplate("the silhouette of a large, three-story building");
addDimLightDescriptionTemplate("a large and dark - possibly stone - building");
addSomeLightDescriptionTemplate("a large, three-story, granite building");

addSeasonDescription("winter", ({ " that has a dusting of snow sitting atop it" }));

addTimeOfDayDescription("dawn", ({ ". Light is shining out from the windows" }));
addTimeOfDayDescription("morning", ({ ". Activity can be seen through the windows" }));
addTimeOfDayDescription("noon", ({ ". Activity can be seen through the windows" }));
addTimeOfDayDescription("afternoon", ({
". Activity can be seen through the windows" }));
addTimeOfDayDescription("evening", ({
". Light can be seen coming out of its windows" }));
addTimeOfDayDescription("dusk", ({
". No light can be seen coming from its windows" }));
}
@@ -9,4 +9,20 @@ public void Setup()
{
Name("court house");
addDescriptionTemplate("a large granite court house");
}
addNearDarkDescriptionTemplate("the silhouette of a large building");
addLowLightDescriptionTemplate("the silhouette of a large, three-story building");
addDimLightDescriptionTemplate("a large and dark - possibly stone - building");
addSomeLightDescriptionTemplate("a large, three-story, granite building");

addSeasonDescription("winter", ({ " that has a dusting of snow sitting atop it" }));

addTimeOfDayDescription("dawn", ({ ". Light is shining out from the windows" }));
addTimeOfDayDescription("morning", ({ ". Activity can be seen through the windows" }));
addTimeOfDayDescription("noon", ({ ". Activity can be seen through the windows" }));
addTimeOfDayDescription("afternoon", ({
". Activity can be seen through the windows" }));
addTimeOfDayDescription("evening", ({
". Light can be seen coming out of its windows" }));
addTimeOfDayDescription("dusk", ({
". No light can be seen coming from its windows" }));
}
@@ -9,4 +9,28 @@ public void Setup()
{
Name("jail");
addDescriptionTemplate("a sturdy brick jail with metal bars reinforcing the windows");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a sturdy building building");
addDimLightDescriptionTemplate("a large and dark - possibly brick - building");
addSomeLightDescriptionTemplate("a sturdy brick building");

addSeasonDescription("winter", ({ " that has a dusting of snow sitting atop it" }));

addTimeOfDayDescription("dawn", ({ ". Light is shining out from the windows" }));
addTimeOfDayDescription("morning", ({ ". Activity can be seen through the windows" }));
addTimeOfDayDescription("noon", ({ ". Activity can be seen through the windows" }));
addTimeOfDayDescription("afternoon", ({
". Activity can be seen through the windows" }));
addTimeOfDayDescription("evening", ({
". Light can be seen coming out of its windows" }));
addTimeOfDayDescription("dusk", ({
". Light can be seen coming out of its windows" }));
addTimeOfDayDescription("night", ({
". Light can be seen coming out of its windows" }));
addTimeOfDayDescription("midnight", ({
". Light can be seen coming out of its windows" }));
addTimeOfDayDescription("late night", ({
". Light can be seen coming out of its windows" }));
addSourceOfLight(7);
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -29,5 +32,11 @@ public void Setup()
addSeasonDescription("summer", ({ " that has ivy climbing high up its walls" }));
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addSourceOfLight(7, "default", "night");

addDescriptionTemplate("an alchemy shop in a wooden building");
addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly wooden two-story building");
addSomeLightDescriptionTemplate("a wooden two-story building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -29,5 +32,11 @@ public void Setup()
addSeasonDescription("summer", ({ " that has ivy climbing high up its walls" }));
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addSourceOfLight(7, "default", "night");

addDescriptionTemplate("an apothecary in a limestone building");
addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly stone two-story building");
addSomeLightDescriptionTemplate("a two-story limestone building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -29,5 +32,11 @@ public void Setup()
addSeasonDescription("summer", ({ " that has ivy climbing high up its walls" }));
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addSourceOfLight(7, "default", "night");

addDescriptionTemplate("an armorer's shop in a brick building");
addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly brick two-story building");
addSomeLightDescriptionTemplate("a two-story brick building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is closed" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -29,5 +32,11 @@ public void Setup()
addSeasonDescription("summer", ({ " that has ivy climbing high up its walls" }));
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addSourceOfLight(7, "default", "night");

addDescriptionTemplate("a bakery in a limestone building");
addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly stone two-story building");
addSomeLightDescriptionTemplate("a two-story limestone building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -29,5 +32,11 @@ public void Setup()
addSeasonDescription("summer", ({ " that has ivy climbing high up its walls" }));
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addSourceOfLight(7, "default", "night");

addDescriptionTemplate("a barber's shop in a wooden building");
addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly wood two-story building");
addSomeLightDescriptionTemplate("a two-story wooden building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is closed" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -29,5 +32,11 @@ public void Setup()
addSeasonDescription("summer", ({ " that has ivy climbing high up its walls" }));
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addSourceOfLight(7, "default", "night");

addDescriptionTemplate("a blacksmith's shop made of limestone with two large sliding doors");
addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly stone two-story building");
addSomeLightDescriptionTemplate("a two-story limestone building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a bookstore in a quaint wooden building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly wood two-story building");
addSomeLightDescriptionTemplate("a two-story wooden building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a bowyer's shop in a tall wooden building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly wood two-story building");
addSomeLightDescriptionTemplate("a two-story wooden building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a brewer's shop in a sturdy brick building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly brick two-story building");
addSomeLightDescriptionTemplate("a two-story brick building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a butcher shop in a gray stone building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly stone two-story building");
addSomeLightDescriptionTemplate("a two-story stone building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a carpentry shop in a wooden building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly wood two-story building");
addSomeLightDescriptionTemplate("a two-story wooden building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a cartography shop in a limestone building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly stone two-story building");
addSomeLightDescriptionTemplate("a two-story limestone building");
}
@@ -21,6 +21,9 @@ public void Setup()
addTimeOfDayDescription("dusk", ({
". A sign in the window states that it is open and a light invitingly shines out into the street from its window" }));
addTimeOfDayDescription("night", ({
" with a closed sign in the window looking in upon an unlit shop. There is "
"a light coming from its second story" }));
addTimeOfDayDescription("late night", ({
" with a closed sign in the window looking in upon an unlit shop" }));
addTimeOfDayDescription("midnight", ({
" with a closed sign in the window looking in upon an unlit shop" }));
@@ -30,4 +33,10 @@ public void Setup()
addSeasonDescription("autumn", ({ " with ivy whose leaves are turning a deep red color still clinging to the walls" }));

addDescriptionTemplate("a dye shop in a wooden building");
addSourceOfLight(7, "default", "night");

addNearDarkDescriptionTemplate("the silhouette of a building");
addLowLightDescriptionTemplate("the silhouette of a two-story building");
addDimLightDescriptionTemplate("a dark, possibly wood two-story building");
addSomeLightDescriptionTemplate("a two-story wooden building");
}
Oops, something went wrong.

0 comments on commit 27888a5

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