codename-alex-dev-commits Mailing List for Codename Alexandria
Brought to you by:
scriptfellow,
wza
Menu
▾
▴
codename-alex-dev-commits — Track CVS commits
You can subscribe to this list here.
| 2003 |
Jan
(2) |
Feb
(2) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <wz...@us...> - 2003-03-09 10:03:21
|
Update of /cvsroot/codename-alex/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20286/src
Modified Files:
subs.txt
Log Message:
ADDED: WarLocke's exp sub
Index: subs.txt
===================================================================
RCS file: /cvsroot/codename-alex/src/subs.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** subs.txt 8 Mar 2003 21:04:58 -0000 1.10
--- subs.txt 9 Mar 2003 10:03:19 -0000 1.11
***************
*** 1424,1427 ****
--- 1424,1455 ----
;===========================================================
+ ; Name: exp
+ ; Author: WarLocke
+ ; Parameters: %1 = base #
+ ; %2 = exponent
+ ; Note: %2 must be greater than 0
+ ; Return: %return is %1 ** %2.
+ ; Example: call subs.txt exp 20 2
+ ; %return = 400
+ ;-----------------------------------------------------------
+ sub exp
+ if %2 > 0
+ {
+ set %return %1
+ for %_idx 2 %2
+ {
+ set %return %return * %1
+ }
+ }
+ else
+ {
+ if %2 = 0
+ set %return 1
+ else ;if %2 < 0 ; not possible until we have floating points in EUO?
+ set %return N/A
+ }
+ return
+
+ ;===========================================================
; Name: getString
; Author: Rolo
|
|
From: <wz...@us...> - 2003-03-08 21:08:56
|
Update of /cvsroot/codename-alex/QA
In directory sc8-pr-cvs1:/tmp/cvs-serv27685/QA
Modified Files:
subsTest0000.txt subsTest0001.txt subsTest0002.txt
subsTest0004.txt subsTest0005.txt
Log Message:
updated version
- use #true and #false
- ensureVersion and isStableRelease now in subs.txt
Index: subsTest0000.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0000.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0000.txt 21 Jan 2003 13:45:32 -0000 1.1
--- subsTest0000.txt 8 Mar 2003 21:08:53 -0000 1.2
***************
*** 1,3 ****
! ; force subs.txt _init
deleteVar subsInitialized
--- 1,3 ----
! ; force subs.txt _init, ensureVersion, isStableRelease
deleteVar subsInitialized
***************
*** 14,49 ****
+ subsVerRevision: %subsVerRevision $$
+ [subs.txt should be initialized]
! gosub ensureVersion 1 6
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! + "gosub ensureVersion 1 6" returned: %return $$
! + ( true: %_TRUE / false: %_FALSE )
! gosub isStableRelease
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
+ "gosub isStableRelease" returned: %return $$
! + ( true: %_TRUE / false: %_FALSE )
halt
-
- sub ensureVersion
- set %_1 %1
- call subs.txt andOr %subsVerMajor = %1 AND %subsVerMinor >= %2
- if %subsVerMajor > %_1
- {
- set %return %_TRUE
- }
- return
-
- sub isStableRelease
- call subs.txt andOr RC in %subsVerRevision OR %subsVerRevision in AlphaBeta
- if %return = %_TRUE
- {
- set %return %_FALSE
- return
- }
- set %_subsVerRevisionModulus %subsVerRevision % 2
- if %_subsVerRevisionModulus = 1
- set %return %_TRUE
- return
--- 14,70 ----
+ subsVerRevision: %subsVerRevision $$
+ [subs.txt should be initialized]
+
+ set %testMinor %subsVerMinor - 1
+ set %testMajor %subsVerMajor
+ call subs.txt ensureVersion %testMajor %testMinor
+ display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
+ + subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
+ + "gosub ensureVersion %testMajor %testMinor " returned: %return $$
+ + ( true: #true / false: #false )
! set %testMinor %subsVerMinor
! set %testMajor %subsVerMajor - 1
! call subs.txt ensureVersion %testMajor %testMinor
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! + "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! + ( true: #true / false: #false )
! set %testMinor %subsVerMinor
! set %testMajor %subsVerMajor
! call subs.txt ensureVersion %testMajor %testMinor
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! + "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! + ( true: #true / false: #false )
!
! set %testMinor %subsVerMinor + 1
! set %testMajor %subsVerMajor
! call subs.txt ensureVersion %testMajor %testMinor
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! + "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! + ( true: #true / false: #false )
!
! set %testMinor %subsVerMinor
! set %testMajor %subsVerMajor + 1
! call subs.txt ensureVersion %testMajor %testMinor
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! + "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! + ( true: #true / false: #false )
!
! set %testMinor %subsVerMinor - 1
! set %testMajor %subsVerMajor + 1
! call subs.txt ensureVersion %testMajor %testMinor
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! + "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! + ( true: #true / false: #false )
!
! call subs.txt isStableRelease
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
+ "gosub isStableRelease" returned: %return $$
! + ( true: #true / false: #false )
halt
Index: subsTest0001.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0001.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0001.txt 21 Jan 2003 13:45:32 -0000 1.1
--- subsTest0001.txt 8 Mar 2003 21:08:53 -0000 1.2
***************
*** 5,9 ****
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
--- 5,9 ----
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: #true )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
***************
*** 12,16 ****
call subs.txt N/A
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
--- 12,16 ----
call subs.txt N/A
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: #true )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
***************
*** 19,23 ****
call subs.txt setGameWndRes 800 600
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
--- 19,23 ----
call subs.txt setGameWndRes 800 600
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: #true )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
***************
*** 27,31 ****
call subs.txt N/A
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
--- 27,31 ----
call subs.txt N/A
display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! + dontMoveCursor: %dontMoveCursor ( true: #true )$
+ screenResX: %screenResX $
+ screenResY: %screenResY $$
Index: subsTest0002.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0002.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0002.txt 21 Jan 2003 13:45:32 -0000 1.1
--- subsTest0002.txt 8 Mar 2003 21:08:53 -0000 1.2
***************
*** 6,11 ****
; 1. run test twice; with "Don't Move Cursor" option on and off
! ; parameter "vendor name" is only used/tested when %dontMoveCursor = %_TRUE
! ; parameter "move" is only used/tested when %dontMoveCursor = %_FALSE
; Setup:
--- 6,11 ----
; 1. run test twice; with "Don't Move Cursor" option on and off
! ; parameter "vendor name" is only used/tested when %dontMoveCursor = #true
! ; parameter "move" is only used/tested when %dontMoveCursor = #false
; Setup:
***************
*** 25,63 ****
halt
! if %dontMoveCursor = %_FALSE
{
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName %_TRUE $
+ (character isn't allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName %_TRUE
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName %_TRUE $
+ (character isn't allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openSell %vendorID %vendorName %_TRUE
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName %_FALSE $
+ (character is allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName %_FALSE
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName %_FALSE $
+ (character is allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openSell %vendorID %vendorName %_FALSE
}
! if %dontMoveCursor = %_TRUE
{
display ok dontMoveCursor is on$$
--- 25,63 ----
halt
! if %dontMoveCursor = #false
{
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName #true $
+ (character isn't allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName #true
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName #true $
+ (character isn't allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openSell %vendorID %vendorName #true
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName #false $
+ (character is allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName #false
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName #false $
+ (character is allowed to move)
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openSell %vendorID %vendorName #false
}
! if %dontMoveCursor = #true
{
display ok dontMoveCursor is on$$
***************
*** 98,105 ****
; Parameters: %1 = vendor ID
; %2 = vendor name
! ; %3 = don't move (%_FALSE = it's okay to move, %_TRUE = don't move)
; Name: openSell
; Parameters: %1 = vendor ID
; %2 = vendor name
! ; %3 = don't move (%_FALSE = it's okay to move, %_TRUE = don't move)
--- 98,105 ----
; Parameters: %1 = vendor ID
; %2 = vendor name
! ; %3 = don't move (#false = it's okay to move, #true = don't move)
; Name: openSell
; Parameters: %1 = vendor ID
; %2 = vendor name
! ; %3 = don't move (#false = it's okay to move, #true = don't move)
Index: subsTest0004.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0004.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0004.txt 21 Jan 2003 13:45:32 -0000 1.1
--- subsTest0004.txt 8 Mar 2003 21:08:53 -0000 1.2
***************
*** 30,37 ****
halt
! if %dontMoveCursor = %_FALSE
{
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName %_TRUE $
+ (character isn't allowed to move)$$
+ testing buy %itemTypeList %buyAmount 0$
--- 30,37 ----
halt
! if %dontMoveCursor = #false
{
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName #true $
+ (character isn't allowed to move)$$
+ testing buy %itemTypeList %buyAmount 0$
***************
*** 40,44 ****
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName %_TRUE
call subs.txt buy %itemTypeList %buyAmount 0
--- 40,44 ----
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName #true
call subs.txt buy %itemTypeList %buyAmount 0
***************
*** 48,52 ****
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName %_TRUE $
+ (character isn't allowed to move)$$
+ testing buy %itemTypeList %buyAmount 1$
--- 48,52 ----
display ok dontMoveCursor is off$$
! + testing openBuy %vendorID %vendorName #true $
+ (character isn't allowed to move)$$
+ testing buy %itemTypeList %buyAmount 1$
***************
*** 55,59 ****
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName %_TRUE
call subs.txt buy %itemTypeList %buyAmount 1
--- 55,59 ----
if #contKind = %shopContKind
click 289 164 r
! call subs.txt openBuy %vendorID %vendorName #true
call subs.txt buy %itemTypeList %buyAmount 1
***************
*** 62,66 ****
+ closedUnexpectedly: %closedUnexpectedly
}
! if %dontMoveCursor = %_TRUE
{
display ok dontMoveCursor is on$$
--- 62,66 ----
+ closedUnexpectedly: %closedUnexpectedly
}
! if %dontMoveCursor = #true
{
display ok dontMoveCursor is on$$
***************
*** 99,106 ****
; Parameters: %1 = vendor ID
; %2 = vendor name
! ; %3 = don't move (%_FALSE = it's okay to move, %_TRUE = don't move)
; Name: buy
; Parameters: %1 = item type list
; %2 = amount (0 = all available)
! ; %3 = stop after match (%_FALSE or %_TRUE)
--- 99,106 ----
; Parameters: %1 = vendor ID
; %2 = vendor name
! ; %3 = don't move (#false = it's okay to move, #true = don't move)
; Name: buy
; Parameters: %1 = item type list
; %2 = amount (0 = all available)
! ; %3 = stop after match (#false or #true)
Index: subsTest0005.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0005.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0005.txt 21 Jan 2003 13:45:32 -0000 1.1
--- subsTest0005.txt 8 Mar 2003 21:08:53 -0000 1.2
***************
*** 34,37 ****
; Parameters: %1 = Runebook ID
; %2 = Rune number
! ; %3 = bail on blocked (%_TRUE or %_FALSE )
; %4 = Time between tries (wait units)
--- 34,37 ----
; Parameters: %1 = Runebook ID
; %2 = Rune number
! ; %3 = bail on blocked (#true or #false )
; %4 = Time between tries (wait units)
|
|
From: <wz...@us...> - 2003-03-08 21:05:02
|
Update of /cvsroot/codename-alex/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26344/src
Modified Files:
subs.txt
Log Message:
- fixed some credits
- _init error
- added ensureVersion and isStableRelease subs
- fixed inline coments (hopefuly)
- Rain Dog's wait sub updated
- changed wait commands into sleep commands
Note: meditate and meditateFull might be revamped to use timers like hide and waitForHide ?
Index: subs.txt
===================================================================
RCS file: /cvsroot/codename-alex/src/subs.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** subs.txt 8 Mar 2003 16:15:45 -0000 1.9
--- subs.txt 8 Mar 2003 21:04:58 -0000 1.10
***************
*** 1,6 ****
;===========================================================
; Alexandria Project, a standard subs library.
! ; Copyright (C) 2001-2003 ScriptFellow, LordSiD, Rain Dog,
! ; Roadkill, Smertrios, WarLocke.
;
; This library is free software; you can redistribute it and/or
--- 1,6 ----
;===========================================================
; Alexandria Project, a standard subs library.
! ; Copyright (C) 2001-2003 Cheffe, LordSiD, Rain Dog, Roadkill,
! ; Rolo, ScriptFellow, Smertrios, the.WZA, WarLocke.
;
; This library is free software; you can redistribute it and/or
***************
*** 32,38 ****
; dispatcher stub for sub calls.
;-----------------------------------------------------------
! if %subsInitialized <> 1
{
! set %_param1Fix %1 ; _init parameters fix
set %_param2Fix %2
gosub _init
--- 32,38 ----
; dispatcher stub for sub calls.
;-----------------------------------------------------------
! if %subsInitialized <> #true
{
! set %_param1Fix %1 ; _init parameters fix
set %_param2Fix %2
gosub _init
***************
*** 102,106 ****
set %_SAMETILE 8
;---- Rain Dog's wait sub init -----------------------------
! set %_sCnt2 #sCnt2
;---- hide sub init ----------------------------------------
set %_hideCnt #sCnt2
--- 102,107 ----
set %_SAMETILE 8
;---- Rain Dog's wait sub init -----------------------------
! set %_wait_sCnt2 #sCnt2
! set %_wait_maxDelay 10 ; (unit 0.1 s)
;---- hide sub init ----------------------------------------
set %_hideCnt #sCnt2
***************
*** 109,115 ****
--- 110,124 ----
;---- Standardized delay -----------------------------------
; (might need to be adapted to match connection speed)
+ ;---- wait command (unit 50 ms) ----------------------------
set %_gumpCloseDelay 5
+ set %shortDelay 5
set %_gumpDisplayDelay 20
set %_dropDelay 20
+ ;---- sleep command (unit 1 ms) ----------------------------
+ set %_gumpCloseDelayMs 250
+ set %shortDelayMs 250
+ set %_gumpDisplayDelayMs 1000
+ set %_dropDelayMs 1000
+ ;---- #sCnt2 (unit 0.1 s) ----------------------------
set %_defaultWaitForContTimeout 100
;---- Legacy aliases ---------------------------------------
***************
*** 117,127 ****
set %_FALSE #false
set %delay %_gumpDisplayDelay
- set %shortDelay %_gumpCloseDelay
;---- Don't Move Cursor detect -----------------------------
set %dontMoveCursor #true
click 200 200 n
! wait %shortDelay
click 100 100 n
! wait %shortDelay
if #cursorX = 100 && #cursorY = 100
set %dontMoveCursor #false
--- 126,135 ----
set %_FALSE #false
set %delay %_gumpDisplayDelay
;---- Don't Move Cursor detect -----------------------------
set %dontMoveCursor #true
click 200 200 n
! sleep %shortDelayMs
click 100 100 n
! sleep %shortDelayMs
if #cursorX = 100 && #cursorY = 100
set %dontMoveCursor #false
***************
*** 135,138 ****
--- 143,173 ----
;===========================================================
+ ; Name: ensureVersion
+ ; Parameters: %1 = Major number of required version
+ ; %2 = Minor number of required version
+ ; Purpose: check if subs.txt match required version
+ ; Return: %return (#true or #false )
+ ;-----------------------------------------------------------
+ sub ensureVersion
+ if %subsVerMajor > %1 || ( %subsVerMajor = %1 && %subsVerMinor >= %2 )
+ set %return #true
+ else
+ set %return #false
+ return
+
+ ;===========================================================
+ ; Name: isStableRelease
+ ; Purpose: initialize common static variables:
+ ; %screenResX, %screenResY, %centerX, %centerY
+ ; Return: %return (#true or #false )
+ ;-----------------------------------------------------------
+ sub isStableRelease
+ if RC notIn %subsVerRevision && %subsVerRevision notIn AlphaBeta && %subsVerRevision % 2 = 1
+ set %return #true
+ else
+ set %return #false
+ return
+
+ ;===========================================================
; Name: setGameWndRes
; Parameters: %1 = UO game window width
***************
*** 193,197 ****
if %outsideScreen = #true
goto _openContextMenu
! wait %_gumpDisplayDelay
set %_newCursorX %_cursorX + 40
set %_newCursorY %_cursorY + 18
--- 228,232 ----
if %outsideScreen = #true
goto _openContextMenu
! sleep %_gumpDisplayDelayMs
set %_newCursorX %_cursorX + 40
set %_newCursorY %_cursorY + 18
***************
*** 200,210 ****
{
click %_newCursorX %_newCursorY r
! wait %_gumpDisplayDelay
gosub clickScreenPos #findX #findY 0 %3
! wait %_gumpDisplayDelay
}
set %_newCursorY %_newCursorY + %_menuItemPos
click %_newCursorX %_newCursorY
! wait %_gumpDisplayDelay
if that_is_too_far_away in #sysMsg
set %outsideScreen #true
--- 235,245 ----
{
click %_newCursorX %_newCursorY r
! sleep %_gumpDisplayDelayMs
gosub clickScreenPos #findX #findY 0 %3
! sleep %_gumpDisplayDelayMs
}
set %_newCursorY %_newCursorY + %_menuItemPos
click %_newCursorX %_newCursorY
! sleep %_gumpDisplayDelayMs
if that_is_too_far_away in #sysMsg
set %outsideScreen #true
***************
*** 222,226 ****
;-----------------------------------------------------------
; ToDo: Endless loop if vendor is unreachable (off screen, behind wall, etc)
! ; wait 4s too long?
;-----------------------------------------------------------
sub openBuy
--- 257,261 ----
;-----------------------------------------------------------
; ToDo: Endless loop if vendor is unreachable (off screen, behind wall, etc)
! ; wait 4s (sleep 4000) too long?
;-----------------------------------------------------------
sub openBuy
***************
*** 256,260 ****
; if %_dontMove = #true
}
! ; wait 4s
goto _openBuyNewStyle
}
--- 291,295 ----
; if %_dontMove = #true
}
! ; sleep 4000
goto _openBuyNewStyle
}
***************
*** 265,269 ****
{
move #findX #findY 1 60
! ; wait 2s
goto _openBuyOldStyle
}
--- 300,304 ----
{
move #findX #findY 1 60
! ; sleep 2000
goto _openBuyOldStyle
}
***************
*** 272,276 ****
else
event Macro 3 0 %_vendorName buy
! wait %_gumpDisplayDelay
if #contKind <> %shopContKind
goto _openBuyOldStyle
--- 307,311 ----
else
event Macro 3 0 %_vendorName buy
! sleep %_gumpDisplayDelayMs
if #contKind <> %shopContKind
goto _openBuyOldStyle
***************
*** 286,290 ****
;-----------------------------------------------------------
; ToDo: Endless loop if vendor is unreachable (off screen, behind wall, etc)
! ; wait 4s too long?
;-----------------------------------------------------------
sub openSell
--- 321,325 ----
;-----------------------------------------------------------
; ToDo: Endless loop if vendor is unreachable (off screen, behind wall, etc)
! ; wait 4s (sleep 4000) too long?
;-----------------------------------------------------------
sub openSell
***************
*** 319,323 ****
gosub charMoveAway
}
! ; wait 4s
goto _openSellNewStyle
}
--- 354,358 ----
gosub charMoveAway
}
! ; sleep 4000
goto _openSellNewStyle
}
***************
*** 328,332 ****
{
move #findX #findY 1 60
! ; wait 2s
goto _openSellOldStyle
}
--- 363,367 ----
{
move #findX #findY 1 60
! ; sleep 2000
goto _openSellOldStyle
}
***************
*** 335,339 ****
else
event Macro 3 0 %_vendorName sell
! wait %_gumpDisplayDelay
if #contKind <> %shopContKind
goto openbuysellstyle
--- 370,374 ----
else
event Macro 3 0 %_vendorName sell
! sleep %_gumpDisplayDelayMs
if #contKind <> %shopContKind
goto openbuysellstyle
***************
*** 418,422 ****
set %_buyAmount %2
set %_stopAfterMatch %3
! set %itemNotFound #true ; set error return values
_buyMainLoop:
set %closedUnexpectedly #true
--- 453,457 ----
set %_buyAmount %2
set %_stopAfterMatch %3
! set %itemNotFound #true ; set error return values
_buyMainLoop:
set %closedUnexpectedly #true
***************
*** 431,448 ****
return
}
! ; Did we get a match?
! if #shopItemType in %_buyItemType
{
set %itemNotFound #false
! ; double click item to get it to the shopping list
! click 260 82 d
if %dontMoveCursor = #true
{
! wait %shortDelay
click 260 82 d
! wait %shortDelay
click 260 82 d
}
! wait %shortDelay
if %_buyAmount = 0
set %_buyAmount 10000
--- 466,481 ----
return
}
! if #shopItemType in %_buyItemType ; Did we get a match?
{
set %itemNotFound #false
! click 260 82 d ; double click item to get it to the shopping list
if %dontMoveCursor = #true
{
! sleep %shortDelayMs
click 260 82 d
! sleep %shortDelayMs
click 260 82 d
}
! sleep %shortDelayMs
if %_buyAmount = 0
set %_buyAmount 10000
***************
*** 463,471 ****
return
}
- ; Scroll down
set %_oldShopCurPos #shopCurPos
_buyScrollDown:
! click 390 200
! wait %shortDelay
getShopInfo
if %_oldShopCurPos = #shopCurPos
--- 496,503 ----
return
}
set %_oldShopCurPos #shopCurPos
_buyScrollDown:
! click 390 200 ; Scroll down
! sleep %shortDelayMs
getShopInfo
if %_oldShopCurPos = #shopCurPos
***************
*** 476,485 ****
if %dontMoveCursor = #true
{
! wait %shortDelay
click 366 426
! wait %shortDelay
click 366 426
}
! wait %shortDelay
return
--- 508,517 ----
if %dontMoveCursor = #true
{
! sleep %shortDelayMs
click 366 426
! sleep %shortDelayMs
click 366 426
}
! sleep %shortDelayMs
return
***************
*** 490,494 ****
; %2 = Rune number
; %3 = bail on blocked (#true or #false )
! ; %4 = Time between tries (wait units)
; Purpose: Recalls from a runebook for your choice
; Return: %blocked (#true or #false )
--- 522,526 ----
; %2 = Rune number
; %3 = bail on blocked (#true or #false )
! ; %4 = Time between tries (unit 50 ms)
; Purpose: Recalls from a runebook for your choice
; Return: %blocked (#true or #false )
***************
*** 503,507 ****
; set %_runeNumber %2
set %_bailOnBlocked %3
! set %_time %4
set %blocked #false
set %_page ( %2 + 1 ) / 2
--- 535,539 ----
; set %_runeNumber %2
set %_bailOnBlocked %3
! set %_time %4 * 50
set %blocked #false
set %_page ( %2 + 1 ) / 2
***************
*** 519,523 ****
_recallOpenBook:
set #lObjectID %_runebookID
! ; wait %shortDelay
event Macro 17 0
gosub waitForContKindToOpen %runebookContKind %_defaultWaitForContTimeout
--- 551,555 ----
_recallOpenBook:
set #lObjectID %_runebookID
! ; sleep %shortDelayMs
event Macro 17 0
gosub waitForContKindToOpen %runebookContKind %_defaultWaitForContTimeout
***************
*** 535,539 ****
{
gosub charMoveAway
! wait %_time
goto _recallStart
}
--- 567,571 ----
{
gosub charMoveAway
! sleep %_time
goto _recallStart
}
***************
*** 576,580 ****
set #lObjectID #findID
set %_contType #findType
! ; wait %shortDelay
event Macro 17 0
gosub waitForContTypeToOpen %_contType %_defaultWaitForContTimeout
--- 608,612 ----
set #lObjectID #findID
set %_contType #findType
! ; sleep %shortDelayMs
event Macro 17 0
gosub waitForContTypeToOpen %_contType %_defaultWaitForContTimeout
***************
*** 606,610 ****
click %1 %2 r
; set #findMod %_findMod
! wait %_gumpCloseDelay
return
--- 638,642 ----
click %1 %2 r
; set #findMod %_findMod
! sleep %_gumpCloseDelayMs
return
***************
*** 703,707 ****
gosub drag %1 %4
gosub drop %_x %_y
! wait %_dropDelay
return
--- 735,739 ----
gosub drag %1 %4
gosub drop %_x %_y
! sleep %_dropDelayMs
return
***************
*** 805,809 ****
_meditate:
event Macro 13 46
! wait 280
if concentrate in #sysMsg
goto _meditate
--- 837,841 ----
_meditate:
event Macro 13 46
! sleep 14000
if concentrate in #sysMsg
goto _meditate
***************
*** 821,825 ****
_meditateFull:
event Macro 13 46
! wait 280
if focus in #sysMsg
goto _meditateFull
--- 853,857 ----
_meditateFull:
event Macro 13 46
! sleep 14000
if focus in #sysMsg
goto _meditateFull
***************
*** 867,871 ****
goto _getValueKeyLoop
_getValue:
! wait 20
set %_i 1
_getValueScan:
--- 899,903 ----
goto _getValueKeyLoop
_getValue:
! sleep 1000
set %_i 1
_getValueScan:
***************
*** 911,919 ****
sub setupBackpack
event Macro 9 7
! wait %_gumpCloseDelay
set #nextCPosX %1
set #nextCPosY %2
event Macro 8 7
! wait %_gumpDisplayDelay
set %backpackID #contID
return
--- 943,951 ----
sub setupBackpack
event Macro 9 7
! sleep %_gumpCloseDelayMs
set #nextCPosX %1
set #nextCPosY %2
event Macro 8 7
! sleep %_gumpDisplayDelayMs
set %backpackID #contID
return
***************
*** 926,935 ****
sub setupOverview
event Macro 9 8
! wait %_gumpCloseDelay
event Macro 8 8
event Macro 8 8
! wait %_gumpDisplayDelay
contPos %1 %2
! wait %_gumpDisplayDelay
return
--- 958,967 ----
sub setupOverview
event Macro 9 8
! sleep %_gumpCloseDelayMs
event Macro 8 8
event Macro 8 8
! sleep %_gumpDisplayDelayMs
contPos %1 %2
! sleep %_gumpDisplayDelayMs
return
***************
*** 943,949 ****
sub setupPaperdoll
event Macro 8 1
! wait %_gumpDisplayDelay
contPos %1 %2
! wait %_gumpDisplayDelay
return
--- 975,981 ----
sub setupPaperdoll
event Macro 8 1
! sleep %_gumpDisplayDelayMs
contPos %1 %2
! sleep %_gumpDisplayDelayMs
return
***************
*** 955,961 ****
sub setupStatusBar
event Macro 8 2
! wait %_gumpDisplayDelay
contPos %1 %2
! wait %_gumpDisplayDelay
return
--- 987,993 ----
sub setupStatusBar
event Macro 8 2
! sleep %_gumpDisplayDelayMs
contPos %1 %2
! sleep %_gumpDisplayDelayMs
return
***************
*** 975,982 ****
{
event Macro 8 2
! wait %_gumpDisplayDelay
display ok Drag your status bar to where you want it on your screen$
+ You have 3 seconds
! wait 3s
set %statusBarX #contPosX
set %statusBarY #contPosY
--- 1007,1014 ----
{
event Macro 8 2
! sleep %_gumpDisplayDelayMs
display ok Drag your status bar to where you want it on your screen$
+ You have 3 seconds
! sleep 3000
set %statusBarX #contPosX
set %statusBarY #contPosY
***************
*** 995,1001 ****
{
event Macro 8 2
! wait %_gumpDisplayDelay
contPos %1 %2
! wait %_gumpDisplayDelay
}
return
--- 1027,1033 ----
{
event Macro 8 2
! sleep %_gumpDisplayDelayMs
contPos %1 %2
! sleep %_gumpDisplayDelayMs
}
return
***************
*** 1013,1017 ****
sub _getPaperdollXY
findItem %1
! set %_paperdollX #findX % 65536 ; die bug, die!
set %_paperdollY #findY % 65536
return
--- 1045,1049 ----
sub _getPaperdollXY
findItem %1
! set %_paperdollX #findX % 65536 ; die bug, die!
set %_paperdollY #findY % 65536
return
***************
*** 1030,1034 ****
findItem %1
; set #findMod 142_225
! set %_backpackX ( #findX + 142 ) % 65536 ; die bug, die!
set %_backpackY ( #findY + 225 ) % 65536
return
--- 1062,1066 ----
findItem %1
; set #findMod 142_225
! set %_backpackX ( #findX + 142 ) % 65536 ; die bug, die!
set %_backpackY ( #findY + 225 ) % 65536
return
***************
*** 1079,1083 ****
}
else
! return ; Failed reading backpack content
}
gosub _readNumberEndingWith _items %_journal
--- 1111,1115 ----
}
else
! return ; Failed reading backpack content
}
gosub _readNumberEndingWith _items %_journal
***************
*** 1186,1190 ****
if H in #charStatus
return
! if %_hideCnt > #sCnt2 ; Fix against sub re-entry
goto _hide
if H in #charStatus
--- 1218,1222 ----
if H in #charStatus
return
! if %_hideCnt > #sCnt2 ; Fix against sub re-entry
goto _hide
if H in #charStatus
***************
*** 1206,1219 ****
; Name: wait
; Author: Rain Dog
! ; Purpose: Wait for a minimum of 1 second between calls ??
;-----------------------------------------------------------
sub wait
! set %_sCnt2 #sCnt2 - %_sCnt2
! if %_sCnt2 < 20
{
! set %_sCnt2 20 - ( %_sCnt2 * 2 )
! wait %_sCnt2
}
! set %_sCnt2 #sCnt2
return
--- 1238,1251 ----
; Name: wait
; Author: Rain Dog
! ; Purpose: Wait for a minimum of 1 second between calls
;-----------------------------------------------------------
sub wait
! set %_wait_sCnt2 #sCnt2 - %_wait_sCnt2
! if %_wait_sCnt2 < 10
{
! set %_wait_sCnt2 ( %_wait_maxDelay - %_wait_sCnt2 ) * 100
! sleep %_wait_sCnt2
}
! set %_wait_sCnt2 #sCnt2
return
***************
*** 1241,1245 ****
set %_xDist %_xDist - #findX abs
set %_yDist %_yDist - #findY abs
! set %distBetween 0 ; %_xDist = %_yDist
if %_xDist > %_yDist
set %distBetween %_xDist
--- 1273,1277 ----
set %_xDist %_xDist - #findX abs
set %_yDist %_yDist - #findY abs
! set %distBetween 0 ; %_xDist = %_yDist
if %_xDist > %_yDist
set %distBetween %_xDist
***************
*** 1311,1315 ****
if %4 = AND
{
! if %return = #false ; shortcut
return
set %return #false
--- 1343,1347 ----
if %4 = AND
{
! if %return = #false ; shortcut
return
set %return #false
***************
*** 1320,1324 ****
if %4 = OR
{
! if %return = #true ; shortcut
return
if %5 %6 %7
--- 1352,1356 ----
if %4 = OR
{
! if %return = #true ; shortcut
return
if %5 %6 %7
***************
*** 1352,1356 ****
goto _setupItemTypesStringLoop
findItem #lTargetID
! if #findType notIn %itemTypesString ; prevent dupe
set %itemTypesString %itemTypesString , _ , #findType
goto _setupItemTypesString
--- 1384,1388 ----
goto _setupItemTypesStringLoop
findItem #lTargetID
! if #findType notIn %itemTypesString ; prevent dupe
set %itemTypesString %itemTypesString , _ , #findType
goto _setupItemTypesString
|
|
From: <wz...@us...> - 2003-03-08 18:10:29
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv17343/src Modified Files: client_4.0.0c_statics.txt Log Message: - fixed inline comments Index: client_4.0.0c_statics.txt =================================================================== RCS file: /cvsroot/codename-alex/src/client_4.0.0c_statics.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** client_4.0.0c_statics.txt 8 Mar 2003 16:08:50 -0000 1.2 --- client_4.0.0c_statics.txt 8 Mar 2003 18:10:24 -0000 1.3 *************** *** 9,13 **** ;---- #contKind -------------------------------------------- ! set %amountContKind GHKC ; #contKind for drag quantity window set %backpackContKind QMZ set %bankContKind QMZ --- 9,13 ---- ;---- #contKind -------------------------------------------- ! set %amountContKind GHKC ; #contKind for drag quantity window set %backpackContKind QMZ set %bankContKind QMZ *************** *** 15,19 **** set %confirmContKind AMR set %connLostContKind AIVB ! set %draggingContKind WZBB ; #contKind when dragging an object set %loginContKind QAT set %menuContKind EIEB --- 15,19 ---- set %confirmContKind AMR set %connLostContKind AIVB ! set %draggingContKind WZBB ; #contKind when dragging an object set %loginContKind QAT set %menuContKind EIEB |
|
From: <wz...@us...> - 2003-03-08 16:15:49
|
Update of /cvsroot/codename-alex/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29110/src
Modified Files:
subs.txt
Log Message:
- minor editing of contKind names
Index: subs.txt
===================================================================
RCS file: /cvsroot/codename-alex/src/subs.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** subs.txt 6 Mar 2003 18:58:58 -0000 1.8
--- subs.txt 8 Mar 2003 16:15:45 -0000 1.9
***************
*** 47,51 ****
; Status: internal (do not call directly)
; Purpose: initialize standardized constants:
! ; %_TRUE, %_FALSE, %_OK, %_NOK,
; %_NORTHWEST, %_NORTH, %_NORTHEAST, %_EAST,
; %_SOUTHEAST,%_SOUTH, %_SOUTHWEST,%_WEST,
--- 47,51 ----
; Status: internal (do not call directly)
; Purpose: initialize standardized constants:
! ; %_OK, %_NOK,
; %_NORTHWEST, %_NORTH, %_NORTHEAST, %_EAST,
; %_SOUTHEAST,%_SOUTH, %_SOUTHWEST,%_WEST,
***************
*** 53,59 ****
;
; initialize common static variables:
! ; %shopContKind, %menuContKind, %dragQtyContKind,
! ; %draggingContKind, %runebookContKind,
! ; %healthBarContKind, %bankContType
;
; initialize common delay variables:
--- 53,61 ----
;
; initialize common static variables:
! ; %amountContKind, %backpackContKind, %bankContKind,
! ; %charSelectContKind, %confirmContKind, %connLostContKind,
! ; %draggingContKind, %loginContKind, %menuContKind,
! ; %paperdollContKind, %runebookContKind, %shardSelectContKind,
! ; %shopContKind, %statusContKind, %bankContType
;
; initialize common delay variables:
***************
*** 195,199 ****
set %_newCursorY %_cursorY + 18
; Below is a quick fix against vendor health bar being dragged in the way
! if #contKind = %healthBarContKind && #contID <> #charID
{
click %_newCursorX %_newCursorY r
--- 197,201 ----
set %_newCursorY %_cursorY + 18
; Below is a quick fix against vendor health bar being dragged in the way
! if #contKind = %statusContKind && #contID <> #charID
{
click %_newCursorX %_newCursorY r
***************
*** 658,662 ****
if #contKind = %draggingContKind
return
! if #contKind <> %dragQtyContKind
goto _drag_dragQtyWnd
if %2 = 0
--- 660,664 ----
if #contKind = %draggingContKind
return
! if #contKind <> %amountContKind
goto _drag_dragQtyWnd
if %2 = 0
***************
*** 1144,1148 ****
; %2 = timeout value equal to %4 * .1 seconds
; Purpose: Check if a gump is open/has focus.
! ; (Typicaly used with %bankBoxContType)
; Return: %return (%_OK or %_NOK if timedout)
;-----------------------------------------------------------
--- 1146,1150 ----
; %2 = timeout value equal to %4 * .1 seconds
; Purpose: Check if a gump is open/has focus.
! ; (Typicaly used with %bankContType)
; Return: %return (%_OK or %_NOK if timedout)
;-----------------------------------------------------------
***************
*** 1156,1160 ****
; %2 = timeout value equal to %4 * .1 seconds
; Purpose: Check if a gump is open/has focus.
! ; (Typicaly used with %craftMenuContKind)
; Return: %return (%_OK or %_NOK if timedout)
;-----------------------------------------------------------
--- 1158,1162 ----
; %2 = timeout value equal to %4 * .1 seconds
; Purpose: Check if a gump is open/has focus.
! ; (Typicaly used with %menuContKind)
; Return: %return (%_OK or %_NOK if timedout)
;-----------------------------------------------------------
***************
*** 1168,1172 ****
; %2 = timeout value equal to %4 * .1 seconds
; Purpose: Check if a gump is closed/has lost focus.
! ; (Typicaly used with %craftMenuContKind)
; Return: %return (%_OK or %_NOK if timedout)
;-----------------------------------------------------------
--- 1170,1174 ----
; %2 = timeout value equal to %4 * .1 seconds
; Purpose: Check if a gump is closed/has lost focus.
! ; (Typicaly used with %menuContKind)
; Return: %return (%_OK or %_NOK if timedout)
;-----------------------------------------------------------
|
|
From: <wz...@us...> - 2003-03-08 16:08:53
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv26063/src Modified Files: client_4.0.0c_statics.txt Log Message: FIXED: - %bankContType RENAMED: - %dragQtyContKind into %amountContKind - %healthBarContKind into %statusContKind ADDED: - %backpackContKind, %charSelectContKind, %confirmContKind, %connLostContKind, %loginContKind, %paperdollContKind and %shardSelectContKind Index: client_4.0.0c_statics.txt =================================================================== RCS file: /cvsroot/codename-alex/src/client_4.0.0c_statics.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** client_4.0.0c_statics.txt 25 Feb 2003 12:53:28 -0000 1.1 --- client_4.0.0c_statics.txt 8 Mar 2003 16:08:50 -0000 1.2 *************** *** 1,7 **** ;=========================================================== ; Alexandria Project, a standard subs library. ! ;=========================================================== ! ! ;=========================================================== ; UO client specific variables ;----------------------------------------------------------- --- 1,5 ---- ;=========================================================== ; Alexandria Project, a standard subs library. ! ;----------------------------------------------------------- ; UO client specific variables ;----------------------------------------------------------- *************** *** 9,31 **** ; change with every client.exe update ;----------------------------------------------------------- ! ; #contKind ! set %shopContKind EQUC set %menuContKind EIEB ! ; #contKind for drag quantity window ! set %dragQtyContKind GHKC ! ; #contKind when dragging an object ! set %draggingContKind WZBB set %runebookContKind EIEB ! set %healthBarContKind YMJC ! ; #contType ! set %bankContType QMZ ! ;----------------------------------------------------------- ! ; Legacy aliases: ! ;----------------------------------------------------------- set %buyMenuKind %shopContKind - set %vendorMenuContKind %shopContKind set %craftMenuContKind %menuContKind ! set %dragContKind GHKC ! set %bankBoxContType %bankContType ;----------------------------------------------------------- set %_clientStaticsLoaded 1 --- 7,36 ---- ; change with every client.exe update ;----------------------------------------------------------- ! ! ;---- #contKind -------------------------------------------- ! set %amountContKind GHKC ; #contKind for drag quantity window ! set %backpackContKind QMZ ! set %bankContKind QMZ ! set %charSelectContKind KRCC ! set %confirmContKind AMR ! set %connLostContKind AIVB ! set %draggingContKind WZBB ; #contKind when dragging an object ! set %loginContKind QAT set %menuContKind EIEB ! set %paperdollContKind QSIC set %runebookContKind EIEB ! set %shardSelectContKind GXSC ! set %shopContKind EQUC ! set %statusContKind YMJC ! ;---- #contType -------------------------------------------- ! set %bankContType IKF ! ;---- Legacy aliases --------------------------------------- ! set %bankBoxContType %bankContType set %buyMenuKind %shopContKind set %craftMenuContKind %menuContKind ! set %dragContKind %draggingContKind ! set %dragQtyContKind %amountContKind ! set %healthBarContKind %statusContKind ! set %vendorMenuContKind %shopContKind ;----------------------------------------------------------- set %_clientStaticsLoaded 1 |
|
From: <scr...@us...> - 2003-03-06 18:59:03
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv8672 Modified Files: subs.txt Removed Files: 040303_subs_changes.txt Log Message: - general editing about inline comments and #smc - code clening (much dead code removed) - #true and #false now replace %_TRUE and %_FALSE respectively. values for %_OK and %_NOK were adjusted too. - taking advantage of IF and SET extended syntax (clickScreenPos, openBuy, openSell, charMoveAway, charTurnRight, charTurnAround, charMoveForward, buy, recall, drag, countItemsInContainer, countItemsInSpecificContainer, getValue, getBackpackInfo, wait, random) - taking advantage of FINDITEM extended syntax (findItemInContainer, findItemInSpecificContainer) - added timerInit, timerGet and timerSet subs - moved changes description to cvs log Index: subs.txt =================================================================== RCS file: /cvsroot/codename-alex/src/subs.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** subs.txt 5 Mar 2003 00:40:48 -0000 1.7 --- subs.txt 6 Mar 2003 18:58:58 -0000 1.8 *************** *** 18,22 **** ; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; ! ; Version 2.0.RC2 (Release Candidate 1) ; $Id$ ;----------------------------------------------------------- --- 18,22 ---- ; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; ! ; Version 2.0.RC2 (Release Candidate 2) ; $Id$ ;----------------------------------------------------------- --- 040303_subs_changes.txt DELETED --- |
|
From: <wz...@us...> - 2003-03-05 00:40:54
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv13329/src Modified Files: subs.txt Log Message: Index: subs.txt =================================================================== RCS file: /cvsroot/codename-alex/src/subs.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** subs.txt 5 Mar 2003 00:34:07 -0000 1.6 --- subs.txt 5 Mar 2003 00:40:48 -0000 1.7 *************** *** 18,22 **** ; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; ! ; Version 2.0.RC1 (Release Candidate 1) ; $Id$ ;----------------------------------------------------------- --- 18,22 ---- ; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; ! ; Version 2.0.RC2 (Release Candidate 1) ; $Id$ ;----------------------------------------------------------- *************** *** 129,133 **** set %subsVerMajor 2 set %subsVerMinor 0 ! set %subsVerRevision RC1 return --- 129,133 ---- set %subsVerMajor 2 set %subsVerMinor 0 ! set %subsVerRevision RC2 return |
|
From: <wz...@us...> - 2003-03-05 00:35:27
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv10374/src Added Files: 040303_subs_changes.txt Log Message: --- NEW FILE: 040303_subs_changes.txt --- - general editing about inline comments and #smc - code clening (much dead code removed) - #true and #false now replace %_TRUE and %_FALSE respectively. values for %_OK and %_NOK were adjusted too. - taking advantage of IF and SET extended syntax (clickScreenPos, openBuy, openSell, charMoveAway, charTurnRight, charTurnAround, charMoveForward, buy, recall, drag, countItemsInContainer, countItemsInSpecificContainer, getValue, getBackpackInfo, wait, random) - taking advantage of FINDITEM extended syntax (findItemInContainer, findItemInSpecificContainer) - added timerInit, timerGet and timerSet subs - sub hideCheck renamed into hide |
|
From: <wz...@us...> - 2003-03-05 00:34:11
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv9791/src Modified Files: subs.txt Log Message: Index: subs.txt =================================================================== RCS file: /cvsroot/codename-alex/src/subs.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** subs.txt 30 Jan 2003 15:00:34 -0000 1.5 --- subs.txt 5 Mar 2003 00:34:07 -0000 1.6 *************** *** 25,29 **** ; Original idea & contributor: ScriptFellow ;----------------------------------------------------------- ! ; Contributors: LordSiD, Rain Dog, Roadkill, Smertrios, WarLocke ;=========================================================== --- 25,30 ---- ; Original idea & contributor: ScriptFellow ;----------------------------------------------------------- ! ; Contributors: Cheffe, LordSiD, Rain Dog, Roadkill, Rolo, ! ; Smertrios, WarLocke [...1383 lines suppressed...] + } + return + ;----------------------------------------------------------- + ; Name: timerGet + ; Parameters: %1 = index of timer to read + ; Return: %result is the value of timer %1 in seconds + ; %result2 is the value of timer %1 in 10th of seconds + ;----------------------------------------------------------- + sub timerGet + set %result2 #sCnt2 - %_timer . %1 + set %result %result2 / 10 + return + ;----------------------------------------------------------- + ; Name: timerSet + ; Parameters: %1 = index of timer to write + ; %2 = number of seconds to set back + ;----------------------------------------------------------- + sub timerSet + set %_timer . %1 #sCnt2 - ( %2 * 10 ) return |
|
From: <war...@us...> - 2003-02-25 13:01:19
|
Update of /cvsroot/codename-alex/controlpanel
In directory sc8-pr-cvs1:/tmp/cvs-serv20756/controlpanel
Modified Files:
cpanel.txt
Log Message:
Minor revisions (prefixed all subs with _cp)
Index: cpanel.txt
===================================================================
RCS file: /cvsroot/codename-alex/controlpanel/cpanel.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cpanel.txt 30 Jan 2003 03:34:36 -0000 1.2
--- cpanel.txt 25 Feb 2003 13:01:15 -0000 1.3
***************
*** 1,4 ****
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; Control Panel 2.2
;;---------------------------------
;; Allow Execute must be enabled
--- 1,4 ----
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; Control Panel 2.2.1
;;---------------------------------
;; Allow Execute must be enabled
***************
*** 7,24 ****
;; Do not modify next line.
! gosub Initialize
execute updatelist.bat
call cpmenu.euo
! gosub buildMenu
! gosub displayMenu
! gosub AutoLaunch
! gosub HotkeyLoop
halt
! sub buildMenu
menu window title Script Control Panel 2.0
menu window color btnface
--- 7,24 ----
;; Do not modify next line.
! gosub _cpInit
execute updatelist.bat
call cpmenu.euo
! gosub _cpBuildMenu
! gosub _cpDisplayMenu
! gosub _cpAutoLaunch
! gosub _cpHotkeyLoop
halt
! sub _cpBuildMenu
menu window title Script Control Panel 2.0
menu window color btnface
***************
*** 47,51 ****
return
! sub displayMenu
set #menubutton N/A
menu show
--- 47,51 ----
return
! sub _cpDisplayMenu
set #menubutton N/A
menu show
***************
*** 66,70 ****
return
! sub HotkeyLoop
HKL:
if %hkcount > 0
--- 66,70 ----
return
! sub _cpHotkeyLoop
HKL:
if %hkcount > 0
***************
*** 77,81 ****
set %checkname %hkfileprefix . %j
onhotkey %check
! gosub launchfile %checkname %j
}
}
--- 77,81 ----
set %checkname %hkfileprefix . %j
onhotkey %check
! gosub _cpLaunchFile %checkname %j
}
}
***************
*** 84,88 ****
return
! sub launchfile
event sysmessage Launching %1
set * . %2 2
--- 84,88 ----
return
! sub _cpLaunchFile
event sysmessage Launching %1
set * . %2 2
***************
*** 95,99 ****
return
! sub AutoLaunch
if %autocount > 0
{
--- 95,99 ----
return
! sub _cpAutoLaunch
if %autocount > 0
{
***************
*** 126,130 ****
return
! sub Initialize
initevents
linespercycle 70
--- 126,130 ----
return
! sub _cpInit
initevents
linespercycle 70
|
|
From: <war...@us...> - 2003-02-25 12:53:31
|
Update of /cvsroot/codename-alex/src In directory sc8-pr-cvs1:/tmp/cvs-serv17591/src Added Files: client_4.0.0c_statics.txt Log Message: Updated client statics file for 4.0.0c AoS -- dont know if its different for non-AoS, but I doubt it. --- NEW FILE: client_4.0.0c_statics.txt --- ;=========================================================== ; Alexandria Project, a standard subs library. ;=========================================================== ;=========================================================== ; UO client specific variables ;----------------------------------------------------------- ; The #contKind and #contType values below are likely to ; change with every client.exe update ;----------------------------------------------------------- ; #contKind set %shopContKind EQUC set %menuContKind EIEB ; #contKind for drag quantity window set %dragQtyContKind GHKC ; #contKind when dragging an object set %draggingContKind WZBB set %runebookContKind EIEB set %healthBarContKind YMJC ; #contType set %bankContType QMZ ;----------------------------------------------------------- ; Legacy aliases: ;----------------------------------------------------------- set %buyMenuKind %shopContKind set %vendorMenuContKind %shopContKind set %craftMenuContKind %menuContKind set %dragContKind GHKC set %bankBoxContType %bankContType ;----------------------------------------------------------- set %_clientStaticsLoaded 1 exit |
|
From: <wz...@us...> - 2003-01-30 15:00:39
|
Update of /cvsroot/codename-alex/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4108a/src
Modified Files:
subs.txt
Log Message:
subs.txt _readNumberEndingWith: code change (untested)
subs.txt setupItemTypesString: code change (untested)
subs.txt getString: added (untested)
subs.txt findEnemyArray: removed
Index: subs.txt
===================================================================
RCS file: /cvsroot/codename-alex/src/subs.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** subs.txt 29 Jan 2003 10:22:01 -0000 1.4
--- subs.txt 30 Jan 2003 15:00:34 -0000 1.5
***************
*** 746,779 ****
set %_y %3
set %_amount %4
- ; findItem %_itemID
- ; set %dontwait 0
- ; if %_itemID = #LLIFTEDID
- ; set %dontwait 1
- ; set %oldliftedid #LLIFTEDID
gosub drag %_itemID %_amount
- ; wait 5
- ; if #LLIFTEDID = %oldliftedid
- ; {
- ; if #FINDSTACK > 1
- ; {
- ; if %dontwait = 1
- ; goto enteramount
- ; set %start #SCNT + 2
- ;waitfordrag:
- ; if #SCNT > %start
- ; goto enteramount
- ; if #CONTKIND <> %dragcontkind
- ; goto waitfordrag
- ;enteramount:
- ; if %_amount = 0
- ; msg $
- ; if %_amount > 0
- ; msg %_amount $
- ; }
- ; }
- ; if #LLIFTEDID <> %oldliftedid
- ; wait %delay
gosub drop %_x %_y
- ; click %_x %_y
wait %_dropDelay
return
--- 746,751 ----
***************
*** 1192,1198 ****
; Returns: set variables %_value
;-----------------------------------------------------------
sub _readNumberEndingWith
! ; deleteVar _value
! set %_value N/A
_readNumberEndingWith:
for %_i 0 9
--- 1164,1172 ----
; Returns: set variables %_value
;-----------------------------------------------------------
+ ; ToDo: re-test?
+ ;-----------------------------------------------------------
sub _readNumberEndingWith
! deleteVar _value
! ; set %_value N/A
_readNumberEndingWith:
for %_i 0 9
***************
*** 1201,1208 ****
if %_temp in %2
{
! if %_value <> N/A
set %_value %_i , %_value
! if %_value = N/A
! set %_value %_i
set %1 %_temp
goto _readNumberEndingWith
--- 1175,1182 ----
if %_temp in %2
{
! ; if %_value <> N/A
set %_value %_i , %_value
! ; if %_value = N/A
! ; set %_value %_i
set %1 %_temp
goto _readNumberEndingWith
***************
*** 1371,1414 ****
;===========================================================
- ; Name: findEnemyArray
- ; Status: Still being reviewed
- ; Author: Roadkill
- ; Parameters: %1 = objectTypes
- ; Purpose: find objects of %_objectTypes and arrange data into array
- ; Return: array is %enemyArray, indexes are:
- ; 1=enemyid
- ; 2=enemytype
- ; 3=finddist
- ; 4=findrep
- ; 5=direction
- ; 9=totalfound
- ;-----------------------------------------------------------
- ; ToDo: sub name change to something more generic?
- ; "enemyArray" should be a parameter?
- ;-----------------------------------------------------------
- sub findEnemyArray
- ;purpose:
- ;%1 = %_objectTypes
- ;
- set %_objectTypes %1
- set %_idx 0
- _findEnemyArray:
- set %_idx %_idx + 1
- findItem %_objectTypes %_idx
- if #findKind = 1
- {
- set %enemyArray1 . %_idx #findID
- set %enemyArray2 . %_idx #findType
- set %enemyArray3 . %_idx #findDist
- set %enemyArray4 . %_idx #findRep
- gosub findDirectionTo #findX #findY
- set %enemyArray5 . %_idx %thingsDirection
- goto _findEnemyArray
- }
- set %enemyArray1 . %_idx 0 ;put a 0 after valid spots
- set %enemyArray9 %_idx - 1 ;puts total found enemy position 9
- return
-
- ;===========================================================
; Name: findDirectionTo
; Author: Roadkill
--- 1345,1348 ----
***************
*** 1503,1510 ****
; Return: the final string is held in the variable %ItemTypesString
;-----------------------------------------------------------
sub setupItemTypesString
display ok You will be asked to double-click one of the %1
! ; deleteVar itemTypesString
! set %itemTypesString N/A
_setupItemTypesString:
display yesno Would you like to add a (another) %1 type?$
--- 1437,1446 ----
; Return: the final string is held in the variable %ItemTypesString
;-----------------------------------------------------------
+ ; ToDo: re-test?
+ ;-----------------------------------------------------------
sub setupItemTypesString
display ok You will be asked to double-click one of the %1
! deleteVar itemTypesString
! ; set %itemTypesString N/A
_setupItemTypesString:
display yesno Would you like to add a (another) %1 type?$
***************
*** 1520,1525 ****
;if you get here you've targeted something, carry on with script...
findItem #lTargetID
! if %itemTypesString <> N/A
! {
if #findType in %itemTypesString
; dupe
--- 1456,1461 ----
;if you get here you've targeted something, carry on with script...
findItem #lTargetID
! ; if %itemTypesString <> N/A
! ; {
if #findType in %itemTypesString
; dupe
***************
*** 1528,1534 ****
set %itemTypesString %itemTypesString , _ , #findType
}
! }
! if %itemTypesString = N/A
! set %itemTypesString #findType
goto _setupItemTypesString
}
--- 1464,1470 ----
set %itemTypesString %itemTypesString , _ , #findType
}
! ; }
! ; if %itemTypesString = N/A
! ; set %itemTypesString #findType
goto _setupItemTypesString
}
***************
*** 1572,1574 ****
--- 1508,1552 ----
set %return %return % %_diff
set %return %return + %1
+ return
+
+ ;===========================================================
+ ; Name: getString
+ ; Author: Rolo
+ ; Parameters: %1 = actual string
+ ; %2 = left of desired string in %1
+ ; %3 = right of desired string in %1
+ ; Return: %return is the string in %1 between %2 and %3
+ ; Notes: if %2 isn't in %1 it will return null; if %3 ins't in %1 it will return from %2 to end of %1
+ ; also requires high linespercycle to work efficiantly
+ ; Example: gosub getString #journal you_see:_ *
+ ;-----------------------------------------------------------
+ sub getString
+ set %_string %1
+ set %_preString %2
+ set %_postString %3
+ deleteVar return
+ ; set %return null
+ _getString:
+ set %_temp %_preString , %_postString
+ if %_temp in %_string
+ return
+ set %_check %return
+ gosub _getStringChr _ e t a o i n s r h l d c u m p f g y w b v k x j q z 0 1 2 3 4 5 6 7 8 9
+ if %return = %_check
+ return
+ goto _getString
+
+ sub _getStringChr
+ for %_chrIndex 1 37
+ {
+ set %_chr % . %_chrIndex
+ set %_temp %_preString , %_chr
+ if %_temp in %_string 6
+ set %_preString %_temp
+ ; if %return <> null
+ set %return %return , %_chr
+ ; if %return = null
+ ; set %return %_chr
+ return
+ }
return
|
|
From: <scr...@us...> - 2003-01-30 13:02:13
|
Update of /cvsroot/codename-alex In directory sc8-pr-cvs1:/tmp/cvs-serv19529 Modified Files: ChangeLog Log Message: Testing commit mails again. |
