From d4de0f40e3baed39af88f4c29be286aeae1f2209 Mon Sep 17 00:00:00 2001 From: Error430 Date: Fri, 21 Jun 2024 18:31:03 -0400 Subject: [PATCH 01/12] feat: remove watermelon skin (does not fit skin requirements) --- .../public/img/game/skins/watermelon_base.svg | 189 ------------------ .../public/img/game/skins/watermelon_fist.svg | 1 - common/src/definitions/skins.ts | 3 +- 3 files changed, 1 insertion(+), 192 deletions(-) delete mode 100644 client/public/img/game/skins/watermelon_base.svg delete mode 100644 client/public/img/game/skins/watermelon_fist.svg 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/skins.ts b/common/src/definitions/skins.ts index 3947b27d2..d31d91f89 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], From a4e9cc65cbe3bc4b898f668d1fb197aca034a3eb Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:43:54 -0400 Subject: [PATCH 02/12] Add new skin images --- .../img/game/skins/aegis_jumpsuit_base.svg | 47 +++++++ .../img/game/skins/aegis_jumpsuit_fist.svg | 44 ++++++ .../img/game/skins/battle_dress_base.svg | 80 +++++++++++ .../img/game/skins/battle_dress_fist.svg | 44 ++++++ .../public/img/game/skins/field_gray_base.svg | 47 +++++++ .../public/img/game/skins/field_gray_fist.svg | 47 +++++++ .../game/skins/hazardous_materials_base.svg | 64 +++++++++ .../game/skins/hazardous_materials_fist.svg | 44 ++++++ .../img/game/skins/heavy_cargo_base.svg | 64 +++++++++ .../img/game/skins/heavy_cargo_fist.svg | 47 +++++++ .../img/game/skins/lily_lurker_base.svg | 133 ++++++++++++++++++ .../img/game/skins/lily_lurker_fist.svg | 44 ++++++ .../img/game/skins/oil_dweller_base.svg | 47 +++++++ .../img/game/skins/oil_dweller_fist.svg | 47 +++++++ .../img/game/skins/the_arrowhead_base.svg | 47 +++++++ .../img/game/skins/the_arrowhead_fist.svg | 47 +++++++ 16 files changed, 893 insertions(+) create mode 100644 client/public/img/game/skins/aegis_jumpsuit_base.svg create mode 100644 client/public/img/game/skins/aegis_jumpsuit_fist.svg create mode 100644 client/public/img/game/skins/battle_dress_base.svg create mode 100644 client/public/img/game/skins/battle_dress_fist.svg create mode 100644 client/public/img/game/skins/field_gray_base.svg create mode 100644 client/public/img/game/skins/field_gray_fist.svg create mode 100644 client/public/img/game/skins/hazardous_materials_base.svg create mode 100644 client/public/img/game/skins/hazardous_materials_fist.svg create mode 100644 client/public/img/game/skins/heavy_cargo_base.svg create mode 100644 client/public/img/game/skins/heavy_cargo_fist.svg create mode 100644 client/public/img/game/skins/lily_lurker_base.svg create mode 100644 client/public/img/game/skins/lily_lurker_fist.svg create mode 100644 client/public/img/game/skins/oil_dweller_base.svg create mode 100644 client/public/img/game/skins/oil_dweller_fist.svg create mode 100644 client/public/img/game/skins/the_arrowhead_base.svg create mode 100644 client/public/img/game/skins/the_arrowhead_fist.svg 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/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 @@ + + + + From a7ec83057b5851b302e7c8ede6ccac076422a418 Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:46:10 -0400 Subject: [PATCH 03/12] Update skins.ts --- common/src/definitions/skins.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common/src/definitions/skins.ts b/common/src/definitions/skins.ts index d31d91f89..824d6d48e 100644 --- a/common/src/definitions/skins.ts +++ b/common/src/definitions/skins.ts @@ -120,7 +120,15 @@ 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", 0xe1d248], + ["Field Gray", 0x6d5038], + ["Heavy Cargo", 0x32354d], + ["AEGIS Jumpsuit", 0x4984aa], + ["Oil Dweller", 0x6e2f2b] ] satisfies ReadonlyArray).map(([name, tint]) => simple("hidden_skin", [], [name, tint])), apply( "hidden_skin", From 8b40f81372c3fb1c285f1d40286ec2b3d0a1eb19 Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:52:14 -0400 Subject: [PATCH 04/12] Update lootTables.ts --- server/src/data/lootTables.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts index 7b8c61df4..4f06e99fd 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, count: 1 } ] }, 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, count: 1 } ] }, 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 } ] ] }, @@ -784,5 +793,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} ] }; From 8c60f1a2de43d7bafee6a2cc4218bf324136b3fd Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:54:29 -0400 Subject: [PATCH 05/12] Add new floor loot tables --- server/src/data/lootTables.ts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts index 4f06e99fd..e0a8cc6c5 100644 --- a/server/src/data/lootTables.ts +++ b/server/src/data/lootTables.ts @@ -559,6 +559,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 } + ] } }; From 3c6c3e4135d15aa3f1976c439163f7e65f382fcb Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 16:59:24 -0400 Subject: [PATCH 06/12] Update buildings.ts --- common/src/definitions/buildings.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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) } ] }, { From e99c9353d6406849cd487f3a7316a9016ac5d45b Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 17:05:22 -0400 Subject: [PATCH 07/12] fix this --- server/src/data/lootTables.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts index e0a8cc6c5..23244f5dd 100644 --- a/server/src/data/lootTables.ts +++ b/server/src/data/lootTables.ts @@ -43,7 +43,7 @@ export const LootTables: Record = { // { tier: "winter_skins", weight: 0.4 }, // winter mode { tier: "throwables", weight: 0.3 }, { tier: "melee", weight: 0.04 }, - { tier: "rare_world_skins", weight: 0,04} + { tier: "rare_world_skins", weight: 0.04} ] }, hazel_crate: { From f4bc359e2ad6822c227cc9124aed4b7d57e12b4e Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:15:16 -0400 Subject: [PATCH 08/12] this looks better --- common/src/definitions/skins.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/definitions/skins.ts b/common/src/definitions/skins.ts index 824d6d48e..59698b991 100644 --- a/common/src/definitions/skins.ts +++ b/common/src/definitions/skins.ts @@ -124,7 +124,7 @@ export const Skins = ObjectDefinitions.create()( ["Battle Dress", 0x676f4f], ["The Arrowhead", 0x4a4a4a], ["Lily Lurker", 0x5b6642], - ["Hazardous Materials", 0xe1d248], + ["Hazardous Materials", 0x4a4a4a], ["Field Gray", 0x6d5038], ["Heavy Cargo", 0x32354d], ["AEGIS Jumpsuit", 0x4984aa], From 9d0a4d4bed671ff7887f8e48c9c4172e50e2a9ac Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sat, 22 Jun 2024 20:10:45 -0400 Subject: [PATCH 09/12] remove useless stuff --- server/src/data/lootTables.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts index 23244f5dd..ea62054dd 100644 --- a/server/src/data/lootTables.ts +++ b/server/src/data/lootTables.ts @@ -110,7 +110,7 @@ export const LootTables: Record = { { tier: "special_healing_items", weight: 0.15 }, { tier: "special_equipment", weight: 0.65 }, { tier: "special_scopes", weight: 0.3 }, - { item: "aegis_jumpsuit", weight: 0.08, count: 1 } + { item: "aegis_jumpsuit", weight: 0.08 } ] }, flint_crate: { @@ -121,7 +121,7 @@ export const LootTables: Record = { { tier: "special_equipment", weight: 0.65 }, { tier: "special_healing_items", weight: 0.15 }, { tier: "special_scopes", weight: 0.3 }, - { item: "the_arrowhead", weight: 0.08, count: 1 } + { item: "the_arrowhead", weight: 0.08, } ] }, grenade_box: { From 76edab106526669bd24c5e46b034d105463da481 Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:37:09 -0400 Subject: [PATCH 10/12] Add files via upload --- .../img/game/skins/tattered_rags_base.svg | 58 +++++++++++++++++++ .../img/game/skins/tattered_rags_fist.svg | 44 ++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 client/public/img/game/skins/tattered_rags_base.svg create mode 100644 client/public/img/game/skins/tattered_rags_fist.svg 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 @@ + + + + From 84f175db92b0208ef081060206ea91397a12b281 Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:39:10 -0400 Subject: [PATCH 11/12] Update washing machine loot --- server/src/data/lootTables.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/data/lootTables.ts b/server/src/data/lootTables.ts index ea62054dd..e716d5c5c 100644 --- a/server/src/data/lootTables.ts +++ b/server/src/data/lootTables.ts @@ -306,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 } From 6f11dff9c32deb9b1638d03e41cb4915186e8aae Mon Sep 17 00:00:00 2001 From: Lemonfood <34180040+Lemonfood@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:55:35 -0400 Subject: [PATCH 12/12] Update skins.ts --- common/src/definitions/skins.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/definitions/skins.ts b/common/src/definitions/skins.ts index 59698b991..6c89ac60c 100644 --- a/common/src/definitions/skins.ts +++ b/common/src/definitions/skins.ts @@ -128,7 +128,8 @@ export const Skins = ObjectDefinitions.create()( ["Field Gray", 0x6d5038], ["Heavy Cargo", 0x32354d], ["AEGIS Jumpsuit", 0x4984aa], - ["Oil Dweller", 0x6e2f2b] + ["Oil Dweller", 0x6e2f2b], + ["Tattered Rags", 0x6e4627] ] satisfies ReadonlyArray).map(([name, tint]) => simple("hidden_skin", [], [name, tint])), apply( "hidden_skin",