Skip to content

Commit b0ba9ed

Browse files
mayzmaemayzmae
committed
v0.3
1 parent a569d67 commit b0ba9ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1353
-121
lines changed

‎AM2R.project.gmx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,6 +3407,9 @@
34073407
<sprite>sprites\sEditorStartIcon</sprite>
34083408
<sprite>sprites\sGoal</sprite>
34093409
<sprite>sprites\sGoalStrip</sprite>
3410+
<sprite>sprites\sHealField</sprite>
3411+
<sprite>sprites\sAmmoField</sprite>
3412+
<sprite>sprites\sStaticLabel</sprite>
34103413
</sprites>
34113414
</sprites>
34123415
<backgrounds name="background">
@@ -4372,6 +4375,8 @@
43724375
<script>scripts\editor_load.gml</script>
43734376
<script>scripts\generate_id.gml</script>
43744377
<script>scripts\get_stage_data.gml</script>
4378+
<script>scripts\convert_level.gml</script>
4379+
<script>scripts\split_object_string.gml</script>
43754380
</scripts>
43764381
</scripts>
43774382
<shaders name="shaders">
@@ -5426,12 +5431,17 @@
54265431
<object>objects\oTrialAutoad</object>
54275432
<object>objects\oTTBooster</object>
54285433
<object>objects\oTTScrew</object>
5434+
<object>objects\oTTWBeam</object>
5435+
<object>objects\oTTCBeam</object>
5436+
<object>objects\oTTSBeam</object>
54295437
<object>objects\oTTSpace</object>
54305438
<object>objects\oTTHijump</object>
54315439
<object>objects\oTTPGrip</object>
5440+
<object>objects\oTTMorph</object>
54325441
<object>objects\oTTBomb</object>
54335442
<object>objects\oTTSpring</object>
54345443
<object>objects\oTTMissile</object>
5444+
<object>objects\oTTEnergy</object>
54355445
<object>objects\oTTPower</object>
54365446
<object>objects\oTTSpider</object>
54375447
<object>objects\oTTSuper</object>
@@ -5444,6 +5454,9 @@
54445454
<object>objects\oInfoButton</object>
54455455
<object>objects\oEditorInfo</object>
54465456
<object>objects\oEditorHelp</object>
5457+
<object>objects\oDemoRecord</object>
5458+
<object>objects\oTTAmmoField</object>
5459+
<object>objects\oTTHealField</object>
54475460
</objects>
54485461
</objects>
54495462
<timelines name="timelines">

‎objects/oCharacter.object.gmx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,9 @@ if (room != rm_transition) {
312312
global.myposy = floor((y - 8) / 240);
313313
global.mapposx = global.myposx + global.mapoffsetx;
314314
global.mapposy = global.myposy + global.mapoffsety;
315-
if (global.dmap[global.mapposx, global.mapposy] == 0) global.dmap[global.mapposx, global.mapposy] = 1;
316-
if (prevmapposx != global.mapposx || prevmapposy != global.mapposy) with (oControl) event_user(2);
315+
// commenting this out should work..?
316+
// if (global.dmap[global.mapposx, global.mapposy] == 0) global.dmap[global.mapposx, global.mapposy] = 1;
317+
//if (prevmapposx != global.mapposx || prevmapposy != global.mapposy) with (oControl) event_user(2);
317318
} else image_speed = 0;
318319
//
319320
block_id = -4;

‎objects/oControl.object.gmx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,8 @@ if (os_is_native) {
10811081
<arguments>
10821082
<argument>
10831083
<kind>1</kind>
1084-
<string>m1 = string(global.map[global.mapposx, global.mapposy]);
1084+
<string>/*
1085+
m1 = string(global.map[global.mapposx, global.mapposy]);
10851086
m2 = string(global.map[global.mapposx - 2, global.mapposy - 1]);
10861087
m3 = string(global.map[global.mapposx - 1, global.mapposy - 1]);
10871088
m4 = string(global.map[global.mapposx, global.mapposy - 1]);
@@ -1115,6 +1116,7 @@ if (global.mapmarker) {
11151116
moffx = global.mapmarkerx - global.mapposx;
11161117
moffy = global.mapmarkery - global.mapposy;
11171118
}
1119+
*/
11181120
</string>
11191121
</argument>
11201122
</arguments>

‎objects/oDemoRecord.object.gmx‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
2+
<object>
3+
<spriteName>&lt;undefined&gt;</spriteName>
4+
<solid>0</solid>
5+
<visible>-1</visible>
6+
<depth>0</depth>
7+
<persistent>0</persistent>
8+
<parentName>&lt;undefined&gt;</parentName>
9+
<maskName>&lt;undefined&gt;</maskName>
10+
<events>
11+
<event eventtype="0" enumb="0">
12+
<action>
13+
<libid>1</libid>
14+
<id>603</id>
15+
<kind>7</kind>
16+
<userelative>0</userelative>
17+
<isquestion>0</isquestion>
18+
<useapplyto>-1</useapplyto>
19+
<exetype>2</exetype>
20+
<functionname></functionname>
21+
<codestring></codestring>
22+
<whoName>self</whoName>
23+
<relative>0</relative>
24+
<isnot>0</isnot>
25+
<arguments>
26+
<argument>
27+
<kind>1</kind>
28+
<string>demo_valid = 1;
29+
demo_inputs = 0;
30+
31+
demo_uppr = 0;
32+
demo_dnpr = 0;
33+
demo_rtpr = 0;
34+
demo_lfpr = 0;
35+
36+
demo_frpr = 0;
37+
demo_jppr = 0;
38+
</string>
39+
</argument>
40+
</arguments>
41+
</action>
42+
</event>
43+
</events>
44+
<PhysicsObject>0</PhysicsObject>
45+
<PhysicsObjectSensor>0</PhysicsObjectSensor>
46+
<PhysicsObjectShape>0</PhysicsObjectShape>
47+
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
48+
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
49+
<PhysicsObjectGroup>0</PhysicsObjectGroup>
50+
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
51+
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
52+
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
53+
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
54+
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
55+
<PhysicsShapePoints/>
56+
</object>

‎objects/oDrawTitleBG.object.gmx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ draw_background_ext(bgURL, 198+(oControl.widescreen_space/2), 232, 1, 1, 0, -1,
122122
draw_set_font(global.fontVersion);
123123
draw_background_ext(bgVersion, 0-(oControl.widescreen_space/2), 0, string_width(global.am2r_version) + 1, 1, 0, -1, image_alpha);
124124
draw_text_colour(1-(oControl.widescreen_space/2), 1, global.am2r_version, -1, -1, -1, -1, image_alpha);
125+
draw_background_ext(bgVersion, 0-(oControl.widescreen_space/2), 7, string_width(global.am2r_version) + 1, 1, 0, -1, image_alpha);
126+
draw_text_colour(1-(oControl.widescreen_space/2), 8, string_upper(global.tt_vers), -1, -1, -1, -1, image_alpha);
125127
</string>
126128
</argument>
127129
</arguments>

‎objects/oEditorInfo.object.gmx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bu[1] = c_white;
3434
create_button_alt(214,80,200,10,0,oTrialEditor.stage_name,0,bu[0]);
3535
create_button_alt(214,100,200,10,1,oTrialEditor.stage_auth,1,bu[1]);
3636

37-
create_button_alt(232,130,80,10,3,"Toggle",2,c_aqua);
37+
create_button_alt(240,130,80,10,3,"Toggle",2,c_aqua);
3838
create_button_alt(160,160,70,10,2,"Confirm",2,c_lime);
3939

4040
relay_button = -1;
@@ -187,9 +187,10 @@ draw_set_valign(fa_center);
187187
draw_text(80+x,80+y,"Level Name");
188188
draw_text(80+x,100+y,"Level Author");
189189

190+
draw_set_halign(fa_center);
190191
var s = "Enabled";
191192
if (oTrialEditor.objs_hidden = false) then s = "Disabled";
192-
draw_text(160+x,130+y,"Hidden Blocks: "+s);
193+
draw_text(80+x,130+y,"Hidden Blocks: "+s);
193194
</string>
194195
</argument>
195196
</arguments>

‎objects/oEditorSolid.object.gmx‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,37 @@ switch (solid_style){
3636
case 2:
3737
draw_sprite(sSlope2,0,x,y);
3838
break;
39-
case 3:
39+
case 3: case 25:
4040
draw_sprite(sBlockStep,0,x,y);
41+
if (solid_style == 25) then draw_sprite(sStaticLabel,0,x,y);
4142
break;
42-
case 4:
43+
case 4: case 26:
4344
draw_sprite(sBlockShoot,0,x,y);
45+
if (solid_style == 26) then draw_sprite(sStaticLabel,0,x,y);
4446
break;
45-
case 5:
47+
case 5: case 27:
4648
draw_sprite(sBlockBomb,0,x,y);
49+
if (solid_style == 27) then draw_sprite(sStaticLabel,0,x,y);
4750
break;
48-
case 6:
51+
case 6: case 28:
4952
draw_sprite(sBlockMissile,0,x,y);
53+
if (solid_style == 28) then draw_sprite(sStaticLabel,0,x,y);
5054
break;
51-
case 7:
55+
case 7: case 29:
5256
draw_sprite(sBlockSMissile,0,x,y);
57+
if (solid_style == 29) then draw_sprite(sStaticLabel,0,x,y);
5358
break;
54-
case 8:
59+
case 8: case 30:
5560
draw_sprite(sBlockPBomb,0,x,y);
61+
if (solid_style == 30) then draw_sprite(sStaticLabel,0,x,y);
5662
break;
57-
case 9:
63+
case 9: case 31:
5864
draw_sprite(sBlockScrew,0,x,y);
65+
if (solid_style == 31) then draw_sprite(sStaticLabel,0,x,y);
5966
break;
60-
case 10:
67+
case 10: case 32:
6168
draw_sprite(sBlockSpeed,0,x,y);
69+
if (solid_style == 32) then draw_sprite(sStaticLabel,0,x,y);
6270
break;
6371
case 11:
6472
draw_sprite(sEditorStart,0,x+8,y+16);
@@ -100,6 +108,31 @@ switch (solid_style){
100108
case 23:
101109
draw_sprite(sItemSpeedBooster,0,x+0,y+16);
102110
break;
111+
case 34:
112+
draw_sprite(sItemMorphBall,0,x+0,y+16);
113+
break;
114+
case 35:
115+
draw_sprite(sItemPowergrip,0,x+0,y+16);
116+
break;
117+
case 36:
118+
draw_sprite(sItemEnergyTank,0,x+0,y+16);
119+
break;
120+
case 37:
121+
draw_sprite(sItemChargeBeam,0,x+0,y+16);
122+
break;
123+
case 38:
124+
draw_sprite(sItemWaveBeam,0,x+0,y+16);
125+
break;
126+
case 39:
127+
draw_sprite(sItemSpazerBeam,0,x+0,y+16);
128+
break;
129+
// fields
130+
case 24:
131+
draw_sprite(sHealField,0,x+0,y+0);
132+
break;
133+
case 33:
134+
draw_sprite(sAmmoField,0,x+0,y+0);
135+
break;
103136
}
104137
</string>
105138
</argument>

‎objects/oEditorTab.object.gmx‎

Lines changed: 95 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,11 @@ message_string = "Welcome to the AM2Rials editor!";
3232
if (oControl.widescreen == 0) message_string = "It appears you are using 4:3. Switch to 16:9 for a better experience!";
3333
message_tick = 300;
3434

35-
// data buttons
36-
create_button(3-185,22,50,12,0,"Info",0,c_fuchsia);
37-
create_button(3-185,36,50,12,1,"Save",0,c_lime);
38-
create_button(3-185,50,50,12,2,"Load",0,c_aqua);
39-
create_button(3-185,64,50,12,3,"Exit",0,c_red);
35+
tab_data = 0;
36+
// 0 - page 1
37+
// 1 - page 2
4038

41-
// obj buttons
42-
create_button(3-140,29,24,24,4,"",sEditorStartIcon,c_white);
43-
create_button(3-110,29,24,24,5,"",sSolid,c_white);
44-
create_button(3-80,29,24,24,6,"",sSlope1,c_white);
45-
create_button(3-50,29,24,24,7,"",sSlope2,c_white);
46-
create_button(3-20,29,24,24,8,"",sBlockStep,c_white);
47-
create_button(3+10,29,24,24,9,"",sBlockShoot,c_white);
48-
create_button(3+40,29,24,24,10,"",sBlockBomb,c_white);
49-
create_button(3+70,29,24,24,11,"",sBlockMissile,c_white);
50-
create_button(3+100,29,24,24,12,"",sBlockSMissile,c_white);
51-
create_button(3+130,29,24,24,13,"",sBlockPBomb,c_white);
52-
create_button(3+160,29,24,24,14,"",sBlockScrew,c_white);
53-
create_button(3+190,29,24,24,15,"",sBlockSpeed,c_white);
54-
// row 2
55-
create_button(3-140,57,24,24,16,"",sEDTrigger,c_white); // end tiles
56-
create_button(3-110,57,24,24,17,"",sEDSpike,c_white); // spike tiles
57-
create_button(3-80,57,24,24,18,"",sItemSpiderBall,c_white);
58-
create_button(3-50,57,24,24,19,"",sItemJumpBall,c_white);
59-
create_button(3-20,57,24,24,20,"",sItemHijump,c_white);
60-
create_button(3+10,57,24,24,21,"",sItemSpaceJump,c_white);
61-
create_button(3+40,57,24,24,22,"",sItemBomb,c_white);
62-
create_button(3+70,57,24,24,23,"",sItemMissile,c_white);
63-
create_button(3+100,57,24,24,24,"",sItemSuperMissile,c_white);
64-
create_button(3+130,57,24,24,25,"",sItemPowerBomb,c_white);
65-
create_button(3+160,57,24,24,26,"",sItemScrewAttack,c_white);
66-
create_button(3+190,57,24,24,27,"",sItemSpeedBooster,c_white);
39+
event_user(0);
6740
</string>
6841
</argument>
6942
</arguments>
@@ -87,6 +60,97 @@ create_button(3+190,57,24,24,27,"",sItemSpeedBooster,c_white);
8760
<argument>
8861
<kind>1</kind>
8962
<string>if (message_tick &gt; 0) --message_tick;
63+
</string>
64+
</argument>
65+
</arguments>
66+
</action>
67+
</event>
68+
<event eventtype="7" enumb="10">
69+
<action>
70+
<libid>1</libid>
71+
<id>603</id>
72+
<kind>7</kind>
73+
<userelative>0</userelative>
74+
<isquestion>0</isquestion>
75+
<useapplyto>-1</useapplyto>
76+
<exetype>2</exetype>
77+
<functionname></functionname>
78+
<codestring></codestring>
79+
<whoName>self</whoName>
80+
<relative>0</relative>
81+
<isnot>0</isnot>
82+
<arguments>
83+
<argument>
84+
<kind>1</kind>
85+
<string>with (oEditorButton){
86+
instance_destroy();
87+
}
88+
89+
// data buttons
90+
create_button(-185,22,50,12,0,"Info",0,c_fuchsia);
91+
create_button(-185,36,50,12,1,"Save",0,c_lime);
92+
create_button(-185,50,50,12,2,"Load",0,c_aqua);
93+
create_button(-185,64,50,12,3,"Exit",0,c_red);
94+
95+
if (tab_data){ // page 2
96+
// obj buttons
97+
create_button(-142,29,24,24,29,"",sHealField,c_white); // heal tiles
98+
//create_button(-112,29,24,24,30,"",sSolid,c_white);
99+
//create_button(-82,29,24,24,31,"",sSlope1,c_white);
100+
//create_button(-52,29,24,24,32,"",sSlope2,c_white);
101+
create_button(-22,29,24,24,33,"",sBlockStep,c_red);
102+
create_button(8,29,24,24,34,"",sBlockShoot,c_red);
103+
create_button(38,29,24,24,35,"",sBlockBomb,c_red);
104+
create_button(68,29,24,24,36,"",sBlockMissile,c_red);
105+
create_button(98,29,24,24,37,"",sBlockSMissile,c_red);
106+
create_button(128,29,24,24,38,"",sBlockPBomb,c_red);
107+
create_button(158,29,24,24,39,"",sBlockScrew,c_red);
108+
create_button(188,29,24,24,40,"",sBlockSpeed,c_red);
109+
// row 2
110+
create_button(-142,57,24,24,41,"",sAmmoField,c_white); // ammo tiles
111+
//create_button(-112,57,24,24,42,"",sEDSpike,c_white);
112+
//create_button(-82,57,24,24,43,"",sItemSpiderBall,c_white);
113+
//create_button(-52,57,24,24,44,"",sItemJumpBall,c_white);
114+
create_button(-22,57,24,24,45,"",sItemMorphBall,c_white);
115+
create_button(8,57,24,24,46,"",sItemPowergrip,c_white);
116+
create_button(38,57,24,24,47,"",sItemEnergyTank,c_white);
117+
//create_button(68,57,24,24,48,"",sItemChargeBeam,c_white);
118+
//create_button(98,57,24,24,49,"",sItemWaveBeam,c_white);
119+
create_button(128,57,24,24,50,"",sItemChargeBeam,c_white);
120+
create_button(158,57,24,24,51,"",sItemWaveBeam,c_white);
121+
create_button(188,57,24,24,52,"",sItemSpazerBeam,c_white);
122+
123+
create_button(207,43,6,48,28,"&lt;",0,c_white);
124+
}else{ // page 1
125+
// obj buttons
126+
create_button(-142,29,24,24,4,"",sEditorStartIcon,c_white);
127+
create_button(-112,29,24,24,5,"",sSolid,c_white);
128+
create_button(-82,29,24,24,6,"",sSlope1,c_white);
129+
create_button(-52,29,24,24,7,"",sSlope2,c_white);
130+
create_button(-22,29,24,24,8,"",sBlockStep,c_white);
131+
create_button(8,29,24,24,9,"",sBlockShoot,c_white);
132+
create_button(38,29,24,24,10,"",sBlockBomb,c_white);
133+
create_button(68,29,24,24,11,"",sBlockMissile,c_white);
134+
create_button(98,29,24,24,12,"",sBlockSMissile,c_white);
135+
create_button(128,29,24,24,13,"",sBlockPBomb,c_white);
136+
create_button(158,29,24,24,14,"",sBlockScrew,c_white);
137+
create_button(188,29,24,24,15,"",sBlockSpeed,c_white);
138+
// row 2
139+
create_button(-142,57,24,24,16,"",sEDTrigger,c_white); // end tiles
140+
create_button(-112,57,24,24,17,"",sEDSpike,c_white); // spike tiles
141+
create_button(-82,57,24,24,18,"",sItemSpiderBall,c_white);
142+
create_button(-52,57,24,24,19,"",sItemJumpBall,c_white);
143+
create_button(-22,57,24,24,20,"",sItemHijump,c_white);
144+
create_button(8,57,24,24,21,"",sItemSpaceJump,c_white);
145+
create_button(38,57,24,24,22,"",sItemBomb,c_white);
146+
create_button(68,57,24,24,23,"",sItemMissile,c_white);
147+
create_button(98,57,24,24,24,"",sItemSuperMissile,c_white);
148+
create_button(128,57,24,24,25,"",sItemPowerBomb,c_white);
149+
create_button(158,57,24,24,26,"",sItemScrewAttack,c_white);
150+
create_button(188,57,24,24,27,"",sItemSpeedBooster,c_white);
151+
152+
create_button(207,43,6,48,28,"&gt;",0,c_white);
153+
}
90154
</string>
91155
</argument>
92156
</arguments>

0 commit comments

Comments
 (0)