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

Timer fix #237

Closed
wants to merge 170 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
fc29355
Merge branch 'release-0.99.6' into develop
Xoduz Oct 14, 2023
ec89502
All UO Pumpkins
DragonSlayer62 Oct 15, 2023
630c66b
Added More pumpkins
DragonSlayer62 Oct 18, 2023
a104ba4
Updated halloween.dfn
DragonSlayer62 Oct 20, 2023
0ebc3f4
More Halloween
DragonSlayer62 Oct 21, 2023
a760882
Update headonaspike.js
DragonSlayer62 Oct 22, 2023
528e112
Updated Runbook
DragonSlayer62 Oct 25, 2023
684f0a7
Update Potion.js
DragonSlayer62 Oct 25, 2023
d20cad9
changelog update
DragonSlayer62 Oct 25, 2023
334959c
updated log
DragonSlayer62 Oct 26, 2023
44dc2b7
fixed change log
DragonSlayer62 Oct 26, 2023
f5c9804
Update cVersionClass.cpp
DragonSlayer62 Oct 26, 2023
ad55969
Move SetRandomName from Char to Base. Add NAMELIST tag support for i…
strattond Oct 26, 2023
d1695ba
Merge pull request #1 from strattond/GreatPumpkin
DragonSlayer62 Oct 27, 2023
b752caf
Update Changelog.txt
DragonSlayer62 Oct 27, 2023
a8e7e4f
Added namelist.dfn
DragonSlayer62 Oct 27, 2023
6b07e2c
Update items.cpp
DragonSlayer62 Oct 27, 2023
1723f41
updates
DragonSlayer62 Oct 27, 2023
8389828
Update Docs
DragonSlayer62 Oct 27, 2023
aaf9dc2
Update and Fixes
DragonSlayer62 Oct 28, 2023
fa7ea38
minor fixes
DragonSlayer62 Oct 29, 2023
743edb4
Halloween Event
DragonSlayer62 Oct 29, 2023
ed370e4
changelog update
DragonSlayer62 Oct 29, 2023
9a05855
fix color
DragonSlayer62 Oct 29, 2023
7a47c55
Merge pull request #212 from DragonSlayer62/GreatPumpkin
Xoduz Oct 29, 2023
9403eda
First Aid Belt
DragonSlayer62 Oct 29, 2023
93459a0
Update bandagehealingbonus.js
DragonSlayer62 Oct 29, 2023
25fb7e4
Update ej_clothing.dfn
DragonSlayer62 Oct 29, 2023
20e19c1
Update bandagehealingbonus.js
DragonSlayer62 Oct 29, 2023
7b17025
Update Changelog.txt
DragonSlayer62 Oct 29, 2023
a785cae
renamed file
DragonSlayer62 Oct 29, 2023
9a45c29
Fixed healing Bonus
DragonSlayer62 Oct 29, 2023
172983a
Added msg to dictionary files
DragonSlayer62 Oct 30, 2023
97f5938
UOR Weapon Abilities
DragonSlayer62 Oct 31, 2023
80ef79d
Spell Channeling Property
DragonSlayer62 Oct 31, 2023
3c8c0cc
Update Life_drain
DragonSlayer62 Nov 2, 2023
ff565d7
Update weapon_abilities.js
DragonSlayer62 Nov 7, 2023
4bad740
Merge pull request #216 from DragonSlayer62/life_drain
Xoduz Nov 7, 2023
ce64649
Merge branch 'develop' into UOR-Weapon-abilities
Xoduz Nov 7, 2023
1b6e803
Merge branch 'develop' into First-Aid-Belt
DragonSlayer62 Nov 8, 2023
ae1f0ab
Merge branch 'develop' into Spell-Channeling-Property
DragonSlayer62 Nov 8, 2023
e3eb237
Updated Smelting and unraveling
DragonSlayer62 Nov 9, 2023
27b53e3
T2A Weapons and Armors
DragonSlayer62 Nov 10, 2023
d26d051
Fix typos making BODs unable to be turned in.
Nov 10, 2023
a548c56
Merge branch 'develop' into bod-fixes
Nov 10, 2023
467a036
Merge pull request #220 from danielshoun/bod-fixes
Xoduz Nov 10, 2023
bebad07
Fix switch case for Sturdy Shovel BOD reward.
Nov 10, 2023
72a2e2b
Fixed information
DragonSlayer62 Nov 10, 2023
ab51fcd
Update Js spells
DragonSlayer62 Nov 10, 2023
773199b
Merge branch 'develop' into Spell-Channeling-Property
DragonSlayer62 Nov 10, 2023
e81182a
Merge branch 'develop' into T2A_Armor_Weapons
DragonSlayer62 Nov 10, 2023
ce27070
Merge branch 'develop' into smelting-update
DragonSlayer62 Nov 10, 2023
62dc86f
Modify effective skills instead of base skills with boost items.
Nov 10, 2023
9effa8e
Missing Item IDs for Gumps
DragonSlayer62 Nov 10, 2023
b7fe955
Improvements to BOD GUMP UX.
Nov 11, 2023
058418a
Formatting fixes.
Nov 11, 2023
d92f3cb
Merge branch 'bod-reward-errors' into tailor-bods
Nov 11, 2023
60686e0
Rename smallbod DFN item to smallbod_blacksmith.
Nov 11, 2023
71b4f9b
Merge pull request #221 from danielshoun/bod-reward-errors
Xoduz Nov 11, 2023
d13e273
Merge branch 'develop' into smelting-update
Xoduz Nov 11, 2023
03f4669
Merge branch 'develop' into UOR-Weapon-abilities
Xoduz Nov 11, 2023
747cb03
Merge branch 'develop' into First-Aid-Belt
Xoduz Nov 11, 2023
f80b73b
Merge branch 'develop' into Spell-Channeling-Property
Xoduz Nov 11, 2023
5126f0b
Merge branch 'develop' into bod-gump-fix
Xoduz Nov 11, 2023
63e6554
Merge pull request #223 from danielshoun/bod-gump-fix
Xoduz Nov 11, 2023
e1b3f8a
Merge branch 'develop' into srtocking-ids
Xoduz Nov 11, 2023
2817081
Merge branch 'develop' into First-Aid-Belt
Xoduz Nov 11, 2023
8c3b51b
Merge pull request #213 from DragonSlayer62/First-Aid-Belt
Xoduz Nov 11, 2023
612262b
Merge branch 'develop' into srtocking-ids
Xoduz Nov 11, 2023
4912172
Add bodSubtype to blacksmith BOD vendor DFNs.
Nov 11, 2023
78dd79e
Add bodType tag to deed DFNs.
Nov 11, 2023
4ef9c47
Merge branch 'develop' into tailor-bods
Nov 11, 2023
3d56a33
Add amount prop to cloth rewards.
Nov 11, 2023
5e9acea
Add BOD related properties to tailor DFNs.
Nov 11, 2023
96fba4a
Add colors for cloth and sandal BOD rewards.
Nov 11, 2023
4f8085a
Fix bug that prevents BODs from requiring exceptional items.
Nov 11, 2023
4c392b6
Reorder params of SetJSTimer.
Nov 11, 2023
bb63d09
Updates to comments and formatting.
Nov 11, 2023
cd68f4b
Change all single quote strings to double quotes.
Nov 11, 2023
ce6e5f4
Allow any NPC that vendors a BOD type to accept that BOD type.
Nov 11, 2023
f44d680
Formatting fixes.
Nov 11, 2023
6e2905c
Update Changelog.txt
DragonSlayer62 Nov 11, 2023
5af7545
Merge branch 'srtocking-ids' of https://github.com/DragonSlayer62/UOX…
DragonSlayer62 Nov 11, 2023
19d2f29
Merge branch 'develop' into Spell-Channeling-Property
DragonSlayer62 Nov 11, 2023
24e1c5e
Spellbook line changes
DragonSlayer62 Nov 11, 2023
f97faed
Merge pull request #222 from DragonSlayer62/srtocking-ids
Xoduz Nov 11, 2023
643b6e2
Merge branch 'develop' into T2A_Armor_Weapons
Xoduz Nov 11, 2023
f6461de
Merge pull request #218 from DragonSlayer62/T2A_Armor_Weapons
Xoduz Nov 11, 2023
63e9315
Merge branch 'develop' into Spell-Channeling-Property
Xoduz Nov 11, 2023
63dae8a
Merge branch 'develop' into smelting-update
Xoduz Nov 11, 2023
efc8950
Merge pull request #215 from DragonSlayer62/Spell-Channeling-Property
Xoduz Nov 11, 2023
affa97c
Fix timers.
Nov 11, 2023
79d9951
Fix condition causing onSpeech to trigger for all vendors in radius.
Nov 11, 2023
8718e2c
Merge branch 'develop' into tailor-bods
Nov 11, 2023
108da9a
Add comment above unimplemented rewards.
Nov 11, 2023
11f3c48
Select random BOD subtype when adding via commands.
Nov 11, 2023
f368d76
Formatting fixes.
Nov 11, 2023
9f165e5
Update Changelog.txt
Nov 11, 2023
b4c0aab
Fix mistakes in Changelog updates.
Nov 11, 2023
9c216ed
Christmas Items
DragonSlayer62 Nov 12, 2023
d60f316
Update ItemMenu.bulk.dfn
DragonSlayer62 Nov 12, 2023
d2a7ea3
Fix anvil item names in blacksmith BOD reward list.
Nov 12, 2023
32742d1
Added Krampus
DragonSlayer62 Nov 12, 2023
ab57800
Update weapon_abilities.js
DragonSlayer62 Nov 12, 2023
e5ceb6c
Update weapon_abilities.js
DragonSlayer62 Nov 12, 2023
57ad72b
Merge pull request #224 from danielshoun/tailor-bods
Xoduz Nov 12, 2023
8326bc0
Merge branch 'develop' into UOR-Weapon-abilities
Xoduz Nov 12, 2023
2c0e22c
Merge branch 'develop' into smelting-update
Xoduz Nov 12, 2023
6c4221d
Merge branch 'develop' into Christmas-Items
Xoduz Nov 12, 2023
10f47f8
Update
DragonSlayer62 Nov 12, 2023
c38d008
Add ton of missing items
DragonSlayer62 Nov 12, 2023
0c3ec8a
Update material_types.js
DragonSlayer62 Nov 12, 2023
7ba7c7e
Fixed Deed Expansions
DragonSlayer62 Nov 12, 2023
f1cec76
update dictionaries with messages
DragonSlayer62 Nov 13, 2023
dbb3660
Update dictionary.ENG
DragonSlayer62 Nov 13, 2023
100c0b2
Treasure Hunting System
DragonSlayer62 Nov 13, 2023
73bb53d
Update mapitem.js
DragonSlayer62 Nov 13, 2023
92f3ea8
changed tags
DragonSlayer62 Nov 13, 2023
c2d3d6b
Update mapitem.js
DragonSlayer62 Nov 13, 2023
a360c1a
use explicit script ids for spinningwheel callback
gameswarden Nov 14, 2023
ada426e
Merge pull request #230 from gameswarden/spinningwheel-fix
Xoduz Nov 14, 2023
6f5ec00
Merge branch 'develop' into treasure-maps-and-maps
DragonSlayer62 Nov 14, 2023
f5143e0
Major Update
DragonSlayer62 Nov 14, 2023
0172023
Merge branch 'develop' into bod-deed-update
DragonSlayer62 Nov 14, 2023
5b95985
Update misc_deeds.dfn
DragonSlayer62 Nov 14, 2023
2cff133
Merge pull request #226 from DragonSlayer62/bod-deed-update
Xoduz Nov 14, 2023
60b6f6e
Merge branch 'develop' into treasure-maps-and-maps
Xoduz Nov 14, 2023
651c7cf
Update Changelog.txt
DragonSlayer62 Nov 14, 2023
320da7e
Merge branch 'treasure-maps-and-maps' of https://github.com/DragonSla…
DragonSlayer62 Nov 14, 2023
ab943d1
Merge branch 'develop' into UOR-Weapon-abilities
DragonSlayer62 Nov 14, 2023
d21a66e
Merge branch 'develop' into smelting-update
DragonSlayer62 Nov 14, 2023
7bfeb72
Merge branch 'develop' into Christmas-Items
DragonSlayer62 Nov 14, 2023
c4a1121
small update
DragonSlayer62 Nov 14, 2023
9e96273
Updated crafting rank system
gameswarden Nov 14, 2023
51293f5
Update changelog
gameswarden Nov 14, 2023
06df764
Rebalanced rank scaling
gameswarden Nov 14, 2023
9640d34
Merge pull request #217 from DragonSlayer62/smelting-update
Xoduz Nov 15, 2023
6d42956
Merge branch 'develop' into balance-rank-system
Xoduz Nov 15, 2023
b6eb842
Merge pull request #232 from gameswarden/balance-rank-system
Xoduz Nov 15, 2023
96cf406
Merge branch 'develop' into treasure-maps-and-maps
Xoduz Nov 15, 2023
b43b51c
Update mapitem.js
DragonSlayer62 Nov 15, 2023
d27dc89
Merge branch 'develop' into Christmas-Items
Xoduz Nov 15, 2023
f89cfe8
Merge branch 'develop' into UOR-Weapon-abilities
DragonSlayer62 Nov 15, 2023
667f39c
Update
DragonSlayer62 Nov 15, 2023
a005732
Update to dfn
DragonSlayer62 Nov 15, 2023
547f18e
Update Changelog.txt
DragonSlayer62 Nov 15, 2023
836b5d8
Update weapon_abilities.js
DragonSlayer62 Nov 16, 2023
1d45409
update
DragonSlayer62 Nov 16, 2023
6d28898
Merge pull request #214 from DragonSlayer62/UOR-Weapon-abilities
Xoduz Nov 17, 2023
b787021
Update
DragonSlayer62 Nov 17, 2023
23ddae5
Merge branch 'develop' into Christmas-Items
Xoduz Nov 17, 2023
de9f082
Merge pull request #225 from DragonSlayer62/Christmas-Items
Xoduz Nov 17, 2023
aa5f974
Fixed Z
DragonSlayer62 Nov 18, 2023
44543b1
Merge pull request #234 from DragonSlayer62/MapStuff
Xoduz Nov 18, 2023
18d3f6d
Merge branch 'develop' into treasure-maps-and-maps
DragonSlayer62 Nov 18, 2023
e158c70
update
DragonSlayer62 Nov 19, 2023
13c1c57
Update mapitem.js
DragonSlayer62 Nov 19, 2023
c9ec268
Update treasuredigging.js
DragonSlayer62 Nov 19, 2023
a332236
Update treasuredigging.js
DragonSlayer62 Nov 19, 2023
72d90b0
Update treasuredigging.js
DragonSlayer62 Nov 19, 2023
d7eff0c
Update treasuredigging.js
DragonSlayer62 Nov 19, 2023
f045ced
update
DragonSlayer62 Nov 19, 2023
370104a
small miss
DragonSlayer62 Nov 19, 2023
7518b49
Update treasuremaps.dfn
DragonSlayer62 Nov 19, 2023
2cb555b
Update jse_fileassociations.scp
DragonSlayer62 Nov 19, 2023
017e644
instant logout
DragonSlayer62 Nov 19, 2023
914b15b
Merge pull request #235 from DragonSlayer62/Refresh-Logout
Xoduz Nov 19, 2023
c6f9336
Merge branch 'develop' into treasure-maps-and-maps
Xoduz Nov 19, 2023
80768f3
Merge pull request #229 from DragonSlayer62/treasure-maps-and-maps
Xoduz Nov 19, 2023
7b71d68
Timer call in Main
DragonSlayer62 Nov 24, 2023
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
34 changes: 34 additions & 0 deletions data/dfndata/colors/colors.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -1620,4 +1620,38 @@
0x003a
0x0044
0x0059
}

