Fixes and new commands #13

xEasycore · 2017-05-13T09:12:38Z

Fixed GD Skills cooldown.
Added 3 new commands:

@leader
This command allows to change the team leader. (Include BattleConf parameter)

@bgmode <1 - 10 > (TotalArenas)
Set a bg mode as new queue.
Number 1 = Random Mode.

@bgsize <0 - 9>
Set players requeriments for a specific mode.
Number 0 = All Arenas.

@Leave now allows leave BG.

Updates 05/15

Fixed Guild Information:
If you entering in BG being in a guild, your guild info (name, leader, skill, etc) overrides "BG Guild Info", now It's solved.
Fixed charname display:
When you enter to bg arenas, your name is changed to your team info, eg.

Easycore
Blue Team [Blue Team Leader]

But this change only was showed once in LoadMap. Now it's always is displayed.

Added team emblem and removed sword emblem:
For enable this feature you must set "EnableEmblemForBG" in your exe diff.

You can find this patch in this NEMO tree:
https://github.com/MStr3am/NEMO/tree/fc064112e0704e06c6746e871fbe4df35d18740e
Just download and execute.

sagunkho · 2017-05-14T20:19:11Z

src/plugins/hBG.c

+
+	if (map->list[m].flag.battleground && (*skill_id >= GD_SKILLBASE && *skill_id <= GD_DEVELOPMENT)){
+
+	if( pc_has_permission(*sd, PC_PERM_DISABLE_SKILL_USAGE) ){


If you could please follow the code-styling here to if () rather than if(. More code-styling guidelines can be found here - https://github.com/HerculesWS/Hercules/wiki/Coding-Style

Also indentation of the inner if statement should be 1 level more than its parent.

sagunkho · 2017-05-14T20:19:27Z

src/plugins/hBG.c


+	if ((*sd)->blockskill[idx]){


Code-styling here ) {

sagunkho · 2017-05-14T20:20:16Z

src/plugins/hBG.c

+		clif->skill_fail(*sd, *skill_id, USESKILL_FAIL_SKILLINTERVAL, 0);
+		hookStop();
+		return 1;
+		}


Extra indentation here? Closing braces should be at the same indentation level as its if counterpart.

sagunkho · 2017-05-14T20:22:07Z

npc/custom/hBG/bg_common.txt

+		for(.@i = 0; .@i<.TotalArenas; .@i++)
+			dispbottom "#"+(.@i+2)+" - "+.BG_Names$[.@i],.BG_Color2[.@i];			
+		end;
+		}


Indentation of the braces here. And anywhere else in this file.

sagunkho · 2017-05-14T20:22:58Z

npc/custom/hBG/bg_common.txt

+	.@X = atoi(.@atcmd_parameters$[0]);
+	.@X2 = atoi(.@atcmd_parameters$[1]);
+	.@X3 = atoi(.@atcmd_parameters$[2]);
+	if(.@X2 == 0 || .@X3 == 0){


Variables starting with a capital letter cause errors to be thrown by the server.

sagunkho · 2017-05-14T20:23:32Z

npc/custom/hBG/bg_common.txt

+		end;
+		}	
+	if(.@X <= .TotalArenas && .@X > 0){
+	message strcharinfo(0),"["+.BG_Names$[.@X-1]+"] min players is <"+.@X2+"> and max players is <"+.@X3+">.";


Too many indentation issues here, it is important to indent at the correct levels for better readability.

sagunkho · 2017-05-15T23:48:39Z

src/plugins/hBG.c

+	return 1;
+}
+//This is not the correct way, but I could not think of another way to avoid sending the sword emblem.
+void clif_sendbgemblem_area_pre(struct map_session_data **sd)


It is better having the sword emblem, than not having one at all. Does this allow sending of the guild emblem instead?

clif_sendbgemblem (Sword emblem) is still working but not if you are inside a BG Team.

No, this doesn't allow, for that you must add "EnableEmblemForBG" in your diff exe, from this NEMO version:
https://github.com/MStr3am/NEMO/tree/fc064112e0704e06c6746e871fbe4df35d18740e

This doesn't affect GVG/WoE.

Comparative image:

sagunkho · 2017-05-15T23:53:06Z

src/plugins/hBG.c

+			clif->skill_fail((*sd), *skill_id, USESKILL_FAIL_SKILLINTERVAL, 0);
+			hookStop();
+			return 1;
+			}


Still an extra indentation before the closing braces }.

