Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
devapromix committed May 4, 2017
1 parent 2832b9e commit 378513e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 35 deletions.
3 changes: 2 additions & 1 deletion uCorpse.pas
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ procedure TCorpses.Render(AX, AY: Byte);
X := FCorpse[I].X - Player.X + AX + View.Left;
Y := FCorpse[I].Y - Player.Y + AY + View.Top;
if not Game.Wizard and (Player.GetDist(FCorpse[I].X, FCorpse[I].Y) >
Player.GetRadius) then Color := clFog
Player.GetRadius) then
Color := clFog
else
Color := clCorpse;
Terminal.Print(X, Y, '%', Color);
Expand Down
36 changes: 6 additions & 30 deletions uItem.pas
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ TItemBase = record
type
TItemEnum = (
// All maps
iCorpse, iGold,
iPotionOfHealth1, iPotionOfHealth2, iPotionOfHealth3,
iPotionOfMana1, iPotionOfMana2, iPotionOfMana3,
iFood, iKey,
iCorpse, iGold, iPotionOfHealth1, iPotionOfHealth2, iPotionOfHealth3,
iPotionOfMana1, iPotionOfMana2, iPotionOfMana3, iFood, iKey,
// Dark Wood
iQuiltedArmor, iLeatherArmor, // Armor
iRustySword, iShortSword, // Blade
Expand Down Expand Up @@ -549,30 +547,6 @@ destructor TItems.Destroy;
inherited;
end;

// Broadsword, Hilted Sword, Longsword, Bastard Sword
// Combat Sword, War Sword, Claymore, Ebony Sword
// Rusty Iron Wood-Chopping Axe, Battle Axe,

// Phantom Axe, Dwarven Battle Axe, War Axe
// Feathered Spear, Bronze Spear, Rusted Spear
// Small Dagger, a Rusty Dagger, Flying Dagger
// Sharpened Daggers, Gemmed Dagger, Carving Knife
// Boot Knife, Target Knife, Throwing Spike
// Rapier, Sabre,

// Rusty, Chipped
// Low Quality, Medium Quality, High Quality
// Fine, Double Bladed, Enchanted
// Bronze, Iron, Steel

// Short Bow, Battle Bow, Long Bow, Elven Long Bow
// Hunter's Bow, Ranger's Bow, Elvish Longbow, Compound Bow

// Tunic, Chainmail, Platemail
// Padded clothing, Chitin armor, Bone armor, Light armor,
// Medium armor, Mail hauberk, Brigandine,
// Heavy armor, Plate armor,

function TItems.GetName(AItemEnum: TItemEnum): string;
begin
case AItemEnum of
Expand Down Expand Up @@ -814,13 +788,15 @@ procedure TItems.AddItemToInv(Index: Integer);
Player.SetAmountScene(False, Index, FItem.Amount);
Exit;
end;
if (Items_Dungeon_DeleteItemXY(MapID, Index, Player.X, Player.Y, FItem) > 0) then
if (Items_Dungeon_DeleteItemXY(MapID, Index, Player.X, Player.Y, FItem) > 0)
then
begin
Items_Inventory_AppendItem(FItem);
The := GetDescThe(Items.GetName(TItemEnum(FItem.ItemID)));
if (FItem.Amount = 1) then
MsgLog.Add(Format(_('You picked up %s.'), [The]))
else MsgLog.Add(Format(_('You picked up %s (%dx).'), [The, FItem.Amount]));
else
MsgLog.Add(Format(_('You picked up %s (%dx).'), [The, FItem.Amount]));
Player.Calc;
end;
end;
Expand Down
8 changes: 4 additions & 4 deletions uMob.pas
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ TMob = class(TEntity)
Maps: TMapEnum;
Sleep: Boolean;
Boss: Boolean;
public
public
procedure AddRandom(AZ: TMapEnum);
procedure Process;
procedure Render(AX, AY: Byte);
Expand Down Expand Up @@ -325,11 +325,11 @@ procedure TMob.AddRandom(AZ: TMapEnum);
Ord(AZ)]));
Self.Boss := True;
IsBoss := True;
{ if Game.Wizard then
begin
{ if Game.Wizard then
begin
Player.X := EnsureRange(X - 1, 0, High(Byte));
Player.Y := EnsureRange(Y - 1, 0, High(Byte));
end; }
end; }
end;
end;

Expand Down

0 comments on commit 378513e

Please sign in to comment.