diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index b5474c5b..7d5538f3 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -26,7 +26,7 @@ 1 network_set_config(network_config_connect_timeout, 5000); -strict_init(working_directory + "\Multitroid\dictionary.json"); +strict_init(working_directory + "\multitroid\dictionary.json"); queenHealthResetQueued = false; canSend = false; metroidCountChanged = false; @@ -79,7 +79,7 @@ type = network_socket_tcp; syncedDifficulty = global.difficulty; elm = oControl.mod_monstersextremecheck; -ini_open(working_directory + "\Multitroid\mod_settings.ini"); +ini_open(working_directory + "\multitroid\mod_settings.ini"); ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1"); name = ini_read_string("ModSettings", "displayname", "name"); port = ini_read_real("ModSettings", "port", 64198); @@ -91,7 +91,7 @@ ini_close(); var nameLength = string_length(name); if(nameLength > 15){ name = string_copy(name, 1, 15); - ini_open(working_directory + "\Multitroid\mod_settings.ini"); + ini_open(working_directory + "\multitroid\mod_settings.ini"); ini_write_string("ModSettings", "displayname", name); ini_close(); } @@ -1282,10 +1282,15 @@ if(keyboard_check_pressed(vk_f3)){ if(keyboard_check_pressed(vk_f4)){ showName = -showName; - if(showName){ - popup_text("Nametags enabled"); - } else { + switch(showName){ + case 0: + oControl.showname = "disabled"; popup_text("Nametags disabled"); + break; + case 1: + oControl.showname = "enabled"; + popup_text("Nametags enabled"); + break; } } diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 1b72234d..3c33c90c 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -398,30 +398,32 @@ global.canConnect = true; reset_map(); load_character_vars(); -if(!(file_exists(working_directory + "\Multitroid\mod_settings.ini"))){ +if(!(file_exists(working_directory + "\multitroid\mod_settings.ini"))){ //Create new file - ini_open(working_directory + "\Multitroid\mod_settings.ini"); + ini_open(working_directory + "\multitroid\mod_settings.ini"); ini_write_string("ModSettings", "ipaddress", "127.0.0.1"); ini_write_string("ModSettings", "displayname", "name"); ini_write_real("ModSettings", "port", 64198); ini_write_string("ModSettings", "reactorsequence", "synced"); ini_write_string("ModSettings", "preferredcolor", "random"); ini_write_string("ModSettings", "showname", "enabled"); + ini_write_real("ModSettings", "palette", 0); ini_close(); } -ini_open(working_directory + "\Multitroid\mod_settings.ini"); +ini_open(working_directory + "\multitroid\mod_settings.ini"); ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1"); name = ini_read_string("ModSettings", "displayname", "name"); port = ini_read_real("ModSettings", "port", 64198); reactorsequence = string_lower(ini_read_string("ModSettings", "reactorsequence", "synced")); preferredcolor = string_lower(ini_read_string("ModSettings", "preferredcolor", "random")); showname = string_lower(ini_read_string("ModSettings", "showname", "enabled")); +palette = ini_read_real("ModSettings", "palette", 0); ini_close(); var nameLength = string_length(name); if(nameLength > 15){ name = string_copy(name, 1, 15); - ini_open(working_directory + "\Multitroid\mod_settings.ini"); + ini_open(working_directory + "\multitroid\mod_settings.ini"); ini_write_string("ModSettings", "displayname", name); ini_close(); } @@ -480,13 +482,38 @@ switch(preferredcolor){ break; } -MultitroidPalette = sPalMultitroidNew; -MultitroidPaletteFusion = sPalMultitroidFusion; -SpiderballPalette = sPalSpiderball; -MultitroidBabyPalette = sPalMultitroidBaby; -MultitroidIcon = sMultitroidIcon; -MultitroidIconDark = sDarkMultitroidPlayer; -MultitroidMapIcon = sMultitroidMapIcon; +MultitroidPaletteDefault = sPalMultitroidNew; +MultitroidPaletteFusionDefault = sPalMultitroidFusion; +SpiderballPaletteDefault = sPalSpiderball; +MultitroidBabyPaletteDefault = sPalMultitroidBaby; +MultitroidIconDefault = sMultitroidIcon; +MultitroidIconDarkDefault = sDarkMultitroidPlayer; +MultitroidMapIconDefault = sMultitroidMapIcon; + +MultitroidPaletteColor = sPalMultitroidNew; +MultitroidPaletteFusionColor = sPalMultitroidFusion; +SpiderballPaletteColor = sPalSpiderball; +MultitroidBabyPaletteColor = sPalMultitroidBaby; +MultitroidIconColor = sMultitroidIcon; +MultitroidIconDarkColor = sDarkMultitroidPlayer; +MultitroidMapIconColor = sMultitroidMapIcon; + +MultitroidPaletteCustom = sPalMultitroidNew; +MultitroidPaletteFusionCustom = sPalMultitroidFusion; +SpiderballPaletteCustom = sPalSpiderball; +MultitroidBabyPaletteCustom = sPalMultitroidBaby; +MultitroidIconCustom = sMultitroidIcon; +MultitroidIconDarkCustom = sDarkMultitroidPlayer; +MultitroidMapIconCustom = sMultitroidMapIcon; + +MultitroidPalette = MultitroidPaletteDefault; +MultitroidPaletteFusion = MultitroidPaletteFusionDefault; +SpiderballPalette = SpiderballPaletteDefault; +MultitroidBabyPalette = MultitroidBabyPaletteDefault; +MultitroidIcon = MultitroidIconDefault; +MultitroidIconDark = MultitroidIconDarkDefault; +MultitroidMapIcon = MultitroidMapIconDefault; + if(os_type == os_android){ MonsterPalettesFusionOnly = 1; PowerPalette = sPalFusion0; @@ -497,10 +524,10 @@ if(os_type == os_android){ global.acceptPacket = true; -if(!file_exists(working_directory + "\Multitroid\dictionary.json")){ +if(!file_exists(working_directory + "\multitroid\dictionary.json")){ var jsonList = ds_list_create(); ds_list_read(jsonList, "2E0100000301000001000000010000007B0100000010000000092264696374696F6E617279223A207B010000000A000000092230223A203135372C010000000A000000092231223A203135382C010000000A000000092232223A203135392C010000000A000000092233223A203136302C010000000A000000092234223A203136312C010000000A000000092235223A203136322C010000000A000000092236223A203136332C010000000A000000092237223A203136342C010000000A000000092238223A203136352C010000000A000000092239223A203136362C010000000B00000009223131223A203136392C010000000C0000000922313131223A203137302C0100000008000000092265223A20312C0100000008000000092274223A20322C0100000008000000092261223A20332C010000000800000009226F223A20342C0100000008000000092269223A20352C010000000800000009226E223A20362C0100000008000000092273223A20372C0100000008000000092272223A20382C0100000008000000092268223A20392C010000000900000009226C223A2031302C0100000009000000092264223A2031312C0100000009000000092263223A2031322C0100000009000000092275223A2031332C010000000900000009226D223A2031342C0100000009000000092266223A2031352C0100000009000000092270223A2031362C0100000009000000092267223A2031372C0100000009000000092277223A2031382C0100000009000000092279223A2031392C0100000009000000092262223A2032302C0100000009000000092276223A2032312C010000000900000009226B223A2032322C0100000009000000092278223A2032332C010000000900000009226A223A2032342C0100000009000000092271223A2032352C010000000900000009227A223A2032362C010000000A00000009227468223A2032372C010000000A00000009226865223A2032382C010000000A0000000922696E223A2032392C010000000A00000009226572223A2033302C010000000A0000000922616E223A2033312C010000000A00000009227265223A2033322C010000000A00000009226F6E223A2033332C010000000A00000009226174223A2033342C010000000A0000000922656E223A2033352C010000000A00000009226E64223A2033362C010000000A00000009227469223A2033372C010000000A00000009226573223A2033382C010000000A00000009226F72223A2033392C010000000A00000009227465223A2034302C010000000A00000009226F66223A2034312C010000000A00000009226564223A2034322C010000000A00000009226973223A2034332C010000000A00000009226974223A2034342C010000000A0000000922616C223A2034352C010000000A00000009226172223A2034362C010000000A00000009227374223A2034372C010000000A0000000922746F223A2034382C010000000A00000009226E74223A2034392C010000000A00000009226E67223A2035302C010000000A00000009227365223A2035312C010000000A00000009226861223A2035322C010000000A00000009226964223A2035332C010000000A00000009226173223A2035342C010000000A00000009226F75223A2035352C010000000A0000000922696F223A2035362C010000000A00000009226C65223A2035372C010000000A00000009227665223A2035382C010000000A0000000922636F223A2035392C010000000A00000009226D65223A2036302C010000000A00000009226465223A2036312C010000000A00000009226869223A2036322C010000000A00000009227269223A2036332C010000000A0000000922726F223A2036342C010000000A00000009226963223A2036352C010000000A00000009226E65223A2036362C010000000A00000009226561223A2036372C010000000A00000009227261223A2036382C010000000A00000009226365223A2036392C010000000A00000009226C69223A2037302C010000000A00000009226368223A2037312C010000000A00000009226C6C223A2037322C010000000A00000009226265223A2037332C010000000A00000009226D61223A2037342C010000000A00000009227369223A2037352C010000000A00000009226F6D223A2037362C010000000A00000009227572223A2037372C010000000A00000009227373223A2037382C010000000B0000000922746865223A2037392C010000000B0000000922616E64223A2038302C010000000B0000000922696E67223A2038312C010000000B0000000922696F6E223A2038322C010000000B000000092274696F223A2038332C010000000B0000000922656E74223A2038342C010000000B0000000922617469223A2038352C010000000B0000000922666F72223A2038362C010000000B0000000922686572223A2038372C010000000B0000000922746572223A2038382C010000000B0000000922686174223A2038392C010000000B0000000922546865223A2039302C010000000B0000000922746861223A2039312C010000000B0000000922657265223A2039322C010000000B0000000922617465223A2039332C010000000B0000000922686973223A2039342C010000000B0000000922636F6E223A2039352C010000000B0000000922726573223A2039362C010000000B0000000922766572223A2039372C010000000B0000000922616C6C223A2039382C010000000B00000009226F6E73223A2039392C010000000C00000009226E6365223A203130302C010000000C00000009226D656E223A203130312C010000000C0000000922697468223A203130322C010000000C0000000922746564223A203130332C010000000C0000000922657273223A203130342C010000000C000000092270726F223A203130352C010000000C0000000922746869223A203130362C010000000C0000000922776974223A203130372C010000000C0000000922617265223A203130382C010000000C0000000922657373223A203130392C010000000C00000009226E6F74223A203131302C010000000C0000000922697665223A203131312C010000000C0000000922776173223A203131322C010000000C0000000922656374223A203131332C010000000C0000000922726561223A203131342C010000000C0000000922636F6D223A203131352C010000000C0000000922657665223A203131362C010000000C0000000922706572223A203131372C010000000C0000000922696E74223A203131382C010000000C0000000922657374223A203131392C010000000C0000000922737461223A203132302C010000000C0000000922637469223A203132312C010000000C0000000922696361223A203132322C010000000C0000000922697374223A203132332C010000000C0000000922656172223A203132342C010000000C000000092261696E223A203132352C010000000C00000009226F6E65223A203132362C010000000C00000009226F7572223A203132372C010000000C0000000922697469223A203132382C010000000C0000000922726174223A203132392C010000000D000000092274696F6E223A203133302C010000000D00000009226174696F223A203133312C010000000D000000092274686174223A203133322C010000000D000000092274686572223A203133332C010000000D000000092277697468223A203133342C010000000D00000009226D656E74223A203133352C010000000D0000000922696F6E73223A203133362C010000000D000000092274686973223A203133372C010000000D000000092268657265223A203133382C010000000D000000092266726F6D223A203133392C010000000D00000009226F756C64223A203134302C010000000D000000092274696E67223A203134312C010000000D000000092268696368223A203134322C010000000D000000092277686963223A203134332C010000000D00000009226374696F223A203134342C010000000D0000000922656E6365223A203134352C010000000D000000092268617665223A203134362C010000000D00000009226F746865223A203134372C010000000D000000092269676874223A203134382C010000000D000000092273696F6E223A203134392C010000000E00000009226174696F6E223A203135302C010000000E000000092274696F6E73223A203135312C010000000E00000009227768696368223A203135322C010000000E00000009226374696F6E223A203135332C010000000E00000009226F74686572223A203135342C010000000E00000009227468656972223A203135352C010000000D000000092268747470223A203135362C010000000B00000009223030223A203136372C010000000C0000000922303030223A203136382C010000000B00000009222074223A203137312C010000000B0000000922206F223A203137322C010000000B00000009222069223A203137332C010000000B00000009222073223A203137342C010000000B00000009222063223A203137352C010000000B00000009222077223A203137362C010000000B00000009222068223A203137372C010000000B00000009222062223A203137382C010000000B00000009222066223A203137392C010000000B0000000922206D223A203138302C010000000B00000009226520223A203138312C010000000B00000009227320223A203138322C010000000B00000009227420223A203138332C010000000B00000009226420223A203138342C010000000B00000009226E20223A203138352C010000000B00000009227220223A203138362C010000000B00000009227920223A203138372C010000000B00000009226620223A203138382C010000000B00000009226C20223A203138392C010000000B00000009226F20223A203139302C010000000A000000092220223A203139312C010000000A00000009222E223A203139322C010000000A00000009222C223A203139332C010000000B00000009222020223A203139342C010000000B00000009222E20223A203139352C010000000B00000009222C20223A203139362C010000000C0000000922202020223A203139372C010000000A00000009222F223A203139382C010000000B00000009225C5C223A203139392C010000000A00000009223A223A203230302C010000000A00000009227B223A203230312C010000000A00000009227D223A203230322C010000000A00000009225B223A203230332C010000000A00000009225D223A203230342C010000000B00000009225C22223A203230352C010000000C0000000922652C20223A203230362C010000000C0000000922732C20223A203230372C010000000C00000009222C2074223A203230382C010000000C00000009222C2061223A203230392C010000000C0000000922206120223A203231302C010000000C0000000922207468223A203231312C010000000C00000009226E6420223A203231322C010000000C000000092220696E223A203231332C010000000C0000000922206F66223A203231342C010000000C00000009226F6620223A203231352C010000000C00000009226F6E20223A203231362C010000000C000000092220616E223A203231372C010000000C0000000922697320223A203231382C010000000C000000092220746F223A203231392C010000000C0000000922746F20223A203232302C010000000C0000000922742074223A203232312C010000000C0000000922652074223A203232322C010000000C0000000922732074223A203232332C010000000C0000000922652061223A203232342C010000000C0000000922732061223A203232352C010000000A000000092245223A203232362C010000000A000000092254223A203232372C010000000A000000092241223A203232382C010000000A00000009224F223A203232392C010000000A000000092249223A203233302C010000000A00000009224E223A203233312C010000000A000000092253223A203233322C010000000A000000092252223A203233332C010000000A000000092248223A203233342C010000000A00000009224C223A203233352C010000000A000000092244223A203233362C010000000A000000092243223A203233372C010000000A000000092255223A203233382C010000000A00000009224D223A203233392C010000000A000000092246223A203234302C010000000A000000092250223A203234312C010000000A000000092247223A203234322C010000000A000000092257223A203234332C010000000A000000092259223A203234342C010000000A000000092242223A203234352C010000000A000000092256223A203234362C010000000A00000009224B223A203234372C010000000A000000092258223A203234382C010000000A00000009224A223A203234392C010000000A000000092251223A203235302C010000000A00000009225A223A203235312C010000000C00000009225C222C223A203235322C010000000D00000009225C223A5C22223A2032353301000000020000007D2C01000000480600000922696E765F64696374696F6E617279223A205B22222C2265222C202274222C202261222C20226F222C202269222C20226E222C202273222C202272222C202268222C20226C222C202264222C202263222C202275222C20226D222C202266222C202270222C202267222C202277222C202279222C202262222C202276222C20226B222C202278222C20226A222C202271222C20227A222C20227468222C20226865222C2022696E222C20226572222C2022616E222C20227265222C20226F6E222C20226174222C2022656E222C20226E64222C20227469222C20226573222C20226F72222C20227465222C20226F66222C20226564222C20226973222C20226974222C2022616C222C20226172222C20227374222C2022746F222C20226E74222C20226E67222C20227365222C20226861222C20226964222C20226173222C20226F75222C2022696F222C20226C65222C20227665222C2022636F222C20226D65222C20226465222C20226869222C20227269222C2022726F222C20226963222C20226E65222C20226561222C20227261222C20226365222C20226C69222C20226368222C20226C6C222C20226265222C20226D61222C20227369222C20226F6D222C20227572222C20227373222C2022746865222C2022616E64222C2022696E67222C2022696F6E222C202274696F222C2022656E74222C2022617469222C2022666F72222C2022686572222C2022746572222C2022686174222C2022546865222C2022746861222C2022657265222C2022617465222C2022686973222C2022636F6E222C2022726573222C2022766572222C2022616C6C222C20226F6E73222C20226E6365222C20226D656E222C2022697468222C2022746564222C2022657273222C202270726F222C2022746869222C2022776974222C2022617265222C2022657373222C20226E6F74222C2022697665222C2022776173222C2022656374222C2022726561222C2022636F6D222C2022657665222C2022706572222C2022696E74222C2022657374222C2022737461222C2022637469222C2022696361222C2022697374222C2022656172222C202261696E222C20226F6E65222C20226F7572222C2022697469222C2022726174222C202274696F6E222C20226174696F222C202274686174222C202274686572222C202277697468222C20226D656E74222C2022696F6E73222C202274686973222C202268657265222C202266726F6D222C20226F756C64222C202274696E67222C202268696368222C202277686963222C20226374696F222C2022656E6365222C202268617665222C20226F746865222C202269676874222C202273696F6E222C20226174696F6E222C202274696F6E73222C20227768696368222C20226374696F6E222C20226F74686572222C20227468656972222C202268747470222C202230222C202231222C202232222C202233222C202234222C202235222C202236222C202237222C202238222C202239222C20223030222C2022303030222C20223131222C2022313131222C20222074222C2022206F222C20222069222C20222073222C20222063222C20222077222C20222068222C20222062222C20222066222C2022206D222C20226520222C20227320222C20227420222C20226420222C20226E20222C20227220222C20227920222C20226620222C20226C20222C20226F20222C202220222C20222E222C20222C222C20222020222C20222E20222C20222C20222C2022202020222C20222F222C20225C5C222C20223A222C20227B222C20227D222C20225B222C20225D222C20225C22222C2022652C20222C2022732C20222C20222C2074222C20222C2061222C2022206120222C2022207468222C20226E6420222C202220696E222C2022206F66222C20226F6620222C20226F6E20222C202220616E222C2022697320222C202220746F222C2022746F20222C2022742074222C2022652074222C2022732074222C2022652061222C2022732061222C202245222C202254222C202241222C20224F222C202249222C20224E222C202253222C202252222C202248222C20224C222C202244222C202243222C202255222C20224D222C202246222C202250222C202247222C202257222C202259222C202242222C202256222C20224B222C202258222C20224A222C202251222C20225A222C20225C222C222C20225C223A5C22225D2C010000001000000009226D61785F6C656E677468223A203501000000010000007D") - file = file_text_open_write(working_directory + "\Multitroid\dictionary.json"); + file = file_text_open_write(working_directory + "\multitroid\dictionary.json"); for(var i=0; i<ds_list_size(jsonList); i++){ file_text_write_string(file, string(jsonList[| i])); file_text_writeln(file); @@ -1086,6 +1113,36 @@ switch translatestep if(instance_exists(oCharacter) && mod_IGT && !instance_exists(oIGT)) { instance_create(0, 0, oIGT); } + +switch(palette){ + case 0: + if(MultitroidPalette != MultitroidPaletteDefault) MultitroidPalette = MultitroidPaletteDefault; + if(MultitroidPaletteFusion != MultitroidPaletteFusionDefault) MultitroidPaletteFusion = MultitroidPaletteFusionDefault; + if(SpiderballPalette != SpiderballPaletteDefault) SpiderballPalette = SpiderballPaletteDefault; + if(MultitroidBabyPalette != MultitroidBabyPaletteDefault) MultitroidBabyPalette = MultitroidBabyPaletteDefault; + if(MultitroidIcon != MultitroidIconDefault) MultitroidIcon = MultitroidIconDefault; + if(MultitroidIconDark != MultitroidIconDarkDefault) MultitroidIconDark = MultitroidIconDarkDefault; + if(MultitroidMapIcon != MultitroidMapIconDefault) MultitroidMapIcon = MultitroidMapIconDefault; + break; + case 1: + if(MultitroidPalette != MultitroidPaletteColor) MultitroidPalette = MultitroidPaletteColor; + if(MultitroidPaletteFusion != MultitroidPaletteFusionColor) MultitroidPaletteFusion = MultitroidPaletteFusionColor; + if(SpiderballPalette != SpiderballPaletteColor) SpiderballPalette = SpiderballPaletteColor; + if(MultitroidBabyPalette != MultitroidBabyPaletteColor) MultitroidBabyPalette = MultitroidBabyPaletteColor; + if(MultitroidIcon != MultitroidIconColor) MultitroidIcon = MultitroidIconColor; + if(MultitroidIconDark != MultitroidIconDarkColor) MultitroidIconDark = MultitroidIconDarkColor; + if(MultitroidMapIcon != MultitroidMapIconColor) MultitroidMapIcon = MultitroidMapIconColor; + break; + case 2: + if(MultitroidPalette != MultitroidPaletteCustom) MultitroidPalette = MultitroidPaletteCustom; + if(MultitroidPaletteFusion != MultitroidPaletteFusionCustom) MultitroidPaletteFusion = MultitroidPaletteFusionCustom; + if(SpiderballPalette != SpiderballPaletteCustom) SpiderballPalette = SpiderballPaletteCustom; + if(MultitroidBabyPalette != MultitroidBabyPaletteCustom) MultitroidBabyPalette = MultitroidBabyPaletteCustom; + if(MultitroidIcon != MultitroidIconCustom) MultitroidIcon = MultitroidIconCustom; + if(MultitroidIconDark != MultitroidIconDarkCustom) MultitroidIconDark = MultitroidIconDarkCustom; + if(MultitroidMapIcon != MultitroidMapIconCustom) MultitroidMapIcon = MultitroidMapIconCustom; + break; +} diff --git a/objects/oGameSelMenu.object.gmx b/objects/oGameSelMenu.object.gmx index 3cc4d87f..1e9e2fff 100644 --- a/objects/oGameSelMenu.object.gmx +++ b/objects/oGameSelMenu.object.gmx @@ -219,7 +219,7 @@ var ptanks = global.ptanks; var detail; j = 0; repeat (3) { - filename = working_directory + "\Multitroid\save" + string(j + 1); + filename = working_directory + "\multitroid\save" + string(j + 1); if (file_exists(filename)) { detail = sv6_load_details(filename); if (detail == 1) { diff --git a/objects/oLoadGame.object.gmx b/objects/oLoadGame.object.gmx index 30d05cdf..21ca3803 100644 --- a/objects/oLoadGame.object.gmx +++ b/objects/oLoadGame.object.gmx @@ -73,7 +73,7 @@ 1 if (global.newgame == 1) { start_new_game(); -} else load_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); +} else load_game(working_directory + "\multitroid\save" + string(global.saveslot + 1)); diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx index c577c248..1f75115e 100644 --- a/objects/oOptionsMod.object.gmx +++ b/objects/oOptionsMod.object.gmx @@ -38,6 +38,7 @@ num_port = tempnumcounter++; num_name = tempnumcounter++; num_sequence = tempnumcounter++; num_color = tempnumcounter++; +num_palette = tempnumcounter++; num_showname = tempnumcounter++; num_difficulty = tempnumcounter++; num_elm = tempnumcounter++; @@ -109,6 +110,7 @@ tip[num_port] = "Set the port of the server"; tip[num_name] = "Set your display name"; tip[num_sequence] = "Toggle whether the reactor sequence is synced"; tip[num_color] = "Pick your preferred player color"; +tip[num_palette] = "Choose Default/Color/Custom Palette"; tip[num_showname] = "Enable/disable showing player names"; tip[num_difficulty] = "Choose the shared Multitroid difficulty"; tip[num_elm] = "Choose the shared ELM difficulty"; @@ -248,6 +250,16 @@ if (active) { sfx_play(sndMenuMove); event_user(2); } + + if (global.curropt == num_palette) + { + oControl.palette--; + if(oControl.palette < 0){ + oControl.palette = 2; + } + sfx_play(sndMenuMove); + event_user(2); + } } if (global.curropt == num_difficulty && instance_exists(oClient)) @@ -277,6 +289,16 @@ if (active) { sfx_play(sndMenuMove); event_user(2); } + + if (global.curropt == num_palette) + { + oControl.palette++; + if(oControl.palette > 2){ + oControl.palette = 0; + } + sfx_play(sndMenuMove); + event_user(2); + } } if (global.curropt == num_difficulty && instance_exists(oClient)) @@ -313,14 +335,15 @@ if (active) { event_user(2); } - var key; + var key, keyBegin; + var keyBegin = (oControl.kMenu1 > 0); if(os_type != os_android){ key = keyboard_check_pressed(vk_enter); } else { key = (oControl.kMenu1 > 0); } - if (key && oControl.kMenu1PushedSteps == 0) { + if (key && oControl.kMenu1PushedSteps == 0 || (os_type != os_android && keyBegin && oControl.kMenu1PushedSteps == 0 && !editing)) { if (global.curropt == num_ip && os_type != os_android) { editing = !editing; op[num_ip].editing = editing; @@ -541,7 +564,7 @@ if(ID == msg && global.curropt == num_ip){ if(ds_map_find_value(async_load, "status")){ var input = ds_map_find_value(async_load, "result"); if(is_string(input)){ - ini_open(working_directory + "\Multitroid\settings.ini"); + ini_open(working_directory + "\multitroid\settings.ini"); ini_write_string("Settings", "ipaddress", input); ini_close(); ip = input; @@ -558,7 +581,7 @@ if(ID == msg && global.curropt == num_port){ if(ds_map_find_value(async_load, "status")){ var input = ds_map_find_value(async_load, "value"); if(is_real(input)){ - ini_open(working_directory + "\Multitroid\settings.ini"); + ini_open(working_directory + "\multitroid\settings.ini"); ini_write_real("Settings", "port", input); ini_close(); port = string(input); @@ -574,7 +597,7 @@ if(ID == msg && global.curropt == num_name){ if(ds_map_find_value(async_load, "status")){ var input = ds_map_find_value(async_load, "result"); if(is_string(input)){ - ini_open(working_directory + "\Multitroid\settings.ini"); + ini_open(working_directory + "\multitroid\settings.ini"); ini_write_string("Settings", "name", input); ini_close(); name = input; @@ -764,13 +787,26 @@ switch(showname){ break; } -ini_open(working_directory + "\Multitroid\mod_settings.ini"); +switch(oControl.palette){ + case 0: + op[num_palette].optext = "Default"; + break; + case 1: + op[num_palette].optext = "Color"; + break; + case 2: + op[num_palette].optext = "Custom"; + break; +} + +ini_open(working_directory + "\multitroid\mod_settings.ini"); ini_write_string("ModSettings", "ipaddress", ip); ini_write_real("ModSettings", "port", real(port)); ini_write_string("ModSettings", "displayname", name); ini_write_string("ModSettings", "reactorsequence", _sequence); ini_write_string("ModSettings", "preferredcolor", color); ini_write_string("ModSettings", "showname", _showname); +ini_write_real("ModSettings", "palette", oControl.palette); ini_close(); oControl.ipaddress = ip; @@ -859,6 +895,14 @@ if(!global.shaders_compiled){ canedit[num_color] = 0; } +op[num_palette] = instance_create(x, y + sep * tempcount++, oOptionLR); +op[num_palette].label = "Palette"; +op[num_palette].optionid = num_palette; +if(!global.shaders_compiled){ + op[num_palette].enabled = 0; + canedit[num_palette] = 0; +} + op[num_showname] = instance_create(x, y + sep * tempcount++, oOptionLR); op[num_showname].label = "Show names"; op[num_showname].optionid = num_showname; diff --git a/objects/oSS_Fg.object.gmx b/objects/oSS_Fg.object.gmx index 5a3c2128..ed96798d 100644 --- a/objects/oSS_Fg.object.gmx +++ b/objects/oSS_Fg.object.gmx @@ -115,7 +115,13 @@ widescreen_space = oControl.widescreen_space; rectoffset -= 2; } else fadein = 0; } -if (active && !fadein && oControl.kStart && oControl.kStartPushedSteps == 0) event_user(0); +if (active && !fadein && oControl.kStart && oControl.kStartPushedSteps == 0){ + if(instance_exists(oOptionsMod)){ + if(oOptionsMod.editing){ + //do nothing + } else event_user(0); + } else event_user(0); +} if (fadeout) rectoffset += 2; if (ealpha < 1 && fadeout == 0) ealpha += 0.05; if (ealpha > 0 && fadeout) ealpha -= 0.05; diff --git a/scripts/characterStepEvent.gml b/scripts/characterStepEvent.gml index 184aaad9..9182c5af 100644 --- a/scripts/characterStepEvent.gml +++ b/scripts/characterStepEvent.gml @@ -869,7 +869,7 @@ if (state == SAVINGFX) { instance_create(x, y, oSaveFX); instance_create(x, y, oSaveSparks); popup_text(get_text("Notifications", "GameSaved")); - save_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); + save_game(working_directory + "\multitroid\save" + string(global.saveslot + 1)); refill_heath_ammo(); } if (statetime == 230) state = IDLE; @@ -934,7 +934,7 @@ if (state == SAVINGSHIP) { if (state == SAVINGSHIPFX) { if (statetime == 1) { sfx_play(sndSave); - save_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); + save_game(working_directory + "\multitroid\save" + string(global.saveslot + 1)); refill_heath_ammo(); popup_text(get_text("Notifications", "GameSaved")); } diff --git a/scripts/copy_save.gml b/scripts/copy_save.gml index 9e614927..1e5f896b 100644 --- a/scripts/copy_save.gml +++ b/scripts/copy_save.gml @@ -1,22 +1,22 @@ /// copy_save(from, to) -file1 = working_directory + "\Multitroid\save" + string(argument0 + 1); -file2 = working_directory + "\Multitroid\save" + string(argument1 + 1); +file1 = working_directory + "\multitroid\save" + string(argument0 + 1); +file2 = working_directory + "\multitroid\save" + string(argument1 + 1); if (file_exists(file2)) file_delete(file2); file_copy(file1, file2); with (oGameSelMenu) event_user(2); saveslot_flash(argument1); -if (file_exists(working_directory + "\Multitroid\random" + string(argument1 + 1) + ".ini")) +if (file_exists(working_directory + "\multitroid\random" + string(argument1 + 1) + ".ini")) { //This is only here for old file cleanup. - file_delete(working_directory + "\Multitroid\random" + string(argument1 + 1) + ".ini"); + file_delete(working_directory + "\multitroid\random" + string(argument1 + 1) + ".ini"); } -if (file_exists(working_directory + "\Multitroid\save" + string(argument1 + 1) + ".dat")) +if (file_exists(working_directory + "\multitroid\save" + string(argument1 + 1) + ".dat")) { - file_delete(working_directory + "\Multitroid\save" + string(argument1 + 1) + ".dat"); + file_delete(working_directory + "\multitroid\save" + string(argument1 + 1) + ".dat"); } -if (file_exists(working_directory + "\Multitroid\save" + string(argument0 + 1) + ".dat")) +if (file_exists(working_directory + "\multitroid\save" + string(argument0 + 1) + ".dat")) { - file_copy(working_directory + "\Multitroid\save" + string(argument0 + 1) + ".dat", working_directory + "\Multitroid\save" + string(argument1 + 1) + ".dat"); + file_copy(working_directory + "\multitroid\save" + string(argument0 + 1) + ".dat", working_directory + "\multitroid\save" + string(argument1 + 1) + ".dat"); } diff --git a/scripts/erase_save.gml b/scripts/erase_save.gml index dc26b433..248ff70b 100644 --- a/scripts/erase_save.gml +++ b/scripts/erase_save.gml @@ -1,5 +1,5 @@ /// erase_save() -filename = working_directory + "\Multitroid\save" + string(global.saveslot + 1); +filename = working_directory + "\multitroid\save" + string(global.saveslot + 1); file_delete(filename); with (oMenuSaveSlot) if (slot == global.saveslot) { saveexists = 0; @@ -7,5 +7,5 @@ with (oMenuSaveSlot) if (slot == global.saveslot) { } saveslot_flash(global.saveslot); -file_delete(working_directory + "\Multitroid\random" + string(global.saveslot + 1) + ".ini"); -file_delete(working_directory + "\Multitroid\save" + string(global.saveslot + 1) + ".dat"); +file_delete(working_directory + "\multitroid\random" + string(global.saveslot + 1) + ".ini"); +file_delete(working_directory + "\multitroid\save" + string(global.saveslot + 1) + ".dat"); diff --git a/scripts/load_resources.gml b/scripts/load_resources.gml index c32b8b9a..2f155c67 100644 --- a/scripts/load_resources.gml +++ b/scripts/load_resources.gml @@ -289,10 +289,10 @@ if (file_exists("mods/palettes/monsters/queen_dead.png")) oControl.QueenDead = b if (file_exists("mods/palettes/monsters/queen_blood_drop.png")) oControl.QueenBloodDrop = sprite_add("mods/palettes/monsters/queen_blood_drop.png", sprite_get_number(sQueenBloodDrop), false, false, sprite_get_xoffset(sQueenBloodDrop), sprite_get_yoffset(sQueenBloodDrop)); if (file_exists("mods/palettes/monsters/queen_blood_particle.png")) oControl.QueenBloodParticle = sprite_add("mods/palettes/monsters/queen_blood_particle.png", sprite_get_number(sQueenBloodParticle), false, false, sprite_get_xoffset(sQueenBloodParticle), sprite_get_yoffset(sQueenBloodParticle)); -if (file_exists("mods/palettes/multitroid/multitroid.png")) oControl.MultitroidPalette = sprite_add("mods/palettes/multitroid/multitroid.png", 1, false, false, 0, 0); -if (file_exists("mods/palettes/multitroid/multitroid_fusion.png")) oControl.MultitroidPaletteFusion = sprite_add("mods/palettes/multitroid/multitroid_fusion.png", 1, false, false, 0, 0); -if (file_exists("mods/palettes/multitroid/spiderball.png")) oControl.SpiderballPalette = sprite_add("mods/palettes/multitroid/spiderball.png", 1, false, false, 0, 0); -if (file_exists("mods/palettes/multitroid/baby_metroid.png")) oControl.MultitroidBabyPalette = sprite_add("mods/palettes/multitroid/baby_metroid.png", 1, false, false, 0, 0); +if (file_exists("mods/palettes/multitroid/multitroid.png")) oControl.MultitroidPaletteCustom = sprite_add("mods/palettes/multitroid/multitroid.png", 1, false, false, 0, 0); +if (file_exists("mods/palettes/multitroid/multitroid_fusion.png")) oControl.MultitroidPaletteFusionCustom = sprite_add("mods/palettes/multitroid/multitroid_fusion.png", 1, false, false, 0, 0); +if (file_exists("mods/palettes/multitroid/spiderball.png")) oControl.SpiderballPaletteCustom = sprite_add("mods/palettes/multitroid/spiderball.png", 1, false, false, 0, 0); +if (file_exists("mods/palettes/multitroid/baby_metroid.png")) oControl.MultitroidBabyPaletteCustom = sprite_add("mods/palettes/multitroid/baby_metroid.png", 1, false, false, 0, 0); icon_sprite = 0; icon_merge = 1; @@ -376,7 +376,8 @@ if (file_exists("mods/palettes/multitroid/player_icons/sMultitroidPlayer_15.png" icon_duplicate16 = sprite_duplicate(icon_merge16); sprite_merge(icon_duplicate, icon_duplicate16); if(i == 16){ - oControl.MultitroidIcon = icon_duplicate; + //oControl.MultitroidIcon = icon_duplicate; + oControl.MultitroidIconCustom = icon_duplicate; show_debug_message("MultitroidIcons imported"); } @@ -462,7 +463,8 @@ if (file_exists("mods/palettes/multitroid/dark_player_icons/sDarkMultitroidPlaye icon_duplicate16 = sprite_duplicate(icon_merge16); sprite_merge(icon_duplicate, icon_duplicate16); if(i == 16){ - oControl.MultitroidIconDark = icon_duplicate; + //oControl.MultitroidIconDark = icon_duplicate; + oControl.MultitroidIconDarkCustom = icon_duplicate; show_debug_message("MultitroidIconDark imported"); } @@ -548,6 +550,7 @@ if (file_exists("mods/palettes/multitroid/map_icons/sMultitroidMapIcon_15.png")) icon_duplicate16 = sprite_duplicate(icon_merge16); sprite_merge(icon_duplicate, icon_duplicate16); if(i == 16){ - oControl.MultitroidMapIcon = icon_duplicate; + //oControl.MultitroidMapIcon = icon_duplicate; + oControl.MultitroidMapIconCustom = icon_duplicate; show_debug_message("MultitroidMapIcons imported"); } diff --git a/scripts/start_new_game.gml b/scripts/start_new_game.gml index 190b54b2..3e9604c0 100644 --- a/scripts/start_new_game.gml +++ b/scripts/start_new_game.gml @@ -7,9 +7,9 @@ global.timeofday = 0; reset_map(); init_map(); load_character_vars(); -file_delete(working_directory + "\Multitroid\random" + string(global.saveslot + 1) + ".ini"); //This is only here for old file cleanup. -file_delete(working_directory + "\Multitroid\save" + string(global.saveslot + 1) + ".dat"); +file_delete(working_directory + "\multitroid\random" + string(global.saveslot + 1) + ".ini"); //This is only here for old file cleanup. +file_delete(working_directory + "\multitroid\save" + string(global.saveslot + 1) + ".dat"); scr_newgame(); -save_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); +save_game(working_directory + "\multitroid\save" + string(global.saveslot + 1)); room_change(global.start_room, 0);