sagunkho · 2017-05-15T23:54:07Z

npc/custom/hBG/bg_common.txt

 			dispbottom "#"+(.@i+2)+" - "+.BG_Names$[.@i],.BG_Color2[.@i];			
-		end;
+			end;
 		}


Indentation here again

sagunkho · 2017-05-15T23:55:04Z

npc/custom/hBG/bg_common.txt

+			message strcharinfo(0),"[All Arenas] min players is <"+.@x2+"> and max players is <"+.@x3+">.";
+			setarray .BG_Players_Min[0],.@x2,.@x2,.@x2,.@x2,.@x2,.@x2,.@x2,.@x2,.@x2;
+			setarray .BG_Players_Max[0],.@x3,.@x3,.@x3,.@x3,.@x3,.@x3,.@x3,.@x3,.@x3;
+		}


Closing braces indentation here.

sagunkho · 2017-05-17T03:20:03Z

npc/custom/hBG/bg_common.txt

+		for (.@i = 0; .@i<.TotalArenas; .@i++)
+			dispbottom "#"+(.@i+1)+" - "+.BG_Names$[.@i],.BG_Color2[.@i];			
+		end;
+		} else if (.@x2 > .@x3) {


Extra indentation to this else if clause.

sagunkho · 2017-05-17T03:20:11Z

npc/custom/hBG/bg_common.txt

+		} else if (.@x2 > .@x3) {
+		message strcharinfo(0), "@bgsize failed: min players is higher than max players. ";
+		end;
+		}	


Extra indent here.

sagunkho · 2017-05-17T03:20:27Z

npc/custom/hBG/bg_common.txt

@@ -132,6 +180,10 @@ OnDoJoin:
 // @leavebg
 OnDoLeave:
 	hBG_queue_leave .BG_Queue;
+	if(getmapflag(strcharinfo(3),mf_battleground)){
+	hBG_leave;


This line and the one below need to be indented.

sagunkho · 2017-05-17T03:23:30Z

src/plugins/hBG.c

+		clif->charnameupdate(pl_sd);
+		return 0;
+	}
+	return -1;


The return type for an atcommand function is either true or false not an integer. Please change this to false on failure and true on success.

sagunkho · 2017-05-17T03:24:45Z

src/plugins/hBG.c

