Skip to content

Add Fancy Range to POH utils #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Garrett3Nelson merged 2 commits into from
Apr 10, 2026
Merged

Add Fancy Range to POH utils #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b5789
Update houseutils.simba with fancy range
r0ot Mar 14, 2026
bd0769f
Update house.simba with fancy range
r0ot Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion optional/handlers/house/house.simba
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,13 @@ begin
room.Objects += EHouseObject.LARDER + index-1;
end;

'range_combobox':
begin
room.Objects -= KITCHEN_RANGES;
if index <> 0 then
room.Objects += EHouseObject.FANCY_RANGE + index-1;
end;

'repair_stand_combobox':
begin
case index of
Expand Down Expand Up @@ -1017,7 +1024,24 @@ begin
combobox.Create(panel, 'Larder:', 'Does this room have a larder?', [0,0],[166,50], True);
combobox.AddItemArray(['None', 'Normal', 'Oak', 'Teak']);
combobox.SetName('larder');
combobox.SetItemIndex(SetCount(room.Objects));

tmp := room.Objects - KITCHEN_RANGES;
if SetCount(tmp) <> 1 then
combobox.SetItemIndex(0)
else
combobox.SetItemIndex(SetFirst(tmp) - Ord(EHouseObject.LARDER) + 1);

combobox.ComboBox.setOnChange(@Self.POHObjectUpdate);

combobox.Create(panel, 'Range:', 'Does this room have a range?', [0,50],[166,50], True);
combobox.AddItemArray(['None', 'Fancy']);
combobox.SetName('range');

tmp := room.Objects - KITCHEN_LARDERS;
if SetCount(tmp) <> 1 then
combobox.SetItemIndex(0)
else
combobox.SetItemIndex(SetFirst(tmp) - Ord(EHouseObject.FANCY_RANGE) + 1);
combobox.ComboBox.setOnChange(@Self.POHObjectUpdate);
end;

Expand Down
13 changes: 13 additions & 0 deletions optional/handlers/house/houseutils.simba
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ EHouseObject = (
EHouseObject = (
EXIT, LARDER, OAK_LARDER, TEAK_LARDER, REPAIR_STAND, SERVANT_BAG,

FANCY_RANGE,

GLORY, MYTH_CAPE,

OAK_LECTERN, EAGLE_LECTERN, DEMON_LECTERN, TEAK_EAGLE_LECTERN,
Expand Down Expand Up @@ -197,6 +199,8 @@ begin
EHouseObject.OAK_ALTAR..EHouseObject.GILDED_ALTAR: Result := [2,1,4];
EHouseObject.LARDER..EHouseObject.TEAK_LARDER: Result := [1.7,1.7,7];

EHouseObject.FANCY_RANGE: Result := [2,1,3]; //might not be perfect

EHouseObject.LEFT_PORTAL, EHouseObject.RIGHT_PORTAL: Result := [0.6,1.7,7];
EHouseObject.MIDDLE_PORTAL: Result := [1.7,0.6,7];

Expand Down Expand Up @@ -239,6 +243,8 @@ begin
EHouseObject.LARDER..EHouseObject.TEAK_LARDER: Result := Point(26,28);
EHouseObject.OAK_ALTAR..EHouseObject.GILDED_ALTAR: Result := Point(16,16); //todo: aprox placeholder...

EHouseObject.FANCY_RANGE: Result := Point(12,0); //by ian

EHouseObject.LEFT_PORTAL: Result := Point(0,16);
EHouseObject.MIDDLE_PORTAL: Result := Point(15,1);
EHouseObject.RIGHT_PORTAL: Result := Point(28,16);
Expand Down Expand Up @@ -299,6 +305,7 @@ begin
EHouseObject.LARDER..EHouseObject.TEAK_LARDER: Result := ['Larder'];
EHouseObject.REPAIR_STAND: Result := ['Repair', 'stand'];
EHouseObject.SERVANT_BAG: Result := ['Money', 'bag'];
EHouseObject.FANCY_RANGE: Result := ['Fancy', 'range'];
EHouseObject.GLORY: Result := ['Amulet', 'Glory'];
EHouseObject.MYTH_CAPE: Result := ['Mythical', 'cape'];
EHouseObject.OAK_LECTERN..EHouseObject.MARBLE_LECTERN: Result := ['Lectern'];
Expand Down Expand Up @@ -350,6 +357,11 @@ begin
Result.Colors += CTS2(4484738, 3, 0.11, 0.23);
end;

EHouseObject.FANCY_RANGE:
begin
Result.Colors += CTS2(1913523, 3, 0.06, 0.28); //just a few red colors
end;

EHouseObject.OAK_ALTAR..EHouseObject.GILDED_ALTAR:
begin
//TODO
Expand Down Expand Up @@ -572,6 +584,7 @@ end;

const
KITCHEN_LARDERS: set of EHouseObject = [EHouseObject.LARDER..EHouseObject.TEAK_LARDER];
KITCHEN_RANGES: set of EHouseObject = [EHouseObject.FANCY_RANGE];
STUDY_LECTERNS: set of EHouseObject = [EHouseObject.OAK_LECTERN..EHouseObject.MARBLE_LECTERN];
CHAPEL_BURNERS: set of EHouseObject = [EHouseObject.LEFT_BURNER, EHouseObject.RIGHT_BURNER];
CHAPEL_ALTARS: set of EHouseObject = [EHouseObject.OAK_ALTAR..EHouseObject.GILDED_ALTAR];
Expand Down