From 935c343ae830f1cae3ebd1ca6a9c7acb80b63aac Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Wed, 15 May 2024 17:01:30 -0700 Subject: [PATCH 1/7] am about to BUST --- .../buildings/riverside_house_ceiling.svg | 490 +++++++++ .../game/buildings/riverside_house_floor.svg | 931 ++++++++++++++++++ .../game/obstacles/riverside_house_wall.svg | 178 ++++ .../public/img/game/obstacles/slide_door.svg | 84 ++ client/src/scripts/utils/constants.ts | 2 +- common/src/definitions/buildings.ts | 34 + common/src/definitions/obstacles.ts | 44 + server/src/data/maps.ts | 1 + 8 files changed, 1763 insertions(+), 1 deletion(-) create mode 100644 client/public/img/game/buildings/riverside_house_ceiling.svg create mode 100644 client/public/img/game/buildings/riverside_house_floor.svg create mode 100644 client/public/img/game/obstacles/riverside_house_wall.svg create mode 100644 client/public/img/game/obstacles/slide_door.svg diff --git a/client/public/img/game/buildings/riverside_house_ceiling.svg b/client/public/img/game/buildings/riverside_house_ceiling.svg new file mode 100644 index 000000000..f980724e7 --- /dev/null +++ b/client/public/img/game/buildings/riverside_house_ceiling.svg @@ -0,0 +1,490 @@ + + + + diff --git a/client/public/img/game/buildings/riverside_house_floor.svg b/client/public/img/game/buildings/riverside_house_floor.svg new file mode 100644 index 000000000..34d12f668 --- /dev/null +++ b/client/public/img/game/buildings/riverside_house_floor.svg @@ -0,0 +1,931 @@ + + + + diff --git a/client/public/img/game/obstacles/riverside_house_wall.svg b/client/public/img/game/obstacles/riverside_house_wall.svg new file mode 100644 index 000000000..5fadc06ee --- /dev/null +++ b/client/public/img/game/obstacles/riverside_house_wall.svg @@ -0,0 +1,178 @@ + + + + diff --git a/client/public/img/game/obstacles/slide_door.svg b/client/public/img/game/obstacles/slide_door.svg new file mode 100644 index 000000000..8a553d579 --- /dev/null +++ b/client/public/img/game/obstacles/slide_door.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + diff --git a/client/src/scripts/utils/constants.ts b/client/src/scripts/utils/constants.ts index 47dde6f69..8f49a0510 100644 --- a/client/src/scripts/utils/constants.ts +++ b/client/src/scripts/utils/constants.ts @@ -3,7 +3,7 @@ import { Modes, type ColorKeys } from "../../../../common/src/definitions/modes" import { Config } from "../config"; export const UI_DEBUG_MODE = false; -export const HITBOX_DEBUG_MODE = false; +export const HITBOX_DEBUG_MODE = true; export const HITBOX_COLORS = { obstacle: new Color("red"), diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts index 249a6aac2..84d38e1f1 100644 --- a/common/src/definitions/buildings.ts +++ b/common/src/definitions/buildings.ts @@ -1035,6 +1035,40 @@ export const Buildings = ObjectDefinitions.create()( { table: "ground_loot", position: Vec.create(-15.42, 17.44) } ] }, + + { + idString: "riverside_house", + name: "riverside_house", + spawnHitbox: RectangleHitbox.fromRect(72, 130), + scopeHitbox: RectangleHitbox.fromRect(58, 118), + floorImages: [ + { + key: "riverside_house_floor", + position: Vec.create(0, 0) + }, + ], + ceilingImages: [{ + key: "riverside_house_ceiling", + position: Vec.create(-1.62, -2.5), + }], + obstacles: [ + { + idString: "slide_door", + position: Vec.create(15.15, -15.4), + rotation: 1 + }, + { + idString: "slide_door", + position: Vec.create(-12, 14.6), + rotation: 2 + }, + { + idString: "riverside_house_wall", + position: Vec.create(-8.5, -8.9), + rotation: 4 + }, + ] + }, { idString: "crane", name: "Crane", diff --git a/common/src/definitions/obstacles.ts b/common/src/definitions/obstacles.ts index 318bd3354..9f66d1e2f 100644 --- a/common/src/definitions/obstacles.ts +++ b/common/src/definitions/obstacles.ts @@ -844,6 +844,27 @@ export const Obstacles = ObjectDefinitions.create()( particle: "furniture_particle" } }, + { + idString: "slide_door", + name: "slide_Door", + material: "wood", + health: 120, + scale: { + spawnMin: 1, + spawnMax: 1, + destroy: 1 + }, + hitbox: RectangleHitbox.fromRect(10.15, 1.6, Vec.create(-0.44, 0)), + rotationMode: RotationMode.Limited, + noResidue: true, + role: ObstacleSpecialRoles.Door, + hingeOffset: Vec.create(-5.5, 0), + operationStyle: "slide", + zIndex: ZIndexes.ObstaclesLayer3, + frames: { + particle: "furniture_particle" + } + }, { idString: "vault_door", name: "Vault Door", @@ -1196,6 +1217,29 @@ export const Obstacles = ObjectDefinitions.create()( residue: "porta_potty_toilet_residue" } }, + { + idString: "riverside_house_wall", + name: "riverside_house_wall", + material: "wood", + health: 100, + noResidue: true, + scale: { + spawnMin: 1, + spawnMax: 1, + destroy: 0.9 + }, + hideOnMap: true, + hitbox: new HitboxGroup( + RectangleHitbox.fromRect(22.3, 2.1, Vec.create(12.9, 23.3)), + ), + + rotationMode: RotationMode.Limited, + allowFlyover: FlyoverPref.Never, + role: ObstacleSpecialRoles.Wall, + frames: { + particle: "porta_potty_wall_particle" + } + }, { idString: "porta_potty_back_wall", name: "Porta Potty Back Wall", diff --git a/server/src/data/maps.ts b/server/src/data/maps.ts index 352627444..b9d36dae0 100644 --- a/server/src/data/maps.ts +++ b/server/src/data/maps.ts @@ -72,6 +72,7 @@ const maps = { green_house: 2, mobile_home: 9, porta_potty: 12, + riverside_house: 100, container_3: 2, container_4: 2, container_5: 2, From 6604a16d4d8d693469d38b1015abaf9ba5a61313 Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Thu, 16 May 2024 21:38:29 -0700 Subject: [PATCH 2/7] almost done --- .../game/buildings/riverside_house_floor.svg | 754 ++++++++---------- common/src/definitions/buildings.ts | 5 + common/src/definitions/obstacles.ts | 22 +- 3 files changed, 349 insertions(+), 432 deletions(-) diff --git a/client/public/img/game/buildings/riverside_house_floor.svg b/client/public/img/game/buildings/riverside_house_floor.svg index 34d12f668..9dd0574f4 100644 --- a/client/public/img/game/buildings/riverside_house_floor.svg +++ b/client/public/img/game/buildings/riverside_house_floor.svg @@ -10,7 +10,7 @@ xml:space="preserve" sodipodi:docname="riverside_house_floor.svg" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - inkscape:export-filename="..\Desktop\NewBuilding\client\public\img\game\buildings\riverside_house_ceiling.svg" + inkscape:export-filename="..\obstacles\riverside_house_floor.svg" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -424,55 +424,7 @@ y="1" width="1" height="1" - id="rect211-3" /> ()( position: Vec.create(-8.5, -8.9), rotation: 4 }, + { + idString: "window", + position: Vec.create(-30.95, -9), + rotation: 0 + }, ] }, { diff --git a/common/src/definitions/obstacles.ts b/common/src/definitions/obstacles.ts index 9f66d1e2f..335f631ca 100644 --- a/common/src/definitions/obstacles.ts +++ b/common/src/definitions/obstacles.ts @@ -1221,7 +1221,9 @@ export const Obstacles = ObjectDefinitions.create()( idString: "riverside_house_wall", name: "riverside_house_wall", material: "wood", - health: 100, + indestructible: true, + reflectBullets: false, + health: 1000, noResidue: true, scale: { spawnMin: 1, @@ -1230,14 +1232,28 @@ export const Obstacles = ObjectDefinitions.create()( }, hideOnMap: true, hitbox: new HitboxGroup( - RectangleHitbox.fromRect(22.3, 2.1, Vec.create(12.9, 23.3)), + RectangleHitbox.fromRect(22.3, 1.9, Vec.create(12.9, 23.3)), + RectangleHitbox.fromRect(1.9, 25, Vec.create(23.5, 11.5)), + RectangleHitbox.fromRect(1.9, 13.3, Vec.create(23.5, -17.8)), + RectangleHitbox.fromRect(14.9, 1.9, Vec.create(-15.3, 23.3)), + RectangleHitbox.fromRect(45.75, 1.9, Vec.create(0, -23.2)), + RectangleHitbox.fromRect(1.9, 18, Vec.create(-22, 13.8)), + RectangleHitbox.fromRect(1.9, 18, Vec.create(-22, -13.8)), + RectangleHitbox.fromRect(1.6, 8.5, Vec.create(-13.7, 28.5)), + RectangleHitbox.fromRect(2.3, 2.3, Vec.create(-13.7, 34)), + RectangleHitbox.fromRect(4.5, 1.3, Vec.create(-10.3, 34)), + RectangleHitbox.fromRect(4.5, 1.3, Vec.create(3.7, 34)), + RectangleHitbox.fromRect(2.3, 2.3, Vec.create(7.3, 34)), + RectangleHitbox.fromRect(24.78, 1.3, Vec.create(20.8, 34)), + RectangleHitbox.fromRect(2.3, 2.3, Vec.create(34.4, 34)), + ), rotationMode: RotationMode.Limited, allowFlyover: FlyoverPref.Never, role: ObstacleSpecialRoles.Wall, frames: { - particle: "porta_potty_wall_particle" + particle: "furniture_particle" } }, { From 3493c9769fbe63190b2a621fee51f6dc928ea652 Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Fri, 17 May 2024 07:59:58 -0700 Subject: [PATCH 3/7] Update obstacles.ts --- common/src/definitions/obstacles.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/src/definitions/obstacles.ts b/common/src/definitions/obstacles.ts index 335f631ca..8f2e5c19c 100644 --- a/common/src/definitions/obstacles.ts +++ b/common/src/definitions/obstacles.ts @@ -1246,6 +1246,12 @@ export const Obstacles = ObjectDefinitions.create()( RectangleHitbox.fromRect(2.3, 2.3, Vec.create(7.3, 34)), RectangleHitbox.fromRect(24.78, 1.3, Vec.create(20.8, 34)), RectangleHitbox.fromRect(2.3, 2.3, Vec.create(34.4, 34)), + RectangleHitbox.fromRect(1.6, 27.8, Vec.create(34.4, 19.4)), + RectangleHitbox.fromRect(2.3, 2.3, Vec.create(34.4, 4.2)), + RectangleHitbox.fromRect(1.3, 4.5, Vec.create(34.4, 1.1)), + RectangleHitbox.fromRect(1.3, 4.5, Vec.create(34.4, -13.5)), + RectangleHitbox.fromRect(2.3, 2.3, Vec.create(34.4, -17)), + RectangleHitbox.fromRect(8.8, 1.6, Vec.create(28.7, -16.8)), ), From f743910ebc3dc2e56e2772b121d9051e6091631e Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Fri, 17 May 2024 20:02:58 -0700 Subject: [PATCH 4/7] basiclly done --- client/public/img/game/obstacles/bathtub.svg | 107 ++++++++ client/public/img/game/obstacles/bed2.svg | 117 +++++++++ .../public/img/game/obstacles/fireplace.svg | 158 ++++++++++++ .../game/obstacles/riverside_house_wall.svg | 136 ++-------- .../game/obstacles/riverside_house_wall_2.svg | 106 ++++++++ .../game/obstacles/riverside_house_wall_3.svg | 110 ++++++++ .../riverside_house_wall_exterior.svg | 179 +++++++++++++ client/public/img/game/obstacles/table2.svg | 243 ++++++++++++++++++ .../img/game/particles/fireplace_particle.svg | 83 ++++++ .../img/game/residues/fireplace_residue.svg | 239 +++++++++++++++++ common/src/definitions/buildings.ts | 71 ++++- common/src/definitions/obstacles.ts | 127 ++++++++- server/src/data/lootTables.ts | 10 + 13 files changed, 1571 insertions(+), 115 deletions(-) create mode 100644 client/public/img/game/obstacles/bathtub.svg create mode 100644 client/public/img/game/obstacles/bed2.svg create mode 100644 client/public/img/game/obstacles/fireplace.svg create mode 100644 client/public/img/game/obstacles/riverside_house_wall_2.svg create mode 100644 client/public/img/game/obstacles/riverside_house_wall_3.svg create mode 100644 client/public/img/game/obstacles/riverside_house_wall_exterior.svg create mode 100644 client/public/img/game/obstacles/table2.svg create mode 100644 client/public/img/game/particles/fireplace_particle.svg create mode 100644 client/public/img/game/residues/fireplace_residue.svg diff --git a/client/public/img/game/obstacles/bathtub.svg b/client/public/img/game/obstacles/bathtub.svg new file mode 100644 index 000000000..fa81ff685 --- /dev/null +++ b/client/public/img/game/obstacles/bathtub.svg @@ -0,0 +1,107 @@ + + + + diff --git a/client/public/img/game/obstacles/bed2.svg b/client/public/img/game/obstacles/bed2.svg new file mode 100644 index 000000000..c74275c50 --- /dev/null +++ b/client/public/img/game/obstacles/bed2.svg @@ -0,0 +1,117 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/client/public/img/game/obstacles/fireplace.svg b/client/public/img/game/obstacles/fireplace.svg new file mode 100644 index 000000000..56f51d448 --- /dev/null +++ b/client/public/img/game/obstacles/fireplace.svg @@ -0,0 +1,158 @@ + + + + diff --git a/client/public/img/game/obstacles/riverside_house_wall.svg b/client/public/img/game/obstacles/riverside_house_wall.svg index 5fadc06ee..c7166b23c 100644 --- a/client/public/img/game/obstacles/riverside_house_wall.svg +++ b/client/public/img/game/obstacles/riverside_house_wall.svg @@ -2,9 +2,9 @@ + transform="translate(-1476.0215,-88.050286)"> diff --git a/client/public/img/game/obstacles/riverside_house_wall_2.svg b/client/public/img/game/obstacles/riverside_house_wall_2.svg new file mode 100644 index 000000000..5dcc0214f --- /dev/null +++ b/client/public/img/game/obstacles/riverside_house_wall_2.svg @@ -0,0 +1,106 @@ + + + + diff --git a/client/public/img/game/obstacles/riverside_house_wall_3.svg b/client/public/img/game/obstacles/riverside_house_wall_3.svg new file mode 100644 index 000000000..cea1f0307 --- /dev/null +++ b/client/public/img/game/obstacles/riverside_house_wall_3.svg @@ -0,0 +1,110 @@ + + + + diff --git a/client/public/img/game/obstacles/riverside_house_wall_exterior.svg b/client/public/img/game/obstacles/riverside_house_wall_exterior.svg new file mode 100644 index 000000000..4fe6df698 --- /dev/null +++ b/client/public/img/game/obstacles/riverside_house_wall_exterior.svg @@ -0,0 +1,179 @@ + + + + diff --git a/client/public/img/game/obstacles/table2.svg b/client/public/img/game/obstacles/table2.svg new file mode 100644 index 000000000..4ec5b6759 --- /dev/null +++ b/client/public/img/game/obstacles/table2.svg @@ -0,0 +1,243 @@ + + + + diff --git a/client/public/img/game/particles/fireplace_particle.svg b/client/public/img/game/particles/fireplace_particle.svg new file mode 100644 index 000000000..bf722db9c --- /dev/null +++ b/client/public/img/game/particles/fireplace_particle.svg @@ -0,0 +1,83 @@ + + + + diff --git a/client/public/img/game/residues/fireplace_residue.svg b/client/public/img/game/residues/fireplace_residue.svg new file mode 100644 index 000000000..937d69609 --- /dev/null +++ b/client/public/img/game/residues/fireplace_residue.svg @@ -0,0 +1,239 @@ + + + + diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts index b07a4136a..350c79b81 100644 --- a/common/src/definitions/buildings.ts +++ b/common/src/definitions/buildings.ts @@ -1039,8 +1039,8 @@ export const Buildings = ObjectDefinitions.create()( { idString: "riverside_house", name: "riverside_house", - spawnHitbox: RectangleHitbox.fromRect(72, 130), - scopeHitbox: RectangleHitbox.fromRect(58, 118), + spawnHitbox: RectangleHitbox.fromRect(72, 72), + scopeHitbox: RectangleHitbox.fromRect(50, 50,Vec.create(0, 0)), floorImages: [ { key: "riverside_house_floor", @@ -1063,7 +1063,7 @@ export const Buildings = ObjectDefinitions.create()( rotation: 2 }, { - idString: "riverside_house_wall", + idString: "riverside_house_wall_exterior", position: Vec.create(-8.5, -8.9), rotation: 4 }, @@ -1072,6 +1072,71 @@ export const Buildings = ObjectDefinitions.create()( position: Vec.create(-30.95, -9), rotation: 0 }, + { + idString: "small_drawer", + position: Vec.create(-26, -26.9), + rotation: 0 + }, + { + idString: "gun_mount_maul", + position: Vec.create(-28, -19), + rotation: 1 + }, + { + idString: "large_drawer", + position: Vec.create(-23, 9.7), + rotation: 2 + }, + { + idString: "table2", + position: Vec.create(-24.5, 1), + rotation: 1 + }, + { + idString: "bookshelf", + position: Vec.create(-5, 4), + rotation: 1 + }, + { + idString: { toilet: 2, used_toilet: 1 }, + position: Vec.create(10, 8.9), + rotation: 2 + }, + { + idString: "bathtub", + position: Vec.create(3, 6.5), + rotation: 2 + }, + { + idString: "fireplace", + position: Vec.create(-11.9, -25.9), + rotation: 1 + }, + { + idString: "bed2", + position: Vec.create(5.2, -27.5), + rotation: 3 + }, + { + idString: "riverside_house_wall", + position: Vec.create(-1.1, -6.5), + rotation: 3 + }, + { + idString: "riverside_house_wall_3", + position: Vec.create(2.5, -6.5), + rotation: 3 + }, + { + idString: "riverside_house_wall_2", + position: Vec.create(-1.1, 3.95), + rotation: 2 + }, + { + idString: "door", + position: Vec.create(9.15, -6.5), + rotation: 2 + }, ] }, { diff --git a/common/src/definitions/obstacles.ts b/common/src/definitions/obstacles.ts index 8f2e5c19c..b4fe91471 100644 --- a/common/src/definitions/obstacles.ts +++ b/common/src/definitions/obstacles.ts @@ -980,6 +980,26 @@ export const Obstacles = ObjectDefinitions.create()( hitbox: RectangleHitbox.fromRect(6.85, 15.4, Vec.create(-0.3, 0)), rotationMode: RotationMode.Limited }, + { + idString: "fireplace", + name: "fireplace", + material: "metal", + health: 100, + scale: { + spawnMin: 1, + spawnMax: 1, + destroy: 0.9 + }, + hideOnMap: true, + hitbox: new HitboxGroup( + RectangleHitbox.fromRect(9.5, 13.5, Vec.create(0, -1)), + new CircleHitbox(3, Vec.create(0, 5.35)), + + ), + explosion: "barrel_explosion", + rotationMode: RotationMode.Limited + + }, { idString: "tv", name: "TV", @@ -1017,6 +1037,49 @@ export const Obstacles = ObjectDefinitions.create()( zIndex: ZIndexes.ObstaclesLayer3, noCollisions: true }, + { + idString: "table2", + name: "Table2", + material: "wood", + health: 100, + scale: { + spawnMin: 1, + spawnMax: 1, + destroy: 0.9 + }, + hideOnMap: true, + hitbox: RectangleHitbox.fromRect(9, 7.7), + rotationMode: RotationMode.Limited, + frames: { + particle: "furniture_particle" + }, + zIndex: ZIndexes.ObstaclesLayer3, + noCollisions: true + }, + { + idString: "bathtub", + name: "bathtub", + material: "porcelain", + health: 100, + scale: { + spawnMin: 1, + spawnMax: 1, + destroy: 0.9 + }, + hideOnMap: true, + hitbox: new HitboxGroup( + RectangleHitbox.fromRect(5.8, 10, Vec.create(0, -1.5)), + new CircleHitbox(2.65, Vec.create(0, 3.7)), + + ), + rotationMode: RotationMode.Limited, + allowFlyover: FlyoverPref.Always, + hasLoot: true, + frames: { + particle: "porta_potty_toilet_particle", + residue: "porta_potty_toilet_residue" + } + }, { idString: "green_house_large_table", name: "Green House Large Table", @@ -1144,6 +1207,66 @@ export const Obstacles = ObjectDefinitions.create()( particle: "furniture_particle" } }, + { + idString: "riverside_house_wall", + name: "riverside_house_wall", + material: "wood", + health: 250, + hideOnMap: true, + hitbox: RectangleHitbox.fromRect(2.3, 2.3), + rotationMode: RotationMode.Limited, + allowFlyover: FlyoverPref.Never, + reflectBullets: true, + frames: { + particle: "wall_particle" + } + }, + { + idString: "riverside_house_wall_2", + name: "riverside_house_wall_2", + material: "wood", + health: 250, + hideOnMap: true, + hitbox: RectangleHitbox.fromRect(1.65, 18.5), + rotationMode: RotationMode.Limited, + allowFlyover: FlyoverPref.Never, + reflectBullets: true, + frames: { + particle: "wall_particle" + } + }, + { + idString: "riverside_house_wall_3", + name: "riverside_house_wall_3", + material: "wood", + health: 250, + hideOnMap: true, + hitbox: RectangleHitbox.fromRect(1.65, 4.5), + rotationMode: RotationMode.Limited, + allowFlyover: FlyoverPref.Never, + reflectBullets: true, + frames: { + particle: "wall_particle" + } + }, + { + idString: "bed2", + name: "Bed2", + material: "wood", + health: 100, + scale: { + spawnMin: 1, + spawnMax: 1, + destroy: 0.9 + }, + hideOnMap: true, + hitbox: RectangleHitbox.fromRect(5.6, 16), + rotationMode: RotationMode.Limited, + allowFlyover: FlyoverPref.Always, + frames: { + particle: "furniture_particle" + } + }, { idString: "bunk_bed", name: "Bunk Bed", @@ -1218,8 +1341,8 @@ export const Obstacles = ObjectDefinitions.create()( } }, { - idString: "riverside_house_wall", - name: "riverside_house_wall", + idString: "riverside_house_wall_exterior", + name: "riverside_house_wall_exterior", material: "wood", indestructible: true, reflectBullets: false, diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts index 8f7674425..b5890c2a5 100644 --- a/server/src/data/lootTables.ts +++ b/server/src/data/lootTables.ts @@ -260,6 +260,15 @@ export const LootTables: Record = { { item: "basic_outfit", weight: 0.001 } ] }, + bathtub: { + min: 2, + max: 3, + loot: [ + { tier: "healing_items", weight: 3 }, + { tier: "scopes", weight: 0.1 }, + { tier: "guns", weight: 0.05 } + ] + }, toilet: { min: 2, max: 3, @@ -269,6 +278,7 @@ export const LootTables: Record = { { tier: "guns", weight: 0.05 } ] }, + used_toilet: { min: 2, max: 3, From 9cfa2349c794088c811710d3e4f917e3a4f25e2f Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Fri, 17 May 2024 20:46:45 -0700 Subject: [PATCH 5/7] Update buildings.ts --- common/src/definitions/buildings.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts index 350c79b81..d9c86b4c1 100644 --- a/common/src/definitions/buildings.ts +++ b/common/src/definitions/buildings.ts @@ -1039,8 +1039,13 @@ export const Buildings = ObjectDefinitions.create()( { idString: "riverside_house", name: "riverside_house", - spawnHitbox: RectangleHitbox.fromRect(72, 72), - scopeHitbox: RectangleHitbox.fromRect(50, 50,Vec.create(0, 0)), + spawnHitbox: + RectangleHitbox.fromRect(72, 72), + + scopeHitbox: new HitboxGroup( + RectangleHitbox.fromRect(50, 50,Vec.create(2, 0)), + RectangleHitbox.fromRect(47, 47,Vec.create(-8.4, -8.8)), + ), floorImages: [ { key: "riverside_house_floor", From c4e77baa5991a295cb6bc09cccc9feaeee5406be Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Fri, 17 May 2024 21:06:54 -0700 Subject: [PATCH 6/7] boxes --- common/src/definitions/buildings.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts index d9c86b4c1..66b66f2ef 100644 --- a/common/src/definitions/buildings.ts +++ b/common/src/definitions/buildings.ts @@ -1040,7 +1040,7 @@ export const Buildings = ObjectDefinitions.create()( idString: "riverside_house", name: "riverside_house", spawnHitbox: - RectangleHitbox.fromRect(72, 72), + RectangleHitbox.fromRect(60, 60), scopeHitbox: new HitboxGroup( RectangleHitbox.fromRect(50, 50,Vec.create(2, 0)), @@ -1142,6 +1142,16 @@ export const Buildings = ObjectDefinitions.create()( position: Vec.create(9.15, -6.5), rotation: 2 }, + { + idString: "box", + position: Vec.create(19, 13.5), + rotation: 2 + }, + { + idString: "box", + position: Vec.create(22, 19), + rotation: 2 + }, ] }, { From 32de8a2bca9c10c5a60ce96b0aeb9eae3634ad73 Mon Sep 17 00:00:00 2001 From: CroissantEdit Date: Fri, 17 May 2024 21:43:03 -0700 Subject: [PATCH 7/7] some fixies --- client/src/scripts/utils/constants.ts | 2 +- common/src/definitions/buildings.ts | 2 +- server/src/data/maps.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/scripts/utils/constants.ts b/client/src/scripts/utils/constants.ts index 8f49a0510..47dde6f69 100644 --- a/client/src/scripts/utils/constants.ts +++ b/client/src/scripts/utils/constants.ts @@ -3,7 +3,7 @@ import { Modes, type ColorKeys } from "../../../../common/src/definitions/modes" import { Config } from "../config"; export const UI_DEBUG_MODE = false; -export const HITBOX_DEBUG_MODE = true; +export const HITBOX_DEBUG_MODE = false; export const HITBOX_COLORS = { obstacle: new Color("red"), diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts index 66b66f2ef..4525fe530 100644 --- a/common/src/definitions/buildings.ts +++ b/common/src/definitions/buildings.ts @@ -1040,7 +1040,7 @@ export const Buildings = ObjectDefinitions.create()( idString: "riverside_house", name: "riverside_house", spawnHitbox: - RectangleHitbox.fromRect(60, 60), + RectangleHitbox.fromRect(85, 85), scopeHitbox: new HitboxGroup( RectangleHitbox.fromRect(50, 50,Vec.create(2, 0)), diff --git a/server/src/data/maps.ts b/server/src/data/maps.ts index b9d36dae0..f2165463c 100644 --- a/server/src/data/maps.ts +++ b/server/src/data/maps.ts @@ -72,7 +72,7 @@ const maps = { green_house: 2, mobile_home: 9, porta_potty: 12, - riverside_house: 100, + riverside_house: 5, container_3: 2, container_4: 2, container_5: 2,