From 671e287f13844499f1adf912c253618b5033c017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Wed, 3 Mar 2021 02:22:17 -0500
Subject: [PATCH] Fix drop dialog and players online list
---
xtrn/lord2/lord2.js | 13 ++++++-------
xtrn/lord2/map.dat | Bin 4110909 -> 4110909 bytes
xtrn/lord2/world.dat | Bin 6231 -> 6231 bytes
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/xtrn/lord2/lord2.js b/xtrn/lord2/lord2.js
index 259db83545..f999a02cb2 100644
--- a/xtrn/lord2/lord2.js
+++ b/xtrn/lord2/lord2.js
@@ -1497,7 +1497,7 @@ rescan:
else
pl = pfile.get(i);
mp = load_map(pl.lastmap);
- lw(' `2'+space_pad(pl.name, 29)+'`%'+space_pad(pl.p[8].toString(), 14)+'`0'+mp.name);
+ lln(' `2'+space_pad(pl.name, 29)+'`%'+space_pad(pl.p[8].toString(), 14)+'`0'+mp.name);
}
});
},
@@ -2321,15 +2321,15 @@ newpage:
cur = choice.cur;
switch(choice.ch) {
case 'D':
- draw_box(12, items[inv[cur] - 1].name, ['','`$Drop how many? ','']);
- dk.console.gotoxy(38, 14);
+ i = draw_box(12, items[inv[cur] - 1].name, ['','`$Drop how many? ','']);
+ dk.console.gotoxy(i.x + 18, i.y + 2);
// TODO: This isn't exactly right... cursor is in wrong position, and selected colour is used.
ch = dk.console.getstr({edit:player.i[inv[cur] - 1].toString(), integer:true, input_box:true, attr:new Attribute(47), len:11});
lw('`r1`0');
ch = parseInt(ch, 10);
if (!isNaN(ch) && ch <= player.i[inv[cur] - 1]) {
+ dk.console.gotoxy(i.x + 3, i.y + 2);
if (items[inv[cur] - 1].questitem) {
- dk.console.gotoxy(21, 14);
lw('`$Naw, it might be useful later...');
}
else {
@@ -2340,11 +2340,10 @@ newpage:
if (player.armournumber === inv[cur])
player.armournumber = 0;
}
- dk.console.gotoxy(21, 14);
if (ch === 1)
- lw('`$You go ahead and throw it away.`0');
+ lw('`$You go ahead and throw it away. `0');
else
- lw('`$You drop the offending items!`0');
+ lw('`$ You drop the offending items! `0');
}
getkey();
}
diff --git a/xtrn/lord2/map.dat b/xtrn/lord2/map.dat
index ded160c29342262b96d6b6411940aebe863ac376..4b0e6cc103c9de3b1c4c40df73ebe7c5430fed0f 100644
GIT binary patch
delta 347
zcmdn{<rgCeH?%OeFtsqZu(YtYu(hzaaI|o?aJ6u^@ND7rEn#HX?pMM)U3L26<2Lo%
zQ)cllVPj<2&bg3RPK}Xa`bBB3%Iyn}^YSxJFWzWXJ6-oAFFRNzk0mn$16xsPQc_MT
z!}R?pd21oUo~#TE%r5@!3=9ll;j-xp-<Vpqv(4xI!Z`ha9yeF}{<FO8`_J;V??21m
zzW=O1`~I_n?fcIPweLSG+`j*;Nc;Y?qV4<7inZ@QE8f2UtVH|%vy$!m&q}rLKP%n7
z|Ex^={<E^}`_Ia??>{TwzW=O3`~I_v?fcIvweLTx+`j*;O8fq^s_pyFs<rPwtKPo<
ztVa9(vzqPu&uX>rKdaro|Ex~?{<FI6`_JmN??0>GzW=O2`~I_r?fcIfweLS`+`j*;
uN&Eh@rtSOBnzipgYu>*9tVR3&vzG1q&sw$bKWp8-|E$gS{bz0K-T(k@!J>`;
delta 406
zcmdn{<rgCeH?%OeFtsqZu(YtYu(hzaaI|o?aJ6u^@ND7rEn&>t?pMM)U6nV$G2D*<
z2BuGp6E51GGK+T!8)M#f&V{^kYAh-Fd8yMkZqO*(zVJ9NKO=8mehEkjqGkGoHjRSm
zx+i(rF~y5`ESVV?*osP%l5$d0r|&<>TZ>JRCo2O3vx~nw$WV}?vgr!nm|C{8&FB5X
zIQ@VgH&^@qv%Ky5&+@hJKg-{~|Exg!{<DJZ`_Brs?>{TtzW=O9`~I_{?fcJ)weLSG
z-oF2=MEm};lI{D?O11AlE8V{TtW5j<v$E~`&&sv$KP%t9|Exm${<Dhh`_C%1??0>D
zzW=OB`~I`4?fcKFweLTx-oF2=M*IG=n(h0~YPIh_tKGi;tWNv>v%2m3&+4`BKdaxq
z|Exj#{<DVd`_CG+?>}qYzW=OA`~I`0?fcJ~weLS`-oF2=Mf?7<mhJn`TD9*#Yu
Ntj+fQXKm}=003d`ur&Yx
diff --git a/xtrn/lord2/world.dat b/xtrn/lord2/world.dat
index 402e4936bbbf682c2d1d3074013e91cc9464ab81..daf044ce1332e9c16482e8b29924a37b4acac977 100644
GIT binary patch
delta 22
Zcmca^aNS_TK^{(41_<EWe2S-+8vsq-1<3#a
delta 22
Zcmca^aNS_TK^{&f1_%(|e2S-+8vsqx1<L>c
--
GitLab