// Brightly Colored Rock Candy
[RANDOMCOLOR 34]
{
0x113
0x19
0x13
0x63
0x68
0x58
0x89
0x98
0x3
0x28
0x33
0x55
0x48
}

// Small Web Halloween Colo
[RANDOMCOLOR 35]
{
0x0
0x455
0x4E9
}

// TwilightLantern and Ghoul Statue Colors
[RANDOMCOLOR 36]
{
0x0
0x03b3
0x08e
}
263 changes: 263 additions & 0 deletions data/dfndata/house/house.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,45 @@ MAXTRASHCONTAINERS=1
SCRIPT=15000
}

// Christmas tree
[HOUSE 39]
{
NAME=a tree for the holidays
ID=0x0CD6
CHARX=0
CHARY=0
CHARZ=0
HOUSE_ITEM=343
HOUSE_ITEM=344
HOUSE_ITEM=345
HOUSE_ITEM=346
HOUSE_ITEM=347
HOUSE_ITEM=348
HOUSE_ITEM=349
HOUSE_ITEM=350
HOUSE_ITEM=351
HOUSE_ITEM=352
HOUSE_ITEM=353
HOUSE_ITEM=354
HOUSE_ITEM=355
HOUSE_ITEM=356
HOUSE_ITEM=357
HOUSE_ITEM=358
HOUSE_ITEM=359
HOUSE_ITEM=360
HOUSE_ITEM=361
HOUSE_ITEM=362
HOUSE_ITEM=363
HOUSE_ITEM=364
HOUSE_ITEM=365
HOUSE_ITEM=366
HOUSE_ITEM=367
HOUSE_ITEM=368
HOUSE_ITEM=369
HOUSE_ITEM=370
HOUSE_ITEM=371
}

// House Addon - brown bear rug (east)
[HOUSE 40]
{
Expand Down Expand Up @@ -2279,6 +2318,230 @@ Y=-5
Z=29
}

[HOUSE ITEM 344]
{ christmas tree ornament
ITEM=treeornament1
X=0
Y=1
Z=12
}

[HOUSE ITEM 345]
{ christmas tree ornament
ITEM=treeornament4
X=0
Y=1
Z=13
}

[HOUSE ITEM 346]
{ christmas tree ornament
ITEM=treeornament3
X=0
Y=1
Z=18
}

[HOUSE ITEM 347]
{ christmas tree ornament
ITEM=treeornament6
X=0
Y=1
Z=19
}

[HOUSE ITEM 348]
{ christmas tree ornament
ITEM=treeornament27
X=0
Y=1
Z=25
}

[HOUSE ITEM 349]
{ christmas tree ornament
ITEM=treeornament24
X=0
Y=1
Z=29
}

[HOUSE ITEM 350]
{ christmas tree ornament
ITEM=treeornament25
X=0
Y=1
Z=37
}

[HOUSE ITEM 351]
{ christmas tree ornament
ITEM=treeornament2
X=1
Y=0
Z=13
}

[HOUSE ITEM 352]
{ christmas tree ornament
ITEM=treeornament21
X=1
Y=0
Z=14
}

[HOUSE ITEM 353]
{ christmas tree ornament
ITEM=treeornament5
X=1
Y=0
Z=16
}

[HOUSE ITEM 354]
{ christmas tree ornament
ITEM=treeornament15
X=1
Y=0
Z=17
}

[HOUSE ITEM 355]
{ christmas tree ornament
ITEM=treeornament16
X=1
Y=0
Z=22
}

[HOUSE ITEM 356]
{ christmas tree ornament
ITEM=treeornament22
X=0
Y=1
Z=7
}

[HOUSE ITEM 357]
{ christmas tree ornament
ITEM=treeornament7
X=0
Y=1
Z=7
}

[HOUSE ITEM 358]
{ christmas tree ornament
ITEM=treeornament17
X=0
Y=0
Z=34
}

[HOUSE ITEM 359]
{ christmas tree ornament
ITEM=treeornament18
X=0
Y=0
Z=33
}

[HOUSE ITEM 360]
{ christmas tree ornament
ITEM=treeornament24
X=0
Y=0
Z=32
}

[HOUSE ITEM 361]
{ christmas tree ornament
ITEM=treeornament13
X=0
Y=0
Z=30
}

[HOUSE ITEM 362]
{ christmas tree ornament
ITEM=treeornament26
X=0
Y=0
Z=28
}

