From a26eb2f858cce483cf7edac7740643abd44e0709 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 14 Nov 2016 23:55:22 +0100 Subject: Propageted the AegisName fix to scripts and pre-re database This commit just propagates the AegisName changes to the pre-re database and to the (re) scripts. Two issues are fixed as a side-effect: - The ghost_palace script was referring the non-existing constant(s): Thanatos_Two-Handed_Staff == (Thanatos_Two) - (Handed_Staff) == 0. Paired with the script engine's inability to differentiate between constants and player variables, that produced a very subtle issue. - The item RAG203 is sold by a NPC (Rebellion Weapon Vending). Due to a pair of swapped AegisName constants (RAG203 and RAG203_), the slotted version was sold by the NPC instead of hte non-slotted one (the issue was actually fixed in the previous commit, although the description of the fix is here - these two commits are only split for legibility purposes but they're to be considered indivisible). Signed-off-by: Haru --- npc/re/events/halloween_2013.txt | 12 +++--- npc/re/instances/OldGlastHeim.txt | 82 +++++++++++++++++++------------------- npc/re/instances/ghost_palace.txt | 15 +++---- npc/re/jobs/novice/academy.txt | 14 +++---- npc/re/merchants/coin_exchange.txt | 2 +- npc/re/merchants/shops.txt | 50 +++++++++++------------ npc/re/quests/eden/eden_iro.txt | 2 +- npc/re/quests/quests_eclage.txt | 8 ++-- 8 files changed, 93 insertions(+), 92 deletions(-) (limited to 'npc/re') diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt index 6f16d437c..acfd60f9f 100644 --- a/npc/re/events/halloween_2013.txt +++ b/npc/re/events/halloween_2013.txt @@ -267,7 +267,7 @@ L_Explain: niflheim,181,173,5 script Chef Candycon#2013HE 4_M_NFDEADSWDMAN,{ if (eve_bs == 1) { - if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) >= 30) { + if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) >= 30) { mes "[Chef Candycon]"; mes "Clang~Clang~!"; next; @@ -400,16 +400,16 @@ L_GivePumpkin: mes "Eeh~~ You have no use for those pumpkins~~"; close; } - if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) < 30) { + if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) < 30) { mes "[Chef Candycon]"; mes "Ooops where is pumpkin? escaped again?"; mes "Oh, boy...no... you should go to get them again..."; close; } - if (countitem(Inorganic_Pumpkin)) - delitem Inorganic_Pumpkin,countitem(Inorganic_Pumpkin); - if (countitem(Organic_Pumpkin)) - delitem Organic_Pumpkin,countitem(Organic_Pumpkin); + if (countitem(INORGANIC_PUMPKIN)) + delitem INORGANIC_PUMPKIN, countitem(INORGANIC_PUMPKIN); + if (countitem(ORGANIC_PUMPKIN)) + delitem ORGANIC_PUMPKIN, countitem(ORGANIC_PUMPKIN); eve_bs = 2; getitem HALLOWEEN_G_BOX,1; erasequest 11378; diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 0b21767f7..fc01464f2 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -2226,7 +2226,7 @@ OnEnable: end; } -// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_STAT_Boots +// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_*_Boots // Upon trade all refines got removed // Uses Temporal_Crystal /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -2275,7 +2275,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{ mes("You can trade ^0000FF1 Temporal Boots and 5 Temporal Crystals^000000 for 1 of the following items. ^FF0000Previous refine rate will not be retained with these new ones^000000."); next; setarray .@type$[0], "Strength", "Intelligence", "Agility", "Vitality", "Dexterity", "Luck"; - setarray .@equip_type[0], Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots; + setarray .@equip_type[0], Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots; .@select = select("Cancel", "Str Boots", "Int Boots", "Agi Boots", "Vit Boots", "Dex Boots", "Luk Boots"); switch (.@select) { case 1: @@ -2296,7 +2296,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{ mes("The boots has been upgraded as you want."); delequip .@part; delitem Temporal_Crystal, 5; - getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots + getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots close; } mes("[Hugin's Butler]"); @@ -2307,7 +2307,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{ } // Enchant NPC - Coagulated Spell to enchants on 4th slot. First one to pick --> upgraded --> additional random enchant on 3rd slot -// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_STAT_Boots +// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_*_Boots // Enchanting can fail, the 3th slot random one is guaranteed // Refine remains // Item Used: Coagulated_Spell @@ -2371,18 +2371,18 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of setarray .@enchant_rate[0], 90, 80, 70, 50, 100; // Enchant Success Rate in % .@random = rand(1, 100); switch (.@equip_id) { - case Temporal_STR_Boots: - case Temporal_INT_Boots: - case Temporal_AGI_Boots: - case Temporal_VIT_Boots: - case Temporal_DEX_Boots: - case Temporal_LUK_Boots: - case Temporal_STR_Boots_: - case Temporal_INT_Boots_: - case Temporal_AGI_Boots_: - case Temporal_VIT_Boots_: - case Temporal_DEX_Boots_: - case Temporal_LUK_Boots_: + case Temporal_Str_Boots: + case Temporal_Int_Boots: + case Temporal_Agi_Boots: + case Temporal_Vit_Boots: + case Temporal_Dex_Boots: + case Temporal_Luk_Boots: + case Temporal_Str_Boots_: + case Temporal_Int_Boots_: + case Temporal_Agi_Boots_: + case Temporal_Vit_Boots_: + case Temporal_Dex_Boots_: + case Temporal_Luk_Boots_: if (.@card3 == 0) { //4th slot 1st try enchanting .@cost = .@enchant_cost[0]; .@scs = .@enchant_rate[0]; @@ -2566,9 +2566,9 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of close; } -// Socket NPC - Contaminated_Magic or Temporal_Crystal to add card slot +// Socket NPC - Corrupted_Charm or Temporal_Crystal to add card slot // After the boots were slotted, you can still enchant, but slotting removes any enchants and refines applied before. -// Item Used: Contaminated_Magic, Temporal_Crystal +// Item Used: Corrupted_Charm, Temporal_Crystal /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ disable_items; @@ -2601,12 +2601,12 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ } .@equip_id = getequipid(.@part); switch (.@equip_id) { - case Temporal_STR_Boots: - case Temporal_INT_Boots: - case Temporal_AGI_Boots: - case Temporal_VIT_Boots: - case Temporal_DEX_Boots: - case Temporal_LUK_Boots: + case Temporal_Str_Boots: + case Temporal_Int_Boots: + case Temporal_Agi_Boots: + case Temporal_Vit_Boots: + case Temporal_Dex_Boots: + case Temporal_Luk_Boots: mes("[Hugin's Craftsman]"); mes("The ^FF0000Boots and all enchants or refines will be lost if you fail this.^000000\r" "Still want to risk it?"); @@ -2629,7 +2629,7 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ mes("Then my last question:\r" "Which item are you gonna use to pay me?"); next; - setarray .@slotpay[0], Temporal_Crystal, Contaminated_Magic; + setarray .@slotpay[0], Temporal_Crystal, Corrupted_Charm; setarray .@slotcost[0], 10, 50; setarray .@slotchance[0], 80, 65; // Custom rates .@select = select("Cancel", "Temporal Crystal", "Contaminated Magic"); @@ -2664,18 +2664,18 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ specialeffect2 EF_PHARMACY_OK; delequip .@part; // todo: read aegis name and attach "_" to worn constant - if (.@equip_id == Temporal_STR_Boots) { - getitem2 Temporal_STR_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_INT_Boots) { - getitem2 Temporal_INT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_AGI_Boots) { - getitem2 Temporal_AGI_Boots_, 1, 1, 0, 0, 0, 0, .0, 0; - } else if (.@equip_id == Temporal_VIT_Boots) { - getitem2 Temporal_VIT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_DEX_Boots) { - getitem2 Temporal_DEX_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_LUK_Boots) { - getitem2 Temporal_LUK_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + if (.@equip_id == Temporal_Str_Boots) { + getitem2 Temporal_Str_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Int_Boots) { + getitem2 Temporal_Int_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Agi_Boots) { + getitem2 Temporal_Agi_Boots_, 1, 1, 0, 0, 0, 0, .0, 0; + } else if (.@equip_id == Temporal_Vit_Boots) { + getitem2 Temporal_Vit_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Dex_Boots) { + getitem2 Temporal_Dex_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Luk_Boots) { + getitem2 Temporal_Luk_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; } close; default: @@ -2699,7 +2699,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{ mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000."); mes("White Knight Card4608"); next; - setarray .@item[0], Coagulated_Spell, Contaminated_Magic; + setarray .@item[0], Coagulated_Spell, Corrupted_Charm; setarray .@cost[0], 3000, 70; .@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000"); switch (.@select) { @@ -2717,7 +2717,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{ close; } delitem .@item, .@cost; - getitem White_Knight_Card, 1; + getitem White_Knightage_Card, 1; close; } } @@ -2732,7 +2732,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{ mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000."); mes("Khalitzburg Knight Card4609"); next; - setarray .@item[0], Coagulated_Spell, Contaminated_Magic; + setarray .@item[0], Coagulated_Spell, Corrupted_Charm; setarray .@cost[0], 5000, 100; .@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000"); switch (.@select) { @@ -2750,7 +2750,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{ close; } delitem .@item, .@cost; - getitem Khalitzburg_Knight_Card, 1; + getitem Khali_Knightage_Card, 1; close; } } diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index 08fe3b71b..b1a8f3c10 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -318,9 +318,9 @@ OnInstanceInit: "Everything will be vanished..."); close2(); if (first_time_gpmission) - getitem Gray_Piece, 1; + getitem(Gray_Shard, 1); if (!first_time_gpmission) { - getitem Gray_Piece, 2; + getitem(Gray_Shard, 2); getexp(900000, 500000); ++first_time_gpmission; } @@ -705,9 +705,10 @@ OnInstanceInit: mes("The cursed knight...\r" "Please help me save the soul of Sakray."); next; - setarray .@items_list, Thanatos_Sword, Thanatos_Great_Sword, Thanatos_Spear, Thanatos_Long_Spear, Thanatos_Staff, Thanatos_Two-Handed_Staff, Thanatos_Bow, - Thanatos_Dagger, Thanatos_Katar, Thanatos_Knuckles, Thanatos_Hammer, Thanatos_Axe, Thanatos_Violin, Thanatos_Whip, Gray_Shield, - Gray_Armor, Gray_Robe, Gray_Cloak, Boots_of_Gray, Gray_Helmet; + setarray(.@items_list, + Thanos_Sword, Thanos_Great_Sword, Thanos_Spear, Thanos_Long_Spear, Thanos_Staff, Thanos_Rod, Thanos_Bow, + Thanos_Dagger, Thanos_Katar, Thanos_Knuckle, Thanos_Hammer, Thanos_Axe, Thanos_Violin, Thanos_Whip, Shield_Of_Gray, + Armor_Of_Gray, Gray_Robe, Cloak_Of_Gray, Boots_Of_Gray, Gray_Helmet); setarray .@cost, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 100, 100, 100, 100, 100, 100; .@menulist$ = ""; @@ -734,7 +735,7 @@ OnInstanceInit: break; case 2: next; - if (countitem(Gray_Piece) < .@cost[.@choice]) { + if (countitem(Gray_Shard) < .@cost[.@choice]) { mes("[King]"); mes("You don't have enough Gray Shards."); mesf("I need %d Gray Shards to make a ^FF0000%s.^000000", .@cost[.@choice], getitemname(.@items_list[.@choice])); @@ -755,7 +756,7 @@ OnInstanceInit: mes("[King]"); mes("The power requires a sacrifice.\r" "Please be careful..."); - delitem Gray_Piece, .@cost[.@choice]; + delitem(Gray_Shard, .@cost[.@choice]); getitem .@items_list[.@choice], 1; close(); } diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 6164a0994..bee91f382 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -123,8 +123,8 @@ int_land,58,69,5 script Sailor#int_land 4W_SAILOR,{ mes("I'll let you know when we set sail~!"); close(); } else { - if (countitem(Lumber) >= 2) { - delitem(Lumber, countitem(Lumber)); + if (countitem(Wood) >= 2) { + delitem(Wood, countitem(Wood)); completequest(21002); mes("[Sailor]"); mes("Unbelievable, perfect! Any chance you want to join my crew?"); @@ -2646,8 +2646,8 @@ iz_ac01,100,39,5 script Academy Receptionist#1 4_F_01,{ getitem(Novice_Egg_Cap, 1); // Novice_Egg_Cap getitem(Novice_Knife, 1); // Novice_Knife getitem(Novice_Guard, 1); // Novice_Guard - getitem(Criatura_Academy_Hat, 1); // Criatura_Academy_Hat - getitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon + getitem(Cryptura_Academy_Hat, 1); + getitem(Cryptura_Hair_Coupon, 1); getitem(Novice_Potion, 300); // Novice_Potion next(); mes("[Receptionist]"); @@ -5208,7 +5208,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ cutin("", 255); completequest(2295); setquest(2296); - getitem(Little_Unripe_Apple, 5); // Little_Unripe_Apple + getitem(Unripe_Apple2, 5); close(); } else if (questprogress(2296) == 1) { if (countitem(Novice_Poring_Egg) > 0) { @@ -6111,7 +6111,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } close(); case 2: - if (!countitem(Criatura_Hair_Coupon)) { + if (!countitem(Cryptura_Hair_Coupon)) { mes("[Otter Samssoon]"); mes("Come on.. Honey~"); mes("You should bring ^ff0000'Criatura Hair Coupon'^000000 for changing hair..."); @@ -6192,7 +6192,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("- Chikak, crack, crack.. -"); mes("- Snap, snap, snap.. Crack -"); next(); - delitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon + delitem(Cryptura_Hair_Coupon, 1); cutin("", 255); mes("[Otter Samssoon]"); mes("Oh my! Oh my! Oh my!"); diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index b714dd71d..e5ee13ffb 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -1139,7 +1139,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{ C_Assassin_Mask_, C_Elven_Ears, C_Hahoe_Mask, - C_Boy's_Cap; + C_Boys_Cap; if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10)) .@item_check =1; diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 54155e8c4..d8f7594b2 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -547,42 +547,42 @@ OnInit: prontera,92,209,4 trader Rebellion Weapon Vending 2_VENDING_MACHINE1,{ OnInit: - sellitem Heaven's_Feather_and_Hell's_Fire; - sellitem Altea_and_Ares; - sellitem Color_Scope; + sellitem H_FEATHER_H_FIRE; + sellitem ALTAIR_ARES; + sellitem COLORSCOPE; sellitem RAG203; - sellitem Death_Fire; - sellitem Rolling_Thunder; - sellitem Peace_Breaker; - sellitem Mini_Mei; - sellitem Tempest; - sellitem End_Of_The_Horizon; - sellitem South_Cross; + sellitem DEATHFIRE; + sellitem R_THUNDER; + sellitem P_BREAKER; + sellitem MINIMAY; + sellitem TEMPEST; + sellitem END_OF_HORIZON; + sellitem Southern_Cross_R; } prontera,96,209,4 trader Rebellion Prop Vending 2_VENDING_MACHINE1,{ OnInit: - sellitem Slug_Ammunition_L; - sellitem Slug_Ammunition_M; - sellitem Slug_Ammunition_H; - sellitem Full_Metal_Jacket; - sellitem Projection_Landmines; + sellitem Slug_Bullet_1; + sellitem Slug_Bullet_2; + sellitem Slug_Bullet_3; + sellitem Fullmetal_Jacket_Bullet; + sellitem Mine_Projectile; sellitem Dragon_Tail_Missile; sellitem Special_Alloy_Trap; sellitem Bullet; sellitem Silver_Bullet_; sellitem Shell_Of_Blood_; - sellitem Armor_Piercing_Bullet; - sellitem Blazing_Bullet; + sellitem AP_Ammo; + sellitem Blaze_Bullet; sellitem Freezing_Bullet; - sellitem Lightning_Bullet; - sellitem Magic_Stone_Bullet; - sellitem Purifying_Bullet; - sellitem Incendiary_Grenade; - sellitem Lightning_Grenade; - sellitem Poison_Grenade; - sellitem Flash_Grenade; - sellitem Cyro_Grenade; + sellitem Electric_Shock_Bullet; + sellitem Magical_Stone_Bullet; + sellitem Sanctified_Bullet; + sellitem Flare_Sphere_; + sellitem Lighting_Sphere_; + sellitem Poison_Sphere_; + sellitem Blind_Sphere_; + sellitem Freezing_Sphere_; } //== Morroc =============================================== diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 460960d72..2d72b3541 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -709,7 +709,7 @@ OnInit: tradertype(NST_CASH); sellitem Blue_Potion_Box,5; sellitem F_Neuralizer_Box,400; - sellitem FPr_Reset_Stone_Box,100; + sellitem FPremium_Reset_Stone_Box,100; sellitem F_Abrasive_Box10,75; sellitem F_G_O_I_Box10,25; sellitem Greed_Scroll_Box_30,30; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index f1abf56aa..bbf074581 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -2807,7 +2807,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ emotion e_dots,0,"Alp Ocart#ep14_2in2"; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -2949,7 +2949,7 @@ ecl_in04,224,234,4 script Mark Esha#ep14_2in2 4_M_BLUEMAN,{ emotion e_dots,0,"Alp Ocart#ep14_2in2"; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -3094,7 +3094,7 @@ ecl_in04,223,234,4 script Maggi Steen#ep14_2in2 4_F_PINKWOMAN,{ emotion e_dots,0,"Alp Ocart#ep14_2in2"; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -3230,7 +3230,7 @@ ecl_in04,223,230,4 script Alp Ocart#ep14_2in2 4_M_BLACKMAN,{ emotion e_dots; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; -- cgit v1.2.3-70-g09d2