AM2R-Mod-Sources
/
AM2R-Multitroid
mirror of https://github.com/milesthenerd/AM2R-Multitroid
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed credits sync

Browse Source
pull/28/head
milesthenerd 5 years ago
parent 4584b7c593
commit ce6bfb7834
6 changed files with 150 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
AM2R.project.gmx
Unescape View File

@ -5521,6 +5521,7 @@
<script>scripts\popup_text_ext.gml</script>
<script>scripts\draw_character_ext.gml</script>
<script>scripts\reset_dmap.gml</script>
<script>scripts\popup_seed.gml</script>
</scripts>
<scripts name="Misc">
<script>scripts\pal_swap_get_color_count.gml</script>
@ -6593,6 +6594,7 @@
<object>objects\oNametag</object>
<object>objects\oOptionsMod</object>
<object>objects\oOptionLRMod</object>
<object>objects\oPopupTextSeed</object>
</objects>
</objects>
<timelines name="timelines">

10
Configs/Default.config.gmx
Unescape View File

@ -25,7 +25,7 @@
<option_android_build_version>2</option_android_build_version>
<option_android_color_depth>1</option_android_color_depth>
<option_android_compile_sdk_version>28</option_android_compile_sdk_version>
<option_android_display_name>AM2R</option_android_display_name>
<option_android_display_name>Multitroid 1.2.1</option_android_display_name>
<option_android_facebook_app_display_name></option_android_facebook_app_display_name>
<option_android_facebook_appid></option_android_facebook_appid>
<option_android_facebook_enable>0</option_android_facebook_enable>
@ -62,9 +62,9 @@
<option_android_orient_portrait_flipped>False</option_android_orient_portrait_flipped>
<option_android_orientation>2</option_android_orientation>
<option_android_ouya_icon>Configs\Default\android\icons\ouyaIcon.png</option_android_ouya_icon>
<option_android_package_company>lojical</option_android_package_company>
<option_android_package_company>milesthenerd</option_android_package_company>
<option_android_package_domain>com</option_android_package_domain>
<option_android_package_product>AM2R</option_android_package_product>
<option_android_package_product>multitroid</option_android_package_product>
<option_android_permission_flags>24</option_android_permission_flags>
<option_android_pocketchange_enable>false</option_android_pocketchange_enable>
<option_android_pocketchange_id></option_android_pocketchange_id>
@ -220,7 +220,7 @@
<option_changeresolution>false</option_changeresolution>
<option_closeesc>true</option_closeesc>
<option_colordepth>0</option_colordepth>
<option_display_name>AM2R Multitroid 1.2</option_display_name>
<option_display_name>AM2R Multitroid 1.2.1</option_display_name>
<option_displayerrors>True</option_displayerrors>
<option_ecma>0</option_ecma>
<option_facebook_app_display_name></option_facebook_app_display_name>
@ -362,7 +362,7 @@
<option_ios_texture_page>1024</option_ios_texture_page>
<option_ios_use_test_ads>false</option_ios_use_test_ads>
<option_lastchanged></option_lastchanged>
<option_linux_display_name>AM2R Multitroid 1.2</option_linux_display_name>
<option_linux_display_name>AM2R Multitroid 1.2.1</option_linux_display_name>
<option_linux_enable_steam>0</option_linux_enable_steam>
<option_linux_fullscreen>0</option_linux_fullscreen>
<option_linux_homepage>https://www.reddit.com/r/AM2R/</option_linux_homepage>

11
objects/oClient.object.gmx
Unescape View File

@ -657,9 +657,12 @@ if(mapChanged){
<kind>1</kind>
<string>var v = 0;
for(var f=0; f&lt;array_length_1d(global.event); f++){
if(f &gt; 350 || f == 102){
if(f &gt; 350){
break;
}
if(f == 102){
global.eventPrev[f] = global.event[f];
}
if(global.eventPrev[f] != global.event[f]){
global.eventChanges[v, 0] = global.event[f];
global.eventChanges[v, 1] = f;
@ -2005,7 +2008,7 @@ switch(type_event){
if(seed != _seed){
seed = _seed;
show_debug_message("seed received");
popup_text("Seed received");
popup_seed("Seed received");
}
}
break;
@ -2103,15 +2106,15 @@ switch(type_event){
if (global.currentsuit == 0) sprite_index = scr_suit_sprites(sFront,sFront_fusion);
if (global.currentsuit == 1) sprite_index = scr_suit_sprites(sVFront,sFront_fusion);
if (global.currentsuit == 2) sprite_index = scr_suit_sprites(sGFront,sFront_fusion);
global.enablecontrol = 0;
canbehit = 0;
oControl.displaygui = 0;
xVel = 0;
yVel = 0;
xAcc = 0;
yAcc = 0;
}
}
global.enablecontrol = 0;
oControl.displaygui = 0;
popup_text_ext("Ship reached", 120);
}
if(eventArr[f, 0] == 2 &amp;&amp; clientID != global.clientID){

2
objects/oControl.object.gmx
Unescape View File

@ -321,7 +321,7 @@ global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", true, 1);
global.am2r_version = "V1.5.2"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities.
global.multitroid_version = "V1.2";
global.multitroid_version = "V1.2.1";
// Android
global.gamestarted = 0;

131
objects/oPopupTextSeed.object.gmx
Unescape View File

@ -0,0 +1,131 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>&lt;undefined&gt;</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>-2000</depth>
<persistent>0</persistent>
<parentName>&lt;undefined&gt;</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>image_alpha = 0;
alarm[0] = 100;
fadeout = 0;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="2" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>fadeout = 1;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="3" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>if (!fadeout) {
if (image_alpha &lt; 1) image_alpha += 0.1;
} else if (image_alpha &gt; 0) {
image_alpha -= 0.05;
} else instance_destroy();
x = view_xview[0] + 4;
y = view_yview[0] + 230;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="8" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>draw_set_font(fontGUI2);
draw_set_halign(fa_right);
if(room == rm_controller || room == rm_options){
draw_cool_text(view_xview[0] + 316, view_yview[0] + 206, text, c_black, c_white, c_white, image_alpha);
} else {
draw_cool_text(view_xview[0] + 316 + (53*oControl.widescreen), view_yview[0] + 206, text, c_black, c_white, c_white, image_alpha);
}
draw_set_halign(fa_left);
</string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>
<PhysicsObjectShape>0</PhysicsObjectShape>
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
<PhysicsObjectGroup>0</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints/>
</object>

4
scripts/popup_seed.gml
Unescape View File

@ -0,0 +1,4 @@
/// popup_seed
with (oPopupTextSeed) instance_destroy();
var t = instance_create(0, 0, oPopupTextSeed);
t.text = argument0;
Write Preview
Loading…
Cancel
Save