. This paper is an extension of previous paper written by Hutahaean (2007c). The improvements are in wave direction and wave amplitude equation. The wave direction equation or wave refraction-diffraction equation and wave amplitude equation are developed using continuity and momentum equation. Simulation results show that the new equations can model refraction-diffraction due to bathymetry, shoaling and breaking.