From f00a89453826bbd94478ac0c997d5d66c8b8866f Mon Sep 17 00:00:00 2001 From: "WilloIzCitron(AetherLumine)" <49786146+WilloIzCitron@users.noreply.github.com> Date: Thu, 16 May 2024 06:05:36 +0700 Subject: [PATCH] Update Sound and Halo - Swap halo from tecta to collaris (requested by rosnok) - UI Sounds --- assets/bundles/bundle.properties | 2 +- assets/bundles/bundle_id_ID.properties | 2 +- assets/bundles/bundle_it.properties | 2 +- ...cta-arrival1.ogg => collaris-arrival1.ogg} | Bin ...cta-arrival2.ogg => collaris-arrival2.ogg} | Bin .../{tecta-death.ogg => collaris-death.ogg} | Bin .../{tecta-hit1.ogg => collaris-hit1.ogg} | Bin .../{tecta-hit2.ogg => collaris-hit2.ogg} | Bin .../{tecta-hit3.ogg => collaris-hit3.ogg} | Bin .../{tecta-pickup.ogg => collaris-pickup.ogg} | Bin assets/sprites/units/collaris-halo.png | Bin 418 -> 325 bytes assets/sprites/units/tecta-halo.png | Bin 325 -> 418 bytes src/bluearchive/units/UnitHalo.java | 4 ++-- src/bluearchive/units/UnitSound.java | 18 +++++++++--------- 14 files changed, 14 insertions(+), 14 deletions(-) rename assets/sounds/units/{tecta-arrival1.ogg => collaris-arrival1.ogg} (100%) rename assets/sounds/units/{tecta-arrival2.ogg => collaris-arrival2.ogg} (100%) rename assets/sounds/units/{tecta-death.ogg => collaris-death.ogg} (100%) rename assets/sounds/units/{tecta-hit1.ogg => collaris-hit1.ogg} (100%) rename assets/sounds/units/{tecta-hit2.ogg => collaris-hit2.ogg} (100%) rename assets/sounds/units/{tecta-hit3.ogg => collaris-hit3.ogg} (100%) rename assets/sounds/units/{tecta-pickup.ogg => collaris-pickup.ogg} (100%) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 2079ae0..e67ac5a 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -23,7 +23,7 @@ ba-l2d1.name = Otose Kotama ba-l2d2.name = Ushio Noa -unit.tecta.details = "\*Fanfare\* Alice joined the party."\nTendou Arisu, the girl who has hijacked the Tecta's system.\nidk why?\nthere something strange? +unit.collaris.details = "\*Fanfare\* Alice joined the party."\nTendou Arisu, the girl who has hijacked the Collaris' system.\nidk why?\nthere something strange? setting.gameOver.name = Game Over (Win & Lose) diff --git a/assets/bundles/bundle_id_ID.properties b/assets/bundles/bundle_id_ID.properties index 6b6a5b7..20d6c65 100644 --- a/assets/bundles/bundle_id_ID.properties +++ b/assets/bundles/bundle_id_ID.properties @@ -21,7 +21,7 @@ setting.setL2D.name = Recollection Lobby ba-l2d1.name = Otose Kotama ba-l2d2.name = Ushio Noa -unit.tecta.details = "\*Panpakapan!\* Alice telah bergabung dalam timmu."\nTendou Arisu, gadis yang telah mengambil alih sistem Tecta.\nSaya tidak tahu kenapa?\nAda sesuatu yang aneh?? +unit.collaris.details = "\*Panpakapan!\* Alice telah bergabung dalam timmu."\nTendou Arisu, gadis yang telah mengambil alih sistem Collaris.\nSaya tidak tahu kenapa?\nAda sesuatu yang aneh?? setting.gameOver.name = Permainan Berakhir (Menang & Kalah) setting.research.name = Penelitian diff --git a/assets/bundles/bundle_it.properties b/assets/bundles/bundle_it.properties index 3282f5b..f19a5d1 100644 --- a/assets/bundles/bundle_it.properties +++ b/assets/bundles/bundle_it.properties @@ -24,7 +24,7 @@ ba-l2d1.name = Otose Kotama ba-l2d2.name = Ushio Noa -unit.tecta.details = «Alice "Fanfara" si è unita alla tua squadra.»\nTendou Arisu, la ragazza che ha sabotato il sistema del Tecta.\nil perché non lo so\nc'è qualcosa di strano? +unit.collaris.details = «Alice "Fanfara" si è unita alla tua squadra.»\nTendou Arisu, la ragazza che ha sabotato il sistema del Collaris.\nil perché non lo so\nc'è qualcosa di strano? setting.gameOver.name = Fine Partita diff --git a/assets/sounds/units/tecta-arrival1.ogg b/assets/sounds/units/collaris-arrival1.ogg similarity index 100% rename from assets/sounds/units/tecta-arrival1.ogg rename to assets/sounds/units/collaris-arrival1.ogg diff --git a/assets/sounds/units/tecta-arrival2.ogg b/assets/sounds/units/collaris-arrival2.ogg similarity index 100% rename from assets/sounds/units/tecta-arrival2.ogg rename to assets/sounds/units/collaris-arrival2.ogg diff --git a/assets/sounds/units/tecta-death.ogg b/assets/sounds/units/collaris-death.ogg similarity index 100% rename from assets/sounds/units/tecta-death.ogg rename to assets/sounds/units/collaris-death.ogg diff --git a/assets/sounds/units/tecta-hit1.ogg b/assets/sounds/units/collaris-hit1.ogg similarity index 100% rename from assets/sounds/units/tecta-hit1.ogg rename to assets/sounds/units/collaris-hit1.ogg diff --git a/assets/sounds/units/tecta-hit2.ogg b/assets/sounds/units/collaris-hit2.ogg similarity index 100% rename from assets/sounds/units/tecta-hit2.ogg rename to assets/sounds/units/collaris-hit2.ogg diff --git a/assets/sounds/units/tecta-hit3.ogg b/assets/sounds/units/collaris-hit3.ogg similarity index 100% rename from assets/sounds/units/tecta-hit3.ogg rename to assets/sounds/units/collaris-hit3.ogg diff --git a/assets/sounds/units/tecta-pickup.ogg b/assets/sounds/units/collaris-pickup.ogg similarity index 100% rename from assets/sounds/units/tecta-pickup.ogg rename to assets/sounds/units/collaris-pickup.ogg diff --git a/assets/sprites/units/collaris-halo.png b/assets/sprites/units/collaris-halo.png index 98b0a25587b5750a16f2541ea70529ba4dd289c2..1abb798c84fb24ebe04bdfcf49f4a61a7a45c42a 100644 GIT binary patch delta 286 zcmZ3)e3WT|K|RBNPZ!6KiaBp*9pqzD6mS-Q{QtjEoH<)bgoM|n?|sJ-F6XkFRm3tp z@X4%=$X>gYo(c ze3vjucBkdWONwsvZ`jLtod4jP%MZ+$=Y1(peO~Q$EBwGchLb$?FOGh+{R%p2LW-0V7vNfJ_Y7ck1vAwp00i_>zopr0EK0I`Tzg` delta 379 zcmV->0fhd=0-^(uFndwh-$2_Oyx4uP zl_Ch#s3@Y=TC*HqYlYPIK#-gadI4Y-xZ`dKRLkE%-vRUjJZBEFCipM>Yjq@7De3?T zFlB)r(P_PVeXE7&JAhsQvjuiBYSHU^^n^$qfF``|u%^O?Kz{;c7m$sR3>YQ-tj~AP zw}8F_=miKL23Oj)KgV-<{0$!h^kk9a^0yz=T5BlIo<|m#ImmivJnv*Q_i_g8*u_gA z56eQ<0+vEiIrQcjk%tiiH$`V^pbtR_kX=AFh9T$~R;#{7)BqU;ENPD38Cn)#r%_q7KfDF=;KrevV0=x6{6Ly7r(02g60D55}gY+cO3!vBL5F{sqUI0NL Z#|sG?pv*QrDeeFO002ovPDHLkV1n80ry>9V diff --git a/assets/sprites/units/tecta-halo.png b/assets/sprites/units/tecta-halo.png index 1abb798c84fb24ebe04bdfcf49f4a61a7a45c42a..98b0a25587b5750a16f2541ea70529ba4dd289c2 100644 GIT binary patch delta 379 zcmV->0fhd=0-^(uFndwh-$2_Oyx4uP zl_Ch#s3@Y=TC*HqYlYPIK#-gadI4Y-xZ`dKRLkE%-vRUjJZBEFCipM>Yjq@7De3?T zFlB)r(P_PVeXE7&JAhsQvjuiBYSHU^^n^$qfF``|u%^O?Kz{;c7m$sR3>YQ-tj~AP zw}8F_=miKL23Oj)KgV-<{0$!h^kk9a^0yz=T5BlIo<|m#ImmivJnv*Q_i_g8*u_gA z56eQ<0+vEiIrQcjk%tiiH$`V^pbtR_kX=AFh9T$~R;#{7)BqU;ENPD38Cn)#r%_q7KfDF=;KrevV0=x6{6Ly7r(02g60D55}gY+cO3!vBL5F{sqUI0NL Z#|sG?pv*QrDeeFO002ovPDHLkV1n80ry>9V delta 286 zcmZ3)e3WT|K|RBNPZ!6KiaBp*9pqzD6mS-Q{QtjEoH<)bgoM|n?|sJ-F6XkFRm3tp z@X4%=$X>gYo(c ze3vjucBkdWONwsvZ`jLtod4jP%MZ+$=Y1(peO~Q$EBwGchLb$?FOGh+{R%p2LW-0V7vNfJ_Y7ck1vAwp00i_>zopr0EK0I`Tzg` diff --git a/src/bluearchive/units/UnitHalo.java b/src/bluearchive/units/UnitHalo.java index 3b3daca..0be007e 100644 --- a/src/bluearchive/units/UnitHalo.java +++ b/src/bluearchive/units/UnitHalo.java @@ -1073,7 +1073,7 @@ public static void init(){ }} ); - //arisu + //kether UnitTypes.tecta.parts.addAll( new RegionPart(){{ name = "bluearchive-tecta"; @@ -1090,7 +1090,7 @@ public static void init(){ }} ); - //kether + //arisu UnitTypes.collaris.parts.addAll( new RegionPart(){{ name = "bluearchive-collaris"; diff --git a/src/bluearchive/units/UnitSound.java b/src/bluearchive/units/UnitSound.java index 6dbd603..57ca08b 100644 --- a/src/bluearchive/units/UnitSound.java +++ b/src/bluearchive/units/UnitSound.java @@ -18,23 +18,23 @@ public class UnitSound { public static Seq hitSound = Seq.with(); static Interval hitInterval = new Interval(5); public static void init() { - // tecta atlas start + // collaris atlas start Events.on(PayloadDropEvent.class, e -> { - if (e.unit.type == Vars.content.unit("tecta")) { - arrivalSound = Seq.with(new Sound(Vars.tree.get("sounds/units/tecta-arrival1.ogg")), new Sound(Vars.tree.get("sounds/units/tecta-arrival2.ogg"))); + if (e.unit.type == Vars.content.unit("collaris")) { + arrivalSound = Seq.with(new Sound(Vars.tree.get("sounds/units/collaris-arrival1.ogg")), new Sound(Vars.tree.get("sounds/units/collaris-arrival2.ogg"))); arrivalSound.random().play(); } }); Events.on(PickupEvent.class, e -> { - if (e.unit.type == Vars.content.unit("tecta")) { - Sound pickedSound = new Sound(Vars.tree.get("sounds/units/tecta-pickup.ogg")); + if (e.unit.type == Vars.content.unit("collaris")) { + Sound pickedSound = new Sound(Vars.tree.get("sounds/units/collaris-pickup.ogg")); pickedSound.play(); } }); Events.on(UnitDamageEvent.class, e -> { /* Check if the unit is same as intended, hit sound was being interval */ - if (e.unit.type == Vars.content.unit("tecta") && hitInterval.get(300)) { - hitSound = Seq.with(new Sound(Vars.tree.get("sounds/units/tecta-hit1.ogg")), new Sound(Vars.tree.get("sounds/units/tecta-hit2.ogg")), new Sound(Vars.tree.get("sounds/units/tecta-hit3.ogg"))); + if (e.unit.type == Vars.content.unit("collaris") && hitInterval.get(300)) { + hitSound = Seq.with(new Sound(Vars.tree.get("sounds/units/collaris-hit1.ogg")), new Sound(Vars.tree.get("sounds/units/collaris-hit2.ogg")), new Sound(Vars.tree.get("sounds/units/collaris-hit3.ogg"))); if (!e.unit.dead) { Time.run(0f, () -> { hitSound.random().play(); @@ -42,8 +42,8 @@ public static void init() { } } }); - UnitTypes.tecta.deathSound = new Sound(Vars.tree.get("sounds/units/tecta-death.ogg")); - // tecta atlas end + UnitTypes.collaris.deathSound = new Sound(Vars.tree.get("sounds/units/collaris-death.ogg")); + // collaris atlas end Log.infoTag("ArchiveDustry", "Unit Sounds Loaded!"); }