diff --git a/LivingDexSS.gmx/Configs/Default.config.gmx b/LivingDexSS.gmx/Configs/Default.config.gmx index 34d0edd..d94db8d 100644 --- a/LivingDexSS.gmx/Configs/Default.config.gmx +++ b/LivingDexSS.gmx/Configs/Default.config.gmx @@ -211,7 +211,7 @@ false true 0 - GameMaker: Studio + DexTools True 0 @@ -490,7 +490,7 @@ False 100 0 - + Posho 1 @@ -570,7 +570,7 @@ clBlack False 0 - + Posho False @@ -590,7 +590,7 @@ Configs\Default\windows\splash.png 0 2048 - -1 + 0 1 Configs\Default\WinPhone\SplashScreenImage480.jpg Configs\Default\WinPhone\SplashScreenImage720.jpg diff --git a/LivingDexSS.gmx/Configs/Default/windows/runner_icon.ico b/LivingDexSS.gmx/Configs/Default/windows/runner_icon.ico index f6c1b44..8226e3a 100644 Binary files a/LivingDexSS.gmx/Configs/Default/windows/runner_icon.ico and b/LivingDexSS.gmx/Configs/Default/windows/runner_icon.ico differ diff --git a/LivingDexSS.gmx/LivingDexSS.project.gmx b/LivingDexSS.gmx/LivingDexSS.project.gmx index 168d828..4e0935c 100644 --- a/LivingDexSS.gmx/LivingDexSS.project.gmx +++ b/LivingDexSS.gmx/LivingDexSS.project.gmx @@ -39857,6 +39857,8 @@ sprites\spr_slot sprites\spr_font sprites\spr_type + sprites\spr_source + sprites\spr_tag @@ -39871,10 +39873,13 @@ + + objects\obj_global objects\obj_slot + objects\obj_header rooms\room0 diff --git a/LivingDexSS.gmx/objects/obj_global.object.gmx b/LivingDexSS.gmx/objects/obj_global.object.gmx index 8df3632..63062cc 100644 --- a/LivingDexSS.gmx/objects/obj_global.object.gmx +++ b/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++; - } +} @@ -224,41 +236,25 @@ for (var i=0; i<100; i++) 1 - 601 - 0 + 603 + 7 0 0 -1 - 1 - action_execute_script + 2 + self 0 0 - 9 - - - - 0 - - - - 0 - - - - 0 - - - - 0 - - - - 0 - + 1 + /// WINDOW RESIZE CHECK + +if (window_get_width()!=global.window_width || window_get_height()!=global.window_height) + scr_window_resize(); + @@ -299,7 +295,27 @@ for (var i=0; i<100; i++) 1 - /// WINDOW RESIZE CHECK + /// SCROLLING + +if (mouse_wheel_up()) +{ + global.current_box--; + + if (global.current_box < 1) + global.current_box = 1; + else + scroll_do(); +} +else if (mouse_wheel_down()) +{ + global.current_box++; + + if (global.current_box > global.box_count-1) + global.current_box = global.box_count-1; + else + scroll_do(); +} + diff --git a/LivingDexSS.gmx/objects/obj_header.object.gmx b/LivingDexSS.gmx/objects/obj_header.object.gmx new file mode 100644 index 0000000..0e80888 --- /dev/null +++ b/LivingDexSS.gmx/objects/obj_header.object.gmx @@ -0,0 +1,51 @@ + + + spr_source + 0 + -1 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// INITIALS + +image_speed = 0; + +image_index = 4; + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/LivingDexSS.gmx/objects/obj_slot.object.gmx b/LivingDexSS.gmx/objects/obj_slot.object.gmx index a921ae4..244a55d 100644 --- a/LivingDexSS.gmx/objects/obj_slot.object.gmx +++ b/LivingDexSS.gmx/objects/obj_slot.object.gmx @@ -127,8 +127,8 @@ else 1 // Scaling -image_xscale = global.icon_scale; -image_yscale = global.icon_scale; +//image_xscale = global.icon_scale; +//image_yscale = global.icon_scale; // Back color diff --git a/LivingDexSS.gmx/scripts/scr_window_resize.gml b/LivingDexSS.gmx/scripts/scr_window_resize.gml index 28478f8..2f54bf0 100644 --- a/LivingDexSS.gmx/scripts/scr_window_resize.gml +++ b/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_sizei*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."); diff --git a/LivingDexSS.gmx/scripts/scroll_do.gml b/LivingDexSS.gmx/scripts/scroll_do.gml new file mode 100644 index 0000000..0ca0858 --- /dev/null +++ b/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)); diff --git a/LivingDexSS.gmx/scripts/scroll_warp.gml b/LivingDexSS.gmx/scripts/scroll_warp.gml new file mode 100644 index 0000000..db66367 --- /dev/null +++ b/LivingDexSS.gmx/scripts/scroll_warp.gml @@ -0,0 +1 @@ +view_yview[0] = global.box_header[global.current_box].y; diff --git a/LivingDexSS.gmx/sprites/images/spr_font_52.png b/LivingDexSS.gmx/sprites/images/spr_font_52.png new file mode 100644 index 0000000..e23c6bf Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_font_52.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_font_53.png b/LivingDexSS.gmx/sprites/images/spr_font_53.png new file mode 100644 index 0000000..3710870 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_font_53.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_0.png b/LivingDexSS.gmx/sprites/images/spr_source_0.png new file mode 100644 index 0000000..590d1f3 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_0.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_1.png b/LivingDexSS.gmx/sprites/images/spr_source_1.png new file mode 100644 index 0000000..6254235 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_1.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_2.png b/LivingDexSS.gmx/sprites/images/spr_source_2.png new file mode 100644 index 0000000..4245f7b Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_2.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_3.png b/LivingDexSS.gmx/sprites/images/spr_source_3.png new file mode 100644 index 0000000..53de127 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_3.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_4.png b/LivingDexSS.gmx/sprites/images/spr_source_4.png new file mode 100644 index 0000000..da60602 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_4.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_5.png b/LivingDexSS.gmx/sprites/images/spr_source_5.png new file mode 100644 index 0000000..2016dfe Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_5.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_6.png b/LivingDexSS.gmx/sprites/images/spr_source_6.png new file mode 100644 index 0000000..6d6da49 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_6.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_7.png b/LivingDexSS.gmx/sprites/images/spr_source_7.png new file mode 100644 index 0000000..42be0fb Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_7.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_source_8.png b/LivingDexSS.gmx/sprites/images/spr_source_8.png new file mode 100644 index 0000000..43cc540 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_source_8.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_0.png b/LivingDexSS.gmx/sprites/images/spr_tag_0.png new file mode 100644 index 0000000..f4440b6 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_0.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_1.png b/LivingDexSS.gmx/sprites/images/spr_tag_1.png new file mode 100644 index 0000000..d1ca1fc Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_1.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_10.png b/LivingDexSS.gmx/sprites/images/spr_tag_10.png new file mode 100644 index 0000000..973ec53 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_10.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_11.png b/LivingDexSS.gmx/sprites/images/spr_tag_11.png new file mode 100644 index 0000000..6d58be3 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_11.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_12.png b/LivingDexSS.gmx/sprites/images/spr_tag_12.png new file mode 100644 index 0000000..e4adb61 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_12.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_13.png b/LivingDexSS.gmx/sprites/images/spr_tag_13.png new file mode 100644 index 0000000..577a70c Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_13.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_14.png b/LivingDexSS.gmx/sprites/images/spr_tag_14.png new file mode 100644 index 0000000..0b7b600 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_14.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_15.png b/LivingDexSS.gmx/sprites/images/spr_tag_15.png new file mode 100644 index 0000000..c94f75a Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_15.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_16.png b/LivingDexSS.gmx/sprites/images/spr_tag_16.png new file mode 100644 index 0000000..79d6b97 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_16.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_17.png b/LivingDexSS.gmx/sprites/images/spr_tag_17.png new file mode 100644 index 0000000..ccd1992 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_17.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_18.png b/LivingDexSS.gmx/sprites/images/spr_tag_18.png new file mode 100644 index 0000000..0f44c2b Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_18.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_19.png b/LivingDexSS.gmx/sprites/images/spr_tag_19.png new file mode 100644 index 0000000..50c55f9 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_19.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_2.png b/LivingDexSS.gmx/sprites/images/spr_tag_2.png new file mode 100644 index 0000000..5b13567 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_2.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_20.png b/LivingDexSS.gmx/sprites/images/spr_tag_20.png new file mode 100644 index 0000000..39023fe Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_20.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_21.png b/LivingDexSS.gmx/sprites/images/spr_tag_21.png new file mode 100644 index 0000000..9b79720 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_21.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_22.png b/LivingDexSS.gmx/sprites/images/spr_tag_22.png new file mode 100644 index 0000000..7fd9c5a Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_22.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_23.png b/LivingDexSS.gmx/sprites/images/spr_tag_23.png new file mode 100644 index 0000000..52a82ce Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_23.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_24.png b/LivingDexSS.gmx/sprites/images/spr_tag_24.png new file mode 100644 index 0000000..208ed57 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_24.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_25.png b/LivingDexSS.gmx/sprites/images/spr_tag_25.png new file mode 100644 index 0000000..7872547 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_25.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_26.png b/LivingDexSS.gmx/sprites/images/spr_tag_26.png new file mode 100644 index 0000000..6dcd751 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_26.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_27.png b/LivingDexSS.gmx/sprites/images/spr_tag_27.png new file mode 100644 index 0000000..1515d7b Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_27.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_28.png b/LivingDexSS.gmx/sprites/images/spr_tag_28.png new file mode 100644 index 0000000..1018020 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_28.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_3.png b/LivingDexSS.gmx/sprites/images/spr_tag_3.png new file mode 100644 index 0000000..dbb07e8 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_3.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_4.png b/LivingDexSS.gmx/sprites/images/spr_tag_4.png new file mode 100644 index 0000000..b1a6683 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_4.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_5.png b/LivingDexSS.gmx/sprites/images/spr_tag_5.png new file mode 100644 index 0000000..1df8d25 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_5.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_6.png b/LivingDexSS.gmx/sprites/images/spr_tag_6.png new file mode 100644 index 0000000..5de7258 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_6.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_7.png b/LivingDexSS.gmx/sprites/images/spr_tag_7.png new file mode 100644 index 0000000..c5a0894 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_7.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_8.png b/LivingDexSS.gmx/sprites/images/spr_tag_8.png new file mode 100644 index 0000000..b1e929b Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_8.png differ diff --git a/LivingDexSS.gmx/sprites/images/spr_tag_9.png b/LivingDexSS.gmx/sprites/images/spr_tag_9.png new file mode 100644 index 0000000..7afa1b1 Binary files /dev/null and b/LivingDexSS.gmx/sprites/images/spr_tag_9.png differ diff --git a/LivingDexSS.gmx/sprites/spr_font.sprite.gmx b/LivingDexSS.gmx/sprites/spr_font.sprite.gmx index 78095b3..be9d889 100644 --- a/LivingDexSS.gmx/sprites/spr_font.sprite.gmx +++ b/LivingDexSS.gmx/sprites/spr_font.sprite.gmx @@ -72,5 +72,7 @@ images\spr_font_49.png images\spr_font_50.png images\spr_font_51.png + images\spr_font_52.png + images\spr_font_53.png diff --git a/LivingDexSS.gmx/sprites/spr_source.sprite.gmx b/LivingDexSS.gmx/sprites/spr_source.sprite.gmx new file mode 100644 index 0000000..e4e138c --- /dev/null +++ b/LivingDexSS.gmx/sprites/spr_source.sprite.gmx @@ -0,0 +1,33 @@ + + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 71 + 0 + 23 + 0 + 0 + + 0 + + 0 + 72 + 24 + + images\spr_source_0.png + images\spr_source_1.png + images\spr_source_2.png + images\spr_source_3.png + images\spr_source_4.png + images\spr_source_5.png + images\spr_source_6.png + images\spr_source_7.png + images\spr_source_8.png + + diff --git a/LivingDexSS.gmx/sprites/spr_tag.sprite.gmx b/LivingDexSS.gmx/sprites/spr_tag.sprite.gmx new file mode 100644 index 0000000..f481483 --- /dev/null +++ b/LivingDexSS.gmx/sprites/spr_tag.sprite.gmx @@ -0,0 +1,53 @@ + + + 0 + -33 + -25 + 1 + 0 + 0 + 0 + 0 + 6 + 0 + 14 + 0 + 0 + + 0 + + 0 + 7 + 15 + + images\spr_tag_0.png + images\spr_tag_1.png + images\spr_tag_2.png + images\spr_tag_3.png + images\spr_tag_4.png + images\spr_tag_5.png + images\spr_tag_6.png + images\spr_tag_7.png + images\spr_tag_8.png + images\spr_tag_9.png + images\spr_tag_10.png + images\spr_tag_11.png + images\spr_tag_12.png + images\spr_tag_13.png + images\spr_tag_14.png + images\spr_tag_15.png + images\spr_tag_16.png + images\spr_tag_17.png + images\spr_tag_18.png + images\spr_tag_19.png + images\spr_tag_20.png + images\spr_tag_21.png + images\spr_tag_22.png + images\spr_tag_23.png + images\spr_tag_24.png + images\spr_tag_25.png + images\spr_tag_26.png + images\spr_tag_27.png + images\spr_tag_28.png + +