From 83b235ebf0ca73d28fb9fbff4205950b75a0d6a0 Mon Sep 17 00:00:00 2001
From: TheGreenTie <green.tie.rgm@gmail.com>
Date: Mon, 2 Mar 2020 14:39:43 -0600
Subject: [PATCH] Prettying up screenshots.

---
 Project/DexTool.yyp                           |  29 ++++-
 .../draw_set_default/draw_set_default.gml     |   3 +
 .../draw_set_default/draw_set_default.yy      |   8 ++
 .../make_screenshot/make_screenshot.gml       | 108 ++----------------
 .../make_screenshot_regular.gml               |  47 ++++++++
 .../make_screenshot_regular.yy                |   8 ++
 .../make_screenshot_shiny.gml                 |  51 +++++++++
 .../make_screenshot_shiny.yy                  |   8 ++
 .../e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy   |   5 +-
 9 files changed, 164 insertions(+), 103 deletions(-)
 create mode 100644 Project/scripts/draw_set_default/draw_set_default.gml
 create mode 100644 Project/scripts/draw_set_default/draw_set_default.yy
 create mode 100644 Project/scripts/make_screenshot_regular/make_screenshot_regular.gml
 create mode 100644 Project/scripts/make_screenshot_regular/make_screenshot_regular.yy
 create mode 100644 Project/scripts/make_screenshot_shiny/make_screenshot_shiny.gml
 create mode 100644 Project/scripts/make_screenshot_shiny/make_screenshot_shiny.yy

