Cambios

DeadFish.gmx/Configs/Default.config.gmx

@@ -22,20 +22,20 @@
     <option_android_arch_mipsr2sf>false</option_android_arch_mipsr2sf>
     <option_android_arch_x86>False</option_android_arch_x86>
     <option_android_build_tools_version>23.0.1</option_android_build_tools_version>
-    <option_android_build_version>0</option_android_build_version>
+    <option_android_build_version>1</option_android_build_version>
     <option_android_color_depth>0</option_android_color_depth>
     <option_android_compile_sdk_version>23</option_android_compile_sdk_version>
-    <option_android_display_name>DeadFish</option_android_display_name>
+    <option_android_display_name>Dead Fish</option_android_display_name>
     <option_android_facebook_app_display_name></option_android_facebook_app_display_name>
     <option_android_facebook_appid></option_android_facebook_appid>
     <option_android_facebook_enable>false</option_android_facebook_enable>
     <option_android_flurry_analytics>false</option_android_flurry_analytics>
     <option_android_google_analytics>false</option_android_google_analytics>
     <option_android_google_analytics_enable>false</option_android_google_analytics_enable>
     <option_android_google_mobile_ads>false</option_android_google_mobile_ads>
-    <option_android_google_play>0</option_android_google_play>
+    <option_android_google_play>-1</option_android_google_play>
     <option_android_google_play_cloud_save_enable>false</option_android_google_play_cloud_save_enable>
-    <option_android_google_play_id></option_android_google_play_id>
+    <option_android_google_play_id>244946398970</option_android_google_play_id>
     <option_android_google_tracking_id></option_android_google_tracking_id>
     <option_android_iap_suppress_toast>false</option_android_iap_suppress_toast>
     <option_android_icade_support>-1</option_android_icade_support>
@@ -61,7 +61,7 @@
     <option_android_orient_portrait_flipped>True</option_android_orient_portrait_flipped>
     <option_android_orientation>2</option_android_orientation>
     <option_android_ouya_icon>Configs\Default\android\icons\ouyaIcon.png</option_android_ouya_icon>
-    <option_android_package_company>companyname</option_android_package_company>
+    <option_android_package_company>Fa_Dielle</option_android_package_company>
     <option_android_package_domain>com</option_android_package_domain>
     <option_android_package_product>DeadFish</option_android_package_product>
     <option_android_permission_flags>8</option_android_permission_flags>
@@ -213,7 +213,7 @@
     <option_changeresolution>false</option_changeresolution>
     <option_closeesc>true</option_closeesc>
     <option_colordepth>0</option_colordepth>
-    <option_display_name>GameMaker: Studio</option_display_name>
+    <option_display_name>Dead Fish</option_display_name>
     <option_displayerrors>True</option_displayerrors>
     <option_ecma>false</option_ecma>
     <option_facebook_app_display_name></option_facebook_app_display_name>
@@ -262,7 +262,7 @@
     <option_html5_usebuiltinparticles>True</option_html5_usebuiltinparticles>
     <option_html5_usesplash>False</option_html5_usesplash>
     <option_icon>nil</option_icon>
-    <option_in_app_purchase_enable>0</option_in_app_purchase_enable>
+    <option_in_app_purchase_enable>-1</option_in_app_purchase_enable>
     <option_in_app_purchase_sandbox_mode>0</option_in_app_purchase_sandbox_mode>
     <option_in_app_purchase_server_url></option_in_app_purchase_server_url>
     <option_information></option_information>
@@ -455,13 +455,13 @@
     <option_use_new_audio>True</option_use_new_audio>
     <option_variableerrors>False</option_variableerrors>
     <option_version>100</option_version>
-    <option_version_build>0</option_version_build>
-    <option_version_company></option_version_company>
-    <option_version_copyright></option_version_copyright>
+    <option_version_build>2</option_version_build>
+    <option_version_company>Fa'Dielle</option_version_company>
+    <option_version_copyright>@Fa'Dielle 2015</option_version_copyright>
     <option_version_description></option_version_description>
     <option_version_major>1</option_version_major>
     <option_version_minor>0</option_version_minor>
-    <option_version_product></option_version_product>
+    <option_version_product>Dead Fish</option_version_product>
     <option_version_release>0</option_version_release>
     <option_win8_advertising_appid></option_win8_advertising_appid>
     <option_win8_advertising_enable>0</option_win8_advertising_enable>
@@ -531,9 +531,9 @@
     <option_winUAP_wide_logo>Configs\Default\WindowsUAP\logos\WideLogo.scale-100.png</option_winUAP_wide_logo>
     <option_windowcolor>clBlack</option_windowcolor>
     <option_windows_alternate_sync_method>false</option_windows_alternate_sync_method>
-    <option_windows_build_version>0</option_windows_build_version>
-    <option_windows_company_info></option_windows_company_info>
-    <option_windows_copyright_info></option_windows_copyright_info>
+    <option_windows_build_version>1</option_windows_build_version>
+    <option_windows_company_info>Fa'Dielle</option_windows_company_info>
+    <option_windows_copyright_info>@Fa'Dielle 2015</option_windows_copyright_info>
     <option_windows_create_textures_on_demand>false</option_windows_create_textures_on_demand>
     <option_windows_description_info></option_windows_description_info>
     <option_windows_enable_steam>0</option_windows_enable_steam>
@@ -542,7 +542,7 @@
     <option_windows_mainor_version>0</option_windows_mainor_version>
     <option_windows_major_version>1</option_windows_major_version>
     <option_windows_nsis_file>Configs\Default\windows\RunnerInstaller.nsi</option_windows_nsis_file>
-    <option_windows_product_info></option_windows_product_info>
+    <option_windows_product_info>Dead Fish</option_windows_product_info>
     <option_windows_release_version>0</option_windows_release_version>
     <option_windows_runner_finished>Configs\Default\windows\Runner_finish.bmp</option_windows_runner_finished>
     <option_windows_runner_header>Configs\Default\windows\Runner_header.bmp</option_windows_runner_header>

DeadFish.gmx/DeadFish.project.gmx

@@ -43,7 +43,6 @@
     <sprite>sprites\spr_mas1</sprite>
     <sprite>sprites\spr_barra_vida</sprite>
     <sprite>sprites\spr_shop</sprite>
-    <sprite>sprites\spr_icono</sprite>
     <sprite>sprites\spr_fondo_pausa</sprite>
   </sprites>
   <backgrounds name="background">

DeadFish.gmx/objects/obj_control_game.object.gmx

