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

Update stringtable.xml (Update Japanese) #1

Closed
wants to merge 25 commits into from

Conversation

Apricot-ale
Copy link

When merged this pull request will:

  • Update Japanese

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

DartRuffian and others added 17 commits November 13, 2024 22:58
…s unusable (acemod#10401)

* Use `handleHeal` to intercept healing attempts

* Update XEH_postInit.sqf

* Update addons/medical_engine/XEH_postInit.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Common - Improve file checking error messages

* refactor the damn thing

* same thing for install messages

* missing private

* better compat handling

* Update fnc_checkFiles.sqf

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
)

* Initial Commit

* Small fix to get all medications

* Update launch.toml

* Small fix and removal of medication dose variables

* Deleted old entries from stringtable

* Update addons/medical_treatment/script_component.hpp

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Fixed newline

* Changes for backwards compatibility

* Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Fixes, maybe?

* Overdose fixes

* trailling comma

* Update addons/medical_vitals/functions/fnc_handleUnitVitals.sqf

* aa

* there we go

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update XEH_PREP.hpp

* Update addons/medical_status/functions/fnc_getAllMedicationCount.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Grim Misc Fixes

* Remove debug

* Small fixes

* newline

* headers

* code cleanup

* more headers

* drop unneeded _dose

* last header

* fix getting overdose func/code

* whitespace

* now the last header

* Update addons/medical_treatment/functions/fnc_overDose.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* fix compiling nil

* Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Fixes

* Update addons/medical_treatment/functions/fnc_overDose.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update fnc_overDose.sqf

* Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_treatment/functions/fnc_overDose.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_status/functions/fnc_addMedicationAdjustment.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_status/functions/fnc_getMedicationCount.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Fixes

* Moving med settings to different PR

* oopps

* Stringtable

* Misc fixes & cleanup

* Update fnc_onMedicationUsage.sqf

* Fix nonsensical code

* add API event and doc

* Misc fixes

* Update ACE_Medical_Treatment.hpp

* Update watchVariable.sqf

* Update addons/medical_treatment/ACE_Medical_Treatment.hpp

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update ACE_Medical_Treatment.hpp

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* update_optic_dms_weathered_kir_f

* update_optic_dms_weathered_kir_f
…neer (acemod#10500)

* Allow checking specific medic/engineer levels

* Fix isEngineer value of true being considered 2

* Update function header
* Cook-off improvements

* More changes

* Update fnc_getVehicleAmmo.sqf

* Better engine fire placement

* Update fnc_detonateAmmunition.sqf

* Update XEH_postInit.sqf

* Update fnc_getVehicleAmmo.sqf

* Update events-framework.md

* Various improvements

* Separate effect handling

* Tweaks

* Update XEH_postInit.sqf

* Prevent double ammo detonation

* Fixed objects not being able to cook-off again

* Gradual ammo cook-off

* Added incendiary rounds as source of box cookoff

* Converted enable setting to bool

* Fixed brackets

* Update fnc_cookOff.sqf

* Update CfgEden.hpp

* Removed GVAR(enable), added GVAR(enableFire) back

* Merge conflict caused issues

* Magazine removal

* Minor improvements

* Update fnc_detonateAmmunitionServerLoop.sqf

* Fix using random ammo count instead of selected magazine
* Jp

* wrong backslash

* better localization

* cargo size
* Update fnc_applyGlassesEffect.sqf

* Update initSettings.inc.sqf

* Update stringtable.xml

* Update fnc_applyGlassesEffect.sqf

* Update stringtable.xml

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* update_b_127x54_ball

* update_b_127x54_ball

* update_b_127x54_ball

* update_b_127x54_ball

* update_b_127x54_ball

* Update fnc_initGunList.sqf
* Add "pass grenade" interaction

* Fix docs

* Correct spelling

* Change to one node and pass only currently selected grenade

* Handle currentThrowable returns empty array

* Add documentation

* Update addons/interaction/functions/fnc_canPassThrowable.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Handle throwables with ammo count greater 1

* Update single quotes to double quotes

* Switch target and player parameters & remove default values

* Update stringtable.xml

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Common - Allow custom event name for status effects

* Apply suggestions from code review

Co-authored-by: Dart <59131299+DartRuffian@users.noreply.github.com>

---------

Co-authored-by: Dart <59131299+DartRuffian@users.noreply.github.com>
* Remove animals from cookoff EH

* Apply suggestions from code review

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
DartRuffian and others added 8 commits November 21, 2024 00:46
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Add API for healing a unit

* Use patient as medic if not passed

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update function header

* Add parameter to log message

* Update function header

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update function header

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Remove explicit nil return

* Update addons/medical/functions/fnc_fullHeal.sqf

* Don't log message by default, change param name

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Jp

* wrong backslash

* better localization

* cargo size

* Goggle it

* better sentence

* Pass Grenade update
Fix adv. throwing for multiple round grenades
* Fix adv. throwing for multiple round grenades

* Cleanup adv. throwing

* Minor optimisation and cleanup
@Apricot-ale
Copy link
Author

broken

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants