From 6d941a38411740e4854eaf4745da2c24c3f17b64 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 6 Feb 2024 14:12:04 +0900 Subject: [PATCH] music by orstphone --- .../basegame/audio/music/discs/3_over_4.ogg | 3 + .../basegame/audio/music/discs/_musicdb.json | 18 ++++++ .../audio/music/discs/cyllindrical.ogg | 3 + .../mods/basegame/audio/music/discs/fog.ogg | 3 + .../basegame/audio/music/discs/geometry.ogg | 3 + .../basegame/audio/music/discs/hangdrum.ogg | 3 + .../mods/basegame/audio/music/discs/hdma.ogg | 3 + .../audio/music/discs/lucid_dream.ogg | 3 + .../basegame/audio/music/discs/railway.ogg | 3 + .../basegame/audio/music/discs/welded.ogg | 3 + assets/mods/basegame/items/itemid.csv | 3 + src/net/torvald/terrarum/CreditSingleton.kt | 64 ++++++++++++------- .../modulebasegame/gameitems/ItemFileRef.kt | 2 +- .../modulebasegame/gameitems/MusicDisc.kt | 3 + 14 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 assets/mods/basegame/audio/music/discs/3_over_4.ogg create mode 100644 assets/mods/basegame/audio/music/discs/_musicdb.json create mode 100644 assets/mods/basegame/audio/music/discs/cyllindrical.ogg create mode 100644 assets/mods/basegame/audio/music/discs/fog.ogg create mode 100644 assets/mods/basegame/audio/music/discs/geometry.ogg create mode 100644 assets/mods/basegame/audio/music/discs/hangdrum.ogg create mode 100644 assets/mods/basegame/audio/music/discs/hdma.ogg create mode 100644 assets/mods/basegame/audio/music/discs/lucid_dream.ogg create mode 100644 assets/mods/basegame/audio/music/discs/railway.ogg create mode 100644 assets/mods/basegame/audio/music/discs/welded.ogg diff --git a/assets/mods/basegame/audio/music/discs/3_over_4.ogg b/assets/mods/basegame/audio/music/discs/3_over_4.ogg new file mode 100644 index 000000000..9534383cc --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/3_over_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aba50d4f676078c7af2751303fa28b14bf8b944fe8f223d5a6ff6297d6435e0 +size 4401979 diff --git a/assets/mods/basegame/audio/music/discs/_musicdb.json b/assets/mods/basegame/audio/music/discs/_musicdb.json new file mode 100644 index 000000000..288c63e60 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/_musicdb.json @@ -0,0 +1,18 @@ +{ + "01 Thousands of Shards.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Thousands of Shards"}, + "02 Glitter.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Glitter"}, + "03 Digital Foliage.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Digital Foliage"}, + "04 HDMA.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"HDMA"}, + "07 Plastic Pop.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Plastic Pop"}, + "08 Gateway 509.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Gateway 509"}, + + "3_over_4.ogg" : {"artist":"Orstphone","title":"3 Over 4","album":""}, + "fog.ogg" : {"artist":"Orstphone","title":"Fog","album":"Shattered Glass"}, + "geometry.ogg" : {"artist":"Orstphone","title":"Geometry","album":""}, + "hdma.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"HDMA"}, + "lucid_dream.ogg" : {"artist":"Orstphone","title":"Lucid Dream","album":""}, + "railway.ogg" : {"artist":"Orstphone","title":"Railway Autumn 2098","album":""}, + "cyllindrical.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Cyllindrical"}, + "welded.ogg" : {"album":"Thousands of Shards","artist":"Orstphone","title":"Welded"}, + "hangdrum.ogg" : {"album":"","artist":"Orstphone","title":"Hangdrum"} +} diff --git a/assets/mods/basegame/audio/music/discs/cyllindrical.ogg b/assets/mods/basegame/audio/music/discs/cyllindrical.ogg new file mode 100644 index 000000000..daac5e013 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/cyllindrical.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d4651976863c55fbc6c73ef74489dc078523470b8eafbae4b578e02a47cddc9 +size 7872502 diff --git a/assets/mods/basegame/audio/music/discs/fog.ogg b/assets/mods/basegame/audio/music/discs/fog.ogg new file mode 100644 index 000000000..b6032b2e2 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/fog.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f535e2c419b65910ec3a423a150f7ceaccc1030aa09497db7c713b6efecbb86 +size 8449235 diff --git a/assets/mods/basegame/audio/music/discs/geometry.ogg b/assets/mods/basegame/audio/music/discs/geometry.ogg new file mode 100644 index 000000000..0bb320f0f --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/geometry.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2631401947b2ede3b0cc6f31ceb944b4db6e1ab563ba4f36a5cd1548e0090f19 +size 6685680 diff --git a/assets/mods/basegame/audio/music/discs/hangdrum.ogg b/assets/mods/basegame/audio/music/discs/hangdrum.ogg new file mode 100644 index 000000000..e38c7ef22 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/hangdrum.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5568b6d4e57eef30df85618a5cdaa90f006dfe6273e540dc4080e09cb3c9b221 +size 5503286 diff --git a/assets/mods/basegame/audio/music/discs/hdma.ogg b/assets/mods/basegame/audio/music/discs/hdma.ogg new file mode 100644 index 000000000..1162109bb --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/hdma.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aad93f2812fcbc56907776473fd0889dd005fdc0d5e997c8723cfd25613af17b +size 7421236 diff --git a/assets/mods/basegame/audio/music/discs/lucid_dream.ogg b/assets/mods/basegame/audio/music/discs/lucid_dream.ogg new file mode 100644 index 000000000..bd62f8090 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/lucid_dream.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c390a002301e5e9a1d5280839e34feca8a7d2891b5af370bd33c342e869deece +size 6705289 diff --git a/assets/mods/basegame/audio/music/discs/railway.ogg b/assets/mods/basegame/audio/music/discs/railway.ogg new file mode 100644 index 000000000..4432b1ef8 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/railway.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13299a3f21c57301b6a6ca3d18839005d7cbac944fe0a4f3f20c5e766dde07c8 +size 2226648 diff --git a/assets/mods/basegame/audio/music/discs/welded.ogg b/assets/mods/basegame/audio/music/discs/welded.ogg new file mode 100644 index 000000000..e6ea3d293 --- /dev/null +++ b/assets/mods/basegame/audio/music/discs/welded.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58f290f545cb9e9fbbdac94e5869c54a92cd2d9de21cd6eccf58779c7b07da82 +size 7666261 diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv index 509d72b7f..56663956f 100644 --- a/assets/mods/basegame/items/itemid.csv +++ b/assets/mods/basegame/items/itemid.csv @@ -82,6 +82,9 @@ id;classname;tags 32772;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc04;MUSIC 32773;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc05;MUSIC 32774;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc06;MUSIC +32775;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc07;MUSIC +32776;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc08;MUSIC +32777;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc09;MUSIC # data storage (tapestries; 256) #33023;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry;FIXTURE diff --git a/src/net/torvald/terrarum/CreditSingleton.kt b/src/net/torvald/terrarum/CreditSingleton.kt index 698d521aa..fa4c1db0c 100644 --- a/src/net/torvald/terrarum/CreditSingleton.kt +++ b/src/net/torvald/terrarum/CreditSingleton.kt @@ -8,8 +8,8 @@ import net.torvald.unicode.ENDASH object CreditSingleton { val credit: List; get() = - ("Programming, Arts, Directed by CuriousTorvald (minjaesong)\n" + - "Sound Effects by FreeSound.org and Klankbeeld\n" + + ("Programming, Arts, Directed by CuriousTorvald\n" + + "Music by Orstphone\n" + "Translation Databases:\n" + "$ENDASH © 2018 The Polyglot Project. Distributed under CC0.\n" + "$ENDASH Entry from the Microsoft Language Portal. © 2018 Microsoft Corporation. All rights reserved.\n" + @@ -18,7 +18,7 @@ object CreditSingleton { $BULLET Terrarum -Copyright (C) 2013-2024 CuriousTorvald (minjaesong) +© 2013-2024 CuriousTorvald (minjaesong) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ along with this program. If not, see . $BULLET Terrarum Sans Bitmap -Copyright (c) 2017-2022 Minjae Song ("CuriousTorvald") and the contributors +© 2017-2024 Minjae Song ("CuriousTorvald") and the contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -61,7 +61,7 @@ THE SOFTWARE. $BULLET Joise -Copyright (C) 2013 Jason Taylor +© 2013 Jason Taylor Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ Accidental Noise Library Joise is a derivative work based on Josua Tippetts' C++ library: http://accidentalnoise.sourceforge.net/index.html -Copyright (C) 2011 Joshua Tippetts +© 2011 Joshua Tippetts This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -102,7 +102,7 @@ Copyright (C) 2011 Joshua Tippetts $BULLET Vector2.java, Epsilon.java -Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/ +© 2010-2015 William Bittle http://www.dyn4j.org/ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted @@ -131,7 +131,7 @@ Kotlin translated and modified code Copyright (C) 2016 Minjaesong (CuriousTorval $BULLET PRTree, a Priority R-Tree, a spatial index for java code -Copyright (c) 2008-2012 Robert Olofsson. +© 2008-2012 Robert Olofsson. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -165,7 +165,7 @@ SUCH DAMAGE. $BULLET HUSLColorConverter.java -Copyright (c) 2016 Alexei Boronine +© 2016 Alexei Boronine Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -193,13 +193,13 @@ GraalVM Community Edition consists of multiple modules. The software as a whole, as well as the JVMCI and VisualVM modules, are released under version 2 of the GNU General Public License with the “Classpath” Exception. -Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. +© 2015, 2019, Oracle and/or its affiliates. All rights reserved. $BULLET Apache Commons Codec -Copyright 2002-2023 The Apache Software Foundation +© 2002-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). @@ -208,7 +208,7 @@ The Apache Software Foundation (https://www.apache.org/). $BULLET Apache Commons CSV -Copyright 2005-2023 The Apache Software Foundation +© 2005-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). @@ -217,20 +217,20 @@ The Apache Software Foundation (https://www.apache.org/). $BULLET Apache Commons Math -Copyright 2001-2022 The Apache Software Foundation +© 2001-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). This product includes software developed for Orekit by CS Systèmes d'Information (http://www.c-s.fr/) -Copyright 2010-2012 CS Systèmes d'Information +© 2010-2012 CS Systèmes d'Information $BULLET JTransforms -Copyright (c) 2007 onward, Piotr Wendykier +© 2007 onward, Piotr Wendykier All rights reserved. Redistribution and use in source and binary forms, with or without @@ -271,6 +271,26 @@ limitations under the License. +$BULLET Music: + + - music/discs/3_over_4.ogg + - music/discs/cyllindrical.ogg + - music/discs/fog.ogg + - music/discs/geometry.ogg + - music/discs/hangdrum.ogg + - music/discs/hdma.ogg + - music/discs/lucid_dream.ogg + - music/discs/railway.ogg + - music/discs/welded.ogg + +℗ 2021, 2022, 2023, 2024 Orstphone +Check out the original tracks at: +Apple Music: +Bandcamp: +YouTube: + + + $BULLET Foleys: - ambient/season/crepuscular.*.ogg @@ -281,7 +301,7 @@ $BULLET Foleys: - ambient/season/matutinal.*.ogg - ambient/season/nocturnal.*.ogg -Copyright (C) 2011, 2013, 2015, 2020, 2021 Klankbeeld +℗ 2011, 2013, 2015, 2020, 2021 Klankbeeld Sound from - effects/steps/GRSS.*.ogg @@ -292,22 +312,22 @@ Sound from - effects/door/wooden_open.*.ogg - effects/door/wooden_close.*.ogg -Copyright (C) 2020, 2021, 2022 Nox Sound +℗ 2020, 2021, 2022 Nox Sound Sound from - effects/static/phono_pops.ogg -Copyright (C) 2011 Veezay +℗ 2011 Veezay Sound from - effects/static/tape_hiss.ogg -Copyright (C) 2017 Stephen Holdaway +℗ 2017 Stephen Holdaway Sound from - effects/static/film_pops_lowpass.ogg -Copyright (C) 2015 Joe DeShon +℗ 2015 Joe DeShon Sound from @@ -317,12 +337,12 @@ $BULLET Impulse Responses: - convolution/EchoThief - *.bin EchoThief Impulse Response Library -Copyright 2013-2023 Chris Warren +℗ 2013-2023 Chris Warren - convolution/Soundwoofer - *.bin Soundwoofer Free Impulse Response Library -Copyright 2018 Soundwoofer Team +℗ 2018 Soundwoofer Team """).split('\n') diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFileRef.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFileRef.kt index e1ab97eb2..e75951452 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFileRef.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFileRef.kt @@ -63,7 +63,7 @@ open class ItemFileRef(originalID: ItemID) : GameItem(originalID) { override var baseMass = 1.0 override var baseToolSize: Double? = null - override var inventoryCategory = Category.GENERIC + override var inventoryCategory = Category.MISC override val isDynamic = false override val materialId = "" override var equipPosition = EquipPosition.HAND_GRIP diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt index 8b37aac20..3ae9de85d 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt @@ -144,3 +144,6 @@ class MusicDisc03(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame class MusicDisc04(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/hdma.ogg") class MusicDisc05(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/lucid_dream.ogg") class MusicDisc06(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/railway.ogg") +class MusicDisc07(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/cyllindrical.ogg") +class MusicDisc08(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/welded.ogg") +class MusicDisc09(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/hangdrum.ogg")