Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Guild Storage Expansion Skill #3244

Merged
merged 1 commit into from Jul 3, 2018

Conversation

Projects
None yet
4 participants
@aleos89
Copy link
Contributor

aleos89 commented Jun 24, 2018

  • Addressed Issue(s): #499, #1303

  • Server Mode: Pre-renewal and Renewal

  • Description of Pull Request:

    • Implements Guild Storage Expansion Skill which requires client 2013-12-23 or newer (enable by default depending on client date in src/config/packets.hpp).
    • Implements guild storage permission which requires client 2014-02-05 or newer.
    • Expanded script command guildopenstorage return values.
Added Guild Storage Expansion Skill
* Fixes #499 and part of #1303.
* Implements Guild Storage Expansion Skill which requires client 2013-12-23 or newer (enable by default depending on client date in src/config/packets.hpp).
* Implements guild storage permission which requires client 2014-02-05 or newer.
* Expanded script command guildopenstorage return values.
GUILD_PERM_INVITE = 0x001,
GUILD_PERM_EXPEL = 0x010,
#if PACKETVER >= 20140205
GUILD_PERM_STORAGE = 0x100,

This comment has been minimized.

@secretdataz

secretdataz Jun 26, 2018

Member

Shouldn't these be 0x001, 0x002, 0x004?

This comment has been minimized.

@Lemongrass3110

Lemongrass3110 Jun 26, 2018

Member

Gravity... :-) This is how bitmasks work for one of their developers at least...

This comment has been minimized.

@ghost
@ghost

This comment has been minimized.

Copy link

ghost commented Jun 28, 2018

At some point, I change something in the guild.cpp?

My Emulator:
if( (i=guild_getposition(g,sd))<0 || !(g->position[i].mode&0x0001) )
Commit Diff:
if( (i=guild_getposition(sd))<0 || !(g->position[i].mode&0x0001) )

In my emulator all that part is different, could you tell me where it was that this changed?

Thanks!

@Lemongrass3110

This comment has been minimized.

Copy link
Member

Lemongrass3110 commented Jun 28, 2018

The actual change is like this:
if( (i=guild_getposition(sd))<0 || !(g->position[i].mode&GUILD_PERM_INVITE) )

Also guild_getposition was refactored by me back in 2016 in 418d820. You should actually update your emulator in general.

@ghost

This comment has been minimized.

Copy link

ghost commented Jun 28, 2018

Thanks! @Lemongrass3110

@aleos89 aleos89 merged commit e13ca63 into master Jul 3, 2018

4 checks passed

continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@Atemo Atemo deleted the feature/guild_storage_expansion branch Jul 3, 2018

@laziem

This comment has been minimized.

Copy link

laziem commented Jul 4, 2018

I got this error

error_

        CXX     elemental.cpp
        CXX     guild.cpp
guild.cpp: In function ‘int guild_invite(map_session_data*, map_session_data*)’:
guild.cpp:596:29: error: cannot convert ‘map_session_data*’ to ‘guild*’ for argument ‘1’ to ‘int guild_getposition(guild*, map_session_data*)’
  if( (i=guild_getposition(sd))<0 || !(g->position[i].mode&GUILD_PERM_INVITE) )
                             ^
guild.cpp: In function ‘int guild_expulsion(map_session_data*, int, uint32, uint32, const char*)’:
guild.cpp:808:30: error: cannot convert ‘map_session_data*’ to ‘guild*’ for argument ‘1’ to ‘int guild_getposition(guild*, map_session_data*)’
  if( (ps=guild_getposition(sd))<0 || !(g->position[ps].mode&GUILD_PERM_EXPEL) )
                              ^
Makefile:83: recipe for target 'obj/guild.o' failed
@aleos89

This comment has been minimized.

Copy link
Contributor Author

aleos89 commented Jul 4, 2018

Same issue posted just above yours.

@ghost

This comment has been minimized.

Copy link

ghost commented Jul 13, 2018

The current Guild Storage before this change is 600, what will happen to the people who have objects in their Guild Storage?

@secretdataz secretdataz referenced this pull request Feb 10, 2019

Open

Episode 15.1: Fantasmagorica #1303

5 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.