Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Couple confirmation

Browse Source 
Added couple vows confirmation before completing marriage and giving rings.
This commit is contained in:
ronancpl
2018-04-22 22:23:58 -03:00
parent ede8ad8551
commit f6c06e5f2e
5 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/npc/9201002.js
View File

@@ -311,29 +311,40 @@ function action(mode, type, selection) {
switch(state) {
case 0:
eim.setIntProperty("weddingStage", 3);
var cmPartner = partner.getClient().getAbstractPlayerInteraction();
var pid = eim.getIntProperty("confirmedVows");
if(pid != -1) {
if(pid == player.getId()) {
cm.sendOk("You have already confirmed your vows. All that is left is for your partner to confirm now.");
} else {
eim.setIntProperty("weddingStage", 3);
var cmPartner = partner.getClient().getAbstractPlayerInteraction();
var playerItemId = detectPlayerItemid(player);
var partnerItemId = (playerItemId % 2 == 1) ? playerItemId + 1 : playerItemId - 1;
var playerItemId = detectPlayerItemid(player);
var partnerItemId = (playerItemId % 2 == 1) ? playerItemId + 1 : playerItemId - 1;
var marriageRingId = getRingId((playerItemId % 2 == 1) ? playerItemId : partnerItemId);
var marriageRingId = getRingId((playerItemId % 2 == 1) ? playerItemId : partnerItemId);
cm.gainItem(playerItemId, -1);
cmPartner.gainItem(partnerItemId, -1);
cm.gainItem(playerItemId, -1);
cmPartner.gainItem(partnerItemId, -1);
RingActionHandler.giveMarriageRings(player, partner, marriageRingId);
player.setMarriageItemId(marriageRingId);
partner.setMarriageItemId(marriageRingId);
RingActionHandler.giveMarriageRings(player, partner, marriageRingId);
player.setMarriageItemId(marriageRingId);
partner.setMarriageItemId(marriageRingId);
//var marriageId = eim.getIntProperty("weddingId");
//player.announce(Wedding.OnMarriageResult(marriageId, player, true));
//partner.announce(Wedding.OnMarriageResult(marriageId, player, true));
giveCoupleBlessings(eim, player, partner);
cm.getMap().dropMessage(6, "High Priest John: By the power vested in me through the mighty Maple tree, I now pronounce you Husband and Wife. You may kiss the bride!");
eim.schedule("showMarriedMsg", 2 * 1000);
}
} else {
eim.setIntProperty("confirmedVows", player.getId());
mapobj.dropMessage(6, "Wedding Assistant: " + player.getName() + " has confirmed vows! Alright, one step away to make it official. Tighten your seatbelts!");
}
//var marriageId = eim.getIntProperty("weddingId");
//player.announce(Wedding.OnMarriageResult(marriageId, player, true));
//partner.announce(Wedding.OnMarriageResult(marriageId, player, true));
giveCoupleBlessings(eim, player, partner);
cm.getMap().dropMessage(6, "High Priest John: By the power vested in me through the mighty Maple tree, I now pronounce you Husband and Wife. You may kiss the bride!");
eim.schedule("showMarriedMsg", 2 * 1000);
break;
case -1:

43
scripts/npc/9201011.js
View File

@@ -192,29 +192,40 @@ function action(mode, type, selection) {
switch(state) {
case 0:
eim.setIntProperty("weddingStage", 3);
var cmPartner = partner.getClient().getAbstractPlayerInteraction();
var pid = eim.getIntProperty("confirmedVows");
if(pid != -1) {
if(pid == player.getId()) {
cm.sendOk("You have already confirmed your vows. All that is left is for your partner to confirm now.");
} else {
eim.setIntProperty("weddingStage", 3);
var cmPartner = partner.getClient().getAbstractPlayerInteraction();
var playerItemId = detectPlayerItemid(player);
var partnerItemId = (playerItemId % 2 == 1) ? playerItemId + 1 : playerItemId - 1;
var playerItemId = detectPlayerItemid(player);
var partnerItemId = (playerItemId % 2 == 1) ? playerItemId + 1 : playerItemId - 1;
var marriageRingId = getRingId((playerItemId % 2 == 1) ? playerItemId : partnerItemId);
var marriageRingId = getRingId((playerItemId % 2 == 1) ? playerItemId : partnerItemId);
cm.gainItem(playerItemId, -1);
cmPartner.gainItem(partnerItemId, -1);
cm.gainItem(playerItemId, -1);
cmPartner.gainItem(partnerItemId, -1);
RingActionHandler.giveMarriageRings(player, partner, marriageRingId);
player.setMarriageItemId(marriageRingId);
partner.setMarriageItemId(marriageRingId);
RingActionHandler.giveMarriageRings(player, partner, marriageRingId);
player.setMarriageItemId(marriageRingId);
partner.setMarriageItemId(marriageRingId);
//var marriageId = eim.getIntProperty("weddingId");
//player.announce(Wedding.OnMarriageResult(marriageId, player, true));
//partner.announce(Wedding.OnMarriageResult(marriageId, player, true));
//var marriageId = eim.getIntProperty("weddingId");
//player.announce(Wedding.OnMarriageResult(marriageId, player, true));
//partner.announce(Wedding.OnMarriageResult(marriageId, player, true));
giveCoupleBlessings(eim, player, partner);
giveCoupleBlessings(eim, player, partner);
cm.getMap().dropMessage(6, "Wayne: I'll call it out right now, and it shall go on: you guys are the key of the other's lock, a lace of a pendant. That's it, snog yourselves!");
eim.schedule("showMarriedMsg", 2 * 1000);
cm.getMap().dropMessage(6, "Wayne: I'll call it out right now, and it shall go on: you guys are the key of the other's lock, a lace of a pendant. That's it, snog yourselves!");
eim.schedule("showMarriedMsg", 2 * 1000);
}
} else {
eim.setIntProperty("confirmedVows", player.getId());
mapobj.dropMessage(6, "Wedding Assistant: " + player.getName() + " has confirmed vows! Alright, one step away to make it official. Tighten your seatbelts!");
}
break;
case -1: