Merge branch 'main' into Content-Patch-1

This commit is contained in:
Kaan Soral
2025-03-23 10:56:27 +03:00
committed by GitHub
12 changed files with 204 additions and 87 deletions
+49 -4
View File
@@ -171,8 +171,8 @@ var events = {
// SEASONS
holidayseason: false,
lunarnewyear: false,
valentines: false,
pinkgoo: 0, // every N minutes - 60
valentines: true,
pinkgoo: 60, // every N minutes - 60
snowman: 20 * 60, // 1200 normally - 60 - at sprocess_game_data
egghunt: 0, // every N minutes - 60
halloween: false,
@@ -5604,6 +5604,48 @@ function init_io() {
resend(player, "reopen+nc+inv");
success_response({ num: num, cevent: true });
});
socket.on("destat", function (data) {
var player = players[socket.id];
if (!player || player.user) {
return fail_response("cant_in_bank");
}
if (!player.computer && simple_distance(G.maps.desertland.ref.scrollsmith, player) > B.sell_dist) {
return fail_response("distance");
}
var item = player.items[data.num];
if (!item) {
return fail_response("no_item");
}
var def = G.items[item.name];
if (item.stat_type == null) {
return fail_response("scrollsmith_cant");
}
var scrolltype = item.stat_type + "scroll";
if (scrolltype == "mp_costscroll") {
scrolltype = "mpcostscroll";
}
var scrolldef = G.items[scrolltype];
if (!scrolldef) {
return fail_response("scrollsmith_cant"); // Just in case there isn't actually an item associated with the scroll... should never happen, though.
}
var needed = [1, 10, 100, 1000, 9999, 9999, 9999];
var ograde = calculate_item_grade(def, { name: item.name, level: 0 });
var cost = needed[ograde] * scrolldef.g * 10;
if (player.gold < cost) {
return fail_response("gold_not_enough");
}
if (!can_add_items(player, list_to_pseudo_items([[needed[ograde], scrolltype]]))) {
return fail_response("inv_size");
}
player.gold -= cost;
add_item(player, scrolltype, { q: needed[ograde] });
delete item.stat_type;
socket.emit("game_response", { response: "scrollsmith_success", gold: cost });
player.citems[data.num] = cache_item(player.items[data.num]);
resend(player, "reopen+nc");
success_response();
});
socket.on("locksmith", function (data) {
var player = players[socket.id];
var item = player.items[data.item_num];
@@ -6594,8 +6636,11 @@ function init_io() {
new_monster(player.in, { type: def.spawn, stype: "trap", x: player.x, y: player.y, owner: player.name });
consume_one(player, data.num);
} else if (def.gives) {
if (player.last.potion && mssince(player.last.potion) < 0) {
return fail_response("not_ready");
if (player.last.potion) {
const ms = -mssince(player.last.potion);
if (ms > 0) {
return fail_response("not_ready", { ms: ms });
}
}
if (item.l) {
return fail_response("item_locked");