summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/clientversion.txt7
-rw-r--r--npc/guilds/exchange.txt52
2 files changed, 33 insertions, 26 deletions
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index c36a12f3a..78fd2c4eb 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -1075,6 +1075,13 @@ function script clientupdater {
bitmask_count(.@q));
}
}
+ // Change variable scope
+ // sáb jan 16 19:21:15 BRT 2021
+ if (UPDATE < 1610835675) {
+ UPDATE=1610835675;
+ #GUILDSHOP=GUILDSHOP;
+ GUILDSHOP=0;
+ }
// :// End of Regular Update System
////////////////////////////////////
diff --git a/npc/guilds/exchange.txt b/npc/guilds/exchange.txt
index 1813fa693..168dc93bc 100644
--- a/npc/guilds/exchange.txt
+++ b/npc/guilds/exchange.txt
@@ -4,7 +4,7 @@
// Description:
// Trades Guild Coins for useful items
// Variable:
-// GUILDSHOP (bitmask)
+// #GUILDSHOP (bitmask)
guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
do
@@ -12,60 +12,60 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
mes l("You have %d %s", countitem(GuildCoin), getitemlink(GuildCoin));
next;
// Calculate fruit cost
- if (!(GUILDSHOP & GEX_fruit1)) {
+ if (!(#GUILDSHOP & GEX_fruit1)) {
.@fruitcost=200; .@fruitId=GEX_fruit1;
- } else if (!(GUILDSHOP & GEX_fruit2)) {
+ } else if (!(#GUILDSHOP & GEX_fruit2)) {
.@fruitcost=350; .@fruitId=GEX_fruit2;
- } else if (!(GUILDSHOP & GEX_fruit3)) {
+ } else if (!(#GUILDSHOP & GEX_fruit3)) {
.@fruitcost=500; .@fruitId=GEX_fruit3;
- } else if (!(GUILDSHOP & GEX_fruit4)) {
+ } else if (!(#GUILDSHOP & GEX_fruit4)) {
.@fruitcost=750; .@fruitId=GEX_fruit4;
- } else if (!(GUILDSHOP & GEX_fruit5)) {
+ } else if (!(#GUILDSHOP & GEX_fruit5)) {
.@fruitcost=1000; .@fruitId=GEX_fruit5;
} else {
.@fruitcost=false; .@fruitId=GEX_fruitMAX;
}
// Calculate mercbox cost
- if (!(GUILDSHOP & GEX_merc1)) {
+ if (!(#GUILDSHOP & GEX_merc1)) {
.@merccost=50; .@mercId=GEX_merc1;
- } else if (!(GUILDSHOP & GEX_merc2)) {
+ } else if (!(#GUILDSHOP & GEX_merc2)) {
.@merccost=100; .@mercId=GEX_merc2;
- } else if (!(GUILDSHOP & GEX_merc3)) {
+ } else if (!(#GUILDSHOP & GEX_merc3)) {
.@merccost=175; .@mercId=GEX_merc3;
- } else if (!(GUILDSHOP & GEX_merc4)) {
+ } else if (!(#GUILDSHOP & GEX_merc4)) {
.@merccost=250; .@mercId=GEX_merc4;
- } else if (!(GUILDSHOP & GEX_merc5)) {
+ } else if (!(#GUILDSHOP & GEX_merc5)) {
.@merccost=350; .@mercId=GEX_merc5;
} else {
.@merccost=false; .@mercId=GEX_mercMAX;
}
// Calculate blueprint cost
- if (!(GUILDSHOP & GEX_blue1)) {
+ if (!(#GUILDSHOP & GEX_blue1)) {
.@bluecost=75; .@blueId=GEX_blue1;
- } else if (!(GUILDSHOP & GEX_blue2)) {
+ } else if (!(#GUILDSHOP & GEX_blue2)) {
.@bluecost=100; .@blueId=GEX_blue2;
- } else if (!(GUILDSHOP & GEX_blue3)) {
+ } else if (!(#GUILDSHOP & GEX_blue3)) {
.@bluecost=150; .@blueId=GEX_blue3;
- } else if (!(GUILDSHOP & GEX_blue4)) {
+ } else if (!(#GUILDSHOP & GEX_blue4)) {
.@bluecost=200; .@blueId=GEX_blue4;
- } else if (!(GUILDSHOP & GEX_blue5)) {
+ } else if (!(#GUILDSHOP & GEX_blue5)) {
.@bluecost=250; .@blueId=GEX_blue5;
} else {
.@bluecost=300; .@blueId=GEX_blueMAX;
}
// Calculate arcmage boxset cost
- if (!(GUILDSHOP & GEX_arcmage1)) {
+ if (!(#GUILDSHOP & GEX_arcmage1)) {
.@arcmagecost=30; .@arcmageId=GEX_arcmage1;
- } else if (!(GUILDSHOP & GEX_arcmage2)) {
+ } else if (!(#GUILDSHOP & GEX_arcmage2)) {
.@arcmagecost=60; .@arcmageId=GEX_arcmage2;
- } else if (!(GUILDSHOP & GEX_arcmage3)) {
+ } else if (!(#GUILDSHOP & GEX_arcmage3)) {
.@arcmagecost=90; .@arcmageId=GEX_arcmage3;
- } else if (!(GUILDSHOP & GEX_arcmage4)) {
+ } else if (!(#GUILDSHOP & GEX_arcmage4)) {
.@arcmagecost=120; .@arcmageId=GEX_arcmage4;
- } else if (!(GUILDSHOP & GEX_arcmage5)) {
+ } else if (!(#GUILDSHOP & GEX_arcmage5)) {
.@arcmagecost=150; .@arcmageId=GEX_arcmage5;
} else {
.@arcmagecost=150; .@arcmageId=GEX_arcmageMAX;
@@ -91,7 +91,7 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
delitem GuildCoin, .@fruitcost;
getitem MysteriousFruit, 1;
if (@menuret > 0)
- GUILDSHOP=GUILDSHOP|@menuret;
+ #GUILDSHOP=#GUILDSHOP|@menuret;
break;
case GEX_merc1:
@@ -103,9 +103,9 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
if (countitem(GuildCoin) < .@merccost)
close;
delitem GuildCoin, .@merccost;
- getitem (GUILDSHOP & GEX_merc3 ? MercBoxE : MercBoxD), 1;
+ getitem (#GUILDSHOP & GEX_merc3 ? MercBoxE : MercBoxD), 1;
if (@menuret > 0)
- GUILDSHOP=GUILDSHOP|@menuret;
+ #GUILDSHOP=#GUILDSHOP|@menuret;
break;
case GEX_blue1:
@@ -119,7 +119,7 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
delitem GuildCoin, .@bluecost;
getitem AncientBlueprint, 1;
if (@menuret > 0)
- GUILDSHOP=GUILDSHOP|@menuret;
+ #GUILDSHOP=#GUILDSHOP|@menuret;
break;
case GEX_arcmage1:
@@ -133,7 +133,7 @@ guilds,29,24,0 script Guild Coin Exchange NPC_NO_SPRITE,{
delitem GuildCoin, .@arcmagecost;
getitem ArcmageBoxset, 1;
if (@menuret > 0)
- GUILDSHOP=GUILDSHOP|@menuret;
+ #GUILDSHOP=#GUILDSHOP|@menuret;
break;
}