A generalised δ-shock model with two types of shocks