1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:49:58 +00:00
Commit graph

293 commits

Author SHA1 Message Date
scrawl
a619cff615 Implement EnableLevelupMenu to trigger level-up 2015-01-23 15:34:47 +01:00
Marc Zinnschlag
cd62dbc5b7 Merge remote-tracking branch 'scrawl/essimporter' 2015-01-21 15:12:04 +01:00
scrawl
5104a5a023 Add missing setFactionReaction instruction, use absolute storage instead of difference
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).

This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
Marc Zinnschlag
375d426dd0 check for premature end of scripts more consistently 2015-01-15 11:35:17 +01:00
Marc Zinnschlag
4b88ef5891 fixed QuickFileParser handling of begin line (skip it instead of trying to make sense of it) 2015-01-08 13:59:03 +01:00
scrawl
d919a0186e Comment out unused opSkipOnZero 2015-01-05 18:54:52 +01:00
Marc Zinnschlag
ac7c2a1473 some cleanup 2015-01-03 13:59:59 +01:00
Marc Zinnschlag
bbbf431ae3 double bug in script name handling workaround (Fixes #1730) 2015-01-03 13:54:46 +01:00
Marc Zinnschlag
120873a66d another workaround for script translation messup 2014-12-18 10:40:51 +01:00
Marc Zinnschlag
057d0913d6 Merge branch 'scriptfixes' 2014-12-18 10:22:07 +01:00
Marc Zinnschlag
fc1d42a7d2 fixed exclusion for certain characters at the start of names 2014-12-18 09:55:26 +01:00
Marc Zinnschlag
b951251572 handle junk in argument lists (Fixes #2206) 2014-12-17 15:03:05 +01:00
Marc Zinnschlag
5cb94da9c5 compensate for incorrect minus character in translated dialogue script (Fixes #2207) 2014-12-17 11:56:54 +01:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
Marc Zinnschlag
ed5387fb8c replaced stay [ ignoring implementation with one that does not interfere with other workarounds (Fixes #2205) 2014-12-13 15:43:40 +01:00
Marc Zinnschlag
e4f75267d0 in case of arguments not separated with comma the fist token of the next argument was put back incorrectly 2014-12-13 15:40:24 +01:00
scrawl
0ca11eab1c Ignore extra argument for removeItem (Fixes #2208) 2014-12-13 02:39:56 +01:00
scrawl
2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-11 22:44:58 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
Marc Zinnschlag
cda0363f29 allow a space in the middle of multi-character comparison operators (Fixes #2185) 2014-12-11 13:51:37 +01:00
Marc Zinnschlag
109fbab546 changed column/row numbering in script compiler error messages from being starting at 0 to starting at 1 2014-12-07 16:02:28 +01:00
Marc Zinnschlag
86037149cd add optional string argument for activate instruction (ignored) 2014-11-20 11:06:32 +01:00
Marc Zinnschlag
95dfb07816 make [ a whitespace character in scripts (Fixes #2126) 2014-11-15 09:53:08 +01:00
scrawl
bf0669e18c Ignore some extra string arguments to ShowMap (Fixes #2029)
Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation").
This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching.
2014-10-18 00:56:41 +02:00
Marc Zinnschlag
a0dbb40c8e Allow script names starting with digits (Fixes #1730) 2014-10-11 14:48:52 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
slothlife
35ced14e45 Fix for MSVC warnings 2014-09-22 21:33:09 -05:00
Marc Zinnschlag
9ae9104a45 Merge branch 'openmw-32' 2014-09-11 14:22:07 +02:00
Marc Zinnschlag
14f32563e7 fixed script compiler code ordering issue 2014-09-09 13:55:10 +02:00
scrawl
267cf4e140 Implement ResetActors script instruction (Fixes #1859) 2014-08-30 18:27:32 +02:00
scrawl
174153b2da Revert "Fix member variable case problem"
This reverts commit f0354ea04c.

Fixes #759 (again)

Conflicts:
	components/compiler/lineparser.cpp
2014-08-24 17:46:08 +02:00
Marc Zinnschlag
52f6a2ec7b remote local variable access was always using variable with index 1 instead of the index specified by the access request (Fixes #1739) 2014-08-24 11:58:08 +02:00
Marc Zinnschlag
736ab76f68 limit argument error workaround to PositionCell instruction (Fixes #1732) 2014-08-24 10:17:55 +02:00
scrawl
2db50da8dd Implement magic effect script instructions (Feature #1489) 2014-08-17 05:09:14 +02:00
Marc Zinnschlag
33c36bf0df Merge remote-tracking branch 'scrawl/master' 2014-08-03 22:23:48 +02:00
Digmaster
a32ab842ae Added ForceJump/ForceMoveJump commands 2014-08-02 22:42:40 -07:00
scrawl
0c1c468f70 Accept a useless extra integer argument for addItem (Fixes #1726) 2014-07-31 01:18:52 +02:00
scrawl
45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-07-29 19:35:44 +02:00
scrawl
543bb22e8f Implement collision script instructions (Fixes #1111) 2014-07-29 19:01:40 +02:00
Marc Zinnschlag
ad50b926f5 reducing some stray arguments again 2014-07-28 09:01:44 +02:00
Marc Zinnschlag
17bd094afd allow a few more stray arguments 2014-07-27 20:55:54 +02:00
Marc Zinnschlag
2abc4e42c8 end parsing of line after parsing a declaration 2014-07-27 20:49:57 +02:00
Marc Zinnschlag
6a745c014f workaround for incorrect argument order for PositionCell instruction 2014-07-27 11:51:53 +02:00
Marc Zinnschlag
2e355df8b3 removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts) 2014-07-25 07:59:50 +02:00
Marc Zinnschlag
19f4c46fe4 alllow (and ignore) explicit references for StopScript and ScriptRunning 2014-07-23 12:33:35 +02:00
Marc Zinnschlag
aa8c0bccb4 added new argument type: z (optional, any) 2014-07-23 09:44:29 +02:00
Marc Zinnschlag
11a2c767cc some argument parsing cleanup 2014-07-21 12:50:29 +02:00
Marc Zinnschlag
e33ee52b91 make stray names in the begin line a warning instead of an error 2014-07-18 12:29:20 +02:00
Marc Zinnschlag
35b27ea8cb ignore stray string argument after GetDisabled 2014-07-17 11:29:04 +02:00
Marc Zinnschlag
e8322da663 added support for targeted scripts to script compiler 2014-07-17 08:36:34 +02:00
Marc Zinnschlag
563c2e5730 be a bit more relaxed about allowing - in names (Fixes #1593) 2014-07-15 10:39:11 +02:00
scrawl
2506c16bf5 Add a dummy GetStat function returning 0 (Fixes #1589) 2014-06-30 17:49:01 +02:00
scrawl
b259c5def2 Make GetFactionReaction garbage argument optional 2014-06-25 01:12:57 +02:00
scrawl
b52977e44c Add dummy Face implementation for now (Bug #1541) 2014-06-24 15:09:13 +02:00
scrawl
750d8b5589 Allow garbage integer argument for addSpell (Fixes #1539) 2014-06-23 22:02:22 +02:00
scrawl
9a26cf22e6 Implement toggleMenus 2014-06-20 18:51:00 +02:00
scrawl
1dc9e151cb Count werewolf kills (Fixes #1525) 2014-06-18 16:56:36 +02:00
scrawl
2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 2014-06-17 04:05:27 +02:00
scrawl
ec66484472 Fix forceGreeting with explicit references (Fixes #1518) 2014-06-17 04:05:27 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
scrawl
77388fe2ce Implement BetaComment instruction (dumps reference info) 2014-06-15 16:11:16 +02:00
scrawl
3788fb042e Implement MenuTest script instruction (Fixes #1454) 2014-06-10 18:49:42 +02:00
scrawl
2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00
Marc Zinnschlag
f112c78858 Merge remote-tracking branch 'scrawl/master' 2014-05-28 19:47:36 +02:00
scrawl
e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame.
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
2014-05-28 19:23:50 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
Marc Zinnschlag
be39395ce7 Merge remote-tracking branch 'scrawl/master' 2014-05-27 21:09:24 +02:00
Marc Zinnschlag
12fc0aaecb removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly) 2014-05-27 21:08:29 +02:00
scrawl
3e2eed9269 Implement getFactionReaction function
Strange bug when using value != 0 for the garbage argument?
2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d Implement modFactionReaction instruction (Closes #1347) 2014-05-27 14:54:29 +02:00
Thomas
085fb2c5a2 Simplified documentation a bit 2014-05-13 14:13:05 -04:00
Thomas
a61d804de6 now that I've found the documentation, fixed some stuff for extensions 2014-05-13 13:53:06 -04:00
Thomas
8f90dd43ec Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier 2014-04-29 12:52:08 -04:00
Thomas
c2127845af Added onKnockdown command 2014-04-27 20:54:22 -04:00
scrawl
f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
2014-04-26 12:04:37 +02:00
scrawl
452b522bc3 Fix typos 2014-03-22 19:01:41 +01:00
scrawl
c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 2014-03-16 23:49:06 +01:00
Marc Zinnschlag
0d84adb2c6 allow x->(y) instead of (x->y) 2014-02-15 12:50:40 +01:00
Marc Zinnschlag
fd665a1994 ignore conditions after an else (only works if condition is put in parentheses) 2014-02-15 12:45:50 +01:00
Marc Zinnschlag
d213c6c36a fixed a constness-issue 2014-02-14 12:23:00 +01:00
Marc Zinnschlag
451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 2014-02-14 11:15:16 +01:00
Marc Zinnschlag
e76ef92669 also allow the use of keywords as remote local variables in set statements 2014-02-14 09:06:06 +01:00
Marc Zinnschlag
2086ebe410 fix for inappropriate disable (2nd attempt) 2014-02-14 08:48:26 +01:00
Marc Zinnschlag
b01c6dad37 Revert "allow disable as an alias for getDisabled (in most cases)"
This reverts commit f7ff4fbd51.
2014-02-14 08:29:18 +01:00
Marc Zinnschlag
f7ff4fbd51 allow disable as an alias for getDisabled (in most cases) 2014-02-13 15:31:07 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
Marc Zinnschlag
309573a3ac allow the use of the keyword end as a variable name in an expression 2014-02-13 14:15:48 +01:00
Marc Zinnschlag
ac8290c4d3 fixed problem with line endings in case of a local variable redeclaration 2014-02-13 09:59:22 +01:00
Marc Zinnschlag
dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 2014-02-13 09:52:44 +01:00
Marc Zinnschlag
87b51e47a9 fixed another case issue in remote member access 2014-02-13 09:40:07 +01:00
Marc Zinnschlag
c03bd8ebb6 allow [] as aliases for () 2014-02-13 08:59:33 +01:00
Marc Zinnschlag
0313876d88 allow leaving out if in a top-level if-statement 2014-02-13 08:49:40 +01:00
Marc Zinnschlag
2eeb0eb4f3 allow lines to continue with other instructions after an legit else 2014-02-13 08:38:26 +01:00
Marc Zinnschlag
749136bf33 ignore attempts to set non-existing variables 2014-02-12 20:23:47 +01:00
Marc Zinnschlag
a85d3c7dcb ignore unused explicit references for functions 2014-02-12 13:53:59 +01:00
Marc Zinnschlag
6e2e4d1adf ignore stray begin 2014-02-12 13:45:01 +01:00
Marc Zinnschlag
93d4743012 interpret instruction keywords as names within expressions 2014-02-12 09:56:25 +01:00
Marc Zinnschlag
c0a6acfe6c allow the use of keywords as variable names in more places 2014-02-12 09:23:23 +01:00