Skip to content

Commit a0a78c1

Browse files
author
coruja
committed
Script pack update:
[sphere_defs.scp]: Added missing defs for 'colors_metal' and 'colors_bright' [sphere_template.scp]: Added missing 'random_talisman' template [sphere_skills.scp]: Removed USESMAX behavior from Fishing skill (I dont know why, but OSI doesn't seems to use the 'Uses Remaining' behavior on this skill) [items/*]: Added missing USESMAX property on skill tools items (and removed from i_pole_fishing) [towns/sphere_town_dlg_master.scp]: Fixed console error [replaced function f_stonesys_iswarring -> f_townsys_iswarring] [towns/sphere_town_functions.scp]: Fixed console error [replaced typedef t_town_town -> t_stone_town]
1 parent 6aaaf24 commit a0a78c1

11 files changed

+70
-40
lines changed

‎items/sphere_item_profession.scp

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2007
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Tuesday, November 5, 2013
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -65,10 +65,6 @@ SUBSECTION=Fisherman
6565
DESCRIPTION=Fishing Pole
6666
DUPELIST=0dc0
6767

68-
69-
ON=@Create
70-
UsesMax={25 75}
71-
7268
[ITEMDEF 0dc0]
7369
//fishing pole
7470
DUPEITEM=0dbf
@@ -662,6 +658,8 @@ CATEGORY=Items by Professions
662658
SUBSECTION=Scribe
663659
DESCRIPTION=Pen & Ink
664660
DUPELIST=0fc0
661+
ON=@Create
662+
UsesMax={25 75}
665663

666664
[ITEMDEF 0fc0]
667665
//pen and ink
@@ -858,6 +856,8 @@ CATEGORY=Items by Professions
858856
SUBSECTION=Carpenter
859857
DESCRIPTION=Dovetail Saw
860858
DUPELIST=01029
859+
ON=@Create
860+
UsesMax={25 75}
861861

862862
[ITEMDEF 01029]
863863
//dovetail saw
@@ -875,6 +875,8 @@ CATEGORY=Items by Professions
875875
SUBSECTION=Carpenter
876876
DESCRIPTION=Hammer
877877
DUPELIST=0102b
878+
ON=@Create
879+
UsesMax={25 75}
878880

879881
[ITEMDEF 0102b]
880882
//hammer
@@ -892,6 +894,8 @@ CATEGORY=Items by Professions
892894
SUBSECTION=Carpenter
893895
DESCRIPTION=Moulding Planes
894896
DUPELIST=0102d
897+
ON=@Create
898+
UsesMax={25 75}
895899

896900
[ITEMDEF 0102d]
897901
//moulding planes
@@ -909,6 +913,8 @@ CATEGORY=Items by Professions
909913
SUBSECTION=Carpenter
910914
DESCRIPTION=Nails
911915
DUPELIST=0102f
916+
ON=@Create
917+
UsesMax={25 75}
912918

913919
[ITEMDEF 0102f]
914920
//nails
@@ -926,6 +932,8 @@ CATEGORY=Items by Professions
926932
SUBSECTION=Carpenter
927933
DESCRIPTION=Jointing Plane
928934
DUPELIST=01031
935+
ON=@Create
936+
UsesMax={25 75}
929937

930938
[ITEMDEF 01031]
931939
//jointing plane
@@ -943,6 +951,8 @@ CATEGORY=Items by Professions
943951
SUBSECTION=Carpenter
944952
DESCRIPTION=Smoothing Plane
945953
DUPELIST=01033
954+
ON=@Create
955+
UsesMax={25 75}
946956

947957
[ITEMDEF 01033]
948958
//smoothing plane
@@ -960,6 +970,8 @@ CATEGORY=Items by Professions
960970
SUBSECTION=Carpenter
961971
DESCRIPTION=Saw
962972
DUPELIST=01035
973+
ON=@Create
974+
UsesMax={25 75}
963975

964976
[ITEMDEF 01035]
965977
//saw
@@ -1224,6 +1236,8 @@ SKILLMAKE=Tinkering 21.4,t_tinker_tools
12241236
CATEGORY=Items by Professions
12251237
SUBSECTION=Carpenter
12261238
DESCRIPTION=Draw Knife
1239+
ON=@Create
1240+
UsesMax={25 75}
12271241

12281242
[ITEMDEF 010e5]
12291243
DEFNAME=i_froe
@@ -1235,6 +1249,8 @@ SKILLMAKE=Tinkering 29.7,t_tinker_tools
12351249
CATEGORY=Items by Professions
12361250
SUBSECTION=Carpenter
12371251
DESCRIPTION=Froe
1252+
ON=@Create
1253+
UsesMax={25 75}
12381254

12391255
[ITEMDEF 010e6]
12401256
DEFNAME=i_inshave
@@ -1246,6 +1262,8 @@ SKILLMAKE=Tinkering 31.2,t_tinker_tools
12461262
CATEGORY=Items by Professions
12471263
SUBSECTION=Carpenter
12481264
DESCRIPTION=Inshave
1265+
ON=@Create
1266+
UsesMax={25 75}
12491267

12501268
[ITEMDEF 010e7]
12511269
DEFNAME=i_scorp
@@ -1257,7 +1275,8 @@ SKILLMAKE=Tinkering 26.3.2,t_tinker_tools
12571275
CATEGORY=Items by Professions
12581276
SUBSECTION=Carpenter
12591277
DESCRIPTION=Scorp
1260-
1278+
ON=@Create
1279+
UsesMax={25 75}
12611280

12621281
[ITEMDEF 012a5]
12631282
DEFNAME=i_cards_tarot
@@ -1296,7 +1315,6 @@ DUPEITEM=012a5
12961315
//tarot
12971316
DUPEITEM=012a5
12981317

1299-
13001318
[ITEMDEF 012b3]
13011319
DEFNAME=i_mallet_and_chisel
13021320
TYPE=t_masonry_tool
@@ -1306,7 +1324,8 @@ RESOURCES=2 i_ingot_iron,1 i_board
13061324
CATEGORY=Items by Professions
13071325
SUBSECTION=Mason
13081326
DESCRIPTION=Mallet and Chisel
1309-
1327+
ON=@Create
1328+
UsesMax={25 75}
13101329

13111330
[ITEMDEF 01370]
13121331
DEFNAME=i_brush_horse
@@ -2691,6 +2710,8 @@ SKILLMAKE=TINKERING 35.0,t_tinker_tools
26912710
CATEGORY=Items by Professions
26922711
SUBSECTION=Tinker
26932712
DESCRIPTION=Tinker Tools
2713+
ON=@Create
2714+
UsesMax={25 75}
26942715

26952716
[ITEMDEF 01ebd]
26962717
DEFNAME=i_wheat_sheaf

‎items/sphere_item_profession_alchemist.scp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2007
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Friday, September 20, 2013
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -225,6 +225,8 @@ SKILLMAKE=Tinkering 23.3,t_tinker_tools
225225
CATEGORY=Items by Professions
226226
SUBSECTION=Alchemist
227227
DESCRIPTION=Mortar and Pestle
228+
ON=@Create
229+
UsesMax={25 75}
228230

229231

230232
[ITEMDEF 0efb]

‎items/sphere_item_profession_cartographer.scp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2007
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Friday, September 20, 2013
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -102,6 +102,8 @@ TYPE=t_cartography
102102
RESOURCES=1 i_ingot_iron
103103
SKILLMAKE=TINKERING 25.0, t_tinker_tools
104104
VALUE=7
105+
ON=@Create
106+
MaxUses={25 75}
105107

106108

107109
[ITEMDEF i_map_local]
@@ -112,7 +114,7 @@ SKILLMAKE=CARTOGRAPHY 0.0, t_cartography
112114
VALUE=3
113115

114116
ON=@Create
115-
IF (<SRC.ISCHAR>)
117+
IF (<SRC>)
116118
LOCAL.Radius=<eval 64+((<SRC.CARTOGRAPHY>*2)/10)>
117119
MORE1=<eval ((<SRC.P.X>-<LOCAL.Radius>)*010000)+(<SRC.P.Y>-<LOCAL.Radius>)>
118120
MORE2=<eval ((<SRC.P.X>+<LOCAL.Radius>)*010000)+(<SRC.P.Y>+<LOCAL.Radius>)>
@@ -127,7 +129,7 @@ SKILLMAKE=CARTOGRAPHY 25.0, t_cartography
127129
VALUE=3
128130

129131
ON=@Create
130-
IF (<SRC.ISCHAR>)
132+
IF (<SRC>)
131133
LOCAL.Radius=<eval 64+((<SRC.CARTOGRAPHY>*4)/10)>
132134
IF (<LOCAL.Radius> < 200)
133135
LOCAL.Radius=200
@@ -145,7 +147,7 @@ SKILLMAKE=CARTOGRAPHY 35.0, t_cartography
145147
VALUE=3
146148

147149
ON=@Create
148-
IF (<SRC.ISCHAR>)
150+
IF (<SRC>)
149151
LOCAL.Radius=<eval 64+((<SRC.CARTOGRAPHY>*10)/10)>
150152
IF (<LOCAL.Radius> < 200)
151153
LOCAL.Radius=200
@@ -163,7 +165,7 @@ SKILLMAKE=CARTOGRAPHY 50.0, t_cartography
163165
VALUE=3
164166

165167
ON=@Create
166-
IF (<SRC.ISCHAR>)
168+
IF (<SRC>)
167169
LOCAL.Radius=<eval (<SRC.CARTOGRAPHY>*20)/10>
168170
MORE2=<eval ((<SRC.P.X>+<LOCAL.Radius>)*010000)+(<SRC.P.Y>+<LOCAL.Radius>)>
169171
ENDIF

‎items/sphere_item_profession_cook_barkeep_baker.scp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2014
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Tuesday, October 7, 2014
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -181,7 +181,8 @@ SKILLMAKE=Tinkering 30.0,t_tinker_tools
181181
CATEGORY=Items by Professions
182182
SUBSECTION=Cook
183183
DESCRIPTION=Frypan
184-
184+
ON=@Create
185+
UsesMax={25 75}
185186

186187
[ITEMDEF 098c]
187188
DEFNAME=i_bread_french
@@ -1279,6 +1280,8 @@ SKILLMAKE=Tinkering 50.0,t_tinker_tools
12791280
CATEGORY=Items by Professions
12801281
SUBSECTION=Baker
12811282
DESCRIPTION=Flour Sifter
1283+
ON=@Create
1284+
UsesMax={25 75}
12821285

12831286
[ITEMDEF 0103f]
12841287
DEFNAME=i_cookie_mix
@@ -1342,6 +1345,8 @@ SKILLMAKE=Tinkering 0.0,t_tinker_tools
13421345
CATEGORY=Items by Professions
13431346
SUBSECTION=Baker
13441347
DESCRIPTION=Rolling Pin
1348+
ON=@Create
1349+
UsesMax={25 75}
13451350

13461351
[ITEMDEF 01044]
13471352
DEFNAME=i_spam

‎items/sphere_item_profession_tailor_tanner.scp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2014
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Tuesday, May 6, 2014
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -130,6 +130,8 @@ SKILLMAKE=Tinkering 18.8,t_tinker_tools,Tailoring 18.8
130130
CATEGORY=Items by Professions
131131
SUBSECTION=Tailor
132132
DESCRIPTION=Sewing Kit
133+
ON=@Create
134+
UsesMax={25 75}
133135

134136
[ITEMDEF 0f9e]
135137
DEFNAME=i_scissors

‎items/sphere_item_provisions_weapons.scp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2007
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Friday, October 18, 2013
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -551,6 +551,7 @@ TEVENTS=t_equipitem
551551
DUPELIST=0e86
552552
ON=@Create
553553
HITPOINTS={36 48}
554+
UsesMax=50
554555

555556
[ITEMDEF 0e86]
556557
//pickaxe
@@ -1051,6 +1052,7 @@ TEVENTS=t_equipitem
10511052
DUPELIST=0fb5
10521053
ON=@Create
10531054
HITPOINTS={36 48}
1055+
UsesMax={25 75}
10541056

10551057
[ITEMDEF 0fb5]
10561058
//sledge hammer

‎sphere_defs.scp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2014
2+
// SPHERE by : Menasoft �1997-2015
33
// www.sphereserver.net
44
// All SPHERE script files and formats are copyright Menasoft & Partners.
55
// This file may be freely edited for personal use, but may not be distributed
66
// in whole or in part, in any format without express written permission from
77
// Menasoft & Partners. All donations and contributions
88
// become the property of Menasoft & Partners.
99
//****************************************************************************
10-
// FILE LAST UPDATED: Sunday, Nov 30, 2014
10+
// FILE LAST UPDATED: Sunday, Feb 15, 2015
1111
//
1212
VERSION=0.56c
1313

@@ -82,7 +82,6 @@ mount_0x4e7 03ec8 // tigress
8282
[DEFNAME hues]
8383
color_text -1
8484
color_none 0
85-
color_metal 0
8685
color_red1 32
8786
color_red2 33
8887
color_cyan 88
@@ -110,7 +109,9 @@ colors_snake {2001 2018}
110109
colors_bird {2101 2130}
111110
colors_slime {2201 2224}
112111
colors_animal {2301 2318}
112+
colors_metal {2401 2430}
113113

114+
colors_bright {062 1 071 1 03 9 0d 9 013 9 01c 9 021 9 030 9 037 9 03a 9 044 9 059 9}
114115
colors_stone {2498 1 2500 1 {2671 2706} 1}
115116
colors_skin_gargoyle {1755 1779}
116117
colors_white 2301

0 commit comments

Comments
 (0)