jslightham/Zork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bugs

Browse Source
This commit is contained in:
jslightham
2019-06-01 00:49:31 -04:00
parent c8642adc5c
commit 33586d7f35
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/enemies.dat
View File

@@ -8,3 +8,8 @@ Description: The wife to the owner of the Castle
Starting Room: Lady Pellatt's Bedroom Starting Room: Lady Pellatt's Bedroom
Damage Given: 25 Damage Given: 25
Loot: Crowbar Loot: Crowbar
Enemy Name: DesLauriers The Dog
Description: The cookie monster
Starting Room: Kitchen
Damage Given: 40
Loot: Base

4
data/rooms.dat
View File

@@ -164,7 +164,7 @@ Locked: false
Boarded: false Boarded: false
Items: Items:
Riddler: Riddler:
Exit Rooms: S-Aspen Bedroom, E-Willow Bedroom Exit Rooms: S-Aspen Bedroom, E-Willow Bedroom, N-Guest Bedroom
Room name: Guest Bedroom Room name: Guest Bedroom
Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. There is another tailored<br>man in the corner. He seems to have something he would like to tell you. Room Description: Welcome to the guest bedroom, where guests like yourself stay for the night. There is another tailored<br>man in the corner. He seems to have something he would like to tell you.
@@ -227,7 +227,7 @@ Room Description: You are now in the Conservatory. The walls and ceilings are al
Locked: false Locked: false
Boarded: false Boarded: false
Items: Items:
Riddler: "Hey<comma> I'm Karen. Kevin is on his break but he told me to give you this riddle", "Marking mortal privation<comma> when firmly in place. An enduring summation<comma> inscribed in my face. What am I?", "A tombstone", Point Riddler: "Hey<comma> I'm Karen. Kevin is on his break but he told me to give you this riddle", "Marking mortal privation<comma> when firmly in place. An enduring summation<comma> inscribed in my face. What am I?", "tombstone", Cylinder
Exit Rooms: E-Dining Room Exit Rooms: E-Dining Room
Room name: Library Room name: Library

2
data/synonyms.dat
View File

@@ -59,3 +59,5 @@ water, waterbottle
bottle, waterbottle bottle, waterbottle
bread, warmbread bread, warmbread
ram, batteringram ram, batteringram
deslauriers, deslauriersthedog
dog, deslauriersthedog

1
data/words.dat
View File

@@ -74,3 +74,4 @@ batteringram, item
ladypellatt, enemy ladypellatt, enemy
use, verb use, verb
bandage, item bandage, item
deslauriersthedog, enemy

2
src/com/bayviewglen/zork/Combat.java
View File

@@ -40,7 +40,7 @@ public class Combat {
enemy.setHealth(enemy.getHealth()-object.getDamage()*1.5); enemy.setHealth(enemy.getHealth()-object.getDamage()*1.5);
if(enemy.getHealth() < 0) if(enemy.getHealth() < 0)
enemy.setHealth(0); enemy.setHealth(0);
System.out.println("You hit " + enemy.getName() + " with a critical hit, doing " + object.getDamage()*1.5 + " damage! His health is now " + enemy.getHealth() + "%"); System.out.println("You hit " + enemy.getName() + " with a critical hit, doing " + object.getDamage()*1.5 + " damage! " + enemy.getName() + "'s health is now " + enemy.getHealth() + "%");
} }
else { else {
enemy.setHealth(enemy.getHealth()-object.getDamage()); enemy.setHealth(enemy.getHealth()-object.getDamage());

2
src/com/bayviewglen/zork/Game.java
View File

@@ -462,7 +462,7 @@ class Game {
System.out.println("I've got to go find Mr. Pellatt now. Good luck with your escape!"); System.out.println("I've got to go find Mr. Pellatt now. Good luck with your escape!");
currentRoom.removeRiddler(); currentRoom.removeRiddler();
} else { } else {
System.out.println("Sorry, you can't carry any more, but a " + prize + " has been added to your room."); System.out.println("Sorry, you can't carry any more, but a " + prize.getName() + " has been added to your room.");
currentRoom.addItem(prize); currentRoom.addItem(prize);
} }
} else { } else {