Skip to content

Commit ce6bfb7

Browse files
milesthenerdmilesthenerd
committed
Fixed credits sync
1 parent 4584b7c commit ce6bfb7

File tree

6 files changed

+150
-10
lines changed

6 files changed

+150
-10
lines changed

‎AM2R.project.gmx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5521,6 +5521,7 @@
55215521
<script>scripts\popup_text_ext.gml</script>
55225522
<script>scripts\draw_character_ext.gml</script>
55235523
<script>scripts\reset_dmap.gml</script>
5524+
<script>scripts\popup_seed.gml</script>
55245525
</scripts>
55255526
<scripts name="Misc">
55265527
<script>scripts\pal_swap_get_color_count.gml</script>
@@ -6593,6 +6594,7 @@
65936594
<object>objects\oNametag</object>
65946595
<object>objects\oOptionsMod</object>
65956596
<object>objects\oOptionLRMod</object>
6597+
<object>objects\oPopupTextSeed</object>
65966598
</objects>
65976599
</objects>
65986600
<timelines name="timelines">

‎Configs/Default.config.gmx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<option_android_build_version>2</option_android_build_version>
2626
<option_android_color_depth>1</option_android_color_depth>
2727
<option_android_compile_sdk_version>28</option_android_compile_sdk_version>
28-
<option_android_display_name>AM2R</option_android_display_name>
28+
<option_android_display_name>Multitroid 1.2.1</option_android_display_name>
2929
<option_android_facebook_app_display_name></option_android_facebook_app_display_name>
3030
<option_android_facebook_appid></option_android_facebook_appid>
3131
<option_android_facebook_enable>0</option_android_facebook_enable>
@@ -62,9 +62,9 @@
6262
<option_android_orient_portrait_flipped>False</option_android_orient_portrait_flipped>
6363
<option_android_orientation>2</option_android_orientation>
6464
<option_android_ouya_icon>Configs\Default\android\icons\ouyaIcon.png</option_android_ouya_icon>
65-
<option_android_package_company>lojical</option_android_package_company>
65+
<option_android_package_company>milesthenerd</option_android_package_company>
6666
<option_android_package_domain>com</option_android_package_domain>
67-
<option_android_package_product>AM2R</option_android_package_product>
67+
<option_android_package_product>multitroid</option_android_package_product>
6868
<option_android_permission_flags>24</option_android_permission_flags>
6969
<option_android_pocketchange_enable>false</option_android_pocketchange_enable>
7070
<option_android_pocketchange_id></option_android_pocketchange_id>
@@ -220,7 +220,7 @@
220220
<option_changeresolution>false</option_changeresolution>
221221
<option_closeesc>true</option_closeesc>
222222
<option_colordepth>0</option_colordepth>
223-
<option_display_name>AM2R Multitroid 1.2</option_display_name>
223+
<option_display_name>AM2R Multitroid 1.2.1</option_display_name>
224224
<option_displayerrors>True</option_displayerrors>
225225
<option_ecma>0</option_ecma>
226226
<option_facebook_app_display_name></option_facebook_app_display_name>
@@ -362,7 +362,7 @@
362362
<option_ios_texture_page>1024</option_ios_texture_page>
363363
<option_ios_use_test_ads>false</option_ios_use_test_ads>
364364
<option_lastchanged></option_lastchanged>
365-
<option_linux_display_name>AM2R Multitroid 1.2</option_linux_display_name>
365+
<option_linux_display_name>AM2R Multitroid 1.2.1</option_linux_display_name>
366366
<option_linux_enable_steam>0</option_linux_enable_steam>
367367
<option_linux_fullscreen>0</option_linux_fullscreen>
368368
<option_linux_homepage>https://www.reddit.com/r/AM2R/</option_linux_homepage>

‎objects/oClient.object.gmx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,12 @@ if(mapChanged){
657657
<kind>1</kind>
658658
<string>var v = 0;
659659
for(var f=0; f&lt;array_length_1d(global.event); f++){
660-
if(f &gt; 350 || f == 102){
660+
if(f &gt; 350){
661661
break;
662662
}
663+
if(f == 102){
664+
global.eventPrev[f] = global.event[f];
665+
}
663666
if(global.eventPrev[f] != global.event[f]){
664667
global.eventChanges[v, 0] = global.event[f];
665668
global.eventChanges[v, 1] = f;
@@ -2005,7 +2008,7 @@ switch(type_event){
20052008
if(seed != _seed){
20062009
seed = _seed;
20072010
show_debug_message("seed received");
2008-
popup_text("Seed received");
2011+
popup_seed("Seed received");
20092012
}
20102013
}
20112014
break;
@@ -2103,15 +2106,15 @@ switch(type_event){
21032106
if (global.currentsuit == 0) sprite_index = scr_suit_sprites(sFront,sFront_fusion);
21042107
if (global.currentsuit == 1) sprite_index = scr_suit_sprites(sVFront,sFront_fusion);
21052108
if (global.currentsuit == 2) sprite_index = scr_suit_sprites(sGFront,sFront_fusion);
2106-
global.enablecontrol = 0;
21072109
canbehit = 0;
2108-
oControl.displaygui = 0;
21092110
xVel = 0;
21102111
yVel = 0;
21112112
xAcc = 0;
21122113
yAcc = 0;
21132114
}
21142115
}
2116+
global.enablecontrol = 0;
2117+
oControl.displaygui = 0;
21152118
popup_text_ext("Ship reached", 120);
21162119
}
21172120
if(eventArr[f, 0] == 2 &amp;&amp; clientID != global.clientID){

‎objects/oControl.object.gmx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", true, 1);
321321

322322
global.am2r_version = "V1.5.2"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities.
323323

324-
global.multitroid_version = "V1.2";
324+
global.multitroid_version = "V1.2.1";
325325

326326
// Android
327327
global.gamestarted = 0;

‎objects/oPopupTextSeed.object.gmx

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
2+
<object>
3+
<spriteName>&lt;undefined&gt;</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>-2000</depth>
7+
<persistent>0</persistent>
8+
<parentName>&lt;undefined&gt;</parentName>
9+
<maskName>&lt;undefined&gt;</maskName>
10+
<events>
11+
<event eventtype="0" enumb="0">
12+
<action>
13+
<libid>1</libid>
14+
<id>603</id>
15+
<kind>7</kind>
16+
<userelative>0</userelative>
17+
<isquestion>0</isquestion>
18+
<useapplyto>-1</useapplyto>
19+
<exetype>2</exetype>
20+
<functionname></functionname>
21+
<codestring></codestring>
22+
<whoName>self</whoName>
23+
<relative>0</relative>
24+
<isnot>0</isnot>
25+
<arguments>
26+
<argument>
27+
<kind>1</kind>
28+
<string>image_alpha = 0;
29+
alarm[0] = 100;
30+
fadeout = 0;
31+
</string>
32+
</argument>
33+
</arguments>
34+
</action>
35+
</event>
36+
<event eventtype="2" enumb="0">
37+
<action>
38+
<libid>1</libid>
39+
<id>603</id>
40+
<kind>7</kind>
41+
<userelative>0</userelative>
42+
<isquestion>0</isquestion>
43+
<useapplyto>-1</useapplyto>
44+
<exetype>2</exetype>
45+
<functionname></functionname>
46+
<codestring></codestring>
47+
<whoName>self</whoName>
48+
<relative>0</relative>
49+
<isnot>0</isnot>
50+
<arguments>
51+
<argument>
52+
<kind>1</kind>
53+
<string>fadeout = 1;
54+
</string>
55+
</argument>
56+
</arguments>
57+
</action>
58+
</event>
59+
<event eventtype="3" enumb="0">
60+
<action>
61+
<libid>1</libid>
62+
<id>603</id>
63+
<kind>7</kind>
64+
<userelative>0</userelative>
65+
<isquestion>0</isquestion>
66+
<useapplyto>-1</useapplyto>
67+
<exetype>2</exetype>
68+
<functionname></functionname>
69+
<codestring></codestring>
70+
<whoName>self</whoName>
71+
<relative>0</relative>
72+
<isnot>0</isnot>
73+
<arguments>
74+
<argument>
75+
<kind>1</kind>
76+
<string>if (!fadeout) {
77+
if (image_alpha &lt; 1) image_alpha += 0.1;
78+
} else if (image_alpha &gt; 0) {
79+
image_alpha -= 0.05;
80+
} else instance_destroy();
81+
x = view_xview[0] + 4;
82+
y = view_yview[0] + 230;
83+
</string>
84+
</argument>
85+
</arguments>
86+
</action>
87+
</event>
88+
<event eventtype="8" enumb="0">
89+
<action>
90+
<libid>1</libid>
91+
<id>603</id>
92+
<kind>7</kind>
93+
<userelative>0</userelative>
94+
<isquestion>0</isquestion>
95+
<useapplyto>-1</useapplyto>
96+
<exetype>2</exetype>
97+
<functionname></functionname>
98+
<codestring></codestring>
99+
<whoName>self</whoName>
100+
<relative>0</relative>
101+
<isnot>0</isnot>
102+
<arguments>
103+
<argument>
104+
<kind>1</kind>
105+
<string>draw_set_font(fontGUI2);
106+
draw_set_halign(fa_right);
107+
if(room == rm_controller || room == rm_options){
108+
draw_cool_text(view_xview[0] + 316, view_yview[0] + 206, text, c_black, c_white, c_white, image_alpha);
109+
} else {
110+
draw_cool_text(view_xview[0] + 316 + (53*oControl.widescreen), view_yview[0] + 206, text, c_black, c_white, c_white, image_alpha);
111+
}
112+
draw_set_halign(fa_left);
113+
</string>
114+
</argument>
115+
</arguments>
116+
</action>
117+
</event>
118+
</events>
119+
<PhysicsObject>0</PhysicsObject>
120+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
121+
<PhysicsObjectShape>0</PhysicsObjectShape>
122+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
123+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
124+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
125+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
126+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
127+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
128+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
129+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
130+
<PhysicsShapePoints/>
131+
</object>

‎scripts/popup_seed.gml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/// popup_seed
2+
with (oPopupTextSeed) instance_destroy();
3+
var t = instance_create(0, 0, oPopupTextSeed);
4+
t.text = argument0;

0 commit comments

Comments
 (0)