[HOUSE ITEM 363]
{ christmas tree ornament
ITEM=treeornament20
X=0
Y=0
Z=21
}

[HOUSE ITEM 364]
{ christmas tree ornament
ITEM=treeornament10
X=0
Y=0
Z=20
}

[HOUSE ITEM 365]
{ christmas tree ornament
ITEM=treeornament23
X=0
Y=0
Z=20
}

[HOUSE ITEM 366]
{ christmas tree ornament
ITEM=treeornament14
X=0
Y=0
Z=20
}

[HOUSE ITEM 367]
{ christmas tree ornament
ITEM=treeornament8
X=0
Y=0
Z=19
}

[HOUSE ITEM 368]
{ christmas tree ornament
ITEM=treeornament11
X=0
Y=0
Z=15
}

[HOUSE ITEM 369]
{ christmas tree ornament
ITEM=treeornament9
X=0
Y=0
Z=9
}

[HOUSE ITEM 370]
{ christmas tree ornament
ITEM=treeornament12
X=0
Y=0
Z=2
}

[HOUSE ITEM 371]
{ christmas tree needles
ITEM=treeneedles
X=0
Y=0
Z=0
}

[HOUSE ITEM 386]
{ brown bear rug east 1/9
ITEM=brownbearrug9
Expand Down
Loading