diff --git a/Project/DexTool.yyp b/Project/DexTool.yyp
index f6eb36f..1ec3d27 100644
--- a/Project/DexTool.yyp
+++ b/Project/DexTool.yyp
@@ -14718,6 +14718,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23",
+            "Value": {
+                "id": "3c301798-872c-5b62-c8a4-e15894720ff2",
+                "resourcePath": "scripts\\draw_set_default\\draw_set_default.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "a807a5d6-f42b-4cfb-94cb-7a53b6282083",
             "Value": {
@@ -17518,6 +17526,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "c854fb34-52ee-fd8e-b01b-086f33590212",
+            "Value": {
+                "id": "0ce73cbf-3dea-570c-f0a2-5573ed9bc787",
+                "resourcePath": "scripts\\make_screenshot_regular\\make_screenshot_regular.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "c8dafb39-1806-4c1e-85e8-e7b684760302",
             "Value": {
@@ -18342,6 +18358,14 @@
                 "resourceType": "GMIncludedFile"
             }
         },
+        {
+            "Key": "d258aee7-2bed-eaae-edfb-2228979346df",
+            "Value": {
+                "id": "eac9f92c-7160-17fe-3005-5af467bad86c",
+                "resourcePath": "scripts\\make_screenshot_shiny\\make_screenshot_shiny.yy",
+                "resourceType": "GMScript"
+            }
+        },
         {
             "Key": "d2798081-22fa-49a5-a60c-8d4f49201e9b",
             "Value": {
@@ -22314,7 +22338,10 @@
         "aa47343b-06e8-c5c7-5f42-7551e6b2c23f",
         "6ee30c99-62bc-bcf5-3853-e159533ab6d0",
         "9081971b-e1be-521f-34be-38fcfa32f684",
-        "b0a1886d-571c-9ed1-098f-65abb5bf18f6"
+        "b0a1886d-571c-9ed1-098f-65abb5bf18f6",
+        "c854fb34-52ee-fd8e-b01b-086f33590212",
+        "d258aee7-2bed-eaae-edfb-2228979346df",
+        "a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23"
     ],
     "tutorial": ""
 }
\ No newline at end of file
diff --git a/Project/scripts/draw_set_default/draw_set_default.gml b/Project/scripts/draw_set_default/draw_set_default.gml
new file mode 100644
index 0000000..a46f937
--- /dev/null
+++ b/Project/scripts/draw_set_default/draw_set_default.gml
@@ -0,0 +1,3 @@
+draw_set_color(c_white);
+draw_set_valign(fa_top);
+draw_set_halign(fa_left);
\ No newline at end of file
diff --git a/Project/scripts/draw_set_default/draw_set_default.yy b/Project/scripts/draw_set_default/draw_set_default.yy
new file mode 100644
index 0000000..0a73015
--- /dev/null
+++ b/Project/scripts/draw_set_default/draw_set_default.yy
@@ -0,0 +1,8 @@
+{
+    "id": "a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "draw_set_default",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/scripts/make_screenshot/make_screenshot.gml b/Project/scripts/make_screenshot/make_screenshot.gml
index 0c8fa08..0d8d48c 100644
--- a/Project/scripts/make_screenshot/make_screenshot.gml
+++ b/Project/scripts/make_screenshot/make_screenshot.gml
@@ -1,111 +1,17 @@
-// Set Size
+///make_screenshot()
 
-if (!global.show_shiny) // Regulars
-{
-    var slots_per_line = 32;
-    var slots_h = ceil(global.dex_len/slots_per_line);
-    
-    var slot_w = 40;
-    var slot_h = 30;
-    
-    var size_w = slots_per_line * slot_w + slot_w;
-    var size_h = slots_h * slot_h;
-    
-    var surf = surface_create(size_w, size_h);
-    surface_set_target(surf);
-    draw_clear(c_white);
-    
-    // Slots
-    var current = 1;
+if (!global.show_shiny)
+    var sprtemp = make_screenshot_regular();
+else
+    var sprtemp = make_screenshot_shiny();
 
-    for (var i=1; i<=slots_h; i++)
-        for (var j=1; j<slots_per_line; j++)
-            if (current<global.dex_len)
-            {
-                while(!check_skip(current))
-                    current++;
-                
-                var px = j*slot_w;
-                var py = i*slot_h;
-                
-                draw_set_color(get_color3(global.savedata[global.dexdata[current, dex.idno]], false));
-                draw_rectangle(px, py, px+slot_w, py+slot_h, false);
-                
-                draw_set_color(c_black);
-                draw_rectangle(px, py, px+slot_w, py+slot_h, true);
-                
-                draw_sprite(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, j*slot_w+slot_w/2, i*slot_h+slot_h/2);
-                
-                show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+"."); 
-                
-                current++;
-            }
-            else
-                break;
-}
-else // Shinies
-{
-    var mult = 2;
-    var offset = 40/* * mult / 2*/;
-    var slot_w = offset * 5;
-    var slot_h = 30 * mult;
-    
-    var size_w = slot_w + offset*2;
-    var size_h = slot_h*global.progress + offset*2;
-    
-    var surf = surface_create(size_w, size_h);
-    surface_set_target(surf);
-    draw_clear(c_white);
-    
-    var current = 1;
-    
-    for (var i=0; current<global.dex_len; i++)
-    {
-        while(!check_skip(current))
-            current++;
-            
-        if (global.savedata[global.dexdata[current, dex.idno]])
-        {
-            var px = offset;
-            var py = offset + i*slot_h;
-        
-            draw_set_color(get_color3(global.savedata[global.dexdata[current, dex.idno]], false));
-            draw_rectangle(px, py, px+slot_w, py+slot_h, false);
-            
-            draw_set_color(c_black);
-            draw_rectangle(px, py, px+slot_w, py+slot_h, true);
-            
-            draw_sprite_ext(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, px+offset*mult/2, offset+i*slot_h+slot_h/2, mult, mult, image_angle, image_blend, image_alpha);
-            
-            draw_set_font(global.font);
-            draw_set_color(c_white);
-            draw_set_valign(fa_middle);
-            draw_set_halign(fa_center);
-            draw_text_transformed(/*px+offset*mult*/px+slot_w*0.7, offset+i*slot_h+slot_h/2, "334", mult*2.5, mult*2.5, image_angle);
-            
-            show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+"."); 
-        }
-        else
-            i--;
-            
-        current++;
-    }
-}
-
-draw_set_color(c_white);
-draw_set_valign(fa_top);
-draw_set_halign(fa_left);
+draw_set_default();
 
 
 // Saving
-
-surface_reset_target();
-sprtemp = sprite_create_from_surface(surf,0,0,size_w,size_h,false,false,0,0)
-surface_free(surf)
-
 var filename = "dex";
 var ext = ".png";
 sprite_save(sprtemp, 0, filename+ext);
 
 var user = string(environment_get_variable("USERNAME"));
-show_debug_message("Image exported to C:\Users"+chr(92)+user+"\AppData\Local\DexTool"+filename+ext+".");
+show_debug_message("Image exported to C:\Users"+chr(92)+user+"\AppData\Local\DexTool"+filename+ext+".");
\ No newline at end of file
diff --git a/Project/scripts/make_screenshot_regular/make_screenshot_regular.gml b/Project/scripts/make_screenshot_regular/make_screenshot_regular.gml
new file mode 100644
index 0000000..23470fe
--- /dev/null
+++ b/Project/scripts/make_screenshot_regular/make_screenshot_regular.gml
@@ -0,0 +1,47 @@
+var slots_per_line = 32;
+var slots_h = ceil(global.dex_len/slots_per_line);
+
+var slot_w = 40;
+var slot_h = 30;
+
+var size_w = slots_per_line * slot_w + slot_w;
+var size_h = slots_h * slot_h;
+
+var surf = surface_create(size_w, size_h);
+surface_set_target(surf);
+draw_clear(c_white);
+
+// Slots
+var current = 1;
+
+for (var i=1; i<=slots_h; i++)
+    for (var j=1; j<slots_per_line; j++)
+        if (current<global.dex_len)
+        {
+            while(!check_skip(current))
+                current++;
+            
+            var px = j*slot_w;
+            var py = i*slot_h;
+            
+            draw_set_color(get_color3(global.savedata[global.dexdata[current, dex.idno]], false));
+            draw_rectangle(px, py, px+slot_w, py+slot_h, false);
+            
+            draw_set_color(c_black);
+            draw_rectangle(px, py, px+slot_w, py+slot_h, true);
+            
+            draw_sprite(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, j*slot_w+slot_w/2, i*slot_h+slot_h/2);
+            
+            show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+"."); 
+            
+            current++;
+        }
+        else
+            break;
+
+
+surface_reset_target();
+var sprtemp = sprite_create_from_surface(surf,0,0,size_w,size_h,false,false,0,0)
+surface_free(surf)
+
+return sprtemp;
\ No newline at end of file
diff --git a/Project/scripts/make_screenshot_regular/make_screenshot_regular.yy b/Project/scripts/make_screenshot_regular/make_screenshot_regular.yy
new file mode 100644
index 0000000..00ff0fc
--- /dev/null
+++ b/Project/scripts/make_screenshot_regular/make_screenshot_regular.yy
@@ -0,0 +1,8 @@
+{
+    "id": "c854fb34-52ee-fd8e-b01b-086f33590212",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "make_screenshot_regular",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/scripts/make_screenshot_shiny/make_screenshot_shiny.gml b/Project/scripts/make_screenshot_shiny/make_screenshot_shiny.gml
new file mode 100644
index 0000000..6bd96a7
--- /dev/null
+++ b/Project/scripts/make_screenshot_shiny/make_screenshot_shiny.gml
@@ -0,0 +1,51 @@
+var mult = 2;
+var offset = 40/* * mult / 2*/;
+var slot_w = offset * 5;
+var slot_h = 30 * mult;
+
+var size_w = slot_w + offset*2;
+var size_h = slot_h*global.progress + offset*2;
+
+var surf = surface_create(size_w, size_h);
+surface_set_target(surf);
+draw_clear(c_white);
+
+var current = 1;
+
+for (var i=0; current<global.dex_len; i++)
+{
+    while(!check_skip(current))
+        current++;
+        
+    if (global.savedata[global.dexdata[current, dex.idno]])
+    {
+        var px = offset;
+        var py = offset + i*slot_h;
+    
+        draw_set_color(get_color3(global.savedata[global.dexdata[current, dex.idno]], false));
+        draw_rectangle(px, py, px+slot_w, py+slot_h, false);
+        
+        draw_set_color(c_black);
+        draw_rectangle(px, py, px+slot_w, py+slot_h, true);
+        
+        draw_sprite_ext(make_sprite(global.dexdata[current, dex.pokemon], global.dexdata[current, dex.form]), 0, px+offset*mult/2, offset+i*slot_h+slot_h/2, mult, mult, image_angle, image_blend, image_alpha);
+        
+        draw_set_font(global.font);
+        draw_set_color(c_white);
+        draw_set_valign(fa_middle);
+        draw_set_halign(fa_center);
+        draw_text_transformed(/*px+offset*mult*/px+slot_w*0.7, offset+i*slot_h+slot_h/2, "334", mult*2.5, mult*2.5, image_angle);
+        
+        show_debug_message("Snapshot: Drew #"+global.dexdata[current, dex.dexno]+" "+global.dexdata[current, dex.pokemon]+"."); 
+    }
+    else
+        i--;
+        
+    current++;
+}
+
+surface_reset_target();
+var sprtemp = sprite_create_from_surface(surf,0,0,size_w,size_h,false,false,0,0)
+surface_free(surf)
+
+return sprtemp;
\ No newline at end of file
diff --git a/Project/scripts/make_screenshot_shiny/make_screenshot_shiny.yy b/Project/scripts/make_screenshot_shiny/make_screenshot_shiny.yy
new file mode 100644
index 0000000..b5cc01c
--- /dev/null
+++ b/Project/scripts/make_screenshot_shiny/make_screenshot_shiny.yy
@@ -0,0 +1,8 @@
+{
+    "id": "d258aee7-2bed-eaae-edfb-2228979346df",
+    "modelName": "GMScript",
+    "mvc": "1.0",
+    "name": "make_screenshot_shiny",
+    "IsCompatibility": false,
+    "IsDnD": false
+}
\ No newline at end of file
diff --git a/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy b/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
index 442a286..1682737 100644
--- a/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
+++ b/Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
@@ -67,7 +67,10 @@
         "aa0cd879-2cce-411a-dd1a-10c3fd63f802",
         "ba2125b7-8439-ee4b-a25c-45062dccc0e6",
         "15f6da05-1158-20ed-dd4b-2fbf23fb3faf",
-        "6ce290dc-805f-91e8-ca66-1b31a6b638b4"
+        "6ce290dc-805f-91e8-ca66-1b31a6b638b4",
+        "c854fb34-52ee-fd8e-b01b-086f33590212",
+        "d258aee7-2bed-eaae-edfb-2228979346df",
+        "a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23"
     ],
     "filterType": "GMScript",
     "folderName": "scripts",