openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Tests for conversion of legacy monsters

Browse Source 
Fixes:
- Throw Rocks always produced weakest version
- The following abilities had a strength of 0:
-- Paralysis Touch
-- Petrification Touch
-- Experience Draining Touch (including as a component of Icy and Draining Touch)
- Summon ability chances were off by a factor of 10
This commit is contained in:
Celtic Minstrel
2015-10-01 03:17:06 -04:00
parent 70c89a998b
commit f218cd94f3
3 changed files with 663 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BoE.xcodeproj/project.pbxproj
View File

@@ -138,6 +138,7 @@
919145FC18E3AB1B005CF3A4 /* boe.appleevents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 919145FB18E3A32F005CF3A4 /* boe.appleevents.mm */; };
9192C12018F2745C0088A580 /* game.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9192C11E18F271920088A580 /* game.xib */; };
91960ED41BB6157A008AF8F4 /* restypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91960ED31BB613E5008AF8F4 /* restypes.cpp */; };
919B13A21BBCDF14009905A4 /* monst_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 919B13A11BBCDE18009905A4 /* monst_legacy.cpp */; };
919CC2481B3772F300273FDA /* creatlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC620A0FA2853700EEAE67 /* creatlist.cpp */; };
919CC2491B3772FB00273FDA /* creature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 914698FE1A747C4500F20F5E /* creature.cpp */; };
919CC24B1B37730300273FDA /* item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91279D3D0F9D1D6A007B0D52 /* item.cpp */; };
@@ -659,6 +660,7 @@
9191460118E6591F005CF3A4 /* boe.menus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = boe.menus.hpp; sourceTree = "<group>"; };
9192C11E18F271920088A580 /* game.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = game.xib; path = ../rsrc/menus/game.xib; sourceTree = "<group>"; };
91960ED31BB613E5008AF8F4 /* restypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restypes.cpp; sourceTree = "<group>"; };
919B13A11BBCDE18009905A4 /* monst_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = monst_legacy.cpp; sourceTree = "<group>"; };
919DDBFA19006CC9003E7FED /* libboost_filesystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_filesystem.dylib; path = /usr/local/lib/libboost_filesystem.dylib; sourceTree = "<absolute>"; };
919DDBFB19006CC9003E7FED /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = /usr/local/lib/libboost_system.dylib; sourceTree = "<absolute>"; };
919DDC091900750D003E7FED /* freetype.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = freetype.framework; path = ../../../../../../Library/Frameworks/freetype.framework; sourceTree = "<group>"; };
@@ -1315,6 +1317,7 @@
91EF27781B693D5F00666469 /* item_write.cpp */,
91C763DA1B4EE6E00086D879 /* map_read.cpp */,
91C763DC1B4EE7950086D879 /* map_write.cpp */,
919B13A11BBCDE18009905A4 /* monst_legacy.cpp */,
91EF277A1B693D6E00666469 /* monst_read.cpp */,
91EF277C1B693D7D00666469 /* monst_write.cpp */,
91C2A6ED1B8FA9FB00346948 /* out_read.cpp */,
@@ -1848,6 +1851,7 @@
91E381461B97673700F69B81 /* town_write.cpp in Sources */,
91E381481B97677900F69B81 /* talk_write.cpp in Sources */,
91E3814A1B97679800F69B81 /* out_write.cpp in Sources */,
919B13A21BBCDF14009905A4 /* monst_legacy.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

19
src/classes/monster.cpp
View File

@@ -22,7 +22,8 @@
void cMonster::append(legacy::monster_record_type& old){
level = old.level;
//m_name = old.m_name;
m_name = std::string((char*) old.m_name, 26);
m_name.erase(m_name.begin() + m_name.find_first_of('\0'), m_name.end());
m_health = old.m_health;
armor = old.armor;
skill = old.skill;
@@ -47,8 +48,8 @@ void cMonster::append(legacy::monster_record_type& old){
case 2: addAbil(eMonstAbilTemplate::SHOOTS_ARROWS); break;
case 3: addAbil(eMonstAbilTemplate::THROWS_SPEARS); break;
case 4: addAbil(eMonstAbilTemplate::THROWS_ROCKS1); break;
case 5: addAbil(eMonstAbilTemplate::THROWS_ROCKS1); break;
case 6: addAbil(eMonstAbilTemplate::THROWS_ROCKS1); break;
case 5: addAbil(eMonstAbilTemplate::THROWS_ROCKS2); break;
case 6: addAbil(eMonstAbilTemplate::THROWS_ROCKS3); break;
case 7: addAbil(eMonstAbilTemplate::THROWS_RAZORDISKS); break;
case 8: addAbil(eMonstAbilTemplate::RAY_PETRIFY); break;
case 9: addAbil(eMonstAbilTemplate::RAY_SP_DRAIN); break;
@@ -247,11 +248,11 @@ std::map<eMonstAbil,uAbility>::iterator cMonster::addAbil(eMonstAbilTemplate wha
abil[eMonstAbil::STATUS].gen.stat = eStatus::DUMB;
return abil.find(eMonstAbil::STATUS);
case eMonstAbilTemplate::TOUCH_PARALYSIS:
abil[eMonstAbil::STATUS].gen = {true, eMonstGen::TOUCH, -1, 0, 500};
abil[eMonstAbil::STATUS].gen = {true, eMonstGen::TOUCH, -1, 500};
abil[eMonstAbil::STATUS].gen.stat = eStatus::PARALYZED;
return abil.find(eMonstAbil::STATUS);
case eMonstAbilTemplate::TOUCH_PETRIFY:
abil[eMonstAbil::PETRIFY].gen = {true, eMonstGen::TOUCH, -1, 0, 25};
abil[eMonstAbil::PETRIFY].gen = {true, eMonstGen::TOUCH, -1, 25};
return abil.find(eMonstAbil::PETRIFY);
case eMonstAbilTemplate::TOUCH_DEATH:
abil[eMonstAbil::KILL].gen = {true, eMonstGen::TOUCH, -1, 2, 0, 667};
@@ -263,7 +264,7 @@ std::map<eMonstAbil,uAbility>::iterator cMonster::addAbil(eMonstAbilTemplate wha
if(what == eMonstAbilTemplate::TOUCH_ICY)
return abil.find(eMonstAbil::DAMAGE);
case eMonstAbilTemplate::TOUCH_XP_DRAIN:
abil[eMonstAbil::DRAIN_XP].gen = {true, eMonstGen::TOUCH, -1, 0, 150};
abil[eMonstAbil::DRAIN_XP].gen = {true, eMonstGen::TOUCH, -1, 150};
return abil.find(eMonstAbil::DRAIN_XP);
case eMonstAbilTemplate::TOUCH_STUN:
abil[eMonstAbil::STUN].gen = {true, eMonstGen::TOUCH, -1, 2, 0, 667};
@@ -286,13 +287,13 @@ std::map<eMonstAbil,uAbility>::iterator cMonster::addAbil(eMonstAbilTemplate wha
abil[eMonstAbil::ABSORB_SPELLS].special = {true, 1000, 3, 0};
return abil.find(eMonstAbil::ABSORB_SPELLS);
case eMonstAbilTemplate::SUMMON_5:
abil[eMonstAbil::SUMMON].summon = {true, eMonstSummon::TYPE, static_cast<mon_num_t>(param), 1, 1, 130, 5};
abil[eMonstAbil::SUMMON].summon = {true, eMonstSummon::TYPE, static_cast<mon_num_t>(param), 1, 1, 130, 50};
return abil.find(eMonstAbil::SUMMON);
case eMonstAbilTemplate::SUMMON_20:
abil[eMonstAbil::SUMMON].summon = {true, eMonstSummon::TYPE, static_cast<mon_num_t>(param), 1, 1, 130, 20};
abil[eMonstAbil::SUMMON].summon = {true, eMonstSummon::TYPE, static_cast<mon_num_t>(param), 1, 1, 130, 200};
return abil.find(eMonstAbil::SUMMON);
case eMonstAbilTemplate::SUMMON_50:
abil[eMonstAbil::SUMMON].summon = {true, eMonstSummon::TYPE, static_cast<mon_num_t>(param), 1, 1, 130, 50};
abil[eMonstAbil::SUMMON].summon = {true, eMonstSummon::TYPE, static_cast<mon_num_t>(param), 1, 1, 130, 500};
return abil.find(eMonstAbil::SUMMON);
case eMonstAbilTemplate::SPECIAL:
abil[eMonstAbil::SPECIAL].special = {true, param, 1};