snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-20 13:59:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mathewv/master'

Browse source
This commit is contained in:
Vinyl Darkscratch 2016-12-14 12:57:06 -08:00
commit 544fd78753
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/Data_Item.rb
View file

@ -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)

4
scripts/SaveLoad.rb
View file

@ -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

2
scripts/Script.rb
View file

@ -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