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.

Sign up for GitHub

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

Pull master into Spell-Improvements #149

Merged
merged 2 commits into from
Feb 11, 2024
Merged

Pull master into Spell-Improvements #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
978ae2b
Add POSIX executables to .gitignore (#147)
KevinEady Jan 11, 2024
214a3ce
Changes to support pol 100.1 (#148)
KevinEady Feb 7, 2024
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
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,22 @@ pol.cfg
*.bak

# POL binaries and cfgs that are in the polserver release
pol
pol.exe
libmysql.dll
uoconvert
uoconvert.exe
uoconvert.cfg
uoconvert.txt
uotool
uotool.exe
uotool.txt
ecompile
ecompile.exe
poltool
poltool.exe
ecompile.cfg
runecl
runecl.exe
pol.cfg.example
animxlate.cfg
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/gm/summon.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function summon_creature( caster, circle := 8, npctemplate, cast_loc, gate)
sleep(2);
thecritter := CreateNpcFromTemplate(npctemplate, 5849, 1207, 0, parms, caster.realm);
if(npctemplate == "daemon")
thecritter.setCriminal(1);w
thecritter.setCriminal(1);
caster.setCriminal(1);
endif
MoveObjectToLocation(thecritter, cast_loc.x, cast_loc.y, cast_loc.z, thecritter.realm, MOVEOBJECT_FORCELOCATION);
Expand Down
16 changes: 16 additions & 0 deletions pkg/multis/boat/config/itemdesc.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ Item 0x1F011
OldObjType 0xF011
}

Item 0x1f01c
{
SaveOnExit 0
Graphic 0x3E96
}

Item 0x1F012
{
Name Starboard_Plank
Expand Down Expand Up @@ -88,6 +94,16 @@ Item 0x1F017
CanInsertScript tiller/canInsert
}

Item 0x1F014
{
Name Rope
# Note, graphic will get replaced by what's in boats.cfg
graphic 1
script mooringLine
UseRequiresLOS 0
DoubleClickRange 5
}

Item 0x1F018
{
Name Rudder
Expand Down
6 changes: 3 additions & 3 deletions pkg/systems/attributes/include/skills.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,11 @@ function GetTrueEffectiveSkill(who, skillid)
var base := GetAttributeBaseValue(who, id);
var mod1 := GetAttributeTemporaryMod(who, id);
var mod2 := GetAttributeIntrinsicMod(who, id);
var true := Cdbl((base + mod1 + mod2)/ 10.0);
if(true < 0.0)
var val := Cdbl((base + mod1 + mod2)/ 10.0);
if(val < 0.0)
return 0.0;
else
return true;
return val;
endif
endfunction

Expand Down
8 changes: 0 additions & 8 deletions pkg/systems/merchantnodes/include/nodeEvents.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,3 @@ enum MN_EVENTS
SPAWN_EVENT := 0x80,
UPDATE_EVENT := 0x100
endenum

// Kind of silly but these are here for the two scripts started,
// makes the second parameter passed in the array more clear as
// to what is going on...
enum SCRIPT_OPTS
FALSE := 0x0,
TRUE := 0x1
endenum
Loading