Amend Orum's script and the flowerpentagrams to use the actual items.

6 files changed, 22 insertions, 22 deletions

diff --git a/world/map/npc/012-1/flowerpentagram2.txt b/world/map/npc/012-1/flowerpentagram2.txt
index 21910356..f1dee0fe 100644
--- a/world/map/npc/012-1/flowerpentagram2.txt
+++ b/world/map/npc/012-1/flowerpentagram2.txt
@@ -23,9 +23,9 @@ L_SecondFlower:
     goto L_Close;
 
 L_Place:
-//    if ((countitem("TODO:name") < 1))
-//        goto L_NoFlower;
-//    delitem "TODO:name", 1;
+    if (countitem("PurpleSummonFlower") < 1)
+        goto L_NoFlower;
+    delitem "PurpleSummonFlower", 1;
     mes "Remembering what happened last time, you take a careful look around. Everything's calm. You proceed and place the second flower.";
     mes "Tension builds up around you. You're alarmed.";
     set OrumQuest, 21;
diff --git a/world/map/npc/017-1/flowerpentagram1.txt b/world/map/npc/017-1/flowerpentagram1.txt
index 38f51d0b..d0cda333 100644
--- a/world/map/npc/017-1/flowerpentagram1.txt
+++ b/world/map/npc/017-1/flowerpentagram1.txt
@@ -23,9 +23,9 @@ L_FirstFlower:
     goto L_Close;
 
 L_Place:
-//    if (countitem("TODO:name") < 1)
-//        goto L_NoFlower;
-//    delitem "TODO:name", 1;
+    if (countitem("OrangeSummonFlower") < 1)
+        goto L_NoFlower;
+    delitem "OrangeSummonFlower", 1;
     mes "You carefully place the magic flower on the marked spot. You feel some tension in the air around you.";
     set OrumQuest, 18;
     close2;
diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt
index c1b81298..388b52f8 100644
--- a/world/map/npc/017-4/orum.txt
+++ b/world/map/npc/017-4/orum.txt
@@ -139,7 +139,7 @@ L_FirstFlower: // 16: Got task to bring materials for first magical flower
     delitem "SmallMushroom", @AMOUNT_SMALLMUSHROOM;
     delitem "PileOfAsh", @AMOUNT_SMALLMUSHROOM;
     delitem "OrangeTulip", 1;
-    getitem "BlueRose", 1; // TODO: replace with magical flower artefact
+    getitem "OrangeSummonFlower", 1;
     set OrumQuest, 17;
 
     mes "Orum takes the items and starts to pulverize them, mixes some of it together in the caldron and finally dips the tulip into it, mumbering enchantements. The tulip changes its appearance. Then he hands it over to you.";
@@ -209,7 +209,7 @@ L_SecondFlower: // 19: Got task to bring materials for second magical flower
     delitem "PinkPetal", @AMOUNT_PINKPETAL;
     delitem "ScorpionStinger", @AMOUNT_STINGER;
     delitem "PurpleTulip", 1;
-    getitem "BlueRose", 1; // TODO: replace with magical flower artefact
+    getitem "PurpleSummonFlower", 1;
     set OrumQuest, 20;
 
     mes "Orum starts to handle the material similiar to the ones for the first flower. Suddenly something from the pulver gets on his hand and it makes a nasty frizzling sound. He yells in pain. After cleaning his hand he continues. At the end he gives you another magical flower while rubbing his hand.";
@@ -346,7 +346,7 @@ L_EasyTooEarly:
     goto L_Close;
 
 L_EasySuccess:
-    getitem "BlueRose", 1; // TODO: replace with magical flower artefact
+    getitem "WhiteSummonFlower", 1;
     set OrumQuest, 23;
 
     mes "As you pour the liquid on the bubbling mixture, it calms down and becomes viscous. Orum takes the tulip and dips it into the mixture.";
@@ -513,7 +513,7 @@ L_HardTooExtreme:
     goto L_Close;
 
 L_HardSuccess:
-    getitem "BlueRose", 1; // TODO: replace with magical flower artefact
+    getitem "YellowSummonFlower", 1;
     set OrumQuest, 26;
 
     mes "Orum pours the rheological additive on the mixture and then drips the flower into the caldron.";
