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

Removed Saxmode requirements on basically everything

Browse Source
main
DodoBirb 3 years ago
parent 5f476fff6d
commit e9b463970b
46 changed files with 44 additions and 176 deletions
Show Stats Download Patch File Download Diff File

7
Export_Code/gml_Object_oCharacter_Other_12.gml
Unescape View File

@ -1,4 +1,4 @@
var combo;
var combo, cantFreeze;
if global.spectator
exit
otherOBJ = other.object_index
@ -37,9 +37,10 @@ if (invincible == 0)
}
if global.frozenByRollback
show_debug_message("rollback freeze")
cantFreeze = ((global.currentsuit == 2 && global.item[5] == 1) || global.currentsuit == 1)
if (global.playerFreeze == 0 && (!global.frozenByRollback))
{
if (otherOBJ == 439 && other.ibeam && (!global.freezeDisabled) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (otherOBJ == 439 && other.ibeam && (!cantFreeze) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 120
damageDir = 0
@ -53,7 +54,7 @@ if (invincible == 0)
kDown = 0
}
}
if ((otherOBJ == 440 || otherOBJ == 438) && other.icemissiles && (!other.smissile) && (!global.freezeDisabled) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if ((otherOBJ == 440 || otherOBJ == 438) && other.icemissiles && (!other.smissile) && (!cantFreeze) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 120
damageDir = 0

9
Export_Code/gml_Object_oClawOrbFirst_Other_11.gml
Unescape View File

@ -1,12 +1,3 @@
if (!global.saxmode)
{
ecam = instance_create(x, (y - 16), oEventCamera)
ecam.targetx = 800
ecam.targety = y
ecam.ratio = 8
ecam.alarm[0] = 280
view_object[0] = oEventCamera
}
with (oA1MovingPlatform2)
alarm[0] = 60
global.event[58] = 1

9
Export_Code/gml_Object_oClawPuzzle_Alarm_0.gml
Unescape View File

@ -1,14 +1,5 @@
with (oClawOrb)
event_user(0)
if (!global.saxmode)
{
ecam = instance_create(x, (y - 16), oEventCamera)
ecam.targetx = oA1MovingPlatform.x
ecam.targety = y
ecam.ratio = 8
ecam.alarm[0] = 450
view_object[0] = oEventCamera
}
with (oA1MovingPlatform)
alarm[0] = 60
global.event[54] = 1

2
Export_Code/gml_Object_oControl_KeyPress_27.gml
Unescape View File

@ -1,4 +1,4 @@
if (global.saxmode && global.enemyNearby)
if global.enemyNearby
exit
if (global.ingame == 1 && global.enablecontrol == 1 && room != rm_transition)
{

2
Export_Code/gml_Object_oControl_Other_10.gml
Unescape View File

@ -1,4 +1,4 @@
if (global.saxmode && global.enemyNearby)
if global.enemyNearby
{
if (global.sax || (!global.spectator))
exit

10
Export_Code/gml_Object_oControl_Other_11.gml
Unescape View File

@ -26,17 +26,13 @@ global.ingame = 0
global.darkness = 0
global.gotolog = -1
global.transitiontype = 3
if (global.saxmode && (!global.sax))
global.spectatorOption = 1
global.spectatorOption = 1
if (global.spectatorOption && global.lobbyLocked)
{
global.spectator = 1
global.spectatorIndex = -1
}
if global.saxmode
{
global.mapposx = 2
global.mapposy = 2
}
global.mapposx = 2
global.mapposy = 2
event_user(3)
room_goto(rm_death)

3
Export_Code/gml_Object_oCreditsText_Create_0.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
room_goto(rm_score)
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
Export_Code/gml_Object_oEMPNoise_Create_0.gml
Unescape View File

@ -1,5 +1,3 @@
if global.saxmode
instance_destroy()
xoff = 0
yoff = 0
alarm[0] = 1

21
Export_Code/gml_Object_oIGT_Step_0.gml
Unescape View File

@ -23,20 +23,15 @@ if surface_exists(igt_surface)
yoff = 27
draw_cool_text(4, yoff, ("ping: " + string(global.ping)), c_black, c_white, c_gray, 1)
yoff += 11
if global.saxmode
metcount = 0
for (i = 0; i <= 40; i++)
{
metcount = 0
for (i = 0; i <= 40; i++)
{
if (global.metdead[i] == 1)
metcount += 1
}
if ((global.MetCount - metcount) > 0)
{
draw_cool_text(4, yoff, ("Metroids to A6: " + string((global.MetCount - metcount))), c_black, c_white, c_gray, 1)
yoff += 11
}
draw_cool_text(4, yoff, ("X-Power: " + string(global.damageMult)), c_black, c_aqua, make_colour_rgb(79, 146, 255), 1)
if (global.metdead[i] == 1)
metcount += 1
}
if ((global.MetCount - metcount) > 0)
{
draw_cool_text(4, yoff, ("Metroids to A6: " + string((global.MetCount - metcount))), c_black, c_white, c_gray, 1)
yoff += 11
}
if (global.saveStationCooldown > 0)

7
Export_Code/gml_Object_oItemCutscene_Step_0.gml
Unescape View File

@ -13,8 +13,5 @@ if (ealpha <= 0 && fadeout)
room_goto(global.currentroom)
}
size = (ealpha * 24)
if global.saxmode
{
fadeout = 1
active = 0
}
fadeout = 1
active = 0

3
Export_Code/gml_Object_oItemGravity_Collision_267.gml
Unescape View File

@ -4,8 +4,7 @@ if collision_line((x + 8), (y - 8), (x + 8), (y - 32), oSolid, false, true)
global.SuitChange = 0
if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
global.SuitChange = 0
if global.saxmode
global.SuitChange = 0
global.SuitChange = 0
global.SuitChangeX = x
global.SuitChangeY = y
global.SuitChangeGravity = 1

3
Export_Code/gml_Object_oItemVaria_Collision_267.gml
Unescape View File

@ -4,8 +4,7 @@ if collision_line((x + 8), (y - 8), (x + 8), (y - 32), oSolid, false, true)
global.SuitChange = 0
if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
global.SuitChange = 0
if global.saxmode
global.SuitChange = 0
global.SuitChange = 0
global.SuitChangeX = x
global.SuitChangeY = y
global.SuitChangeGravity = 0

3
Export_Code/gml_Object_oMAlphaFirstTrigger_Create_0.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
global.event[0] = 1
global.event[0] = 1
if (global.metdead[0] || global.event[0])
{
instance_destroy()

3
Export_Code/gml_Object_oMAlphaTriggerFirstCocoon_Create_0.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
global.event[0] = 1
global.event[0] = 1
if (global.metdead[0] || global.event[0])
{
instance_destroy()

2
Export_Code/gml_Object_oMAlpha_Collision_267.gml
Unescape View File

@ -2,8 +2,6 @@ var damageToDeal;
if (myhealth > 0)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
if (other.invincible == 0)
damagedealt += damageToDeal
damage_player(damageToDeal, hpush, vpush, 0, 0)

3
Export_Code/gml_Object_oMGammaFirstTrigger_Create_0.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
global.event[109] = 1
global.event[109] = 1
if (global.event[109] == 1 || global.metdead[11] == 0)
{
instance_destroy()

2
Export_Code/gml_Object_oMGamma_Collision_267.gml
Unescape View File

@ -2,8 +2,6 @@ var damageToDeal;
if (myhealth > 0)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
if (other.invincible == 0)
damagedealt += damageToDeal
damage_player(damageToDeal, hpush, vpush, 0, 0)

2
Export_Code/gml_Object_oMOmegaFlame_Collision_267.gml
Unescape View File

@ -6,8 +6,6 @@ else
if (cooldown == 0 && image_index < 10)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player(damageToDeal, hpush, vpush, 0, 0)
oCharacter.onfire = 90
cooldown = 15

2
Export_Code/gml_Object_oMOmegaGroundHit_Collision_267.gml
Unescape View File

@ -8,8 +8,6 @@ else
if (oCharacter.state == 10 || oCharacter.state == 11 || oCharacter.state == 12 || oCharacter.state == 23)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_knockdown(damageToDeal, pushdir, 10, 0, 1)
}
instance_destroy()

2
Export_Code/gml_Object_oMOmegaHead_Collision_267.gml
Unescape View File

@ -7,7 +7,5 @@ if (other.invincible == 0 && other.state != 40)
{
oMOmega.damagedealt += oMOmega.damage
damageToDeal = oMOmega.damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player(damageToDeal, oMOmega.hpush, oMOmega.vpush, 0, 0)
}

2
Export_Code/gml_Object_oMOmegaMask2_Collision_267.gml
Unescape View File

@ -8,7 +8,5 @@ if (other.state != 52 && other.state != 39 && other.state != 40)
if (other.invincible == 0)
oMOmega.damagedealt += oMOmega.damage
damageToDeal = oMOmega.damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_push(damageToDeal, pushdir, 90, 0, 4)
}

2
Export_Code/gml_Object_oMOmegaMask4_Collision_267.gml
Unescape View File

@ -8,7 +8,5 @@ if (other.state != 52 && other.state != 39 && other.state != 40)
if (other.invincible == 0)
oMOmega.damagedealt += oMOmega.damage
damageToDeal = oMOmega.damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_push(damageToDeal, pushdir, 90, 0, 4)
}

2
Export_Code/gml_Object_oMOmegaMask_Collision_267.gml
Unescape View File

@ -8,7 +8,5 @@ if (other.state != 52 && other.state != 39 && other.state != 40)
if (other.invincible == 0)
oMOmega.damagedealt += oMOmega.damage
damageToDeal = oMOmega.damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_push(damageToDeal, pushdir, 90, 0, 4)
}

2
Export_Code/gml_Object_oMOmega_Projectile_Collision_267.gml
Unescape View File

@ -3,8 +3,6 @@ combo = global.difficulty >= 2
if (fadeout == 0 && (combo == 1 || other.invincible == 0) && other.state != 40)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_knockdown(damageToDeal, image_xscale, 90, 0, 3.5)
fadeout = 1
speed = 0

2
Export_Code/gml_Object_oMZetaBodyMask_Collision_267.gml
Unescape View File

@ -6,6 +6,4 @@ else
if (other.invincible == 0)
oMZeta.damagedealt += oMZeta.damage
damageToDeal = oMZeta.damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_push(damageToDeal, pushdir, 90, 0, 3.5)

3
Export_Code/gml_Object_oMZetaFirstTrigger_Alarm_0.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
global.event[205] = 1
global.event[205] = 1
if (global.metdead[myid] > 0 || global.event[205] > 0)
{
instance_destroy()

2
Export_Code/gml_Object_oMZetaHead_Collision_267.gml
Unescape View File

@ -6,8 +6,6 @@ else
if (other.invincible == 0)
{
damageToDeal = oMZeta.damage
if global.sax
damageToDeal = (damageToDeal * 2)
oMZeta.damagedealt += damageToDeal
if (oMZeta.blur == 1)
{

2
Export_Code/gml_Object_oMZetaProj_Collision_267.gml
Unescape View File

@ -2,7 +2,5 @@ var damageToDeal;
if (fadeout == 0)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player(damageToDeal, hpush, vpush, 0, 0)
}

2
Export_Code/gml_Object_oMZetaSlashProj2_Collision_267.gml
Unescape View File

@ -6,8 +6,6 @@ else
if (fadeout == 0)
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player_push(damage, facing, 110, 0, 3.5)
fadeout = 1
speed = 0

2
Export_Code/gml_Object_oMZetaSlashProj_Collision_267.gml
Unescape View File

@ -3,8 +3,6 @@ combo = global.difficulty >= 2
if (fadeout == 0 && (combo == 1 || other.invincible == 0))
{
damageToDeal = damage
if global.sax
damageToDeal = (damageToDeal * 2)
damage_player(damageToDeal, hpush, vpush, 0, combo)
fadeout = 1
speed = 0

3
Export_Code/gml_Object_oMZeta_Cocoon_Alarm_0.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
global.event[205] = 1
global.event[205] = 1
if (global.metdead[myid] > 0)
{
state = 3

2
Export_Code/gml_Object_oMapScrBG2_Step_0.gml
Unescape View File

@ -19,7 +19,7 @@ if (ealpha <= 0 && fadeout)
room_goto(global.currentroom)
Unmute_Loops()
}
if (global.saxmode && global.enemyNearby)
if global.enemyNearby
{
if (global.sax || (!global.spectator))
{

2
Export_Code/gml_Object_oSS_Fg_Step_0.gml
Unescape View File

@ -44,7 +44,7 @@ if (oControl.kMissile && oControl.kSelectPushedSteps == 0 && (!missilepressed))
}
if (missilepressed && (!oControl.kMissile))
missilepressed = 0
if (global.saxmode && global.enemyNearby)
if global.enemyNearby
{
if (global.sax || (!global.spectator))
{

2
Export_Code/gml_Object_oSaveShip_Step_0.gml
Unescape View File

@ -14,7 +14,7 @@ if (enabled == 0 && image_index > 0.2)
image_index -= 0.5
if (saveenabled == 1 && cansave == 1 && (oCharacter.state == 10 || oCharacter.state == 12) && oCharacter.statetime >= 10)
{
if ((oControl.mod_insanitymode == 1 && global.event[304] == 0) || (global.enemyNearby && global.saxmode && global.event[304] == 0) || (global.sax && global.saxmode) || global.saveStationCooldown > 0)
if ((oControl.mod_insanitymode == 1 && global.event[304] == 0) || (global.enemyNearby && global.event[304] == 0))
exit
global.savexpos = (x + 16)
global.start_room = 21

2
Export_Code/gml_Object_oSaveStation_Step_0.gml
Unescape View File

@ -12,7 +12,7 @@ if (enabled == 0 && image_index > 0.2)
image_index -= 0.2
if (saveenabled == 1 && cansave == 1 && (oCharacter.state == 10 || oCharacter.state == 12) && (oCharacter.statetime >= 10 || oControl.kUp))
{
if (oControl.mod_insanitymode == 1 || ((global.enemyNearby || global.showHealthIndicators) && global.saxmode) || global.saveStationCooldown > 0)
if (oControl.mod_insanitymode == 1 || global.enemyNearby || global.showHealthIndicators || global.saveStationCooldown > 0)
exit
global.savexpos = (x + 16)
saveenabled = 0

2
Export_Code/gml_Object_oSubscreenMenu_Step_0.gml
Unescape View File

@ -176,7 +176,7 @@ if (global.curropt < 14)
oSubScrPlayer.targety = 52
else
oSubScrPlayer.targety = -13
if (global.saxmode && global.enemyNearby)
if global.enemyNearby
{
if (global.sax || (!global.spectator))
{

3
Export_Code/gml_Object_oWarpPipeTrigger_Step_0.gml
Unescape View File

@ -49,8 +49,7 @@ if (state == 1)
global.offsety = 0
oCharacter.x = 0
oCharacter.y = 0
if global.saxmode
global.warpPipeCooldown = 360
global.warpPipeCooldown = 360
room_change(targetroom, 0)
Mute_Loops()
}

3
Export_Code/gml_RoomCC_rm_a0h05_4073_Create.gml
Unescape View File

@ -1,5 +1,4 @@
if global.saxmode
global.event[0] = 1
global.event[0] = 1
if (global.event[0] == 0)
{
instance_destroy()

3
Export_Code/gml_RoomCC_rm_a2c07_5335_Create.gml
Unescape View File

@ -1,5 +1,4 @@
init_monster_trigger(12, -1)
if global.saxmode
global.event[109] = 1
global.event[109] = 1
if (global.metdead[11] == 0 || global.event[109] == 0)
instance_destroy()

3
Export_Code/gml_RoomCC_rm_a6a09A_9111_Create.gml
Unescape View File

@ -3,5 +3,4 @@ radius = 300
maxradius = 900
minvol = 0
maxvol = 1
if (global.event[300] == 1 || global.saxmode)
instance_destroy()
instance_destroy()

3
Export_Code/gml_Room_rm_a6a09A_Create.gml
Unescape View File

@ -3,5 +3,4 @@ global.mapoffsety = 47
global.waterlevel = 0
global.floormaterial = 1
global.objdeactivate = 1
if global.saxmode
global.event[300] = 1
global.event[300] = 1

16
Export_Code/gml_Script_chStepFire.gml
Unescape View File

@ -56,21 +56,9 @@ if (kFire && kFirePushedSteps == 1 && (state == 23 || state == 24 || state == 27
}
if (((global.opmslstyle == 0 && armmsl == 1) || (global.opmslstyle == 1 && global.currentweapon == 3)) && global.pbombs > 0 && instance_number(oQueenFinalExplosion) == 0 && state != GRABBEDQUEENMORPH && (!((state == GRABBEDQUEENBELLY && distance_to_point((oQueenFront.x + 81), y) > 4))))
{
if global.saxmode
{
if (global.pbombCooldown == 600)
{
global.pbombCooldown = 0
bmb = instance_create(x, (y - 5), oPBomb)
if (state == GRABBEDQUEENBELLY)
bmb.special = 1
global.pbombs -= 1
if (global.currentweapon == 3 && global.pbombs == 0)
global.currentweapon = 0
}
}
else if (instance_number(oPBomb) == 0 && instance_number(oPBombExpl) == 0)
if (global.pbombCooldown == 600)
{
global.pbombCooldown = 0
bmb = instance_create(x, (y - 5), oPBomb)
if (state == GRABBEDQUEENBELLY)
bmb.special = 1

30
Export_Code/gml_Script_display_itemmsg.gml
Unescape View File

@ -1,29 +1 @@
if (!global.saxmode)
{
global.itmtext1 = argument0
global.itmtext2 = argument1
global.btn1_name = argument2
global.btn2_name = argument3
global.ingame = 0
global.targetx = oCharacter.x
global.targety = oCharacter.y
global.offsetx = 0
global.offsety = 0
global.camstartx = oCamera.x
global.camstarty = oCamera.y
with (oCamera)
{
targetx = x
targety = y
}
room_persistent = true
oCharacter.persistent = 0
oCamera.persistent = 0
global.currentroom = room
global.transitiontype = 3
with (oControl)
event_user(3)
room_goto(itemroom)
}
else
sfx_play(sndMessage)
sfx_play(sndMessage)

16
Export_Code/gml_Script_draw_gui.gml
Unescape View File

@ -385,12 +385,9 @@ if (global.classicmode == 0 && global.opshowhud)
else
draw_sprite(sGUIPBomb, 0, (xoff + 1), 4)
}
if global.saxmode
{
draw_sprite(sPBombCooldownOverlay, 0, (xoff + 2), 17)
scaleMult = (global.pbombCooldown / 600)
draw_sprite_ext(sPBombCooldownFull, 0, (xoff + 2), 17, scaleMult, 1, 0, c_white, 1)
}
draw_sprite(sPBombCooldownOverlay, 0, (xoff + 2), 17)
scaleMult = (global.pbombCooldown / 600)
draw_sprite_ext(sPBombCooldownFull, 0, (xoff + 2), 17, scaleMult, 1, 0, c_white, 1)
}
if (instance_exists(oClient) && (!global.saxmode))
{
@ -426,7 +423,7 @@ if (global.classicmode == 0 && global.opshowhud)
draw_background(bgGUIMetOnly, (296 + widescreen_space), 0)
xoff = 296
}
if (instance_exists(oClient) && global.saxmode)
if instance_exists(oClient)
{
draw_set_halign(fa_right)
draw_set_alpha(0.39215686274509803)
@ -516,11 +513,6 @@ if (global.classicmode == 0 && global.opshowhud)
}
if global.ophudshowmetrcount
{
if global.saxmode
{
draw_background(bgSamCount, ((xoff - 20) + widescreen_space), 4)
draw_text(((xoff - 18) + widescreen_space), 21, to_string_lz(global.samCount))
}
if (global.ophudshowmetrcount == 1)
{
draw_background(bgGUIMetCountBG1, ((xoff + 4) + widescreen_space), 4)

6
Export_Code/gml_Script_start_new_game.gml
Unescape View File

@ -1,12 +1,6 @@
global.start_room = 21
global.save_x = 3408
global.save_y = 1184
if (global.saxmode && global.sax)
{
global.start_room = 376
global.save_x = 144
global.save_y = 176
}
global.ingame = 1
global.timeofday = 0
reset_map()

6
Export_Code/gml_Script_sv6_load.gml
Unescape View File

@ -89,12 +89,6 @@ else
global.roomsSinceLastSpawn = 0
global.ingame = 1
global.newgame = 0
if (global.saxmode && global.sax)
{
global.start_room = 376
global.save_x = 144
global.save_y = 176
}
room_change(global.start_room, 1)
}
if instance_exists(oClient)

Write Preview
Loading…
Cancel
Save