Skip to content
This repository was archived by the owner on Sep 21, 2024. It is now read-only.

Adding the gold flower #30

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Configs/Default/AmazonFire/icons/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/icons/icon_hdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/icons/icon_ldpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/icons/icon_mdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/icons/icon_xxhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/icons/ouyaIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/portrait_splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AmazonFire/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/icon_hdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/icon_ldpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/icon_mdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/icon_xhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/icon_xxhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/icons/ouyaIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/AndroidTV/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Configs/Default/ios/iPadsplashPortrait.png
Binary file added Configs/Default/ios/iPhone5splashPortrait.png
Binary file added Configs/Default/ios/iPhone6PlusSplash.png
Binary file added Configs/Default/ios/iPhone6PlusSplashPortrait.png
Binary file added Configs/Default/ios/iPhone6Splash.png
Binary file added Configs/Default/ios/iPhone6SplashPortrait.png
Binary file added Configs/Default/ios/iPhone7PlusSplash.png
Binary file added Configs/Default/ios/iPhone7PlusSplashPortrait.png
Binary file added Configs/Default/ios/iPhone7Splash.png
Binary file added Configs/Default/ios/iPhone7SplashPortrait.png
Binary file added Configs/Default/ios/iPhone8PlusSplash.png
Binary file added Configs/Default/ios/iPhone8PlusSplashPortrait.png
Binary file added Configs/Default/ios/iPhone8Splash.png
Binary file added Configs/Default/ios/iPhone8SplashPortrait.png
Binary file added Configs/Default/ios/iPhoneSEsplash.png
Binary file added Configs/Default/ios/iPhoneSEsplashPortrait.png
Binary file added Configs/Default/ios/iPhoneXSplash.png
Binary file added Configs/Default/ios/iPhoneXSplashPortrait.png
Binary file added Configs/Default/ios/iPhonesplashPortrait.png
Binary file added Configs/Default/ios/icons/app/ipad_152.png
Binary file added Configs/Default/ios/icons/app/ipad_76.png
Binary file added Configs/Default/ios/icons/app/ipad_pro_167.png
Binary file added Configs/Default/ios/icons/app/iphone_120.png
Binary file added Configs/Default/ios/icons/app/iphone_180.png
Binary file added Configs/Default/ios/icons/itunes/itunes_1024.png
Binary file added Configs/Default/ios/icons/settings/ipad_29.png
Binary file added Configs/Default/ios/icons/settings/ipad_58.png
Binary file added Configs/Default/ios/icons/settings/iphone_58.png
Binary file added Configs/Default/ios/icons/settings/iphone_87.png
Binary file added Configs/Default/ios/icons/spotlight/ipad_40.png
Binary file added Configs/Default/ios/icons/spotlight/ipad_80.png
Binary file added Configs/Default/ios/icons/spotlight/iphone_80.png
Binary file added Configs/Default/ios/splashPortrait.png
Binary file added Configs/Default/tvos/icons/icon1280.png
Binary file added Configs/Default/tvos/icons/icon400.png
Binary file added Configs/Default/tvos/splash.png
29 changes: 28 additions & 1 deletion HME.project.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,24 @@
<sprite>sprites\spr_mario_crown_fall</sprite>
<sprite>sprites\spr_mario_crown_float</sprite>
</sprites>
<sprites name="Gold">
<sprite>sprites\spr_mario_gold_walk</sprite>
<sprite>sprites\spr_mario_gold_jump</sprite>
<sprite>sprites\spr_mario_gold_run</sprite>
<sprite>sprites\spr_mario_gold_runjump</sprite>
<sprite>sprites\spr_mario_gold_skid</sprite>
<sprite>sprites\spr_mario_gold_climb</sprite>
<sprite>sprites\spr_mario_gold_swim</sprite>
<sprite>sprites\spr_mario_gold_hold</sprite>
<sprite>sprites\spr_mario_gold_carry</sprite>
<sprite>sprites\spr_mario_gold_duck</sprite>
<sprite>sprites\spr_mario_gold_goal</sprite>
<sprite>sprites\spr_mario_gold_warp</sprite>
<sprite>sprites\spr_mario_gold_shoot</sprite>
<sprite>sprites\spr_mario_gold_slide</sprite>
<sprite>sprites\spr_mario_gold_kick</sprite>
<sprite>sprites\spr_mario_gold_ride</sprite>
</sprites>
<sprite>sprites\spr_mario_dead</sprite>
<sprite>sprites\spr_mario_pull</sprite>
<sprite>sprites\spr_smallmask</sprite>
Expand Down Expand Up @@ -910,6 +928,7 @@
<sprite>sprites\spr_mapmario_small</sprite>
<sprite>sprites\spr_mapmario_big</sprite>
<sprite>sprites\spr_mapmario_fire</sprite>
<sprite>sprites\spr_mapmario_gold</sprite>
<sprite>sprites\spr_mapmario_hammer</sprite>
<sprite>sprites\spr_mapmario_leaf</sprite>
<sprite>sprites\spr_mapmario_tanooki</sprite>
Expand Down Expand Up @@ -1030,6 +1049,7 @@
<sprite>sprites\spr_swoopersuit</sprite>
<sprite>sprites\spr_karatesuit</sprite>
<sprite>sprites\spr_supercrown</sprite>
<sprite>sprites\spr_goldflower</sprite>
<sprite>sprites\spr_1up</sprite>
<sprite>sprites\spr_poison</sprite>
<sprite>sprites\spr_star</sprite>
Expand Down Expand Up @@ -1157,6 +1177,7 @@
</sprites>
<sprites name="Projectiles">
<sprite>sprites\spr_fireball</sprite>
<sprite>sprites\spr_goldball</sprite>
<sprite>sprites\spr_hammer2</sprite>
<sprite>sprites\spr_minibomb</sprite>
<sprite>sprites\spr_iceball</sprite>
Expand Down Expand Up @@ -1196,6 +1217,8 @@
<sprite>sprites\spr_splash</sprite>
<sprite>sprites\spr_lavasplash</sprite>
<sprite>sprites\spr_rain</sprite>
<sprite>sprites\spr_gold_ball_glow</sprite>
<sprite>sprites\spr_gold_explosion</sprite>
</sprites>
<sprite>sprites\spr_warptop</sprite>
<sprite>sprites\spr_warpsides</sprite>
Expand Down Expand Up @@ -1751,6 +1774,7 @@
<object>objects\obj_swoopersuit</object>
<object>objects\obj_karatesuit</object>
<object>objects\obj_supercrown</object>
<object>objects\obj_goldflower</object>
<object>objects\obj_star</object>
</objects>
<objects name="Rides">
Expand All @@ -1768,6 +1792,7 @@
<object>objects\obj_grasspowerup</object>
<object>objects\obj_getpowerup</object>
<object>objects\obj_fireball</object>
<object>objects\obj_goldball</object>
<object>objects\obj_hammer</object>
<object>objects\obj_minibomb</object>
<object>objects\obj_iceball</object>
Expand Down Expand Up @@ -1914,6 +1939,7 @@
</objects>
<object>objects\obj_mapcard</object>
<object>objects\obj_explosion</object>
<object>objects\obj_gold_explosion</object>
<object>objects\obj_flag</object>
<object>objects\obj_lightningsheet</object>
<object>objects\obj_messagebox</object>
Expand Down Expand Up @@ -2004,7 +2030,7 @@
<room>rooms\rm_gameover</room>
</rooms>
</rooms>
<constants number="45">
<constants number="46">
<constant name="cs_small">0</constant>
<constant name="cs_big">1</constant>
<constant name="cs_fire">2</constant>
Expand All @@ -2030,6 +2056,7 @@
<constant name="cs_swooper">22</constant>
<constant name="cs_karate">23</constant>
<constant name="cs_crown">24</constant>
<constant name="cs_gold">25</constant>
<constant name="cs_coin">-1</constant>
<constant name="cs_greenyoshi">-10</constant>
<constant name="cs_redyoshi">-11</constant>
Expand Down
25 changes: 14 additions & 11 deletions objects/obj_block_view.object.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -137,39 +137,42 @@ switch floor(image_index)
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_supercrown
break
case 24:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_goldflower
break
case 25:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch_r
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch
break
case 26:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch_y
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch_r
break
case 27:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch_b
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch_y
break
case 28:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_kuriboshoe
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_hatch_b
break
case 29:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_baburushoe
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_kuriboshoe
break
case 30:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_dossunshoe
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_baburushoe
break
case 31:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_jugemushoe
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_dossunshoe
break
case 32:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_1up
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_jugemushoe
break
case 33:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_star
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_1up
break
case 34:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_poison
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_star
break
case 35:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_poison
break
case 36:
with instance_create(x,y,obj_powerupsprout) sprite_index = spr_3upmoon
break
}
Expand Down
16 changes: 16 additions & 0 deletions objects/obj_flagpole.object.gmx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@ else if other.y &lt; y+112
else
with instance_create(x,other.y,obj_score) event_user(0)

//Revert
if global.powerup = cs_gold
{
instance_create(x,y,obj_gold_explosion);
with (instance_create(x,y,obj_gold_explosion))
{
value = 0.055;
}
with (instance_create(x,y,obj_gold_explosion))
{
value = 0.03;
}

global.powerup = cs_fire;
}

//Create goal Mario
instance_create(x+9,other.y,obj_goalmario)

Expand Down
205 changes: 205 additions & 0 deletions objects/obj_gold_explosion.object.gmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_gold_explosion</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>-31</depth>
<persistent>0</persistent>
<parentName>&lt;undefined&gt;</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>///A golden explosion!

//Play an explode sound if inside the view
if not outside_view() and not audio_is_playing(snd_bump)
audio_play_sound(snd_bump,0,0);

//Number of kills
hitpoint = 0;

value = 0.08;
image_xscale = 0;
image_yscale = 0;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="3" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>///Scale
image_xscale += value;
image_yscale = image_xscale;
image_alpha -= value;

if (image_xscale &gt; 1)
{
instance_destroy();
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="obj_blockparent">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>///Activate blocks
with other
{
if ready = 0
{
audio_play_sound(snd_bump,0,0)
ready = 1
vspeed = -2
alarm[0] = 4
event_user(0)
}
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="obj_enemyparent">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>///Hurt enemies
if other.hardness &lt; 99
{
scr_musicalscale(id,other.id,1)
with other event_user(0)
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="4" ename="obj_brick">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>///Convert to coins
with other {
instance_create(x,y,obj_coin);
instance_create(x,y,obj_smoke);
instance_destroy();
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="8" enumb="0">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>///Draw
draw_set_blend_mode(bm_add);
draw_self();
draw_set_blend_mode(bm_normal);
</string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>
<PhysicsObjectShape>0</PhysicsObjectShape>
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
<PhysicsObjectGroup>0</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints/>
</object>
Loading