Initial release of the clan system #1511

Lemongrass3110 · 2016-08-23T21:13:25Z

Thanks to @RagnarokNova for his help.

We have a few things that are not yet in there. I will open up some issues for it and try to solve them as soon as possible.

Fixes #1317

Fixed run-once mode Fixed packet version Renamed the initialize function to match the others

cydh · 2016-08-23T23:28:04Z

sql-files/main.sql

+INSERT INTO `clan` VALUES ('1', 'Swordman Clan', 'Raffam Oranpere', 'prontera', '500');
+INSERT INTO `clan` VALUES ('2', 'Arcwand Clan', 'Devon Aire', 'geffen', '500');
+INSERT INTO `clan` VALUES ('3', 'Golden Mace Clan', 'Berman Aire', 'prontera', '500');
+INSERT INTO `clan` VALUES ('4', 'Crossbow Clan', 'Shaam Rumi', 'payon', '500');


the clan_ids, not using the constants?
and I don't see u alter the char table for clan_id in upgrade file and add new column in main.sql

Thanks seems like I forgot to add that update... >.<

I did not use constants because because the char server does not have a constant resolving feature in it yet. Any suggestions?

forgot, well. just leave it be.

anacondaq · 2016-08-24T02:22:24Z

Dear @Lemongrass3110 what minimal exe date and exe we should use to try the feature?
2015-11-04a-Ragexe is ok for it?

andoys · 2016-08-24T05:55:08Z

db/packet_db.txt

@@ -2330,6 +2330,9 @@ packet_keys: 0x631C511C,0x111C111C,0x111C111C // [Shakto]
 0x09D6,-1,npcmarketpurchase,2:4:6
 0x09D7,-1
 0x09D8,2,npcmarketclosed,0
+0x098D,-1,clanchat,2:4


will the packets work with 2015-11-04aRagexe ?

Yes.
@Anacondaqq everything from 2013-12-23 will work.

Forgot to add the new character table column and updated the sql scripts Added missing integrity check to character server Trimmed trailing whitespaces Added newlines to the end of the files where missing Added PACKETVER checks to the clif functions Dropped default charset for the new table

cydh · 2016-08-24T08:06:57Z

src/map/script.c

+	}else{
+		return SCRIPT_CMD_FAILURE;
+	}
+}


shouldn't the else part, just let it be end of function control?
(and for script above)

I was thinking that it might be safer to terminate the script at this point, that is why I set it up like this.

Might also be an option to make it return true/false to the caller so that they can check it.
What would you prefer/suggest?

Having a return value can be beneficial for clan_join and clan_leave to let the script know if the player was properly entered/removed from the clan.

cydh · 2016-08-24T08:13:58Z

sql-files/upgrades/upgrade_20160823.sql

+INSERT INTO `clan` VALUES ('4', 'Crossbow Clan', 'Shaam Rumi', 'payon', '500');
+
+ALTER TABLE `char`
+	ADD COLUMN `clan_id` INT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `hotkey_rowshift`;


must be INT(11)

cydh · 2016-08-24T08:15:40Z

Need the doc updates for packet_interserv.txt

@cydh

Fixed a typo in field size of clan_id Thanks to @cydh

cydh · 2016-08-24T08:25:04Z

src/map/clif.c

+	int fd = sd->fd, offset, length;
+	struct clan* clan = sd->clan;
+	char mapname[MAP_NAME_LENGTH_EXT];
+


sure doesn't want to check the sd first?
and also the fd (clif_session_isValid() wow, forgot about this actually)
just incase if player is autorade, they has no fd set.

@cydh

Added some missing packet sizes into the packet_db and added the packet sizes to the hardcoded packet db Also added some sanity checks for valid sessions Exported the send type clan into the script engine Thanks again to @cydh.

* Fixed text that didn't make sense.

* Reverted a change from the previous dialogue change. * Added changelog line.

* Added return values for clan script commands. * Adjusted clan script to account for return values.

* Updated the script command documentation.

cydh · 2016-09-10T23:55:48Z

src/char/int_clan.c

+	struct clan* clan;
+	int length;
+
+	length = 4 + db_size(clan_db) * sizeof( struct clan );


make it
int clan_len = sizeof(struct clan);

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

cydh · 2016-09-12T01:05:47Z

Need alliance & enemies table
Prevent player create guild while in clan by using @guild
Why? // Should display a clientside message "You are currently joined in Clan !!" so we ignore it
Because you need guildleaders to WoE, clansmen cannot participate in WoE. Maybe add a fun point, add config to dual mode (can join both Guild and Clan).
There's enemies, why don't add custom cvc (Clan vs Clan) mapflag?

Lemongrass3110 · 2016-09-12T11:04:00Z

This is why it is called initial release. Since we do not have enough information about what influence alliances and enemies have I just left them out for now.
Will be added shortly. Thanks for bringing that up. I thought I did that already.
Because this is clientside functionality. Ask Gravity why they did it like that.
This will create really troublesome problems, but if you want to try it you can do that. The serverside logic is easy, but having it displayed correctly on clientside will be a funny thing to do.
I wanted to add that when we add alliances and enemies.

