01/02/2020 #2

LivingDexSS.gmx/Configs/Default.config.gmx

@@ -211,7 +211,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>DexTools</option_display_name>
     <option_displayerrors>True</option_displayerrors>
     <option_ecma>0</option_ecma>
     <option_facebook_app_display_name></option_facebook_app_display_name>
@@ -490,7 +490,7 @@
     <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_company>Posho</option_version_company>
     <option_version_copyright></option_version_copyright>
     <option_version_description></option_version_description>
     <option_version_major>1</option_version_major>
@@ -570,7 +570,7 @@
     <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_company_info>Posho</option_windows_company_info>
     <option_windows_copyright_info></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>
@@ -590,7 +590,7 @@
     <option_windows_splash_screen>Configs\Default\windows\splash.png</option_windows_splash_screen>
     <option_windows_steam_app_id>0</option_windows_steam_app_id>
     <option_windows_texture_page>2048</option_windows_texture_page>
-    <option_windows_use_splash>-1</option_windows_use_splash>
+    <option_windows_use_splash>0</option_windows_use_splash>
     <option_windows_vertex_buffer_method2>1</option_windows_vertex_buffer_method2>
     <option_winphone_480_splash_image>Configs\Default\WinPhone\SplashScreenImage480.jpg</option_winphone_480_splash_image>
     <option_winphone_720_splash_image>Configs\Default\WinPhone\SplashScreenImage720.jpg</option_winphone_720_splash_image>

LivingDexSS.gmx/LivingDexSS.project.gmx

@@ -39857,6 +39857,8 @@
     <sprite>sprites\spr_slot</sprite>
     <sprite>sprites\spr_font</sprite>
     <sprite>sprites\spr_type</sprite>
+    <sprite>sprites\spr_source</sprite>
+    <sprite>sprites\spr_tag</sprite>
   </sprites>
   <backgrounds name="background"/>
   <paths name="paths"/>
@@ -39871,10 +39873,13 @@
     <script>scripts\scr_typeget.gml</script>
     <script>scripts\get_color3.gml</script>
     <script>scripts\scr_zeros.gml</script>
+    <script>scripts\scroll_do.gml</script>
+    <script>scripts\scroll_warp.gml</script>
   </scripts>
   <objects name="objects">
     <object>objects\obj_global</object>
     <object>objects\obj_slot</object>
+    <object>objects\obj_header</object>
   </objects>
   <rooms name="rooms">
     <room>rooms\room0</room>

LivingDexSS.gmx/objects/obj_global.object.gmx

@@ -74,7 +74,7 @@ global.window_height = window_get_height();
 global.box_len = global.window_width/2/7;
 global.icon_scale = 2;
 
