Improved Hajde probaj ti. Closes #3

adore-hrzz · Feb 7, 2017 · d7da416 · d7da416
1 parent ce4516a
commit d7da416
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Adore gestures/Adore gestures.pml b/Adore gestures/Adore gestures.pml
@@ -17,19 +17,20 @@
     </BehaviorDescriptions>
     <Dialogs />
     <Resources>
+        <File name="icon" src="icon.png" />
         <File name="drinking" src="sounds/drinking.wav" />
+        <File name="hajde_pokusaj_ti" src="sounds/hajde_pokusaj_ti.wav" />
         <File name="hajde_probaj_ti" src="sounds/hajde_probaj_ti.wav" />
         <File name="krekre" src="sounds/krekre.wav" />
-        <File name="ovo_je_salica" src="sounds/ovo_je_salica.wav" />
         <File name="ovo_je_zaba" src="sounds/ovo_je_zaba.wav" />
         <File name="probajmo_ponovo" src="sounds/probajmo_ponovo.wav" />
         <File name="vidi_ovo" src="sounds/vidi_ovo.wav" />
-        <File name="icon" src="icon.png" />
     </Resources>
     <Topics />
     <IgnoredPaths>
         <Path src=".gitignore" />
-        <Path src="sounds/download_sounds.sh" />
+        <Path src=".gitignore~" />
         <Path src="icon.png" />
+        <Path src="sounds/download_sounds.sh" />
     </IgnoredPaths>
 </Package>
diff --git a/Adore gestures/Sada ti (left)/behavior.xar b/Adore gestures/Sada ti (left)/behavior.xar
@@ -15,7 +15,7 @@
             <BehaviorLayer name="behavior_layer1">
                 <BehaviorKeyframe name="keyframe1" index="1">
                     <Diagram>
-                        <Box name="Sada ti (left)" id="1" localization="8" tooltip="This box is empty (contains a single motion layer with no motor position&#x0A;defined in it) and should be used to create any animation you would like." x="461" y="226">
+                        <Box name="Sada ti (left)" id="1" localization="8" tooltip="This box is empty (contains a single motion layer with no motor position&#x0A;defined in it) and should be used to create any animation you would like." x="392" y="220">
                             <bitmap>media/images/box/movement/move.png</bitmap>
                             <script language="4">
                                 <content>
@@ -62,7 +62,7 @@
                                                 <Input name="onStart" type="1" type_size="1" nature="2" inner="0" tooltip="Starts the music." id="2" />
                                                 <Input name="onStop" type="1" type_size="1" nature="3" inner="0" tooltip="Stops the music." id="3" />
                                                 <Output name="onStopped" type="1" type_size="1" nature="1" inner="0" tooltip="Signal sent when box behavior is finished or stopped." id="4" />
-                                                <Parameter name="File name" inherits_from_parent="0" content_type="4" value="/../sounds/hajde_probaj_ti.wav" default_value="" tooltip="Name of the file you want to play.&#x0A;&#x0A;Note: You can click on the folder icon to browse the project content or import&#x0A;new files to the project." id="5" />
+                                                <Parameter name="File name" inherits_from_parent="0" content_type="4" value="/../sounds/hajde_pokusaj_ti.wav" default_value="" tooltip="Name of the file you want to play.&#x0A;&#x0A;Note: You can click on the folder icon to browse the project content or import&#x0A;new files to the project." id="5" />
                                                 <Parameter name="Begin position (s)" inherits_from_parent="0" content_type="2" value="0" default_value="0" min="0" max="600" tooltip="Position in seconds where the playing must start." id="6" />
                                                 <Parameter name="Volume (%)" inherits_from_parent="0" content_type="1" value="100" default_value="100" min="0" max="100" tooltip="Volume the file is played with." id="7" />
                                                 <Parameter name="Balance L/R" inherits_from_parent="0" content_type="2" value="0" default_value="0" min="-1" max="1" tooltip="Value which determines if the sound is played more on the robot&apos;s left or right.&#x0A;You can particularly set it to:&#x0A;- -1 to play only on the left loudspeaker.&#x0A;- 0 to play on both loudspeakers.&#x0A;- 1 to play only on the right loudspeaker." id="8" />