@@ -638,7 +638,7 @@ L_FlowerHat:
     mes "\"Fool! See what you've done! It's ruined!\"";
     next;
     mes "\"Though we have enough of the materials left to start over... Here, take this garbage out and get a new Red Rose!\"";
-    getitem "RoseHat", 1; // TODO: add item to database
+    getitem "RoseHat", 1;
     set OrumQuest, 29;
     goto L_Close;
 
@@ -673,7 +673,7 @@ L_FailedFifthFlower: // 29: Failed unbeatable minigame and got the flower hat
     next;
     mes "You watch while Orum carefully prepares the last magic flower.";
     next;
-    getitem "BlueRose", 1; // TODO: replace with magical flower artefact
+    getitem "RedSummonFlower", 1;
     set OrumQuest, 30;
     mes "[Orum]";
     mes "\"Here it is. We're almost done. Don't mess it up!\"";
@@ -725,7 +725,7 @@ L_PlaceFifthFlower: // 30: Got task to place the fifth flower
     delitem "Pearl", @AMOUNT_PEARL;
     delitem "BlackScorpionStinger", @AMOUNT_BLACKSTINGER;
     delitem "RedRose", 1;
-    getitem "BlueRose", 1; // TODO: replace with magical flower artefact
+    getitem "RedSummonFlower", 1;
 
     mes "Orum takes the material and prepares a new flower.";
     mes "[Orum]";
diff --git a/world/map/npc/018-1/flowerpentagram3.txt b/world/map/npc/018-1/flowerpentagram3.txt
index e80a6317..07195529 100644
--- a/world/map/npc/018-1/flowerpentagram3.txt
+++ b/world/map/npc/018-1/flowerpentagram3.txt
@@ -23,9 +23,9 @@ L_ThirdFlower:
     goto L_Close;
 
 L_Place:
-//    if ((countitem("TODO:name") < 1))
-//        goto L_NoFlower;
-//    delitem "TODO:name", 1;
+    if (countitem("WhiteSummonFlower") < 1)
+        goto L_NoFlower;
+    delitem "WhiteSummonFlower", 1;
     mes "Knowing what will happen, you prepare yourself for a fight. Then you go ahead and place the magical flower.";
     mes "You feel the familiar tension around you. Here they come.";
     set OrumQuest, 24;
diff --git a/world/map/npc/055-1/flowerpentagram4.txt b/world/map/npc/055-1/flowerpentagram4.txt
index 6af2fa6a..f56a9059 100644
--- a/world/map/npc/055-1/flowerpentagram4.txt
+++ b/world/map/npc/055-1/flowerpentagram4.txt
@@ -23,9 +23,9 @@ L_FourthFlower:
     goto L_Close;
 
 L_Place:
-//    if ((countitem("TODO:name") < 1))
-//        goto L_NoFlower;
-//    delitem "TODO:name", 1;
+    if (countitem("YellowSummonFlower") < 1)
+        goto L_NoFlower;
+    delitem "YellowSummonFlower", 1;
     mes "Worried about what will leak from the astral plane this time, you prepare yourself and put the flower in place.";
     mes "As expected you feel the magical tension building up. They're coming.";
     set OrumQuest, 28;
diff --git a/world/map/npc/056-1/flowerpentagram5.txt b/world/map/npc/056-1/flowerpentagram5.txt
index 31786166..27ba9b91 100644
--- a/world/map/npc/056-1/flowerpentagram5.txt
+++ b/world/map/npc/056-1/flowerpentagram5.txt
@@ -33,9 +33,9 @@ L_Place:
     if (($@Flower_Pentagram_Time > gettimetick(2) - 3600) && ($@Flower_Pentagram_Mobcount > 5)) // TODO: balance treshold
         goto L_TooEarly;
     set $@Flower_Pentagram_Time, gettimetick(2);
-//    if ((countitem("TODO:name") < 1))
-//        goto L_NoFlower;
-//    delitem "TODO:name", 1;
+    if (countitem("RedSummonFlower") < 1)
+        goto L_NoFlower;
+    delitem "RedSummonFlower", 1;
 
     mes "The moment you think you can't endure it anymore, the webbing of the world seems to tear apart.";
     set OrumQuest, 31;