From: Deluge <ant...@us...> - 2013-10-01 22:17:16
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5192/src/games/stendhal/server/entity Modified Files: RPEntityRPClass.java Log Message: Mark merchant NPCs with icon. Feature request #1288: http://sourceforge.net/p/arianne/feature-requests/1288/ Index: RPEntityRPClass.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/RPEntityRPClass.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RPEntityRPClass.java 15 Sep 2013 23:01:59 -0000 1.3 --- RPEntityRPClass.java 1 Oct 2013 22:17:12 -0000 1.4 *************** *** 61,64 **** --- 61,67 ---- entity.addAttribute("no_hpbar", Type.FLAG, Definition.VOLATILE); + // Jobs + entity.addAttribute("job_merchant", Type.SHORT, Definition.VOLATILE); + // Status effects entity.addAttribute("choking", Type.SHORT, Definition.VOLATILE); *************** *** 67,71 **** entity.addAttribute("poisoned", Type.SHORT, Definition.VOLATILE); entity.addAttribute("status_shock", Type.SHORT, Definition.VOLATILE); ! entity.addRPSlot("head", 1, Definition.PRIVATE); entity.addRPSlot("rhand", 1, Definition.PRIVATE); --- 70,74 ---- entity.addAttribute("poisoned", Type.SHORT, Definition.VOLATILE); entity.addAttribute("status_shock", Type.SHORT, Definition.VOLATILE); ! entity.addRPSlot("head", 1, Definition.PRIVATE); entity.addRPSlot("rhand", 1, Definition.PRIVATE); |