Merge pull request #149 from polserver/master

Pull master into Spell-Improvements
polserver · Feb 11, 2024 · 401b0a1 · 401b0a1
2 parents 67b9e2e + 214a3ce
commit 401b0a1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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

diff --git a/pkg/commands/gm/summon.inc b/pkg/commands/gm/summon.inc
@@ -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);

diff --git a/pkg/multis/boat/config/itemdesc.cfg b/pkg/multis/boat/config/itemdesc.cfg
@@ -32,6 +32,12 @@ Item 0x1F011
 	OldObjType			0xF011
 }
 
+Item 0x1f01c
+{
+	SaveOnExit 0
+	Graphic 0x3E96
+}
+
 Item 0x1F012
 {
 	Name				Starboard_Plank
@@ -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

diff --git a/pkg/systems/attributes/include/skills.inc b/pkg/systems/attributes/include/skills.inc
@@ -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
 

diff --git a/pkg/systems/merchantnodes/include/nodeEvents.inc b/pkg/systems/merchantnodes/include/nodeEvents.inc
@@ -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