Fix some errors in the Cheat NPC

1 files changed, 116 insertions, 108 deletions

diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 3d8d4a936..ac5b5a083 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -73,61 +73,65 @@ OnInit:
     .distance=5;
     .sex=G_MALE;
 
+    .@steam = $FIRESOFSTEAM;
+    if ($EVENT$ != "Steam")
+        .@steam /= 2;
+
     sleep(SHOPWAIT);
-    sellitem Coal,          -1, 50+($FIRESOFSTEAM*3-3);
-    sellitem LeatherPatch,  800, 45+($FIRESOFSTEAM*3-3);
-    sellitem RawLog,        -1, 40+($FIRESOFSTEAM*3-3);
-    sellitem WoodenLog,     -1, 40+($FIRESOFSTEAM*3-3);
-    sellitem IronOre,       -1, 30+($FIRESOFSTEAM*3-3);
-    sellitem CopperOre,     1000, 20+($FIRESOFSTEAM*2-2);
-    sellitem SilverOre,     2000, 14+($FIRESOFSTEAM*2-2);
-    sellitem GoldOre,       3000, 14+($FIRESOFSTEAM*2-2);
-    sellitem TinOre,        3600, 15+($FIRESOFSTEAM*2-2);
-    sellitem LeadOre,       4000, 15+($FIRESOFSTEAM*2-2);
-    sellitem TitaniumOre,   6000, 9+($FIRESOFSTEAM*2-2);
-    sellitem IridiumOre,    16000, 6+($FIRESOFSTEAM*2-2);
-    sellitem PlatinumOre,   24000, 3+($FIRESOFSTEAM*2-2);
-    sellitem EarthPowder,   -1, 3+$FIRESOFSTEAM-1;
-    sellitem EverburnPowder, 15000, 2+$FIRESOFSTEAM-1;
-
-    sellitem AncientBlueprint,  12500, max(1, 4+$FIRESOFSTEAM/2);
-    sellitem RustyKnife,        -1, 5+$FIRESOFSTEAM-1;
-    sellitem TrainingWand,      -1, 5+$FIRESOFSTEAM-1;
-    sellitem TrainingBow,       -1, 5+$FIRESOFSTEAM-1;
-
-    sellitem AlchemyBlueprintA, -1, 5+$FIRESOFSTEAM-1;
-    sellitem AlchemyBlueprintB, -1, 4+$FIRESOFSTEAM-1;
-    sellitem AlchemyBlueprintC, -1, 3+$FIRESOFSTEAM-1;
-    sellitem AlchemyBlueprintD, -1, 2+$FIRESOFSTEAM-1;
-    sellitem AlchemyBlueprintE, -1, max(1, 1+$FIRESOFSTEAM/2);
-
-    sellitem EquipmentBlueprintA, -1, 5+$FIRESOFSTEAM-1;
-    sellitem EquipmentBlueprintB, -1, 4+$FIRESOFSTEAM-1;
-    sellitem EquipmentBlueprintC, -1, 3+$FIRESOFSTEAM-1;
-    sellitem EquipmentBlueprintD, -1, 2+$FIRESOFSTEAM-1;
-    sellitem EquipmentBlueprintE, -1, max(1, 1+$FIRESOFSTEAM/2);
-
-    sellitem ArcmageBoxset,     10000, 4+$FIRESOFSTEAM-1;
-    sellitem ScholarshipBadge,  -1, 3+$FIRESOFSTEAM-1;
-    sellitem Bullet,            4, 90000+($FIRESOFSTEAM*1000-1000);
-    sellitem Lifestone,         -1, 500+$FIRESOFSTEAM-1;
-    sellitem Bread,             -1, 450+$FIRESOFSTEAM-1;
-    sellitem Cheese,            -1, 300+$FIRESOFSTEAM-1;
-    sellitem Aquada,            -1, 200+$FIRESOFSTEAM-1;
-
-    sellitem WhiteFur,          -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem Piberries,         -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem CherryCake,        -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem LettuceLeaf,       -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem BugLeg,            -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem RoastedMaggot,     -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem Moss,              -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem AnimalBones,       -1, 1+rand2(40)+$FIRESOFSTEAM;
-    sellitem Milk,              -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem Mashmallow,        -1, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem Dragonfruit,       1200, 1+rand2(50)+$FIRESOFSTEAM;
-    sellitem Root,              -1, 40+$FIRESOFSTEAM-1;
-    sellitem ManaPiouFeathers,  -1, 1+rand2(300)+$FIRESOFSTEAM;
+    sellitem Coal,          -1, 50+(.@steam*3-3);
+    sellitem LeatherPatch,  800, 45+(.@steam*3-3);
+    sellitem RawLog,        -1, 40+(.@steam*3-3);
+    sellitem WoodenLog,     -1, 40+(.@steam*3-3);
+    sellitem IronOre,       -1, 30+(.@steam*3-3);
+    sellitem CopperOre,     1000, 20+(.@steam*2-2);
+    sellitem SilverOre,     2000, 14+(.@steam*2-2);
+    sellitem GoldOre,       3000, 14+(.@steam*2-2);
+    sellitem TinOre,        3600, 15+(.@steam*2-2);
+    sellitem LeadOre,       4000, 15+(.@steam*2-2);
+    sellitem TitaniumOre,   6000, 9+(.@steam*2-2);
+    sellitem IridiumOre,    16000, 6+(.@steam*2-2);
+    sellitem PlatinumOre,   24000, 3+(.@steam*2-2);
+    sellitem EarthPowder,   -1, 3+.@steam-1;
+    sellitem EverburnPowder, 15000, 2+.@steam-1;
+
+    sellitem AncientBlueprint,  12500, 4+.@steam/2;
+    sellitem RustyKnife,        -1, 5+.@steam-1;
+    sellitem TrainingWand,      -1, 5+.@steam-1;
+    sellitem TrainingBow,       -1, 5+.@steam-1;
+
+    sellitem AlchemyBlueprintA, -1, 5+.@steam-1;
+    sellitem AlchemyBlueprintB, -1, 4+.@steam-1;
+    sellitem AlchemyBlueprintC, -1, 3+.@steam-1;
+    sellitem AlchemyBlueprintD, -1, 2+.@steam-1;
+    sellitem AlchemyBlueprintE, -1, 1+.@steam/2;
+
+    sellitem EquipmentBlueprintA, -1, 5+.@steam-1;
+    sellitem EquipmentBlueprintB, -1, 4+.@steam-1;
+    sellitem EquipmentBlueprintC, -1, 3+.@steam-1;
+    sellitem EquipmentBlueprintD, -1, 2+.@steam-1;
+    sellitem EquipmentBlueprintE, -1, 1+.@steam/2;
+
+    sellitem ArcmageBoxset,     10000, 4+.@steam-1;
+    sellitem ScholarshipBadge,  -1, 3+.@steam-1;
+    sellitem Bullet,            4, 90000+(.@steam*1000-1000);
+    sellitem Lifestone,         -1, 500+.@steam-1;
+    sellitem Bread,             -1, 450+.@steam-1;
+    sellitem Cheese,            -1, 300+.@steam-1;
+    sellitem Aquada,            -1, 200+.@steam-1;
+
+    sellitem WhiteFur,          -1, 1+rand2(50)+.@steam;
+    sellitem Piberries,         -1, 1+rand2(50)+.@steam;
+    sellitem CherryCake,        -1, 1+rand2(50)+.@steam;
+    sellitem LettuceLeaf,       -1, 1+rand2(50)+.@steam;
+    sellitem BugLeg,            -1, 1+rand2(50)+.@steam;
+    sellitem RoastedMaggot,     -1, 1+rand2(50)+.@steam;
+    sellitem Moss,              -1, 1+rand2(50)+.@steam;
+    sellitem AnimalBones,       -1, 1+rand2(40)+.@steam;
+    sellitem Milk,              -1, 1+rand2(50)+.@steam;
+    sellitem Mashmallow,        -1, 1+rand2(50)+.@steam;
+    sellitem Dragonfruit,       1200, 1+rand2(50)+.@steam;
+    sellitem Root,              -1, 40+.@steam;
+    sellitem ManaPiouFeathers,  -1, 1+rand2(300)+.@steam;
 
     if (!$BETASERVER && !debug)
         disablenpc .name$;
