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

Added color palettes and IP censoring

Browse Source
pull/28/head
milesthenerd 5 years ago
parent adcb9d2984
commit b51c1b1a48
8 changed files with 120 additions and 9 deletions
Show Stats Download Patch File Download Diff File

5
AM2R.project.gmx
Unescape View File

@ -5003,8 +5003,11 @@
<sprite>sprites\sShirkTurnFrozen</sprite>
<sprite>sprites\sMultitroidMapPlayerCountBox</sprite>
<sprite>sprites\sMiepee</sprite>
<sprite>sprites\sPalMultitroidMiepeeNew</sprite>
<sprite>sprites\sPalMultitroidColorNew</sprite>
<sprite>sprites\sMultitroidMapIconMiepee</sprite>
<sprite>sprites\sPalMultitroidFusionColor</sprite>
<sprite>sprites\sPalSpiderballColor</sprite>
<sprite>sprites\sPalMetroidBabyColor</sprite>
</sprites>
</sprites>
<backgrounds name="background">

10
objects/oControl.object.gmx
Unescape View File

@ -408,6 +408,7 @@ if(!(file_exists(working_directory + "\multitroid\mod_settings.ini"))){
ini_write_string("ModSettings", "preferredcolor", "random");
ini_write_string("ModSettings", "showname", "enabled");
ini_write_real("ModSettings", "palette", 0);
ini_write_real("ModSettings", "censorip", 0);
ini_close();
}
ini_open(working_directory + "\multitroid\mod_settings.ini");
@ -418,6 +419,7 @@ reactorsequence = string_lower(ini_read_string("ModSettings", "reactorsequence",
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);
censorip = ini_read_real("ModSettings", "censorip", 0);
ini_close();
var nameLength = string_length(name);
@ -490,10 +492,10 @@ MultitroidIconDefault = sMultitroidIcon;
MultitroidIconDarkDefault = sDarkMultitroidPlayer;
MultitroidMapIconDefault = sMultitroidMapIcon;
MultitroidPaletteColor = sPalMultitroidMiepeeNew;
MultitroidPaletteFusionColor = sPalMultitroidFusion;
SpiderballPaletteColor = sPalSpiderball;
MultitroidBabyPaletteColor = sPalMultitroidBaby;
MultitroidPaletteColor = sPalMultitroidColorNew;
MultitroidPaletteFusionColor = sPalMultitroidFusionColor;
SpiderballPaletteColor = sPalSpiderballColor;
MultitroidBabyPaletteColor = sPalMetroidBabyColor;
MultitroidIconColor = sMultitroidIcon;
MultitroidIconDarkColor = sMultitroidIcon;
MultitroidMapIconColor = sMultitroidMapIconMiepee;

35
objects/oOptionsMod.object.gmx
Unescape View File

@ -32,7 +32,8 @@ var tempnumcounter = 0;
This list dictates the order of selection in the Extras Menu.
Also, the list in User Defined 0 needs to be in order.
*/
init = 0;
num_censorip = tempnumcounter++;
num_ip = tempnumcounter++;
num_port = tempnumcounter++;
num_name = tempnumcounter++;
@ -105,6 +106,7 @@ with (oSS_Fg) {
}
tip[num_censorip] = "Toggle whether your IP address is censored"
tip[num_ip] = "Set the IP address of the server";
tip[num_port] = "Set the port of the server";
tip[num_name] = "Set your display name";
@ -318,6 +320,7 @@ if (active) {
if (oControl.kLeft &gt; 0 &amp;&amp; oControl.kLeftPushedSteps == 0 || oControl.kRight &gt; 0 &amp;&amp; oControl.kRightPushedSteps == 0 &amp;&amp; global.curropt &lt; lastitem &amp;&amp; oControl.kDown == 0 &amp;&amp; oControl.kUp == 0) {
if (global.curropt == num_censorip) oControl.censorip = !oControl.censorip;
if (global.curropt == num_sequence) sequence = !sequence;
if (global.curropt == num_showname) showname = !showname;
//if (global.shaders_compiled) {
@ -535,6 +538,17 @@ if(!done){
op[num_elm].optext = "Enabled";
break;
}
if(oControl.censorip &amp;&amp; !op[num_ip].editing){
op[num_ip].optext = "";
init = 1;
}
if(op[num_ip].editing){
if(keyboard_check(vk_control) &amp;&amp; keyboard_check_pressed(ord('V'))){
keyboard_string = clipboard_get_text();
}
}
}
</string>
</argument>
@ -634,7 +648,10 @@ if(ID == msg &amp;&amp; global.curropt == num_name){
var _sequence = "synced";
var _showname = "enabled";
op[num_ip].optext = ip;
if(oControl.censorip){
if(init) op[num_ip].optext = ip;
} else op[num_ip].optext = ip;
op[num_port].optext = port;
op[num_name].optext = name;
@ -799,6 +816,15 @@ switch(oControl.palette){
break;
}
switch(oControl.censorip){
case 0:
op[num_censorip].optext = "Disabled";
break;
case 1:
op[num_censorip].optext = "Enabled";
break;
}
ini_open(working_directory + "\multitroid\mod_settings.ini");
ini_write_string("ModSettings", "ipaddress", ip);
ini_write_real("ModSettings", "port", real(port));
@ -807,6 +833,7 @@ 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_write_real("ModSettings", "censorip", oControl.censorip);
ini_close();
oControl.ipaddress = ip;
@ -871,6 +898,10 @@ op[50].text = "Multitroid settings";
var tempcount = 1;
op[num_censorip] = instance_create(x, y + sep * tempcount++, oOptionLR);
op[num_censorip].label = "IP Address Censoring";
op[num_censorip].optionid = num_censorip;
op[num_ip] = instance_create(x, y + sep * tempcount++, oOptionLRMod);
op[num_ip].label = "IP Address";
op[num_ip].optionid = num_ip;

2
objects/oSmallSplash.object.gmx
Unescape View File

@ -50,7 +50,7 @@ image_speed = 0.5;
<argument>
<kind>1</kind>
<string>y = global.waterlevel;
if (global.watertype == 0) y += oWater.yoffset;
if (global.watertype == 0 &amp;&amp; instance_exists(oWater)) y += oWater.yoffset;
</string>
</argument>
</arguments>

25
sprites/sPalMetroidBabyColor.sprite.gmx
Unescape View File

@ -0,0 +1,25 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<sprite>
<type>0</type>
<xorig>0</xorig>
<yorigin>0</yorigin>
<colkind>1</colkind>
<coltolerance>0</coltolerance>
<sepmasks>0</sepmasks>
<bboxmode>0</bboxmode>
<bbox_left>0</bbox_left>
<bbox_right>16</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>9</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>17</width>
<height>10</height>
<frames>
<frame index="0">images\sPalMetroidBabyColor_0.png</frame>
</frames>
</sprite>

2
sprites/sPalMultitroidMiepeeNew.sprite.gmx → sprites/sPalMultitroidColorNew.sprite.gmx
Unescape View File

@ -20,6 +20,6 @@
<width>17</width>
<height>87</height>
<frames>
<frame index="0">images\sPalMultitroidMiepeeNew_0.png</frame>
<frame index="0">images\sPalMultitroidColorNew_0.png</frame>
</frames>
</sprite>

25
sprites/sPalMultitroidFusionColor.sprite.gmx
Unescape View File

@ -0,0 +1,25 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<sprite>
<type>0</type>
<xorig>0</xorig>
<yorigin>0</yorigin>
<colkind>1</colkind>
<coltolerance>0</coltolerance>
<sepmasks>0</sepmasks>
<bboxmode>0</bboxmode>
<bbox_left>0</bbox_left>
<bbox_right>16</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>80</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>17</width>
<height>81</height>
<frames>
<frame index="0">images\sPalMultitroidFusionColor_0.png</frame>
</frames>
</sprite>

25
sprites/sPalSpiderballColor.sprite.gmx
Unescape View File

@ -0,0 +1,25 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<sprite>
<type>0</type>
<xorig>0</xorig>
<yorigin>0</yorigin>
<colkind>1</colkind>
<coltolerance>0</coltolerance>
<sepmasks>0</sepmasks>
<bboxmode>0</bboxmode>
<bbox_left>0</bbox_left>
<bbox_right>16</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>68</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>17</width>
<height>69</height>
<frames>
<frame index="0">images\sPalSpiderballColor_0.png</frame>
</frames>
</sprite>
Write Preview
Loading…
Cancel
Save