diff --git a/config.ini b/config.ini index 23e03fb3..d0cccb3b 100644 --- a/config.ini +++ b/config.ini @@ -23,6 +23,7 @@ life=200,0,0 food=150,100,0 poison=100,250,100 unidentified=255,80,80 +rare=90,170,90 [Colors] default=Yellow diff --git a/uMob.pas b/uMob.pas index 35d61722..4e087a49 100644 --- a/uMob.pas +++ b/uMob.pas @@ -485,8 +485,8 @@ procedure TMob.AddNPC(AX, AY: Byte; AZ: TMapEnum; ANPCID: Byte); function ChMapTile(AMobID, AX, AY: Byte; AZ: TMapEnum): Boolean; begin - Result := (Map.GetTileEnum(AX, AY, AZ) in SpawnTiles) and (Player.X <> AX) and - (Player.Y <> AY) and Mobs.GetFreeTile(AX, AY) and + Result := (Map.GetTileEnum(AX, AY, AZ) in SpawnTiles) + and (Player.X <> AX) and (Player.Y <> AY) and Mobs.GetFreeTile(AX, AY) and (AZ in MobBase[TMobEnum(AMobID)].Maps); end; diff --git a/uPlayer.pas b/uPlayer.pas index d5d7427f..c5fe2b48 100644 --- a/uPlayer.pas +++ b/uPlayer.pas @@ -1140,7 +1140,6 @@ procedure TPlayer.SetAmountScene(IsDrop: Boolean; Index, Amount: Integer); procedure TPlayer.Spawn; begin - Self.Clear; X := Game.Spawn.X; Y := Game.Spawn.Y; Map.Current := deDarkWood;