From 8168e726c8be72b5aa6b472b69ea580451754ba1 Mon Sep 17 00:00:00 2001 From: Mae <72725655+VanessaMae1087@users.noreply.github.com> Date: Sat, 25 Jun 2022 14:39:35 -0700 Subject: [PATCH] Added Ice Traps --- AM2R.project.gmx | 6 +- Configs/Default.config.gmx | 16 +-- objects/oItem.object.gmx | 14 +-- objects/oItemIceTrap.object.gmx | 82 ++++++++++++++++ rooms/rm_a0h07.room.gmx | 2 +- rooms/rm_a0h11.room.gmx | 4 +- rooms/rm_a0h31.room.gmx | 2 +- rooms/rm_a2a05.room.gmx | 4 +- rooms/rm_a2a09.room.gmx | 2 +- rooms/rm_a2a17.room.gmx | 166 ++++++++++++++++---------------- rooms/rm_a2c01.room.gmx | 5 + rooms/rm_a2h02.room.gmx | 30 ++++++ rooms/rm_a3a07.room.gmx | 4 +- rooms/rm_a3a15.room.gmx | 2 +- rooms/rm_a3a24.room.gmx | 64 +++++++++++- rooms/rm_a3h02.room.gmx | 47 ++++++++- rooms/rm_a4h01.room.gmx | 4 +- rooms/rm_a4h02.room.gmx | 27 +++++- rooms/rm_a4h05.room.gmx | 40 +++++++- rooms/rm_a4h07.room.gmx | 68 +++++++++++++ rooms/rm_a4h08.room.gmx | 67 ++++++++++++- rooms/rm_a4h10.room.gmx | 40 +++++++- rooms/rm_a4h12.room.gmx | 135 +++++++++++++++++++++++++- rooms/rm_a4h15.room.gmx | 3 +- rooms/rm_a4h16.room.gmx | 3 +- rooms/rm_a5c09.room.gmx | 2 +- rooms/rm_a5c12.room.gmx | 6 +- rooms/rm_a5c17.room.gmx | 2 +- rooms/rm_a5c29.room.gmx | 2 +- rooms/rm_a5h03.room.gmx | 49 ++++++++++ sprites/sItemIceTrap.sprite.gmx | 25 +++++ 31 files changed, 785 insertions(+), 138 deletions(-) create mode 100644 objects/oItemIceTrap.object.gmx create mode 100644 sprites/sItemIceTrap.sprite.gmx diff --git a/AM2R.project.gmx b/AM2R.project.gmx index 543ec7c..a2d5d1d 100644 --- a/AM2R.project.gmx +++ b/AM2R.project.gmx @@ -5064,7 +5064,6 @@ sprites\sShipGlow - sprites\sRoboGeo sprites\sMultitroidIcon sprites\sPalMultitroidNew @@ -5283,6 +5282,10 @@ sprites\sVariaPalette sprites\sGravityPalette + + sprites\sRoboGeo + sprites\sItemIceTrap + background\bgScreenGuide @@ -7320,6 +7323,7 @@ objects\oRoboGeo + objects\oItemIceTrap diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx index 264227e..3a0e2ce 100644 --- a/Configs/Default.config.gmx +++ b/Configs/Default.config.gmx @@ -25,7 +25,7 @@ 2 1 28 - Item Roulette 1.0.1 + Item Roulette B-0.2.0 0 @@ -220,7 +220,7 @@ false true 0 - AM2R - Item Roulette 1.0.1 + AM2R - Item Roulette B-0.2.0 True 0 @@ -283,7 +283,7 @@ 0 < Press refresh to fetch certificate list from Mac> 3 - AM2R - Item Roulette 1.0.1 + AM2R - Item Roulette B-0.2.0 0 @@ -362,7 +362,7 @@ 1024 false - AM2R - Item Roulette 1.0.1 + AM2R - Item Roulette B-0.2.0 0 0 https://www.reddit.com/r/AM2R/ @@ -391,7 +391,7 @@ 1 (c)2012 CompanyName Ltd... -1 - AM2R - Item Roulette 1.0.1 + AM2R - Item Roulette B-0.2.0 0 0 0 @@ -485,7 +485,7 @@ TexPage1 http://yourdomain/AM2R 0 - AM2R - Item Roulette 1.0.1 + AM2R - Item Roulette B-0.2.0 0 0 @@ -536,7 +536,7 @@ 0 Windows8_TemporaryKey.pfx - AM2R - Item Roulette 1.0.1 + AM2R - Item Roulette B-0.2.0 0 -1 -1 @@ -643,7 +643,7 @@ Configs\Default\WinPhone\CycleWide8.png Configs\Default\WinPhone\CycleWide9.png YourDescription - Item Roulette 1.0.1 + Item Roulette B-0.2.0 Configs\Default\WinPhone\FlipMedBack.png diff --git a/objects/oItem.object.gmx b/objects/oItem.object.gmx index 609f39d..73e6529 100644 --- a/objects/oItem.object.gmx +++ b/objects/oItem.object.gmx @@ -95,7 +95,9 @@ alarm[0] = ShuffleTime 1 - with (self) + + +with (self) instance_destroy() Rando = floor(irandom_range(1, 26)) if (Rando == 1) @@ -105,7 +107,7 @@ if (Rando == 2) if (global.jumpball == 0) RouletteResult = instance_create(x, y, oItemJumpBall) else - RouletteResult = instance_create(x, y, oItemSM_51) + RouletteResult = instance_create(x, y, oItemIceTrap) } if (Rando == 3) { @@ -121,7 +123,7 @@ if (Rando == 5) if (global.spacejump == 0) RouletteResult = instance_create(x, y, oItemSpaceJump) else - RouletteResult = instance_create(x, y, oItemPB_58) + RouletteResult = instance_create(x, y, oItemIceTrap) } if (Rando == 6) { @@ -146,7 +148,7 @@ if (Rando == 10) if (global.ibeam == 0) RouletteResult = instance_create(x, y, oItemIBeam) else - RouletteResult = instance_create(x, y, oItemETank_103) + RouletteResult = instance_create(x, y, oItemIceTrap) } if (Rando == 11) RouletteResult = instance_create(x, y, oItemWBeam) @@ -167,9 +169,9 @@ if (Rando == 13) if (Rando == 14) RouletteResult = instance_create(x, y, oItemM_52) if (Rando == 15) - RouletteResult = instance_create(x, y, oItemSM_51) + RouletteResult = instance_create(x, y, oItemIceTrap) if (Rando == 16) - RouletteResult = instance_create(x, y, oItemPB_58) + RouletteResult = instance_create(x, y, oItemIceTrap) if (Rando == 17) RouletteResult = instance_create(x, y, oItemETank_103) if (Rando == 18) diff --git a/objects/oItemIceTrap.object.gmx b/objects/oItemIceTrap.object.gmx new file mode 100644 index 0000000..06f0e3f --- /dev/null +++ b/objects/oItemIceTrap.object.gmx @@ -0,0 +1,82 @@ + + + sItemIceTrap + 0 + -1 + -1 + 0 + oItem + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + event_inherited(); +text1 = "" +text2 = "" +itemid = 300; //i hope this is an unused ID cuz im not checking lol + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + itemtype = 1; +popup_text(get_text("Notifications", "Fool")) +event_inherited(); +global.playerFreeze = 340; damageDir = 0; knockbackY = 0; global.frozenNormally = true; + with(oControl){ + kLeft = 0; + kRight = 0; + kUp = 0; + kDown = 0; + } + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + -1 + + diff --git a/rooms/rm_a0h07.room.gmx b/rooms/rm_a0h07.room.gmx index bd8491a..953638e 100644 --- a/rooms/rm_a0h07.room.gmx +++ b/rooms/rm_a0h07.room.gmx @@ -476,7 +476,7 @@ with(oBlockSpeed){ - + diff --git a/rooms/rm_a0h11.room.gmx b/rooms/rm_a0h11.room.gmx index 271b074..d1f4510 100644 --- a/rooms/rm_a0h11.room.gmx +++ b/rooms/rm_a0h11.room.gmx @@ -91,7 +91,7 @@ mus_change(mus_get_main_song()); - + @@ -263,7 +263,7 @@ mus_change(mus_get_main_song()); - + diff --git a/rooms/rm_a0h31.room.gmx b/rooms/rm_a0h31.room.gmx index f842a8d..a6178d2 100644 --- a/rooms/rm_a0h31.room.gmx +++ b/rooms/rm_a0h31.room.gmx @@ -300,7 +300,7 @@ global.objdeactivate = 1; - + diff --git a/rooms/rm_a2a05.room.gmx b/rooms/rm_a2a05.room.gmx index f99cb22..37da4dc 100644 --- a/rooms/rm_a2a05.room.gmx +++ b/rooms/rm_a2a05.room.gmx @@ -103,8 +103,8 @@ instance_create(848, 80, scr_itemsopen(oControl.mod_152)); - - + + diff --git a/rooms/rm_a2a09.room.gmx b/rooms/rm_a2a09.room.gmx index 1a70eb5..e9da6e0 100644 --- a/rooms/rm_a2a09.room.gmx +++ b/rooms/rm_a2a09.room.gmx @@ -111,7 +111,7 @@ instance_create(56, 48, scr_itemsopen(oControl.mod_151)); - + diff --git a/rooms/rm_a2a17.room.gmx b/rooms/rm_a2a17.room.gmx index 10ae32e..23f735d 100644 --- a/rooms/rm_a2a17.room.gmx +++ b/rooms/rm_a2a17.room.gmx @@ -758,89 +758,89 @@ instance_create(424, 176, scr_itemsopen(oControl.mod_157)); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/rooms/rm_a2c01.room.gmx b/rooms/rm_a2c01.room.gmx index 1ae7f61..72763fe 100644 --- a/rooms/rm_a2c01.room.gmx +++ b/rooms/rm_a2c01.room.gmx @@ -156,6 +156,7 @@ global.objdeactivate = 0; + @@ -232,6 +233,10 @@ global.objdeactivate = 0; + + + + diff --git a/rooms/rm_a2h02.room.gmx b/rooms/rm_a2h02.room.gmx index 33524cc..0806657 100644 --- a/rooms/rm_a2h02.room.gmx +++ b/rooms/rm_a2h02.room.gmx @@ -414,6 +414,9 @@ instance_create(3144, 608, scr_itemsopen(oControl.mod_163)); + + + @@ -884,6 +887,33 @@ instance_create(3144, 608, scr_itemsopen(oControl.mod_163)); + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rooms/rm_a3a07.room.gmx b/rooms/rm_a3a07.room.gmx index 48cba11..0adc1c6 100644 --- a/rooms/rm_a3a07.room.gmx +++ b/rooms/rm_a3a07.room.gmx @@ -206,7 +206,7 @@ instance_create(240, 96, scr_itemsopen(oControl.mod_204)); - + @@ -251,7 +251,7 @@ instance_create(240, 96, scr_itemsopen(oControl.mod_204)); - + diff --git a/rooms/rm_a3a15.room.gmx b/rooms/rm_a3a15.room.gmx index e6e15da..814def7 100644 --- a/rooms/rm_a3a15.room.gmx +++ b/rooms/rm_a3a15.room.gmx @@ -253,7 +253,7 @@ instance_create(72, 80, scr_itemsopen(oControl.mod_201)); - + diff --git a/rooms/rm_a3a24.room.gmx b/rooms/rm_a3a24.room.gmx index ab14491..660ae6a 100644 --- a/rooms/rm_a3a24.room.gmx +++ b/rooms/rm_a3a24.room.gmx @@ -12,8 +12,7 @@ 0 global.mapoffsetx = 66; global.mapoffsety = 30; -global.watertype = 0; -global.waterlevel = 0; +if (global.lavastate <= 2) make_liquid(1, 232, 0, 0, 0, 0, 1); global.floormaterial = 1; SoundFX_Preset(1); make_liquid(1, 464, 0, 0, 0, 0, 1); @@ -134,6 +133,9 @@ make_liquid(1, 464, 0, 0, 0, 0, 1); + + + @@ -387,6 +389,64 @@ make_liquid(1, 464, 0, 0, 0, 0, 1); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/rooms/rm_a3h02.room.gmx b/rooms/rm_a3h02.room.gmx index 7012558..df047b5 100644 --- a/rooms/rm_a3h02.room.gmx +++ b/rooms/rm_a3h02.room.gmx @@ -12,8 +12,7 @@ 0 global.mapoffsetx = 53; global.mapoffsety = 22; -global.watertype = 0; -global.waterlevel = 0; +if (global.lavastate <= 2) make_liquid(1, 1012, 0, 0, 0, 0, 1); global.floormaterial = 3; global.darkness = 0; global.objdeactivate = 1; @@ -135,6 +134,9 @@ mus_change(musCaveAmbience); + + + @@ -151,6 +153,47 @@ mus_change(musCaveAmbience); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rooms/rm_a4h01.room.gmx b/rooms/rm_a4h01.room.gmx index 01e249b..cc2a6c5 100644 --- a/rooms/rm_a4h01.room.gmx +++ b/rooms/rm_a4h01.room.gmx @@ -3,8 +3,8 @@ 640 1920 - 32 - 32 + 16 + 16 0 60 0 diff --git a/rooms/rm_a4h02.room.gmx b/rooms/rm_a4h02.room.gmx index 4208090..eb2bd38 100644 --- a/rooms/rm_a4h02.room.gmx +++ b/rooms/rm_a4h02.room.gmx @@ -111,6 +111,9 @@ global.darkness = 0; + + + @@ -361,7 +364,6 @@ global.darkness = 0; - @@ -383,7 +385,6 @@ global.darkness = 0; - @@ -543,6 +544,28 @@ global.darkness = 0; + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/rooms/rm_a4h05.room.gmx b/rooms/rm_a4h05.room.gmx index 1b04da5..a715d1e 100644 --- a/rooms/rm_a4h05.room.gmx +++ b/rooms/rm_a4h05.room.gmx @@ -3,8 +3,8 @@ 960 240 - 32 - 32 + 16 + 16 0 60 0 @@ -12,8 +12,7 @@ 0 global.mapoffsetx = 38; global.mapoffsety = 37; -global.waterlevel = 0; -global.watertype = 0; +if (global.lavastate <= 6) make_liquid(1, 227, 0, 0, 0, 0, 1); global.floormaterial = 1; -1 -1 @@ -188,6 +187,12 @@ global.floormaterial = 1; + + + + + + @@ -335,6 +340,33 @@ global.floormaterial = 1; + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rooms/rm_a4h07.room.gmx b/rooms/rm_a4h07.room.gmx index 15aa924..f96eec6 100644 --- a/rooms/rm_a4h07.room.gmx +++ b/rooms/rm_a4h07.room.gmx @@ -149,6 +149,14 @@ global.floormaterial = 1; + + + + + + + + @@ -304,6 +312,66 @@ global.floormaterial = 1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/rooms/rm_a4h08.room.gmx b/rooms/rm_a4h08.room.gmx index 33a3f57..3129a2b 100644 --- a/rooms/rm_a4h08.room.gmx +++ b/rooms/rm_a4h08.room.gmx @@ -3,8 +3,8 @@ 960 240 - 32 - 32 + 16 + 16 0 60 0 @@ -142,6 +142,17 @@ global.floormaterial = 1; + + + + + + + + + + + @@ -249,6 +260,58 @@ global.floormaterial = 1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/rooms/rm_a4h10.room.gmx b/rooms/rm_a4h10.room.gmx index b28ddf8..97c3f44 100644 --- a/rooms/rm_a4h10.room.gmx +++ b/rooms/rm_a4h10.room.gmx @@ -3,8 +3,8 @@ 1280 240 - 32 - 32 + 16 + 16 0 60 0 @@ -221,8 +221,44 @@ global.floormaterial = 1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rooms/rm_a4h12.room.gmx b/rooms/rm_a4h12.room.gmx index bb54f5f..28f3856 100644 --- a/rooms/rm_a4h12.room.gmx +++ b/rooms/rm_a4h12.room.gmx @@ -3,8 +3,8 @@ 960 480 - 32 - 32 + 16 + 16 0 60 0 @@ -12,8 +12,7 @@ 0 global.mapoffsetx = 28; global.mapoffsety = 41; -global.waterlevel = 0; -global.watertype = 0; +if (global.lavastate <= 6) make_liquid(1, 183, 0, 0, 0, 0, 1); global.floormaterial = 1; -1 -1 @@ -158,6 +157,18 @@ global.floormaterial = 1; + + + + + + + + + + + + @@ -217,6 +228,122 @@ global.floormaterial = 1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rooms/rm_a4h15.room.gmx b/rooms/rm_a4h15.room.gmx index f7fa046..c87ca66 100644 --- a/rooms/rm_a4h15.room.gmx +++ b/rooms/rm_a4h15.room.gmx @@ -12,8 +12,7 @@ 0 global.mapoffsetx = 38; global.mapoffsety = 42; -global.watertype = 0; -global.waterlevel = 0; +if (global.lavastate <= 6) make_liquid(1, 55, 0, 0, 0, 0, 1); global.floormaterial = 1; if (global.event[200] == 0) { mus_change(musCaveAmbienceA4); diff --git a/rooms/rm_a4h16.room.gmx b/rooms/rm_a4h16.room.gmx index 8166ffb..acdacd9 100644 --- a/rooms/rm_a4h16.room.gmx +++ b/rooms/rm_a4h16.room.gmx @@ -12,8 +12,7 @@ 0 global.mapoffsetx = 36; global.mapoffsety = 43; -global.watertype = 0; -global.waterlevel = 0; +if (global.lavastate <= 6) make_liquid(1, -128, 0, 0, 0, 0, 1); global.floormaterial = 1; mus_change(musItemAmb); -1 diff --git a/rooms/rm_a5c09.room.gmx b/rooms/rm_a5c09.room.gmx index b22a209..46994a3 100644 --- a/rooms/rm_a5c09.room.gmx +++ b/rooms/rm_a5c09.room.gmx @@ -72,7 +72,7 @@ global.objdeactivate = 0; - + diff --git a/rooms/rm_a5c12.room.gmx b/rooms/rm_a5c12.room.gmx index 3dc3c05..1ec5c26 100644 --- a/rooms/rm_a5c12.room.gmx +++ b/rooms/rm_a5c12.room.gmx @@ -80,9 +80,9 @@ if (oControl.mod_randomgamebool) { - - - + + + diff --git a/rooms/rm_a5c17.room.gmx b/rooms/rm_a5c17.room.gmx index 5b4fe54..d320877 100644 --- a/rooms/rm_a5c17.room.gmx +++ b/rooms/rm_a5c17.room.gmx @@ -130,7 +130,7 @@ global.objdeactivate = 0; - + diff --git a/rooms/rm_a5c29.room.gmx b/rooms/rm_a5c29.room.gmx index 10e4e0f..26c673d 100644 --- a/rooms/rm_a5c29.room.gmx +++ b/rooms/rm_a5c29.room.gmx @@ -68,7 +68,7 @@ make_liquid(0, 80, 0, 0, 0, 0, 1); - + diff --git a/rooms/rm_a5h03.room.gmx b/rooms/rm_a5h03.room.gmx index 1a7f020..62e3528 100644 --- a/rooms/rm_a5h03.room.gmx +++ b/rooms/rm_a5h03.room.gmx @@ -291,6 +291,15 @@ global.objdeactivate = 1; + + + + + + + + + @@ -755,6 +764,46 @@ global.objdeactivate = 1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 diff --git a/sprites/sItemIceTrap.sprite.gmx b/sprites/sItemIceTrap.sprite.gmx new file mode 100644 index 0000000..66861e9 --- /dev/null +++ b/sprites/sItemIceTrap.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 0 + 16 + 1 + 0 + 0 + 0 + 1 + 14 + 2 + 15 + 0 + 0 + + 0 + + 0 + 16 + 16 + + images\sItemIceTrap_0.png + +