Merge pull request 'Push updates to master' (#4) from dev into master

Reviewed-on: #4
This commit is contained in:
randy 2024-11-21 06:43:18 -07:00
commit 456925264b
3 changed files with 9 additions and 3 deletions

View file

@ -223,12 +223,16 @@ public final class StrongHoldSecurityPlugin extends MapZone implements Plugin<Ob
* @param object the object.
*/
private static void handleDoor(final Player player, final Scenery object) {
openDoor(player, object);
return;
/* Snowscape custom: no dialogue in the stronghold
final boolean force = isForced(player, object);
if (force || RandomFunction.random(40) < 2) {
openDoor(player, object);
return;
}
player.getDialogueInterpreter().open("strong-hold", object);
*/
}
/**

View file

@ -49,8 +49,9 @@ public final class TradeContainer extends Container {
return;
}
if (!tradeable(item) && !GameWorld.getSettings().isDevMode()) {
player.getPacketDispatch().sendMessage("You can't trade this item.");
return;
player.getPacketDispatch().sendMessage("<col=ff4500>This item is not normally tradeable. Be careful not to break any quests!</col>");
//player.getPacketDispatch().sendMessage("You can't trade this item.");
//return;
}
Item remove = new Item(item.getId(), amount);
remove.setAmount(stabalizeAmount(remove, amount, player.getInventory()));

View file

@ -58,7 +58,8 @@ members = true
#activity as displayed on the world list
activity = "SnowScape"
pvp = false
default_xp_rate = 1.0
#any default_xp_rate other than 5.0 will override player selection
default_xp_rate = 5.0
allow_slayer_reroll = false
#enables a default clan for players to join automatically. Should be an account with the same name as @name, with a clan set up already.
enable_default_clan = true