diff --git a/client/public/img/game/skins/aegis_jumpsuit_base.svg b/client/public/img/game/skins/aegis_jumpsuit_base.svg
new file mode 100644
index 000000000..94fd00ab0
--- /dev/null
+++ b/client/public/img/game/skins/aegis_jumpsuit_base.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/aegis_jumpsuit_fist.svg b/client/public/img/game/skins/aegis_jumpsuit_fist.svg
new file mode 100644
index 000000000..7454d0657
--- /dev/null
+++ b/client/public/img/game/skins/aegis_jumpsuit_fist.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/client/public/img/game/skins/battle_dress_base.svg b/client/public/img/game/skins/battle_dress_base.svg
new file mode 100644
index 000000000..f68d6c614
--- /dev/null
+++ b/client/public/img/game/skins/battle_dress_base.svg
@@ -0,0 +1,80 @@
+
+
+
+
diff --git a/client/public/img/game/skins/battle_dress_fist.svg b/client/public/img/game/skins/battle_dress_fist.svg
new file mode 100644
index 000000000..9b68486b5
--- /dev/null
+++ b/client/public/img/game/skins/battle_dress_fist.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/client/public/img/game/skins/field_gray_base.svg b/client/public/img/game/skins/field_gray_base.svg
new file mode 100644
index 000000000..9fb3a66ea
--- /dev/null
+++ b/client/public/img/game/skins/field_gray_base.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/field_gray_fist.svg b/client/public/img/game/skins/field_gray_fist.svg
new file mode 100644
index 000000000..bc9b12225
--- /dev/null
+++ b/client/public/img/game/skins/field_gray_fist.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/hazardous_materials_base.svg b/client/public/img/game/skins/hazardous_materials_base.svg
new file mode 100644
index 000000000..2bd3f6226
--- /dev/null
+++ b/client/public/img/game/skins/hazardous_materials_base.svg
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/client/public/img/game/skins/hazardous_materials_fist.svg b/client/public/img/game/skins/hazardous_materials_fist.svg
new file mode 100644
index 000000000..a41aa2b23
--- /dev/null
+++ b/client/public/img/game/skins/hazardous_materials_fist.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/client/public/img/game/skins/heavy_cargo_base.svg b/client/public/img/game/skins/heavy_cargo_base.svg
new file mode 100644
index 000000000..0b1173cb5
--- /dev/null
+++ b/client/public/img/game/skins/heavy_cargo_base.svg
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/client/public/img/game/skins/heavy_cargo_fist.svg b/client/public/img/game/skins/heavy_cargo_fist.svg
new file mode 100644
index 000000000..982e671ba
--- /dev/null
+++ b/client/public/img/game/skins/heavy_cargo_fist.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/lily_lurker_base.svg b/client/public/img/game/skins/lily_lurker_base.svg
new file mode 100644
index 000000000..400d651c5
--- /dev/null
+++ b/client/public/img/game/skins/lily_lurker_base.svg
@@ -0,0 +1,133 @@
+
+
+
+
diff --git a/client/public/img/game/skins/lily_lurker_fist.svg b/client/public/img/game/skins/lily_lurker_fist.svg
new file mode 100644
index 000000000..22a304e09
--- /dev/null
+++ b/client/public/img/game/skins/lily_lurker_fist.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/client/public/img/game/skins/oil_dweller_base.svg b/client/public/img/game/skins/oil_dweller_base.svg
new file mode 100644
index 000000000..dd36a0473
--- /dev/null
+++ b/client/public/img/game/skins/oil_dweller_base.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/oil_dweller_fist.svg b/client/public/img/game/skins/oil_dweller_fist.svg
new file mode 100644
index 000000000..f53c93e42
--- /dev/null
+++ b/client/public/img/game/skins/oil_dweller_fist.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/tattered_rags_base.svg b/client/public/img/game/skins/tattered_rags_base.svg
new file mode 100644
index 000000000..539154627
--- /dev/null
+++ b/client/public/img/game/skins/tattered_rags_base.svg
@@ -0,0 +1,58 @@
+
+
+
+
diff --git a/client/public/img/game/skins/tattered_rags_fist.svg b/client/public/img/game/skins/tattered_rags_fist.svg
new file mode 100644
index 000000000..60a10fc97
--- /dev/null
+++ b/client/public/img/game/skins/tattered_rags_fist.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/client/public/img/game/skins/the_arrowhead_base.svg b/client/public/img/game/skins/the_arrowhead_base.svg
new file mode 100644
index 000000000..40c5b684a
--- /dev/null
+++ b/client/public/img/game/skins/the_arrowhead_base.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/the_arrowhead_fist.svg b/client/public/img/game/skins/the_arrowhead_fist.svg
new file mode 100644
index 000000000..6b2a66604
--- /dev/null
+++ b/client/public/img/game/skins/the_arrowhead_fist.svg
@@ -0,0 +1,47 @@
+
+
+
+
diff --git a/client/public/img/game/skins/watermelon_base.svg b/client/public/img/game/skins/watermelon_base.svg
deleted file mode 100644
index e06c9327d..000000000
--- a/client/public/img/game/skins/watermelon_base.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
diff --git a/client/public/img/game/skins/watermelon_fist.svg b/client/public/img/game/skins/watermelon_fist.svg
deleted file mode 100644
index ef00bcf2c..000000000
--- a/client/public/img/game/skins/watermelon_fist.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/common/src/definitions/buildings.ts b/common/src/definitions/buildings.ts
index 7ee25cd8e..2a29d35e9 100644
--- a/common/src/definitions/buildings.ts
+++ b/common/src/definitions/buildings.ts
@@ -710,7 +710,7 @@ export const Buildings = ObjectDefinitions.create()(
},
{
idString: "chair",
- position: Vec.create(-26, 28),
+ position: Vec.create(-29, 28),
rotation: 3
},
{
@@ -926,6 +926,9 @@ export const Buildings = ObjectDefinitions.create()(
idString: "porta_potty",
position: Vec.create(59.75, -27.6)
}
+ ],
+ lootSpawners: [
+ { table: "refinery_office_floor", position: Vec.create(-21, 28) }
]
},
{
@@ -1422,7 +1425,10 @@ export const Buildings = ObjectDefinitions.create()(
ceilingImages: [{
key: "oil_tanker_ship_vault_ceiling",
position: Vec.create(0, 0)
- }]
+ }],
+ lootSpawners: [
+ { table: "oil_tanker_ship_vault_floor", position: Vec.create(0, 0) }
+ ]
},
{
idString: "port",
@@ -2014,6 +2020,9 @@ export const Buildings = ObjectDefinitions.create()(
{ idString: "barrel", position: Vec.create(-30.9, 11.3) },
{ idString: "briefcase", position: Vec.create(-20.7, 10.85), rotation: 0 },
{ idString: "vault_door", position: Vec.create(-14.1, -3.22), rotation: 3 }
+ ],
+ lootSpawners: [
+ { table: "armory_vault_floor", position: Vec.create(-20.7, -3.22) }
]
},
{
diff --git a/common/src/definitions/skins.ts b/common/src/definitions/skins.ts
index 3947b27d2..6c89ac60c 100644
--- a/common/src/definitions/skins.ts
+++ b/common/src/definitions/skins.ts
@@ -99,8 +99,7 @@ export const Skins = ObjectDefinitions.create()(
["Bee", 0x4a4a4a],
["Armadillo", 0xa68c5e],
["Printer", 0xffffff],
- ["Distant Shores", 0x7eca83],
- ["Watermelon", 0xc02c2c]
+ ["Distant Shores", 0x7eca83]
] satisfies ReadonlyArray).map(([name, tint]) => simple("skin_factory", name, tint)),
...([
["Lemon", 0xebe092],
@@ -121,7 +120,16 @@ export const Skins = ObjectDefinitions.create()(
["Aurora", 0x1d2f58],
["Nebula", 0x28a0b7],
["1st Birthday", 0xed8080],
- ["Lumberjack", 0x924a24]
+ ["Lumberjack", 0x924a24],
+ ["Battle Dress", 0x676f4f],
+ ["The Arrowhead", 0x4a4a4a],
+ ["Lily Lurker", 0x5b6642],
+ ["Hazardous Materials", 0x4a4a4a],
+ ["Field Gray", 0x6d5038],
+ ["Heavy Cargo", 0x32354d],
+ ["AEGIS Jumpsuit", 0x4984aa],
+ ["Oil Dweller", 0x6e2f2b],
+ ["Tattered Rags", 0x6e4627]
] satisfies ReadonlyArray).map(([name, tint]) => simple("hidden_skin", [], [name, tint])),
apply(
"hidden_skin",
diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts
index 7b8c61df4..e716d5c5c 100644
--- a/server/src/data/lootTables.ts
+++ b/server/src/data/lootTables.ts
@@ -42,7 +42,8 @@ export const LootTables: Record = {
{ tier: "scopes", weight: 0.3 },
// { tier: "winter_skins", weight: 0.4 }, // winter mode
{ tier: "throwables", weight: 0.3 },
- { tier: "melee", weight: 0.04 }
+ { tier: "melee", weight: 0.04 },
+ { tier: "rare_world_skins", weight: 0.04}
]
},
hazel_crate: {
@@ -81,6 +82,9 @@ export const LootTables: Record = {
min: 1,
max: 1,
loot: [
+ [
+ { item: "lily_lurker", weight: 1}
+ ],
[
{ tier: "river_chest_guns", weight: 1 }
],
@@ -105,7 +109,8 @@ export const LootTables: Record = {
{ tier: "special_guns", weight: 1 },
{ tier: "special_healing_items", weight: 0.15 },
{ tier: "special_equipment", weight: 0.65 },
- { tier: "special_scopes", weight: 0.3 }
+ { tier: "special_scopes", weight: 0.3 },
+ { item: "aegis_jumpsuit", weight: 0.08 }
]
},
flint_crate: {
@@ -115,7 +120,8 @@ export const LootTables: Record = {
{ tier: "special_guns", weight: 1 },
{ tier: "special_equipment", weight: 0.65 },
{ tier: "special_healing_items", weight: 0.15 },
- { tier: "special_scopes", weight: 0.3 }
+ { tier: "special_scopes", weight: 0.3 },
+ { item: "the_arrowhead", weight: 0.08, }
]
},
grenade_box: {
@@ -155,6 +161,9 @@ export const LootTables: Record = {
{ item: "tango_51", spawnSeparately: true, count: 3, weight: 3.5 },
{ item: "tango_51", spawnSeparately: true, count: 4, weight: 0.1 },
{ item: "tango_51", spawnSeparately: true, count: 5, weight: 0.0000001 }
+ ],
+ [
+ { item: "heavy_cargo", weight: .8 }
]
]
},
@@ -297,6 +306,7 @@ export const LootTables: Record = {
loot: [
{ item: "lemon", weight: 1 },
{ item: "flamingo", weight: 1 },
+ { item: "tattered_rags", weight: 0.6 },
{ item: "verified", weight: 0.5 },
{ item: "no_kil_pls", weight: 0.5 },
{ item: "basic_outfit", weight: 0.001 }
@@ -550,6 +560,29 @@ export const LootTables: Record = {
{ tier: "healing_items", weight: 0.5 },
{ tier: "equipment", weight: 0.3 }
]
+ },
+ refinery_office_floor: {
+ min: 1,
+ max: 1,
+ loot: [
+ { item: "hazardous_materials", weight: .3 }
+ ]
+ },
+ armory_vault_floor: {
+ min: 1,
+ max: 1,
+ loot: [
+ { item: "battle_dress", spawnSeparately: true, count: 1, weight: 3.5 },
+ { item: "battle_dress", spawnSeparately: true, count: 2, weight: 0.8 },
+ { item: "battle_dress", spawnSeparately: true, count: 4, weight: 0.05 }
+ ]
+ },
+ oil_tanker_ship_vault_floor: {
+ min: 1,
+ max: 1,
+ loot: [
+ { item: "oil_dweller", weight: 1 }
+ ]
}
};
@@ -784,5 +817,8 @@ export const LootTiers: Record = {
{ item: "stoner_63", weight: 0.08 },
{ item: "tango_51", weight: 0.08 },
{ item: "g19", weight: 0.08 }
+ ],
+ rare_world_skins: [
+ { item: "field_gray", weight: 1}
]
};