Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match construction UI #38765

Merged
merged 79 commits into from
Mar 15, 2020
Merged

Match construction UI #38765

merged 79 commits into from
Mar 15, 2020

Conversation

Pupsi-Mupsi
Copy link
Contributor

Summary

SUMMARY: Interface "Match construction UI."

Purpose of change

Last PR got a bit messy. New PRs will be smaller.

This is just an idea for UI consistency as suggested in #12112.

Hope you like it.

Screenshot(s)

grafik

KorGgenT and others added 30 commits February 21, 2020 22:14
This splits a string into a sequence of displayed characters.
Using new facility to split strings into displayed chunks, allow mapgen
to use arbitrary Unicode characters (including combining characters) as
keys.
Replace bookcase symbol in the house_w_nest_palette with a Unicode
symbol that looks similar to a bookcase (▤).
Adds blacklists for items, locations, monsters, scenarios, and traits.
Adds ammo effects, an effect for a later monster spell, a few placeholder items, and the RP mutations "Leader", "Medic", and "Combatant".
Adds speech files.
* Dark Skies Part 4: Overrides

Adds override files
Evac_center and scenarios
Spells, guns, attacks, upgrades, spawns, and the monster definitions themselves. Does not include Strays.
Low ranking Order soldiers aren't clever enough to figure out how to open doors closed by the player - no doubt the player does something to jimmy them locked in the event of a chase anyway.
Their gear and divine purpose slows them slightly.
Their heavy armor and arrogance slows their movements. Also gives the player more of a chance to escape their grasp in the event of being ambushed by one.
Oops, forgot a comma
KorGgenT and others added 6 commits March 11, 2020 09:54
JSONize AEP_EVIL and implement intermittent artifact effects
* Add utf8_display_split function

This splits a string into a sequence of displayed characters.

* Switch mapgen keys from ints to strings

Using new facility to split strings into displayed chunks, allow mapgen
to use arbitrary Unicode characters (including combining characters) as
keys.

* Test Unicode mapgen with bookcases in house_w

Replace bookcase symbol in the house_w_nest_palette with a Unicode
symbol that looks similar to a bookcase (▤).

* Document the Unicode mapgen support
@kevingranade kevingranade added 0.E Content Freeze Info / User Interface Game - player communication, menus, etc. labels Mar 14, 2020
* Make carried vehicle cargo available for inventory

* Update migration.json

de-duplicate lines 1002-1057

* Generic name to object (CleverRaven#38686)

* Generic name to object

* Name to object

* Armor name to object (CleverRaven#38685)

* Armor fix looks_like

* Name to object, volume to string

* Lowered beaver aggression and morale to be more accurate and believable. (CleverRaven#38688)

* made vacuum sealing more consistent

* Add demon chitin armor

* Add d-chitin armor recipes


Add armormaking book, remove autolearn from recipes


Fix recipe category


Add armorsmithing book to mapgen

* Fix playtest errors

* Add repairing ability to sewing kits

* Capitals

* Itemgroup description fix

* Linting

* Forgot gauntlet recipe + adjust crafting times

* Fix fire protection being too low

* Add dog & horse d-chitin armors

* Update data/mods/Magiclysm/items/recipe_books.json

Co-authored-by: jkraybill <[email protected]>
Co-authored-by: ZhilkinSerg <[email protected]>
Co-authored-by: tenmillimaster <>
Co-authored-by: snipercup <[email protected]>
Co-authored-by: chrimchim <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
@ZhilkinSerg ZhilkinSerg changed the base branch from master to dev March 15, 2020 11:12
@ZhilkinSerg ZhilkinSerg requested a review from I-am-Erk as a code owner March 15, 2020 11:15
@ZhilkinSerg ZhilkinSerg changed the base branch from dev to master March 15, 2020 12:12
@ZhilkinSerg ZhilkinSerg changed the base branch from master to dev March 15, 2020 12:12
@ZhilkinSerg ZhilkinSerg merged commit c64fcee into CleverRaven:dev Mar 15, 2020
@ZhilkinSerg ZhilkinSerg mentioned this pull request Mar 15, 2020
13 tasks
ZhilkinSerg pushed a commit that referenced this pull request Mar 16, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 18, 2020
ZhilkinSerg pushed a commit that referenced this pull request Mar 29, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
@Pupsi-Mupsi Pupsi-Mupsi deleted the PM-CUI branch April 2, 2020 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Info / User Interface Game - player communication, menus, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.