diff options
| -rw-r--r-- | npc/001-1/eventmaster.txt | 23 | ||||
| -rw-r--r-- | npc/items/shovel.txt | 46 |
2 files changed, 45 insertions, 24 deletions
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt index 29590f4f8..4abc9b5fa 100644 --- a/npc/001-1/eventmaster.txt +++ b/npc/001-1/eventmaster.txt @@ -45,12 +45,12 @@ // [0] East [1] West [2] Full makeitem switch($@AEROS_SPWN) { case 1: - shovel_scatter("001-1", 20, 20, 140, 140, getarg(0), getarg(1,1)); + shovel_scatter("001-1", 20, 20, 140, 140, getarg(1,1), getarg(0)); break; case 2: - shovel_scatter("001-1", 20, 20, 340, 160, getarg(0), getarg(1,1)); + shovel_scatter("001-1", 20, 20, 340, 160, getarg(1,1), getarg(0)); default: - shovel_scatter("001-1",171, 20, 340, 160, getarg(0), getarg(1,1)); + shovel_scatter("001-1",171, 20, 340, 160, getarg(1,1), getarg(0)); } } @@ -768,7 +768,6 @@ L_Drop: select "Abort", // 1 "Bury 10x Coins", // 2 - "Bury Random Crap", // 3 "Toothbrush", // 4 "Bronze Gift", // 5 "Silver Gift", // 6 @@ -789,22 +788,14 @@ L_Drop: case 2: buryitem(StrangeCoin, .@c*any(9,10,10,10,11,11)); break; case 3: - setarray .@Treasure, - Bread,Candy,BugLeg,Cheese,Acorn, - ScorpionStinger,CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, - Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - BoneArrow, SacredBullet; - buryitem(.@Treasure, .@c*any(9,10,10,10,11,11)); break; - case 4: mkitem(Toothbrush, .@c); break; - case 5: + case 4: mkitem(BronzeGift, .@c); break; - case 6: + case 5: mkitem(SilverGift, .@c); break; - case 7: + case 6: mkitem(GoldenGift, .@c); break; - case 8: + case 7: mkitem(PrismGift, .@c); break; default: mkitem(SupremeGift, .@c); break; diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt index e16fce0ce..63d4f677c 100644 --- a/npc/items/shovel.txt +++ b/npc/items/shovel.txt @@ -24,19 +24,18 @@ function script shovel_scriptItem { return; } -// shovel_scatter( map, x1, y1, x2, y2, items_array, {amount} ) +// shovel_scatter( map, x1, y1, x2, y2, amount, item1, {item2, item3...} ) function script shovel_scatter { .@map$=getarg(0); .@x1=getarg(1); .@y1=getarg(2); .@x2=getarg(3); .@y2=getarg(4); - .@id=getarg(5); - .@amount=getarg(6,1); + .@amount=getarg(5,1); freeloop(true); // DANGEROUS for (.@i = 0; .@i < .@amount; .@i++) - shovel_scriptItem(.@map$, rand(.@x1,.@x2), rand(.@y1,.@y2), any_of(.@id)); + shovel_scriptItem(.@map$, rand(.@x1,.@x2), rand(.@y1,.@y2), getarg(rand(getargcount()-6)+6)); freeloop(false); .@wtc = getarraysize($@WBT_Random_id); @@ -291,12 +290,43 @@ OnHour00: // As we don't prevent treasure from falling on collision, it is pretty high. // If two treasures fall on same place, the previous treasure will be deleted. // Theoretical chance of uncovering a treasure on an attempt is 0.12% to 0.70% - shovel_scatter("007-1", 20, 20, 180, 180, .@Treasure, rand(30,180)); - shovel_scatter("011-1", 20, 20, 180, 180, .@Treasure, rand(30,180)); - shovel_scatter("015-1", 20, 20, 180, 180, .@Treasure, rand(30,180)); + shovel_scatter("007-1", 20, 20, 180, 180, rand(30,180), + Bread,Candy,BugLeg,Cheese,Acorn, + ScorpionStinger,CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, + Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, + Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, + BoneArrow,SacredBullet); + shovel_scatter("011-1", 20, 20, 180, 180, rand(30,180), + Bread,Candy,BugLeg,Cheese,Acorn, + ScorpionStinger,CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, + Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, + Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, + BoneArrow,SacredBullet); + shovel_scatter("015-1", 20, 20, 180, 180, rand(30,180), + Bread,Candy,BugLeg,Cheese,Acorn, + ScorpionStinger,CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, + Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, + Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, + BoneArrow,SacredBullet); // Extra burried treasure (25~65 over 3600 tiles: aprox. 0.70% to 1.80%) - shovel_scatter("018-1", 20, 20, 80, 80, .@Treasure, rand(25,65)); + shovel_scatter("018-1", 20, 20, 80, 80, rand(25,65), + Bread,Candy,BugLeg,Cheese,Acorn, + ScorpionStinger,CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, + Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, + Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, + BoneArrow,SacredBullet); + + // Aeros can't be forgotten + shovel_scatter("001-1", 171, 20, 340, 160, rand(80,180), + CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, + Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, + Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst); + shovel_scatter("001-1", 20, 20, 140, 140, rand(80,180), + CoinBag,RustyKnife,TreasureKey,CasinoCoins,SulfurPowder, + Coal,IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, + Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst); + end; } |