Skip to content

Commit 0c088e9

Browse files
MeltyPlayerMeltyPlayer
committed
Filled in some more of the Facade room.
1 parent 10319d8 commit 0c088e9

File tree

1 file changed

+163
-34
lines changed

1 file changed

+163
-34
lines changed

‎FinModelUtility/Games/Facade/Facade/api/FacadeRoomModelLoader.cs‎

Lines changed: 163 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public enum FilmstripId {
4242
MARTINI_GLASS = 0x2,
4343
RED_WINE_BOTTLE = 0x3,
4444
WHITE_WINE_BOTTLE = 0x4,
45+
PLAYERS_DRINK = 0x6,
4546
PAINTING_1 = 0x10,
4647
LITTLE_PAINTING = 0x11,
4748
WEDDING_PHOTO = 0x12,
@@ -72,22 +73,24 @@ public enum FilmstripId {
7273
}
7374

7475
public enum ColorId {
76+
FRIDGE_BOTTOM = 0x10,
7577
WINDOW = 0x20,
78+
FRIDGE = 0x24,
7679
COLOR_0x2E = 0x2E,
7780
COLOR_0x2F = 0x2F,
7881
COLOR_0x30 = 0x30,
7982
COLOR_0x31 = 0x31,
8083
COLOR_0x32 = 0x32,
8184
COLOR_0x33 = 0x33,
82-
COLOR_0x34 = 0x34,
83-
COLOR_0x35 = 0x35,
85+
LIVING_ROOM_FRONT_WALL = 0x34,
86+
FOYER_WALL = 0x35,
8487
COLOR_0x36 = 0x36,
8588
COLOR_0x37 = 0x37,
86-
COLOR_0x38 = 0x38,
89+
CEILING = 0x38,
8790
COLOR_0x39 = 0x39,
8891
COLOR_0x3A = 0x3A,
8992
FLOOR = 0x3b,
90-
WALL = 0xFF,
93+
LIVING_ROOM_WALL = 0xFF,
9194
}
9295

9396
file class FacadeRoomModelBuilder {
@@ -313,10 +316,10 @@ public FacadeRoomModelBuilder(FacadeRoomModelFileBundle fileBundle) {
313316
ColorId.COLOR_0x33 => Color.FromArgb((byte) (255 * .05f),
314317
(byte) (255 * .05f),
315318
(byte) (255 * .05f)),
316-
ColorId.COLOR_0x34 => Color.FromArgb((byte) (255 * .1f),
319+
ColorId.LIVING_ROOM_FRONT_WALL => Color.FromArgb((byte) (255 * .1f),
317320
(byte) (255 * .1f),
318321
(byte) (255 * .1f)),
319-
ColorId.COLOR_0x35 => Color.FromArgb((byte) (255 * .15f),
322+
ColorId.FOYER_WALL => Color.FromArgb((byte) (255 * .15f),
320323
(byte) (255 * .15f),
321324
(byte) (255 * .15f)),
322325
ColorId.COLOR_0x36 => Color.FromArgb((byte) (255 * .2f),
@@ -325,7 +328,7 @@ public FacadeRoomModelBuilder(FacadeRoomModelFileBundle fileBundle) {
325328
ColorId.COLOR_0x37 => Color.FromArgb((byte) (255 * .25f),
326329
(byte) (255 * .25f),
327330
(byte) (255 * .25f)),
328-
ColorId.COLOR_0x38 => Color.FromArgb((byte) (255 * .3f),
331+
ColorId.CEILING => Color.FromArgb((byte) (255 * .3f),
329332
(byte) (255 * .3f),
330333
(byte) (255 * .3f)),
331334
ColorId.COLOR_0x39 => Color.FromArgb((byte) (255 * .35f),
@@ -337,7 +340,7 @@ public FacadeRoomModelBuilder(FacadeRoomModelFileBundle fileBundle) {
337340
ColorId.FLOOR => Color.FromArgb((byte) (255 * .45f),
338341
(byte) (255 * .45f),
339342
(byte) (255 * .45f)),
340-
ColorId.WALL => Color.Black,
343+
ColorId.LIVING_ROOM_WALL => Color.Black,
341344
_ => null,
342345
};
343346

@@ -569,128 +572,128 @@ private void AddRoom_() {
569572
this.AddPlane_(
570573
"LR_backwall1",
571574
null,
572-
ColorId.WALL,
575+
ColorId.LIVING_ROOM_WALL,
573576
new Vector2(70, 160),
574577
new Vector3(-165, 80, -500),
575578
0);
576579
this.AddPlane_(
577580
"LR_backwallsliver1",
578581
null,
579-
ColorId.WALL,
582+
ColorId.LIVING_ROOM_WALL,
580583
new Vector2(6.5f, 160),
581584
new Vector3(-66, 80, -500),
582585
0);
583586
this.AddPlane_(
584587
"LR_backwallsliver2",
585588
null,
586-
ColorId.WALL,
589+
ColorId.LIVING_ROOM_WALL,
587590
new Vector2(6.5f, 160),
588591
new Vector3(6, 80, -500),
589592
0);
590593
this.AddPlane_(
591594
"LR_backwall3",
592595
null,
593-
ColorId.WALL,
596+
ColorId.LIVING_ROOM_WALL,
594597
new Vector2(30, 160),
595598
new Vector3(85, 80, -500),
596599
0);
597600
this.AddPlane_(
598601
"LR_backwall4",
599602
null,
600-
ColorId.WALL,
603+
ColorId.LIVING_ROOM_WALL,
601604
new Vector2(100, 160),
602605
new Vector3(150, 80, -500),
603606
0);
604607
this.AddPlane_(
605608
"LR_backwalltoppanel",
606609
null,
607-
ColorId.WALL,
610+
ColorId.LIVING_ROOM_WALL,
608611
new Vector2(200, 10),
609612
new Vector3(-30, 155, -500),
610613
0);
611614

612615
this.AddPlane_(
613616
"LR_leftwall0",
614617
null,
615-
ColorId.WALL,
618+
ColorId.LIVING_ROOM_WALL,
616619
new Vector2(70, 160),
617620
new Vector3(-200, 80, -5),
618621
90);
619622
this.AddPlane_(
620623
"LR_leftwall1",
621624
null,
622-
ColorId.WALL,
625+
ColorId.LIVING_ROOM_WALL,
623626
new Vector2(100, 160),
624627
new Vector3(-200, 80, -90),
625628
90);
626629
this.AddPlane_(
627630
"LR_leftwall2",
628631
null,
629-
ColorId.WALL,
632+
ColorId.LIVING_ROOM_WALL,
630633
new Vector2(100, 160),
631634
new Vector3(-200, 80, -190),
632635
90);
633636
this.AddPlane_(
634637
"LR_leftwall3",
635638
null,
636-
ColorId.WALL,
639+
ColorId.LIVING_ROOM_WALL,
637640
new Vector2(100, 160),
638641
new Vector3(-200, 80, -290),
639642
90);
640643
this.AddPlane_(
641644
"LR_leftwall4",
642645
null,
643-
ColorId.WALL,
646+
ColorId.LIVING_ROOM_WALL,
644647
new Vector2(60, 160),
645648
new Vector3(-200, 80, -370),
646649
90);
647650
this.AddPlane_(
648651
"LR_leftwall5",
649652
null,
650-
ColorId.WALL,
653+
ColorId.LIVING_ROOM_WALL,
651654
new Vector2(100, 160),
652655
new Vector3(-200, 80, -450),
653656
90);
654657

655658
this.AddPlane_(
656659
"LR_rightwall0",
657660
null,
658-
ColorId.WALL,
661+
ColorId.LIVING_ROOM_WALL,
659662
new Vector2(100, 160),
660663
new Vector3(200, 80, 50),
661664
90);
662665
this.AddPlane_(
663666
"LR_rightwall1",
664667
null,
665-
ColorId.WALL,
668+
ColorId.LIVING_ROOM_WALL,
666669
new Vector2(100, 160),
667670
new Vector3(200, 80, -50),
668671
90);
669672
this.AddPlane_(
670673
"LR_rightwall2",
671674
null,
672-
ColorId.WALL,
675+
ColorId.LIVING_ROOM_WALL,
673676
new Vector2(100, 160),
674677
new Vector3(200, 80, -150),
675678
90);
676679
this.AddPlane_(
677680
"LR_rightwall3",
678681
null,
679-
ColorId.WALL,
682+
ColorId.LIVING_ROOM_WALL,
680683
new Vector2(100, 160),
681684
new Vector3(200, 80, -250),
682685
90);
683686
this.AddPlane_(
684687
"LR_rightwall4",
685688
null,
686-
ColorId.WALL,
689+
ColorId.LIVING_ROOM_WALL,
687690
new Vector2(100, 160),
688691
new Vector3(200, 80, -350),
689692
90);
690693
this.AddPlane_(
691694
"LR_rightwall5",
692695
null,
693-
ColorId.WALL,
696+
ColorId.LIVING_ROOM_WALL,
694697
new Vector2(100, 160),
695698
new Vector3(200, 80, -450),
696699
90);
@@ -717,6 +720,104 @@ private void AddRoom_() {
717720
new Vector3(41, 77, -498),
718721
0);
719722

723+
this.AddPlane_(
724+
"LR_frontwallL",
725+
null,
726+
ColorId.LIVING_ROOM_FRONT_WALL,
727+
new Vector2(60, 160),
728+
new Vector3(170, 80, 98),
729+
0);
730+
this.AddPlane_(
731+
"LR_frontwallR1",
732+
null,
733+
ColorId.LIVING_ROOM_FRONT_WALL,
734+
new Vector2(66, 160),
735+
new Vector3(17, 80, 98),
736+
0);
737+
this.AddPlane_(
738+
"LR_frontwallR1_real",
739+
null,
740+
ColorId.LIVING_ROOM_FRONT_WALL,
741+
new Vector2(50, 160),
742+
new Vector3(2, 80, 108),
743+
0);
744+
this.AddPlane_(
745+
"LR_frontwallR2",
746+
null,
747+
ColorId.LIVING_ROOM_FRONT_WALL,
748+
new Vector2(80, 160),
749+
new Vector3(-46, 80, 98),
750+
0);
751+
752+
this.AddPlane_(
753+
"FY_leftwall1",
754+
null,
755+
ColorId.FOYER_WALL,
756+
new Vector2(100, 160),
757+
new Vector3(-225, 80, 72),
758+
60);
759+
760+
this.AddPlane_(
761+
"KI_fridgeside1",
762+
null,
763+
ColorId.FRIDGE,
764+
new Vector2(60, 120),
765+
new Vector3(-20, 60, 430),
766+
90);
767+
this.AddPlane_(
768+
"KI_fridgeside2",
769+
null,
770+
ColorId.FRIDGE,
771+
new Vector2(60, 120),
772+
new Vector3(40, 60, 430),
773+
90);
774+
this.AddPlane_(
775+
"KI_fridgefront1",
776+
null,
777+
ColorId.FRIDGE,
778+
new Vector2(60, 40),
779+
new Vector3(10, 100, 400),
780+
0);
781+
this.AddPlane_(
782+
"KI_fridgefront2",
783+
null,
784+
ColorId.FRIDGE,
785+
new Vector2(60, 72),
786+
new Vector3(10, 44, 400),
787+
0);
788+
this.AddPlane_(
789+
"KI_fridgefrontbottom",
790+
null,
791+
ColorId.FRIDGE_BOTTOM,
792+
new Vector2(60, 8),
793+
new Vector3(10, 4, 401),
794+
0);
795+
796+
this.AddFloor_(
797+
"ceiling1",
798+
null,
799+
ColorId.CEILING,
800+
new Vector2(500, 600),
801+
new Vector3(-250, 160, 300));
802+
this.AddFloor_(
803+
"ceiling2",
804+
null,
805+
ColorId.CEILING,
806+
new Vector2(500, 600),
807+
new Vector3(250, 160, 300));
808+
this.AddFloor_(
809+
"ceiling3",
810+
null,
811+
ColorId.CEILING,
812+
new Vector2(500, 600),
813+
new Vector3(-250, 160, -300));
814+
this.AddFloor_(
815+
"ceiling4",
816+
null,
817+
ColorId.CEILING,
818+
new Vector2(500, 600),
819+
new Vector3(250, 160, -300));
820+
720821
this.AddFloor_(
721822
"floor1",
722823
null,
@@ -741,6 +842,13 @@ private void AddRoom_() {
741842
ColorId.FLOOR,
742843
new Vector2(500, 600),
743844
new Vector3(250, 0, -300));
845+
846+
this.AddFloor_(
847+
"rug",
848+
FilmstripId.RUG,
849+
null,
850+
new Vector2(50, 100),
851+
new Vector3(85, 3, -350));
744852
}
745853

746854
private void AddSprites_() {
@@ -793,11 +901,23 @@ private void AddSprites_() {
793901
this.AddSprite_("bar_redwinebottle",
794902
FilmstripId.RED_WINE_BOTTLE,
795903
new Vector2(25),
796-
new Vector3(-100f, -100, -100));
904+
new Vector3(-100));
797905
this.AddSprite_("bar_whitewinebottle",
798906
FilmstripId.WHITE_WINE_BOTTLE,
799907
new Vector2(25),
800-
new Vector3(-100f, -100, -100));
908+
new Vector3(-100));
909+
/*this.AddSprite_("player's drink",
910+
6,
911+
new Vector2(12),
912+
new Vector3(-170f, 73, -110));
913+
this.AddSprite_("Trip's drink",
914+
6,
915+
new Vector2(12),
916+
new Vector3(-100));
917+
this.AddSprite_("Grace's drink",
918+
5,
919+
new Vector2(12),
920+
new Vector3(-100));*/
801921

802922
this.AddPlane_(
803923
"big abstract painting",
@@ -820,12 +940,6 @@ private void AddSprites_() {
820940
new Vector2(40, 50),
821941
new Vector3(215, 100, 400),
822942
90);
823-
this.AddFloor_(
824-
"rug",
825-
FilmstripId.RUG,
826-
null,
827-
new Vector2(50, 100),
828-
new Vector3(85, 3, -350));
829943
this.AddPlane_(
830944
"wedding photo",
831945
FilmstripId.WEDDING_PHOTO,
@@ -917,6 +1031,21 @@ private void AddSprites_() {
9171031
FilmstripId.TRINKET_5,
9181032
new Vector2(16),
9191033
new Vector3(-186, 75, -405));
1034+
this.AddSprite_(
1035+
"trinket 6",
1036+
FilmstripId.TRINKET_6,
1037+
new Vector2(20),
1038+
new Vector3(-186, 98, -399));
1039+
this.AddSprite_(
1040+
"trinket 7",
1041+
FilmstripId.TRINKET_7,
1042+
new Vector2(16),
1043+
new Vector3(-186, 96, -424));
1044+
this.AddSprite_(
1045+
"trinket 8",
1046+
FilmstripId.TRINKET_8,
1047+
new Vector2(16),
1048+
new Vector3(-186, 96, -450));
9201049
}
9211050

9221051
private void AddSprite_(

0 commit comments

Comments
 (0)