Browse files

2.4

Stabmasks destroy selves upon contact with a generator
Autoguns visibly catch fire when low on health (cosmetic only)
Increased generator shield recharge rate
Drastically increased generator health
Added Generator overtime
*IF losing/tied team is attacking a generator actively, overtime
Added 2 new menu music pieces
  • Loading branch information...
1 parent 1030068 commit 762c746dee4f3c8c1459691559edd9d78103f657 @ASBenz ASBenz committed Oct 6, 2011
View
BIN Music/menumusic5.wav
Binary file not shown.
View
BIN Music/menumusic6.wav
Binary file not shown.
View
4 Source/gg2/Objects/InGameElements/Sentry.events/Draw.xml
@@ -18,6 +18,7 @@ if team == TEAM_RED sprite_index=SentryRed;
xr = round(x);
yr = round(y);
if global.myself.team == team draw_healthbar(xr-10, yr-30, xr+10, yr-25,hp*100/maxHp,c_black,c_red,c_green,0,true,true);
+if (built && hp < .75 * maxHp) draw_sprite_part_ext(FlameS, random(3), 0, 0, 21, 9, xr, yr, 2, 2, c_white, 1 - (hp / maxHp));
draw_sprite_ext(sprite_index,image_index,xr,yr,image_xscale,image_yscale,image_angle,c_white,1);
if(distance_to_point(mouse_x, mouse_y)<25 && global.myself.team == team) {
@@ -31,7 +32,8 @@ if(distance_to_point(mouse_x, mouse_y)<25 && global.myself.team == te
}
draw_text(xr, yr-45, ownerPlayer.name + "'s");
draw_text(xr, yr-35, "Autogun");
-} </argument>
+}
+</argument>
</arguments>
</action>
</actions>
View
4 Source/gg2/Objects/Map elements/Generator/Generator.events/Create.xml
@@ -13,9 +13,9 @@
<not>false</not>
<appliesTo>.self</appliesTo>
<arguments>
- <argument kind="STRING">maxHp = 1400;
+ <argument kind="STRING">maxHp = 2100;
hp = maxHp;
-maxShieldHp = 200;
+maxShieldHp = 300;
shieldHp = maxShieldHp;
maxShieldResistance = 0.75;
minShieldResistance = 0.25;
View
2 Source/gg2/Objects/Map elements/Generator/Generator.events/Step.xml
@@ -14,7 +14,7 @@
<appliesTo>.self</appliesTo>
<arguments>
<argument kind="STRING">if (isShieldRegenerating) {
- shieldHp = min(shieldHp+(2*isShieldRegenerating)/3, maxShieldHp);
+ shieldHp = min(shieldHp+isShieldRegenerating, maxShieldHp);
if (shieldHp == maxShieldHp)
isShieldRegenerating = false;
}
View
1 Source/gg2/Objects/Overlays/GeneratorHUD.events/Create.xml
@@ -16,6 +16,7 @@
<argument kind="STRING">timeLimit=global.timeLimitMins*30*60;
timer=timeLimit;
teamoffset=0;
+overtime=0;
xshift=-320*global.timerPos
yshift=5*global.timerPos
</argument>
View
28 Source/gg2/Objects/Overlays/GeneratorHUD.events/Draw.xml
@@ -44,18 +44,24 @@ if instance_exists(WinBanner) exit;
draw_set_color(c_white);
draw_set_valign(fa_center);
-draw_set_halign(fa_right);
-draw_set_halign(fa_right);
-draw_sprite_ext(TimerHudS,teamoffset,xoffset+xsize/2 +xshift,yoffset+30+ yshift,3,3,0,c_white,1);
-draw_sprite_ext(TimerS,floor(timer/timeLimit*12),xoffset+xsize/2+39 +xshift,yoffset+30+ yshift,3,3,0,c_white,1);
-minutes=floor(timer/1800);
-secondcounter=timer-minutes*1800;
-seconds=floor(secondcounter/30);
-draw_text_transformed((xoffset+xsize/2-1)-10+xshift,yoffset+32+ yshift,string(minutes),1.5,1.5,0);
-draw_text_transformed((xoffset+xsize/2)+xshift,yoffset+32+ yshift,":",1.5,1.5,0);
-if seconds &gt;= 10 draw_text_transformed((xoffset+xsize/2+20)+xshift,yoffset+32+ yshift,string(seconds),1.5,1.5,0);
-else if seconds &lt; 10 draw_text_transformed((xoffset+xsize/2+20)+xshift,yoffset+32+ yshift,"0"+string(seconds),1.5,1.5,0);
+if overtime == 1 {
+ draw_set_halign(fa_center);
+ draw_sprite_ext(TimerHudS,2+teamoffset,xoffset+xsize/2 +xshift,yoffset+30+ yshift,3,3,0 ,c_white,1);
+ draw_text((xoffset+xsize/2)+xshift,yoffset+30+ yshift,"OVERTIME");
+}
+else{
+ draw_set_halign(fa_right);
+ draw_sprite_ext(TimerHudS,teamoffset,xoffset+xsize/2 +xshift,yoffset+30+ yshift,3,3,0,c_white,1);
+ draw_sprite_ext(TimerS,floor(timer/timeLimit*12),xoffset+xsize/2+39 +xshift,yoffset+30+ yshift,3,3,0,c_white,1);
+ minutes=floor(timer/1800);
+ secondcounter=timer-minutes*1800;
+ seconds=floor(secondcounter/30);
+ draw_text_transformed((xoffset+xsize/2-1)-10+xshift,yoffset+32+ yshift,string(minutes),1.5,1.5,0);
+ draw_text_transformed((xoffset+xsize/2)+xshift,yoffset+32+ yshift,":",1.5,1.5,0);
+ if seconds &gt;= 10 draw_text_transformed((xoffset+xsize/2+20)+xshift,yoffset+32+ yshift,string(seconds),1.5,1.5,0);
+ else if seconds &lt; 10 draw_text_transformed((xoffset+xsize/2+20)+xshift,yoffset+32+ yshift,"0"+string(seconds),1.5,1.5,0);
+}
</argument>
</arguments>
</action>
View
3 Source/gg2/Objects/Overlays/GeneratorHUD.events/Step.xml
@@ -32,6 +32,9 @@
else blueStage = 1;
}
}
+ if (redStage &gt; blueStage &amp;&amp; GeneratorRed.alarm[0] &gt; -1) { overtime = true; exit; }
+ if (redStage &lt; blueStage &amp;&amp; GeneratorBlue.alarm[0] &gt; -1) { overtime = true; exit; }
+ if (redStage == blueStage &amp;&amp; (GeneratorRed.alarm[0] &gt; -1 || GeneratorBlue.alarm[0] &gt; -1)) { overtime = true; exit; }
if (redStage &gt; blueStage) global.winners = TEAM_RED;
if (redStage &lt; blueStage) global.winners = TEAM_BLUE;
if (redStage == blueStage) global.winners = TEAM_SPECTATOR;
View
1 Source/gg2/Objects/Projectiles/StabMask.events/Collision with Generator.xml
@@ -24,6 +24,7 @@
other.hp -= hitDamage/2 * other.shieldResistance;
other.shieldHp -= hitDamage/2;
}
+ instance_destroy();
}
</argument>
</arguments>
View
2 Source/gg2/Scripts/game_init.gml
@@ -6,7 +6,7 @@
var customMapRotationFile;
//import wav files for music
- global.MenuMusic=sound_add(choose("Music/menumusic1.wav","Music/menumusic2.wav","Music/menumusic3.wav","Music/menumusic4.wav"), 1, true);
+ global.MenuMusic=sound_add(choose("Music/menumusic1.wav","Music/menumusic2.wav","Music/menumusic3.wav","Music/menumusic4.wav","Music/menumusic5.wav","Music/menumusic6.wav"), 1, true);
global.IngameMusic=sound_add("Music/ingamemusic.wav", 1, true);
global.FaucetMusic=sound_add("Music/faucetmusic.wav", 1, true);
if(global.MenuMusic != -1)

0 comments on commit 762c746

Please sign in to comment.