summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/rewards.txt3
-rw-r--r--npc/003-1/ishi.txt2
-rw-r--r--npc/012-1/guards.txt2
-rw-r--r--npc/042-5/ctrl.txt6
-rw-r--r--npc/functions/aurora.txt10
-rw-r--r--npc/functions/daily.txt2
-rw-r--r--npc/functions/treasure.txt6
7 files changed, 16 insertions, 15 deletions
diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt
index 6a73dbe4b..33db14426 100644
--- a/npc/001-1/rewards.txt
+++ b/npc/001-1/rewards.txt
@@ -97,7 +97,7 @@ OnInit:
sellitem SacredLifePotion,60;
sellitem SacredManaPotion,60;
sellitem ElixirOfLife,32;
- sellitem Grenade,28;
+ sellitem ScrollMagnusHealA,28;
sellitem WhiskeyAle,28;
sellitem YerbaMate,22;
sellitem CelestiaTea,17;
@@ -106,6 +106,7 @@ OnInit:
sellitem DodgePotion,9;
sellitem Curshroom,6;
sellitem PetcaringGuide,5; // I needed to add this somewhere
+ sellitem ScrollSCave,3;
sellitem SmokeGrenade,3;
end;
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 36ccfc1bd..ed16ed362 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -56,7 +56,7 @@
MauveHerb,CopperOre,MaggotSlime,RawLog,ScorpionStinger,SilkCocoon,TreasureKey,
WhiteFur,EmptyBottle,RustyKnife,Coral,PiouLegs,Cheese,SnakeEgg,RoastedMaggot,BlueDye;
}
- setarray @Rares, BrimmedHat, 5, IronIngot, 10, BronzeGift, 10, SmokeGrenade, 15, Grenade, 15;
+ setarray @Rares, BrimmedHat, 5, IronIngot, 10, BronzeGift, 10, ScrollSMaggot, 15, MercBoxB, 15;
// Push blueprints based on your Job Level
array_push(@Rares, AlchemyBlueprintA);
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 0b52a3ee7..c5cc466a7 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -105,7 +105,7 @@ L_Assign:
if (@fc >= 10) {
switch (@fc) {
case 10:
- .@tea=Coffee; .@gift=BronzeGift; .@rare=Grenade;
+ .@tea=Coffee; .@gift=BronzeGift; .@rare=ScrollSTerranite;
break;
case 11:
.@tea=ChamomileTea; .@gift=SilverGift; .@rare=WhiskeyAle;
diff --git a/npc/042-5/ctrl.txt b/npc/042-5/ctrl.txt
index b0e301913..8130da76e 100644
--- a/npc/042-5/ctrl.txt
+++ b/npc/042-5/ctrl.txt
@@ -147,10 +147,10 @@ function script KamelotTreasure {
// Select treasure list
if (.@r <= 0) // 0.01% total, 0.025% each
.@loot=any(MylarinDust, SupremeGift, HousingLetterIII, TimeFlask, MercCard_EH);
- else if (.@r < 300) // 0.3% each
- .@loot=any(MagicApple, PrismGift, EquipmentBlueprintD, DarkPulsar, Halberd, AncientShield, AncientSword, Setzer, MercBoxD, Shemagh);
+ else if (.@r < 330) // 0.3% each
+ .@loot=any(MagicApple, PrismGift, EquipmentBlueprintD, DarkPulsar, Halberd, AncientShield, AncientSword, Setzer, MercBoxD, ScrollMagnusHealC, Shemagh);
else
- .@loot=any(SacredImmortalityPotion, DivineApple, ArcmageBoxset, GoldenApple, MercBoxA, MercBoxB, MercBoxC, MoveSpeedPotion, AtroposMixture, EverburnPowder, IridiumOre, PlatinumOre, YerbaMate, SmokeGrenade, SnakeEgg, LachesisBrew, BoneAmmoBox, GoldPieces, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, EquipmentBlueprintC, AlchemyBlueprintC, AlchemyBlueprintD, AncientBlueprint, JasmineTea, MoubooSteak, ClothoLiquor, Coal, RedPlushWine, HastePotion, CoinBag, StrengthPotion, Pearl, BronzeGift, IronOre, CopperOre, BlueDye, EquipmentBlueprintB, AlchemyBlueprintB, AlchemyBlueprintC, OolongTea, Croconut, CelestiaTea, MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, WoodenLog, LeatherPatch, DwarvenSake, EquipmentBlueprintA, EquipmentBlueprintB, AlchemyBlueprintA, SpearmintTea, TreasureMap, FatesPotion, CrazyRum, LightGreenDiamond, EarthPowder, WoodenLog, MysteriousBottle, FluoPowder, ChamomileTea); // > 70 options (~1% each)
+ .@loot=any(SacredImmortalityPotion, DivineApple, ArcmageBoxset, GoldenApple, MercBoxA, MercBoxB, MercBoxC, MoveSpeedPotion, AtroposMixture, EverburnPowder, IridiumOre, PlatinumOre, YerbaMate, SmokeGrenade, SnakeEgg, LachesisBrew, BoneAmmoBox, GoldPieces, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, EquipmentBlueprintC, AlchemyBlueprintC, AlchemyBlueprintD, AncientBlueprint, JasmineTea, MoubooSteak, ClothoLiquor, Coal, RedPlushWine, HastePotion, CoinBag, StrengthPotion, Pearl, BronzeGift, IronOre, CopperOre, BlueDye, EquipmentBlueprintB, AlchemyBlueprintB, AlchemyBlueprintC, OolongTea, Croconut, CelestiaTea, MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, WoodenLog, LeatherPatch, DwarvenSake, EquipmentBlueprintA, EquipmentBlueprintB, AlchemyBlueprintA, SpearmintTea, TreasureMap, FatesPotion, CrazyRum, LightGreenDiamond, EarthPowder, WoodenLog, MysteriousBottle, FluoPowder, ChamomileTea, ScrollSCave); // > 70 options (~1% each)
mesc l("You find @@ inside!", getitemlink(.@loot));
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 3cf52ee1b..dc3f8d987 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -161,11 +161,11 @@ function script FYT {
case FY_MISC:
switch (.@l) {
case 1:
- return any(SmokeGrenade, ScentGrenade, Grenade, Lockpicks);
+ return any(SmokeGrenade, ScentGrenade, Grenade, DeathPotion, Lockpicks);
case 2:
return any(MysteriousBottle, TreasureMap);
case 3:
- return any(ArcmageBoxset, MercBoxA);
+ return any(ArcmageBoxset, MercBoxA, ScrollSMaggot);
}
break;
case FY_BP:
@@ -179,7 +179,7 @@ function script FYT {
case 4:
return any(EquipmentBlueprintD, AlchemyBlueprintD);
case 5:
- return any(EquipmentBlueprintE, AlchemyBlueprintE);
+ return any(EquipmentBlueprintE, AlchemyBlueprintE, AncientBlueprint);
}
break;
case FY_WARP:
@@ -232,9 +232,9 @@ function script FYT {
break;
// Single cases doesn't needs break
case FY_HEAL:
- return any(SpearmintTea, Coffee, ClothoLiquor);
+ return any(SpearmintTea, Coffee, ClothoLiquor, BottleOfDivineWater);
case FY_MAGIC:
- return any(FluoPowder, Quill, ScholarshipBadge);;
+ return any(FluoPowder, Quill, ScholarshipBadge, ScrollSWolvern);
}
return Exception("Invalid cast to FYEIT: "+.@t+" (Lv "+.@l+")", RB_IRCBROADCAST|RB_DEBUGMES|RB_GLOBALANNOUNCE, Bread);
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index 522d14a07..3d2dc906a 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -174,7 +174,7 @@ function script daily_login_bonus_handler {
if (gettime(6) == SEPTEMBER) {
if (#TMW2_LOGINBONUS != gettime(GETTIME_YEAR) && gettime(5) == 9) {
#TMW2_LOGINBONUS=gettime(GETTIME_YEAR);
- getitem any(ScentGrenade, Grenade, SmokeGrenade), 1;
+ getitem any(ScentGrenade, Grenade, SmokeGrenade), 2;
dispbottom "##B##2"+l("It's the Free Software Day!")+" "+l("Licensing was one of the worst hassle we had, but just today, all mobs may drop Ancient Blueprints. Enjoy!")+"##b##0";
}
}
diff --git a/npc/functions/treasure.txt b/npc/functions/treasure.txt
index fe3017b52..f8eab3175 100644
--- a/npc/functions/treasure.txt
+++ b/npc/functions/treasure.txt
@@ -35,11 +35,11 @@ function script TreasureBox {
// There's also rares (14%), uncommons (35%) and commons (50%)
.@ur_rate=min(10, (TREASURE_OPEN/10));
if (.@t % 149 == 0 || .@r < .@ur_rate)
- .@loot=any(AtroposMixture, GoldenApple, DivineApple, MercBoxC, MoveSpeedPotion, Shemagh, EverburnPowder, IridiumOre, PlatinumOre, YerbaMate);
+ .@loot=any(ScrollMagnusHealC, GoldenApple, DivineApple, MercBoxC, ScrollSDragon, Shemagh, EverburnPowder, IridiumOre, PlatinumOre, YerbaMate);
else if (.@t % 50 == 0 || .@r < 100)
- .@loot=any(MercBoxB, SmokeGrenade, SnakeEgg, LachesisBrew, ArrowAmmoBox, GoldPieces, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, EquipmentBlueprintC, AlchemyBlueprintC, AlchemyBlueprintD, AncientBlueprint, JasmineTea);
+ .@loot=any(MercBoxB, ScrollMagnusHealB, SnakeEgg, LachesisBrew, ArrowAmmoBox, GoldPieces, SilverGift, MoveSpeedPotion, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, EquipmentBlueprintC, AlchemyBlueprintC, AlchemyBlueprintD, AncientBlueprint, JasmineTea);
else if (.@r < 1500 || .@t == 0)
- .@loot=any(MercBoxA, MoubooSteak, ClothoLiquor, Coal, RedPlushWine, HastePotion, CoinBag, StrengthPotion, Dagger, BronzeGift, IronOre, CopperOre, BlueDye, EquipmentBlueprintB, AlchemyBlueprintB, AlchemyBlueprintC, OolongTea);
+ .@loot=any(MercBoxA, MoubooSteak, SmokeGrenade, ClothoLiquor, Coal, RedPlushWine, HastePotion, CoinBag, StrengthPotion, Dagger, BronzeGift, IronOre, CopperOre, BlueDye, EquipmentBlueprintB, AlchemyBlueprintB, AlchemyBlueprintC, OolongTea);
else if (.@r < 5000)
.@loot=any(Croconut, Potatoz, MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, WoodenLog, LeatherPatch, Beer, EquipmentBlueprintA, EquipmentBlueprintB, AlchemyBlueprintA, SpearmintTea, TreasureMap);
else
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-04 04:53:53 +0000