@@ -152,60 +156,64 @@ OnClock2201:
     .robp=rand2(900, 1200);
     .robg=.robp*rand2(40, 60);//rand2(80, 110);
 
-    restoreshopitem Coal,           50+($FIRESOFSTEAM*3-3);
-    restoreshopitem LeatherPatch, 800, 45+($FIRESOFSTEAM*3-3);
-    restoreshopitem RawLog,         40+($FIRESOFSTEAM*3-3);
-    restoreshopitem WoodenLog,      40+($FIRESOFSTEAM*3-3);
-    restoreshopitem IronOre,        30+($FIRESOFSTEAM*3-3);
-    restoreshopitem CopperOre,   1000, 20+($FIRESOFSTEAM*2-2);
-    restoreshopitem SilverOre,   2000, 14+($FIRESOFSTEAM*2-2);
-    restoreshopitem GoldOre,     3000, 14+($FIRESOFSTEAM*2-2);
-    restoreshopitem TinOre,      3600, 15+($FIRESOFSTEAM*2-2);
-    restoreshopitem LeadOre,     4000, 15+($FIRESOFSTEAM*2-2);
-    restoreshopitem TitaniumOre, 6000, 9+($FIRESOFSTEAM*2-2);
-    restoreshopitem IridiumOre,  16000, 6+($FIRESOFSTEAM*2-2);
-    restoreshopitem PlatinumOre, 24000, 3+($FIRESOFSTEAM*2-2);
-    restoreshopitem EarthPowder, 3+$FIRESOFSTEAM-1;
-    restoreshopitem EverburnPowder, 15000, 2+$FIRESOFSTEAM-1;
-
-    restoreshopitem AncientBlueprint, 10000, 4+$FIRESOFSTEAM-1;
-    restoreshopitem RustyKnife, 5+$FIRESOFSTEAM-1;
-    restoreshopitem TrainingWand, 5+$FIRESOFSTEAM-1;
-    restoreshopitem TrainingBow, 5+$FIRESOFSTEAM-1;
-
-    restoreshopitem AlchemyBlueprintA, 5+$FIRESOFSTEAM-1;
-    restoreshopitem AlchemyBlueprintB, 4+$FIRESOFSTEAM-1;
-    restoreshopitem AlchemyBlueprintC, 3+$FIRESOFSTEAM-1;
-    restoreshopitem AlchemyBlueprintD, 2+$FIRESOFSTEAM-1;
-    restoreshopitem AlchemyBlueprintE, 1+$FIRESOFSTEAM-1;
-
-    restoreshopitem EquipmentBlueprintA, 5+$FIRESOFSTEAM-1;
-    restoreshopitem EquipmentBlueprintB, 4+$FIRESOFSTEAM-1;
-    restoreshopitem EquipmentBlueprintC, 3+$FIRESOFSTEAM-1;
-    restoreshopitem EquipmentBlueprintD, 2+$FIRESOFSTEAM-1;
-    restoreshopitem EquipmentBlueprintE, 1+$FIRESOFSTEAM-1;
-
-    restoreshopitem ArcmageBoxset, 10000, 4+$FIRESOFSTEAM-1;
-    restoreshopitem ScholarshipBadge, 3+$FIRESOFSTEAM-1;
-    restoreshopitem Lifestone, 800+$FIRESOFSTEAM-1;
-    restoreshopitem Bullet, 4, 90000+$FIRESOFSTEAM-1;
-    restoreshopitem Bread,  750+$FIRESOFSTEAM-1;
-    restoreshopitem Cheese, 400+$FIRESOFSTEAM-1;
-    restoreshopitem Aquada, 200+$FIRESOFSTEAM-1;
-
-    restoreshopitem WhiteFur, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem Piberries, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem CherryCake, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem LettuceLeaf, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem BugLeg, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem RoastedMaggot, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem Moss, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem AnimalBones, 1+rand2(40)+$FIRESOFSTEAM;
-    restoreshopitem Milk, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem Mashmallow, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem Dragonfruit, 1200, 1+rand2(50)+$FIRESOFSTEAM;
-    restoreshopitem Root, 40+$FIRESOFSTEAM;
-    restoreshopitem ManaPiouFeathers, 1+rand2(300)+$FIRESOFSTEAM;
+    .@steam = $FIRESOFSTEAM;
+    if ($EVENT$ != "Steam")
+        .@steam /= 2;
+
+    restoreshopitem Coal,           50+(.@steam*3-3);
+    restoreshopitem LeatherPatch, 800, 45+(.@steam*3-3);
+    restoreshopitem RawLog,         40+(.@steam*3-3);
+    restoreshopitem WoodenLog,      40+(.@steam*3-3);
+    restoreshopitem IronOre,        30+(.@steam*3-3);
+    restoreshopitem CopperOre,   1000, 20+(.@steam*2-2);
+    restoreshopitem SilverOre,   2000, 14+(.@steam*2-2);
+    restoreshopitem GoldOre,     3000, 14+(.@steam*2-2);
+    restoreshopitem TinOre,      3600, 15+(.@steam*2-2);
+    restoreshopitem LeadOre,     4000, 15+(.@steam*2-2);
+    restoreshopitem TitaniumOre, 6000, 9+(.@steam*2-2);
+    restoreshopitem IridiumOre,  16000, 6+(.@steam*2-2);
+    restoreshopitem PlatinumOre, 24000, 3+(.@steam*2-2);
+    restoreshopitem EarthPowder, 3+.@steam-1;
+    restoreshopitem EverburnPowder, 15000, 2+.@steam-1;
+
+    restoreshopitem AncientBlueprint, 12500, 4+.@steam/2;
+    restoreshopitem RustyKnife, 5+.@steam-1;
+    restoreshopitem TrainingWand, 5+.@steam-1;
+    restoreshopitem TrainingBow, 5+.@steam-1;
+
+    restoreshopitem AlchemyBlueprintA, 5+.@steam-1;
+    restoreshopitem AlchemyBlueprintB, 4+.@steam-1;
+    restoreshopitem AlchemyBlueprintC, 3+.@steam-1;
+    restoreshopitem AlchemyBlueprintD, 2+.@steam-1;
+    restoreshopitem AlchemyBlueprintE, 1+.@steam/2;
+
+    restoreshopitem EquipmentBlueprintA, 5+.@steam-1;
+    restoreshopitem EquipmentBlueprintB, 4+.@steam-1;
+    restoreshopitem EquipmentBlueprintC, 3+.@steam-1;
+    restoreshopitem EquipmentBlueprintD, 2+.@steam-1;
+    restoreshopitem EquipmentBlueprintE, 1+.@steam/2;
+
+    restoreshopitem ArcmageBoxset, 10000, 4+.@steam-1;
+    restoreshopitem ScholarshipBadge, 3+.@steam-1;
+    restoreshopitem Bullet, 4, 90000+(.@steam*1000-1000);
+    restoreshopitem Lifestone, 500+.@steam-1;
+    restoreshopitem Bread,  450+.@steam-1;
+    restoreshopitem Cheese, 300+.@steam-1;
+    restoreshopitem Aquada, 200+.@steam-1;
+
+    restoreshopitem WhiteFur, 1+rand2(50)+.@steam;
+    restoreshopitem Piberries, 1+rand2(50)+.@steam;
+    restoreshopitem CherryCake, 1+rand2(50)+.@steam;
+    restoreshopitem LettuceLeaf, 1+rand2(50)+.@steam;
+    restoreshopitem BugLeg, 1+rand2(50)+.@steam;
+    restoreshopitem RoastedMaggot, 1+rand2(50)+.@steam;
+    restoreshopitem Moss, 1+rand2(50)+.@steam;
+    restoreshopitem AnimalBones, 1+rand2(40)+.@steam;
+    restoreshopitem Milk, 1+rand2(50)+.@steam;
+    restoreshopitem Mashmallow, 1+rand2(50)+.@steam;
+    restoreshopitem Dragonfruit, 1200, 1+rand2(50)+.@steam;
+    restoreshopitem Root, 40+.@steam;
+    restoreshopitem ManaPiouFeathers, 1+rand2(300)+.@steam;
     end;
 
 OnMinute02: