Skip to content

Commit 77bff80

Browse files
milesthenerdmilesthenerd
committed
Fixed cross-platform random seed syncing and corrected color palette
1 parent b51c1b1 commit 77bff80

File tree

5 files changed

+220
-19
lines changed

5 files changed

+220
-19
lines changed

‎AM2R.project.gmx

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Configs name="configs">
44
<Config>Configs\Default</Config>
55
</Configs>
6-
<datafiles number="361" name="datafiles">
7-
<datafiles number="361" name="lang">
6+
<datafiles number="362" name="datafiles">
7+
<datafiles number="362" name="lang">
88
<datafile>
99
<name>czech.ini</name>
1010
<exists>-1</exists>
@@ -158,7 +158,7 @@
158158
</ConfigOptions>
159159
<filename>languages.txt</filename>
160160
</datafile>
161-
<datafiles number="361" name="headers">
161+
<datafiles number="362" name="headers">
162162
<datafile>
163163
<name>castellano_a1_f24_b0_c3_d19_e21.png</name>
164164
<exists>-1</exists>
@@ -857,7 +857,7 @@
857857
<filename>russian_a8_f19_b0_c3_d14_e16.png</filename>
858858
</datafile>
859859
</datafiles>
860-
<datafiles number="361" name="fonts">
860+
<datafiles number="362" name="fonts">
861861
<datafile>
862862
<name>04b09.ttf</name>
863863
<exists>-1</exists>
@@ -1030,8 +1030,8 @@
10301030
</ConfigOptions>
10311031
<filename>readme.txt</filename>
10321032
</datafile>
1033-
<datafiles number="361" name="mods">
1034-
<datafiles number="361" name="titles">
1033+
<datafiles number="362" name="mods">
1034+
<datafiles number="362" name="titles">
10351035
<datafile>
10361036
<name>config.ini</name>
10371037
<exists>-1</exists>
@@ -1067,8 +1067,8 @@
10671067
<filename>titlebackground.png</filename>
10681068
</datafile>
10691069
</datafiles>
1070-
<datafiles number="361" name="palettes">
1071-
<datafiles number="361" name="monsters">
1070+
<datafiles number="362" name="palettes">
1071+
<datafiles number="362" name="monsters">
10721072
<datafile>
10731073
<name>alpha.png</name>
10741074
<exists>-1</exists>
@@ -1240,7 +1240,7 @@
12401240
<filename>zeta_blur.png</filename>
12411241
</datafile>
12421242
</datafiles>
1243-
<datafiles number="361" name="suits">
1243+
<datafiles number="362" name="suits">
12441244
<datafile>
12451245
<name>fusion_gravity.png</name>
12461246
<exists>-1</exists>
@@ -1343,7 +1343,7 @@
13431343
</ConfigOptions>
13441344
<filename>varia.png</filename>
13451345
</datafile>
1346-
<datafiles number="361" name="MorphTrailColors">
1346+
<datafiles number="362" name="MorphTrailColors">
13471347
<datafile>
13481348
<name>fusion_gravity.png</name>
13491349
<exists>-1</exists>
@@ -1447,7 +1447,7 @@
14471447
<filename>varia.png</filename>
14481448
</datafile>
14491449
</datafiles>
1450-
<datafiles number="361" name="SpaceJumpTrails">
1450+
<datafiles number="362" name="SpaceJumpTrails">
14511451
<datafile>
14521452
<name>fusion_gravity.png</name>
14531453
<exists>-1</exists>
@@ -1551,7 +1551,7 @@
15511551
<filename>varia.png</filename>
15521552
</datafile>
15531553
</datafiles>
1554-
<datafiles number="361" name="SpiderBallGlow">
1554+
<datafiles number="362" name="SpiderBallGlow">
15551555
<datafile>
15561556
<name>fusion_gravity.png</name>
15571557
<exists>-1</exists>
@@ -1656,8 +1656,8 @@
16561656
</datafile>
16571657
</datafiles>
16581658
</datafiles>
1659-
<datafiles number="361" name="multitroid">
1660-
<datafiles number="361" name="dark_player_icons">
1659+
<datafiles number="362" name="multitroid">
1660+
<datafiles number="362" name="dark_player_icons">
16611661
<datafile>
16621662
<name>sDarkMultitroidPlayer_0.png</name>
16631663
<exists>-1</exists>
@@ -1931,7 +1931,7 @@
19311931
<filename>sDarkMultitroidPlayer_15.png</filename>
19321932
</datafile>
19331933
</datafiles>
1934-
<datafiles number="361" name="player_icons">
1934+
<datafiles number="362" name="player_icons">
19351935
<datafile>
19361936
<name>sMultitroidPlayer_0.png</name>
19371937
<exists>-1</exists>
@@ -2205,7 +2205,7 @@
22052205
<filename>sMultitroidPlayer_15.png</filename>
22062206
</datafile>
22072207
</datafiles>
2208-
<datafiles number="361" name="map_icons">
2208+
<datafiles number="362" name="map_icons">
22092209
<datafile>
22102210
<name>sMultitroidMapIcon_0.png</name>
22112211
<exists>-1</exists>
@@ -2533,7 +2533,7 @@
25332533
<datafile>
25342534
<name>multitroid.png</name>
25352535
<exists>-1</exists>
2536-
<size>1288</size>
2536+
<size>1128</size>
25372537
<exportAction>2</exportAction>
25382538
<exportDir></exportDir>
25392539
<overwrite>0</overwrite>
@@ -5952,6 +5952,7 @@
59525952
<script>scripts\popup_seed.gml</script>
59535953
<script>scripts\shoot_beam_receive.gml</script>
59545954
<script>scripts\shoot_missile_receive.gml</script>
5955+
<script>scripts\receive_randmod_buffer.gml</script>
59555956
</scripts>
59565957
<scripts name="Misc">
59575958
<script>scripts\pal_swap_get_color_count.gml</script>

‎objects/oClient.object.gmx

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2245,6 +2245,103 @@ switch(type_event){
22452245
popup_seed("Seed received");
22462246
}
22472247
}
2248+
//Power-ups
2249+
oControl.mod_bombs = buffer_read(_buffer, buffer_s16);
2250+
oControl.mod_spider = buffer_read(_buffer, buffer_s16);
2251+
oControl.mod_jumpball = buffer_read(_buffer, buffer_s16);
2252+
oControl.mod_hijump = buffer_read(_buffer, buffer_s16);
2253+
oControl.mod_varia = buffer_read(_buffer, buffer_s16);
2254+
oControl.mod_spacejump = buffer_read(_buffer, buffer_s16);
2255+
oControl.mod_speedbooster = buffer_read(_buffer, buffer_s16);
2256+
oControl.mod_screwattack = buffer_read(_buffer, buffer_s16);
2257+
oControl.mod_gravity = buffer_read(_buffer, buffer_s16);
2258+
oControl.mod_charge = buffer_read(_buffer, buffer_s16);
2259+
oControl.mod_ice = buffer_read(_buffer, buffer_s16);
2260+
oControl.mod_wave = buffer_read(_buffer, buffer_s16);
2261+
oControl.mod_spazer = buffer_read(_buffer, buffer_s16);
2262+
oControl.mod_plasma = buffer_read(_buffer, buffer_s16);
2263+
2264+
//Missiles
2265+
oControl.mod_52 = buffer_read(_buffer, buffer_s16);
2266+
oControl.mod_53 = buffer_read(_buffer, buffer_s16);
2267+
oControl.mod_54 = buffer_read(_buffer, buffer_s16);
2268+
oControl.mod_55 = buffer_read(_buffer, buffer_s16);
2269+
oControl.mod_56 = buffer_read(_buffer, buffer_s16);
2270+
oControl.mod_57 = buffer_read(_buffer, buffer_s16);
2271+
oControl.mod_60 = buffer_read(_buffer, buffer_s16);
2272+
oControl.mod_100 = buffer_read(_buffer, buffer_s16);
2273+
oControl.mod_101 = buffer_read(_buffer, buffer_s16);
2274+
oControl.mod_102 = buffer_read(_buffer, buffer_s16);
2275+
oControl.mod_104 = buffer_read(_buffer, buffer_s16);
2276+
oControl.mod_105 = buffer_read(_buffer, buffer_s16);
2277+
oControl.mod_106 = buffer_read(_buffer, buffer_s16);
2278+
oControl.mod_107 = buffer_read(_buffer, buffer_s16);
2279+
oControl.mod_109 = buffer_read(_buffer, buffer_s16);
2280+
oControl.mod_111 = buffer_read(_buffer, buffer_s16);
2281+
oControl.mod_150 = buffer_read(_buffer, buffer_s16);
2282+
oControl.mod_151 = buffer_read(_buffer, buffer_s16);
2283+
oControl.mod_152 = buffer_read(_buffer, buffer_s16);
2284+
oControl.mod_153 = buffer_read(_buffer, buffer_s16);
2285+
oControl.mod_154 = buffer_read(_buffer, buffer_s16);
2286+
oControl.mod_155 = buffer_read(_buffer, buffer_s16);
2287+
oControl.mod_156 = buffer_read(_buffer, buffer_s16);
2288+
oControl.mod_159 = buffer_read(_buffer, buffer_s16);
2289+
oControl.mod_161 = buffer_read(_buffer, buffer_s16);
2290+
oControl.mod_163 = buffer_read(_buffer, buffer_s16);
2291+
oControl.mod_202 = buffer_read(_buffer, buffer_s16);
2292+
oControl.mod_203 = buffer_read(_buffer, buffer_s16);
2293+
oControl.mod_204 = buffer_read(_buffer, buffer_s16);
2294+
oControl.mod_205 = buffer_read(_buffer, buffer_s16);
2295+
oControl.mod_208 = buffer_read(_buffer, buffer_s16);
2296+
oControl.mod_210 = buffer_read(_buffer, buffer_s16);
2297+
oControl.mod_211 = buffer_read(_buffer, buffer_s16);
2298+
oControl.mod_214 = buffer_read(_buffer, buffer_s16);
2299+
oControl.mod_250 = buffer_read(_buffer, buffer_s16);
2300+
oControl.mod_252 = buffer_read(_buffer, buffer_s16);
2301+
oControl.mod_255 = buffer_read(_buffer, buffer_s16);
2302+
oControl.mod_257 = buffer_read(_buffer, buffer_s16);
2303+
oControl.mod_259 = buffer_read(_buffer, buffer_s16);
2304+
oControl.mod_303 = buffer_read(_buffer, buffer_s16);
2305+
oControl.mod_304 = buffer_read(_buffer, buffer_s16);
2306+
oControl.mod_307 = buffer_read(_buffer, buffer_s16);
2307+
oControl.mod_308 = buffer_read(_buffer, buffer_s16);
2308+
oControl.mod_309 = buffer_read(_buffer, buffer_s16);
2309+
2310+
//Super Missiles
2311+
oControl.mod_51 = buffer_read(_buffer, buffer_s16);
2312+
oControl.mod_110 = buffer_read(_buffer, buffer_s16);;
2313+
oControl.mod_162 = buffer_read(_buffer, buffer_s16);
2314+
oControl.mod_206 = buffer_read(_buffer, buffer_s16); //SPECIAL
2315+
oControl.mod_207 = buffer_read(_buffer, buffer_s16);
2316+
oControl.mod_209 = buffer_read(_buffer, buffer_s16);
2317+
oControl.mod_215 = buffer_read(_buffer, buffer_s16);
2318+
oControl.mod_256 = buffer_read(_buffer, buffer_s16);
2319+
oControl.mod_300 = buffer_read(_buffer, buffer_s16);
2320+
oControl.mod_305 = buffer_read(_buffer, buffer_s16);
2321+
2322+
//Energy Tanks
2323+
oControl.mod_50 = buffer_read(_buffer, buffer_s16);
2324+
oControl.mod_103 = buffer_read(_buffer, buffer_s16);
2325+
oControl.mod_108 = buffer_read(_buffer, buffer_s16);
2326+
oControl.mod_157 = buffer_read(_buffer, buffer_s16);
2327+
oControl.mod_158 = buffer_read(_buffer, buffer_s16);
2328+
oControl.mod_200 = buffer_read(_buffer, buffer_s16);
2329+
oControl.mod_201 = buffer_read(_buffer, buffer_s16);
2330+
oControl.mod_251 = buffer_read(_buffer, buffer_s16);
2331+
oControl.mod_254 = buffer_read(_buffer, buffer_s16);
2332+
oControl.mod_306 = buffer_read(_buffer, buffer_s16);
2333+
2334+
//Power Bombs
2335+
oControl.mod_58 = buffer_read(_buffer, buffer_s16);
2336+
oControl.mod_59 = buffer_read(_buffer, buffer_s16);
2337+
oControl.mod_112 = buffer_read(_buffer, buffer_s16);
2338+
oControl.mod_160 = buffer_read(_buffer, buffer_s16);
2339+
oControl.mod_212 = buffer_read(_buffer, buffer_s16);
2340+
oControl.mod_213 = buffer_read(_buffer, buffer_s16);
2341+
oControl.mod_253 = buffer_read(_buffer, buffer_s16); //SPECIAL
2342+
oControl.mod_258 = buffer_read(_buffer, buffer_s16);
2343+
oControl.mod_301 = buffer_read(_buffer, buffer_s16);
2344+
oControl.mod_302 = buffer_read(_buffer, buffer_s16);
22482345
break;
22492346
case 5:
22502347
var monstersLeft = buffer_read(_buffer, buffer_s8);

‎objects/oOptionsMod.object.gmx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ if(!done){
487487
}
488488
*/
489489

490+
/*
490491
if(!instance_exists(oClient)){
491492
op[num_seedgen].enabled = 0;
492493
canedit[num_seedgen] = 0;
@@ -499,6 +500,7 @@ if(!done){
499500
canedit[num_seedgen] = 0;
500501
}
501502
}
503+
*/
502504

503505
/*
504506
if(!instance_exists(oClient)){
@@ -956,6 +958,9 @@ op[num_seedgen] = instance_create(x, y + sep * tempcount++, oPauseOption);
956958
op[num_seedgen].optionid = num_seedgen;
957959
op[num_seedgen].label = "Generate seed";
958960

961+
op[num_seedgen].enabled = 0;
962+
canedit[num_seedgen] = 0;
963+
959964
op[num_connection] = instance_create(x, y + sep * tempcount++, oPauseOption);
960965
op[num_connection].optionid = num_connection;
961966
op[num_connection].label = connectiontxt;

‎scripts/receive_randmod_buffer.gml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/// receive_randmod_buffer
2+
//Power-ups
3+
oControl.mod_bombs = buffer_read(_buffer, buffer_s16);
4+
oControl.mod_spider = buffer_read(_buffer, buffer_s16);
5+
oControl.mod_jumpball = buffer_read(_buffer, buffer_s16);
6+
oControl.mod_hijump = buffer_read(_buffer, buffer_s16);
7+
oControl.mod_varia = buffer_read(_buffer, buffer_s16);
8+
oControl.mod_spacejump = buffer_read(_buffer, buffer_s16);
9+
oControl.mod_speedbooster = buffer_read(_buffer, buffer_s16);
10+
oControl.mod_screwattack = buffer_read(_buffer, buffer_s16);
11+
oControl.mod_gravity = buffer_read(_buffer, buffer_s16);
12+
oControl.mod_charge = buffer_read(_buffer, buffer_s16);
13+
oControl.mod_ice = buffer_read(_buffer, buffer_s16);
14+
oControl.mod_wave = buffer_read(_buffer, buffer_s16);
15+
oControl.mod_spazer = buffer_read(_buffer, buffer_s16);
16+
oControl.mod_plasma = buffer_read(_buffer, buffer_s16);
17+
18+
//Missiles
19+
oControl.mod_52 = buffer_read(_buffer, buffer_s16);
20+
oControl.mod_53 = buffer_read(_buffer, buffer_s16);
21+
oControl.mod_54 = buffer_read(_buffer, buffer_s16);
22+
oControl.mod_55 = buffer_read(_buffer, buffer_s16);
23+
oControl.mod_56 = buffer_read(_buffer, buffer_s16);
24+
oControl.mod_57 = buffer_read(_buffer, buffer_s16);
25+
oControl.mod_60 = buffer_read(_buffer, buffer_s16);
26+
oControl.mod_100 = buffer_read(_buffer, buffer_s16);
27+
oControl.mod_101 = buffer_read(_buffer, buffer_s16);
28+
oControl.mod_102 = buffer_read(_buffer, buffer_s16);
29+
oControl.mod_104 = buffer_read(_buffer, buffer_s16);
30+
oControl.mod_105 = buffer_read(_buffer, buffer_s16);
31+
oControl.mod_106 = buffer_read(_buffer, buffer_s16);
32+
oControl.mod_107 = buffer_read(_buffer, buffer_s16);
33+
oControl.mod_109 = buffer_read(_buffer, buffer_s16);
34+
oControl.mod_111 = buffer_read(_buffer, buffer_s16);
35+
oControl.mod_150 = buffer_read(_buffer, buffer_s16);
36+
oControl.mod_151 = buffer_read(_buffer, buffer_s16);
37+
oControl.mod_152 = buffer_read(_buffer, buffer_s16);
38+
oControl.mod_153 = buffer_read(_buffer, buffer_s16);
39+
oControl.mod_154 = buffer_read(_buffer, buffer_s16);
40+
oControl.mod_155 = buffer_read(_buffer, buffer_s16);
41+
oControl.mod_156 = buffer_read(_buffer, buffer_s16);
42+
oControl.mod_159 = buffer_read(_buffer, buffer_s16);
43+
oControl.mod_161 = buffer_read(_buffer, buffer_s16);
44+
oControl.mod_163 = buffer_read(_buffer, buffer_s16);
45+
oControl.mod_202 = buffer_read(_buffer, buffer_s16);
46+
oControl.mod_203 = buffer_read(_buffer, buffer_s16);
47+
oControl.mod_204 = buffer_read(_buffer, buffer_s16);
48+
oControl.mod_205 = buffer_read(_buffer, buffer_s16);
49+
oControl.mod_208 = buffer_read(_buffer, buffer_s16);
50+
oControl.mod_210 = buffer_read(_buffer, buffer_s16);
51+
oControl.mod_211 = buffer_read(_buffer, buffer_s16);
52+
oControl.mod_214 = buffer_read(_buffer, buffer_s16);
53+
oControl.mod_250 = buffer_read(_buffer, buffer_s16);
54+
oControl.mod_252 = buffer_read(_buffer, buffer_s16);
55+
oControl.mod_255 = buffer_read(_buffer, buffer_s16);
56+
oControl.mod_257 = buffer_read(_buffer, buffer_s16);
57+
oControl.mod_259 = buffer_read(_buffer, buffer_s16);
58+
oControl.mod_303 = buffer_read(_buffer, buffer_s16);
59+
oControl.mod_304 = buffer_read(_buffer, buffer_s16);
60+
oControl.mod_307 = buffer_read(_buffer, buffer_s16);
61+
oControl.mod_308 = buffer_read(_buffer, buffer_s16);
62+
oControl.mod_309 = buffer_read(_buffer, buffer_s16);
63+
64+
//Super Missiles
65+
oControl.mod_51 = buffer_read(_buffer, buffer_s16);
66+
oControl.mod_110 = buffer_read(_buffer, buffer_s16);;
67+
oControl.mod_162 = buffer_read(_buffer, buffer_s16);
68+
oControl.mod_206 = buffer_read(_buffer, buffer_s16); //SPECIAL
69+
oControl.mod_207 = buffer_read(_buffer, buffer_s16);
70+
oControl.mod_209 = buffer_read(_buffer, buffer_s16);
71+
oControl.mod_215 = buffer_read(_buffer, buffer_s16);
72+
oControl.mod_256 = buffer_read(_buffer, buffer_s16);
73+
oControl.mod_300 = buffer_read(_buffer, buffer_s16);
74+
oControl.mod_305 = buffer_read(_buffer, buffer_s16);
75+
76+
//Energy Tanks
77+
oControl.mod_50 = buffer_read(_buffer, buffer_s16);
78+
oControl.mod_103 = buffer_read(_buffer, buffer_s16);
79+
oControl.mod_108 = buffer_read(_buffer, buffer_s16);
80+
oControl.mod_157 = buffer_read(_buffer, buffer_s16);
81+
oControl.mod_158 = buffer_read(_buffer, buffer_s16);
82+
oControl.mod_200 = buffer_read(_buffer, buffer_s16);
83+
oControl.mod_201 = buffer_read(_buffer, buffer_s16);
84+
oControl.mod_251 = buffer_read(_buffer, buffer_s16);
85+
oControl.mod_254 = buffer_read(_buffer, buffer_s16);
86+
oControl.mod_306 = buffer_read(_buffer, buffer_s16);
87+
88+
//Power Bombs
89+
oControl.mod_58 = buffer_read(_buffer, buffer_s16);
90+
oControl.mod_59 = buffer_read(_buffer, buffer_s16);
91+
oControl.mod_112 = buffer_read(_buffer, buffer_s16);
92+
oControl.mod_160 = buffer_read(_buffer, buffer_s16);
93+
oControl.mod_212 = buffer_read(_buffer, buffer_s16);
94+
oControl.mod_213 = buffer_read(_buffer, buffer_s16);
95+
oControl.mod_253 = buffer_read(_buffer, buffer_s16); //SPECIAL
96+
oControl.mod_258 = buffer_read(_buffer, buffer_s16);
97+
oControl.mod_301 = buffer_read(_buffer, buffer_s16);
98+
oControl.mod_302 = buffer_read(_buffer, buffer_s16);

‎sprites/sPalMultitroidColorNew.sprite.gmx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<bbox_left>0</bbox_left>
1111
<bbox_right>16</bbox_right>
1212
<bbox_top>0</bbox_top>
13-
<bbox_bottom>86</bbox_bottom>
13+
<bbox_bottom>77</bbox_bottom>
1414
<HTile>0</HTile>
1515
<VTile>0</VTile>
1616
<TextureGroups>
1717
<TextureGroup0>0</TextureGroup0>
1818
</TextureGroups>
1919
<For3D>0</For3D>
2020
<width>17</width>
21-
<height>87</height>
21+
<height>78</height>
2222
<frames>
2323
<frame index="0">images\sPalMultitroidColorNew_0.png</frame>
2424
</frames>

0 commit comments

Comments
 (0)