]> git.localhorst.tv Git - l2e.git/log
l2e.git
11 years agoMerge branch 'loader'
Daniel Karbach [Mon, 3 Sep 2012 19:58:28 +0000 (21:58 +0200)]
Merge branch 'loader'

This introduces the capability of loading l2 formatted source files.
The syntax for those is described here:
http://luke.redirectme.net/redmine/projects/l2e/wiki/LoaderSource

Please note that this method of loading data is very inefficient, but
convenient. Efficiency issues will be adressed by a binary file format
which mentioned source files can be compiled to.

Also, some representations have been adapted to a more link-friendly
structure and most of the configuration code in main has been moved to
their respective l2s files residing in /test-data/ .

11 years agomade high level parser errors a bit more expressive
Daniel Karbach [Mon, 3 Sep 2012 19:56:12 +0000 (21:56 +0200)]
made high level parser errors a bit more expressive

11 years agosplit headers off of ikaris, items, and spells
Daniel Karbach [Sun, 2 Sep 2012 17:20:16 +0000 (19:20 +0200)]
split headers off of ikaris, items, and spells

11 years agoadded utility function to create headers
Daniel Karbach [Sun, 2 Sep 2012 17:19:40 +0000 (19:19 +0200)]
added utility function to create headers

11 years agofixed some issues with the grammar
Daniel Karbach [Sun, 2 Sep 2012 17:19:02 +0000 (19:19 +0200)]
fixed some issues with the grammar

11 years agoadded interpretation of battle resources
Daniel Karbach [Sun, 2 Sep 2012 16:53:20 +0000 (18:53 +0200)]
added interpretation of battle resources

11 years agorefactored battle resources to better compatibility with loader
Daniel Karbach [Sun, 2 Sep 2012 15:32:58 +0000 (17:32 +0200)]
refactored battle resources to better compatibility with loader

11 years agomoved menu prototypes to test.l2s
Daniel Karbach [Sun, 2 Sep 2012 15:23:34 +0000 (17:23 +0200)]
moved menu prototypes to test.l2s

11 years agoextracted menu properties to a non-template struct
Daniel Karbach [Sun, 2 Sep 2012 14:51:40 +0000 (16:51 +0200)]
extracted menu properties to a non-template struct

11 years agoadded interpretation of colors
Daniel Karbach [Sun, 2 Sep 2012 14:30:35 +0000 (16:30 +0200)]
added interpretation of colors

11 years agofixed parsing of colors
Daniel Karbach [Sun, 2 Sep 2012 14:29:02 +0000 (16:29 +0200)]
fixed parsing of colors

11 years agouse correct headline in SelectIkari
Daniel Karbach [Sat, 1 Sep 2012 19:01:58 +0000 (21:01 +0200)]
use correct headline in SelectIkari

11 years agomoved most of the remaining data from main to test.l2s
Daniel Karbach [Sat, 1 Sep 2012 18:59:12 +0000 (20:59 +0200)]
moved most of the remaining data from main to test.l2s

now only menu prototypes and battle resources are missing

