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

Fixed a ton of bugs and added optional experimental changes

Browse Source
cleaner v1.4.2
milesthenerd 5 years ago
parent d434594e1f
commit d7becb8134
22 changed files with 143 additions and 57 deletions
Show Stats Download Patch File Download Diff File

6
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>Multitroid 1.4.1</option_android_display_name>
<option_android_display_name>Multitroid 1.4.2</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>
@ -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.4.1</option_display_name>
<option_display_name>AM2R Multitroid 1.4.2</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.4.1</option_linux_display_name>
<option_linux_display_name>AM2R Multitroid 1.4.2</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>

2
objects/oCharacter.object.gmx
Unescape View File

@ -736,10 +736,10 @@ damage_player(other.damage, 5 * damageDir, -3, 0, combo);
<kind>1</kind>
<string>/// SA-X Projectile Damage
if(global.spectator) exit;
otherOBJ = other.object_index;
if(invincible == 0){
damageDir = -1;
knockbackY = -3;
otherOBJ = other.object_index;
var combo = 0;
if(!(global.item[5] &amp;&amp; global.currentsuit == 2) &amp;&amp; other.ibeam &amp;&amp; otherOBJ == oBeam){
other.damage = other.damage * 0.8;

49
objects/oClient.object.gmx
Unescape View File

@ -242,6 +242,10 @@ HURT = 32;
sizeX = 1;
sizeY = 1;
global.receiving = false;
beginReceiveTimer = 300;
</string>
</argument>
</arguments>
@ -315,6 +319,11 @@ oControl.alarm[10] = 90;
if(banned) popup_text("Banned from server");
if(kicked) popup_text("Kicked from server");
if(global.sax &amp;&amp; global.saxmode){
global.sax = 0;
load_character_vars();
}
global.spectator = false;
global.spectatorIndex = -1;
global.saxmode = 0;
@ -1260,13 +1269,13 @@ if(itemCount != global.itemstaken){
buffer = buffer_create(size, type, alignment);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 1);
buffer_write(buffer, buffer_string, name);
buffer_write(buffer, buffer_string, name + "," + global.multitroid_version);
buffer_write(buffer, buffer_u8, global.sax);
var bufferSize = buffer_tell(buffer);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_s32, bufferSize);
buffer_write(buffer, buffer_u8, 1);
buffer_write(buffer, buffer_string, name);
buffer_write(buffer, buffer_string, name + "," + global.multitroid_version);
buffer_write(buffer, buffer_u8, global.sax);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
instance_create(x, y, oNametag);
@ -1851,6 +1860,20 @@ if(currentItemsTimer == 0 &amp;&amp; connected){
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
if(beginReceiveTimer == 0 &amp;&amp; connected){
alarm[0] = 5;
alarm[2] = 5;
alarm[3] = 5;
alarm[4] = 5;
alarm[5] = 5;
alarm[6] = 5;
alarm[7] = 5;
alarm[8] = 5;
alarm[9] = 5;
alarm[10] = 3;
alarm[11] = 20;
}
time--;
maxpbombsTimer--;
maxhealthTimer--;
@ -1865,11 +1888,14 @@ pbombsTimer--;
disconnectTimer--;
pingTimer--;
currentItemsTimer--;
if(global.receiving) beginReceiveTimer--;
if(resetTimer &gt; -1){
resetTimer--;
}
if(beginReceiveTimer &lt; -1) beginReceiveTimer = -1;
if(instance_exists(self)){
if(ds_list_size(roomListData) &gt; 0){
for(var h=0; h&lt;ds_list_size(roomListData); h++){
@ -2486,11 +2512,6 @@ switch(type_event){
var newTeam = buffer_read(_buffer, buffer_u8);
if(newTeam == 1) global.sax = 0;
if(newTeam == 2) global.sax = 1;
if(global.sax){
popup_text("SAX enabled");
} else {
popup_text("SAX disabled");
}
break;
case 112:
var saxmode = buffer_read(_buffer, buffer_u8);
@ -2505,8 +2526,10 @@ switch(type_event){
var samCount = buffer_read(_buffer, buffer_u8);
var damageMultStr = buffer_read(_buffer, buffer_string);
var damageMult = real(damageMultStr);
var experimental = buffer_read(_buffer, buffer_u8);
global.damageMult = damageMult;
global.saxmode = saxmode;
global.experimental = experimental;
if(!lobbyLocked){
if(global.spectator){
global.spectator = false;
@ -2540,17 +2563,7 @@ switch(type_event){
case 0:
global.clientID = buffer_read(_buffer, buffer_u8);
show_debug_message(string(msgid) + " " + string(global.clientID));
alarm[0] = 5;
alarm[2] = 5;
alarm[3] = 5;
alarm[4] = 5;
alarm[5] = 5;
alarm[6] = 5;
alarm[7] = 5;
alarm[8] = 5;
alarm[9] = 5;
alarm[10] = 3;
alarm[11] = 20;
global.receiving = true;
buffer_delete(buffer);
var size, type, alignment;
size = 1024;

29
objects/oControl.object.gmx
Unescape View File

@ -319,7 +319,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.4.1";
global.multitroid_version = "V1.4.2";
// Android
global.gamestarted = 0;
@ -592,6 +592,12 @@ global.samCount = 0;
global.damageMult = 0;
global.warpPipeCooldown = 0;
global.experimental = false;
global.saveStationCooldown = 0;
reset_map();
load_character_vars();
@ -1227,6 +1233,10 @@ if(global.scannerSpeed &lt;= 0){
}
}
if(global.showHealthIndicatorsTimer == 1){
if(global.experimental) global.saveStationCooldown = 60 * 30;
}
if(global.showHealthIndicatorsTimer &gt; 0){
global.showHealthIndicatorsTimer--;
global.showHealthIndicators = true;
@ -1270,6 +1280,12 @@ if(!global.spectator) global.reformTimer = 1200;
if(global.playerMapPosTimer == 1) global.mapmarker = 0;
if(global.playerMapPosTimer &gt; 0) global.playerMapPosTimer--;
if(global.warpPipeCooldown &gt; 0) global.warpPipeCooldown--;
if(global.saveStationCooldown &gt; 0) global.saveStationCooldown--;
if(!instance_exists(oClient)) global.experimental = false;
</string>
</argument>
</arguments>
@ -1513,9 +1529,10 @@ if (global.mapmarker) {
<argument>
<kind>1</kind>
<string>/// Player death transition
if(global.playerhealth &lt;= 0 &amp;&amp; global.saxmode &amp;&amp; global.sax &amp;&amp; oCharacter.sprite_index != sCoreXSAX) global.playerhealth = 1;
if(global.playerhealth &gt; 0) exit;
if(global.playerhealth &lt;= 0 &amp;&amp; global.saxmode &amp;&amp; global.sax &amp;&amp; oCharacter.sprite_index != sCoreXSAX){
global.playerhealth = 1;
exit;
}
if(instance_exists(oClient) &amp;&amp; oClient.connected){
global.currX = oCharacter.x;
@ -1539,7 +1556,7 @@ global.ingame = 0;
global.darkness = 0;
global.gotolog = -1;
global.transitiontype = 3;
if(global.saxmode &amp;&amp; !global.sax &amp;&amp; global.showHealthIndicators) global.spectatorOption = true;
if(global.saxmode &amp;&amp; !global.sax) global.spectatorOption = true;
if(global.spectatorOption &amp;&amp; global.lobbyLocked){
global.spectator = true;
global.spectatorIndex = -1;
@ -2133,7 +2150,7 @@ if(global.icemissiles){
popup_text("Ice Missiles disabled");
}
*/
global.spectator = !global.spectator;
//global.spectator = !global.spectator;
</string>
</argument>
</arguments>

3
objects/oCreditsText.object.gmx
Unescape View File

@ -25,7 +25,8 @@
<arguments>
<argument>
<kind>1</kind>
<string>text = "Another " + global.monsterStr + " 2 Remake# # # # # # # # # # # #Producer#Milton 'DoctorM64' Guasti# #Graphic Design#Ramiro Negri#Steve 'Sabre230' Rothlisberger#Jack Witty#Kirill '1Eni1' Fevralev#Jasper#MichaelGabrielR# #Promo Art#Azima 'Zim' Khan# #Writing#James 'Ridley' Hobbs#Paulo 'Latinlingo' Villalobos# #Platform Engine Code#Martin Piecyk# #Music Composition#Milton 'DoctorM64' Guasti#Darren Kerwin#Torbjørn 'Falcool' Brandrud# #Debug#Hemse#Dragondarch#Esteban 'DruidVorse' Criado#Verneri 'Naatiska' Viljanen# #Playtest#Jennifer Potter#Mario Crestanello#Live4Truths#Torbjørn 'Falcool' Brandrud#Lise Trehjørningen#Nommiin#Gabriel Kaplan#Nicolas 'Skol' Del Negro#Darren Kerwin#Robert Sephazon# #Community Management#Dragonheart91#Ammypendent#Karrde# #Special Thanks#Nommiin#Nathan 'wickedclown' Hess#Tyler Rogers#Kousoru#Infinity's End#CapCom#Isabelle Amponin#The " + global.monsterStr + " Community# # # # # #Source Code Reconstruction#YellowAfterlife# # #Continued Revisions# #Lead - Former#Gatordile#Alex 'Wanderer' Mack# #Lead#Lojemiru# #Development#Craig Kostelecky#" + global.monsterStr + "3D# #Art Lead#Dannon 'Shmegleskimo' Yates# #Art#ShirtyScarab#Cooper Garvin#Chris 'Messianic' Oliveira#ChloePlz# #Special Thanks#Banjo, Grom PE,#King Bore, Jean-Samuel Pelletier,#Reaku The Crate, Scooterboot, #Sylandro, TheKhaosDemon, #Unknown, Iwantdevil, #PixHammer, CaptGlitch,#Nokbient, EODTex,#Electrix, gponys,#Japanese Community# # # # # #Original " + global.monsterStr + " II Staff# #Producer#Gunpei Yokoi# #Director#Hiroji Kiyotake, Hiroyuki Kimura# #Main Programmer#Takahiro Harada# #Programmer#Masaru Yamanaka, Masao Yamamoto,#Isao Hirano# #Graphic Designer#Hiroji Kiyotake, Hiroyuki Kimura# #Program Assistant#Yuzuru Ogawa, Nobuhiro Ozaki# #Sound Programmer#Ryohji Yoshitomi# #Designer#Makoto Kanoh, Masafumi Sakashita,#Tomoyoshi Yamane, Takehiko Hosokawa,#Yasuo Inoue# #Debug#Masaru Okadaga, Kenji Nishizawa,#Hirofumi Matsuoka, Tohru Ohsawa,#Kohta Fukui, Keisuke Terasaki,#Kenichi Sugino, Hitoshi Yamagami,#Katsuya Yamaoe, Yuji Hori# #Co-op Mod#milesthenerd#xzackly7# # # # # # # # #In Memory of Satoru Iwata";
<string>if(global.saxmode) room_goto(rm_score);
text = "Another " + global.monsterStr + " 2 Remake# # # # # # # # # # # #Producer#Milton 'DoctorM64' Guasti# #Graphic Design#Ramiro Negri#Steve 'Sabre230' Rothlisberger#Jack Witty#Kirill '1Eni1' Fevralev#Jasper#MichaelGabrielR# #Promo Art#Azima 'Zim' Khan# #Writing#James 'Ridley' Hobbs#Paulo 'Latinlingo' Villalobos# #Platform Engine Code#Martin Piecyk# #Music Composition#Milton 'DoctorM64' Guasti#Darren Kerwin#Torbjørn 'Falcool' Brandrud# #Debug#Hemse#Dragondarch#Esteban 'DruidVorse' Criado#Verneri 'Naatiska' Viljanen# #Playtest#Jennifer Potter#Mario Crestanello#Live4Truths#Torbjørn 'Falcool' Brandrud#Lise Trehjørningen#Nommiin#Gabriel Kaplan#Nicolas 'Skol' Del Negro#Darren Kerwin#Robert Sephazon# #Community Management#Dragonheart91#Ammypendent#Karrde# #Special Thanks#Nommiin#Nathan 'wickedclown' Hess#Tyler Rogers#Kousoru#Infinity's End#CapCom#Isabelle Amponin#The " + global.monsterStr + " Community# # # # # #Source Code Reconstruction#YellowAfterlife# # #Continued Revisions# #Lead - Former#Gatordile#Alex 'Wanderer' Mack# #Lead#Lojemiru# #Development#Craig Kostelecky#" + global.monsterStr + "3D# #Art Lead#Dannon 'Shmegleskimo' Yates# #Art#ShirtyScarab#Cooper Garvin#Chris 'Messianic' Oliveira#ChloePlz# #Special Thanks#Banjo, Grom PE,#King Bore, Jean-Samuel Pelletier,#Reaku The Crate, Scooterboot, #Sylandro, TheKhaosDemon, #Unknown, Iwantdevil, #PixHammer, CaptGlitch,#Nokbient, EODTex,#Electrix, gponys,#Japanese Community# # # # # #Original " + global.monsterStr + " II Staff# #Producer#Gunpei Yokoi# #Director#Hiroji Kiyotake, Hiroyuki Kimura# #Main Programmer#Takahiro Harada# #Programmer#Masaru Yamanaka, Masao Yamamoto,#Isao Hirano# #Graphic Designer#Hiroji Kiyotake, Hiroyuki Kimura# #Program Assistant#Yuzuru Ogawa, Nobuhiro Ozaki# #Sound Programmer#Ryohji Yoshitomi# #Designer#Makoto Kanoh, Masafumi Sakashita,#Tomoyoshi Yamane, Takehiko Hosokawa,#Yasuo Inoue# #Debug#Masaru Okadaga, Kenji Nishizawa,#Hirofumi Matsuoka, Tohru Ohsawa,#Kohta Fukui, Keisuke Terasaki,#Kenichi Sugino, Hitoshi Yamagami,#Katsuya Yamaoe, Yuji Hori# #Co-op Mod#milesthenerd#xzackly7# # # # # # # # #In Memory of Satoru Iwata";
yoffset = 0;
fadeout = 0;

2
objects/oDeathSequenceMulti.object.gmx
Unescape View File

@ -25,7 +25,7 @@
<arguments>
<argument>
<kind>1</kind>
<string>image_speed = 0.25;
<string>image_speed = 0.125;
image_index = 0;
fade = 0;
moveplayer = 0;

2
objects/oDrillSeq1.object.gmx
Unescape View File

@ -69,7 +69,7 @@ with (oCharacter) {
morphing = 0;
turning = 0;
}
immersion_stop();
if (os_type == os_android) immersion_stop();
instance_destroy();
</string>
</argument>

2
objects/oDrillSeq2.object.gmx
Unescape View File

@ -69,7 +69,7 @@ with (oCharacter) {
morphing = 0;
turning = 0;
}
immersion_stop();
if (os_type == os_android) immersion_stop();
instance_destroy();
</string>
</argument>

3
objects/oEMPNoise.object.gmx
Unescape View File

@ -25,7 +25,8 @@
<arguments>
<argument>
<kind>1</kind>
<string>xoff = 0;
<string>if(global.saxmode) instance_destroy();
xoff = 0;
yoff = 0;
alarm[0] = 1;
</string>

5
objects/oIntroController.object.gmx
Unescape View File

@ -27,6 +27,11 @@
<kind>1</kind>
<string>alarm[0] = 180;
txt = get_text("Title", "ControllerRecommended");
// If on Linux, quickly toggle fullscreen to get rid of GM:S mess. Seemed to be the best place to do that.
if (os_type == os_linux &amp;&amp; global.opfullscreen) {
window_set_fullscreen(false);
window_set_fullscreen(true);
}
</string>
</argument>
</arguments>

2
objects/oMapCursor.object.gmx
Unescape View File

@ -36,6 +36,8 @@ alarm[0] = 2;
active = 0;
alarm[1] = 5;
state = 0;
marker = 0;
camera = 0;
if (global.mapmarker == 1) {
state = 2;
marker = instance_create(x, y, oMapMarker);

2
objects/oSaveShip.object.gmx
Unescape View File

@ -91,7 +91,7 @@ if (enabled == 1 &amp;&amp; image_index &lt; 9) image_index += 0.5;
if (enabled == 0 &amp;&amp; image_index &gt; 0.2) image_index -= 0.5;
//
if (saveenabled == 1 &amp;&amp; cansave == 1 &amp;&amp; (oCharacter.state == 10 || oCharacter.state == 12) &amp;&amp; oCharacter.statetime &gt;= 10) {
if ((oControl.mod_insanitymode == 1 &amp;&amp; global.event[304] == 0) || global.enemyNearby) { exit; }
if ((oControl.mod_insanitymode == 1 &amp;&amp; global.event[304] == 0) || (global.enemyNearby &amp;&amp; global.saxmode &amp;&amp; global.event[304] == 0) || (global.sax &amp;&amp; global.saxmode) || global.saveStationCooldown &gt; 0) { exit; }
//if (oControl.mod_insanitymode == 1) { exit; }
global.savexpos = x + 16;
global.start_room = rm_a0h01;

2
objects/oSaveStation.object.gmx
Unescape View File

@ -92,7 +92,7 @@ if (enabled == 1 &amp;&amp; image_index &lt; sprite_get_number(sprite_index) - 1
if (enabled == 0 &amp;&amp; image_index &gt; 0.2) image_index -= 0.2;
//
if (saveenabled == 1 &amp;&amp; cansave == 1 &amp;&amp; (oCharacter.state == 10 || oCharacter.state == 12) &amp;&amp; (oCharacter.statetime &gt;= 10 || oControl.kUp)) {
if (oControl.mod_insanitymode == 1 || global.enemyNearby) { exit; }
if (oControl.mod_insanitymode == 1 || (global.enemyNearby &amp;&amp; global.saxmode) || global.saveStationCooldown &gt; 0) { exit; }
global.savexpos = x + 16;
saveenabled = 0;
with (oCharacter) {

5
objects/oScoreScreen.object.gmx
Unescape View File

@ -176,7 +176,10 @@ if (state == 2) {
}
if (statetime == 60) sfx_play(sndTLM);
if (statetime == 600) fadeout = 1;
if (statetime == 900) event_user(0);
if (statetime == 900){
mus_fadeout(musCredits);
event_user(0);
}
if (fadeout) {
if (ralpha &lt; 1) ralpha += 0.01;
}

21
objects/oWarpPipeTrigger.object.gmx
Unescape View File

@ -25,8 +25,7 @@
<arguments>
<argument>
<kind>1</kind>
<string>if(global.spectator) instance_destroy();
posx = x + 8;
<string>posx = x + 8;
state = 0;
statetime = 0;
door_open = 0;
@ -84,6 +83,7 @@ alarm[0] = 1;
<argument>
<kind>1</kind>
<string>//if (instance_id == inst_133698) exit;
if(global.spectator) instance_destroy();
if (state == 1) {
if (statetime == 0) {
@ -119,6 +119,7 @@ if (state == 1) {
global.offsety = 0;
oCharacter.x = 0;//
oCharacter.y = 0;//
if(global.saxmode) global.warpPipeCooldown = 360;
room_change(targetroom, 0);
Mute_Loops();
}
@ -196,16 +197,18 @@ statetime += 1;
<argument>
<kind>1</kind>
<string>//if (instance_id == inst_133698) { exit; }
if (other.state == 23 &amp;&amp; other.xVel == 0 &amp;&amp; state == 0) {
with (other) {
state = 60;
if(global.warpPipeCooldown == 0){
if (other.state == 23 &amp;&amp; other.xVel == 0 &amp;&amp; state == 0) {
with (other) {
state = 60;
statetime = 0;
}
state = 1;
statetime = 0;
sfx_play(sndMorphBallSlot);
}
state = 1;
statetime = 0;
sfx_play(sndMorphBallSlot);
}
</string>
</argument>
</arguments>

3
scripts/characterStepEvent.gml
Unescape View File

@ -6,6 +6,7 @@ if (global.movingobj) chStepMovingCheck();
if (global.saxmode && !global.lobbyLocked){
xVel = 0;
yVel = 0;
chStepSetSprite();
exit;
}
@ -299,7 +300,7 @@ if (global.spectator) {
var arrPosID = arrPos[0];
var arrPosRoom = arrPos[4];
if(f == global.spectatorIndex){
if(global.ingame && room != arrPosRoom && room != rm_transition && (arrPosRoom == rm_transition || string_count("rm_a", room_get_name(arrPosRoom)) > 0)){
if(global.ingame && room != arrPosRoom && room != rm_transition && arrPosRoom != titleroom && arrPosRoom != gameoverroom && arrPosRoom != rm_credits && arrPosRoom != rm_gallery && arrPosRoom != rm_options && arrPosRoom != optionsroom && arrPosRoom != quitroom && arrPosRoom != subscreenroom && arrPosRoom != itemroom && arrPosRoom != maproom && arrPosRoom != introroom && arrPosRoom != gameintroroom && arrPosRoom != rm_loading && arrPosRoom != rm_subscreen && arrPosRoom != rm_death && arrPosRoom != rm_controller && arrPosRoom != rm_score && (arrPosRoom == rm_transition || string_count("rm_a", room_get_name(arrPosRoom)) > 0)){
if(instance_exists(oGotoRoom)){
gotoRoom = instance_nearest(x, y, oGotoRoom);
if (gotoRoom.direction == 0 || gotoRoom.direction == 180) {

17
scripts/damage_player.gml
Unescape View File

@ -1,13 +1,22 @@
/// damage_player(damage, knockback_x, knockback_y, ignore_armor, ignore_invincibility)
if(global.spectator) exit;
var experimentalExtraSAXDamageMultiplier = 1;
if(global.experimental) experimentalExtraSAXDamageMultiplier = 1.25;
var damage_taken = 0;
if (global.currentsuit == 0 || argument3 == 1) damage_taken = argument0 * oControl.mod_diffmult;
if (global.currentsuit == 0 || argument3 == 1){
if(!global.multiDamageCollision){
damage_taken = argument0 * oControl.mod_diffmult;
} else {
damage_taken = argument0 * experimentalExtraSAXDamageMultiplier * oControl.mod_diffmult; //PvP Damage
damage_taken = damage_taken + (damage_taken * global.damageMult); //PvP Damage
}
}
if (argument3 == 0) {
if (global.currentsuit == 1){
if(!global.multiDamageCollision){
damage_taken = ceil(argument0 * 0.5) * oControl.mod_diffmult;
} else {
damage_taken = ceil(argument0 * 0.75) * oControl.mod_diffmult; //PvP Damage
damage_taken = ceil(argument0 * 0.75) * experimentalExtraSAXDamageMultiplier * oControl.mod_diffmult; //PvP Damage
damage_taken = damage_taken + (damage_taken * global.damageMult); //PvP Damage
}
@ -21,10 +30,10 @@ if (argument3 == 0) {
}
} else {
if(global.item[5] == 0){
damage_taken = ceil(argument0 * 0.75) * oControl.mod_diffmult; //PvP Damage
damage_taken = ceil(argument0 * 0.75) * experimentalExtraSAXDamageMultiplier * oControl.mod_diffmult; //PvP Damage
damage_taken = damage_taken + (damage_taken * global.damageMult); //PvP Damage
} else {
damage_taken = ceil(argument0 * 0.6) * oControl.mod_diffmult; //PvP Damage
damage_taken = ceil(argument0 * 0.6) * experimentalExtraSAXDamageMultiplier * oControl.mod_diffmult; //PvP Damage
damage_taken = damage_taken + (damage_taken * global.damageMult); //PvP Damage
}
}

31
scripts/load_character_vars.gml
Unescape View File

@ -114,6 +114,37 @@ if(global.sax && global.saxmode){
global.mtanks = 4;
global.stanks = 2;
global.ptanks = 1;
if(global.experimental){
for(var i=0; i<array_length_1d(global.item); i++){
if(i == 50 || i == 103 || i == 108 || i == 157 || i == 158 || i == 200 || i == 201 || i == 251 || i == 254 || i == 306){
global.item[i] = 1;
}
}
for(var i=0; i<array_length_1d(global.item); i++){
if(i == 51 || i == 110 || i == 162 || i == 206 || i == 207 || i == 209 || i == 215 || i == 256 || i == 300 || i == 305){
global.item[i] = 1;
}
}
for(var i=0; i<array_length_1d(global.item); i++){
if(i == 58 || i == 59 || i == 112 || i == 160 || i == 212 || i == 213 || i == 253 || i == 258 || i == 301 || i == 302){
global.item[i] = 1;
}
}
for(var i=0; i<array_length_1d(global.item); i++){
if(i == 52 || i == 53 || i == 54 || i == 55 || i == 56 || i == 57 || i == 60 || i == 100 || i == 101 || i == 102 || i == 104 || i == 105 || i == 106 || i == 107 || i == 109 || i == 111 || i == 150 || i == 151 || i == 152 || i == 153 || i == 154 || i == 155 || i == 156 || i == 159 || i == 161 || i == 163 || i == 202 || i == 203 || i == 204 || i == 205 || i == 208 || i == 210 || i == 211 || i == 214 || i == 250 || i == 252 || i == 255 || i == 257 || i == 259 || i == 303 || i == 304 || i == 307 || i == 308 || i == 309){
global.item[i] = 1;
}
}
global.etanks = 10;
global.mtanks = 44;
global.stanks = 10;
global.ptanks = 10;
}
global.maxhealth = 99 + ((global.etanks * 100) * oControl.mod_etankhealthmult);
global.playerhealth = global.maxhealth;
if (global.difficulty < 2) {

2
scripts/shoot_beam.gml
Unescape View File

@ -46,7 +46,7 @@ repeat (beams) {
beam.chargebeam = 0;
if (global.wbeam) {
beam.damage *= 1.5;
if(global.saxmode){
if(global.saxmode && !global.experimental){
nofire += 23;
} else nofire += 2;
}

4
sound/musSAXAppear.sound.gmx
Unescape View File

@ -22,8 +22,8 @@
</bitDepths>
<preload>-1</preload>
<data>musSAXAppear.wav</data>
<compressed>0</compressed>
<streamed>0</streamed>
<compressed>1</compressed>
<streamed>1</streamed>
<uncompressOnLoad>0</uncompressOnLoad>
<audioGroup>0</audioGroup>
</sound>

4
sound/musSAXChase.sound.gmx
Unescape View File

@ -22,8 +22,8 @@
</bitDepths>
<preload>-1</preload>
<data>musSAXChase.wav</data>
<compressed>0</compressed>
<streamed>0</streamed>
<compressed>1</compressed>
<streamed>1</streamed>
<uncompressOnLoad>0</uncompressOnLoad>
<audioGroup>0</audioGroup>
</sound>

4
sound/musSAXEnvironmentalAmbience.sound.gmx
Unescape View File

@ -22,8 +22,8 @@
</bitDepths>
<preload>-1</preload>
<data>musSAXEnvironmentalAmbience.wav</data>
<compressed>0</compressed>
<streamed>0</streamed>
<compressed>1</compressed>
<streamed>1</streamed>
<uncompressOnLoad>0</uncompressOnLoad>
<audioGroup>0</audioGroup>
</sound>

Write Preview
Loading…
Cancel
Save