Skip to content
Permalink
Browse files

Merged PR 515: Merge 608_construction_details to master

Related work items: #608
  • Loading branch information...
realms-mud committed Jun 5, 2019
1 parent 3d76ac5 commit 327bb400ed32d1239cfb5c495c82e93bea4d9641
@@ -59,11 +59,11 @@ public nomask int execute(string command, object initiator)
!$1->query("undroppable") &&
$1->id($2) :), targetString);
}
else if ((member(inherit_list(initiator), "lib/realizations/wizard.c") > -1) &&
present_clone(targetString, initiator))
{
targets += ({ present_clone(targetString, initiator) });
}
else if ((member(inherit_list(initiator), "lib/realizations/wizard.c") > -1) &&
present_clone(targetString, initiator))
{
targets += ({ present_clone(targetString, initiator) });
}
else
{
targets += ({ getTarget(initiator, command, TargetInventory) });
@@ -78,12 +78,12 @@ public nomask int execute(string command, object initiator)
if (!initiator->isEquipped(target) ||
sizeof(regexp(({ command }), "-f")))
{
if (!function_exists("drop", target) &&
(member(inherit_list(initiator),
"lib/realizations/wizard.c") > -1))
{
move_object(target, environment(initiator));
}
if (!function_exists("drop", target) &&
(member(inherit_list(initiator),
"lib/realizations/wizard.c") > -1))
{
move_object(target, environment(initiator));
}
if (!target->drop())
{
displayMessage("##InitiatorName## ##Infinitive::drop## " +
@@ -45,20 +45,20 @@ private nomask object *getAllOfSpecificId(object initiator, object source)

/////////////////////////////////////////////////////////////////////////////
private nomask object *getSpecificItem(object initiator, object source,
string targetString)
string targetString)
{
object *targets = ({});
object target = present(targetString, source) ||
present(targetString, environment(initiator));

int isWizard =
member(inherit_list(initiator), "lib/realizations/wizard.c") > -1;
int isWizard =
member(inherit_list(initiator), "lib/realizations/wizard.c") > -1;

if (!target && isWizard)
{
target = present_clone(targetString, source) ||
present_clone(targetString, environment(initiator));
}
if (!target && isWizard)
{
target = present_clone(targetString, source) ||
present_clone(targetString, environment(initiator));
}

if (target)
{

0 comments on commit 327bb40

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