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.

Sign up for GitHub

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

Jump to bottom

Fight Club #169

Merged
merged 6 commits into from
Nov 2, 2014
Merged

Fight Club #169

merged 6 commits into from
Nov 2, 2014

Conversation

Helianthella
Copy link
Member

includes:

  • Sanguine Vault map
    • bar (with special area only accessible for contributors)
    • fight club
  • fight club announcer (Rouge)
  • quick warp to Brodomir and PVP cave (battle master)
    • modify the royal guards and Brodomir to send the player back to the fight club
  • 2 new shops (Bartender and Garçon)
  • 1v1 duel system
    • global queue
    • per-player queue
    • rules system
    • intrusion detection
    • unexpected death and logout handling
    • allow the player to ignore incoming requests
  • unified summon system (merge nature, astral and dark summon)
    • restrict summon area (do not spawn inside the ring from outside the ring and vice versa)
    • now requires to specify the school
  • fight club debug
  • add the SO_GMHIDE magic system constant

goes with themanaworld/tmwa-client-data#169

@wushin Please do not merge this until october 28th

@Helianthella Helianthella mentioned this pull request Oct 1, 2014
Merged
@wushin wushin added the test label Oct 1, 2014
wushin
wushin reviewed Oct 7, 2014
View reviewed changes
world/map/conf/magic-misc.sex
(ABORT))
(SET script_target target)
(SCRIPT "{
if($@Duel_Queue_ID[($@Duel_MaxQueue)] > 0) goto L_Full;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No such label as L_Full

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes I know, already fixed this in local; I thought I already "git push" but it looks like I forgot

Helianthella
Helianthella reviewed Oct 16, 2014
View reviewed changes
world/map/npc/009-7/debug.txt
mes "$fightclub_name$: " + $fightclub_name$;
mes "$fightclub_password$: " + $fightclub_password$;
mes "$fightclub_bm_enabled: " + $fightclub_bm_enabled;
mes "$Duel_Enabled: " + $Duel_Enabled;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wushin is there a way to combine all these variables by bitmasking ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fightclub_bm_enabled and Duel_Enabled could. They could be single bits. they could also be $@

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to use $@ with it because we'd have to manually start the fight club after each reboot

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use -|script|#FightClubConfig|-1,
{
OnInit:
set $@fightclub_bm_enabled, 1;
...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but if the fightclub is disabled, we don't want to re-disable it at each reboot either

@wushin
Copy link
Member

wushin commented Oct 17, 2014

Not sure why there are so many server side variables for this. Some of these variables can be $@ and die when the server does.

@Helianthella
Copy link
Member Author

  • merged duel_enabled and fightclub_bm_enabled into fightclub_enabled using modulo
  • removed fightclub_name variable (changing the name would require editing the tmx anyway)
  • made most globals temporary (only fightclub_enabled and duel_lastduel remain)

@wushin
Copy link
Member

wushin commented Oct 20, 2014

I was thinking, maybe contributor t-shirts or the dev/GM hat got you Box Seats at the fight?

@Helianthella
Copy link
Member Author

what is this?

@wushin
Copy link
Member

wushin commented Oct 20, 2014

You know how the contributor t-shirt allows you to go behind the bar? Maybe we could make some swanky seating on one end of the ring that allows the similar condition. A Box Seat tends to be a bit better of a seat then general admission.

@Helianthella
Copy link
Member Author

wushin, if you map it yourself I won't oppose

@wushin
Copy link
Member

wushin commented Oct 21, 2014

@mekolat smart answer. I notice you are already starting to understand the Open Source ways.

@Helianthella
Copy link
Member Author

just make a PR on my PR, I'll edit server data accordingly

@Helianthella
Copy link
Member Author

@wushin it has been 7 days since the last bug have been found so I think it is now stable enough for release

@wushin
Copy link
Member

wushin commented Oct 28, 2014

@mekolat ok, give me a chance to review it and we can start talking release.

wushin
wushin reviewed Oct 29, 2014
View reviewed changes
world/map/npc/009-7/eventHandler.txt
{
if(countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)) goto L_Enter;
end;
L_Enter:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indenting.

@wushin wushin added this to the v2014.11.4 milestone Oct 30, 2014
wushin
wushin reviewed Nov 2, 2014
View reviewed changes
world/map/npc/009-7/core.txt
if($@Duel_TimeLimit < 1) set $@Duel_TimeLimit, 120; // init the (temporary) TimeLimit global
if($@Duel_QueueLimit < 1) set $@Duel_QueueLimit, 5; // init the (temporary) QueueLimit global
if($@Duel_PlayerQueueLimit < 1) set $@Duel_PlayerQueueLimit, 2; // init the (temporary) PlayerQueueLimit global
if($@fightclub_password$ == "") set $@fightclub_password$, "Banana"; // init the (temporary) fightclub_password global
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I was looking at this. Explain the purpose? I see where it sets the menu item but I'm not sure why you went through the effort?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to make every single option into a variable so that we can change them at any time without rebooting. For example, we could change the password depending on events (ie. change it to "Boo!" on Halloween) without rebooting.

wushin added a commit that referenced this pull request Nov 2, 2014
@wushin
Merge pull request #169 from mekolat/duels
e0107f4 
Fight Club
@wushin wushin merged commit e0107f4 into themanaworld:master Nov 2, 2014
@wushin wushin removed the test label Nov 2, 2014
@Helianthella Helianthella deleted the duels branch November 2, 2014 03:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2014.11.4
2 participants
@Helianthella @wushin