@@ -25,7 +25,8 @@
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>if(room == Room_Presentation){
+            <string>
+if(room == Room_Presentation){
     globalvar best_puntaje, puntaje, vidas, municion, mejora_arma, tiempo, idioma, 
               pausa, congelar, pausar_musica, pausar_juego, new, valores,
               perder, disparos, shop;
@@ -78,6 +79,8 @@
     if(municion &gt; 0){
         mejora_arma = true;
     }
+
+    show_debug_message(mejora_arma);
 
    // Cargar y Activar los productos.   
    var productList = ds_list_create();

DeadFish.gmx/objects/obj_generar_peces.object.gmx

@@ -89,9 +89,9 @@ if(vel >= 5){
             <kind>1</kind>
             <string>/// Producir peces.
 alarm[0] = irandom_range(15 - contador_peces/10,45 - contador_peces/10);
-if instance_number(obj_pez) &lt; 8{
-    instance_create(choose(-32,480),irandom_range(400,800),obj_pez);
-    contador_peces +=1;
+if(instance_number(obj_pez) &lt; 8){
+    instance_create(choose(-12,460),irandom_range(400,850),obj_pez);
+    contador_peces += 1;
 }
 </string>
           </argument>
@@ -116,7 +116,7 @@ if instance_number(obj_pez) &lt; 8{
           <argument>
             <kind>1</kind>
             <string>// Empezar a cambiar fondo.
-if(puntaje &gt; 0 and puntaje mod 10 = 0){
+if((puntaje == 100 or puntaje == 500 or puntaje == 1000)){
     //alarm[1] = 30;
     alarm[0] = -1;
     if(!instance_exists(obj_pez_boss)){

DeadFish.gmx/objects/obj_pez.object.gmx

@@ -30,26 +30,29 @@ angulo = 0;
 velocidad = 0;
 no_congelado = false;
 despausado = false;
+angulo_sprite = 0;
 
 // Movimiento
 pst_x = x; //guarda posicion inicial x
 initialize_movement_entity(.5, 1, .125, .25,obj_gravedad); //Inicializa los parametros de movimiento
 if(pst_x < 0){
-    angulo = 45;
-    velocidad = irandom_range(18 + puntaje/10,20 + puntaje/10);
-    alarm[1] = -1;
+    angulo = 45; // 60
+    image_angle = 45;
+    velocidad = irandom_range(18 + puntaje/100,20 + puntaje/100);
+    //alarm[1] = -1;
 }
 else{
-    angulo = 135;
-    velocidad = irandom_range(18 + puntaje/10,20 + puntaje/10);
+    angulo = 135; // 120
+    image_angle = -45;
+    velocidad = irandom_range(18 + puntaje/100,20 + puntaje/100);
     image_xscale = -1;
-    alarm[1] = -1;
+    //alarm[1] = -1;
 }
 set_movement_direction_speed(angulo, velocidad);
 
 
 // seleccion color pez
-if (irandom_range(0,1000) == 1) {
+if (irandom_range(1,100) == 1) {
     image_index = 6;
 }
 else
@@ -170,8 +173,18 @@ else{
         no_congelado = false;
     }
 }
-
 move_movement_entity(); //funcion control de movimiento
+if(puntos){ 
+    if(!congelar){
+        image_angle -= angulo_sprite;
+        if(image_xscale == 1){
+            angulo_sprite += .06;
+        }else{
+            angulo_sprite -= .06;
+        }
+    }
+}
+//show_debug_message(lengthdir_y(angulo,velocidad));
 </string>
           </argument>
         </arguments>
@@ -291,9 +304,11 @@ if(puntos and !perder and !pausar_juego){
     // Hacer que el pez se voltee y caiga hacia abajo en linea recta
     angulo = 270; // se da el angulo de caida del pez
     if(image_xscale == -1){
-        image_angle = 90;
+        image_angle = 180;
+        image_xscale = 1;
     }else{
-        image_angle = 270;
+        image_angle = -180;
+        image_xscale = -1;
     }
     puntos = false;
 
@@ -303,6 +318,7 @@ if(puntos and !perder and !pausar_juego){
         switch(choose("tiros","vidas","tiempo")){
             case "tiros":
                 municion += 20;
+                mejora_arma = true;
             break;
             case "vidas":
                 vidas += 2;
@@ -332,7 +348,7 @@ if(puntos and !perder and !pausar_juego){
          //   disparos = 0;
             //mouse_clear(mb_left);
         //}
-                       
+        audio_stop_sound(sound_weapon);
         audio_play_sound(sound_weapon,1,0);
     }
 }

DeadFish.gmx/objects/obj_pez_boss.object.gmx

@@ -123,29 +123,6 @@ cont = 1;
         </arguments>
       </action>
     </event>
-    <event eventtype="2" enumb="1">
-      <action>
-        <libid>1</libid>
-        <id>603</id>
-        <kind>7</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>2</exetype>
-        <functionname></functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>1</kind>
-            <string>path_start(pth_boss2,5,0,1);
-</string>
-          </argument>
-        </arguments>
-      </action>
-    </event>
     <event eventtype="2" enumb="0">
       <action>
         <libid>1</libid>
@@ -171,6 +148,7 @@ cont = 1;
 }else{
     alarm[0] = -1;
     alarm[1] = 20; 
+    path_start(pth_boss2,5,0,1);
     sprite_index = spr_pez_boss_g;
     image_xscale = 1;
     image_yscale = 1;
@@ -224,7 +202,7 @@ else {
         </arguments>
       </action>
     </event>
-    <event eventtype="6" enumb="4">
+    <event eventtype="6" enumb="0">
       <action>
         <libid>1</libid>
         <id>603</id>
@@ -242,7 +220,7 @@ else {
           <argument>
             <kind>1</kind>
             <string>if (pez_grande){
-vida -= 1;
+    vida -= 1;
     if (vida &lt;= 0){ 
         if(puntos and !perder and !pausar_juego){
             instance_create(x, self.y - sprite_get_height(spr_pez_boss_g)/2, obj_mas1);
@@ -254,27 +232,24 @@ vida -= 1;
             with(obj_generar_peces){
             alarm[0] = 30;            
             }
-            // Disparo.
-            if(!mejora_arma){
-                audio_play_sound(sound_weapon,1,0);
-                mouse_clear(mb_left);
-            }else{
-                if(municion &gt; 0){
-                    disparos++;
-                    municion--;
-                }else{
-                    mejora_arma = 0;
-                }
-
-                if(disparos &gt;= 4){
-                    disparos = 0;
-                    mouse_clear(mb_left);
-                }
-
-                audio_play_sound(sound_weapon,1,0);
-            }
         }
+    }        
+    // Disparo.
+    if(!mejora_arma){
+        show_debug_message('what');
+        audio_play_sound(sound_weapon,1,0);
+        mouse_clear(mb_left);
+    }else{
+        show_debug_message('what2');
+        if(municion &gt; 0){
+            municion--;
+        }else{
+            mejora_arma = 0;
+        } 
+        audio_stop_sound(sound_weapon);
+        audio_play_sound(sound_weapon,1,0);
     }
+
 }
 </string>
           </argument>

DeadFish.gmx/rooms/Room_Game.room.gmx

@@ -56,9 +56,9 @@
     <instance objName="obj_agua" x="1" y="755" name="inst_9EAA3B86" locked="0" code="" scaleX="1.09174311161041" scaleY="1.07500004768372" colour="4294967295" rotation="0"/>
     <instance objName="obj_opciones" x="1" y="0" name="inst_51FA7BB9" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
     <instance objName="obj_pausar" x="10" y="6" name="inst_5E7AA498" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
-    <instance objName="obj_arma" x="240" y="23" name="inst_047F07B7" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
-    <instance objName="obj_reloj" x="101" y="25" name="inst_B1AFC6A2" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
-    <instance objName="obj_vida" x="168" y="23" name="inst_28ECD601" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
+    <instance objName="obj_arma" x="168" y="22" name="inst_047F07B7" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
+    <instance objName="obj_reloj" x="92" y="24" name="inst_B1AFC6A2" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
+    <instance objName="obj_vida" x="250" y="22" name="inst_28ECD601" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
     <instance objName="obj_musica" x="416" y="4" name="inst_3F5C3FBE" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
     <instance objName="obj_tienda" x="350" y="4" name="inst_6A10DF57" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
   </instances>

DeadFish.gmx/sprites/spr_icono.sprite.gmx

@@ -1,14 +1,14 @@
 <!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
 <sprite>
   <type>0</type>
-  <xorig>0</xorig>
-  <yorigin>0</yorigin>
+  <xorig>-154</xorig>
+  <yorigin>-171</yorigin>
   <colkind>1</colkind>
   <coltolerance>0</coltolerance>
   <sepmasks>0</sepmasks>
   <bboxmode>0</bboxmode>
   <bbox_left>0</bbox_left>
-  <bbox_right>479</bbox_right>
+  <bbox_right>511</bbox_right>
   <bbox_top>0</bbox_top>
   <bbox_bottom>511</bbox_bottom>
   <HTile>0</HTile>
@@ -17,7 +17,7 @@
     <TextureGroup0>0</TextureGroup0>
   </TextureGroups>
   <For3D>0</For3D>
-  <width>480</width>
+  <width>512</width>
   <height>512</height>
   <frames>
     <frame index="0">images\spr_icono_0.png</frame>