diff --git a/Atari/display_main_menu.asm b/Atari/display_main_menu.asm index bcf9568..4036c57 100644 --- a/Atari/display_main_menu.asm +++ b/Atari/display_main_menu.asm @@ -13,7 +13,7 @@ OptionsHere dta d"Rounds : 10 20 30 40 50 " dta d"Missiles : slug slow norm fast hare " dta d"Seppuku : nevr rare norm oftn alws " - dta d"Mountains: NL BE CZ CH NP " + dta d"Mountain : NL BE CZ CH NP " dta d"Walls : none wrap bump boxy rand " ;; 01234567890123456789012345678901 ; dta d"Players: 2 3 4 5 6 " diff --git a/Atari/display_static.asm b/Atari/display_static.asm index 84b12ee..42ad5e0 100644 --- a/Atari/display_static.asm +++ b/Atari/display_static.asm @@ -69,7 +69,9 @@ MoreDown dta 93,93,93 dta d" more " dta 93,93,93 - dta d" " +; dta d" " ; common part of text and empty line :) +EmptyLine + dta d" " WeaponsDescription ; 0123456789012345678901234567890123456789 .IF TARGET = 800 @@ -105,8 +107,6 @@ ActivateDescription dta d"FIRE"* dta d": Finish " .ENDIF -EmptyLine - dta d" " ;--------------------------------------------------- OptionsTitle .IF TARGET = 800 @@ -115,13 +115,13 @@ OptionsTitle dta d" scorch supersystem "* .ENDIF DifficultyTitle - dta d" difficulty "* + dta d" difficulty"* ; " " 3 bytes - common part of 2 texts +GameOverTitle + dta d" game over "* PurchaseTitle dta d"purchase weapons" InventoryTitle dta d"activate weapons"* -GameOverTitle - dta d" game over "* GameOverTitle2 dta d" Player Points Hits Earned Money " ;----------------------------------------------------- diff --git a/Atari/textproc.asm b/Atari/textproc.asm index 4f5231c..05dce06 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -68,7 +68,8 @@ mva #0 OptionsY OptionsMainLoop - + lda RandomMountains + sta OptionsHere+288 lda WindChangeInRound sta OptionsHere+128 lda FastSoilDown @@ -146,6 +147,13 @@ NotWind sta FastSoilDown rts NotGravity + cmp #$07 + bne NoMountains + lda RandomMountains + eor #$1f ; '?' character + sta RandomMountains + rts +NoMountains ldy GradientNr iny cpy #$03 diff --git a/Manuals/MANUAL_EN.md b/Manuals/MANUAL_EN.md index c2662d5..fb4cea5 100644 --- a/Manuals/MANUAL_EN.md +++ b/Manuals/MANUAL_EN.md @@ -33,6 +33,7 @@ Select options with cursor keys or a joystick. The [TAB], [SELECT] or second joystick button (supported Joy 2B+ standard or compatible), and on the Atari 5200 console, the [5] controller key change the color of the mountains (3 versions to choose from). If the cursor indicates the wind strength selection option "Wind" change the way the wind strength is drawn from "every round" to "every turn" and vice versa. Drawing every turn is indicated by the "?" sign next to the word "Wind". If the cursor indicates the gravity selection option "Gravity" changes the procedure of falling the ground to a less impressive but faster one, and vice versa. The selection of fast ground fall is indicated by the letter "f" next to the word "Gravity". +If the cursor points to the option of selecting the height of the mountains "Mountain" toggles the option of changing the height of the mountains every round. Drawing every round is indicated by the "?" sign next to the word "Mountain". The [RETURN] key or a joystick button moves to the next screen. diff --git a/Manuals/MANUAL_EN_cart.md b/Manuals/MANUAL_EN_cart.md index efa3556..3c3a896 100644 --- a/Manuals/MANUAL_EN_cart.md +++ b/Manuals/MANUAL_EN_cart.md @@ -37,6 +37,7 @@ Select options with cursor keys or a controller. The [TAB], [SELECT] or second controller button (supported Joy 2B+ standard or compatible) key change the color of the mountains (3 versions to choose from). If the cursor indicates the wind strength selection option "Wind" change the way the wind strength is drawn from "every round" to "every turn" and vice versa. Drawing every turn is indicated by the "?" sign next to the word "Wind". If the cursor indicates the gravity selection option "Gravity" changes the procedure of falling the ground to a less impressive but faster one, and vice versa. The selection of fast ground fall is indicated by the letter "f" next to the word "Gravity". +If the cursor points to the option of selecting the height of the mountains "Mountain" toggles the option of changing the height of the mountains every round. Drawing every round is indicated by the "?" sign next to the word "Mountain". The [RETURN] key or a controller button moves to the next screen. diff --git a/Manuals/MANUAL_PL.md b/Manuals/MANUAL_PL.md index fb69079..2ffc473 100644 --- a/Manuals/MANUAL_PL.md +++ b/Manuals/MANUAL_PL.md @@ -45,6 +45,8 @@ Jeśli kursor wskazuje opcję wyboru siły wiatru "Wind" zmienia sposób losowan Jeśli kursor wskazuje opcję wyboru siły ciążenia "Gravity" zmienia procedurę opadania ziemi na mniej efektowną, ale szybszą i odwrotnie. Wybranie szybkiego opadania ziemi sygnalizowane jest literą "f" przy słowie "Gravity". +Jeśli kursor wskazuje opcję wyboru wysokości gór "Mountain" przełącza opcję zmiennej co rundę wysokości gór. Losowanie co rundę jest sygnalizowane znakiem "?" przy słowie "Mountain". + Klawisz [RETURN] lub przycisk joysticka przechodzi do następnego ekranu. diff --git a/artwork/talk.asm b/artwork/talk.asm index 4ebf484..0c07932 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -6,7 +6,7 @@ dta d"YOU'RE TOAST!"^ dta d"BANZAI!"^ dta d"FROM HELL'S HEART I STAB AT THEE..."^ - dta d"I DIDN'T DO IT. NOBODY SAW ME DO IT."^ + dta d"I DIDN'T DO IT. I'M NOT HERE."^ dta d"TAKE A HIKE!"^ dta d"YOU'RE DEAD MEAT."^ dta d"MAKE MY DAY."^ @@ -65,7 +65,7 @@ dta d"EEEK!"^ dta d"AACCH!"^ dta d"I HATE IT WHEN THAT HAPPENS."^ - dta d"ONE DIRECT HIT CAN RUIN YOUR WHOLE DAY."^ + dta d"ONE HIT CAN RUIN YOUR WHOLE DAY."^ dta d"OH NO!"^ dta d"NOT ME!"^ dta d"OUCH."^ diff --git a/game.asm b/game.asm index 0bd3eba..cbd880e 100644 --- a/game.asm +++ b/game.asm @@ -228,6 +228,15 @@ SettingEnergies dex bpl SettingEnergies +; set mountain type if ... + lda RandomMountains + beq noRandomMountains +@ ldy RANDOM + cpy #5 + bcs @- + jsr SetVariablesFromOptions.setMountainsType +noRandomMountains + ;generating the new landscape jsr PMoutofScreen ;let P/M disappear jsr clearscreen ;let the screen be clean @@ -1216,6 +1225,7 @@ SetRandomWalls ;8th option (how aggressive are mountains) ldy OptionsTable+7 +setMountainsType lda mountainsDeltaTableH,y sta mountainDeltaH lda mountainsDeltaTableL,y diff --git a/scorch.asm b/scorch.asm index cd259c2..f45e472 100644 --- a/scorch.asm +++ b/scorch.asm @@ -26,7 +26,7 @@ ;--------------------------------------------------- .macro build - dta d"1.32" ; number of this build (4 bytes) + dta d"1.33" ; number of this build (4 bytes) .endm .macro RMTSong @@ -38,13 +38,14 @@ icl 'definitions.asm' ;--------------------------------------------------- -FirstZpageVariable = $54 +FirstZpageVariable = $53 .zpvar DliColorBack .byte = FirstZpageVariable .zpvar ClearSky .byte ; $ff - Crear sky during drawmountains, 0 - no clear sky .zpvar PaddleState .byte ; old state 2nd button for 2 buttons joysticks .zpvar GradientNr .byte .zpvar GradientColors .word .zpvar WindChangeInRound .byte ; wind change after each turn (not round only) flag - (0 - round only, >0 - each turn) + .zpvar RandomMountains .byte ; mountains type change after each turn flag - (0 - round only, >0 - each turn) .zpvar FastSoilDown .byte ; 0 - standard, >0 - fast .zpvar JoystickNumber .byte .zpvar LazyFlag .byte ; 7 bit - run Lazy Darwin, 6 bit - run Lazy Boy or Darwin (!) after inventory, 0 - nothing diff --git a/scorch.bin b/scorch.bin index 720cc2b..29721b0 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 6491f7b..ad0b867 100644 Binary files a/scorch.xex and b/scorch.xex differ