From 017b21d041bcb48a388911831c9c7d8925a0957e Mon Sep 17 00:00:00 2001 From: Sergiotarxz Date: Wed, 13 Mar 2024 12:37:22 +0100 Subject: [PATCH] Improving version history. --- lib/GEmeTool/Log.pm | 1 + lib/GEmeTool/Save/Pokemon.pm | 8 ++++++-- lib/GEmeTool/View/PokemonEditorWindow.pm | 3 ++- save.sav | Bin 131088 -> 131088 bytes 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/GEmeTool/Log.pm b/lib/GEmeTool/Log.pm index d0e04e8..a5ff08a 100644 --- a/lib/GEmeTool/Log.pm +++ b/lib/GEmeTool/Log.pm @@ -29,6 +29,7 @@ sub msg { my $msg = shift; my $input_file = shift; my $output_file = shift; + my $backup_pk3_file = shift; my ( $input_file_backup, $output_file_backup ) = $self->backup_files( $input_file, $output_file ); my $db = GEmeTool::DB->connect; diff --git a/lib/GEmeTool/Save/Pokemon.pm b/lib/GEmeTool/Save/Pokemon.pm index 073db9a..a405adc 100644 --- a/lib/GEmeTool/Save/Pokemon.pm +++ b/lib/GEmeTool/Save/Pokemon.pm @@ -5,6 +5,8 @@ use v5.16.3; use strict; use warnings; +use Data::Dumper; + use Moo; use Rsaves; use Rsaves::Constants::Emerald::Species; @@ -13,6 +15,7 @@ use Path::Tiny; use GEmeTool::DB; use GEmeTool::Config; use Digest::SHA qw/sha256_hex/; +use Digest::SHA qw/sha256_hex/; use UUID::URandom qw/create_uuid_string/; has _pokemon => ( is => 'rw', required => 1 ); @@ -43,8 +46,8 @@ sub export_file { } sub export_raw { - my $self = shift; - return Rsaves::get_pk3_raw( $self->_pokemon ); + my $self = shift; + return Rsaves::get_pk3_raw($self->_pokemon); } sub empty { @@ -62,6 +65,7 @@ sub copy { sub ivs { my $self = shift; my $arg = shift; + print Data::Dumper::Dumper $self->_pokemon; my $current_value = $self->_pokemon->{substructures}[3]{ivs_egg_status_and_ability}; my @stats = ( diff --git a/lib/GEmeTool/View/PokemonEditorWindow.pm b/lib/GEmeTool/View/PokemonEditorWindow.pm index f967440..0498694 100644 --- a/lib/GEmeTool/View/PokemonEditorWindow.pm +++ b/lib/GEmeTool/View/PokemonEditorWindow.pm @@ -120,6 +120,7 @@ sub draw { $self->create_change_nickname_entry($box_right_image); $save_button->signal_connect( clicked => sub { + $self->activate_save; } ); $delete_button->signal_connect( @@ -210,6 +211,7 @@ sub activate_save { for my $func ( @{ $self->_save_callbacks } ) { $func->(); } + $pokemon->backup; $self->draw; } @@ -273,7 +275,6 @@ sub activate_import_pk3 { $file = path( $file->get_path ); $options->set_last_dir_open( $file->parent . '' ); $self->activate_save; - $self->pokemon->backup; $self->pokemon->copy( GEmeTool::Save::Pokemon->load_from_file($file) ); $self->draw; diff --git a/save.sav b/save.sav index ab0484338fd097d2a307f9a3311fb8d069d311de..4f44572803cc05e2c5737332bf357abde8796a14 100644 GIT binary patch delta 1730 zcmbW&|8Emz9KiAWJa=txUDr;!u5)g2jCGq}9Uv4L1EzNPU4{(&5)z}vNa6?v6E()9 zjfsLNQaqu8fTf}`zisR$Gk}eW8h##mYULZfLKA#ZkmpEo<8GKc#2rfn?t*M zMqiIFxu9Ro{g0UYx8S9c+9|3x(>M0;MK;jmmsIWRQ}BpZp;z7OHER zE_t!?v+_L9`ez$lieda{7;K zp8I2|Ni5x^*WtF5zpo2Tjd=Sy=SLS7drI<{GdPxUPmgVs$wg(^pn`v2$Xsp5yWiA_$-!Q6v#V8=giD zE_bt;>x7$DFkvAV;1Wa#Hfj(?Eh3n?Shr`(u-lF~=s*gc=t4KH!CcJ4wMgSS^k6;~ zU?Hx@A{oxPi)m!A1UFzQda(?BSdJA~iGJLOn{YF-7{Dsrf?IJLZpR(C6L;Zmti~YL z;2x~yi4IAw(_KenJ?_PQxE~MT!f#&fzra&@5nHhhFJU`g#w*x?SFsZX?80ks@H%#5 z4~lr>aV~qY4{u^W4&Wf(LJ5aZ#@jfIcknLW!x4<&eSClq@ew}8D5^KDqkD8$zc^nX zia2ADZl_SPi(ih&b8i3fk}_)y;om2rtN@{r6SiJ=EmJJrXi(Ct$CYaLf|>Aw^@9#( z$bT0oOCQ^f{uy0-c0!sYtdCm}eYGqV@k&`ImwKmmLfKb%RW1?|X28E6>qxJcyh`Ha z@_uRXmZ+!~O#M>WUL!_+WA*3?wK<=1`V2`qrs`TI|B6ZYTr_UZO0DnD?)dFdeNz1c Dku*Z8 delta 1908 zcmbW&4N#MH90&0K^E~X0hQn>SmoNuxiXqC&3gjg=Kq|5zbt}lbye_+=^0>p&>be_3 zqGks8_q8zPrA&wv9;Jw_0W(2cvO^Ndx~Q(~4(s%aEI3--Dp2_ZL6=zyHxs_AMjiX=_`V)cRf7Q%{a<%eMYj)?uaPv3JHy zrFnekCX&ufOB>4lXIkd&P0VM(uC8`(xBHa)bPu)16|hAqv?XpnbCnLpjpc1w5}^@g z55&9L&$_*5JZ?X^v50Rk5mLJ5g;&2GQyEGNM@-Yz71mGGYpf%tt?2U${kM;ps4*cg z?^p9P(ZZz8-m{ps!|Qh6nDnJhgp3xubgi*1I+@?4`yJ)$Hl}@aWa#lQq29B8KsQi) zS@&1Q=6wESf`Ow+eRHvBdtaoYx}2>$DXz0@$mi;QC}(+dVwY6XJ#S)j`SEnWf-&>s zxqSA;b0&f^(!>OOA$6-xR}zcT79sT7#C})s$<7&o0!ux=ua;pgi$6o zNUFl4`L8;(Ops8k3ODj$U0;Ssym1o?pyR#q48zCzf>=&O2#xNa8*;%-NQOq1TBO;U zT1;*IDSUNbB~uk)qeBr2F<+h5FruP+`n`@E<)?bSkDk;F{m84y$Es;K`6`u4Jg0>8$kxQ@}QYH3>M7-2SMNv;U)$NNI?d{a2v>B z<^4&~h_+yjY_1WO?qQXm!5 z;9f`v3s@loG9e3=K{nh6_rn8_0}sM-cnBVbT*!k*U-HL}^384v)fPkPihg z^OH~2H)B`IVGC@9ZSWdwhu2{Tya5$Z301HYDC~mWum|?SzGrdU4{yR-Pz?v*Z8!*r zpayE84(j0@coz=CdvF9Apb_4OCino3!qlRL$al&t4E1%&>9Ivow6a5r!$Qbv{`8=R z<2#zw9KK}B*9OjXbMrV$N7+x93fjgsDo*@qY9u6tTw6+rgK%_oaG~BNE-^`j8E~;2 zDcL|cQbtVm=KXwYkeR89owHLM=7`6E4WAd=ARJr)0gok6K8JE9R86*Xh*RT4D9fkS zh4$Gq>QiI?BRZ~6c(Xx4m{fR}u&}Iud4SMvTCBGowDa;94Wjqnfr~zkhhu+ zJA<+7F8swfJ$_;T+1eV?-sABR^KnA#&ov#;CT-tk$GAgO