diff --git a/lib/commands/baseCommand.c b/lib/commands/baseCommand.c index 9ffb97204..cf532a875 100644 --- a/lib/commands/baseCommand.c +++ b/lib/commands/baseCommand.c @@ -22,12 +22,9 @@ public void SetupCommand() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - SetupCommand(); - } + SetupCommand(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/commands/commandRegistry.c b/lib/commands/commandRegistry.c index 4c7f2480a..f84cd05a3 100644 --- a/lib/commands/commandRegistry.c +++ b/lib/commands/commandRegistry.c @@ -93,15 +93,12 @@ public nomask int isInitialized() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) - { - commands = ([]); - registerPlayerCommands(); - registerWizardCommands(); - IsInitialized = 1; - } + commands = ([]); + registerPlayerCommands(); + registerWizardCommands(); + IsInitialized = 1; } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/core/baseSelector.c b/lib/core/baseSelector.c index ef0e99803..5530b1efc 100644 --- a/lib/core/baseSelector.c +++ b/lib/core/baseSelector.c @@ -31,12 +31,9 @@ public void InitializeSelector() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - InitializeSelector(); - } + InitializeSelector(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/core/stateMachine.c b/lib/core/stateMachine.c index 627a83bdf..239469da4 100644 --- a/lib/core/stateMachine.c +++ b/lib/core/stateMachine.c @@ -16,16 +16,13 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - InitialState = ""; - CurrentState = "default"; - stateActors = ({}); - stateTree = ([]); - Setup(); - } + InitialState = ""; + CurrentState = "default"; + stateActors = ({}); + stateTree = ([]); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/dictionaries/attacks/baseAttack.c b/lib/dictionaries/attacks/baseAttack.c index dfec9740b..49a7505d2 100644 --- a/lib/dictionaries/attacks/baseAttack.c +++ b/lib/dictionaries/attacks/baseAttack.c @@ -216,11 +216,8 @@ public void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - initialized = 1; - Setup(); - } + initialized = 1; + Setup(); } diff --git a/lib/dictionaries/backgrounds/baseBackground.c b/lib/dictionaries/backgrounds/baseBackground.c index 2decee0e1..2901276ac 100644 --- a/lib/dictionaries/backgrounds/baseBackground.c +++ b/lib/dictionaries/backgrounds/baseBackground.c @@ -11,15 +11,12 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) + if (!SetupCompleted) { - if (!SetupCompleted) - { - Setup(); - SetupCompleted = 1; - } + Setup(); + SetupCompleted = 1; } } diff --git a/lib/dictionaries/environmentDictionary.c b/lib/dictionaries/environmentDictionary.c index 7fbc89409..cc58d271e 100644 --- a/lib/dictionaries/environmentDictionary.c +++ b/lib/dictionaries/environmentDictionary.c @@ -529,15 +529,12 @@ private nomask void calculateTimeOfDay() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) - { - loadEnvironmentalData(); - calculateSeason(); - calculateTimeOfDay(); - advanceTime(); - } + loadEnvironmentalData(); + calculateSeason(); + calculateTimeOfDay(); + advanceTime(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/dictionaries/groups/baseGroup.c b/lib/dictionaries/groups/baseGroup.c index 01e75157f..1bb54b2e0 100644 --- a/lib/dictionaries/groups/baseGroup.c +++ b/lib/dictionaries/groups/baseGroup.c @@ -21,12 +21,9 @@ protected void applyGroupDetails() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) - { - applyGroupDetails(); - } + applyGroupDetails(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/dictionaries/partyDictionary.c b/lib/dictionaries/partyDictionary.c index f0d367037..b844d7d3e 100644 --- a/lib/dictionaries/partyDictionary.c +++ b/lib/dictionaries/partyDictionary.c @@ -179,10 +179,7 @@ public nomask void acceptPartyRequest(object target) } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) - { - PersistentParties = partyService->loadPartyList(); - } + PersistentParties = partyService->loadPartyList(); } diff --git a/lib/environment/environment.c b/lib/environment/environment.c index 66dc81f77..f9594a4d2 100644 --- a/lib/environment/environment.c +++ b/lib/environment/environment.c @@ -171,16 +171,8 @@ public void init() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void reset() { - if (!arg) - { - if (!SetupCompleted) - { - Setup(); - SetupCompleted = 1; - } - } object shopObj = getShop(); if (objectp(shopObj)) { @@ -189,6 +181,17 @@ public void reset(int arg) createStateObjects(); } +///////////////////////////////////////////////////////////////////////////// +public nomask void create() +{ + if (!SetupCompleted) + { + Setup(); + SetupCompleted = 1; + } + reset(); +} + ///////////////////////////////////////////////////////////////////////////// public int moveFromIsAllowed(object user, object fromLocation) { diff --git a/lib/environment/environmentalElement.c b/lib/environment/environmentalElement.c index a517e3e63..7d430e445 100644 --- a/lib/environment/environmentalElement.c +++ b/lib/environment/environmentalElement.c @@ -55,29 +55,11 @@ public string Type() } ///////////////////////////////////////////////////////////////////////////// -public void Setup() +public nomask void reset() { -} - -///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) -{ - if (!arg) - { - if (!elementName) - { - Setup(); - } - - if (getDictionary("environment") && stringp(elementName) && - !getDictionary("environment")->isValidEnvironmentItem(elementName)) - { - getDictionary("environment")->registerElement(program_name(this_object())); - } - } - object *harvestItems = m_values( filter(harvestData, (: $1 == $2->name() :))); + if (sizeof(harvestItems)) { foreach(object harvestItem in harvestItems) @@ -98,6 +80,27 @@ public nomask void reset(int arg) } } +///////////////////////////////////////////////////////////////////////////// +public void Setup() +{ +} + +///////////////////////////////////////////////////////////////////////////// +public nomask void create() +{ + if (!elementName) + { + Setup(); + } + + if (getDictionary("environment") && stringp(elementName) && + !getDictionary("environment")->isValidEnvironmentItem(elementName)) + { + getDictionary("environment")->registerElement(program_name(this_object())); + } + reset(); +} + ///////////////////////////////////////////////////////////////////////////// private nomask string translateStringToLanguage(string text, string language) { diff --git a/lib/environment/legacyRoomConverter.c b/lib/environment/legacyRoomConverter.c index f9f1a1acc..009a361fe 100644 --- a/lib/environment/legacyRoomConverter.c +++ b/lib/environment/legacyRoomConverter.c @@ -93,7 +93,12 @@ public void set_terrain(string terrain) } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() +{ +} + +///////////////////////////////////////////////////////////////////////////// +public void reset() { } diff --git a/lib/environment/region.c b/lib/environment/region.c index f742017bb..9b3a7afbb 100644 --- a/lib/environment/region.c +++ b/lib/environment/region.c @@ -229,9 +229,9 @@ public void Setup() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg && !setupCompleted) + if (!setupCompleted) { Setup(); setupCompleted = 1; diff --git a/lib/items/item.c b/lib/items/item.c index 6beebc875..2e7a4fbee 100644 --- a/lib/items/item.c +++ b/lib/items/item.c @@ -63,12 +63,9 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - Setup(); - } + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/conversations/baseConversation.c b/lib/modules/conversations/baseConversation.c index 2183eaa01..8084854e5 100644 --- a/lib/modules/conversations/baseConversation.c +++ b/lib/modules/conversations/baseConversation.c @@ -21,15 +21,12 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) + if (!SetupCompleted) { - if (!SetupCompleted) - { - Setup(); - SetupCompleted = 1; - } + Setup(); + SetupCompleted = 1; } } diff --git a/lib/modules/domains/domainResearchItem.c b/lib/modules/domains/domainResearchItem.c index 79b726f5b..868ed46a8 100644 --- a/lib/modules/domains/domainResearchItem.c +++ b/lib/modules/domains/domainResearchItem.c @@ -95,13 +95,10 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - addSpecification("type", "domain"); - addSpecification("scope", "domain"); - addSpecification("effect", "strategic"); - Setup(); - } + addSpecification("type", "domain"); + addSpecification("scope", "domain"); + addSpecification("effect", "strategic"); + Setup(); } diff --git a/lib/modules/factions/baseFaction.c b/lib/modules/factions/baseFaction.c index 31b9fa257..dff08f748 100644 --- a/lib/modules/factions/baseFaction.c +++ b/lib/modules/factions/baseFaction.c @@ -12,12 +12,9 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) - { - Setup(); - } + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/guilds/baseGuild.c b/lib/modules/guilds/baseGuild.c index e539c2a8d..717fe2b76 100644 --- a/lib/modules/guilds/baseGuild.c +++ b/lib/modules/guilds/baseGuild.c @@ -134,21 +134,18 @@ public void SetupGuild() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) + if (guildName == "BaseGuild") { - if (guildName == "BaseGuild") - { - SetupGuild(); - } + SetupGuild(); + } - object guildDictionary = getDictionary("guilds"); - if (guildDictionary && (guildName != "BaseGuild") && - (member(guildDictionary->validGuilds(), guildName) == -1)) - { - guildDictionary->registerGuild(program_name(this_object())); - } + object guildDictionary = getDictionary("guilds"); + if (guildDictionary && (guildName != "BaseGuild") && + (member(guildDictionary->validGuilds(), guildName) == -1)) + { + guildDictionary->registerGuild(program_name(this_object())); } } diff --git a/lib/modules/quests/questItem.c b/lib/modules/quests/questItem.c index 3d77e402e..6f68c90c4 100644 --- a/lib/modules/quests/questItem.c +++ b/lib/modules/quests/questItem.c @@ -63,14 +63,11 @@ private object configuration = // "is final state": "failure", ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public nomask void create() { - if (!arg) - { - Name = 0; - Description = ""; - stateMachine::reset(arg); - } + Name = 0; + Description = ""; + stateMachine::create(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/activeResearchItem.c b/lib/modules/research/activeResearchItem.c index 5939793c7..e76d3f23d 100644 --- a/lib/modules/research/activeResearchItem.c +++ b/lib/modules/research/activeResearchItem.c @@ -14,13 +14,10 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - addSpecification("type", "active"); - Setup(); - } + addSpecification("type", "active"); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/knowledgeResearchItem.c b/lib/modules/research/knowledgeResearchItem.c index add5df332..8b1379fdb 100644 --- a/lib/modules/research/knowledgeResearchItem.c +++ b/lib/modules/research/knowledgeResearchItem.c @@ -44,15 +44,12 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - addSpecification("type", "knowledge"); - addSpecification("scope", "self"); - addSpecification("effect", "strategic"); - Setup(); - } + addSpecification("type", "knowledge"); + addSpecification("scope", "self"); + addSpecification("effect", "strategic"); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/passiveResearchItem.c b/lib/modules/research/passiveResearchItem.c index 48475dca1..ac33b1e1a 100644 --- a/lib/modules/research/passiveResearchItem.c +++ b/lib/modules/research/passiveResearchItem.c @@ -14,13 +14,10 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - addSpecification("type", "passive"); - Setup(); - } + addSpecification("type", "passive"); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/researchTree.c b/lib/modules/research/researchTree.c index 239f6cb8f..3ac8c1290 100644 --- a/lib/modules/research/researchTree.c +++ b/lib/modules/research/researchTree.c @@ -23,16 +23,13 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - name = ""; - description = ""; - treeRoot = 0; - tree = ([]); - Setup(); - } + name = ""; + description = ""; + treeRoot = 0; + tree = ([]); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/ritualResearchItem.c b/lib/modules/research/ritualResearchItem.c index d7f526d6e..895a92e5d 100644 --- a/lib/modules/research/ritualResearchItem.c +++ b/lib/modules/research/ritualResearchItem.c @@ -14,13 +14,10 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - addSpecification("type", "ritual"); - Setup(); - } + addSpecification("type", "ritual"); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/summoningResearchItem.c b/lib/modules/research/summoningResearchItem.c index fb8bf395e..26d312fed 100644 --- a/lib/modules/research/summoningResearchItem.c +++ b/lib/modules/research/summoningResearchItem.c @@ -244,15 +244,12 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - activeResearchItem::reset(arg); - addSpecification("scope", "self"); - addSpecification("effect", "summoning"); - Setup(); - } + activeResearchItem::create(); + addSpecification("scope", "self"); + addSpecification("effect", "summoning"); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/research/sustainedResearchItem.c b/lib/modules/research/sustainedResearchItem.c index 5934970d3..d3fc3ac64 100644 --- a/lib/modules/research/sustainedResearchItem.c +++ b/lib/modules/research/sustainedResearchItem.c @@ -15,13 +15,10 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - addSpecification("type", "sustained"); - Setup(); - } + addSpecification("type", "sustained"); + Setup(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/modules/traits/baseTrait.c b/lib/modules/traits/baseTrait.c index 6bef06eff..8f72880ff 100644 --- a/lib/modules/traits/baseTrait.c +++ b/lib/modules/traits/baseTrait.c @@ -15,18 +15,15 @@ protected void Setup() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - Setup(); + Setup(); - object traitsDictionary = getDictionary("traits"); - if (traitsDictionary && - !traitsDictionary->traitIsRegistered(program_name(this_object()))) - { - traitsDictionary->registerTrait(this_object()); - } + object traitsDictionary = getDictionary("traits"); + if (traitsDictionary && + !traitsDictionary->traitIsRegistered(program_name(this_object()))) + { + traitsDictionary->registerTrait(this_object()); } } diff --git a/lib/realizations/companion.c b/lib/realizations/companion.c index 2cf114a96..a2bfaf30a 100644 --- a/lib/realizations/companion.c +++ b/lib/realizations/companion.c @@ -11,11 +11,9 @@ public nomask int isRealizationOfCompanion() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - henchman::reset(arg); + henchman::create(); customCombatAssessment("companion"); } } diff --git a/lib/realizations/henchman.c b/lib/realizations/henchman.c index 89df9807f..7a25c0bcc 100644 --- a/lib/realizations/henchman.c +++ b/lib/realizations/henchman.c @@ -27,14 +27,11 @@ public nomask int isRealizationOfHenchman() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - living::reset(arg); - registerHeartBeat("henchman"); - customCombatAssessment("henchman"); - } + living::create(); + registerHeartBeat("henchman"); + customCombatAssessment("henchman"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/realizations/living.c b/lib/realizations/living.c index ca7cde620..6eb2844b1 100644 --- a/lib/realizations/living.c +++ b/lib/realizations/living.c @@ -42,12 +42,15 @@ static nomask int registerHeartBeat(string method) } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (arg) - { - return; - } + +} + +///////////////////////////////////////////////////////////////////////////// +public void create() +{ + Setup(); enable_commands(); registerHeartBeat("combat"); diff --git a/lib/realizations/monster.c b/lib/realizations/monster.c index 055c9b503..24215d13c 100644 --- a/lib/realizations/monster.c +++ b/lib/realizations/monster.c @@ -50,16 +50,12 @@ public varargs string Name(string newName) } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) + living::create(); + if (this_object()->Name() && (this_object()->Name() != "")) { - Setup(); - if (this_object()->Name() && (this_object()->Name() != "")) - { - addLiving(this_object()); - } - living::reset(arg); + addLiving(this_object()); } } diff --git a/lib/realizations/player.c b/lib/realizations/player.c index 1b6f9c997..bf6135619 100644 --- a/lib/realizations/player.c +++ b/lib/realizations/player.c @@ -49,14 +49,11 @@ public nomask int executeCommand(string command) } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - living::reset(arg); - if (!arg) - { - addCommands(); - set_heart_beat(1); - } + living::create(); + addCommands(); + set_heart_beat(1); } ///////////////////////////////////////////////////////////////////////////// diff --git a/lib/tests/commands/player/shoutTest.c b/lib/tests/commands/player/shoutTest.c index f54e7a24e..034c5dacc 100644 --- a/lib/tests/commands/player/shoutTest.c +++ b/lib/tests/commands/player/shoutTest.c @@ -14,19 +14,19 @@ void Setup() Player = clone_object("/lib/tests/support/services/mockPlayer.c"); Player->Name("bob"); Player->Race("human"); - Player->reset(); + Player->create(); Player->colorConfiguration("none"); Target = clone_object("/lib/tests/support/services/mockPlayer.c"); Target->Name("earl"); Target->Race("human"); - Target->reset(); + Target->create(); Target->colorConfiguration("none"); Bystander = clone_object("/lib/tests/support/services/mockPlayer.c"); Bystander->Name("frank"); Bystander->Race("human"); - Bystander->reset(); + Bystander->create(); Bystander->colorConfiguration("none"); setUsers(({ Player, Target, Bystander })); diff --git a/lib/tests/commands/player/talkTest.c b/lib/tests/commands/player/talkTest.c index 69bcb140c..449486eab 100644 --- a/lib/tests/commands/player/talkTest.c +++ b/lib/tests/commands/player/talkTest.c @@ -27,11 +27,11 @@ void Setup() Player = clone_object("/lib/tests/support/services/mockPlayer.c"); Player->Name("gorthaur"); Player->Race("human"); - Player->reset(); + Player->create(); Target = clone_object("/lib/tests/support/conversations/testNPC.c"); Target->resetConversationState(); - Target->reset(); + Target->create(); move_object(Player, this_object()); move_object(Target, this_object()); diff --git a/lib/tests/commands/player/tellTest.c b/lib/tests/commands/player/tellTest.c index b84029173..af34ac99a 100644 --- a/lib/tests/commands/player/tellTest.c +++ b/lib/tests/commands/player/tellTest.c @@ -13,12 +13,12 @@ void Setup() Player = clone_object("/lib/tests/support/services/mockPlayer.c"); Player->Name("bob"); Player->Race("human"); - Player->reset(); + Player->create(); Target = clone_object("/lib/tests/support/services/mockPlayer.c"); Target->Name("earl"); Target->Race("human"); - Target->reset(); + Target->create(); setUsers(({ Player, Target })); } diff --git a/lib/tests/environment/environmentTest.c b/lib/tests/environment/environmentTest.c index cbc1c46fd..dfac6af74 100644 --- a/lib/tests/environment/environmentTest.c +++ b/lib/tests/environment/environmentTest.c @@ -572,7 +572,7 @@ void AddObjectToDefaultStateCreatesObjectOnReset() ///////////////////////////////////////////////////////////////////////////// void SetupIsOnlyCalledOnceByReset() { - Environment->reset(); + Environment->create(); ExpectEq(1, Environment->setupCalled()); Environment->reset(); ExpectEq(1, Environment->setupCalled()); @@ -698,7 +698,7 @@ void ParseEfunCallForCallOtherWithKeyDisplaysInLong() Environment->testSetTerrain("/lib/tests/support/environment/fakeTerrain.c"); Environment->testAddObject("/lib/tests/support/items/testSword.c"); Environment->testSetAdditionalLongDescription("##call_other::key::/lib/tests/support/items/testSword.c::swordMessage::"); - Environment->reset(); + Environment->create(); ExpectTrue(present_clone("/lib/tests/support/items/testSword.c", Environment), "weapon present"); ExpectSubStringMatch("a deciduous forest. You can feel a weaselish buzz in the air", diff --git a/lib/tests/environment/environmentalElementTest.c b/lib/tests/environment/environmentalElementTest.c index ae592ebab..0c1db3ce9 100644 --- a/lib/tests/environment/environmentalElementTest.c +++ b/lib/tests/environment/environmentalElementTest.c @@ -259,7 +259,7 @@ void HarvestableResourcesCorrectlySetUp() clone_object("/lib/tests/support/environment/harvestRoom.c"); move_object(player, environment); - Element->reset(); + Element->create(); ExpectEq("Name: Oak\n" "Alias(es): deciduous tree, oak tree, tree\n" "This can only be harvested when the environment state is default.\n" @@ -333,7 +333,7 @@ void EnvironmentalBonusCorrectlySetUp() clone_object("/lib/tests/support/environment/bonusRoom.c"); move_object(player, environment); - Element->reset(); + Element->create(); ExpectEq("Name: Hit Points\n" "There is a -3 penalty to hit points active.\n" "This is only applied when the environment state is deadified.\n" diff --git a/lib/tests/modules/movementTest.c b/lib/tests/modules/movementTest.c index 3b7300f83..5fe3019c8 100644 --- a/lib/tests/modules/movementTest.c +++ b/lib/tests/modules/movementTest.c @@ -22,7 +22,7 @@ void Setup() Movement->Chr(10); Movement->hitPoints(Movement->maxHitPoints()); Movement->addCommands(); - Movement->reset(); + Movement->create(); FromPlace = load_object("/lib/tests/support/environment/fromLocation.c"); FromPlace->toggleLight(); diff --git a/lib/tests/support/events/receiveEventSubscriber.c b/lib/tests/support/events/receiveEventSubscriber.c index 3c2be8732..1c7068b96 100644 --- a/lib/tests/support/events/receiveEventSubscriber.c +++ b/lib/tests/support/events/receiveEventSubscriber.c @@ -7,7 +7,7 @@ private string eventReceived; private mixed dataReceived; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { eventReceived = "none"; dataReceived = 0; diff --git a/lib/tests/support/services/combatWithMockServices.c b/lib/tests/support/services/combatWithMockServices.c index f8b42389c..fdca00f21 100644 --- a/lib/tests/support/services/combatWithMockServices.c +++ b/lib/tests/support/services/combatWithMockServices.c @@ -91,12 +91,8 @@ public int magicalDamageBonus() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (arg) - { - return; - } enable_commands(); } diff --git a/lib/tests/support/services/researchWithMockServices.c b/lib/tests/support/services/researchWithMockServices.c index 1063900c2..6481bb42a 100644 --- a/lib/tests/support/services/researchWithMockServices.c +++ b/lib/tests/support/services/researchWithMockServices.c @@ -36,12 +36,8 @@ public int has(string service) } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (arg) - { - return; - } enable_commands(); } diff --git a/lib/tests/support/services/skillsWithMockServices.c b/lib/tests/support/services/skillsWithMockServices.c index 7fcb6cd17..d0808fc4f 100644 --- a/lib/tests/support/services/skillsWithMockServices.c +++ b/lib/tests/support/services/skillsWithMockServices.c @@ -34,12 +34,8 @@ public int has(string service) } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (arg) - { - return; - } enable_commands(); } diff --git a/lib/tests/support/tactical-combat/testArcher.c b/lib/tests/support/tactical-combat/testArcher.c index fb9b0368f..782bfbf65 100644 --- a/lib/tests/support/tactical-combat/testArcher.c +++ b/lib/tests/support/tactical-combat/testArcher.c @@ -5,20 +5,17 @@ virtual inherit "/lib/tests/support/tactical-combat/unitNotRandom.c"; ///////////////////////////////////////////////////////////////////////////// -void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "archers"); - set("short", "Archers"); - set("long", "This is a powerful unit of archers."); - set("ground attack", 800); - set("air attack", 400); - set("defense", 100); - set("move", 6); - set("unit morale", 5); - set("troop count", 10); - set("range", 1); - set("unit type", "ground"); - } + set("name", "archers"); + set("short", "Archers"); + set("long", "This is a powerful unit of archers."); + set("ground attack", 800); + set("air attack", 400); + set("defense", 100); + set("move", 6); + set("unit morale", 5); + set("troop count", 10); + set("range", 1); + set("unit type", "ground"); } diff --git a/lib/tests/support/tactical-combat/testKnight.c b/lib/tests/support/tactical-combat/testKnight.c index 0b92bce69..058368307 100644 --- a/lib/tests/support/tactical-combat/testKnight.c +++ b/lib/tests/support/tactical-combat/testKnight.c @@ -5,20 +5,17 @@ virtual inherit "/lib/tests/support/tactical-combat/unitNotRandom.c"; ///////////////////////////////////////////////////////////////////////////// -void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "knights"); - set("short", "Knights"); - set("long", "This is a powerful unit of knights."); - set("ground attack", 600); - set("air attack", 0); - set("defense", 400); - set("move", 4); - set("unit morale", 5); - set("troop count", 10); - set("range", 1); - set("unit type", "ground"); - } + set("name", "knights"); + set("short", "Knights"); + set("long", "This is a powerful unit of knights."); + set("ground attack", 600); + set("air attack", 0); + set("defense", 400); + set("move", 4); + set("unit morale", 5); + set("troop count", 10); + set("range", 1); + set("unit type", "ground"); } diff --git a/secure/master/hooks.c b/secure/master/hooks.c index e24ed496c..cd58218da 100644 --- a/secure/master/hooks.c +++ b/secure/master/hooks.c @@ -124,9 +124,9 @@ protected nomask void addDriverHooks() ); // Various create / clone hooks - set_driver_hook(H_CREATE_SUPER, "reset"); - set_driver_hook(H_CREATE_OB, "reset"); - set_driver_hook(H_CREATE_CLONE, "reset"); + set_driver_hook(H_CREATE_SUPER, "create"); + set_driver_hook(H_CREATE_OB, "create"); + set_driver_hook(H_CREATE_CLONE, "create"); set_driver_hook(H_RESET, "reset"); set_driver_hook(H_CLEAN_UP, "clean_up"); diff --git a/secure/master/security/priviledgeGroup.c b/secure/master/security/priviledgeGroup.c index 4a0e15b2f..2f564f154 100644 --- a/secure/master/security/priviledgeGroup.c +++ b/secure/master/security/priviledgeGroup.c @@ -22,12 +22,9 @@ protected void applyGroupDetails() } ///////////////////////////////////////////////////////////////////////////// -public nomask void reset(int arg) +public nomask void create() { - if (!arg) - { - applyGroupDetails(); - } + applyGroupDetails(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/characters/galadhels-victim.c b/tutorial/characters/galadhels-victim.c index a2633375a..96b03d3d3 100644 --- a/tutorial/characters/galadhels-victim.c +++ b/tutorial/characters/galadhels-victim.c @@ -5,13 +5,10 @@ virtual inherit "/lib/items/corpse.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("short", "Black-robed corpse with an arrow protruding from its " - "throat"); - set("corpse", "black-robed figure"); - set("aliases", ({ "black-robed corpse", "corpse" })); - } + set("short", "Black-robed corpse with an arrow protruding from its " + "throat"); + set("corpse", "black-robed figure"); + set("aliases", ({ "black-robed corpse", "corpse" })); } diff --git a/tutorial/characters/haldor.c b/tutorial/characters/haldor.c index 03f7c1d65..9e714d440 100644 --- a/tutorial/characters/haldor.c +++ b/tutorial/characters/haldor.c @@ -5,12 +5,9 @@ virtual inherit "/lib/items/corpse.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("short", "The corpse of Haldor"); - set("corpse", "haldor"); - set("aliases", ({ "haldor", "corpse of haldor", "corpse" })); - } + set("short", "The corpse of Haldor"); + set("corpse", "haldor"); + set("aliases", ({ "haldor", "corpse of haldor", "corpse" })); } diff --git a/tutorial/characters/not-so-animated-corpse.c b/tutorial/characters/not-so-animated-corpse.c index c3168e240..a4692e5c9 100644 --- a/tutorial/characters/not-so-animated-corpse.c +++ b/tutorial/characters/not-so-animated-corpse.c @@ -6,18 +6,15 @@ virtual inherit "/lib/items/corpse.c"; object bow; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("short", "A decaying corpse"); - set("corpse", "human"); - set("aliases", ({ "decaying corpse", "corpse" })); + set("short", "A decaying corpse"); + set("corpse", "human"); + set("aliases", ({ "decaying corpse", "corpse" })); - if (!bow) - { - move_object(clone_object("/lib/instances/items/weapons/bows/bow.c"), - this_object()); - } + if (!bow) + { + move_object(clone_object("/lib/instances/items/weapons/bows/bow.c"), + this_object()); } } diff --git a/tutorial/stateMachines/introStateMachine.c b/tutorial/stateMachines/introStateMachine.c index 52ebc3631..c4b01427e 100644 --- a/tutorial/stateMachines/introStateMachine.c +++ b/tutorial/stateMachines/introStateMachine.c @@ -10,47 +10,43 @@ inherit "/tutorial/stateMachines/initiateBackgroundStory.c"; private object Player; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - stateMachine::reset(arg); - addState("initiate story", ""); - addEntryAction("initiate story", "displayIntroduction"); + addState("initiate story", ""); + addEntryAction("initiate story", "displayIntroduction"); - addState("regain consciousness", ""); - addEntryAction("regain consciousness", "galadhelAwakensPlayer"); - addTransition("initiate story", "regain consciousness", "regainConsciousness"); + addState("regain consciousness", ""); + addEntryAction("regain consciousness", "galadhelAwakensPlayer"); + addTransition("initiate story", "regain consciousness", "regainConsciousness"); - addState("berenar interjects", ""); - addEntryAction("berenar interjects", "berenarBeginsConversation"); - addTransition("regain consciousness", "berenar interjects", "berenarInterjects"); + addState("berenar interjects", ""); + addEntryAction("berenar interjects", "berenarBeginsConversation"); + addTransition("regain consciousness", "berenar interjects", "berenarInterjects"); - addState("background story", ""); - addEntryAction("background story", "playerTransitionsToBackgroundStory"); - addTransition("berenar interjects", "background story", "playerAgainLosesConsciousness"); + addState("background story", ""); + addEntryAction("background story", "playerTransitionsToBackgroundStory"); + addTransition("berenar interjects", "background story", "playerAgainLosesConsciousness"); - addState("first fight", ""); - addEntryAction("first fight", "firstFight"); - addTransition("background story", "first fight", "onJoinGuild"); + addState("first fight", ""); + addEntryAction("first fight", "firstFight"); + addTransition("background story", "first fight", "onJoinGuild"); - addState("on the trail", ""); - addEntryAction("on the trail", "onTheTrail"); - addTransition("first fight", "on the trail", "first fight is over"); + addState("on the trail", ""); + addEntryAction("on the trail", "onTheTrail"); + addTransition("first fight", "on the trail", "first fight is over"); - addState("wake up, Donald", ""); - addEntryAction("wake up, Donald", "wakeDonald"); - addTransition("on the trail", "wake up, Donald", "halgaladhAwakensDonald"); + addState("wake up, Donald", ""); + addEntryAction("wake up, Donald", "wakeDonald"); + addTransition("on the trail", "wake up, Donald", "halgaladhAwakensDonald"); - addState("fight at the entrance", ""); - addEntryAction("fight at the entrance", "setupFightAtTheEntrance"); - addTransition("wake up, Donald", "fight at the entrance", "fightAtTheEntrance"); + addState("fight at the entrance", ""); + addEntryAction("fight at the entrance", "setupFightAtTheEntrance"); + addTransition("wake up, Donald", "fight at the entrance", "fightAtTheEntrance"); - addState("enter the lair", ""); - addTransition("fight at the entrance", "enter the lair", "enterTheLair"); + addState("enter the lair", ""); + addTransition("fight at the entrance", "enter the lair", "enterTheLair"); - setInitialState("initiate story"); - } + setInitialState("initiate story"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-death.c b/tutorial/temple/objects/rune-death.c index 2b996e572..0387026d8 100644 --- a/tutorial/temple/objects/rune-death.c +++ b/tutorial/temple/objects/rune-death.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of death"); - set("short", "Rune of Death"); - set("aliases", ({ "rune", "rune of death", "death" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'death' and see the words, 'I feel death's loving caress' " - "next to it.\n"); - } + set("name", "rune of death"); + set("short", "Rune of Death"); + set("aliases", ({ "rune", "rune of death", "death" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'death' and see the words, 'I feel death's loving caress' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-doom.c b/tutorial/temple/objects/rune-doom.c index d9f281416..67a1b9d72 100644 --- a/tutorial/temple/objects/rune-doom.c +++ b/tutorial/temple/objects/rune-doom.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of doom"); - set("short", "Rune of Doom"); - set("aliases", ({ "rune", "rune of doom", "doom" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'doom' and see the words, 'My doom awaits me' " - "next to it.\n"); - } + set("name", "rune of doom"); + set("short", "Rune of Doom"); + set("aliases", ({ "rune", "rune of doom", "doom" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'doom' and see the words, 'My doom awaits me' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-endurance.c b/tutorial/temple/objects/rune-endurance.c index 854fe173d..ec6e13698 100644 --- a/tutorial/temple/objects/rune-endurance.c +++ b/tutorial/temple/objects/rune-endurance.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of endurance"); - set("short", "Rune of Endurance"); - set("aliases", ({ "rune", "rune of endurance", "endurance" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'endurance' and see the words, 'Pushed past endurance' " - "next to it.\n"); - } + set("name", "rune of endurance"); + set("short", "Rune of Endurance"); + set("aliases", ({ "rune", "rune of endurance", "endurance" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'endurance' and see the words, 'Pushed past endurance' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-envy.c b/tutorial/temple/objects/rune-envy.c index c5a9f2764..204485cc5 100644 --- a/tutorial/temple/objects/rune-envy.c +++ b/tutorial/temple/objects/rune-envy.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of envy"); - set("short", "Rune of Envy"); - set("aliases", ({ "rune", "rune of envy", "envy" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'envy' and see the words, 'I long for freedom restored' " - "next to it.\n"); - } + set("name", "rune of envy"); + set("short", "Rune of Envy"); + set("aliases", ({ "rune", "rune of envy", "envy" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'envy' and see the words, 'I long for freedom restored' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-fear.c b/tutorial/temple/objects/rune-fear.c index 14729b372..ef69bc088 100644 --- a/tutorial/temple/objects/rune-fear.c +++ b/tutorial/temple/objects/rune-fear.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of fear"); - set("short", "Rune of Fear"); - set("aliases", ({ "rune", "rune of fear", "fear" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'fear' and see the words, 'Held in my tracks by fear' " - "next to it.\n"); - } + set("name", "rune of fear"); + set("short", "Rune of Fear"); + set("aliases", ({ "rune", "rune of fear", "fear" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'fear' and see the words, 'Held in my tracks by fear' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-flame.c b/tutorial/temple/objects/rune-flame.c index 205ac2d7e..64a38b079 100644 --- a/tutorial/temple/objects/rune-flame.c +++ b/tutorial/temple/objects/rune-flame.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of flame"); - set("short", "Rune of Flame"); - set("aliases", ({ "rune", "rune of flame", "flame" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'flame' and see the words, 'Burning' " - "next to it.\n"); - } + set("name", "rune of flame"); + set("short", "Rune of Flame"); + set("aliases", ({ "rune", "rune of flame", "flame" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'flame' and see the words, 'Burning' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-frost.c b/tutorial/temple/objects/rune-frost.c index 33b781780..c20ae2f46 100644 --- a/tutorial/temple/objects/rune-frost.c +++ b/tutorial/temple/objects/rune-frost.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of frost"); - set("short", "Rune of Frost"); - set("aliases", ({ "rune", "rune of frost", "frost" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'frost' and see the words, 'Freezing' " - "next to it.\n"); - } + set("name", "rune of frost"); + set("short", "Rune of Frost"); + set("aliases", ({ "rune", "rune of frost", "frost" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'frost' and see the words, 'Freezing' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-negation.c b/tutorial/temple/objects/rune-negation.c index f68ea9820..9f9dbe0a9 100644 --- a/tutorial/temple/objects/rune-negation.c +++ b/tutorial/temple/objects/rune-negation.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of negation"); - set("short", "Rune of Negation"); - set("aliases", ({ "rune", "rune of negation", "negation" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'negation' and see the words, 'I negate my greatest fears' " - "next to it.\n"); - } + set("name", "rune of negation"); + set("short", "Rune of Negation"); + set("aliases", ({ "rune", "rune of negation", "negation" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'negation' and see the words, 'I negate my greatest fears' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-resistance.c b/tutorial/temple/objects/rune-resistance.c index 3bf008e6a..355b1494f 100644 --- a/tutorial/temple/objects/rune-resistance.c +++ b/tutorial/temple/objects/rune-resistance.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of resistance"); - set("short", "Rune of Resistance"); - set("aliases", ({ "rune", "rune of resistance", "resistance" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'resistance' and see the words, 'Resisting no longer' " - "next to it.\n"); - } + set("name", "rune of resistance"); + set("short", "Rune of Resistance"); + set("aliases", ({ "rune", "rune of resistance", "resistance" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'resistance' and see the words, 'Resisting no longer' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-strength.c b/tutorial/temple/objects/rune-strength.c index 0187bc789..70361d818 100644 --- a/tutorial/temple/objects/rune-strength.c +++ b/tutorial/temple/objects/rune-strength.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of strength"); - set("short", "Rune of Strength"); - set("aliases", ({ "rune", "rune of strength", "strength" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'strength' and see the words, 'I am strong' " - "next to it.\n"); - } + set("name", "rune of strength"); + set("short", "Rune of Strength"); + set("aliases", ({ "rune", "rune of strength", "strength" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'strength' and see the words, 'I am strong' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-wall.c b/tutorial/temple/objects/rune-wall.c index 7ba59eaac..c4e7365e3 100644 --- a/tutorial/temple/objects/rune-wall.c +++ b/tutorial/temple/objects/rune-wall.c @@ -191,12 +191,9 @@ public string getPiecesMissing() } ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +public void create() { - if (!arg) - { - resetWall(); - } + resetWall(); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-weakness.c b/tutorial/temple/objects/rune-weakness.c index 420bbafa3..520dd9571 100644 --- a/tutorial/temple/objects/rune-weakness.c +++ b/tutorial/temple/objects/rune-weakness.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of weakness"); - set("short", "Rune of Weakness"); - set("aliases", ({ "rune", "rune of weakness", "weakness" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'weakness' and see the words, 'I am weak' " - "next to it.\n"); - } + set("name", "rune of weakness"); + set("short", "Rune of Weakness"); + set("aliases", ({ "rune", "rune of weakness", "weakness" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'weakness' and see the words, 'I am weak' " + "next to it.\n"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/tutorial/temple/objects/rune-wisdom.c b/tutorial/temple/objects/rune-wisdom.c index 0575ad3a9..3762ee324 100644 --- a/tutorial/temple/objects/rune-wisdom.c +++ b/tutorial/temple/objects/rune-wisdom.c @@ -5,18 +5,15 @@ virtual inherit "/lib/items/treasure.c"; ///////////////////////////////////////////////////////////////////////////// -public void reset(int arg) +protected void Setup() { - if (!arg) - { - set("name", "rune of wisdom"); - set("short", "Rune of Wisdom"); - set("aliases", ({ "rune", "rune of wisdom", "wisdom" })); - set("long", "A fist-sized slab of amethyst has some intricately carved " - "runes on it. You can distinguish the Khazdic symbol for the word " - "'wisdom' and see the words, 'Feeling wise beyond my years' " - "next to it.\n"); - } + set("name", "rune of wisdom"); + set("short", "Rune of Wisdom"); + set("aliases", ({ "rune", "rune of wisdom", "wisdom" })); + set("long", "A fist-sized slab of amethyst has some intricately carved " + "runes on it. You can distinguish the Khazdic symbol for the word " + "'wisdom' and see the words, 'Feeling wise beyond my years' " + "next to it.\n"); } /////////////////////////////////////////////////////////////////////////////