+//Prevent update Guild Info if you're in BG
+void clif_parse_GuildRequestInfo_pre(int *fd, struct map_session_data **sd)
+{
+	if ((*sd) && (*sd)->bg_id )


Extra space before the closing bracket here.

sagunkho · 2017-05-17T03:26:37Z

src/plugins/hBG.c

+void clif_sendbgemblem_single_pre(int *fd, struct map_session_data **sd)
+{
+	nullpo_retv(*sd);
+	if ((*sd) && (*sd)->bg_id )


Same as above, not intended, please remove this hook.

sagunkho · 2017-05-17T03:27:32Z

src/plugins/hBG.c

+		if (pc_has_permission(*sd, PC_PERM_DISABLE_SKILL_USAGE) ){
+			hookStop();
+			return 1;
+			}


Closing bracket of the if statement is indented. Please keep the closing bracket at the same indentation level as its if counterpart.

sagunkho · 2017-05-17T03:29:27Z

npc/custom/hBG/bg_common.txt

+		dispbottom "#1 - Random",0xFFFFFF;
+		for (.@i = 0; .@i<.TotalArenas; .@i++)
+			dispbottom "#"+(.@i+2)+" - "+.BG_Names$[.@i],.BG_Color2[.@i];			
+			end;


Extra indentation to the end; statement here.

sagunkho · 2017-05-17T03:31:07Z

src/plugins/hBG.c


+	vd = status->get_viewdata(bl);


Why is view_data declared and assign here when not used in the function? Please remove the related lines that aren't being checked or used.

sagunkho · 2017-05-17T03:32:58Z

src/plugins/hBG.c

+			}
+
+		if (pc_has_permission(*sd, PC_PERM_SKILL_UNCONDITIONAL))
+			return 0; // can do any damn thing they want


Missing hookStop() here.

xEasycore · 2017-05-17T04:26:04Z

Done, thanks for all the feedback.

sagunkho · 2017-05-18T00:57:21Z

@xEasycore Thanks, please squash your commits into a single one before I merge.
git rebase -i HEAD~13 and keep the first commit as pick, change the remaining pick lines to squash.

@leader

All GD Skills were ignoring cooldown. Added @leader command - This command allows to change the team leader. - Only leaders are allowed to use this. - Added BattleConf for enable/disable command. Update @leader condition Added @leader battleflag Added @bgmode, @bgsize @bgmode <1 - 10 > (TotalArenas) Set a bg mode as new queue. Number 1 = Random Mode. @bgsize <0 - 9> <min players> <max players> Set players requeriments for a specific mode. Number 0 = All Arenas. @Leave now allows leave BG. Fixes - Fixed Guild Information: If you entering in BG being in a guild, your guild info (name, leader, skill, etc) overrides "BG Guild Info", now It's solved. - Fixed charname display: - Added team emblem and removed sword emblem: For enable this feature you must set "EnableEmblemForBG" in your exe diff. You can find this patch in this NEMO tree: https://github.com/MStr3am/NEMO/tree/fc064112e0704e06c6746e871fbe4df35d18740e Just download and execute. - Invalid return and change code style - Updated coding style - Changes requested. - Updated codying style and minor error - Updated Coding Style & Custom modifications

sagunkho · 2017-05-22T09:02:07Z

I've rebased your commits. Merged, Thanks.

sagunkho requested changes May 14, 2017

View reviewed changes

sagunkho requested changes May 15, 2017

View reviewed changes

sagunkho requested changes May 17, 2017

View reviewed changes

sagunkho approved these changes May 18, 2017

View reviewed changes

sagunkho force-pushed the master branch from e88c969 to a193812 Compare May 22, 2017 09:00

sagunkho merged commit 9b7be44 into sagunkho:master May 22, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes and new commands #13

Fixes and new commands #13

xEasycore commented May 13, 2017 •

edited

sagunkho May 14, 2017

sagunkho May 14, 2017

sagunkho May 14, 2017

sagunkho May 14, 2017

sagunkho May 14, 2017

sagunkho May 14, 2017

sagunkho May 15, 2017

xEasycore May 17, 2017

sagunkho May 15, 2017

sagunkho May 15, 2017

sagunkho May 15, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

sagunkho May 17, 2017

xEasycore commented May 17, 2017

sagunkho commented May 18, 2017 •

edited

sagunkho commented May 22, 2017 •

edited


		if (map->list[m].flag.battleground && (skill_id >= GD_SKILLBASE && skill_id <= GD_DEVELOPMENT)){

		if( pc_has_permission(*sd, PC_PERM_DISABLE_SKILL_USAGE) ){

Fixes and new commands #13

Fixes and new commands #13

Conversation

xEasycore commented May 13, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xEasycore commented May 17, 2017

sagunkho commented May 18, 2017 • edited

sagunkho commented May 22, 2017 • edited

xEasycore commented May 13, 2017 •

edited

sagunkho commented May 18, 2017 •

edited

sagunkho commented May 22, 2017 •

edited