Skip to content

Commit 8b44b95

Browse files
RyanHubcapp
Ryan
authored and
Hubcapp
committed
Halloween 2024
1 parent 7d41151 commit 8b44b95

29 files changed

Lines changed: 1025 additions & 125 deletions

File tree

‎Client_Base/Cache/video/Custom_Sprites.osar‎

6.97 KB
Binary file not shown.

‎Client_Base/src/com/openrsc/client/entityhandling/EntityHandler.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,6 +2334,8 @@ private static void loadNpcDefinitions4() {
23342334
npcs.add(new NPCDef("Forester", "He looks after McGrubor's wood", "", 24, 22, 17, 23, false, sprites, 1, 56576, 43520, 15523536, 145, 220, 6, 6, 5, i++));
23352335
sprites = new int[]{6, 1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1};
23362336
npcs.add(new NPCDef("McGrubor", "Grumpy old McGruber", "", 20, 20, 20, 20, false, sprites, 0xAAAAAA, 12277060, 0x007900, 15523536, 160, 220, 6, 6, 5, i++));
2337+
sprites = new int[]{0, 557, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1};
2338+
npcs.add(new NPCDef("Ash", "Groovy", "", 20, 20, 20, 20, false, sprites, 0x50321E, 0x00137F, 0x794B1E, 15523536, 160, 220, 6, 6, 5, i++));
23372339

23382340
if (Config.S_WANT_CUSTOM_SPRITES) {
23392341
// Ranael
@@ -4122,6 +4124,11 @@ private static void loadCustomItemDefinitions() {
41224124
items.add(new ItemDef("Christmas sweater", "Knitted with love!", "", 5, 87, "items:christmassweater", false, true, 64, 0xcf7602, false, true, false, 1588));
41234125
items.add(new ItemDef("Christmas sweater", "Knitted with love!", "", 5, 87, "items:christmassweater", false, true, 64, 0x106105, false, true, false, 1589));
41244126

4127+
// Halloween 2024
4128+
items.add(new ItemDef("Necronomicon Ex Mortis", "This looks very homemade", "read", 1, 28, "items:28", false, false, 0, 0x777777, false, true, false, 1590));
4129+
items.add(new ItemDef("Ancient amulet", "A sinister looking amulet", "", 1, 125, "items:125", false, true, 1024, 0x010101, false, true, false, 1591));
4130+
items.add(new ItemDef("Boomstick", "A 12-Gauge, Double-Barreled Remington", "", 1, 606, "items:606", false, true, 16, 16737817, false, true, false, 1592));
4131+
41254132
// Custom certificate names
41264133
if (Config.S_WANT_BANK_NOTES && !Config.S_WANT_CERT_AS_NOTES) {
41274134
for (int i : new int[]{1543, 1546, 1547, 1548, 1549, 1550, 1551, 1552}) {
@@ -4856,6 +4863,11 @@ private static void loadAnimationDefinitions() {
48564863
animations.add(new AnimationDef("fchristmassweater", "equipment", 0x6804b5, 0, true, false, 0));//553 - purple
48574864
animations.add(new AnimationDef("fchristmassweater", "equipment", 0xcf7602, 0, true, false, 0));//554 - orange
48584865
animations.add(new AnimationDef("fchristmassweater", "equipment", 0x106105, 0, true, false, 0));//555 - green
4866+
4867+
// Halloween 2024
4868+
animations.add(new AnimationDef("boomstick", "equipment", 0, 0, true, false, 0));//556
4869+
animations.add(new AnimationDef("ashtorso", "equipment", 0, 0, true, false, 0));//557
4870+
animations.add(new AnimationDef("amulet", "equipment", 16763980, 3,0, true, false, 0)); //558
48594871
}
48604872
}
48614873

‎Client_Base/src/com/openrsc/client/entityhandling/defs/ItemDef.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ public ItemDef(String name, String description, String command, int basePrice, i
6464
boolean stackable, boolean wieldable, int wearableID, int pictureMask, int blueMask, boolean membersItem,
6565
boolean untradeable, boolean noteable, int notedForm, int notedFormOf, int id) {
6666
super(name, description, id);
67-
this.command = command.split(",");
68-
this.basePrice = basePrice;
69-
this.spriteID = spriteID;
70-
this.stackable = stackable;
71-
this.wieldable = wieldable;
72-
this.wearableID = wearableID;
73-
this.pictureMask = pictureMask;
74-
this.blueMask = blueMask;
75-
this.membersItem = membersItem;
76-
this.untradeable = untradeable;
77-
this.noteable = noteable;
78-
this.id = id;
79-
this.spriteLocation = spriteLocation;
67+
this.command = command.split(","); // left click option and additional secondary option; do not need to define "wear"
68+
this.basePrice = basePrice; // used to calculate shop price
69+
this.spriteID = spriteID; // item in inventory sprite
70+
this.stackable = stackable; // e.g. coins
71+
this.wieldable = wieldable; // can player wear it
72+
this.wearableID = wearableID; // where on the player is it wielded (e.g. cape slot, amulet slot, etc.)
73+
this.pictureMask = pictureMask; // set to 0 if using bitmap that will not be coloured
74+
this.blueMask = blueMask; // set to 0 if you're not sure
75+
this.membersItem = membersItem; // true if not obtainable in free to play
76+
this.untradeable = untradeable; // prevent trading
77+
this.noteable = noteable; // custom extension to note items; not certificates
78+
this.id = id; // referenced by ItemId class
79+
this.spriteLocation = spriteLocation; // name of sprite in sprites file; aligns with spriteID for authentic items
8080

8181
if (this.command.length == 1 && this.command[0] == "")
8282
this.command = null;

‎Client_Base/src/com/openrsc/client/entityhandling/defs/extras/AnimationDef.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ public class AnimationDef {
66
private int charColour;
77
private int blueMask;
88
private int genderModel;
9-
private boolean hasA;
10-
private boolean hasF;
9+
private boolean hasA; // Has fighting animation
10+
private boolean hasF; // Has special fighting animation for the weapon; used authentically on zombweapon, skelweapon, gobweapon
1111
public int number;
1212

1313

@@ -50,9 +50,9 @@ public int getGenderModel() {
5050

5151
public boolean hasA() {
5252
return hasA;
53-
}
53+
} // Has fighting animation; false for sheep and ranged weapons
5454

55-
public boolean hasF() {
55+
public boolean hasF() { // Has special fighting animation for the weapon; used authentically on zombweapon, skelweapon, gobweapon
5656
return hasF;
5757
}
5858

‎server/2001scape.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ custom_features:
234234
want_openpk_presets: false # This determines if we want presets on the OpenPK stat interface. It's worth noting StorkPK didn't have presets.
235235
form_fitting_chainmail: false # When this setting is true, chainmail will automatically change between tops and bodies depending on the body type of the player wearing them.
236236
want_combat_odyssey: false # Enable the Combat Odyssey miniquest
237-
want_instanced_npcs: false # Allows some NPCs to only be displayed to players that have met specific criteria
237+
want_invisible_npcs: false # Allows some NPCs to only be displayed to players that have met specific criteria
238238
equip_quest_items_without_quests: false # Allows items to be equiped without completing the required quests
239239
want_packet_register: true # If true, signups (character creation) from within game clients such as RSC+ will be allowed
240240

@@ -315,3 +315,4 @@ custom_quest_and_minigame:
315315
pride_month: false # Enables Make over mage to give out the cape of inclusion
316316
a_bone_to_pick: false # Enables the 2023 Halloween event
317317
a_lumbridge_carol: false # Enables the 2023 Christmas event
318+
army_of_obscurity: false # Enables the 2024 Halloween event

‎server/conf/server/data/Custom_Sprites.osar‎

6.97 KB
Binary file not shown.

‎server/conf/server/defs/ItemDefsCustom.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6899,6 +6899,75 @@
68996899
"prayerBonus": 0,
69006900
"basePrice": 5,
69016901
"isNoteable": 0
6902+
},
6903+
{
6904+
"id": 1590,
6905+
"name": "Necronomicon Ex Mortis",
6906+
"description": "This looks very homemade",
6907+
"command": "read",
6908+
"isFemaleOnly": 0,
6909+
"isMembersOnly": 0,
6910+
"isStackable": 0,
6911+
"isUntradable": 1,
6912+
"isWearable": 0,
6913+
"appearanceID": 0,
6914+
"wearableID": 0,
6915+
"wearSlot": -1,
6916+
"requiredLevel": 0,
6917+
"requiredSkillID": -1,
6918+
"armourBonus": 0,
6919+
"weaponAimBonus": 0,
6920+
"weaponPowerBonus": 0,
6921+
"magicBonus": 0,
6922+
"prayerBonus": 0,
6923+
"basePrice": 1,
6924+
"isNoteable": 0
6925+
},
6926+
{
6927+
"id": 1591,
6928+
"name": "Ancient amulet",
6929+
"description": "A sinister looking amulet",
6930+
"command": "",
6931+
"isFemaleOnly": 0,
6932+
"isMembersOnly": 0,
6933+
"isStackable": 0,
6934+
"isUntradable": 1,
6935+
"isWearable": 1,
6936+
"appearanceID": 559,
6937+
"wearableID": 1024,
6938+
"wearSlot": 10,
6939+
"requiredLevel": 1,
6940+
"requiredSkillID": 1,
6941+
"armourBonus": 0,
6942+
"weaponAimBonus": 0,
6943+
"weaponPowerBonus": 0,
6944+
"magicBonus": 0,
6945+
"prayerBonus": 0,
6946+
"basePrice": 1,
6947+
"isNoteable": 0
6948+
},
6949+
{
6950+
"id": 1592,
6951+
"name": "Boomstick",
6952+
"description": "A 12-Gauge, Double-Barreled Remington",
6953+
"command": "",
6954+
"isFemaleOnly": 0,
6955+
"isMembersOnly": 0,
6956+
"isStackable": 0,
6957+
"isUntradable": 1,
6958+
"isWearable": 1,
6959+
"appearanceID": 557,
6960+
"wearableID": 16,
6961+
"wearSlot": 4,
6962+
"requiredLevel": 1,
6963+
"requiredSkillID": 0,
6964+
"armourBonus": 0,
6965+
"weaponAimBonus": 7,
6966+
"weaponPowerBonus": 7,
6967+
"magicBonus": 0,
6968+
"prayerBonus": 0,
6969+
"basePrice": 1,
6970+
"isNoteable": 0
69026971
}
69036972
]
69046973
}

‎server/conf/server/defs/NpcDefsCustom.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,46 @@
16381638
"combatSprite": 5,
16391639
"canEdit": 0,
16401640
"roundMode": 0
1641+
},
1642+
{
1643+
"id": 835,
1644+
"name": "Ash",
1645+
"description": "Groovy",
1646+
"command": "",
1647+
"command2": "",
1648+
"attack": 20,
1649+
"strength": 20,
1650+
"hits": 20,
1651+
"defense": 20,
1652+
"ranged": false,
1653+
"combatlvl": 20,
1654+
"isMembers": 1,
1655+
"attackable": 0,
1656+
"aggressive": 0,
1657+
"respawnTime": 30,
1658+
"sprites1": 0,
1659+
"sprites2": 1,
1660+
"sprites3": 2,
1661+
"sprites4": -1,
1662+
"sprites5": -1,
1663+
"sprites6": -1,
1664+
"sprites7": 557,
1665+
"sprites8": -1,
1666+
"sprites9": -1,
1667+
"sprites10": -1,
1668+
"sprites11": -1,
1669+
"sprites12": -1,
1670+
"hairColour": 15658734,
1671+
"topColour": 12277060,
1672+
"bottomColour": 3,
1673+
"skinColour": 15523536,
1674+
"camera1": 160,
1675+
"camera2": 220,
1676+
"walkModel": 6,
1677+
"combatModel": 6,
1678+
"combatSprite": 5,
1679+
"canEdit": 0,
1680+
"roundMode": 0
16411681
}
16421682
]
16431683
}

‎server/conf/server/defs/locs/NpcLocsCustomQuest.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,5 +686,19 @@
686686
"X": 323,
687687
"Y": 1494
688688
}
689+
}, {
690+
"id": 835,
691+
"start": {
692+
"X": 118,
693+
"Y": 710
694+
},
695+
"min": {
696+
"X": 115,
697+
"Y": 709
698+
},
699+
"max": {
700+
"X": 118,
701+
"Y": 712
702+
}
689703
}]
690704
}

‎server/default.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ custom_features:
232232
want_openpk_presets: false # This determines if we want presets on the OpenPK stat/points interface. It's worth noting StorkPK didn't have presets, but it's nice to have an option for them.
233233
form_fitting_chainmail: false # When this setting is true, chainmail will automatically change between tops and bodies depending on the body type of the player wearing them.
234234
want_combat_odyssey: false # Enable the Combat Odyssey miniquest
235-
want_instanced_npcs: false # Allows some NPCs to only be displayed to players that have met specific criteria
235+
want_invisible_npcs: false # Allows some NPCs to only be displayed to players that have met specific criteria
236236
equip_quest_items_without_quests: false # Allows items to be equiped without completing the required quests
237237
want_packet_register: true # If true, signups (character creation) from within game clients such as RSC+ will be allowed
238238

@@ -313,3 +313,4 @@ custom_quest_and_minigame:
313313
pride_month: false # Enables Make over mage to give out the cape of inclusion
314314
a_bone_to_pick: false # Enables the 2023 Halloween event
315315
a_lumbridge_carol: false # Enables the 2023 Christmas event
316+
army_of_obscurity: false # Enables the 2024 Halloween event

0 commit comments

Comments
 (0)