Skip to content

Commit

Permalink
Merge branch 'dev' into feat-angular-gui
Browse files Browse the repository at this point in the history
  • Loading branch information
@IsaacThoman
IsaacThoman authored Jan 23, 2025
2 parents d96ac8c + 1be340d commit 557981b
Show file tree
Hide file tree
Showing 12 changed files with 448 additions and 153 deletions.
Binary file added assets/rusty_pipe.blend
View file
Binary file not shown.
305 changes: 166 additions & 139 deletions public/maps/crackhouse_1/map.json
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,167 @@
{
"name": "crackhouse_1",
"respawnPoints": [
{
"position": {"x": 12, "y": 2, "z": -7.2},
"quaternion": {"x": 0, "y": 0.95, "z": 0, "w": 0.33}
},
{
"position": {"x": 12, "y": 2, "z": -11.2},
"quaternion": {"x": 0, "y": -1, "z": 0, "w": 0}
},
{
"position": {"x": 10.3, "y": 2, "z": -13.2},
"quaternion": {"x": 0, "y": -1, "z": 0, "w": 0}
},
{
"position": {"x": 8.6, "y": 2, "z": -11.6},
"quaternion": {"x": 0, "y": -1, "z": 0, "w": 0}
},
{
"position": {"x": 8.6, "y": 2, "z": -9.3},
"quaternion": {"x": 0, "y": -1, "z": 0, "w": 0}
},
{
"position": {"x": -6.87, "y": 4, "z": 13.27},
"quaternion": {"x": 0, "y": -0.87, "z": 0, "w": 0.5}
},
{
"position": {"x": 2.62, "y": 4.2, "z": 13.37},
"quaternion": {"x": 0, "y": 0.68, "z": 0, "w": 0.73}
},
{
"position": {"x": 1.86, "y": 4, "z": 11.54},
"quaternion": {"x": 0, "y": 0.95, "z": 0, "w": 0.29}
},
{
"position": {"x": -5.15, "y": 4, "z": 15.22},
"quaternion": {"x": 0, "y": -0.55, "z": 0, "w": 0.83}
},
{
"position": {"x":-8.08 , "y": 4, "z": 15.65},
"quaternion": {"x": 0, "y": -0.31, "z": 0, "w": 0.95}
}
],
"itemRespawnPoints": [
{
"position": {"x": 5.71, "y": 1.31, "z": -4.16},
"itemId": 1
},
{
"position": {"x": -0.22, "y": 1.05, "z": 4.48},
"itemId": 1
},
{
"position": {"x": -7.17, "y": 1.05, "z": 13.79},
"itemId": 1
},
{
"position": {"x": -6.79, "y": 1.05, "z": 4.31},
"itemId": 2
},
{
"position": {"x": -7.03, "y": 3.24, "z": 14.89},
"itemId": 2
},
{
"position": {"x": 4.71, "y": 3.24, "z": 10.77},
"itemId": 2
},
{
"position": {"x": 4.71, "y": 3.24, "z": 10.77},
"itemId": 1
},
{
"position": {"x": 3.38, "y": 3.24, "z": 4.12},
"itemId": 1
},
{
"position": {"x": 12.14, "y": 0.53, "z": 13.78},
"itemId": 1
},
{
"position": {"x": 23.68, "y": 0.45, "z": 14.57},
"itemId": 2
},
{
"position": {"x": 24.3, "y": 1.2, "z": -2.25},
"itemId": 2
},
{
"position": {"x": 0.5, "y": 0.83, "z": -10.2},
"itemId": 1
},
{
"position": {"x": -13.38, "y": 0.83, "z": -10.2},
"itemId": 1
},
{
"position": {"x": 3.68, "y": 1.05, "z": 4.08},
"itemId": 2
},
{
"position": {"x": -0.62, "y": 0.55, "z": 16.68},
"itemId": 2
},
{
"position": {"x": -0.62, "y": 0.55, "z": 16.68},
"itemId": 1
},
{
"position": {"x": -18.04, "y": 0.55, "z": 3.17},
"itemId": 1
},
{
"position": {"x": -13.9, "y": 0.76, "z": -3.94},
"itemId": 1
},
{
"position": {"x": -13.9, "y": 0.76, "z": -3.94},
"itemId": 2
},
{
"position": {"x": 6.83, "y": 0.55, "z": -13.59},
"itemId": 2
},
{
"position": {"x": -6.65, "y": 3.24, "z": 2.28},
"itemId": 2
},
{
"position": {"x": -4.71, "y": 3.24, "z": 10.22},
"itemId": 2
},
{
"position": {"x": -4.71, "y": 3.24, "z": 10.22},
"itemId": 1
}

]
}
"name": "crackhouse_1",
"respawnPoints": [
{
"position": { "x": 12, "y": 2, "z": -7.2 },
"quaternion": { "x": 0, "y": 0.95, "z": 0, "w": 0.33 }
},
{
"position": { "x": 12, "y": 2, "z": -11.2 },
"quaternion": { "x": 0, "y": -1, "z": 0, "w": 0 }
},
{
"position": { "x": 10.3, "y": 2, "z": -13.2 },
"quaternion": { "x": 0, "y": -1, "z": 0, "w": 0 }
},
{
"position": { "x": 8.6, "y": 2, "z": -11.6 },
"quaternion": { "x": 0, "y": -1, "z": 0, "w": 0 }
},
{
"position": { "x": 8.6, "y": 2, "z": -9.3 },
"quaternion": { "x": 0, "y": -1, "z": 0, "w": 0 }
},
{
"position": { "x": -6.87, "y": 4, "z": 13.27 },
"quaternion": { "x": 0, "y": -0.87, "z": 0, "w": 0.5 }
},
{
"position": { "x": 2.62, "y": 4.2, "z": 13.37 },
"quaternion": { "x": 0, "y": 0.68, "z": 0, "w": 0.73 }
},
{
"position": { "x": 1.86, "y": 4, "z": 11.54 },
"quaternion": { "x": 0, "y": 0.95, "z": 0, "w": 0.29 }
},
{
"position": { "x": -5.15, "y": 4, "z": 15.22 },
"quaternion": { "x": 0, "y": -0.55, "z": 0, "w": 0.83 }
},
{
"position": { "x": -8.08, "y": 4, "z": 15.65 },
"quaternion": { "x": 0, "y": -0.31, "z": 0, "w": 0.95 }
}
],
"itemRespawnPoints": [
{
"position": { "x": 5.71, "y": 1.31, "z": -4.16 },
"itemId": 1
},
{
"position": { "x": -0.22, "y": 1.05, "z": 4.48 },
"itemId": 1
},
{
"position": { "x": -7.17, "y": 1.05, "z": 13.79 },
"itemId": 1
},
{
"position": { "x": -6.79, "y": 1.05, "z": 4.31 },
"itemId": 2
},
{
"position": { "x": -7.03, "y": 3.24, "z": 14.89 },
"itemId": 2
},
{
"position": { "x": 4.71, "y": 3.24, "z": 10.77 },
"itemId": 2
},
{
"position": { "x": -6.79, "y": 1.05, "z": 4.31 },
"itemId": 3
},
{
"position": { "x": 4.71, "y": 3.24, "z": 10.77 },
"itemId": 1
},
{
"position": { "x": 3.38, "y": 3.24, "z": 4.12 },
"itemId": 1
},
{
"position": { "x": 12.14, "y": 0.53, "z": 13.78 },
"itemId": 1
},
{
"position": { "x": 23.68, "y": 0.45, "z": 14.57 },
"itemId": 2
},
{
"position": { "x": 24.3, "y": 1.2, "z": -2.25 },
"itemId": 2
},
{
"position": { "x": 23.68, "y": 0.45, "z": 14.57 },
"itemId": 3
},
{
"position": { "x": 24.3, "y": 1.2, "z": -2.25 },
"itemId": 3
},
{
"position": { "x": 0.5, "y": 0.83, "z": -10.2 },
"itemId": 1
},
{
"position": { "x": -13.38, "y": 0.83, "z": -10.2 },
"itemId": 1
},
{
"position": { "x": 3.68, "y": 1.05, "z": 4.08 },
"itemId": 2
},
{
"position": { "x": -0.62, "y": 0.55, "z": 16.68 },
"itemId": 2
},
{
"position": { "x": 3.68, "y": 1.05, "z": 4.08 },
"itemId": 3
},
{
"position": { "x": -0.62, "y": 0.55, "z": 16.68 },
"itemId": 3
},
{
"position": { "x": -0.62, "y": 0.55, "z": 16.68 },
"itemId": 1
},
{
"position": { "x": -18.04, "y": 0.55, "z": 3.17 },
"itemId": 1
},
{
"position": { "x": -13.9, "y": 0.76, "z": -3.94 },
"itemId": 1
},
{
"position": { "x": -13.9, "y": 0.76, "z": -3.94 },
"itemId": 2
},
{
"position": { "x": 6.83, "y": 0.55, "z": -13.59 },
"itemId": 2
},
{
"position": { "x": -13.9, "y": 0.76, "z": -3.94 },
"itemId": 3
},
{
"position": { "x": 6.83, "y": 0.55, "z": -13.59 },
"itemId": 3
},
{
"position": { "x": -6.65, "y": 3.24, "z": 2.28 },
"itemId": 2
},
{
"position": { "x": -4.71, "y": 3.24, "z": 10.22 },
"itemId": 2
},
{
"position": { "x": -4.71, "y": 3.24, "z": 10.22 },
"itemId": 1
}
]
}
Binary file added public/models/rusty_pipe.glb
View file
Binary file not shown.
Binary file added public/models/simplified_rusty_pipe.glb
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions src/client/core/Inventory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Networking } from './Networking.ts';
import { ItemBase, ItemType } from '../items/ItemBase.ts';
import { FishGun } from '../items/FishGun.ts';
import { Player } from '../../shared/Player.ts';
import { Pipe } from '../items/Pipe.ts';
import { FlagItem } from '../items/FlagItem.ts';
export class Inventory {
private inventoryItems: ItemBase[] = [];
Expand Down Expand Up @@ -66,6 +67,11 @@ export class Inventory {
this.inventoryItems.push(fish);
break;
}
case 3: {
const bat = new Pipe(this.renderer, this.networking, i, ItemType.InventoryItem);
this.inventoryItems.push(bat);
break;
}
case 4: {
const flag = new FlagItem(this.renderer, i, ItemType.InventoryItem);
this.inventoryItems.push(flag);
Expand Down
3 changes: 3 additions & 0 deletions src/client/core/RemoteItemRenderer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Renderer } from './Renderer.ts';
import { ItemBase, ItemType } from '../items/ItemBase.ts';
import { BananaGun } from '../items/BananaGun.ts';
import { FishGun } from '../items/FishGun.ts';
import { Pipe } from '../items/Pipe.ts';
import { FlagItem } from '../items/FlagItem.ts';

// Custom types
Expand Down Expand Up @@ -90,6 +91,8 @@ export class RemoteItemRenderer {
return new BananaGun(this.renderer, this.networking, 0, ItemType.WorldItem);
case 2:
return new FishGun(this.renderer, this.networking, 0, ItemType.WorldItem);
case 3:
return new Pipe(this.renderer, this.networking, 0, ItemType.WorldItem);
case 4:
return new FlagItem(this.renderer, 0, ItemType.WorldItem);
default:
Expand Down
Loading

0 comments on commit 557981b

Please sign in to comment.