Skip to content

Commit 238cfbc

Browse files
committed
Experiment with minigame stage and begin modularity
The battle scene is currently not ready for having multiple different enemies and attacks. Created basic arrays and combined variables to allow for the stage to be expanded upon.
1 parent 2396d48 commit 238cfbc

31 files changed

Lines changed: 490 additions & 62 deletions

Dog/Dog.yyp

Lines changed: 75 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dog/objects/BattleManager/Step_0.gml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,21 @@
22
// You can write your code in this editor
33
count ++;
44

5-
if (enemy = oCrab)
5+
if (enemyspawn = noone)
66
{
7-
if (enemyspawn = noone)
8-
{
9-
enemyspawn = instance_create_layer(640,390,"Instances",oCrabBattle)
10-
enemyname = "A Crab"
11-
}
12-
13-
14-
7+
enemyspawn = instance_create_layer(640,390,"Instances",oCrabBattle)
8+
enemyname = "A Crab"
159
}
1610

1711

12+
1813
//After 1/2 second, render text
1914
if (count = 30)
2015
{
2116
var textbuffer = string(enemyname) + " has attacked!"
22-
EnemyTextIntro = array_length_2d(enemy.TextIntro,choose(array_height_2d(enemy.TextIntro)-1));
17+
var EnemyTextIntro = enemyspawn.TextIntro[random_range(0,array_length_1d(enemyspawn.TextIntro))];
2318
//text = [textbuffer, "THIS IS A TEST", "THIS IS COOL!"]
24-
//create_battlebox(text);
19+
//create_battlebox(text);
2520
var BattleText = instance_create_layer(x,y,"text",oBattleBox);
26-
BattleText.text = [textbuffer,EnemyText];
21+
BattleText.text = [textbuffer,EnemyTextIntro];
2722
}

Dog/objects/alertsign/Create_0.gml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/// @description Insert description here
22
// You can write your code in this editor
3-
myuser = noone;
3+
myuser = noone;
4+
timer[0] = 0.25*60; // 1/4 of a second till death

Dog/objects/alertsign/Other_7.gml

Lines changed: 0 additions & 6 deletions
This file was deleted.

Dog/objects/alertsign/Step_0.gml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,13 @@
33
x = myuser.x;
44
y = myuser.y - 100;
55

6+
if(timer[0] > 0)
7+
{
8+
timer[0] -= 1;
9+
}
10+
else
11+
{
12+
myuser.state = estates.aggro;
13+
myuser.myalertsign = noone;
14+
instance_destroy();
15+
}

Dog/objects/alertsign/alertsign.yy

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dog/objects/oBattleBox/Draw_64.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
//box
44
draw_sprite(box,0,0,0);
55

6-
7-
6+
var text_wrapped = string_wrap(text[page],text_max_width);
7+
var str_len = string_length(text_wrapped);
88
if (counter<str_len)
99
{
1010
counter++;

Dog/objects/oBattleBox/Step_0.gml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ if (keyboard_check_pressed(interact_key))
55

66
if (page < array_length_1d(text)-1)
77
{
8-
page ++;event_perform(ev_other,ev_user1);
8+
page ++;//event_perform(ev_other,ev_user1);
9+
counter = 0;
910

1011
}else
1112
{
12-
1313
instance_destroy();
14+
instance_create_layer(0,0,"GameManager",oMiniGame);
1415
}
1516

1617

Dog/objects/oCrab/Step_0.gml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,5 @@ hp = 10;
1919
if (place_meeting(x,y,oDogPaddler))
2020
{
2121
oDogPaddler.attacker = oCrab;
22-
23-
2422
}
2523

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
spd = random_range(2,5);

0 commit comments

Comments
 (0)