11 years agomoved Guy's and Dekar's (well, Artea's) equipment to items.l2s
Daniel Karbach [Sat, 1 Sep 2012 18:43:44 +0000 (20:43 +0200)]
moved Guy's and Dekar's (well, Artea's) equipment to items.l2s

11 years agomoved Guy's equipment to items.l2s
Daniel Karbach [Sat, 1 Sep 2012 18:34:07 +0000 (20:34 +0200)]
moved Guy's equipment to items.l2s

11 years agomoved Maxim's and Selan's equipment to items.l2s
Daniel Karbach [Sat, 1 Sep 2012 18:01:11 +0000 (20:01 +0200)]
moved Maxim's and Selan's equipment to items.l2s

11 years agoadded hard support for path names in source files
Daniel Karbach [Sat, 1 Sep 2012 17:01:50 +0000 (19:01 +0200)]
added hard support for path names in source files

11 years agoresolve inclusion path name in Parser
Daniel Karbach [Sat, 1 Sep 2012 16:28:50 +0000 (18:28 +0200)]
resolve inclusion path name in Parser

11 years agomoved some items to l2 source files
Daniel Karbach [Sat, 1 Sep 2012 13:55:48 +0000 (15:55 +0200)]
moved some items to l2 source files

11 years agoadded interpretation of Ikari and Item
Daniel Karbach [Sat, 1 Sep 2012 13:55:26 +0000 (15:55 +0200)]
added interpretation of Ikari and Item

11 years agomoved icon config to test.l2s
Daniel Karbach [Fri, 31 Aug 2012 21:46:59 +0000 (23:46 +0200)]
moved icon config to test.l2s

11 years agosorry, forgot the spells source file
Daniel Karbach [Fri, 31 Aug 2012 21:46:35 +0000 (23:46 +0200)]
sorry, forgot the spells source file

11 years agoadded Spell and TargetingMode interpretation
Daniel Karbach [Fri, 31 Aug 2012 21:35:27 +0000 (23:35 +0200)]
added Spell and TargetingMode interpretation

11 years agomade single properties of TargetingMode configurable
Daniel Karbach [Fri, 31 Aug 2012 21:35:02 +0000 (23:35 +0200)]
made single properties of TargetingMode configurable

11 years agoadded error message for unreadable files in Parser
Daniel Karbach [Fri, 31 Aug 2012 21:31:55 +0000 (23:31 +0200)]
added error message for unreadable files in Parser

11 years agomoved more configuration to test.l2s
Daniel Karbach [Fri, 31 Aug 2012 20:39:23 +0000 (22:39 +0200)]
moved more configuration to test.l2s

11 years agoadded interpretation of gauges
Daniel Karbach [Fri, 31 Aug 2012 20:18:06 +0000 (22:18 +0200)]
added interpretation of gauges

11 years agomade Gauge default constructible
Daniel Karbach [Fri, 31 Aug 2012 19:52:33 +0000 (21:52 +0200)]
made Gauge default constructible

11 years agoadded interpretation of Font and Frame objects
Daniel Karbach [Fri, 31 Aug 2012 19:43:26 +0000 (21:43 +0200)]
added interpretation of Font and Frame objects

11 years agomade Frame default constructible
Daniel Karbach [Fri, 31 Aug 2012 19:20:46 +0000 (21:20 +0200)]
made Frame default constructible

11 years agomade Font default constructible
Daniel Karbach [Fri, 31 Aug 2012 19:13:57 +0000 (21:13 +0200)]
made Font default constructible

11 years agomoved some sprites to test.l2s
Daniel Karbach [Fri, 31 Aug 2012 19:00:48 +0000 (21:00 +0200)]
moved some sprites to test.l2s

11 years agoadded interpretation of PartyLayout
Daniel Karbach [Fri, 31 Aug 2012 18:40:39 +0000 (20:40 +0200)]
added interpretation of PartyLayout

11 years agomore literals supported in Interpreter
Daniel Karbach [Fri, 31 Aug 2012 18:13:55 +0000 (20:13 +0200)]
more literals supported in Interpreter

11 years agosplit complex and simple animations in interpreter
Daniel Karbach [Thu, 30 Aug 2012 20:34:03 +0000 (22:34 +0200)]
split complex and simple animations in interpreter

11 years agomoved Guy's and Dekar's configuration to test.l2s
Daniel Karbach [Thu, 30 Aug 2012 19:54:57 +0000 (21:54 +0200)]
moved Guy's and Dekar's configuration to test.l2s

11 years agoremoved parser debug output
Daniel Karbach [Wed, 29 Aug 2012 22:47:15 +0000 (00:47 +0200)]
removed parser debug output

11 years agomoved Selan to test.l2s
Daniel Karbach [Wed, 29 Aug 2012 22:19:31 +0000 (00:19 +0200)]
moved Selan to test.l2s

11 years agostore pointers rather than objects in Interpreter
Daniel Karbach [Wed, 29 Aug 2012 22:01:08 +0000 (00:01 +0200)]
store pointers rather than objects in Interpreter

to avoid problems due to reallocation

11 years agoinitialized monster animations and enabled -Wall compiler flag
Daniel Karbach [Wed, 29 Aug 2012 21:38:36 +0000 (23:38 +0200)]
initialized monster animations and enabled -Wall compiler flag

11 years agointerpret Monster's meleeAnimation property
Daniel Karbach [Wed, 29 Aug 2012 21:32:48 +0000 (23:32 +0200)]
interpret Monster's meleeAnimation property

11 years agofixed sword attack animation dimensions
Daniel Karbach [Wed, 29 Aug 2012 21:00:40 +0000 (23:00 +0200)]
fixed sword attack animation dimensions

11 years agodeallocate most of the stuff Interpreter reservers
Daniel Karbach [Wed, 29 Aug 2012 20:53:06 +0000 (22:53 +0200)]
deallocate most of the stuff Interpreter reservers

more to come

11 years agoadded destructors for ParsedSource & Co. to free some resources
Daniel Karbach [Wed, 29 Aug 2012 19:25:42 +0000 (21:25 +0200)]
added destructors for ParsedSource & Co. to free some resources

11 years agouse definition of Maxim and Lizard from source
Daniel Karbach [Wed, 29 Aug 2012 18:57:41 +0000 (20:57 +0200)]
use definition of Maxim and Lizard from source

11 years agoadded comments (/*…*/ and //…\n)
Daniel Karbach [Wed, 29 Aug 2012 18:56:15 +0000 (20:56 +0200)]
added comments (/*…*/ and //…\n)

11 years agoadded getters for interpreted objects
Daniel Karbach [Wed, 29 Aug 2012 18:15:04 +0000 (20:15 +0200)]
added getters for interpreted objects

11 years agointerpretation of Heros and Monsters
Daniel Karbach [Tue, 28 Aug 2012 21:45:32 +0000 (23:45 +0200)]
interpretation of Heros and Monsters

11 years agoset correct literal status in Value constructor
Daniel Karbach [Tue, 28 Aug 2012 20:50:17 +0000 (22:50 +0200)]
set correct literal status in Value constructor

11 years agoadded setters for animations
Daniel Karbach [Tue, 28 Aug 2012 20:09:37 +0000 (22:09 +0200)]
added setters for animations

11 years agoadded setters for stats
Daniel Karbach [Tue, 28 Aug 2012 19:36:10 +0000 (21:36 +0200)]
added setters for stats

11 years agomade Sprite default constructible
Daniel Karbach [Tue, 28 Aug 2012 19:21:44 +0000 (21:21 +0200)]
made Sprite default constructible

11 years agostarted an interpreter for parsed sources
Daniel Karbach [Sun, 26 Aug 2012 22:03:28 +0000 (00:03 +0200)]
started an interpreter for parsed sources

11 years agoadded getters for property lists
Daniel Karbach [Sun, 26 Aug 2012 22:02:57 +0000 (00:02 +0200)]
added getters for property lists

11 years agoadded more getters to ParsedSource
Daniel Karbach [Sun, 26 Aug 2012 21:16:52 +0000 (23:16 +0200)]
added more getters to ParsedSource

11 years agomore information in parsed source and output
Daniel Karbach [Sun, 26 Aug 2012 20:36:47 +0000 (22:36 +0200)]
more information in parsed source and output

11 years agoadded test data
Daniel Karbach [Sun, 26 Aug 2012 19:55:22 +0000 (21:55 +0200)]
added test data

11 years agoadded support for arrays of property lists
Daniel Karbach [Sun, 26 Aug 2012 19:54:48 +0000 (21:54 +0200)]
added support for arrays of property lists

11 years agouse a syntax that my ide recognizes valid -.-
Daniel Karbach [Sun, 26 Aug 2012 19:45:23 +0000 (21:45 +0200)]
use a syntax that my ide recognizes valid -.-

11 years agomade parsing exceptions a little more informative
Daniel Karbach [Sun, 26 Aug 2012 19:43:34 +0000 (21:43 +0200)]
made parsing exceptions a little more informative

11 years agofixed order of initializer list of battle::Stats
Daniel Karbach [Sun, 26 Aug 2012 18:48:57 +0000 (20:48 +0200)]
fixed order of initializer list of battle::Stats

11 years agoadded basic parser (not completely tested)
Daniel Karbach [Sun, 26 Aug 2012 18:46:06 +0000 (20:46 +0200)]
added basic parser (not completely tested)

11 years agoadded peek function to tokenizer
Daniel Karbach [Sun, 26 Aug 2012 15:16:51 +0000 (17:16 +0200)]
added peek function to tokenizer

11 years agoadded missing parentheses tokens
Daniel Karbach [Sun, 26 Aug 2012 15:04:21 +0000 (17:04 +0200)]
added missing parentheses tokens

11 years agointroduced exception type for tokenizer
Daniel Karbach [Sun, 26 Aug 2012 14:47:44 +0000 (16:47 +0200)]
introduced exception type for tokenizer

11 years agomade tokenizer and token constructors explicit
Daniel Karbach [Sun, 26 Aug 2012 14:33:14 +0000 (16:33 +0200)]
made tokenizer and token constructors explicit

11 years agoadded function to convert token types to strings
Daniel Karbach [Sun, 26 Aug 2012 14:31:34 +0000 (16:31 +0200)]
added function to convert token types to strings

11 years agoadded output function for token types
Daniel Karbach [Sun, 26 Aug 2012 13:31:49 +0000 (15:31 +0200)]
added output function for token types

11 years agoadded tokenizer
Daniel Karbach [Sun, 26 Aug 2012 12:28:03 +0000 (14:28 +0200)]
added tokenizer

11 years agomoved TODOs to tracker
Daniel Karbach [Sat, 25 Aug 2012 18:14:08 +0000 (20:14 +0200)]
moved TODOs to tracker

see: http://luke.redirectme.net/redmine/projects/l2e/issues

11 years agoremoved invalid TODO from spell selection
Daniel Karbach [Sat, 25 Aug 2012 17:47:29 +0000 (19:47 +0200)]
removed invalid TODO from spell selection

no need to remove items when selecting a spell ^^

11 years agoremoved pasting fail from ikari selection
Daniel Karbach [Sat, 25 Aug 2012 17:46:22 +0000 (19:46 +0200)]
removed pasting fail from ikari selection

11 years agoswitched some (x,y) and (w,h) pairs to vectors
Daniel Karbach [Wed, 22 Aug 2012 21:17:03 +0000 (23:17 +0200)]
switched some (x,y) and (w,h) pairs to vectors

11 years agomerged Point into Vector
Daniel Karbach [Wed, 22 Aug 2012 20:35:37 +0000 (22:35 +0200)]
merged Point into Vector

this should make some stuff a lot easier

11 years agoextracted damage calculation once more
Daniel Karbach [Wed, 22 Aug 2012 20:14:53 +0000 (22:14 +0200)]
extracted damage calculation once more

11 years agoset targeting mode for weapons in main
Daniel Karbach [Wed, 22 Aug 2012 19:54:47 +0000 (21:54 +0200)]
set targeting mode for weapons in main

11 years agofixed attack choice reset bug
Daniel Karbach [Wed, 22 Aug 2012 19:50:25 +0000 (21:50 +0200)]
fixed attack choice reset bug

did not reset the first hero's attack choice when cancelling the second hero's selection

11 years agorenamed TargetSelections Enemies to Monsters
Daniel Karbach [Wed, 22 Aug 2012 19:49:34 +0000 (21:49 +0200)]
renamed TargetSelections Enemies to Monsters

11 years agorandomized monsters' attack target selection
Daniel Karbach [Wed, 22 Aug 2012 19:45:10 +0000 (21:45 +0200)]
randomized monsters' attack target selection

11 years agoremoved invalid TODO :o
Daniel Karbach [Wed, 22 Aug 2012 19:05:55 +0000 (21:05 +0200)]
removed invalid TODO :o

11 years agoadded target selection type detection for weapons
Daniel Karbach [Tue, 21 Aug 2012 21:27:32 +0000 (23:27 +0200)]
added target selection type detection for weapons

11 years agoremoved battleState TODOs
Daniel Karbach [Tue, 21 Aug 2012 20:28:25 +0000 (22:28 +0200)]
removed battleState TODOs

this current version should do for the next few days

11 years agomoved monster's position to Monster
Daniel Karbach [Tue, 21 Aug 2012 20:24:24 +0000 (22:24 +0200)]
moved monster's position to Monster

11 years agomoved hero position to Hero
Daniel Karbach [Tue, 21 Aug 2012 20:15:08 +0000 (22:15 +0200)]
moved hero position to Hero

11 years agorenamed BattleState's GetItemMenu -> ItemMenu
Daniel Karbach [Tue, 21 Aug 2012 19:55:27 +0000 (21:55 +0200)]
renamed BattleState's GetItemMenu -> ItemMenu

11 years agoremoved redunant getters for spell and ikari menus
Daniel Karbach [Tue, 21 Aug 2012 19:39:37 +0000 (21:39 +0200)]
removed redunant getters for spell and ikari menus

11 years agoremoved redundant BattleState::MonsterAttackChoiceAt(int)
Daniel Karbach [Tue, 21 Aug 2012 19:35:42 +0000 (21:35 +0200)]
removed redundant BattleState::MonsterAttackChoiceAt(int)

11 years agomoved monsters' attack choices to Monster
Daniel Karbach [Tue, 21 Aug 2012 19:32:27 +0000 (21:32 +0200)]
moved monsters' attack choices to Monster

11 years agoremoved redundant BattleState::AttackChoiceAt(int)
Daniel Karbach [Tue, 21 Aug 2012 19:18:25 +0000 (21:18 +0200)]
removed redundant BattleState::AttackChoiceAt(int)

11 years agoremoved redundant BattleState::ActiveHeroAttackChoice()
Daniel Karbach [Tue, 21 Aug 2012 19:14:04 +0000 (21:14 +0200)]
removed redundant BattleState::ActiveHeroAttackChoice()

11 years agoadded some assertions concerning BattleState::activeHero
Daniel Karbach [Tue, 21 Aug 2012 19:06:29 +0000 (21:06 +0200)]
added some assertions concerning BattleState::activeHero

11 years agofixed a bug in BattleState::PreviousHero()
Daniel Karbach [Tue, 21 Aug 2012 19:02:58 +0000 (21:02 +0200)]
fixed a bug in BattleState::PreviousHero()

didn't account for dead heroes; now does

11 years agomoved spell and ikari menu initialization to Hero
Daniel Karbach [Tue, 21 Aug 2012 18:58:48 +0000 (20:58 +0200)]
moved spell and ikari menu initialization to Hero

11 years agomoved some Hero related stuff out of BattleState
Daniel Karbach [Tue, 21 Aug 2012 18:47:29 +0000 (20:47 +0200)]
moved some Hero related stuff out of BattleState

11 years agofix monster attack animation frame offsets
Daniel Karbach [Mon, 20 Aug 2012 21:57:18 +0000 (23:57 +0200)]
fix monster attack animation frame offsets

11 years agoput animations in place
Daniel Karbach [Mon, 20 Aug 2012 21:56:22 +0000 (23:56 +0200)]
put animations in place

11 years agochanged number animation prototype to plain animation pointer
Daniel Karbach [Mon, 20 Aug 2012 21:52:47 +0000 (23:52 +0200)]
changed number animation prototype to plain animation pointer

11 years agoadjusted NumberAnimation to use animation runner
Daniel Karbach [Mon, 20 Aug 2012 21:49:56 +0000 (23:49 +0200)]
adjusted NumberAnimation to use animation runner

11 years agoyet more stuff for AnimationRunner
Daniel Karbach [Mon, 20 Aug 2012 21:49:19 +0000 (23:49 +0200)]
yet more stuff for AnimationRunner

11 years agofixed timer type in AnimationRunner::Clear()
Daniel Karbach [Mon, 20 Aug 2012 21:42:16 +0000 (23:42 +0200)]
fixed timer type in AnimationRunner::Clear()