-global.font = font_add_sprite_ext(spr_font,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZéÉ#-'!?():@_.% /",true,1)
+global.font = font_add_sprite_ext(spr_font,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZéÉ#-'!?():@_.% /♂♀",true,1)
 
 global.selected[dex.dexno] = "001";
 global.selected[dex.pokemon] = "BULBASAUR";
@@ -112,13 +112,14 @@ if (file_exists("save.ini"))
     ini_open("save.ini")
         for (var i=0; i<=global.dex_len; i++)
             global.savedata[i] = ini_read_real("Pokemon", string(i), 0);
+        global.current_box = ini_read_real("Navigation", "Current Box", 1);
     ini_close();
     show_debug_message("LOADED SAVE FILE.");
 }
 else
 {
     ini_open("save.ini");
-        ini_write_real("Version", "Number", 0.1);
+        ini_write_real("Info", "Number", 0.1);
     ini_close();
     show_debug_message("CREATED SAVE FILE.");
 }
@@ -148,34 +149,45 @@ var pos_x = 0;
 var pos_y = 0;
 
 global.current = 1;
-//global.box_len = 40;
 
-for (var i=0; i<100; i++)
-    for (var j=0; j<6; j++)
-    {
-        with instance_create(j*global.box_len, i*global.box_len, obj_slot)
+for (global.box_count=1; global.current<global.dex_len; global.box_count++)
+{
+    global.box_header[global.box_count] = instance_create(0, 0, obj_header);
+    global.box_header[global.box_count].number = global.box_count;
+    
+    for (var i=0; i<5; i++) // Box Y
+        for (var j=0; j<6; j++) // Box X
         {
-            idno =      global.dexdata[global.current, dex.idno];
-            dexno =     global.dexdata[global.current, dex.dexno];
-            pokemon =   global.dexdata[global.current, dex.pokemon];
-            form =      global.dexdata[global.current, dex.form];
-            type1 =     global.dexdata[global.current, dex.type1];
-            type2 =     global.dexdata[global.current, dex.type2];
+            if (global.current<global.dex_len)
+            {
+                with instance_create(j, i, obj_slot)
+                {
+                    idno =      global.dexdata[global.current, dex.idno];
+                    dexno =     global.dexdata[global.current, dex.dexno];
+                    pokemon =   global.dexdata[global.current, dex.pokemon];
+                    form =      global.dexdata[global.current, dex.form];
+                    type1 =     global.dexdata[global.current, dex.type1];
+                    type2 =     global.dexdata[global.current, dex.type2];
+                    
+                    own = global.savedata[global.current];
+                    
+                    color = get_color3(own, false);
+                    
+                    image_speed = 0;
+                    hover = false;
+                    spr = sprite_add("Icons\Regular\"+string(pokemon)+".png",0,true,false,19,14);
+                    
+                    slot_box =  global.box_count;
+                    slot_x =    j;
+                    slot_y =    i;
+                    
+                    show_debug_message("Spawned #"+dexno+" "+pokemon+" "+form+".");
+                }
             
-            own = global.savedata[global.current];
-            
-            color = get_color3(own, false);
-            
-            image_speed = 0;
-            hover = false;
-            spr = sprite_add("Icons\Regular\"+string(pokemon)+".png",0,true,false,19,14);
-            
-            slot_x = j;
-            slot_y = i;
+                global.current++;
+            }
         }
-        
-        global.current++;
-    }
+}
 </string>
           </argument>
         </arguments>
@@ -224,41 +236,25 @@ for (var i=0; i&lt;100; i++)
     <event eventtype="3" enumb="0">
       <action>
         <libid>1</libid>
-        <id>601</id>
-        <kind>0</kind>
+        <id>603</id>
+        <kind>7</kind>
         <userelative>0</userelative>
         <isquestion>0</isquestion>
         <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_execute_script</functionname>
+        <exetype>2</exetype>
+        <functionname></functionname>
         <codestring></codestring>
         <whoName>self</whoName>
         <relative>0</relative>
         <isnot>0</isnot>
         <arguments>
           <argument>
-            <kind>9</kind>
-            <script>scr_window_resize</script>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string></string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string></string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string></string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string></string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string></string>
+            <kind>1</kind>
+            <string>/// WINDOW RESIZE CHECK
+
+if (window_get_width()!=global.window_width || window_get_height()!=global.window_height)
+    scr_window_resize();
+</string>
           </argument>
         </arguments>
       </action>
@@ -299,7 +295,27 @@ for (var i=0; i&lt;100; i++)
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>/// WINDOW RESIZE CHECK
+            <string>/// SCROLLING
+
+if (mouse_wheel_up())
+{
+    global.current_box--;
+    
+    if (global.current_box &lt; 1)
+        global.current_box = 1;
+    else  
+        scroll_do();
+}
+else if (mouse_wheel_down())
+{
+    global.current_box++;
+    
+    if (global.current_box &gt; global.box_count-1)
+        global.current_box = global.box_count-1;
+    else
+        scroll_do();
+}
+    
 
 </string>
           </argument>

LivingDexSS.gmx/objects/obj_header.object.gmx

@@ -0,0 +1,51 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<object>
+  <spriteName>spr_source</spriteName>
+  <solid>0</solid>
+  <visible>-1</visible>
+  <depth>0</depth>
+  <persistent>0</persistent>
+  <parentName>&lt;undefined&gt;</parentName>
+  <maskName>&lt;undefined&gt;</maskName>
+  <events>
+    <event eventtype="0" enumb="0">
+      <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>/// INITIALS
+
+image_speed = 0;
+
+image_index = 4;
+</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+  </events>
+  <PhysicsObject>0</PhysicsObject>
+  <PhysicsObjectSensor>0</PhysicsObjectSensor>
+  <PhysicsObjectShape>0</PhysicsObjectShape>
+  <PhysicsObjectDensity>0.5</PhysicsObjectDensity>
+  <PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
+  <PhysicsObjectGroup>0</PhysicsObjectGroup>
+  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
+  <PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
+  <PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
+  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
+  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
+  <PhysicsShapePoints/>
+</object>

LivingDexSS.gmx/objects/obj_slot.object.gmx

@@ -127,8 +127,8 @@ else
           <argument>
             <kind>1</kind>
             <string>// Scaling
-image_xscale = global.icon_scale;
-image_yscale = global.icon_scale;
+//image_xscale = global.icon_scale;
+//image_yscale = global.icon_scale;
 
 
 // Back color

LivingDexSS.gmx/scripts/scr_window_resize.gml

@@ -1,41 +1,45 @@
-if ((   window_get_width() != global.window_width ||
-        window_get_height() != global.window_height) &&
-        !window_get_fullscreen())
+// Views and that.
+
+global.window_width = window_get_width();
+global.window_height = window_get_height();
+
+view_wport[0] = global.window_width;
+view_hport[0] = global.window_height;
+
+surface_resize(application_surface, view_wport[0], view_hport[0]);  
+
+
+// Slots
+
+var spr_size = sprite_get_width(spr_slot);
+
+for(var i=2; i*spr_size<global.window_width/2/6; i++){}
+
+global.icon_scale = i-1;
+global.box_len = spr_size*global.icon_scale;
+
+with (obj_header)
 {
-    view_wport[0] = window_get_width();
-    view_hport[0] = window_get_height();
-    
-    surface_resize(application_surface, view_wport[0], view_hport[0]);  
-    
-    global.window_width = window_get_width();
-    global.window_height = window_get_height();
-    
-    global.box_len = global.window_width/2/7;
-    
-    room_width = global.window_width;
-    room_height = global.window_height;
-    
-    // If mult scale is allowed:
-    //global.icon_scale = (1 * global.box_len) / 40;
-    
-    for(var i=2; global.box_len>i*40; i++){}
-    global.icon_scale = i-1;
-    
-    /*global.icon_scale = 2;
-    
-    while(global.box_len < global.icon_scale*40)
-        global.icon_scale++;
-    
-    global.icon_scale--;*/
-    
-    with obj_slot
-    {
-        image_xscale = global.icon_scale;
-        image_yscale = global.icon_scale;
-        
-        x = global.box_len/2 + global.box_len * slot_x;
-        y = global.box_len * slot_y;
-    }
-    
-    show_debug_message("Window Resized.");
+    image_xscale = 3.25 * global.icon_scale;
+    image_yscale = global.icon_scale;    
+
+    x = global.window_width/4 - global.box_len*3 + global.icon_scale*3;
+    y = global.box_len + (global.box_len*6)*(number-1);
 }
+
+with (obj_slot)
+{
+    image_xscale = global.icon_scale;
+    image_yscale = global.icon_scale;
+    
+    x = global.window_width/4 - global.box_len*3 + global.box_len*slot_x;
+    y = global.box_header[slot_box].y+24*global.icon_scale + global.box_len*slot_y;
+}
+
+
+
+room_width = global.window_width;
+room_height = global.window_height;
+
+
+show_debug_message("Window Resized.");

LivingDexSS.gmx/scripts/scroll_do.gml

@@ -0,0 +1,16 @@
+// Saving
+
+if (file_exists("save.ini"))
+{
+    ini_open("save.ini")
+        ini_write_real("Navigation", "Current Box", global.current_box);
+    ini_close();
+}
+else
+    show_debug_message("ERROR: Can't save scrolling. Save file somehow went missing.");
+
+// Warp
+
+scroll_warp();
+
+show_debug_message("Scrolled to Box "+string(global.current_box));

LivingDexSS.gmx/scripts/scroll_warp.gml

@@ -0,0 +1 @@
+view_yview[0] = global.box_header[global.current_box].y;

LivingDexSS.gmx/sprites/spr_font.sprite.gmx

@@ -72,5 +72,7 @@
     <frame index="49">images\spr_font_49.png</frame>
     <frame index="50">images\spr_font_50.png</frame>
     <frame index="51">images\spr_font_51.png</frame>
+    <frame index="52">images\spr_font_52.png</frame>
+    <frame index="53">images\spr_font_53.png</frame>
   </frames>
 </sprite>

LivingDexSS.gmx/sprites/spr_source.sprite.gmx

@@ -0,0 +1,33 @@
+<!--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>
+  <colkind>1</colkind>
+  <coltolerance>0</coltolerance>
+  <sepmasks>0</sepmasks>
+  <bboxmode>0</bboxmode>
+  <bbox_left>0</bbox_left>
+  <bbox_right>71</bbox_right>
+  <bbox_top>0</bbox_top>
+  <bbox_bottom>23</bbox_bottom>
+  <HTile>0</HTile>
+  <VTile>0</VTile>
+  <TextureGroups>
+    <TextureGroup0>0</TextureGroup0>
+  </TextureGroups>
+  <For3D>0</For3D>
+  <width>72</width>
+  <height>24</height>
+  <frames>
+    <frame index="0">images\spr_source_0.png</frame>
+    <frame index="1">images\spr_source_1.png</frame>
+    <frame index="2">images\spr_source_2.png</frame>
+    <frame index="3">images\spr_source_3.png</frame>
+    <frame index="4">images\spr_source_4.png</frame>
+    <frame index="5">images\spr_source_5.png</frame>
+    <frame index="6">images\spr_source_6.png</frame>
+    <frame index="7">images\spr_source_7.png</frame>
+    <frame index="8">images\spr_source_8.png</frame>
+  </frames>
+</sprite>

LivingDexSS.gmx/sprites/spr_tag.sprite.gmx

@@ -0,0 +1,53 @@
+<!--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>-33</xorig>
+  <yorigin>-25</yorigin>
+  <colkind>1</colkind>
+  <coltolerance>0</coltolerance>
+  <sepmasks>0</sepmasks>
+  <bboxmode>0</bboxmode>
+  <bbox_left>0</bbox_left>
+  <bbox_right>6</bbox_right>
+  <bbox_top>0</bbox_top>
+  <bbox_bottom>14</bbox_bottom>
+  <HTile>0</HTile>
+  <VTile>0</VTile>
+  <TextureGroups>
+    <TextureGroup0>0</TextureGroup0>
+  </TextureGroups>
+  <For3D>0</For3D>
+  <width>7</width>
+  <height>15</height>
+  <frames>
+    <frame index="0">images\spr_tag_0.png</frame>
+    <frame index="1">images\spr_tag_1.png</frame>
+    <frame index="2">images\spr_tag_2.png</frame>
+    <frame index="3">images\spr_tag_3.png</frame>
+    <frame index="4">images\spr_tag_4.png</frame>
+    <frame index="5">images\spr_tag_5.png</frame>
+    <frame index="6">images\spr_tag_6.png</frame>
+    <frame index="7">images\spr_tag_7.png</frame>
+    <frame index="8">images\spr_tag_8.png</frame>
+    <frame index="9">images\spr_tag_9.png</frame>
+    <frame index="10">images\spr_tag_10.png</frame>
+    <frame index="11">images\spr_tag_11.png</frame>
+    <frame index="12">images\spr_tag_12.png</frame>
+    <frame index="13">images\spr_tag_13.png</frame>
+    <frame index="14">images\spr_tag_14.png</frame>
+    <frame index="15">images\spr_tag_15.png</frame>
+    <frame index="16">images\spr_tag_16.png</frame>
+    <frame index="17">images\spr_tag_17.png</frame>
+    <frame index="18">images\spr_tag_18.png</frame>
+    <frame index="19">images\spr_tag_19.png</frame>
+    <frame index="20">images\spr_tag_20.png</frame>
+    <frame index="21">images\spr_tag_21.png</frame>
+    <frame index="22">images\spr_tag_22.png</frame>
+    <frame index="23">images\spr_tag_23.png</frame>
+    <frame index="24">images\spr_tag_24.png</frame>
+    <frame index="25">images\spr_tag_25.png</frame>
+    <frame index="26">images\spr_tag_26.png</frame>
+    <frame index="27">images\spr_tag_27.png</frame>
+    <frame index="28">images\spr_tag_28.png</frame>
+  </frames>
+</sprite>