Skip to content

Commit

Permalink
0.99.6-RC6x
Browse files Browse the repository at this point in the history
Added dummy context restore function to additional scripts
Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!)
Updated Smart Turn script for furniture (js/server/misc/furniture_smartturn.js) with more optimized code (Humility)
Fixed latitude/longitude output of GetMapCoordinates helper function (js/server/data/map_coordinates.js), and updated scripts that relied on it
Fixed an issue where trying to craft fletching tools would produce hatchets instead (js/skill/craft/fletching.js)
Updated js/item/bankcheck.js to display value of checks using onTooltip JS Event, or onNameRequest JS Event if tooltips are disabled
Fixed a couple of DFN formatting issues (thanks, punt)
Fixed an issue where blank deeds (and bank checks) would be pileable if dropped on the same container (dfndata/items/tools/inscription.dfn)
Added dedicated [bankcheck] DFN item (dfndata/items/misc/money.dfn)
Updated Banker AI script (js/npc/ai/banker.js) to use dedicated [bankcheck] item instead of blank deeds as base for bank checks, and to have banker NPCs pause and turn towards player when talked to
Fixed an issue with script for Healing/Veterinary (js/skill/healing.js) which incorrectly used Anatomy as supplementary skill for Veterinary instead of Animal Lore, and which checked dex of wrong character when calculating healing slips
Added two missing tile flags to tileflag enum that threw order of such flags added with HS expansion out of order (thanks, punt)
Fixed an issue with travel-commands in GM menu which handled travelling between facets incorrectly
Added region spawners for dungeons, towns and overworld in Ilshenar facet
Enabled Trammel and Ilshenar facet decorations/spawns by default in admin welcome script (js/server/misc/admin_welcome.js)
Reworked portions of admin welcome gump to display optional "addon" decorations per facet, which might be client/era-specific (js/server/misc/admin_welcome.js)
Added new NPCs to dfndata/npc/femalehuman.dfn: f_executioner, f_chaosdragoon, f_chaosdragoonelite, f_gypsybanker
Added new NPCs to dfndata/npc/femalevendors.dfn: f_gypsymaiden, f_gypsyanimaltrainer, f_gypsyfortuneteller, f_vagabond, f_ironworker
Added new NPCs to dfndata/npc/malehuman.dfn: m_executioner, m_chaosdragoon, m_chaosdragoonelite, m_gypsybanker
Added new NPCs to dfndata/npc/malevendors.dfn: m_gypsyanimaltrainer, m_vagabond, m_ironworker
Added new NPC to dfndata/npc/miscmonsters.dfn: darkwisp
Added new NPC to dfndata/npc/undead.dfn: ancientlich
Added new Item DFNs for "camps" that when spawned will create a camp with specific decorations ([ilsh_orc_camp], [ilsh_healer_camp], [ilsh_mage_camp], [ilsh_banker_camp])
Added scripts for camps (js/item/camps/ilsh_banker_camp.js, js/item/camps/ilsh_healer_camp.js, js/item/camps/ilsh_mage_camp.js, js/item/camps/ilsh_orc_camp.js)
Added new colorlist to dfndata/colors/colors.dfn: [RANDOMCOLOR 33] (Bright Primary Colors)
Fixed an issue with gargish cloth chest DFN which prevented LBR version from working properly (dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn)
Added a bunch of new NPCLISTS in various npclist DFN files to support regional spawns in Ilshenar
Added missing BACKPACK tag to [golem] NPC DFN (dfndata/npc/clockwork.dfn)
Fixed misspelled section header for Fire Elemental NPC - from firele to fireele (dfndata/npc/elementals.dfn)
Murderous brigand NPCs are no longer willing to teach players skills (dfndata/npc/femalehuman.dfn, dfndata/npc/malehuman.dfn)
Corrected coordinates of Rock Dungeon region (dfndata/regions/regions.dfn)
Added regions for Sea Market (Felucca/Trammel), Blackthorn Dungeon (Felucca/Trammel) and Lakeshire (Ilshenar) (dfndata/regions/regions.dfn)
Fixed an issue with 'radditem and 'raddspawner GM commands which would not correctly set the Z of the added item/spawner to match target location (js/commands/custom/repeatingcmds.js)
Added two new repeating commands (js/commands/custom/repeatingcmds.js):
	'rmovable #	// Repeats bringing up targeting cursor to set movable property on multiple objects
	'rnodecay	// Repeats bringing up targeting cursor to set decayable property to false on multiple objects
Added new areacommand (js/commands/targeting/areacommand.js):
	'areacommand name [string]	// Sets name of all objects within targeted area to [string]
Updated 'decorate command script to better handle flags passed in via admin welcome script for things like facet addons (js/commands/decorate.js)
Updated fire breath script (js/npc/special/fire_breath.js) to get fire breath info per NPC based on their sectionID rather than their base body ID
Updated facet ruleset script (js/server/misc/facetRuleset.js) with an override for GMs trying to snoop players even in places where snooping is disallowed
Updated facet ruleset script (js/server/misc/facetRuleset.js) to allow damage that's not coming from a player/NPC source even in Trammel/Ilshenar
Added teleport locations for entering/leaving Blackthorn Dungeon in Felucca/Trammel (js/teleport.scp)
Updated 'remove and 'rremove commands to release any targeted objects from potential multis they are locked in to properly update lockdown count (js/commands/targeting/remove.js, js/commands/custom/repeatingcmds.js)
Updated felucca/ilshenar world templates with decorations (js/jsdata/worldtemplates/felucca_*/ilshenar_*)
Added world templates with decorations for Trammel (js/jsdata/worldtemplates/trammel_*)
Added DFN entry for Power Generators, and spawn entries for these in Ilshenar (dfndata/item/puzzles/puzzles.dfn, dfndata/spawn/ilshenar/spawn_ilshenar_world_general.dfn)
Added script for Power Generators, which initializes random puzzles on creation and rewards player with diamonds/arcane gems/shadow iron ore when solved, or lightning when failing to solve (js/item/power_generator.js)
Added support for overriding newbie-state of items added to players via dfndata/newbie/newbie.dfn. Supported syntax:
	PACKITEM=sectionID[, amount[, newbieFlag]] 	// To use newbieFlag with PACKITEM, amount must also be specified. Flag can be 0/1
	EQUIPITEM=sectionID[, itemHue[, newbieFlag]	// To use newbieFlag with EQUIPITEM, itemHue must also be specified. Flag can be 0/1
Casting the Earthquake spell will no longer affect the caster, or cause them to become criminal when cast out of town with no impacted targets
Fixed a bug where caster would remain frozen after finishing casting targetless spells like Earthquake
Fixed a bug where caster would remain frozen if spellcast was cancelled half-ways through by picking up or equipping an item
Fixed a bug where caster would remain frozen if spellcast was interrupted by losing concentration from taking melee damage in combat
Fixed a bug where a paralyzed player would remain frozen even if taking magic or poison damage, which releases them from paralyzis
Fixed a bug where target of Paralyze spell would not visually be shown as frozen in target's client
Fixed a bug where a caster frozen while casting a spell could become unfrozen mid-cast because of incoming magic damage
Address overflow issue in MultiMul.cpp (punt)
Address various cast issues (punt)
Corrected jscript project, to not include two files that where for stand alone programs (and resulted in main being added twice in the library (and once was incorrect all ready). (punt)
Replaced RoundNumber with std::round (punt)
The original physical appearance of characters targeted by 'make admin/gm/cns is now kept track of, and restored upon being targeted by 'make player
Fixed an issue where the .HasSpell JS Method was off by 1 when looking for specific spells in player's spellbook, due to 0-based array indexing in code vs 1-based indexing for Spells in DFNs
  • Loading branch information
Xoduz committed Oct 13, 2023
1 parent 890f763 commit 667f948
Show file tree
Hide file tree
Showing 171 changed files with 60,721 additions and 18,230 deletions.
4 changes: 2 additions & 2 deletions assets/uox3.rc
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "UOX3"
VALUE "FileVersion", "0.99.6-RC6"
VALUE "FileVersion", "0.99.6-RC6x"
VALUE "InternalName", "UOX3.exe"
VALUE "OriginalFilename", "UOX3.exe"
VALUE "ProductName", "Ultima Offline eXperiment 3"
VALUE "ProductVersion", "0.99.6-RC6"
VALUE "ProductVersion", "0.99.6-RC6x"
END
END
BLOCK "VarFileInfo"
Expand Down
15 changes: 15 additions & 0 deletions data/dfndata/colors/colors.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -1605,4 +1605,19 @@
0x08a2
0x08a3
0x08a4
}

// Bright Primary Colors
[RANDOMCOLOR 33]
{
0x0003
0x000d
0x0013
0x001c
0x0021
0x0030
0x0037
0x003a
0x0044
0x0059
}
43 changes: 43 additions & 0 deletions data/dfndata/items/building/camps.dfn
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
[ilsh_healer_camp]
{
get=base_item
name=healer camp
id=0x13ab
morex=0x1f4
movable=2
visible=2
script=5500
}

[ilsh_orc_camp]
{
get=base_item
name=orc camp
id=0x13ab
morex=0x1f6d
movable=2
visible=2
script=5501
}

[ilsh_banker_camp]
{
get=base_item
name=banker camp
id=0x13ab
morex=0x1f6
movable=2
visible=2
script=5502
}

[ilsh_mage_camp]
{
get=base_item
name=mage camp
id=0x13ab
morex=0x1f5
movable=2
visible=2
script=5503
}
12 changes: 12 additions & 0 deletions data/dfndata/items/gear/armor/armor_sets/ranger_armor.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,16 @@ id=0x13e2
[rangertunic]
{
get=0x13db-ranger 0x13e2-ranger
}

// Bag with full ranger armor set
[rangerarmorset]
{
get=0x0e76
color=0x59c
packitem=rangersleeves
packitem=rangergloves
packitem=rangergorget
packitem=rangerleggings
packitem=rangertunic
}
2 changes: 1 addition & 1 deletion data/dfndata/items/gear/armor/base_armor.dfn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Ringmail

Ringmail Gloves - Base item with shared DFN tags
// Ringmail Gloves - Base item with shared DFN tags
[base_ring_gloves]
{
get=base_item
Expand Down
4 changes: 2 additions & 2 deletions data/dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ get=0x0403 0x405f

// -----------= CHEST =----------- //

// Gargish Cloth Chest
// Gargish Cloth Chest - E/W
[0x0406]
{
getlbr=0x0406_lbr - E/W
getlbr=0x0406_lbr
getaos=0x0406_aos
gettol=0x0406_tol
sectionid=0x0406
Expand Down
28 changes: 28 additions & 0 deletions data/dfndata/items/itemlists/itemlists.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,22 @@ practice_gnarled_staff
25|0x0df1
}

// Chaos Dragoon Weapons - Kryss, Broadsword, Katana
[ITEMLIST 205]
{
10|kryss
10|broadsword
10|katana
}

// Gypsy Headgear
[ITEMLIST 210]
{
jesterhat
bandana
skullcap
}

// Dungeon Treasures Level 1 - 4
// Special Itemlist for Container Spawn Objects!
[ITEMLIST dungeontreasureloot1]
Expand Down Expand Up @@ -1435,3 +1451,15 @@ itemlist=150
{
itemlist=200
}

// Chaos Dragoon Weapons - Kryss, Broadsword, Katana
[listobject205]
{
itemlist=205
}

// Gypsy Headgear
[gypsyheadgear]
{
itemlist=210
}
2 changes: 1 addition & 1 deletion data/dfndata/items/lootlists.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@
}

// Lich Lord - Magic wand or staff
[LOOTLIST lichLoot]
[LOOTLIST lichlordLoot]
{
50|blank
50|random_magic_wand_5
Expand Down
1 change: 1 addition & 0 deletions data/dfndata/items/misc/equippable-mounts.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ NEWBIE
{
NAME=a swampdragon
ID=0x3EBD
COLOR=0x851
LAYER=25
NEWBIE
}
Expand Down
13 changes: 13 additions & 0 deletions data/dfndata/items/misc/money.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,16 @@ name=copper coin
id=0x0eec
amount=20
}

[bankcheck]
{
get=base_item
name=a bank check
id=0x14F0
color=0x34
weight=100
pileable=0
decay=1
newbie=1
script=5015
}
45 changes: 45 additions & 0 deletions data/dfndata/items/puzzles/puzzles.dfn
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[powergenerator]
{
name=power generator
id=0x0073
colour=0x0451
weight=255
movable=0
script=5036//power generator.js
}

[powergenerator_2]
{
name=power generator
id=0x0076
colour=0x0451
weight=255
movable=0
}

[powergenerator_3]
{
name=power generator
id=0x0075
colour=0x0451
weight=255
movable=0
}

[powergenerator_4]
{
name=power generator
id=0x37f4
colour=0x0451
weight=255
movable=0
}

[powergenerator_ctrlpanel]
{
name=control panel
id=0x0bdc
colour=0x0835
weight=255
movable=0
}
2 changes: 1 addition & 1 deletion data/dfndata/items/skills/tools/inscription.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ id=0x14F0
weight=100
value=12 6
restock=20
pileable=1
pileable=0
amount=1
decay=1
good=56
Expand Down
Loading

0 comments on commit 667f948

Please sign in to comment.