@cydh

`@guild` will now block creation if you are in a clan. Thanks to @cydh for bringing this to my attention.

# Conflicts: # npc/re/scripts_athena.conf # src/map/script_constants.h # src/map/status.c

By the skills RL_BANISHING_BUSTER and AB_CLEARANCE

# Conflicts: # npc/re/scripts_athena.conf

admkakaroto · 2016-10-05T22:22:53Z

@Lemongrass3110

In the topic NPCs show the emblem of the clan under each one, I may have applied the wrong patch, everything is working, less clan emblem that does not appear below the npc, see:

Topic: https://rathena.org/board/topic/105463-clan-system/

Server: http://imgur.com/tZZFEzq

secretdataz · 2016-10-06T02:51:11Z

@admkakaroto What is the date of the client you are using?

Lemongrass3110 · 2016-10-06T06:04:30Z

@admkakaroto this is a known issue at the moment. I know how to get it working, but we did not implement it properly yet.

admkakaroto · 2016-10-06T10:24:27Z

@secretdataz 2015-11-04

@Lemongrass3110 i understand, but the system is working perfectly, congratulations.

# Conflicts: # src/common/mmo.h

cydh · 2016-10-07T02:03:10Z

src/char/inter.c

@@ -54,6 +55,7 @@ int inter_recv_packet_length[] = {
 	-1,10, 6,-1,  0, 0, 0, 0,  0, 0, 0, 0, -1,10,  6,-1,	// 3070-  Mercenary packets [Zephyrus], Elemental packets [pakpil]
 	48,14,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 3080-
 	-1,10,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 3090-  Homunculus packets [albator]
+	 2,-1, 6, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 30A0-  Clan packets


I wonder, maybe can we move the clan packets to empty packets there. We have lot unused packets

Yeah would not be a problem. I just though i'll create a new range because it seemed like that for all other things too.

Grantea · 2016-10-14T10:31:49Z

My character's clan emblem disappears when I use @refresh, but I'm still able to see other's emblem and when I change maps it comes back. it's not a big issue.

Client: 2015-11-04.

Also, I don't know how the official behavior is, but would be great if we have a conf like "display_party_name" to show the clan name.

Lemongrass3110 · 2016-10-14T10:57:59Z

From looking into the code I think there are more things missing when you use refresh at the moment. All kind of visual status changes and hat effects. I will test it later today.

About the display_party_name feature:
So you would want it to only display the party name, if a player is a guild OR in a clan, correct?
In officials you cannot be in a clan and a guild at the same time and we mimiced that behaviour for now. It's unsure if we will support being in both anytime soon.
Also the clan name is not being displayed, you only see the clan emblem beside the member characters.

Grantea · 2016-10-14T11:11:52Z

@Lemongrass3110 Exactly. Thank you for your quick response and amazing work!

admkakaroto · 2016-10-17T05:05:23Z

@Lemongrass3110

When an apprentice enters a Clan after logout and login again, the HP of the character is reduced, is that correct?

Before: http://imgur.com/XVHqI07
After: http://imgur.com/yamQOD3

not yet applied the changes you made on the 10th, I will do it tomorrow and test.

Lemongrass3110 · 2016-10-17T18:08:29Z

@admkakaroto just confirmed this and looking into it. Thanks for reporting.

# Conflicts: # db/const.txt Closes #1709

# Conflicts: # src/common/mmo.h # src/map/intif.c

Refactored the new clif functions to use the new char pointer fifo macros

@cydh

Thanks to @cydh, @RagnarokNova and @aleos89 for their help.

Initial release of the clan system

3512aa1

Lemongrass3110 added component:core server:map mode:renewal status:code-review labels Aug 23, 2016

Lemongrass3110 added this to the Episode 14.3: Decisive Battle milestone Aug 23, 2016

Follow up to 3512aa1

c50a5d1

Fixed run-once mode Fixed packet version Renamed the initialize function to match the others

cydh reviewed Aug 23, 2016
View changes

andoys reviewed Aug 24, 2016
View changes

cydh reviewed Aug 24, 2016
View changes

Added missing packet documentation in clif.c

960656c

cydh reviewed Aug 24, 2016
View changes

Follow up to caa14c9

c34964e

Fixed a typo in field size of clan_id Thanks to @cydh

cydh reviewed Aug 24, 2016
View changes

Lemongrass3110 and others added 5 commits Aug 24, 2016

Added inter server documentation

2cf39c0

Added some missing packet sizes into the packet_db and added the packet sizes to the hardcoded packet db Also added some sanity checks for valid sessions Exported the send type clan into the script engine Thanks again to @cydh.

Corrected some of the Clan NPC dialog

26c869f

* Fixed text that didn't make sense.

Follow up to 26c869f

7083ba0

* Reverted a change from the previous dialogue change. * Added changelog line.

Clan script command clean up

45bf80e

* Added return values for clan script commands. * Adjusted clan script to account for return values.

Follow up to 45bf80e

3c4bf90

* Updated the script command documentation.

cydh reviewed Sep 10, 2016
View changes

cydh added 2 commits Sep 11, 2016

Fixed typo in sql comment

fda8971

Fixed uninitialized fd in clif_clan_basicinfo

7f167b7

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

Lemongrass3110 added 4 commits Sep 12, 2016

Fixed atcommand guild

a9778ac

`@guild` will now block creation if you are in a clan. Thanks to @cydh for bringing this to my attention.

Merge branch 'master' into feature/clans

fb2a957

# Conflicts: # npc/re/scripts_athena.conf # src/map/script_constants.h # src/map/status.c

Fixed clan status changes being cancelable

99b3787

By the skills RL_BANISHING_BUSTER and AB_CLEARANCE

Merge branch 'master' into feature/clans

3710251

# Conflicts: # npc/re/scripts_athena.conf

Lemongrass3110 added 2 commits Oct 6, 2016

Merge branch 'master' into feature/clans

3a5f018

# Conflicts: # src/common/mmo.h

Alliances/Enemies and small cleanup

6b38272

cydh reviewed Oct 7, 2016

View changes

Added the status change for the jumping clan

b019eb5

Lemongrass3110 added 3 commits Nov 12, 2016

Merge branch 'master' into feature/clans

53e5ec8

# Conflicts: # db/const.txt Closes #1709

Merge branch 'master' into feature/clans

68bdcc5

# Conflicts: # src/common/mmo.h # src/map/intif.c

Renamed the sql upgrade file to the current date

9bba538

Refactored the new clif functions to use the new char pointer fifo macros

Lemongrass3110 mentioned this pull request Nov 16, 2016

Clan System #1317

Closed

Lemongrass3110 referenced this issue Nov 16, 2016

Initial release of the clan system

ecc8cf9

Thanks to @cydh, @RagnarokNova and @aleos89 for their help.

Lemongrass3110 closed this Nov 16, 2016

Lemongrass3110 mentioned this pull request Nov 20, 2016

Stored Status Change with HP/SP increment #1733

Open

Lemongrass3110 deleted the feature/clans branch Dec 16, 2016

Likeeit mentioned this pull request Feb 11, 2017

Clan System HerculesWS/Hercules#1574

Closed

aleos89 removed the status:code-review label Apr 10, 2017

rathena / rathena Public

Initial release of the clan system #1511

Initial release of the clan system #1511

Lemongrass3110 commented Aug 23, 2016

cydh Aug 23, 2016 •

edited

Lemongrass3110 Aug 24, 2016

cydh Aug 24, 2016

anacondaq commented Aug 24, 2016

andoys Aug 24, 2016 •

edited

Lemongrass3110 Aug 24, 2016

cydh Aug 24, 2016

Lemongrass3110 Aug 24, 2016

cydh Aug 24, 2016

Lemongrass3110 Aug 24, 2016

aleos89 Aug 24, 2016

cydh Aug 24, 2016

cydh commented Aug 24, 2016

cydh Aug 24, 2016

cydh Sep 10, 2016 •

edited

cydh commented Sep 12, 2016

Lemongrass3110 commented Sep 12, 2016

admkakaroto commented Oct 5, 2016

secretdataz commented Oct 6, 2016

Lemongrass3110 commented Oct 6, 2016

admkakaroto commented Oct 6, 2016

cydh Oct 7, 2016

Lemongrass3110 Oct 7, 2016

Grantea commented Oct 14, 2016

Lemongrass3110 commented Oct 14, 2016

Grantea commented Oct 14, 2016

admkakaroto commented Oct 17, 2016

Lemongrass3110 commented Oct 17, 2016

rathena / rathena Public

Initial release of the clan system #1511

Initial release of the clan system #1511

Conversation

Lemongrass3110 commented Aug 23, 2016

cydh Aug 23, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anacondaq commented Aug 24, 2016

andoys Aug 24, 2016 • 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

cydh commented Aug 24, 2016

Choose a reason for hiding this comment

cydh Sep 10, 2016 • edited

Choose a reason for hiding this comment

cydh commented Sep 12, 2016

Lemongrass3110 commented Sep 12, 2016

admkakaroto commented Oct 5, 2016

secretdataz commented Oct 6, 2016

Lemongrass3110 commented Oct 6, 2016

admkakaroto commented Oct 6, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Grantea commented Oct 14, 2016

Lemongrass3110 commented Oct 14, 2016

Grantea commented Oct 14, 2016

admkakaroto commented Oct 17, 2016

Lemongrass3110 commented Oct 17, 2016

cydh Aug 23, 2016 •

edited

andoys Aug 24, 2016 •

edited

cydh Sep 10, 2016 •

edited