From 41f1a34c8593a40b4c5dc4178d7138e7e166eea0 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 21 Aug 2006 16:07:50 +0000 Subject: - Removed config setting "muting_players", and expanded the manner_system config to specify how having negative manner (mute) affects a player (see battle/misc.conf). - Expanded the pk_mode setting from no/yes to 0/1/2. 1 is normal pk_mode, if 2 is used, it makes killing players give you a loss of 5 manner points. - Fixed WS_WEAPONREFINE always failing when at less than job 50. - Fixed a compilation warning in char-txt/int_homun.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8402 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 50e97249e..efc621333 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4847,11 +4847,11 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) pc_setglobalreg(ssd, "killedrid", sd->bl.id); npc_script_event(ssd, NPCE_KILLPC); } - if (battle_config.pk_mode && ssd->status.manner >= 0 && battle_config.manner_system) { + if (battle_config.pk_mode&2) { ssd->status.manner -= 5; if(ssd->status.manner < 0) sc_start(src,SC_NOCHAT,100,0,0); - + // PK/Karma system code (not enabled yet) [celest] // originally from Kade Online, so i don't know if any of these is correct ^^; // note: karma is measured REVERSE, so more karma = more 'evil' / less honourable, @@ -5486,9 +5486,8 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) if(sd->vd.cloth_color) clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color); - if(battle_config.muting_players && sd->status.manner < 0 && battle_config.manner_system) + if(sd->status.manner < 0) clif_changestatus(&sd->bl,SP_MANNER,sd->status.manner); - if(pc_isriding(sd)) //Remove Peco Status to prevent display <> class problems. pc_setoption(sd,sd->sc.option&~OPTION_RIDING); -- cgit v1.2.3-70-g09d2