Skip to content

Commit

Permalink
enhance: make equipment names clearer
Browse files Browse the repository at this point in the history
  • Loading branch information
hsanger committed Oct 29, 2023
1 parent 9c2b1c8 commit 1da8f75
Show file tree
Hide file tree
Showing 23 changed files with 39 additions and 39 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
16 changes: 8 additions & 8 deletions common/src/definitions/backpacks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export interface BackpackDefinition extends ItemDefinition {

export const Backpacks: BackpackDefinition[] = [
{
idString: "bag",
name: "Bag",
idString: "pack_0",
name: "Lvl. 0 Pack",
itemType: ItemType.Backpack,
level: 0,
maxCapacity: {
Expand All @@ -26,8 +26,8 @@ export const Backpacks: BackpackDefinition[] = [
noDrop: true
},
{
idString: "satchel",
name: "Satchel",
idString: "pack_1",
name: "Lvl. 1 Pack",
itemType: ItemType.Backpack,
level: 1,
maxCapacity: {
Expand All @@ -43,8 +43,8 @@ export const Backpacks: BackpackDefinition[] = [
}
},
{
idString: "regular_backpack",
name: "Regular Backpack",
idString: "pack_2",
name: "Lvl. 2 Pack",
itemType: ItemType.Backpack,
level: 2,
maxCapacity: {
Expand All @@ -60,8 +60,8 @@ export const Backpacks: BackpackDefinition[] = [
}
},
{
idString: "tactical_backpack",
name: "Tactical Backpack",
idString: "pack_3",
name: "Lvl. 3 Pack",
itemType: ItemType.Backpack,
level: 3,
maxCapacity: {
Expand Down
12 changes: 6 additions & 6 deletions common/src/definitions/helmets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ import { type ArmorDefinition } from "./armors";

export const Helmets: ArmorDefinition[] = [
{
idString: "hard_hat",
name: "Hard Hat",
idString: "helmet_1",
name: "Lvl. 1 Helmet",
itemType: ItemType.Armor,
armorType: ArmorType.Helmet,
level: 1,
damageReduction: 0.1
},
{
idString: "m1_helmet",
name: "M1 Helmet",
idString: "helmet_2",
name: "Lvl. 2 Helmet",
itemType: ItemType.Armor,
armorType: ArmorType.Helmet,
level: 2,
damageReduction: 0.15
},
{
idString: "tactical_helmet",
name: "Tactical Helmet",
idString: "helmet_3",
name: "Lvl. 3 Helmet",
itemType: ItemType.Armor,
armorType: ArmorType.Helmet,
level: 3,
Expand Down
12 changes: 6 additions & 6 deletions common/src/definitions/vests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ import { type ArmorDefinition } from "./armors";

export const Vests: ArmorDefinition[] = [
{
idString: "basic_vest",
name: "Basic Vest",
idString: "vest_1",
name: "Lvl. 1 Vest",
itemType: ItemType.Armor,
armorType: ArmorType.Vest,
level: 1,
damageReduction: 0.2
},
{
idString: "bulletproof_vest",
name: "Bulletproof Vest",
idString: "vest_2",
name: "Lvl. 2 Vest",
itemType: ItemType.Armor,
armorType: ArmorType.Vest,
level: 2,
damageReduction: 0.35
},
{
idString: "tactical_vest",
name: "Tactical Vest",
idString: "vest_3",
name: "Lvl. 3 Vest",
itemType: ItemType.Armor,
armorType: ArmorType.Vest,
level: 3,
Expand Down
36 changes: 18 additions & 18 deletions server/src/data/lootTables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,17 +263,17 @@ export const LootTiers: Record<string, WeightedItem[]> = {
{ item: "15x_scope", weight: 0.00025 }
],
equipment: [
{ item: "hard_hat", weight: 1 },
{ item: "m1_helmet", weight: 0.3 },
{ item: "tactical_helmet", weight: 0.1 },
{ item: "helmet_1", weight: 1 },
{ item: "helmet_2", weight: 0.3 },
{ item: "helmet_3", weight: 0.1 },

{ item: "basic_vest", weight: 1 },
{ item: "bulletproof_vest", weight: 0.3 },
{ item: "tactical_vest", weight: 0.1 },
{ item: "vest_1", weight: 1 },
{ item: "vest_2", weight: 0.3 },
{ item: "vest_3", weight: 0.1 },

{ item: "satchel", weight: 1 },
{ item: "regular_backpack", weight: 0.3 },
{ item: "tactical_backpack", weight: 0.1 }
{ item: "pack_1", weight: 1 },
{ item: "pack_2", weight: 0.3 },
{ item: "pack_3", weight: 0.1 }
],
ammo: [
{ item: "12g", count: 10, weight: 0.75 },
Expand Down Expand Up @@ -318,17 +318,17 @@ export const LootTiers: Record<string, WeightedItem[]> = {
{ item: "15x_scope", weight: 0.005 }
],
special_equipment: [
{ item: "hard_hat", weight: 1 },
{ item: "m1_helmet", weight: 0.5 },
{ item: "tactical_helmet", weight: 0.15 },
{ item: "helmet_1", weight: 1 },
{ item: "helmet_2", weight: 0.5 },
{ item: "helmet_3", weight: 0.15 },

{ item: "basic_vest", weight: 1 },
{ item: "bulletproof_vest", weight: 0.5 },
{ item: "tactical_vest", weight: 0.15 },
{ item: "vest_1", weight: 1 },
{ item: "vest_2", weight: 0.5 },
{ item: "vest_3", weight: 0.15 },

{ item: "satchel", weight: 1 },
{ item: "regular_backpack", weight: 0.5 },
{ item: "tactical_backpack", weight: 0.15 }
{ item: "pack_1", weight: 1 },
{ item: "pack_2", weight: 0.5 },
{ item: "pack_3", weight: 0.15 }
],
melee: [
{ item: "baseball_bat", weight: 4 },
Expand Down
2 changes: 1 addition & 1 deletion server/src/inventory/inventory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class Inventory {

helmet?: ArmorDefinition;
vest?: ArmorDefinition;
backpack?: BackpackDefinition = Loots.getByIDString("bag");
backpack?: BackpackDefinition = Loots.getByIDString("pack_0");

private _scope!: ScopeDefinition;

Expand Down

2 comments on commit 1da8f75

@kenos1
Copy link
Contributor

@kenos1 kenos1 commented on 1da8f75 Oct 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BRUH NOW THE NAMES ARE LESS INTERESTING

UNDO THIS COMMIT NOW

@Compositr
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#bringbackbulletproofvest

Please sign in to comment.