Skip to content

Commit

Permalink
Update Sound and Halo
Browse files Browse the repository at this point in the history
- Swap halo from tecta to collaris (requested by rosnok)
- UI Sounds
- Collaris Voiceline (Arisu)
  • Loading branch information
WilloIzCitron committed May 15, 2024
1 parent e243144 commit 8989ec4
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion assets/bundles/bundle_id_ID.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion assets/bundles/bundle_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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.
Binary file modified assets/sprites/units/collaris-halo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/units/tecta-halo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/bluearchive/units/UnitHalo.java
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ public static void init(){
}}
);

//arisu
//kether
UnitTypes.tecta.parts.addAll(
new RegionPart(){{
name = "bluearchive-tecta";
Expand All @@ -1090,7 +1090,7 @@ public static void init(){
}}
);

//kether
//arisu
UnitTypes.collaris.parts.addAll(
new RegionPart(){{
name = "bluearchive-collaris";
Expand Down
18 changes: 9 additions & 9 deletions src/bluearchive/units/UnitSound.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@ public class UnitSound {
public static Seq<Sound> 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();
});
}
}
});
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!");
}
Expand Down

0 comments on commit 8989ec4

Please sign in to comment.