diff --git a/optional/handlers/house/house.simba b/optional/handlers/house/house.simba index 4540cac0..c49a94e9 100644 --- a/optional/handlers/house/house.simba +++ b/optional/handlers/house/house.simba @@ -646,7 +646,7 @@ Global variable to use the {ref}`THouseHandler`. *) House: THouseHandler; -{%codetools on} +{%codetools off} procedure TMufasaBitmap._DrawPOHGrid(); var b: TBox; @@ -1275,7 +1275,6 @@ end; procedure TScriptForm.POHBuilderLeftOnShow(sender: TObject); var combobox: TComboBox; - imgbox: TSimbaImageBox; begin if Login.PlayerIndex <> House.Loader.LayoutIndex then begin diff --git a/optional/handlers/house/houseutils.simba b/optional/handlers/house/houseutils.simba index df96221e..fcc0de52 100644 --- a/optional/handlers/house/houseutils.simba +++ b/optional/handlers/house/houseutils.simba @@ -161,19 +161,19 @@ end; function EHouseObject.GetSize(): Vector3; begin case Self of - EHouseObject.EXIT: Result := [3,1,8]; + EHouseObject.EXIT: Result := [2,2,8]; EHouseObject.PRAYER_ALTAR: Result := [2,1,4]; EHouseObject.LEFT_PORTAL, EHouseObject.RIGHT_PORTAL: Result := [0.6,1.7,7]; EHouseObject.MIDDLE_PORTAL: Result := [1.7,0.6,7]; EHouseObject.FAIRY_RING: Result := [2,2,1]; - EHouseObject.OBELISK: Result := [1,1,6]; + EHouseObject.OBELISK: Result := [1.3,1.3,6]; EHouseObject.SPIRIT_TREE, EHouseObject.SPIRITUAL_FAIRY_TREE: Result := [1.7,1.7,6]; - EHouseObject.ANCIENT_ALTAR..EHouseObject.OCCULT_ALTAR: Result := [2,3,5]; + EHouseObject.ANCIENT_ALTAR..EHouseObject.OCCULT_ALTAR: Result := [2,2,4]; - EHouseObject.REPAIR_STAND: Result := [2,2,6]; + EHouseObject.REPAIR_STAND: Result := [1,1,4]; EHouseObject.SERVANT_BAG: Result := [1,1,4]; EHouseObject.GLORY, EHouseObject.MYTH_CAPE: Result := [1,1,6]; EHouseObject.OAK_LECTERN..EHouseObject.MARBLE_LECTERN: Result := [0.7,0.7,4.5]; @@ -185,7 +185,7 @@ begin EHouseObject.BASIC_JEWELLERY_BOX, EHouseObject.FANCY_JEWELLERY_BOX, EHouseObject.ORNATE_JEWELLERY_BOX: Result := [0.7,0.7,5]; - EHouseObject.CAPE_HANGER: Result := [2,2,5]; + EHouseObject.CAPE_HANGER: Result := [0.5, 0.5 ,5]; end; end; @@ -198,9 +198,10 @@ begin //Feel free to contribute coordinates. //Also these are quite deorganized atm. Sorry. case Self of - EHouseObject.EXIT, EHouseObject.PRAYER_ALTAR: Result := Point(16,16); //todo: aprox placeholder... + EHouseObject.EXIT: Result := Point(14,16); //by taze + EHouseObject.PRAYER_ALTAR: Result := Point(16,16); //todo: aprox placeholder... - EHouseObject.SPIRIT_TREE..EHouseObject.SPIRITUAL_FAIRY_TREE: Result := Point(16, 14); + EHouseObject.SPIRIT_TREE..EHouseObject.SPIRITUAL_FAIRY_TREE: Result := Point(14, 17); EHouseObject.NEXUS: Result := Point(14,16); @@ -222,7 +223,7 @@ begin EHouseObject.BASIC_JEWELLERY_BOX..EHouseObject.ORNATE_JEWELLERY_BOX: Result := Point(24,24); - EHouseObject.CAPE_HANGER: Result := Point(24, 6); //todo: aprox placeholder... + EHouseObject.CAPE_HANGER: Result := Point(26, 4); //by taze end; end; @@ -295,7 +296,8 @@ begin case Self of EHouseObject.EXIT: begin - //TODO + Result.Colors += CTS2(8794487, 19, 0.14, 1.33); + Result.Colors += CTS2(3556172, 7, 0.10, 0.27); end; EHouseObject.PRAYER_ALTAR: begin @@ -315,7 +317,8 @@ begin EHouseObject.OBELISK: begin - //TODO + Result.Colors += CTS2(7961218, 10, 0.26, 0.13); + Result.Colors += CTS2(5000273, 10, 0.25, 0.16); end; EHouseObject.SPIRITUAL_FAIRY_TREE: begin @@ -338,12 +341,15 @@ begin end; EHouseObject.OCCULT_ALTAR: begin - //TODO + Result.Colors += CTS2(9928560, 21, 0.48, 0.35); + Result.Colors += CTS2(8489868, 12, 0.14, 0.15); + Result.Colors += CTS2(6958943, 18, 0.22, 1.35); end; EHouseObject.REPAIR_STAND: begin - //TODO + Result.Colors += CTS2(7107958, 24, 0.08, 0.12); + Result.Colors += CTS2(3561321, 8, 0.11, 0.18); end; EHouseObject.SERVANT_BAG: begin @@ -411,7 +417,7 @@ begin EHouseObject.CAPE_HANGER: begin - //TODO + Result.Colors += CTS2(12435141, 22, 0.10, 0.13); end; EHouseObject.NEXUS: