stevenhowes/TheEscape
1
0
Fork 0
mirror of https://github.com/stevenhowes/TheEscape.git synced 2026-05-26 15:53:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

More consistent variable names and orders

Browse Source
This commit is contained in:
stevenhowes
2021-02-02 21:01:46 +00:00
parent f966f66035
commit 2a5d3ce06c
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
!TheEscape/!RunImage,ffb
BIN
View File
Binary file not shown.
!TheEscape/!RunImage,ffb.bas
+38 -36
View File
@@ -8,6 +8,9 @@ IF INKEY(-42) THEN
SCREENGFXHEIGHT%=960 SCREENGFXHEIGHT%=960
ENDIF ENDIF
X = 0
Y = 1
PROC_main PROC_main
END END
@@ -16,8 +19,8 @@ DEF PROC_main
Scr% = 1 Scr% = 1
DIM PlayerLocation%(1) DIM PlayerLocation%(1)
PlayerLocation%(0) = SCREENGFXWIDTH%/2 PlayerLocation%(X) = SCREENGFXWIDTH%/2
PlayerLocation%(1) = SCREENGFXHEIGHT%/6 PlayerLocation%(Y) = SCREENGFXHEIGHT%/6
PlayerVelocity%=0 PlayerVelocity%=0
PlayerShields%=100 PlayerShields%=100
PlayerStructuralIntegrity%=100 PlayerStructuralIntegrity%=100
@@ -35,26 +38,25 @@ DEF PROC_main
DIM EnemyLocations%(MaxEnemies% - 1,1) DIM EnemyLocations%(MaxEnemies% - 1,1)
DIM EnemySprites$(MaxEnemies% - 1) DIM EnemySprites$(MaxEnemies% - 1)
DIM EnemyHitboxID%(MaxEnemies% - 1) DIM EnemyHitboxID%(MaxEnemies% - 1)
DIM EnemyVelocityX%(MaxEnemies% - 1) DIM EnemyVelocity%(MaxEnemies% - 1,1)
DIM EnemyVelocityY%(MaxEnemies% - 1)
REM Random it up for now REM Random it up for now
FOR Enemy%=0 TO MaxEnemies% - 1 FOR Enemy%=0 TO MaxEnemies% - 1
EnemyLocations%(Enemy%,0) = RND(SCREENGFXWIDTH%) EnemyLocations%(Enemy%,X) = RND(SCREENGFXWIDTH%)
EnemyLocations%(Enemy%,1) = SCREENGFXHEIGHT% + (RND(SCREENGFXHEIGHT%/2) * (Enemy% + 1)) EnemyLocations%(Enemy%,Y) = SCREENGFXHEIGHT% + (RND(SCREENGFXHEIGHT%/2) * (Enemy% + 1))
EnemySprites$(Enemy%) = "durno_ship" EnemySprites$(Enemy%) = "durno_ship"
EnemyVelocityX%(Enemy%) = RND(10) - 5 EnemyVelocity%(Enemy%,X) = RND(10) - 5
EnemyVelocityY%(Enemy%) = RND(5) + 5 EnemyVelocity%(Enemy%,Y) = RND(5) + 5
NEXT Enemy% NEXT Enemy%
REM Show/hide debug display REM Show/hide debug display
DebugOut%=0 DebugOut%=0
DIM SpecLocations%(1,49) DIM SpeckLocations%(49,1)
FOR Spec%=0 TO 49 FOR Speck%=0 TO 49
SpecLocations%(0,Spec%) = RND(SCREENGFXWIDTH%) SpeckLocations%(Speck%,X) = RND(SCREENGFXWIDTH%)
SpecLocations%(1,Spec%) = RND(SCREENGFXHEIGHT%) SpeckLocations%(Speck%,Y) = RND(SCREENGFXHEIGHT%)
NEXT Spec% NEXT Speck%
REM Used for centiseconds per frame calcs REM Used for centiseconds per frame calcs
Cents% = TIME Cents% = TIME
@@ -91,7 +93,7 @@ DEF PROC_main
CLS CLS
REM Environment REM Environment
PROCspacedust_draw PROCspecks_draw
REM Player REM Player
PROCplayer_ship_draw PROCplayer_ship_draw
@@ -109,30 +111,30 @@ DEF PROC_main
ENDPROC ENDPROC
DEF PROCspacedust_draw DEF PROCspecks_draw
REM Space dust / stars REM Specks / stars
FOR Spec%=0 TO 49 FOR Speck%=0 TO 49
GCOL 0,0 GCOL 0,0
LINE SpecLocations%(0,Spec%),SpecLocations%(1,Spec%),SpecLocations%(0,Spec%),(PlayerVelocity% / 3) + SpecLocations%(1,Spec%) LINE SpeckLocations%(Speck%,X),SpeckLocations%(Speck%,Y),SpeckLocations%(Speck%,X),(PlayerVelocity% / 3) + SpeckLocations%(Speck%,Y)
SpecLocations%(1,Spec%) = SpecLocations%(1,Spec%) - ((Cents% - LastCents%) * PlayerVelocity%/10) SpeckLocations%(Speck%,Y) = SpeckLocations%(Speck%,Y) - ((Cents% - LastCents%) * PlayerVelocity%/10)
IF SpecLocations%(1,Spec%) < 0 THEN IF SpeckLocations%(Speck%,Y) < 0 THEN
SpecLocations%(1,Spec%) = SCREENGFXHEIGHT% SpeckLocations%(Speck%,Y) = SCREENGFXHEIGHT%
SpecLocations%(0,Spec%) = RND(SCREENGFXWIDTH%) SpeckLocations%(Speck%,X) = RND(SCREENGFXWIDTH%)
ENDIF ENDIF
NEXT Spec% NEXT Speck%
ENDPROC ENDPROC
REM Move enemy ship (display and physical) REM Move enemy ship (display and physical)
DEF PROCenemy_ship_move DEF PROCenemy_ship_move
REM TODO: Only uses player velocity currently (/2 so they don't match stars) REM TODO: Only uses player velocity currently (/2 so they don't match stars)
FOR Enemy%=0 TO MaxEnemies% - 1 FOR Enemy%=0 TO MaxEnemies% - 1
EnemyLocations%(Enemy%,1) = EnemyLocations%(Enemy%,1) - ((Cents% - LastCents%) * PlayerVelocity%/20) - ((Cents% - LastCents%) * EnemyVelocityY%(Enemy%)) EnemyLocations%(Enemy%,Y) = EnemyLocations%(Enemy%,Y) - ((Cents% - LastCents%) * PlayerVelocity%/20) - ((Cents% - LastCents%) * EnemyVelocity%(Enemy%,Y))
EnemyLocations%(Enemy%,0) = EnemyLocations%(Enemy%,0) - ((Cents% - LastCents%) * EnemyVelocityX%(Enemy%)) EnemyLocations%(Enemy%,X) = EnemyLocations%(Enemy%,X) - ((Cents% - LastCents%) * EnemyVelocity%(Enemy%,X))
IF EnemyLocations%(Enemy%,1) <= 0 THEN IF EnemyLocations%(Enemy%,Y) <= 0 THEN
EnemyLocations%(Enemy%,1) = SCREENGFXHEIGHT% + RND(SCREENGFXHEIGHT%) EnemyLocations%(Enemy%,Y) = SCREENGFXHEIGHT% + RND(SCREENGFXHEIGHT%)
EnemyLocations%(Enemy%,0) = RND(SCREENGFXWIDTH%) EnemyLocations%(Enemy%,X) = RND(SCREENGFXWIDTH%)
ENDIF ENDIF
NEXT Enemy% NEXT Enemy%
ENDPROC ENDPROC
@@ -166,16 +168,16 @@ DEF PROCenemy_ship_collide_npc
CollidesWith% = Enemy% CollidesWith% = Enemy%
REM This is our hitbox REM This is our hitbox
x1 = EnemyLocations%(Enemy%,0) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0) x1 = EnemyLocations%(Enemy%,X) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0)
y1 = EnemyLocations%(Enemy%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1) y1 = EnemyLocations%(Enemy%,Y) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2) w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3) h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
FOR OtherEnemy%=0 TO MaxEnemies% - 1 FOR OtherEnemy%=0 TO MaxEnemies% - 1
REM Collision with an enemy REM Collision with an enemy
IF Enemy% > OtherEnemy% THEN IF Enemy% > OtherEnemy% THEN
x2 = EnemyLocations%(OtherEnemy%,0) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),0) x2 = EnemyLocations%(OtherEnemy%,X) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),0)
y2 = EnemyLocations%(OtherEnemy%,1) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),1) y2 = EnemyLocations%(OtherEnemy%,Y) + EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),1)
w2 = EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),2) w2 = EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),2)
h2 = EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),3) h2 = EnemyHitbox%(EnemyHitboxID%(OtherEnemy%),3)
IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN
@@ -193,14 +195,14 @@ DEF PROCenemy_ship_collide_player
FOR Enemy%=0 TO MaxEnemies% - 1 FOR Enemy%=0 TO MaxEnemies% - 1
REM This is our hitbox REM This is our hitbox
x1 = EnemyLocations%(Enemy%,0) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0) x1 = EnemyLocations%(Enemy%,X) + EnemyHitbox%(EnemyHitboxID%(Enemy%),0)
y1 = EnemyLocations%(Enemy%,1) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1) y1 = EnemyLocations%(Enemy%,Y) + EnemyHitbox%(EnemyHitboxID%(Enemy%),1)
w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2) w1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),2)
h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3) h1 = EnemyHitbox%(EnemyHitboxID%(Enemy%),3)
REM Collision with a player REM Collision with a player
x2 = PlayerLocation%(0) + PlayerHitbox%(0) x2 = PlayerLocation%(X) + PlayerHitbox%(0)
y2 = PlayerLocation%(1) + PlayerHitbox%(1) y2 = PlayerLocation%(Y) + PlayerHitbox%(1)
w2 = PlayerHitbox%(2) w2 = PlayerHitbox%(2)
h2 = PlayerHitbox%(3) h2 = PlayerHitbox%(3)
IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN IF FNcollide(x1, y1, w1, h1, x2, y2, w2, h2) = 1 THEN