From aeff9a856c32914bb00d5ed72afe3a2ef42a28b0 Mon Sep 17 00:00:00 2001 From: mshirt Date: Wed, 14 Dec 2016 02:16:57 -0600 Subject: [PATCH 1/3] Adding in checkpoint save functionality --- scripts/SaveLoad.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/SaveLoad.rb b/scripts/SaveLoad.rb index d577dac..a761c3f 100644 --- a/scripts/SaveLoad.rb +++ b/scripts/SaveLoad.rb @@ -153,7 +153,9 @@ def real_load $game_map.update # Switch to map screen $scene = Scene_Map.new - $game_temp.common_event_id = 42 + if !$game_switches[198] # if this was a "checkpoint" save + $game_temp.common_event_id = 42 + end # Set wallpaper if necessary if $game_oneshot.wallpaper Wallpaper.set $game_oneshot.wallpaper, $game_oneshot.wallpaper_color From 7b34518580719238f26ddedc83a5ac41d1936607 Mon Sep 17 00:00:00 2001 From: mshirt Date: Wed, 14 Dec 2016 02:17:25 -0600 Subject: [PATCH 2/3] Fixing balcony event Would trigger twice if you were at the top of the railing during a cutscene. --- scripts/Script.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Script.rb b/scripts/Script.rb index 82f39e4..cbd3e8c 100644 --- a/scripts/Script.rb +++ b/scripts/Script.rb @@ -437,5 +437,5 @@ def activate_balcony?(ypos) !$scene.menu_open? && $game_player.y == ypos && $game_player.direction == 8 && - Input.trigger?(Input::ACTION) + Input.trigger?(Input::ACTION) && !$game_system.map_interpreter.running? end From 9c03d0da023c7dff22300fb07deb10e2129f9c37 Mon Sep 17 00:00:00 2001 From: mshirt Date: Wed, 14 Dec 2016 03:53:34 -0600 Subject: [PATCH 3/3] Adding in combinations for all 10 photos --- scripts/Data_Item.rb | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/scripts/Data_Item.rb b/scripts/Data_Item.rb index eec0f99..089e471 100644 --- a/scripts/Data_Item.rb +++ b/scripts/Data_Item.rb @@ -17,10 +17,30 @@ module Item [32, 36] => 33, # button + magnets => magnetized button [37, 38] => 32, # tin + scissors => button [36, 37] => 100, # tin + magnets => can't combine - [44, 45] => 53, # gluestick + photo of Niko => sticky photo of Niko [44, 46] => 52, # gluestick + Kip's library card => Kip's sticky library card - [45, 52] => 51, # photo of Niko + Kip's sticky library card => Niko's library card [46, 53] => 51, # Kip's library card + sticky photo of Niko => Niko's library card + [44, 45] => 53, # gluestick + photo of Niko => sticky photo of Niko + [44, 61] => 71, # gluestick + photo of Niko1 => sticky photo of Niko + [44, 62] => 72, # gluestick + photo of Niko2 => sticky photo of Niko + [44, 63] => 73, # gluestick + photo of Niko3 => sticky photo of Niko + [44, 64] => 74, # gluestick + photo of Niko4 => sticky photo of Niko + [44, 65] => 75, # gluestick + photo of Niko5 => sticky photo of Niko + [44, 66] => 54, # gluestick + photo of Niko6 'blink' => can't combine + [44, 67] => 77, # gluestick + photo of Niko7 => sticky photo of Niko + [44, 68] => 78, # gluestick + photo of Niko8 => sticky photo of Niko + [44, 69] => 79, # gluestick + photo of Niko9 => sticky photo of Niko + [44, 70] => 80, # gluestick + photo of Niko10 => sticky photo of Niko + [45, 52] => 51, # photo of Niko + Kip's sticky library card => Niko's library card + [52, 61] => 61, # photo of Niko1 + Kip's sticky library card => Niko's library card + [52, 62] => 62, # photo of Niko2 + Kip's sticky library card => Niko's library card + [52, 63] => 63, # photo of Niko3 + Kip's sticky library card => Niko's library card + [52, 64] => 64, # photo of Niko4 + Kip's sticky library card => Niko's library card + [52, 65] => 65, # photo of Niko5 + Kip's sticky library card => Niko's library card + [52, 66] => 54, # photo of Niko6 'blink' + Kip's sticky library card => can't combine + [52, 67] => 67, # photo of Niko7 + Kip's sticky library card => Niko's library card + [52, 68] => 68, # photo of Niko8 + Kip's sticky library card => Niko's library card + [52, 69] => 69, # photo of Niko9 + Kip's sticky library card => Niko's library card + [52, 70] => 70, # photo of Niko10 + Kip's sticky library card => Niko's library card } def self.combine(item_a, item_b)