diff --git a/Adore gestures/Sada ti (right)/behavior.xar b/Adore gestures/Sada ti (right)/behavior.xar
@@ -15,7 +15,7 @@
             <BehaviorLayer name="behavior_layer1">
                 <BehaviorKeyframe name="keyframe1" index="1">
                     <Diagram>
-                        <Box name="Sada ti (right)" id="1" localization="8" tooltip="This box is empty (contains a single motion layer with no motor position&#x0A;defined in it) and should be used to create any animation you would like." x="553" y="298">
+                        <Box name="Sada ti (right)" id="1" localization="8" tooltip="This box is empty (contains a single motion layer with no motor position&#x0A;defined in it) and should be used to create any animation you would like." x="375" y="203">
                             <bitmap>media/images/box/movement/move.png</bitmap>
                             <script language="4">
                                 <content>
@@ -62,7 +62,7 @@
                                                 <Input name="onStart" type="1" type_size="1" nature="2" inner="0" tooltip="Starts the music." id="2" />
                                                 <Input name="onStop" type="1" type_size="1" nature="3" inner="0" tooltip="Stops the music." id="3" />
                                                 <Output name="onStopped" type="1" type_size="1" nature="1" inner="0" tooltip="Signal sent when box behavior is finished or stopped." id="4" />
-                                                <Parameter name="File name" inherits_from_parent="0" content_type="4" value="/../sounds/hajde_probaj_ti.wav" default_value="" tooltip="Name of the file you want to play.&#x0A;&#x0A;Note: You can click on the folder icon to browse the project content or import&#x0A;new files to the project." id="5" />
+                                                <Parameter name="File name" inherits_from_parent="0" content_type="4" value="/../sounds/hajde_pokusaj_ti.wav" default_value="" tooltip="Name of the file you want to play.&#x0A;&#x0A;Note: You can click on the folder icon to browse the project content or import&#x0A;new files to the project." id="5" />
                                                 <Parameter name="Begin position (s)" inherits_from_parent="0" content_type="2" value="0" default_value="0" min="0" max="600" tooltip="Position in seconds where the playing must start." id="6" />
                                                 <Parameter name="Volume (%)" inherits_from_parent="0" content_type="1" value="100" default_value="100" min="0" max="100" tooltip="Volume the file is played with." id="7" />
                                                 <Parameter name="Balance L/R" inherits_from_parent="0" content_type="2" value="0" default_value="0" min="-1" max="1" tooltip="Value which determines if the sound is played more on the robot&apos;s left or right.&#x0A;You can particularly set it to:&#x0A;- -1 to play only on the left loudspeaker.&#x0A;- 0 to play on both loudspeakers.&#x0A;- 1 to play only on the right loudspeaker." id="8" />

diff --git a/Adore gestures/sounds/download_sounds.sh b/Adore gestures/sounds/download_sounds.sh
@@ -19,7 +19,7 @@ wget -O ovo_je_zaba.wav "https://drive.google.com/uc?export=download&id=0ByIZc3t
 wget -O ovo_je_salica.wav "https://drive.google.com/uc?export=download&id=https://drive.google.com/open?id=0ByIZc3t3wyJoS3U3aWVITlIxbTA"
 
 # Encouragement for imitation "Hajde, probaj ti", TTS Marica v4.2
-wget -O hajde_probaj_ti.wav "https://drive.google.com/uc?export=download&id=0ByIZc3t3wyJoVEZIbzY4VlFobzg"
+wget -O hajde_pokusaj_ti.wav "https://drive.google.com/uc?export=download&id=0ByIZc3t3wyJoS2NLMFlVRG9BSWs"
 
 # Recouragement for imitation "Probajmo ponovo", TTS Marica v4.2
 wget -O probajmo_ponovo.wav "https://drive.google.com/uc?export=download&id=0ByIZc3t3wyJoVm5pMmFqY1lWNG8"