docs: game objects #2
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Enable Rule of Cool explosion option by default Enable Rule of Cool explosion option by default * add new option add new option * rephrase rephrase * explosionS * Remove it Remove it --------- Co-authored-by: Александр Мочалов <aleksandr.mochalov@zyfra.com>
…2452) * JSONize results of clearing rubble via bash results * Also mods
…red (cataclysmbnteam#2516) * Update ranged.cpp Fix dumb code I made * Update src/ranged.cpp Co-authored-by: scarf <greenscarf005@gmail.com> --------- Co-authored-by: scarf <greenscarf005@gmail.com>
Turret shooting doesn't use aim_activity_actor at all.
* feat: port abandoned textile mill (DDA-57892) Co-authored-by: Incroppism <100336898+Incroppism@users.noreply.github.com> Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com> * fix: add `t_strconc_floor_roofless` --------- Co-authored-by: scarf <greenscarf005@gmail.com> Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com>
* Fix blocking code. Game would force bp_hit to one of the limbs even if it later determined it could not be used to block. * Update melee.cpp Make note of edge case I'm not sure how to fix. * Update melee.cpp * Update melee.cpp Add back blocks_left change. * Update src/melee.cpp Co-authored-by: scarf <greenscarf005@gmail.com> * Update src/melee.cpp Co-authored-by: scarf <greenscarf005@gmail.com> * Update src/melee.cpp Co-authored-by: scarf <greenscarf005@gmail.com> * Update src/melee.cpp Co-authored-by: scarf <greenscarf005@gmail.com> --------- Co-authored-by: scarf <greenscarf005@gmail.com>
* Try fix VCPG build Try fix VCPG build * Bump to latest version Bump to latest version * Revert "Bump to latest version" This reverts commit df8219b. --------- Co-authored-by: Александр Мочалов <aleksandr.mochalov@zyfra.com>
Fix linux builds
* perf: parallelize json style check Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com> * fix: ignore `data/names/` --------- Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
* fix: add more monster blacklist for fungi * Update data/mods/No_Fungi/modinfo.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> --------- Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
* Add files via upload * Gun store locker item spawn fix For the lone locker the coordinates for item spawn were off by one, both x and y, which caused ear plugs and/or muffs sometimes spawn outside on top of the downspout. * style: lint CRLF -> LF * chore: remove unrelated file --------- Co-authored-by: scarf <greenscarf005@gmail.com>
Co-authored-by: John Bytheway <52664+jbytheway@users.noreply.github.com>
* Use move semantics in profession::items() (#55127) * Use move semantics in inventory::add_item() (#55100) --------- Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
…nteam#2568) makes `handle_key_blocking_activity` also consider `main_menu` key. most notable improvement is that now you can now also use ESC to cancel waiting.
…am#2579) * Update transifex links * Update transifex cli in github actions
cataclysmbnteam#2538) Co-authored-by: olanti-p <olanti-p@yandex.ru>
* Update bunker.json * Update military.json * Update data/json/itemgroups/military.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/itemgroups/military.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…#2519) * Move get_holiday_from_time to cata_utility (cherry picked from commit 348d239ec08e1301b2f63477ec1351ed49b6e33b) * Fix symbol collision * Fix character name covering world name (cherry picked from commit 60b363d30853f94cde54e7f42a64791333b035ff) * Only use empty worlds when selecting "Play Now" (cherry picked from commit fdbe06d53a48e7a3191f7ffb23e5b49b6de7f146) * Clarify 'delete world?' message (cherry picked from commit aa08e09b1bd052a450d3f3986beae94f6a6259f1) * Reduce merge conflicts * Migrate g->add_msg_if_player -> add_msg (cherry picked from commit a2510c6d12be5e4efebec3219239ae36ae797a83) * Allow traversing main menu horizontally with TAB and SHIFT + TAB (cherry picked from commit 6847331) * Rename and make special_game_type a class enum (cherry picked from commit 09ab0494dfed16fa77292b2cf5c60b46737c6b2e) * (Partial) Global reference migration part 30 (cherry picked from commit f95326e8ad4dddc653f3e459d270f0947a61936a) * Add g->scen accessors * (Partial) Fix spelling issues (cherry picked from commit c380afc798df064ab76645a0a2f66358d425e3bc) * Enable clang-tidy check bugprone-unused-return-value * Fix bugprone-unused-return-value Biggest change here was to mapbuffer, which now stores submaps via unique_ptr rather than raw pointers, simplifying the destructor. Unfortunately, we have to retain the strange pointer-based API for mapbuffer, because the submap ownership logic in map is so convoluted. That can be fixed another day. Also, renamed mapbuffer::reset() to clear(), for consistency. In trait_group, removed a couple of calls to reset() that this warning was highlighting. They didn't do anything anyway. * Enable clang-tidy bugprone-unused-return-value (cherry picked from commit 1c4f47adc95c9a7e87aec501113a310ffab18cc5) * (Partial) Fix some cases of readability-isolate-declaration (cherry picked from commit a8f17b497e3fe255daadcd04e331a2d1dbfc21b6) * (Partial) Fox some cases of modernize-use-emplace (cherry picked from commit 8cc6378fc55bca9f7af06c623c70786de43df1ee) * (Partial) Fix some cases of cata-combine-locals-into-point (cherry picked from commit e067da4d920ab00662adc5319b8c2b4e37cb8d4a) * (Partial) Fix some cases of bugprone-branch-clone Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> (cherry picked from commit 159413daa279694aeaf7885edde67f496d61d473) * Refactor: isolate points_left (cherry picked from commit e0ad76e03960df71797752d1120e23f476fef727) * Decouple save file name from Character::name (cherry picked from commit f0c2c3b123ae44f3b2a6d5d29fc18350be0c4dfd) * (Reduce conflicts) (Partial) Remove ime.h/cpp (cherry picked from commit 722b94b7207c114cc6a34cd140e0619d01f180fd) * Fix compilation * Main menu overhaul (Part 1): Mouse controls + Vertical submenus (cherry picked from commit 369fc6fcf207ba30609eadd02ca4830950596c14) * Fix MOTD/Credits scrolling bug Co-authored-by: David Seguin <davidseguin@live.ca> (cherry picked from commit 293c808cb2c8d0891ca26e9580e17eabcab62e51) * Fix crash when pressing load button in main menu if there is no world (cherry picked from commit 5ac426dfe46f768910bf5354566393147e0a719a) * Add hotkeys for world interaction (cherry picked from commit b7142b23189354fa81a94e83920a0398f83af76b) * monologue messages return after the start of the new game Co-authored-by: EI IKao <you@example.com> (cherry picked from commit d291072370c32ea9027f4c40eaefce49dceec138) * Fix compilation * Fix JSON * Fix JSON style * Remove bits of mouse code * Fix functionality lost during merge * Redraw screen when confirming quitting * Merge 'Special' category into 'New Game' * Fix hotkeys mismatch in world menu * Mute colors a bit, use yellow hotkeys in lists * Fix lack of sound when moving in lists * Reorder entries in world menu * Revert color mute * Add quick return from lists * Make more space for hints at the bottom * Get rid of errflag, fix error when trying to load with no world * Fix uninitialized variable * Reduce code duplication * Auto-create world on "Play Now" * Fix tutorial and defence * Fix starting vehicle in character template --------- Co-authored-by: David Seguin <davidseguin@live.ca> Co-authored-by: Dylan Greer <greerd248@yahoo.com> Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> Co-authored-by: Simon Jansson <simonj12@hotmail.se> Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: John Bytheway <jbytheway@gmail.com> Co-authored-by: Andrey Bienkowski <hexagon-recursion@posteo.net> Co-authored-by: eltank <8000047+eltank@users.noreply.github.com> Co-authored-by: Ezrashaw <Ezrasure@outlook.com> Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com> Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com> Co-authored-by: EI IKaO <109350502+EIIKaO@users.noreply.github.com>
* De-obsolete rail rifles * Forgot the gun file dummy * Update turret.json * Update metal_rail.json * And implement tweaks * Update data/json/items/gun/metal_rail.json Co-authored-by: scarf <greenscarf005@gmail.com> * Update data/json/items/gun/metal_rail.json Co-authored-by: scarf <greenscarf005@gmail.com> * Update metal_rail.json --------- Co-authored-by: scarf <greenscarf005@gmail.com>
* Update last_world_pos considerations On saving the game it will be updated. Will no longer provide wrong offsets after save/load. * Make const, add comment
* New npc weapon compare Update gun_value calcs Reduce emphasis on dispersion, remove many other considerations and fold them directly into ideal_ranged_dps. New npc weapon compare Update gun_value calcs Reduce emphasis on dispersion, remove many other considerations and fold them directly into ideal_ranged_dps. Add debug message, remove extra consideration remove unused variable, update documentation * Update npcmove.cpp Don't use guns in melee * Update character.h * Update ranged.cpp * Lots of work Convert power in shots_remaining to just be an int. Convert best_mode_for_range to use Character instead of npc. Make best_mode_for_range feed the correct reference to confident_shoot_range and update confident mult to account for player character Prevent NPCs from throwing their bayonet installed guns at the enemy. Allow NPCs to consider wielding other weapons instead of mindlessly striking with their reach weapon. Allow NPCs to consider wielding their gun as a melee weapon even if they're not allowed to shoot it. * Update npcmove.cpp Remove a debug message I left in from some other PR... * Update npcmove.cpp * Fixes Enemies using their bionics won't have the player entering the aim menu gun mode is only retrieved after `wield_better_weapon()` in case mode is changed but gun is not, and considerations for using guns in melee is optimized. --------- Co-authored-by: scarf <greenscarf005@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CONTRIBUTING.mdtodoc/cataclysmbnteam/Cataclysm-BN#2527)std::movingitems (perf: portstd::movingitems cataclysmbnteam/Cataclysm-BN#2532)main_menu(ESC)key (feat: allow cancelling activity withmain_menu(ESC)key cataclysmbnteam/Cataclysm-BN#2568)Character::can_use_floor_warmth(refactor: use vector based check forCharacter::can_use_floor_warmthcataclysmbnteam/Cataclysm-BN#2538)cata::void_ttostd::void_t(perf:cata::void_ttostd::void_tcataclysmbnteam/Cataclysm-BN#2524)cata::optionaltostd::optional(perf: fromcata::optionaltostd::optionalcataclysmbnteam/Cataclysm-BN#2525)point_with_valuevery simple struct (fix: macos build failure hotfix, take 2 cataclysmbnteam/Cataclysm-BN#2595)EDIBLE_FROZENtag (feat: removeEDIBLE_FROZENflag cataclysmbnteam/Cataclysm-BN#2607)GITHUB_OUTPUT(ci: bump actions versions and useGITHUB_OUTPUTcataclysmbnteam/Cataclysm-BN#2611)Infection Immune(feat: allow installing non-sterile CBM whenInfection Immunecataclysmbnteam/Cataclysm-BN#2671)Joint ServoCBM (feat(balance): buff speed and power usage ofJoint ServoCBM cataclysmbnteam/Cataclysm-BN#2694)item_spawn->item::spawnstd::move, use->for activity.223->5.56x45mm(fix(i18n): metric bullets part 1: rename.223->5.56x45mmcataclysmbnteam/Cataclysm-BN#2691).308->7.62x51mm(fix(i18n): metric bullets part 2: rename.308->7.62x51mmcataclysmbnteam/Cataclysm-BN#2724)E_NO_POWER_DECAYflag lack engine power penalty (Engines withE_NO_POWER_DECAYflag lack engine power penalty cataclysmbnteam/Cataclysm-BN#2721)Character::weapon(EncapsulateCharacter::weaponcataclysmbnteam/Cataclysm-BN#2657)<cstdint>header (build: explicitly add<cstdint>header cataclysmbnteam/Cataclysm-BN#2777)saitosai_weapon(fix: rename id ofsaitosai_weaponcataclysmbnteam/Cataclysm-BN#2810)RECOVER_Ntodont_recover_one_in(refactor: obsoleteRECOVER_Nin favor ofdont_recover_one_incataclysmbnteam/Cataclysm-BN#2774)last_world_posconsiderations (Updatelast_world_posconsiderations cataclysmbnteam/Cataclysm-BN#2838)