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 ftp general stores #553

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

## Quick setup

1. Make sure you have java 19 or above installed. (`java --version` on command line)
1. Make sure you have [java 19 or above installed](https://adoptium.net/temurin/releases/?package=jre). (`java --version` on command line)
2. Extract the [latest void.zip released bundle](https://github.com/GregHib/void/releases) into a directory.
3. Extract the [latest pre-modified game files cache.zip](https://mega.nz/folder/ZMN2AQaZ#4rJgfzbVW0_mWsr1oPLh1A) into `/void/data/cache/`.
4. Run either the `run-server.bat` on Windows, or `run-server.sh` on Linux.
Expand Down
102 changes: 101 additions & 1 deletion data/definitions/animations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,11 @@ emote_flap:
ticks: 3
walk: false
run: false
emote_enhanced_flap:
id: 3859
ticks: 3
walk: false
run: false
emote_slap_head:
id: 4275
ticks: 3
Expand Down Expand Up @@ -685,7 +690,7 @@ emote_recite_prayer:
walk: false
run: false
emote_chicken_dance:
id: 6400
id: 1835
ticks: 8
walk: false
run: false
Expand Down Expand Up @@ -734,6 +739,101 @@ emote_trample_snow:
ticks: 8
walk: false
run: false
emote_candy_cane_spin:
id: 12664
ticks: 2
walk: false
run: false
emote_salty_claws_hat_dance:
id: 329
ticks: 2
walk: false
run: false
emote_golden_hammer_spin:
id: 15149
ticks: 7
walk: false
run: false
emote_golden_hammer_brandish:
id: 15150
ticks: 4
walk: false
run: false
emote_10th_anniversary_cake:
id: 6292
ticks: 8
walk: false
run: false
emote_marionette_jump:
id: 3003
ticks: 8
walk: false
run: false
emote_marionette_walk:
id: 3004
ticks: 10
walk: false
run: false
emote_marionette_bow:
id: 3005
ticks: 4
walk: false
run: false
emote_marionette_dance:
id: 3006
ticks: 10
walk: false
run: false
emote_magnifying_glass_sleuth:
id: 2936
ticks: 8
walk: false
run: false
emote_chocatrice_cape:
id: 8903
ticks: 6
walk: false
run: false
emote_squirrel_ears:
id: 12265
ticks: 6
walk: false
run: false
emote_toy_horsey_brown:
id: 918
ticks: 4
walk: false
run: false
emote_toy_horsey_white:
id: 919
ticks: 4
walk: false
run: false
emote_toy_horsey_black:
id: 920
ticks: 4
walk: false
run: false
emote_toy_horsey_grey:
id: 921
ticks: 4
walk: false
run: false
rubber_chicken_whack:
id: 1833
ticks: 2
walk: false
run: false
easter_carrot_whack:
id: 11547
ticks: 2
walk: false
run: false
play_with_eek:
id: 12490
ticks: 6
walk: false
run: false
rest_legs_out:
id: 2716
ticks: 4
Expand Down
3 changes: 3 additions & 0 deletions data/definitions/diango-codes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
flagstaff:
variable: flagstaff_runefest
add: [ flagstaff_of_festivities ]
17 changes: 17 additions & 0 deletions data/definitions/graphics.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
play_with_eek: 2178
traiborn_bone_spell: 777
demon_slayer_spell:
id: 782
Expand Down Expand Up @@ -178,7 +179,23 @@ emote_dung_master_gravecreeper: 2778
emote_dung_master_flesh_spoiler: 2779
emote_dung_master_cursebearer: 2780
emote_reindeer: 859
emote_reindeer_2: 263
emote_snow_globe_flurry: 1284
emote_golden_hammer_spin: 2953
emote_red_marionette_jump: 507
emote_red_marionette_walk: 508
emote_red_marionette_bow: 509
emote_red_marionette_dance: 510
emote_blue_marionette_jump: 511
emote_blue_marionette_walk: 512
emote_blue_marionette_bow: 513
emote_blue_marionette_dance: 514
emote_green_marionette_jump: 515
emote_green_marionette_walk: 516
emote_green_marionette_bow: 517
emote_green_marionette_dance: 518
emote_chocatrice_cape: 1566
emote_squirrel_ears: 2145
level_up: 199
home_tele_1: 775
home_tele_2: 800
Expand Down
15 changes: 15 additions & 0 deletions data/definitions/interfaces.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,11 @@ trade_side:
dialogue_tutorial_text:
id: 372
type: dialogue_box
morph:
id: 375
type: overlay_tab
components:
unmorph: 3
slayer_rewards_learn: 378
wilderness_skull:
id: 381
Expand Down Expand Up @@ -1704,6 +1709,16 @@ emotes:
puppet_master: 50
taskmaster: 51
seal_of_approval: 52
diangos_item_retrieval:
id: 468
type: main_screen
components:
items:
id: 2
inventory: diangos_item_retrieval
options:
Claim: 0
Examine: 9
barbarian_assult_rewards: 473
barbarian_assult_horn: 484
barbarian_assult_attacker: 485
Expand Down
115 changes: 77 additions & 38 deletions data/definitions/inventories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ horviks_armour_shop:
- mithril_platebody: 10
al_kharid_general_store:
id: 3
shop: true
defaults:
- empty_pot: 30
- jug: 10
Expand All @@ -41,8 +42,9 @@ al_kharid_general_store:
- hammer: 10
- newcomer_map: 10
- security_book: 10
inventory_4:
edgeville_general_store:
id: 4
shop: true
defaults:
- empty_pot: 30
- jug: 10
Expand Down Expand Up @@ -164,15 +166,17 @@ zekes_superior_scimitars:
- mithril_scimitar: 10
louies_armoured_legs_bazaar:
id: 12
shop: true
defaults:
- bronze_platelegs: 10
- iron_platelegs: 10
- steel_platelegs: 10
- black_platelegs: 10
- mithril_platelegs: 10
- adamant_platelegs: 10
karamja_general_store:
varrock_general_store:
id: 13
shop: true
defaults:
- empty_pot: 30
- jug: 10
Expand Down Expand Up @@ -210,6 +214,7 @@ cassies_shield_shop:
- mithril_sq_shield: 10
ranaels_super_skirt_store:
id: 16
shop: true
defaults:
- bronze_plateskirt: 10
- iron_plateskirt: 10
Expand Down Expand Up @@ -380,6 +385,7 @@ gerrants_fishy_business:
- raw_swordfish: 0
rimmington_general_store:
id: 31
shop: true
defaults:
- empty_pot: 30
- jug: 10
Expand Down Expand Up @@ -420,6 +426,7 @@ scavvos_rune_store:
- studded_leather_coif: 10
falador_general_store:
id: 34
shop: true
defaults:
- empty_pot: 30
- jug: 10
Expand Down Expand Up @@ -1361,8 +1368,9 @@ inventory_135:
id: 135
defaults:
- rotten_tomato: 100
inventory_137:
diangos_toy_store:
id: 137
shop: true
defaults:
- toy_horsey_brown: 10
- toy_horsey_white: 10
Expand Down Expand Up @@ -1470,8 +1478,9 @@ canifis_general_store:
- hammer: 10
- sample_bottle: 10
- knife: 10
inventory_146:
dommiks_crafting_store:
id: 146
shop: true
defaults:
- chisel: 10
- ring_mould: 10
Expand Down Expand Up @@ -3459,8 +3468,9 @@ void_knight_general_store:
- hammer: 10
- bronze_hatchet: 10
- field_ration: 50
inventory_391:
karamja_general_store:
id: 391
shop: true
defaults:
- empty_pot: 30
- jug: 10
Expand Down Expand Up @@ -4457,40 +4467,69 @@ inventory_452:
- hunter_cape_2: 1
- quest_point_cape_2: 1
- more: 1
inventory_453:
diangos_item_retrieval:
id: 453
defaults:
- reindeer_hat_2: 1
- jack_lantern_mask_2: 1
- skeleton_boots_2: 1
- skeleton_gloves_2: 1
- skeleton_leggings_2: 1
- skeleton_shirt_2: 1
- skeleton_mask_2: 1
- easter_ring_2: 1
- bobble_hat_2: 1
- bobble_scarf_2: 1
- blue_marionette_2: 1
- zombie_head_2: 1
- rubber_chicken_2: 1
- yo_yo_2: 1
- bunny_ears_2: 1
- scythe_2: 1
- chicken_head_2: 1
- chicken_feet_2: 1
- chicken_wings_2: 1
- chicken_legs_2: 1
- grim_reaper_hood_2: 1
- snow_globe_2: 1
- chocatrice_cape_2: 1
- witch_top_2: 1
- witch_skirt_2: 1
- witch_cloak_2: 1
- cornucopia_2: 1
- santa_costume_top_3: 1
- ice_amulet_2: 1
- easter_carrot_2: 1
- more: 1
length: 58
defaults:
- bunny_ears: 1
- scythe: 1
- yo_yo: 1
- rubber_chicken: 1
- zombie_head: 1
- easter_ring: 1
- bobble_hat: 1
- bobble_scarf: 1
- jester_hat: 1
- jester_scarf: 1
- tri_jester_hat: 1
- tri_jester_scarf: 1
- woolly_hat: 1
- woolly_scarf: 1
- reindeer_hat: 1
- blue_marionette: 1
- jack_lantern_mask: 1
- skeleton_boots: 1
- skeleton_gloves: 1
- skeleton_leggings: 1
- skeleton_shirt: 1
- skeleton_mask: 1
- wintumber_tree: 1
- chicken_feet: 1
- chicken_legs: 1
- chicken_wings: 1
- chicken_head: 1
- grim_reaper_hood: 1
- snow_globe: 1
- chocatrice_cape: 1
- witch_top: 1
- witch_skirt: 1
- witch_cloak: 1
- santa_costume_top: 1
- santa_costume_legs: 1
- santa_costume_gloves: 1
- santa_costume_boots: 1
- ice_amulet: 1
- cornucopia: 1
- easter_carrot: 1
- eek: 1
- web_cloak: 1
- candy_cane: 1
- christmas_ghost_hood: 1
- christmas_ghost_top: 1
- christmas_ghost_bottoms: 1
- squirrel_ears: 1
- bone_brooch: 1
- flagstaff_of_festivities: 1
- magnifying_glass: 1
- investigators_hat: 1
- investigators_trousers: 1
- investigators_coat: 1
- mysterious_book: 1
- salty_claws_hat: 1
- heimland_games_souvenir: 1
- golden_cracker: 1
- tenth_anniversary_cake: 1
- hati_head: 1
inventory_454:
id: 454
defaults:
Expand Down
Loading
Loading