Skip to content

Commit

Permalink
Merged PR 500: Merge 601_player_castles to master
Browse files Browse the repository at this point in the history 
Related work items: #601
  • Loading branch information
Allen B. Cummings committed May 10, 2019
1 parent bf2ff3a commit eca166b
Show file tree
Hide file tree
Showing 11 changed files with 372 additions and 108 deletions.
33 changes: 24 additions & 9 deletions dictionaries/domainDictionary.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -177,11 +177,7 @@ private nomask string applyColorToBuilding(mapping component, string key,
{ {
string ret = 0; string ret = 0;
string *colors = m_indices(CastleComponents[key]["colors"]); string *colors = m_indices(CastleComponents[key]["colors"]);
colors -= ({ "default" });

printf("component = %O\n", component);
printf("colors = %O\n", colors);

if (member(CastleComponents[key]["colors"]["default"], colorConfiguration)) if (member(CastleComponents[key]["colors"]["default"], colorConfiguration))
{ {
ret = component[charset]; ret = component[charset];
Expand All @@ -201,7 +197,8 @@ private nomask string applyColorToBuilding(mapping component, string key,
} }


///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
public nomask varargs mapping getPlayerDomain(object player, string type) public nomask varargs mapping getPlayerDomain(object player, string location,
string type)
{ {
mapping ret = ([]); mapping ret = ([]);


Expand All @@ -216,10 +213,8 @@ public nomask varargs mapping getPlayerDomain(object player, string type)
foreach(string component in components) foreach(string component in components)
{ {
string key = sprintf("unbuilt %s", component); string key = sprintf("unbuilt %s", component);
printf("key = %O\n", key);
foreach(string section in m_indices(CastleComponents[key]["components"])) foreach(string section in m_indices(CastleComponents[key]["components"]))
{ {
printf("Oink: %O, %O\n\n", section, key);
ret["components"][component][section] = ret["components"][component][section] =
applyColorToBuilding( applyColorToBuilding(
CastleComponents[key]["components"][section] + ([]), CastleComponents[key]["components"][section] + ([]),
Expand All @@ -228,7 +223,27 @@ public nomask varargs mapping getPlayerDomain(object player, string type)
} }
} }


// do getting of buildings mapping upgrades = player->getDomainUpgrades(location, type);
if (sizeof(upgrades))
{
foreach(string upgrade in m_indices(upgrades))
{
printf("Oy!\n");
if (member(CastleComponents, upgrades[upgrade]))
{
mapping components =
CastleComponents[upgrades[upgrade]]["components"];

foreach(string section in m_indices(components))
{
ret["components"][upgrade][section] =
applyColorToBuilding(
CastleComponents[upgrades[upgrade]]["components"][section] + ([]),
upgrades[upgrade], colorConfiguration, charset);
}
}
}
}


transformLayout(ret); transformLayout(ret);
return ret; return ret;
Expand Down
85 changes: 85 additions & 0 deletions dictionaries/domains/buildings.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,6 +5,91 @@
#ifndef buildings_h #ifndef buildings_h
#define buildings_h #define buildings_h


/*
mapping swapstuff = ([
"KEEP 1": "\xe2\x94\x8c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80"
"\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x90",
"KEEP 2": "\xe2\x94\x82\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91"
"\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x94\x82",
"KEEP 3": "\xe2\x94\x83\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x94\x83",
"KEEP 4": "\xe2\x94\x83\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x96\x91\xe2\x94\x83",
"KEEP 5": "\xe2\x94\x94\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80"
"\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x98",
"MMM": " ",
"NWX": " \xe2\x95\x91",
"NEX": "\xe2\x95\x91 ",
"SWX": " \xe2\x95\x91",
"SEX": "\xe2\x95\x91 ",
"NWI": " \xe2\x95\x91",
"NEI": "\xe2\x95\x91 ",
"WC1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x9d",
"WC2": "\xe2\x95\x91 ",
"WC3": "\xe2\x95\x91 ",
"WC4": "\xe2\x95\x91 ",
"WC5": "\xe2\x95\x91 ",
"WC6": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x97",
"WM1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x9d",
"WM2": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x97",
"EM1": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x97",
"EM2": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x9d",
"EC1": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x97",
"EC2": " \xe2\x95\x91",
"EC3": " \xe2\x95\x91",
"EC4": " \xe2\x95\x91",
"EC5": " \xe2\x95\x91",
"EC6": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x9d",
"NWCTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"NWCTR2": "\xe2\x95\x91 \xe2\x95\x91",
"NWCTR3": "\xe2\x95\x91 \xe2\x95\x91",
"NWCTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\xa6\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
"NECTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"NECTR2": "\xe2\x95\x91 \xe2\x95\x91",
"NECTR3": "\xe2\x95\x91 \xe2\x95\x91",
"NECTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\xa6\xe2\x95\x90\xe2\x95\x9d",
"NCATOWER1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"NCATOWER2": "\xe2\x95\x91 \xe2\x95\x91",
"NCATOWER3": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
"NWCASTLEWALL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"NECASTLEWALL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"SWCASTLEWALL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"SECASTLEWALL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"NT1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x97",
"NT2": "\xe2\x95\x9d \xe2\x95\x9a",
"NWMWAL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"NEMWAL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"NWMTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"NWMTR2": "\xe2\x95\x91 \xe2\x95\x9a",
"NWMTR3": "\xe2\x95\x91 ",
"NWMTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x97 ",
"NEMTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"NEMTR2": "\xe2\x95\x9d \xe2\x95\x91",
"NEMTR3": " \xe2\x95\x91",
"NEMTR4": " \xe2\x95\x94\xe2\x95\x90\xe2\x95\x9d",
"SWMWAL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"SEMWAL": "\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90",
"SWMTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x9d ",
"SWMTR2": "\xe2\x95\x91 ",
"SWMTR3": "\xe2\x95\x91 \xe2\x95\x94",
"SWMTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
"SEMTR1": " \xe2\x95\x9a\xe2\x95\x90\xe2\x95\x97",
"SEMTR2": " \xe2\x95\x91",
"SEMTR3": "\xe2\x95\x97 \xe2\x95\x91",
"SEMTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
"ST1": "\xe2\x95\x97 \xe2\x95\x94",
"ST2": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x9d",
"SWCTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\xa9\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"SWCTR2": "\xe2\x95\x91 \xe2\x95\x91",
"SWCTR3": "\xe2\x95\x91 \xe2\x95\x91",
"SWCTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
"SECTR1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\xa9\xe2\x95\x90\xe2\x95\x97",
"SECTR2": "\xe2\x95\x91 \xe2\x95\x91",
"SECTR3": "\xe2\x95\x91 \xe2\x95\x91",
"SECTR4": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
"SCATOWER1": "\xe2\x95\x94\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x97",
"SCATOWER2": "\xe2\x95\x91 \xe2\x95\x91",
"SCATOWER3": "\xe2\x95\x9a\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x90\xe2\x95\x9d",
]);*/
private mapping BuildingBlueprints = ([ private mapping BuildingBlueprints = ([
"unbuilt keep":([ "unbuilt keep":([
"type": "keep", "type": "keep",
Expand Down
Loading

0 comments on commit eca166b

Please sign in to comment.