Skip to content

Implemented on/off music #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChaboCode wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implemented on/off music #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d4e5b
Implemented on/off music
ChaboCode May 27, 2020
6ff4897
Corrected bug on MenuStack
May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions Event sheets/Battle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
<param id="1" name="Comparison">1</param>
<param id="2" name="Value">MODE_NORMAL</param>
</condition>
<condition id="-14" name="Compare variable" sid="939966465870983" type="System">
<param id="0" name="Variable">MUSIC</param>
<param id="1" name="Comparison">0</param>
<param id="2" name="Value">1</param>
</condition>
</conditions>
<actions>
<action id="0" name="Play" sid="4080759880781125" type="Audio">
Expand Down Expand Up @@ -352,13 +357,30 @@
<param id="0" name="Name">&quot;EndAttack&quot;</param>
<param id="1" name="Parameter {n}"></param>
</action>
<action id="0" name="Play" sid="687530192848918" type="Audio">
<param id="0" name="Audio file">mus_zz_megalovania</param>
<param id="2" name="Loop">1</param>
<param id="3" name="Volume">0</param>
<param id="1" name="Tag (optional)">&quot;Music&quot;</param>
</action>
</actions>
<sub-events>
<event-block sid="113152013838079">
<conditions>
<condition id="-14" name="Compare variable" sid="818578028974037" type="System">
<param id="0" name="Variable">MUSIC</param>
<param id="1" name="Comparison">0</param>
<param id="2" name="Value">1</param>
</condition>
</conditions>
<actions>
<action id="0" name="Play" sid="687530192848918" type="Audio">
<param id="0" name="Audio file">mus_zz_megalovania</param>
<param id="2" name="Loop">1</param>
<param id="3" name="Volume">0</param>
<param id="1" name="Tag (optional)">&quot;Music&quot;</param>
</action>
</actions>
</event-block>
</sub-events>
</event-block>
<event-block sid="227284396038694">
<conditions />
<actions />
</event-block>
</sub-events>
</event-block>
Expand Down Expand Up @@ -1268,6 +1290,11 @@
<condition id="5" inverted="1" name="Is tag playing" sid="3373887249691799" type="Audio">
<param id="0" name="Tag">&quot;Music&quot;</param>
</condition>
<condition id="-14" name="Compare variable" sid="102902953279985" type="System">
<param id="0" name="Variable">MUSIC</param>
<param id="1" name="Comparison">0</param>
<param id="2" name="Value">1</param>
</condition>
</conditions>
<actions>
<action id="0" name="Play" sid="3571287415179704" type="Audio">
Expand Down
1 change: 1 addition & 0 deletions Event sheets/Globals.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
<variable constant="0" name="MaxHP" sid="2742940924955148" static="0" type="number">92</variable>
<variable constant="0" name="KR" sid="2189987320058474" static="0" type="number">0</variable>
<variable constant="0" name="KR_T" sid="8948293770944489" static="0" type="number">0</variable>
<variable constant="0" name="MUSIC" sid="970605853181225" static="0" type="number">1</variable>
</events>
</c2eventsheet>
112 changes: 111 additions & 1 deletion Event sheets/MainMenu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<c2eventsheet>
<!--All the 'name' attributes are ignored by Construct 2 - they are there for readability only.-->
<name>MainMenu</name>
Expand Down Expand Up @@ -157,6 +157,10 @@
<param id="0" name="Name">&quot;CreateMenuItem&quot;</param>
<param id="1" name="Parameter {n}">0{###}192{###}224{###}4{###}&quot;Custom attack&quot;{###}&quot;MenuModeCustom&quot;</param>
</action>
<action id="0" name="Call function" sid="647987750913328" type="Function">
<param id="0" name="Name">&quot;CreateMenuItem&quot;</param>
<param id="1" name="Parameter {n}">0{###}192{###}256{###}5{###}&quot;Options&quot;{###}&quot;MenuModeOptions&quot;</param>
</action>
</actions>
</event-block>
<event-block sid="1934787540782705">
Expand Down Expand Up @@ -417,6 +421,9 @@
<param id="2" name="X">224</param>
<param id="3" name="Y">96</param>
</action>
<action id="17" name="Execute Javascript" sid="633282825002353" type="Browser">
<param id="0" name="Javascript">&quot;document.getElementById(&apos;filechooser&apos;).focus();&quot;</param>
</action>
</actions>
</event-block>
<event-block sid="7985503632529348">
Expand Down Expand Up @@ -478,6 +485,105 @@
</action>
</actions>
</event-block>
<event-block sid="180536536734664">
<conditions>
<condition id="0" name="On function" sid="281812231922897" type="Function">
<param id="0" name="Name">&quot;MenuModeOptions&quot;</param>
</condition>
</conditions>
<actions>
<action id="-9" name="Destroy" sid="750743716821897" type="MenuItem" />
<action id="-9" name="Destroy" sid="908125316370276" type="DefaultFont" />
<action id="0" name="Call function" sid="540119107323912" type="Function">
<param id="0" name="Name">&quot;MenuBackAction&quot;</param>
<param id="1" name="Parameter {n}">&quot;MenuMain&quot;</param>
</action>
<action id="-3" name="Create object" sid="628488364856121" type="System">
<param id="0" name="Object to create">DefaultFont</param>
<param id="1" name="Layer">0</param>
<param id="2" name="X">0</param>
<param id="3" name="Y">32</param>
</action>
<action id="2" name="Set scale" sid="849064880823009" type="DefaultFont">
<param id="0" name="Scale">2</param>
</action>
<action id="0" name="Set text" sid="157925185353385" type="DefaultFont">
<param id="0" name="Text">&quot;Options&quot;</param>
</action>
<action id="7" name="Set horizontal alignment" sid="835516085969874" type="DefaultFont">
<param id="0" name="Horizontal alignment">1</param>
</action>
<action id="0" name="Call function" sid="646372684188044" type="Function">
<param id="0" name="Name">&quot;InflateMusicMenu&quot;</param>
<param id="1" name="Parameter {n}"></param>
</action>
<action id="-7" name="Set size" sid="698282710040703" type="DefaultFont">
<param id="0" name="Width">640</param>
<param id="1" name="Height">32</param>
</action>
</actions>
</event-block>
<event-block sid="604882263382183">
<conditions>
<condition id="0" name="On function" sid="777593835797666" type="Function">
<param id="0" name="Name">&quot;InflateMusicMenu&quot;</param>
</condition>
</conditions>
<actions />
<sub-events>
<event-block sid="355910794728814">
<conditions>
<condition id="-14" name="Compare variable" sid="330367611357200" type="System">
<param id="0" name="Variable">MUSIC</param>
<param id="1" name="Comparison">0</param>
<param id="2" name="Value">0</param>
</condition>
</conditions>
<actions>
<action id="0" name="Call function" sid="226881653061889" type="Function">
<param id="0" name="Name">&quot;CreateMenuItem&quot;</param>
<param id="1" name="Parameter {n}">0{###}192{###}96{###}0{###}&quot;Enable music&quot;{###}&quot;ToggleMusic&quot;</param>
</action>
</actions>
</event-block>
<event-block sid="835110928860504">
<conditions>
<condition id="-14" name="Compare variable" sid="943412530247295" type="System">
<param id="0" name="Variable">MUSIC</param>
<param id="1" name="Comparison">0</param>
<param id="2" name="Value">1</param>
</condition>
</conditions>
<actions>
<action id="0" name="Call function" sid="464830689172905" type="Function">
<param id="0" name="Name">&quot;CreateMenuItem&quot;</param>
<param id="1" name="Parameter {n}">0{###}192{###}96{###}0{###}&quot;Disable music&quot;{###}&quot;ToggleMusic&quot;</param>
</action>
</actions>
</event-block>
</sub-events>
</event-block>
<event-block sid="932668235805102">
<conditions>
<condition id="0" name="On function" sid="355123289691150" type="Function">
<param id="0" name="Name">&quot;ToggleMusic&quot;</param>
</condition>
</conditions>
<actions>
<action id="-9" name="Set value" sid="571579044651725" type="System">
<param id="0" name="Variable">MUSIC</param>
<param id="1" name="Value">MUSIC ? 0 : 1</param>
</action>
<action id="6" name="Pop" sid="596169945173924" type="MenuStack">
<param id="0" name="Where">0</param>
<param id="1" name="Axis">0</param>
</action>
<action id="0" name="Call function" sid="792346871488374" type="Function">
<param id="0" name="Name">&quot;MenuModeOptions&quot;</param>
<param id="1" name="Parameter {n}"></param>
</action>
</actions>
</event-block>
<event-block sid="2930222903867678">
<conditions>
<condition id="-2" name="On start of layout" sid="8676844751034461" type="System" />
Expand Down Expand Up @@ -682,5 +788,9 @@
</event-block>
</sub-events>
</event-group>
<event-block sid="804631901764125">
<conditions />
<actions />
</event-block>
</events>
</c2eventsheet>
2 changes: 1 addition & 1 deletion Layouts/System.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@
<accept>.csv</accept>
<select>Single</select>
<initial-visibility>Visible</initial-visibility>
<id-optional></id-optional>
<id-optional>filechooser</id-optional>
</properties>
<blend-mode>0</blend-mode>
<effect-fallback>0</effect-fallback>
Expand Down