diff --git a/PEOPLES.md b/PEOPLES.md index c4d0516..f1f6c5a 100644 --- a/PEOPLES.md +++ b/PEOPLES.md @@ -1,10 +1,12 @@ -Programmers: +# Peoples +## Programmers * Issac332 * "Визя" * DepressedTWM * referr -Artists: +## Artists + * Issac332 * Creature_of_steel1 * DesMo @@ -13,24 +15,28 @@ Artists: * K1RMAN * Serega_play_x -Testers and helpers: +## Testers and helpers: * Rubik * Prime 223432 -Telegram moderators: +## Donators +* Kodu + +## Telegram moderators * Creature_of_steel1 * Обси(ENG channel) -* Freskovich(leaved) +* Freskovich * "Визя" -Matrix moderators: +## Matrix moderators * referr -Servers administrators +## Servers administrators * DepressedTWM -Special thanks to: +## Special thanks to * my mom and dad:3 +* Friends:3 -Donators: +## Donators: * Kodu diff --git a/README.md b/README.md index 59b8f09..aeb1f10 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # mkxp-sunshine - This is a specialized fork of [mkxp-oneshot](https://github.com/elizagamedev/mkxp-oneshot) designed for OneShot: Sunshine mod. Target of sunshine mod - improve original game. @@ -11,7 +10,7 @@ Target of sunshine mod - improve original game. 1. Install required packages * Cmake - * C/C++ compiler(GCC 14+/Clang(untested)/MinGW) + * C/C++ compiler, GCC 14+ or Clang(untested) or MinGW or MSVC(untested) * xxd * Ruby 3.4+ * Boost diff --git a/changelogs/0.1.2.txt b/changelogs/0.1.2.txt index 88dc3df..9d68597 100644 --- a/changelogs/0.1.2.txt +++ b/changelogs/0.1.2.txt @@ -22,4 +22,6 @@ TPtL translation issue fixed fixed Obscured film bug added icons and way to disable options in settings fixed segfault while to fast window size changing -updated cg_blue picture \ No newline at end of file +updated cg_blue picture +Deleted useless hooks + diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c8019ff..235d938 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -89,13 +89,11 @@ set(scripts Dynamic_Resolution.rb ModAPI.rb) -find_program(RUBY_EXE ruby - DOC "Location of the Ruby executable") +find_program(RUBY_EXE ruby DOC "Location of the Ruby executable") set(game_dir "${CMAKE_BINARY_DIR}/bin") set(data_dir "${game_dir}/Data") set(xscripts "${data_dir}/xScripts.rxdata") -add_custom_target(data_dir ALL - COMMAND ${CMAKE_COMMAND} -E make_directory "${data_dir}") +add_custom_target(data_dir ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${data_dir}") add_custom_command( OUTPUT "${xscripts}" COMMAND "${RUBY_EXE}" "${CMAKE_SOURCE_DIR}/rpgscript.rb" "${CMAKE_CURRENT_LIST_DIR}" "${game_dir}" diff --git a/scripts/Credits_Message.rb b/scripts/Credits_Message.rb index 7c4684f..8e180ad 100644 --- a/scripts/Credits_Message.rb +++ b/scripts/Credits_Message.rb @@ -1,6 +1,5 @@ # Displays doc message boxes class Credits_Message - #-------------------------------------------------------------------------- # * Object Initialization #-------------------------------------------------------------------------- @@ -59,7 +58,6 @@ class Credits_Message # * Refresh: Load new message text and pre-process it #-------------------------------------------------------------------------- def refresh - if $game_switches[104] @sprite_bg.bitmap.fill_rect(0, 0, Graphics.width, Graphics.height, Color.new(0, 0, 0, 255)) else diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb index 562205d..73e3f6e 100644 --- a/scripts/Data_Settings.rb +++ b/scripts/Data_Settings.rb @@ -6,6 +6,7 @@ module Settings :bgm_volume => 100, :sfx_volume => 100, :use_fight_crime_track => false, + :use_old_self_contained_universe_reprise => false, # Video :fullscreen => false, @@ -172,6 +173,11 @@ class Window_Settings :name => "ITS TIME FOR FIGHT CRIME", :parameter => :use_fight_crime_track }, + { + :type => :bool, + :name => "Use Old Self Contained Universe(Reprise) version", + :parameter => :use_old_self_contained_universe_reprise + }, ], "Video" => [ { :type => :sep, :name => "Screen"}, diff --git a/scripts/Desktop_Message.rb b/scripts/Desktop_Message.rb index b7ab608..d13eb90 100644 --- a/scripts/Desktop_Message.rb +++ b/scripts/Desktop_Message.rb @@ -9,12 +9,11 @@ class Desktop_Message def initialize @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) @sprite_messagebox = Sprite.new(@viewport) - @sprite_messagebox.bitmap = RPG::Cache.picture('cg_desktop_messagebox') #Bitmap.new(640, 480) + @sprite_messagebox.bitmap = RPG::Cache.picture('cg_desktop_messagebox') @sprite_messagebox.zoom_x = @sprite_messagebox.zoom_y = 2 @sprite_messagebox.x = (Graphics.width) / 2 - 320 @sprite_messagebox.y = (Graphics.height) / 2 - 240 @sprite_messagebox.shader = Shader::CRT - @sprite_text = Sprite.new(@viewport) @contents = Bitmap.new(Graphics.width, Graphics.height) Language.register_text_sprite(self.class.name + "_contents", @contents) @@ -32,7 +31,6 @@ class Desktop_Message # Animation flags @fade_in = false @fade_out = false - RPG::Mod.exec_hooks("hooks/Desktop_Message/init", binding) end #-------------------------------------------------------------------------- # * Dispose diff --git a/scripts/Doc_Message.rb b/scripts/Doc_Message.rb index a7606c0..1f7e943 100644 --- a/scripts/Doc_Message.rb +++ b/scripts/Doc_Message.rb @@ -53,7 +53,6 @@ class Doc_Message # Animation flags @fade_in = false @fade_out = false - RPG::Mod.exec_hooks("hooks/Doc_Message/init", binding) end #-------------------------------------------------------------------------- # * Dispose diff --git a/scripts/Ed_Message.rb b/scripts/Ed_Message.rb index 2f02dfa..dcbb414 100644 --- a/scripts/Ed_Message.rb +++ b/scripts/Ed_Message.rb @@ -40,8 +40,6 @@ class Ed_Message @contents = Bitmap.new(w, h) @sprite_text.bitmap = @contents end - - RPG::Mod.exec_hooks("hooks/Ed_Message/init", binding) end #-------------------------------------------------------------------------- # * Dispose diff --git a/scripts/FastTravel.rb b/scripts/FastTravel.rb index 9d17039..761882c 100644 --- a/scripts/FastTravel.rb +++ b/scripts/FastTravel.rb @@ -92,7 +92,6 @@ class FastTravel @fade_out = false @transfer_player = nil - RPG::Mod.exec_hooks("hooks/FastTravel/init", binding) end #WME diff --git a/scripts/Game_CommonEvent.rb b/scripts/Game_CommonEvent.rb index fc6c211..0635674 100644 --- a/scripts/Game_CommonEvent.rb +++ b/scripts/Game_CommonEvent.rb @@ -13,7 +13,6 @@ class Game_CommonEvent def initialize(common_event_id) @common_event_id = common_event_id @interpreter = nil - RPG::Mod.exec_hooks("hooks/Game_CommonEvent/init", binding) refresh end #-------------------------------------------------------------------------- diff --git a/scripts/Game_FastTravel.rb b/scripts/Game_FastTravel.rb index 88eed8d..8e3f946 100644 --- a/scripts/Game_FastTravel.rb +++ b/scripts/Game_FastTravel.rb @@ -21,7 +21,6 @@ class Game_FastTravel @unlocked = {} @zone = nil @enabled = false - RPG::Mod.exec_hooks("hooks/Game_FastTravel/init", binding) end def unlock(map, id, x, y, dir) diff --git a/scripts/Game_Follower.rb b/scripts/Game_Follower.rb index 88d8bc0..d39b584 100644 --- a/scripts/Game_Follower.rb +++ b/scripts/Game_Follower.rb @@ -12,7 +12,6 @@ class Game_Follower < Game_Character @leader = leader self.actor = actor moveto(leader.x, leader.y) - RPG::Mod.exec_hooks("hooks/Game_Follower/init", binding) end # Overrides diff --git a/scripts/Game_Light.rb b/scripts/Game_Light.rb index d24eb05..fa02d13 100644 --- a/scripts/Game_Light.rb +++ b/scripts/Game_Light.rb @@ -147,4 +147,4 @@ class Game_Light @plr_light_table[15] = val&.[](15) || 1 awake end -end \ No newline at end of file +end diff --git a/scripts/Game_Oneshot.rb b/scripts/Game_Oneshot.rb index deb8d14..c9d74fe 100644 --- a/scripts/Game_Oneshot.rb +++ b/scripts/Game_Oneshot.rb @@ -14,7 +14,6 @@ class Game_Oneshot @plight_timer = nil @wallpaper = nil @bruteforce_start = nil - RPG::Mod.exec_hooks("hooks/Game_Oneshot/init", binding) end def self.get_user_name diff --git a/scripts/Game_Party.rb b/scripts/Game_Party.rb index 2bb78d9..794bdeb 100644 --- a/scripts/Game_Party.rb +++ b/scripts/Game_Party.rb @@ -25,7 +25,6 @@ class Game_Party @items = {} @weapons = {} @armors = {} - RPG::Mod.exec_hooks("hooks/Game_Party/init", binding) end #-------------------------------------------------------------------------- # * Initial Party Setup diff --git a/scripts/Gamepad_Colors.rb b/scripts/Gamepad_Colors.rb index d260b1a..8671b26 100644 --- a/scripts/Gamepad_Colors.rb +++ b/scripts/Gamepad_Colors.rb @@ -218,4 +218,4 @@ module GamepadMapColors 258 => WORLD_MACHINE, 259 => WORLD_MACHINE, } -end \ No newline at end of file +end