Commit Graph

504 Commits

Author SHA1 Message Date
M. Sz c933e4b891 fixed build error & tbl: removed version check (because of error screen; we don't need to check version) 2021-02-25 14:11:19 +01:00
M. Sz 8d5cf7a26b tbl: replaced lolstring with teststring in tests 2021-02-25 13:09:38 +01:00
M. Sz 3b8cdffe15 tbl: lintfix 2021-02-25 12:08:02 +01:00
M. Sz e163c40107 tbl: completed error mesages 2021-02-25 12:06:37 +01:00
M. Sz 91b3290322 tbl: completed test 2021-02-25 12:03:00 +01:00
M. Sz 522f749cfc tbl: encoder 2021-02-25 11:58:32 +01:00
M. Sz 2859eae91c Revert "data encoding: tbl"
This reverts commit 5a0571763e.
2021-02-25 10:02:10 +01:00
M. Sz 78404ed56c cof: added Duration method 2021-02-25 09:33:47 +01:00
M. Sz e7c5efe8e4 cof: added SpeedToFPS method 2021-02-25 09:30:59 +01:00
M. Sz b4cd34e351 cof: splited long Marshal method to avoid nolint:funlen 2021-02-25 09:28:11 +01:00
gucio321 4e7ec3e843
Ds1 refactor: removed npcIndexes field+fixed SetNumberOfWalls bug (#7)
* ds1 refactor: removed npcIndexes field
it was unnecessary, because described a number of objects with paths to use in encoder, but we can calculate manually

* ds1 refactor: fixed set number of (layers) bug

* ds1 refactor: SetNumberOf...Layers now returns error if incorrect number given

* ds1 refactor: lintfix

* ds1 refactor: rename: setupStreamLayerTypes -> GetStreamLayerTypes

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2021-02-23 12:35:06 -08:00
gucio321 5e62b12bc4
Ds1 refactor: test bugs + descriptive errors + SetNumberOfWall/FloorLayers (#6)
* ds1 refactor:
- removed DS1.layerStreamTypes field
- written unit test for setupStreamLayerTypes method
- added more descriptive error messages for LoadDS1 (and submethods)

* ds1 refactor: added some missing error messages

* ds1 refactor: fixed test bugs

* ds1 refactor: removed unnecessary c1. and c2. comments in ds1_test errors

* ds1 refactor: removed fmt from ds1_test

* ds1 refactor: fixed bug with SetTiles test + lintfix

* ds1 refactor: SetNumberOfWalls

* ds1 refactor: SetTile(s) now changes walls/floors length if neccesary

* ds1 refactor: removed unnecessary debugging fmt

* ds1 refactor: added substitution layer and object with paths to example data

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2021-02-22 12:18:35 -08:00
gucio321 46d2bc6559
Ds1 refactor: some test improvement (#5)
* ds1 refactor: floor_shadow.go: methods Encode, Decode an Hidden are methods of floorShadow

* ds1 refactor: test checks, if our methods sets all fields correctly

* ds1 refactor: minor bugfixes

* i don't remember what's this, but i commit it ;-)

* ds1 refactor: reverted some pushed by mistake things

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2021-02-20 11:28:06 -08:00
gravestench bc4bd7235b
Merge branch 'master' into d2ds1_refactor 2021-02-20 11:23:40 -08:00
M. Sz a4f12f6ebe hotfix: removed unnecessary 0 from d2fontglyph.unknown3 bytes list 2021-02-19 14:22:11 +01:00
M. Sz 7574293624 hotfix: font format:
- removed magic numbers
- corrected unknown1 bytes count in d2fontglyph.Create
2021-02-19 08:49:04 +01:00
M. Sz a9ccda1873 hothotfix: fixed argument order in call to d2fontglyph.Create 2021-02-19 07:42:25 +01:00
M. Sz b75f82fc8c font format: refactor: moved font glyph into new package 2021-02-18 21:05:16 +01:00
M. Sz aeef2d5c4b font format: NewFontGlyph method 2021-02-18 20:39:57 +01:00
gravestench 169521e546 DS1.Tile() now calls update if dirty 2021-02-17 10:57:38 -08:00
gravestench 8a5148647b renamed another file 2021-02-17 10:23:49 -08:00
gravestench 84d510fe16 d2ds1.FloorShadow is now private 2021-02-17 10:16:10 -08:00
gravestench 09bbcf0b4d renamed some files in d2ds1 2021-02-17 10:15:51 -08:00
gucio321 99908016be
unit tests for ds1 (#4)
* ds1 refactor: added test fore some methods; put tests in right order

* ds1 refactor: unit tests for all methods

* ds1 refactor: fixed build errors

* ds1 refactor: lintfix

* ds1 refactor: fixed bug with SetWidth, SetHeight methods

* ds1 refactor: rename tile_record.go -> tile.go

* ds1 refactor: unit test for SetTiles

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2021-02-17 10:04:44 -08:00
gravestench ec47f16cc4 Refactoring d2ds1
* Adding setters/getters so that state management can be maintained
internally when the ds1 struct is altered
* Adding unit tests for DS1
2021-02-17 02:36:25 -08:00
M. Sz 6fdbaa07bd font table format: lintfix 2021-02-17 10:37:04 +01:00
M. Sz 66ac5ff657 font table format: methods to set size and frame index 2021-02-17 10:28:36 +01:00
M. Sz 7a54465eb3 hotfix: font table format: fontGlyph is now exported 2021-02-17 09:05:29 +01:00
M. Sz 4243a1f6b1 font: rename GetSize, and GetFrameIndex -> Size, FrameIndex 2021-02-17 08:38:41 +01:00
M. Sz 9f47ed4b35 font encoder: lintfix 2021-02-17 08:32:41 +01:00
M. Sz 1d12c2036a hotfix: font table editor: added methods GetSize, and GetFrameIndex to font glyph 2021-02-17 08:28:23 +01:00
gucio321 b2e10ca43e
Merge branch 'master' into date-encoder-font 2021-02-17 07:56:00 +01:00
gravestench 97708c1349
Revert "hotfix: ds1: method setupLayerTypes is now exported + circleci build job bugfix" 2021-02-16 10:02:34 -08:00
M. Sz 6866a03f34 hotfix: ds1: method setupLayerTypes is now exported 2021-02-16 13:06:12 +01:00
M. Sz 0dd9ae6783 ds1 encoder: fixed build error 2021-02-15 15:07:33 +01:00
M. Sz 8a4c138835 ds1 encoder: layerStreamTypes and npcIndexes are now exported 2021-02-15 15:01:14 +01:00
M. Sz bbeb4b48e2 hotfix: rename hidden -> HiddenBytes in wall_record.go and floor_shadow_record.go 2021-02-15 08:34:12 +01:00
gravestench 298fc786b8
Merge branch 'master' into date-encoder-font 2021-02-10 12:14:41 -08:00
gravestench d268a987f3
Merge branch 'master' into data-encoder-dat 2021-02-10 12:05:10 -08:00
gravestench 0c5a3ae54c
Merge branch 'master' into data-encoding2 2021-02-10 11:52:00 -08:00
gucio321 025a172500 fixed lint errors in stream_writter 2021-02-10 19:53:11 +01:00
gucio321 004787597e
Merge branch 'master' into data-encoder-dt1 2021-02-10 19:43:32 +01:00
M. Sz 8a087dba6c stream writer and stream writer test:
- fixed typo
- cut PushBits... methods
- removed magic number
2021-02-10 14:00:03 +01:00
gucio321 6c230f66d7
d2dat encoder: removed typo in comment 2021-02-10 13:03:59 +01:00
M. Sz 7d0eeb0fd3 hotfix: d2cof encoder: changed way of pushing weapon class 2021-02-10 12:59:07 +01:00
M. Sz 1010353071 hotfix: d2cof encoder: removed magic number (len of weapon class) 2021-02-10 12:35:35 +01:00
M. Sz 8a15c0b074 hotfix: cof encoder: coding weapon class 2021-02-10 08:33:29 +01:00
M. Sz d9cfe7f435 d2font: removed d2interface.Animation argument from d2font.Load; added height reading in glyphs loader 2021-02-09 08:53:34 +01:00
M. Sz 622e54dfce dc6 refactor: lintfix 2021-02-08 18:50:58 +01:00
M. Sz 6d098de778 d2dc6 refactor + unit test for it 2021-02-08 18:50:58 +01:00
gucio321 b74bc3d0b6
Merge branch 'master' into data-encoder-dat 2021-02-08 18:43:58 +01:00
gucio321 98c38b0dbf
Merge branch 'master' into data-encoder-dt1 2021-02-08 18:40:27 +01:00
gucio321 51833ed2de
Merge branch 'master' into date-encoder-font 2021-02-08 18:40:07 +01:00
Tim Sarbin a85a7a18c1
Merge branch 'master' into master 2021-02-08 12:37:46 -05:00
M. Sz e2ec1c6613 d2font: fixed lint errors 2021-02-08 17:25:02 +01:00
M. Sz 662d4489c4 d2font: encoder 2021-02-08 15:03:59 +01:00
M. Sz 6df66b51c1 d2font: rewritten initGlyphs ethod to use stream reader 2021-02-08 14:11:51 +01:00
M. Sz 721a67b404 font table interpreter: moved d stuff responsible for font table into d2fileformats/d2font 2021-02-08 13:21:50 +01:00
gucio321 ac50f8274a
Merge branch 'master' into data-encoder-dat 2021-02-08 12:05:40 +01:00
gucio321 bcfb0fb5c2
Merge branch 'master' into data-encoder-dt1 2021-02-08 12:04:55 +01:00
M. Sz a76ce059e8 dat decoder: fixed lints 2021-02-08 10:03:34 +01:00
gucio321 794c246f64 fixed lint error in bitmuncher_test.go 2021-02-08 09:57:43 +01:00
M. Sz b6cb6f88a6 data encoder: d2dat 2021-02-08 09:49:43 +01:00
M. Sz 5caa93a399 unit test: bitmuncher 2021-02-08 08:23:43 +01:00
M. Sz 8e1ca1dd7f stream writer test: added test for pushing bits 2021-02-06 20:43:04 +01:00
M. Sz 20f0d8a3d5 removed some of nolint:govet 2021-02-06 19:10:15 +01:00
M. Sz 215ac8cfc5 ds1: splited loading function 2021-02-06 18:58:15 +01:00
M. Sz 32570d6ae5 replaced nolint:gomnd directives with "magic numbers'" names 2021-02-06 18:28:01 +01:00
gucio321 ac8794015e Merge branch 'master' into data-encoder-dt1 2021-02-06 17:30:10 +01:00
M. Sz aadfbbc8a6 stream writer: added warnings when bits count is greater then possible input size (in PUshBits... methods) 2021-02-06 17:23:11 +01:00
gravestench 248eaf9d79 Minor refactor of d2cof
* Changed `Load` to `Unmarshal`
* made `Marshal` and `Unmarshal` into methods of `COF`
* added `New` function which creates a new, empty COF instance
* added helper functions `Marshal` and `Unmarshal`
* Changed `StreamReader.ReadBytes` to account for edge case of reading 0
bytes (this was returning an error when it should not have)
* added really simple unit tests for COF
2021-02-05 14:43:42 -08:00
M. Sz b3a754a4a6 ds1 encoder: Marshal method was splited to avoid nolint directive 2021-02-05 15:05:11 +01:00
M. Sz 9227de3418 d2ds1 encoder: fixed lint errors 2021-02-05 14:54:35 +01:00
M. Sz 5702d96cac ds1 encoder: fixed bug, when decoded and encoded back data wasn't the same = records' encoding methods was rewritten to use streamWriter.Pushbit 2021-02-05 14:45:22 +01:00
M. Sz 3dafb3ebcd dt1 encoder: moved record encoders and decoders to appropriate files 2021-02-05 14:07:51 +01:00
M. Sz 9f56574066 data encoder: ds1 2021-02-05 12:52:51 +01:00
gucio321 1b8da9ec8e
Merge branch 'master' into data-encoding2 2021-02-03 16:28:10 +01:00
Tim Sarbin ffe4e68108
Merge branch 'master' into data-encoder-dt1 2021-02-03 09:57:46 -05:00
Tim Sarbin 89595329a5
Merge branch 'master' into data-converting 2021-02-03 09:48:54 -05:00
M. Sz 9f9c882653 data encoder: dt1 2021-02-02 19:25:27 +01:00
gucio321 73ca325a6b
Merge branch 'master' into data-converting 2021-02-02 17:01:05 +01:00
gucio321 5aded8de66
Merge branch 'master' into data-encoding2 2021-02-02 17:00:19 +01:00
Tim Sarbin 42a41d4817
Merge branch 'master' into hotfix2 2021-02-02 08:54:17 -05:00
M. Sz 909a0a9939 lintfix: gomnd 2021-02-02 12:02:11 +01:00
M. Sz 20f2649b65 asset manager: merged TranslateLabel to TranslateString 2021-02-02 10:15:18 +01:00
M. Sz 5a0571763e data encoding: tbl 2021-02-02 10:08:32 +01:00
M. Sz 2ebb36eba8 fixed stream-writer's test bug 2021-02-01 20:58:29 +01:00
M. Sz 84c87b2eb8 data encoding: DC6 2021-02-01 12:57:02 +01:00
M. Sz 7781b2cd6b removed PushByte method from StreamWriter 2021-02-01 11:20:44 +01:00
M. Sz 0fec9473ed rename: PushBytes(b []byte) -> PushBytes(b ...byte) 2021-02-01 11:15:42 +01:00
M. Sz 0f32ad5d62 data encoder: COF remade Cof encoder to use stream writter 2021-01-31 19:14:18 +01:00
gucio321 c5eb602de0
Update cof.go 2021-01-31 12:11:54 +01:00
gucio321 d0288e309f
removed WIP code 2021-01-30 18:31:44 +01:00
M. Sz 157f110105 data encoding: added COF encoder 2021-01-30 18:23:00 +01:00
M. Sz b25bbe31f4 d2ui: rename NewCustomButton -> NewDefaultButton; lintfix 2021-01-19 17:47:42 +01:00
M. Sz 07eeec4827 party panel: rearranged constants (moved part of them into d2enum) 2021-01-19 17:39:40 +01:00
M. Sz 71e4470c25 party panel: colored labels; d2ui improvement: SwitchableButton.SetState() method; lintfix 2021-01-17 20:47:40 +01:00
M. Sz bd3fc4bb25 party panel: switchers creator, party indexes (name, classs labels and switchers) 2021-01-16 21:59:44 +01:00
M. Sz 0de3aeabd3 Rename partyScreen->partyPanel 2021-01-16 21:59:44 +01:00
M. Sz d74e171313 Party screen: frame, panel, close btn 2021-01-16 21:59:44 +01:00
gravestench 87d531814d d2datautil.StreamReader refactor
*`StreamReader.Read` methods now return errors

The other edits in this commit are related to cleaning up lint errors
caused by the changes to StreamReader
2021-01-12 10:26:27 -08:00
gravestench 1fc787023d fixed lint errors 2021-01-11 01:31:57 -08:00
gravestench aa8525ff31 removed commented code 2021-01-11 01:16:29 -08:00
gravestench 2c0f3d9cd9 d2tbl.LoadTextDictionary now returns an error 2021-01-11 01:12:46 -08:00
Tim Sarbin c99810ad0e Fixed various bugs, crashes, and slowdowns. 2021-01-10 02:44:42 -05:00
Intyre db83814527
d2mpq refactored (#1020)
* d2mpq refactor

* d2mpq refactor last standing lint error

* d2mpq refactor: less linter noise

* d2mpq refactor: more linter issues
2021-01-08 12:46:11 -08:00
gucio321 6addf7a243
removed links to closed issues from code (#1005)
Co-authored-by: M. Sz <mszeptuch@protonmail.com>
Co-authored-by: gravestench <dknuth0101@gmail.com>
2021-01-06 21:48:12 -08:00
Tim Sarbin 92989d6d7a Removed improper ebiten dependency in d2interface. 2020-12-30 02:08:32 -05:00
Intyre 1e91df996c Refactor StreamReader 2020-12-23 10:43:33 +01:00
Intyre b78dca52c2 Refactor StreamWriter 2020-12-23 10:43:33 +01:00
Tim Sarbin b4f1e8cbbd
Merge pull request #1000 from gucio321/multi-language-support
ckecked value of italian modifier
2020-12-22 09:25:20 -05:00
M. Sz bc17f2c422 ckecked value of italian modifier 2020-12-22 10:45:30 +01:00
Tim Sarbin 0f658d5dec
Merge pull request #999 from Intyre/term
Cleaned up d2term
2020-12-21 20:21:20 -05:00
Intyre 04ec879035 Cleaned up d2term 2020-12-21 21:46:58 +01:00
M. Sz 0c04e9b3d5 skill select menu dependencies (when we open skillselect menu, other panels are closed) 2020-12-21 17:37:59 +01:00
Tim Sarbin c79c2a8c89
Merge pull request #983 from gucio321/quest-log-part2
Quest Log - quest completion animation
2020-12-17 11:35:25 -05:00
M. Sz be8b3e3157 stats changing: hero stats panel 2020-12-16 16:49:50 +01:00
M. Sz 08e590f3e4 quest animation initial. 2020-12-16 15:08:39 +01:00
gucio321 2e31f3d1ec
Move Gold Panel (#962)
* move gold panel
2020-12-12 01:39:26 -08:00
M. Sz dffa8ff865 moved max quests acts to d2enum 2020-12-04 10:43:33 +01:00
M. Sz ed89d91ae4 code cleanup 2020-12-04 09:20:38 +01:00
M. Sz 2c303d74f2 quest status init 2020-12-03 10:40:01 +01:00
M. Sz c7a841fe5a Merge branch 'hotfix' of https://github.com/gucio321/OpenDiablo2 into hotfix 2020-12-02 09:41:52 +01:00
gucio321 96916863ff
Quest log initial (#956)
* Adding character quest panel
2020-12-01 23:19:15 -08:00
M. Sz fa1e86acc3 added quest log items to d2resources and modified player movement speed 2020-11-29 17:08:46 +01:00
M. Sz b0af051f4c d2resource - escape menu labels 2020-11-28 19:58:22 +01:00
Tim Sarbin 73d381215e
Merge pull request #951 from gucio321/multi-language-labels
Multi language labels
2020-11-27 11:47:54 -05:00
M. Sz 640a9e043d code cleanup 2020-11-26 12:25:47 +01:00
M. Sz 1dcd63a238 fixed lint errors 2020-11-26 11:30:11 +01:00
M. Sz 76257ca351 moved some stuff 2020-11-26 11:13:35 +01:00
M. Sz 6f6516ae33 a bit updated comments 2020-11-25 20:57:52 +01:00
M. Sz 91f28516ff fixed lints 2020-11-25 19:25:19 +01:00
M. Sz 56787b13b8 Opimalisation 2020-11-25 12:37:16 +01:00
Thomas Christlieb 320583b5d4 save act and difficulty. Fixes #866 2020-11-25 11:51:20 +01:00
M. Sz d87e4a846a init of multi-language main menu 2020-11-25 10:03:50 +01:00
gucio321 33bc9fe434
locale strings for character select & hero stat panel (#948)
* character select screen's hero descriptions & hero stat panel

* cinematics names

* buttons on character select screen and "resistances" labels on hero stats panel

Co-authored-by: M. Sz <mszeptuch@protonmail.com>
2020-11-24 23:45:30 -08:00
M. Sz 0f2c5cecb1 fixed lints 2020-11-24 17:50:31 +01:00
M. Sz c704cc4c45 buttons on character select screen and "resistances" labels on hero stats panel 2020-11-24 17:44:15 +01:00
gucio321 2153f5ce64
implemented logger in d2gamescreen (#925)
* implemented logger in d2gamescreen

* logger in d2game/d2player

* logger for app.go
2020-11-18 13:02:49 -08:00
Michał Mrówka 2a36c956a4
Label fix (#931) 2020-11-17 23:50:31 -08:00
Michał Mrówka bbba67487d
Added support for charset 2020-11-16 21:39:48 +01:00
Michał Mrówka 5d5e10f229
Remove language option from config file 2020-11-16 12:47:11 +01:00
Julien Ganichot 0d691dbffa
Key binding menu (#918)
* Feat(KeyBindingMenu): Adds dynamic box system with scrollbar

* Feat(Hotkeys): WIP Adds a lot of things

* Feat(KeyBindingMenu): WIP Adds logic to binding

* Feat(KeyBindingMenu): Fixes assignment logic

* Feat(KeyBindingMenu): Adds buttons logic

* Feat(KeyBindingMenu): Fixes sprites positions+add padding to Box

* Feat(KeyBindingMenu): Adds label blinking cap

* Feat(KeyBindingMenu): Removes commented func

* Feat(KeyBindingMenu): Fixes lint errors and refactors a bit

* Feat(KeyBindingMenu): Corrects few minor things from Grave

* Feat(KeyBindingMenu): removes forgotten key to string mapping
2020-11-13 12:03:30 -08:00
M. Sz 2eda3827ce cinematics select background 2020-11-10 15:00:40 +01:00
M. Sz e20d544a8c Buttons in cinematics menu 2020-11-10 15:00:40 +01:00
M. Sz bd4cf1a334 cinematics menu init 2020-11-10 15:00:40 +01:00
Gürkan Kaymak e99fbf5c4b
showed an error message if the client cannot connect to a host (#910) 2020-11-08 14:03:51 -05:00
gravestench be9c29e9d2
Unfuck asset manager init (#906)
* moved loader bootstrap logic into d2app
2020-11-08 01:24:35 -08:00
gravestench f7fb35a4ec
removed debug printer singleton from d2util (#901)
resolves #504
2020-11-03 11:19:59 -08:00
gravestench af1f0a0eda
removed string table singleton from d2common/d2fileformats/d2tbl/ (#900) 2020-11-03 11:10:11 -08:00