Fixed cross-platform random seed syncing and corrected color palette

cleaner
milesthenerd 5 years ago
parent b51c1b1a48
commit 77bff803da

@ -3,8 +3,8 @@
<Configs name="configs">
<Config>Configs\Default</Config>
</Configs>
<datafiles number="361" name="datafiles">
<datafiles number="361" name="lang">
<datafiles number="362" name="datafiles">
<datafiles number="362" name="lang">
<datafile>
<name>czech.ini</name>
<exists>-1</exists>
@ -158,7 +158,7 @@
</ConfigOptions>
<filename>languages.txt</filename>
</datafile>
<datafiles number="361" name="headers">
<datafiles number="362" name="headers">
<datafile>
<name>castellano_a1_f24_b0_c3_d19_e21.png</name>
<exists>-1</exists>
@ -857,7 +857,7 @@
<filename>russian_a8_f19_b0_c3_d14_e16.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="fonts">
<datafiles number="362" name="fonts">
<datafile>
<name>04b09.ttf</name>
<exists>-1</exists>
@ -1030,8 +1030,8 @@
</ConfigOptions>
<filename>readme.txt</filename>
</datafile>
<datafiles number="361" name="mods">
<datafiles number="361" name="titles">
<datafiles number="362" name="mods">
<datafiles number="362" name="titles">
<datafile>
<name>config.ini</name>
<exists>-1</exists>
@ -1067,8 +1067,8 @@
<filename>titlebackground.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="palettes">
<datafiles number="361" name="monsters">
<datafiles number="362" name="palettes">
<datafiles number="362" name="monsters">
<datafile>
<name>alpha.png</name>
<exists>-1</exists>
@ -1240,7 +1240,7 @@
<filename>zeta_blur.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="suits">
<datafiles number="362" name="suits">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
@ -1343,7 +1343,7 @@
</ConfigOptions>
<filename>varia.png</filename>
</datafile>
<datafiles number="361" name="MorphTrailColors">
<datafiles number="362" name="MorphTrailColors">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
@ -1447,7 +1447,7 @@
<filename>varia.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="SpaceJumpTrails">
<datafiles number="362" name="SpaceJumpTrails">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
@ -1551,7 +1551,7 @@
<filename>varia.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="SpiderBallGlow">
<datafiles number="362" name="SpiderBallGlow">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
@ -1656,8 +1656,8 @@
</datafile>
</datafiles>
</datafiles>
<datafiles number="361" name="multitroid">
<datafiles number="361" name="dark_player_icons">
<datafiles number="362" name="multitroid">
<datafiles number="362" name="dark_player_icons">
<datafile>
<name>sDarkMultitroidPlayer_0.png</name>
<exists>-1</exists>
@ -1931,7 +1931,7 @@
<filename>sDarkMultitroidPlayer_15.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="player_icons">
<datafiles number="362" name="player_icons">
<datafile>
<name>sMultitroidPlayer_0.png</name>
<exists>-1</exists>
@ -2205,7 +2205,7 @@
<filename>sMultitroidPlayer_15.png</filename>
</datafile>
</datafiles>
<datafiles number="361" name="map_icons">
<datafiles number="362" name="map_icons">
<datafile>
<name>sMultitroidMapIcon_0.png</name>
<exists>-1</exists>
@ -2533,7 +2533,7 @@
<datafile>
<name>multitroid.png</name>
<exists>-1</exists>
<size>1288</size>
<size>1128</size>
<exportAction>2</exportAction>
<exportDir></exportDir>
<overwrite>0</overwrite>
@ -5952,6 +5952,7 @@
<script>scripts\popup_seed.gml</script>
<script>scripts\shoot_beam_receive.gml</script>
<script>scripts\shoot_missile_receive.gml</script>
<script>scripts\receive_randmod_buffer.gml</script>
</scripts>
<scripts name="Misc">
<script>scripts\pal_swap_get_color_count.gml</script>

@ -2245,6 +2245,103 @@ switch(type_event){
popup_seed("Seed received");
}
}
//Power-ups
oControl.mod_bombs = buffer_read(_buffer, buffer_s16);
oControl.mod_spider = buffer_read(_buffer, buffer_s16);
oControl.mod_jumpball = buffer_read(_buffer, buffer_s16);
oControl.mod_hijump = buffer_read(_buffer, buffer_s16);
oControl.mod_varia = buffer_read(_buffer, buffer_s16);
oControl.mod_spacejump = buffer_read(_buffer, buffer_s16);
oControl.mod_speedbooster = buffer_read(_buffer, buffer_s16);
oControl.mod_screwattack = buffer_read(_buffer, buffer_s16);
oControl.mod_gravity = buffer_read(_buffer, buffer_s16);
oControl.mod_charge = buffer_read(_buffer, buffer_s16);
oControl.mod_ice = buffer_read(_buffer, buffer_s16);
oControl.mod_wave = buffer_read(_buffer, buffer_s16);
oControl.mod_spazer = buffer_read(_buffer, buffer_s16);
oControl.mod_plasma = buffer_read(_buffer, buffer_s16);
//Missiles
oControl.mod_52 = buffer_read(_buffer, buffer_s16);
oControl.mod_53 = buffer_read(_buffer, buffer_s16);
oControl.mod_54 = buffer_read(_buffer, buffer_s16);
oControl.mod_55 = buffer_read(_buffer, buffer_s16);
oControl.mod_56 = buffer_read(_buffer, buffer_s16);
oControl.mod_57 = buffer_read(_buffer, buffer_s16);
oControl.mod_60 = buffer_read(_buffer, buffer_s16);
oControl.mod_100 = buffer_read(_buffer, buffer_s16);
oControl.mod_101 = buffer_read(_buffer, buffer_s16);
oControl.mod_102 = buffer_read(_buffer, buffer_s16);
oControl.mod_104 = buffer_read(_buffer, buffer_s16);
oControl.mod_105 = buffer_read(_buffer, buffer_s16);
oControl.mod_106 = buffer_read(_buffer, buffer_s16);
oControl.mod_107 = buffer_read(_buffer, buffer_s16);
oControl.mod_109 = buffer_read(_buffer, buffer_s16);
oControl.mod_111 = buffer_read(_buffer, buffer_s16);
oControl.mod_150 = buffer_read(_buffer, buffer_s16);
oControl.mod_151 = buffer_read(_buffer, buffer_s16);
oControl.mod_152 = buffer_read(_buffer, buffer_s16);
oControl.mod_153 = buffer_read(_buffer, buffer_s16);
oControl.mod_154 = buffer_read(_buffer, buffer_s16);
oControl.mod_155 = buffer_read(_buffer, buffer_s16);
oControl.mod_156 = buffer_read(_buffer, buffer_s16);
oControl.mod_159 = buffer_read(_buffer, buffer_s16);
oControl.mod_161 = buffer_read(_buffer, buffer_s16);
oControl.mod_163 = buffer_read(_buffer, buffer_s16);
oControl.mod_202 = buffer_read(_buffer, buffer_s16);
oControl.mod_203 = buffer_read(_buffer, buffer_s16);
oControl.mod_204 = buffer_read(_buffer, buffer_s16);
oControl.mod_205 = buffer_read(_buffer, buffer_s16);
oControl.mod_208 = buffer_read(_buffer, buffer_s16);
oControl.mod_210 = buffer_read(_buffer, buffer_s16);
oControl.mod_211 = buffer_read(_buffer, buffer_s16);
oControl.mod_214 = buffer_read(_buffer, buffer_s16);
oControl.mod_250 = buffer_read(_buffer, buffer_s16);
oControl.mod_252 = buffer_read(_buffer, buffer_s16);
oControl.mod_255 = buffer_read(_buffer, buffer_s16);
oControl.mod_257 = buffer_read(_buffer, buffer_s16);
oControl.mod_259 = buffer_read(_buffer, buffer_s16);
oControl.mod_303 = buffer_read(_buffer, buffer_s16);
oControl.mod_304 = buffer_read(_buffer, buffer_s16);
oControl.mod_307 = buffer_read(_buffer, buffer_s16);
oControl.mod_308 = buffer_read(_buffer, buffer_s16);
oControl.mod_309 = buffer_read(_buffer, buffer_s16);
//Super Missiles
oControl.mod_51 = buffer_read(_buffer, buffer_s16);
oControl.mod_110 = buffer_read(_buffer, buffer_s16);;
oControl.mod_162 = buffer_read(_buffer, buffer_s16);
oControl.mod_206 = buffer_read(_buffer, buffer_s16); //SPECIAL
oControl.mod_207 = buffer_read(_buffer, buffer_s16);
oControl.mod_209 = buffer_read(_buffer, buffer_s16);
oControl.mod_215 = buffer_read(_buffer, buffer_s16);
oControl.mod_256 = buffer_read(_buffer, buffer_s16);
oControl.mod_300 = buffer_read(_buffer, buffer_s16);
oControl.mod_305 = buffer_read(_buffer, buffer_s16);
//Energy Tanks
oControl.mod_50 = buffer_read(_buffer, buffer_s16);
oControl.mod_103 = buffer_read(_buffer, buffer_s16);
oControl.mod_108 = buffer_read(_buffer, buffer_s16);
oControl.mod_157 = buffer_read(_buffer, buffer_s16);
oControl.mod_158 = buffer_read(_buffer, buffer_s16);
oControl.mod_200 = buffer_read(_buffer, buffer_s16);
oControl.mod_201 = buffer_read(_buffer, buffer_s16);
oControl.mod_251 = buffer_read(_buffer, buffer_s16);
oControl.mod_254 = buffer_read(_buffer, buffer_s16);
oControl.mod_306 = buffer_read(_buffer, buffer_s16);
//Power Bombs
oControl.mod_58 = buffer_read(_buffer, buffer_s16);
oControl.mod_59 = buffer_read(_buffer, buffer_s16);
oControl.mod_112 = buffer_read(_buffer, buffer_s16);
oControl.mod_160 = buffer_read(_buffer, buffer_s16);
oControl.mod_212 = buffer_read(_buffer, buffer_s16);
oControl.mod_213 = buffer_read(_buffer, buffer_s16);
oControl.mod_253 = buffer_read(_buffer, buffer_s16); //SPECIAL
oControl.mod_258 = buffer_read(_buffer, buffer_s16);
oControl.mod_301 = buffer_read(_buffer, buffer_s16);
oControl.mod_302 = buffer_read(_buffer, buffer_s16);
break;
case 5:
var monstersLeft = buffer_read(_buffer, buffer_s8);

@ -487,6 +487,7 @@ if(!done){
}
*/
/*
if(!instance_exists(oClient)){
op[num_seedgen].enabled = 0;
canedit[num_seedgen] = 0;
@ -499,6 +500,7 @@ if(!done){
canedit[num_seedgen] = 0;
}
}
*/
/*
if(!instance_exists(oClient)){
@ -956,6 +958,9 @@ op[num_seedgen] = instance_create(x, y + sep * tempcount++, oPauseOption);
op[num_seedgen].optionid = num_seedgen;
op[num_seedgen].label = "Generate seed";
op[num_seedgen].enabled = 0;
canedit[num_seedgen] = 0;
op[num_connection] = instance_create(x, y + sep * tempcount++, oPauseOption);
op[num_connection].optionid = num_connection;
op[num_connection].label = connectiontxt;

@ -0,0 +1,98 @@
/// receive_randmod_buffer
//Power-ups
oControl.mod_bombs = buffer_read(_buffer, buffer_s16);
oControl.mod_spider = buffer_read(_buffer, buffer_s16);
oControl.mod_jumpball = buffer_read(_buffer, buffer_s16);
oControl.mod_hijump = buffer_read(_buffer, buffer_s16);
oControl.mod_varia = buffer_read(_buffer, buffer_s16);
oControl.mod_spacejump = buffer_read(_buffer, buffer_s16);
oControl.mod_speedbooster = buffer_read(_buffer, buffer_s16);
oControl.mod_screwattack = buffer_read(_buffer, buffer_s16);
oControl.mod_gravity = buffer_read(_buffer, buffer_s16);
oControl.mod_charge = buffer_read(_buffer, buffer_s16);
oControl.mod_ice = buffer_read(_buffer, buffer_s16);
oControl.mod_wave = buffer_read(_buffer, buffer_s16);
oControl.mod_spazer = buffer_read(_buffer, buffer_s16);
oControl.mod_plasma = buffer_read(_buffer, buffer_s16);
//Missiles
oControl.mod_52 = buffer_read(_buffer, buffer_s16);
oControl.mod_53 = buffer_read(_buffer, buffer_s16);
oControl.mod_54 = buffer_read(_buffer, buffer_s16);
oControl.mod_55 = buffer_read(_buffer, buffer_s16);
oControl.mod_56 = buffer_read(_buffer, buffer_s16);
oControl.mod_57 = buffer_read(_buffer, buffer_s16);
oControl.mod_60 = buffer_read(_buffer, buffer_s16);
oControl.mod_100 = buffer_read(_buffer, buffer_s16);
oControl.mod_101 = buffer_read(_buffer, buffer_s16);
oControl.mod_102 = buffer_read(_buffer, buffer_s16);
oControl.mod_104 = buffer_read(_buffer, buffer_s16);
oControl.mod_105 = buffer_read(_buffer, buffer_s16);
oControl.mod_106 = buffer_read(_buffer, buffer_s16);
oControl.mod_107 = buffer_read(_buffer, buffer_s16);
oControl.mod_109 = buffer_read(_buffer, buffer_s16);
oControl.mod_111 = buffer_read(_buffer, buffer_s16);
oControl.mod_150 = buffer_read(_buffer, buffer_s16);
oControl.mod_151 = buffer_read(_buffer, buffer_s16);
oControl.mod_152 = buffer_read(_buffer, buffer_s16);
oControl.mod_153 = buffer_read(_buffer, buffer_s16);
oControl.mod_154 = buffer_read(_buffer, buffer_s16);
oControl.mod_155 = buffer_read(_buffer, buffer_s16);
oControl.mod_156 = buffer_read(_buffer, buffer_s16);
oControl.mod_159 = buffer_read(_buffer, buffer_s16);
oControl.mod_161 = buffer_read(_buffer, buffer_s16);
oControl.mod_163 = buffer_read(_buffer, buffer_s16);
oControl.mod_202 = buffer_read(_buffer, buffer_s16);
oControl.mod_203 = buffer_read(_buffer, buffer_s16);
oControl.mod_204 = buffer_read(_buffer, buffer_s16);
oControl.mod_205 = buffer_read(_buffer, buffer_s16);
oControl.mod_208 = buffer_read(_buffer, buffer_s16);
oControl.mod_210 = buffer_read(_buffer, buffer_s16);
oControl.mod_211 = buffer_read(_buffer, buffer_s16);
oControl.mod_214 = buffer_read(_buffer, buffer_s16);
oControl.mod_250 = buffer_read(_buffer, buffer_s16);
oControl.mod_252 = buffer_read(_buffer, buffer_s16);
oControl.mod_255 = buffer_read(_buffer, buffer_s16);
oControl.mod_257 = buffer_read(_buffer, buffer_s16);
oControl.mod_259 = buffer_read(_buffer, buffer_s16);
oControl.mod_303 = buffer_read(_buffer, buffer_s16);
oControl.mod_304 = buffer_read(_buffer, buffer_s16);
oControl.mod_307 = buffer_read(_buffer, buffer_s16);
oControl.mod_308 = buffer_read(_buffer, buffer_s16);
oControl.mod_309 = buffer_read(_buffer, buffer_s16);
//Super Missiles
oControl.mod_51 = buffer_read(_buffer, buffer_s16);
oControl.mod_110 = buffer_read(_buffer, buffer_s16);;
oControl.mod_162 = buffer_read(_buffer, buffer_s16);
oControl.mod_206 = buffer_read(_buffer, buffer_s16); //SPECIAL
oControl.mod_207 = buffer_read(_buffer, buffer_s16);
oControl.mod_209 = buffer_read(_buffer, buffer_s16);
oControl.mod_215 = buffer_read(_buffer, buffer_s16);
oControl.mod_256 = buffer_read(_buffer, buffer_s16);
oControl.mod_300 = buffer_read(_buffer, buffer_s16);
oControl.mod_305 = buffer_read(_buffer, buffer_s16);
//Energy Tanks
oControl.mod_50 = buffer_read(_buffer, buffer_s16);
oControl.mod_103 = buffer_read(_buffer, buffer_s16);
oControl.mod_108 = buffer_read(_buffer, buffer_s16);
oControl.mod_157 = buffer_read(_buffer, buffer_s16);
oControl.mod_158 = buffer_read(_buffer, buffer_s16);
oControl.mod_200 = buffer_read(_buffer, buffer_s16);
oControl.mod_201 = buffer_read(_buffer, buffer_s16);
oControl.mod_251 = buffer_read(_buffer, buffer_s16);
oControl.mod_254 = buffer_read(_buffer, buffer_s16);
oControl.mod_306 = buffer_read(_buffer, buffer_s16);
//Power Bombs
oControl.mod_58 = buffer_read(_buffer, buffer_s16);
oControl.mod_59 = buffer_read(_buffer, buffer_s16);
oControl.mod_112 = buffer_read(_buffer, buffer_s16);
oControl.mod_160 = buffer_read(_buffer, buffer_s16);
oControl.mod_212 = buffer_read(_buffer, buffer_s16);
oControl.mod_213 = buffer_read(_buffer, buffer_s16);
oControl.mod_253 = buffer_read(_buffer, buffer_s16); //SPECIAL
oControl.mod_258 = buffer_read(_buffer, buffer_s16);
oControl.mod_301 = buffer_read(_buffer, buffer_s16);
oControl.mod_302 = buffer_read(_buffer, buffer_s16);

@ -10,7 +10,7 @@
<bbox_left>0</bbox_left>
<bbox_right>16</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>86</bbox_bottom>
<bbox_bottom>77</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
@ -18,7 +18,7 @@
</TextureGroups>
<For3D>0</For3D>
<width>17</width>
<height>87</height>
<height>78</height>
<frames>
<frame index="0">images\sPalMultitroidColorNew_0.png</frame>
</frames>

Loading…
Cancel
Save