mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-20 22:09:55 +00:00
Merge branch 'master' of ssh://femoz.anipic.ru:222/Sunshine/mkxp-sunshine
This commit is contained in:
commit
ce8aa399e8
6 changed files with 5 additions and 8 deletions
|
|
@ -1253,6 +1253,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
|
|||
03000000c82d00001230000011010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
|
||||
03000000c82d00001330000011010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
|
||||
05000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
|
||||
03000000c82d00001260000011010000,8BitDo Ultimate 2,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,
|
||||
03000000c82d00000b31000014010000,8BitDo Ultimate 2,a:b0,b:b1,x:b2,y:b3,back:b6,guide:b8,start:b7,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
|
||||
05000000c82d00001260000001000000,8BitDo Ultimate 2,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,
|
||||
03000000c82d00000a31000014010000,8BitDo Ultimate 2C,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
|
||||
03000000c82d00001d30000011010000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
|
||||
05000000c82d00001b30000001000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
|
||||
|
|
|
|||
|
|
@ -1441,7 +1441,6 @@ module RPG
|
|||
@battleback_name = ""
|
||||
@battler_name = ""
|
||||
@battler_hue = 0
|
||||
@edit_map_id = 1
|
||||
end
|
||||
attr_accessor :magic_number
|
||||
attr_accessor :party_members
|
||||
|
|
@ -1476,7 +1475,6 @@ module RPG
|
|||
attr_accessor :battleback_name
|
||||
attr_accessor :battler_name
|
||||
attr_accessor :battler_hue
|
||||
attr_accessor :edit_map_id
|
||||
end
|
||||
|
||||
class AudioFile
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ class FastTravel
|
|||
@name = name
|
||||
@maps = maps
|
||||
@locations = locations;
|
||||
RPG::Mod.exec_hooks("hooks/FastTravel/init", binding)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -29,7 +28,6 @@ class FastTravel
|
|||
@next_right = next_right
|
||||
@next_bottom = next_bottom
|
||||
@next_left = next_left
|
||||
RPG::Mod.exec_hooks("hooks/ZoneLocations/init", binding)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ class Scene_Map
|
|||
end
|
||||
if Settings[:debug] and Input.press?(Input::F5) and
|
||||
$game_temp.player_transferring = true
|
||||
$game_temp.player_new_map_id = $data_system.start_map_id
|
||||
$game_temp.player_new_map_id = 1
|
||||
$game_temp.player_new_x = $data_system.start_x
|
||||
$game_temp.player_new_y = $data_system.start_y
|
||||
end
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ class Scene_Title
|
|||
# Set up initial party
|
||||
$game_party.setup_starting_members
|
||||
# Set up initial map position
|
||||
$game_map.setup($data_system.start_map_id)
|
||||
$game_map.setup(1)
|
||||
# Move player to initial position
|
||||
$game_player.moveto($data_system.start_x, $data_system.start_y)
|
||||
# Refresh player
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ class Sprite_Character
|
|||
@text_sprite.bitmap = Bitmap.new(Graphics.width, 24)
|
||||
@text_sprite.bitmap.font.size = 12
|
||||
@character = character
|
||||
|
||||
RPG::Mod.exec_hooks("hooks/Sprite_Character/init", binding)
|
||||
update
|
||||
end
|
||||
#--------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue