2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Port Phasmatys Update I (#485)

Browse Source 
* New NPC Spawns for Port Phasmatys

Added most NPCs in Port Phasmatys including the ghost villagers, sailors, guards, Robin, Ak-Haranu, and more.

* ObjectActions for Ectofuntus and Energy Barrier

The Ectofuntus is now fully accessible and Port Phasmatys can be accessed through the energy barrier.

* Added Ak-Haranu's Exotic Shop

Ak-Haranu now sells Bolt Racks.

* Fixed Ectofuntus Worship

Fixed minor issue with Ectofuntus Worship

* Gravingas Exclamations

Gravingas exclaims different messages while protesting Necrovarus in Port Phasmatys.
This commit is contained in:
Olivier
2021-03-30 16:57:35 -07:00
committed by GitHub
parent a52832348a
commit d5b74825d4
4 changed files with 263 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/data/cfg/spawns.json
+170
View File
@@ -23852,5 +23852,175 @@
"id": 309,
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3703,
"y": 3487,
"id": 1705,
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3689,
"y": 3494,
"id": 1688,
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3674,
"y": 3492,
"id": 1694,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3692,
"y": 3497,
"id": 1703,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3690,
"y": 3504,
"id": 1703,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3690,
"y": 3509,
"id": 1703,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3687,
"y": 3464,
"id": 1702,
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3681,
"y": 3494,
"id": 1700,
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3661,
"y": 3500,
"id": 1685,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3662,
"y": 3498,
"id": 1697,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3666,
"y": 3473,
"id": 1697,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3659,
"y": 3494,
"id": 1697,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3677,
"y": 3496,
"id": 3155,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3659,
"y": 3518,
"id": 1686,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3661,
"y": 3519,
"id": 1686,
"walk": 1,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3661,
"y": 3508,
"id": 1706,
"walk": 0,
"height": 0
},
{
"maxHit": 0,
"strength": 0,
"attack": 0,
"x": 3658,
"y": 3508,
"id": 1706,
"walk": 0,
"height": 0
}
]
2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java
+16 -1
View File
@@ -525,7 +525,22 @@ public class NpcHandler {
npcs[i].forceChat("Quack!");
}
}
if (npcs[i].npcType == 1685)
{
if (Misc.random(25) == 7) {
int rand = Misc.random(25);
if (rand <= 5)
npcs[i].forceChat("Down with Necrovarus!!");
else if (rand <= 10)
npcs[i].forceChat("United we conquer - divided we fall!!");
else if (rand <= 15)
npcs[i].forceChat("We shall overcome!!");
else if (rand <= 20)
npcs[i].forceChat("Let Necrovarus know we want out!!");
else
npcs[i].forceChat("Don't stay silent - victory in numbers!!");
}
}
if (npcs[i].spawnedBy > 0) {
if (PlayerHandler.players[npcs[i].spawnedBy] == null
|| PlayerHandler.players[npcs[i].spawnedBy].heightLevel != npcs[i].heightLevel
2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java
+75
View File
@@ -693,6 +693,81 @@ public class ObjectsActions {
"You leave the icy cavern.");
player.getPlayerAssistant().movePlayer(3056, 9562, 0);
break;
case 5259:
if (player.absY == 3507)
{
player.getPacketSender().sendMessage(
"You pass through the energy barrier.");
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 2, 0);
}
else if (player.absY == 3509)
{
player.getPacketSender().sendMessage(
"You pass through the energy barrier.");
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 2, 0);
}
break;
case 5262:
if (player.heightLevel == 0)
{
player.getPlayerAssistant().movePlayer(3687, 9888, 1);
}
else if (player.heightLevel == 1)
{
player.getPlayerAssistant().movePlayer(3671, 9887, 2);
}
else
{
player.getPlayerAssistant().movePlayer(3692, 9887, 3);
}
break;
case 5263:
if (player.heightLevel == 3)
{
player.getPlayerAssistant().movePlayer(3688, 9887, 2);
}
else if (player.heightLevel == 2)
{
player.getPlayerAssistant().movePlayer(3675, 9888, 1);
}
else
{
player.getPlayerAssistant().movePlayer(3683, 9888, 0);
}
break;
case 5264:
player.getPlayerAssistant().movePlayer(3654, 3519, 0);
break;
case 5267:
player.getPlayerAssistant().movePlayer(3669, 9888, 3);
break;
case 5280:
player.getPlayerAssistant().movePlayer(3666, 3522, 1);
break;
case 5281:
player.getPlayerAssistant().movePlayer(3666, 3517, 0);
break;
case 5282: // Ectofuntus Worship
if (player.getItemAssistant().playerHasItem(4286) && player.getItemAssistant().playerHasItem(4255))
{
player.startAnimation(1651);
player.getPacketSender().sendMessage("You put some ectoplasm and bonemeal into the Ectofuntus, and worship it.");
player.getItemAssistant().deleteItem(4286, 1);
player.getItemAssistant().deleteItem(4255, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1931, 1);
player.getPlayerAssistant().addSkillXP(18, player.playerPrayer);
}
else
{
player.getPacketSender().sendMessage("You'll need ectoplasm and bonemeal to worship the Ectofuntus.");
}
break;
case 12982:
if (player.absY == 3278) {
2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java
+2 -1
View File
@@ -47,7 +47,8 @@ public class Shops {
SHOP134(2158, 130), SHOP135(2156, 131), SHOP136(2159, 132), SHOP137(851, 133),
SHOP138(602, 134), SHOP139(596, 135), SHOP140(597, 136), SHOP141(1784, 137),
SHOP142(2620, 138), SHOP143(2622, 139), SHOP144(552, 88), SHOP145(1778, 140),
SHOP146(1782, 141), SHOP147(849, 142), SHOP148(970, 145), SHOP149(555, 220);
SHOP146(1782, 141), SHOP147(849, 142), SHOP148(970, 145), SHOP149(555, 220),
SHOP150(1688, 284);
private final int npcId, shopId;