mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 19:19:56 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
2b35c5efd7
5 changed files with 16 additions and 26 deletions
|
@ -23,9 +23,9 @@ before_script:
|
|||
build:
|
||||
stage: build
|
||||
script:
|
||||
- nproc
|
||||
- cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
|
||||
- mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
|
||||
- make -j2
|
||||
- make -j$cores_to_use
|
||||
- DESTDIR=artifacts make install
|
||||
artifacts:
|
||||
paths:
|
||||
|
@ -35,8 +35,8 @@ build:
|
|||
paths:
|
||||
- "*.o"
|
||||
|
||||
# run tests using the binary built before
|
||||
test:
|
||||
stage: test
|
||||
script:
|
||||
- ls
|
||||
# TODO: run tests using the binary built before
|
||||
#test:
|
||||
# stage: test
|
||||
# script:
|
||||
# - ls
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
------
|
||||
|
||||
Bug #1990: Sunrise/sunset not set correct
|
||||
Bug #2222: Fatigue's effect on selling price is backwards
|
||||
Bug #2326: After a bound item expires the last equipped item of that type is not automatically re-equipped
|
||||
Bug #2835: Player able to slowly move when overencumbered
|
||||
Bug #3374: Touch spells not hitting kwama foragers
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
OpenMW
|
||||
======
|
||||
|
||||
[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/github/openmw/openmw?svg=true)](https://ci.appveyor.com/project/psi29a/openmw) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
|
||||
[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/github/openmw/openmw?svg=true)](https://ci.appveyor.com/project/psi29a/openmw) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740) [![pipeline status](https://gitlab.com/OpenMW/openmw/badges/master/pipeline.svg)](https://gitlab.com/OpenMW/openmw/commits/master)
|
||||
|
||||
OpenMW is a open-source game engine that supports playing Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
|
||||
OpenMW is an open-source game engine that supports playing Morrowind by Bethesda Softworks. You need to own the game for OpenMW to play Morrowind.
|
||||
|
||||
OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.
|
||||
OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
|
||||
|
||||
* Version: 0.44.0
|
||||
* License: GPLv3 (see [LICENSE](https://github.com/OpenMW/openmw/blob/master/LICENSE) for more information)
|
||||
|
|
|
@ -630,22 +630,12 @@ namespace MWMechanics
|
|||
float d = static_cast<float>(std::min(sellerStats.getSkill(ESM::Skill::Mercantile).getModified(), 100));
|
||||
float e = std::min(0.1f * sellerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
|
||||
float f = std::min(0.2f * sellerStats.getAttribute(ESM::Attribute::Personality).getModified(), 10.f);
|
||||
|
||||
float pcTerm = (clampedDisposition - 50 + a + b + c) * playerStats.getFatigueTerm();
|
||||
float npcTerm = (d + e + f) * sellerStats.getFatigueTerm();
|
||||
float buyTerm = 0.01f * (100 - 0.5f * (pcTerm - npcTerm));
|
||||
float sellTerm = 0.01f * (50 - 0.5f * (npcTerm - pcTerm));
|
||||
|
||||
float x;
|
||||
if(buying) x = buyTerm;
|
||||
else x = std::min(buyTerm, sellTerm);
|
||||
int offerPrice;
|
||||
if (x < 1)
|
||||
offerPrice = int(x * basePrice);
|
||||
else
|
||||
offerPrice = basePrice + int((x - 1) * basePrice);
|
||||
offerPrice = std::max(1, offerPrice);
|
||||
return offerPrice;
|
||||
float buyTerm = 0.01f * std::max(75.f, (100 - 0.5f * (pcTerm - npcTerm)));
|
||||
float sellTerm = 0.01f * std::min(75.f, (50 - 0.5f * (npcTerm - pcTerm)));
|
||||
int offerPrice = int(basePrice * (buying ? buyTerm : sellTerm));
|
||||
return std::max(1, offerPrice);
|
||||
}
|
||||
|
||||
int MechanicsManager::countDeaths (const std::string& id) const
|
||||
|
|
|
@ -32,7 +32,6 @@ namespace MWMechanics
|
|||
|
||||
// Is the player buying?
|
||||
bool buying = (merchantOffer < 0);
|
||||
|
||||
int a = std::abs(merchantOffer);
|
||||
int b = std::abs(playerOffer);
|
||||
int d = (buying)
|
||||
|
@ -56,7 +55,7 @@ namespace MWMechanics
|
|||
float npcTerm = (d1 + e1 + f1) * merchantStats.getFatigueTerm();
|
||||
float x = gmst.find("fBargainOfferMulti")->getFloat() * d
|
||||
+ gmst.find("fBargainOfferBase")->getFloat()
|
||||
+ std::abs(int(pcTerm - npcTerm));
|
||||
+ int(pcTerm - npcTerm);
|
||||
|
||||
int roll = Misc::Rng::rollDice(100) + 1;
|
||||
|
||||
|
|
Loading…
Reference in a new issue