diff --git a/art/25gal.svg b/art/25gal.svg
new file mode 100644
index 0000000..16dac52
--- /dev/null
+++ b/art/25gal.svg
@@ -0,0 +1,268 @@
+
+
+
+
diff --git a/art/52gal.svg b/art/52gal.svg
new file mode 100644
index 0000000..9f2aba9
--- /dev/null
+++ b/art/52gal.svg
@@ -0,0 +1,420 @@
+
+
+
+
diff --git a/core/shared/src/main/scala/net/bulbyvr/splooge/core/Weapon.scala b/core/shared/src/main/scala/net/bulbyvr/splooge/core/Weapon.scala
index 58b8268..835b5ff 100644
--- a/core/shared/src/main/scala/net/bulbyvr/splooge/core/Weapon.scala
+++ b/core/shared/src/main/scala/net/bulbyvr/splooge/core/Weapon.scala
@@ -128,6 +128,7 @@ object Mains {
Default ++= AllGames
Named("Deco") ++= OldGames
Named("Kensa") += Splatoon2
+ Named("Wicked") += S3Custom
},
new MainBuilder(".96 Gal", Shooter) {
Default ++= AllGames
@@ -150,6 +151,7 @@ object Mains {
},
new MainBuilder("Big Swig", Roller) {
Default += Splatoon3
+ Named("Express") += Splatoon3
Named("Pear") += S3Custom
},
new MainBuilder("Blaster", Blaster) {
@@ -177,7 +179,7 @@ object Mains {
},
new MainBuilder("Dualie Squelchers", Dualies) {
Default ++= NewGames
- Named("Custom") += Splatoon2
+ Named("Custom") ++= NewGames
},
new MainBuilder("Dual Squelcher", Shooter) {
Default += Splatoon1
@@ -219,12 +221,12 @@ object Mains {
},
new MainBuilder("H-3 Nozzlenose", Shooter) {
Default ++= AllGames
- Named("D") ++= OldGames
+ Named("D") ++= AllGames
Named("Sheldon's Picks") ++= OldGames
},
new MainBuilder("Heavy Splatling", Splatling) {
Default ++= AllGames
- Named("Deco") ++= OldGames
+ Named("Deco") ++= AllGames
Named("Sheldon's Picks") ++= OldGames
add(heroWeapon)
},
@@ -279,6 +281,9 @@ object Mains {
Named("Kensa") += Splatoon2
add(heroWeapon)
},
+ new MainBuilder("Painbrush", Brush) {
+ Default += Splatoon3
+ },
new MainBuilder("Range Blaster", Blaster) {
Default ++= AllGames
Named("Custom") ++= OldGames
@@ -295,13 +300,16 @@ object Mains {
new MainBuilder("Rapid Blaster Pro", Blaster) {
Default ++= AllGames
- Named("Deco") ++= OldGames
+ Named("Deco") ++= AllGames
Named("Wicked") += S3Custom
},
new MainBuilder("REEF-LUX 450", Bow) {
Default += Splatoon3
Named("Gold") += S3Custom
},
+ new MainBuilder("S-BLAST", Blaster) {
+ Default += Splatoon3
+ },
new MainBuilder("Slosher", Slosher) {
Default ++= AllGames
Named("Deco") ++= AllGames
@@ -324,6 +332,7 @@ object Mains {
// 3.0.0 updated the sploosh & splash icons
Named("Base") += Splatoon3
Named("Neo") ++= AllGames
+ Named("Copper") += S3Custom
},
new MainBuilder("Splat Brella", Brella) {
Default ++= NewGames
@@ -361,7 +370,10 @@ object Mains {
Default += Splatoon3
Named("Grizzco") += Splatoon3
},
- Simple3Weapon("Splatana Wiper", Splatana),
+ new MainBuilder("Splatana Wiper", Splatana) {
+ Default += Splatoon3
+ Named("Deco") += Splatoon3
+ },
new MainBuilder("Splatterscope", Charger) {
splatchargerShared(this)
},
@@ -387,6 +399,7 @@ object Mains {
},
new MainBuilder("Splattershot Nova", Shooter) {
Default += Splatoon3
+ Named("Annaki") += Splatoon3
Named("Tentatek") += S3Custom
Named("Pastel") += S3Custom
},
@@ -414,12 +427,12 @@ object Mains {
},
new MainBuilder("Tenta Brella", Brella) {
Default ++= NewGames
- Named("Sorella") += Splatoon2
+ Named("Sorella") ++= NewGames
Named("Sheldon's Picks") += Splatoon2
},
new MainBuilder("Tetra Dualies", Dualies) {
Default ++= NewGames
- Named("Tentatek") += Splatoon2
+ Named("Tentatek") ++= NewGames
},
new MainBuilder("Tri-Slosher", Slosher) {
Default ++= AllGames
@@ -579,6 +592,7 @@ object Brands {
"Emberz",
"Enperry",
"Enperry Crown",
+ "Express",
"Fishfry Red",
"Fishfry Yellow",
"Foil",
diff --git a/resources/brands/express.png b/resources/brands/express.png
new file mode 100644
index 0000000..ad30d50
Binary files /dev/null and b/resources/brands/express.png differ
diff --git a/resources/weapons/s3_annaki_splattershot_nova.png b/resources/weapons/s3_annaki_splattershot_nova.png
new file mode 100644
index 0000000..fcaa7cc
Binary files /dev/null and b/resources/weapons/s3_annaki_splattershot_nova.png differ
diff --git a/resources/weapons/s3_annaki_splattershot_nova_2d.png b/resources/weapons/s3_annaki_splattershot_nova_2d.png
new file mode 100644
index 0000000..8b280da
Binary files /dev/null and b/resources/weapons/s3_annaki_splattershot_nova_2d.png differ
diff --git a/resources/weapons/s3_custom_dualie_squelchers.png b/resources/weapons/s3_custom_dualie_squelchers.png
new file mode 100644
index 0000000..9eb1682
Binary files /dev/null and b/resources/weapons/s3_custom_dualie_squelchers.png differ
diff --git a/resources/weapons/s3_custom_dualie_squelchers_2d.png b/resources/weapons/s3_custom_dualie_squelchers_2d.png
new file mode 100644
index 0000000..cf0b904
Binary files /dev/null and b/resources/weapons/s3_custom_dualie_squelchers_2d.png differ
diff --git a/resources/weapons/s3_d_h-3_nozzlenose.png b/resources/weapons/s3_d_h-3_nozzlenose.png
new file mode 100644
index 0000000..27101c0
Binary files /dev/null and b/resources/weapons/s3_d_h-3_nozzlenose.png differ
diff --git a/resources/weapons/s3_d_h-3_nozzlenose_2d.png b/resources/weapons/s3_d_h-3_nozzlenose_2d.png
new file mode 100644
index 0000000..243737d
Binary files /dev/null and b/resources/weapons/s3_d_h-3_nozzlenose_2d.png differ
diff --git a/resources/weapons/s3_deco_heavy_splatling.png b/resources/weapons/s3_deco_heavy_splatling.png
new file mode 100644
index 0000000..dec1f87
Binary files /dev/null and b/resources/weapons/s3_deco_heavy_splatling.png differ
diff --git a/resources/weapons/s3_deco_heavy_splatling_2d.png b/resources/weapons/s3_deco_heavy_splatling_2d.png
new file mode 100644
index 0000000..a4f83c7
Binary files /dev/null and b/resources/weapons/s3_deco_heavy_splatling_2d.png differ
diff --git a/resources/weapons/s3_deco_rapid_blaster_pro.png b/resources/weapons/s3_deco_rapid_blaster_pro.png
new file mode 100644
index 0000000..256209f
Binary files /dev/null and b/resources/weapons/s3_deco_rapid_blaster_pro.png differ
diff --git a/resources/weapons/s3_deco_rapid_blaster_pro_2d.png b/resources/weapons/s3_deco_rapid_blaster_pro_2d.png
new file mode 100644
index 0000000..6dbd660
Binary files /dev/null and b/resources/weapons/s3_deco_rapid_blaster_pro_2d.png differ
diff --git a/resources/weapons/s3_deco_splatana_wiper.png b/resources/weapons/s3_deco_splatana_wiper.png
new file mode 100644
index 0000000..f52c20f
Binary files /dev/null and b/resources/weapons/s3_deco_splatana_wiper.png differ
diff --git a/resources/weapons/s3_deco_splatana_wiper_2d.png b/resources/weapons/s3_deco_splatana_wiper_2d.png
new file mode 100644
index 0000000..0c7a8a4
Binary files /dev/null and b/resources/weapons/s3_deco_splatana_wiper_2d.png differ
diff --git a/resources/weapons/s3_express_big_swig.png b/resources/weapons/s3_express_big_swig.png
new file mode 100644
index 0000000..8ab228f
Binary files /dev/null and b/resources/weapons/s3_express_big_swig.png differ
diff --git a/resources/weapons/s3_express_big_swig_2d.png b/resources/weapons/s3_express_big_swig_2d.png
new file mode 100644
index 0000000..321ff53
Binary files /dev/null and b/resources/weapons/s3_express_big_swig_2d.png differ
diff --git a/resources/weapons/s3_painbrush.png b/resources/weapons/s3_painbrush.png
new file mode 100644
index 0000000..581188a
Binary files /dev/null and b/resources/weapons/s3_painbrush.png differ
diff --git a/resources/weapons/s3_painbrush_2d.png b/resources/weapons/s3_painbrush_2d.png
new file mode 100644
index 0000000..9f9553d
Binary files /dev/null and b/resources/weapons/s3_painbrush_2d.png differ
diff --git a/resources/weapons/s3_s-blast.png b/resources/weapons/s3_s-blast.png
new file mode 100644
index 0000000..3563dd9
Binary files /dev/null and b/resources/weapons/s3_s-blast.png differ
diff --git a/resources/weapons/s3_s-blast_2d.png b/resources/weapons/s3_s-blast_2d.png
new file mode 100644
index 0000000..9105132
Binary files /dev/null and b/resources/weapons/s3_s-blast_2d.png differ
diff --git a/resources/weapons/s3_sorella_tenta_brella.png b/resources/weapons/s3_sorella_tenta_brella.png
new file mode 100644
index 0000000..ea87b95
Binary files /dev/null and b/resources/weapons/s3_sorella_tenta_brella.png differ
diff --git a/resources/weapons/s3_sorella_tenta_brella_2d.png b/resources/weapons/s3_sorella_tenta_brella_2d.png
new file mode 100644
index 0000000..f941a07
Binary files /dev/null and b/resources/weapons/s3_sorella_tenta_brella_2d.png differ
diff --git a/resources/weapons/s3_tentatek_tetra_dualies.png b/resources/weapons/s3_tentatek_tetra_dualies.png
new file mode 100644
index 0000000..d6f30ae
Binary files /dev/null and b/resources/weapons/s3_tentatek_tetra_dualies.png differ
diff --git a/resources/weapons/s3_tentatek_tetra_dualies_2d.png b/resources/weapons/s3_tentatek_tetra_dualies_2d.png
new file mode 100644
index 0000000..a19ed67
Binary files /dev/null and b/resources/weapons/s3_tentatek_tetra_dualies_2d.png differ
diff --git a/svgweapons/weapons/s3custom_copper_splash-o-matic_2d.svg b/svgweapons/weapons/s3custom_copper_splash-o-matic_2d.svg
new file mode 100644
index 0000000..9eb518d
--- /dev/null
+++ b/svgweapons/weapons/s3custom_copper_splash-o-matic_2d.svg
@@ -0,0 +1,490 @@
+
+
+
+
diff --git a/svgweapons/weapons/s3custom_wicked__52_gal_2d.svg b/svgweapons/weapons/s3custom_wicked__52_gal_2d.svg
new file mode 100644
index 0000000..91bd7c9
--- /dev/null
+++ b/svgweapons/weapons/s3custom_wicked__52_gal_2d.svg
@@ -0,0 +1,385 @@
+
+
+
+