summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/guilds/exchange.txt34
-rw-r--r--npc/items/arcmage.txt2
2 files changed, 33 insertions, 3 deletions
diff --git a/npc/guilds/exchange.txt b/npc/guilds/exchange.txt
index 1d2fe9b17..bdd04a719 100644
--- a/npc/guilds/exchange.txt
+++ b/npc/guilds/exchange.txt
@@ -56,11 +56,27 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
.@bluecost=200; .@blueId=GEX_blueMAX;
}
+ // Calculate arcmage boxset cost
+ if (!(GUILDSHOP & GEX_arcmage1)) {
+ .@arcmagecost=30; .@arcmageId=GEX_arcmage1;
+ } else if (!(GUILDSHOP & GEX_arcmage2)) {
+ .@arcmagecost=60; .@arcmageId=GEX_arcmage2;
+ } else if (!(GUILDSHOP & GEX_arcmage3)) {
+ .@arcmagecost=90; .@arcmageId=GEX_arcmage3;
+ } else if (!(GUILDSHOP & GEX_arcmage4)) {
+ .@arcmagecost=120; .@arcmageId=GEX_arcmage4;
+ } else if (!(GUILDSHOP & GEX_arcmage5)) {
+ .@arcmagecost=150; .@arcmageId=GEX_arcmage5;
+ } else {
+ .@arcmagecost=150; .@arcmageId=GEX_arcmageMAX;
+ }
+
menuint
l("Close"), 0,
rif(.@fruitcost, .@fruitcost+l(" Coins - Mysterious Fruit")), .@fruitId,
- rif(.@merccost, .@merccost+l(" Coins - Mercenary Boxset ++")), .@mercId,
- rif(.@bluecost, .@bluecost+l(" Coins - Ancient Blueprint")), .@blueId;
+ rif(.@merccost, .@merccost+l(" Coins - Mercenary Boxset")), .@mercId,
+ rif(.@bluecost, .@bluecost+l(" Coins - Ancient Blueprint")), .@blueId,
+ rif(.@arcmagecost, .@arcmagecost+l(" Coins - Arcmage Boxset")), .@arcmageId;
mes "";
switch (@menuret) {
@@ -101,6 +117,20 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
if (countitem(GuildCoin) < .@bluecost)
close;
delitem GuildCoin, .@bluecost;
+ getitem ArcmageBoxset, 1;
+ if (@menuret > 0)
+ GUILDSHOP=GUILDSHOP|@menuret;
+ break;
+
+ case GEX_arcmage1:
+ case GEX_arcmage2:
+ case GEX_arcmage3:
+ case GEX_arcmage4:
+ case GEX_arcmage5:
+ case GEX_arcmageMAX:
+ if (countitem(GuildCoin) < .@arcmagecost)
+ close;
+ delitem GuildCoin, .@arcmagecost;
getitem AncientBlueprint, 1;
if (@menuret > 0)
GUILDSHOP=GUILDSHOP|@menuret;
diff --git a/npc/items/arcmage.txt b/npc/items/arcmage.txt
index 15ab88ccb..486db2661 100644
--- a/npc/items/arcmage.txt
+++ b/npc/items/arcmage.txt
@@ -19,7 +19,7 @@ function script MakeRandomArcmageCard {
// 5% chances of a rare card
// Actually only 1/3 of this rate is effective
// Therefore real chances are of about 1.67%
- if (.@r < 500) {
+ if (.@r < 500+JobLevel) {
array_push(.@arcmagecards, SpeedCard);
array_push(.@arcmagecards, ReflectCard);
array_push(.@arcmagecards, PowerCard);