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

Neworigins v6 merger with master branch #142

Merged
merged 228 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
228 commits
Select commit Hold shift + click to select a range
dec12a5
Neworigins ruleset
artyomtrityak Jul 18, 2019
00fc096
New origins storyline
artyomtrityak Jul 19, 2019
f3c527f
Commend extra
artyomtrityak Jul 19, 2019
9485249
Merge pull request #5 from artyomtrityak/neworigin-storyline
artyomtrityak Jul 19, 2019
c311ec4
Revert data
artyomtrityak Jul 19, 2019
7f9796c
Merge pull request #6 from artyomtrityak/modify-race-name-v2
artyomtrityak Jul 19, 2019
e9ed0ec
Upd
artyomtrityak Jul 19, 2019
35faf8c
Neworigins fixes
artyomtrityak Jul 19, 2019
ced26ca
Merge pull request #7 from artyomtrityak/game/rulesetupdate2
artyomtrityak Jul 19, 2019
65af2f9
Buga1
artyomtrityak Jul 19, 2019
d992a8b
Extra reset
artyomtrityak Jul 19, 2019
61f6903
Merge pull request #8 from artyomtrityak/bugshunting1
artyomtrityak Jul 19, 2019
036cffa
City rename cost and man
artyomtrityak Jul 20, 2019
58eed07
Merge pull request #9 from artyomtrityak/feature/rules-changes
artyomtrityak Jul 20, 2019
2d08fab
Add stables and modify name
artyomtrityak Jul 20, 2019
a432ee2
Add endurance to starting leader
artyomtrityak Jul 20, 2019
fc10dfd
Roads cost and item name change definition
artyomtrityak Jul 20, 2019
bdceaea
Merge pull request #10 from artyomtrityak/rules-fixes3
artyomtrityak Jul 20, 2019
9ae2414
Continents
artyomtrityak Jul 20, 2019
a45d397
Merge pull request #11 from artyomtrityak/rules-fixes3
artyomtrityak Jul 20, 2019
2934146
Camels and configs
artyomtrityak Jul 20, 2019
2f24383
changes
artyomtrityak Jul 21, 2019
1ca5c12
Merge pull request #12 from artyomtrityak/pregame-checks1
artyomtrityak Jul 21, 2019
1955d2f
Merge remote-tracking branch 'upstream/master'
artyomtrityak Jul 21, 2019
9279b4d
neworigins
artyomtrityak Jul 21, 2019
fa74929
Disable end game struct
artyomtrityak Jul 21, 2019
b263e8f
Remove ending condition
artyomtrityak Jul 21, 2019
792100f
Return black keep in abyss
artyomtrityak Jul 21, 2019
f6909d4
Merge pull request #13 from artyomtrityak/remove-end
artyomtrityak Jul 21, 2019
898f00e
Races change
artyomtrityak Jul 23, 2019
4016218
Merge pull request #16 from artyomtrityak/races-change
artyomtrityak Jul 23, 2019
8f4a00c
Food 10 - 30
artyomtrityak Jul 24, 2019
d7eba82
Merge pull request #18 from artyomtrityak/feature/change-food
artyomtrityak Jul 24, 2019
268e274
Gnome goblin walk
artyomtrityak Jul 28, 2019
6202943
Merge remote-tracking branch 'upstream/master'
artyomtrityak Jul 28, 2019
1497a8f
Merge pull request #19 from artyomtrityak/fix/change-goblin-gnome-wei…
artyomtrityak Jul 28, 2019
5027cb7
Transmutation pow
artyomtrityak Jul 24, 2019
e8a1b4e
Transmutation
artyomtrityak Jul 25, 2019
83dfea9
show
artyomtrityak Jul 25, 2019
10859f9
key to spall
artyomtrityak Jul 27, 2019
52f5406
Root
artyomtrityak Jul 27, 2019
724941f
ignore
artyomtrityak Jul 28, 2019
31dfa59
Fix output based on outout mOut
artyomtrityak Jul 30, 2019
ca56d94
x2
artyomtrityak Jul 30, 2019
b8e5d06
Trans description
artyomtrityak Jul 30, 2019
913df68
Transmutation docs
artyomtrityak Jul 30, 2019
661a017
Rules fix
artyomtrityak Jul 30, 2019
b78c69d
Merge pull request #17 from artyomtrityak/feature/change-transmutation
artyomtrityak Jul 30, 2019
5890dc7
Merge remote-tracking branch 'upstream/master'
artyomtrityak Aug 2, 2019
12b22e0
Change messaging to fit new storyline
artyomtrityak Aug 3, 2019
57f2301
Change messaging to fit new storyline
artyomtrityak Aug 3, 2019
ed81a22
Merge pull request #24 from artyomtrityak/feature/neworigin-msg
artyomtrityak Aug 3, 2019
5b37d59
GenRules steal
artyomtrityak Aug 3, 2019
c99b35a
Player steal
artyomtrityak Aug 3, 2019
4e3a947
Rules gen change
artyomtrityak Aug 3, 2019
365408f
Merge pull request #25 from artyomtrityak/imp/rules-clar-earth-lore
artyomtrityak Aug 3, 2019
6636c64
Quests
artyomtrityak Aug 3, 2019
a231f63
Quest explore
artyomtrityak Aug 3, 2019
5b2e3a0
Drop relic in addition to regular reward
artyomtrityak Aug 3, 2019
a3c0c7e
Quest desc
artyomtrityak Aug 3, 2019
a89a186
Quests cleanup
artyomtrityak Aug 4, 2019
90e6e4f
Relics for avatar
artyomtrityak Aug 4, 2019
57da409
Quests reward and description
artyomtrityak Aug 4, 2019
3369834
admt change
artyomtrityak Aug 6, 2019
b298fe3
Cleanup rewards
artyomtrityak Aug 7, 2019
32bfdd5
Quest spawn rate match minimum
artyomtrityak Aug 7, 2019
71ddfe9
Modify rate reloc drop
artyomtrityak Aug 7, 2019
05c9ace
Quest rewards
artyomtrityak Aug 8, 2019
032188e
15 to 20 drop
artyomtrityak Aug 8, 2019
6e37474
Merge pull request #26 from artyomtrityak/feature/quests2
artyomtrityak Aug 8, 2019
b289e19
Ruleset version update
artyomtrityak Aug 8, 2019
c10b3fc
End of sentence
artyomtrityak Aug 9, 2019
1107cd3
Ver
artyomtrityak Aug 9, 2019
94becf2
Merge pull request #29 from artyomtrityak/bug/end-of-sentence
artyomtrityak Aug 9, 2019
ee91886
Update ccpp.yml
artyomtrityak Aug 14, 2019
7960e42
Update ccpp.yml
artyomtrityak Aug 14, 2019
c192d06
Update ccpp.yml
artyomtrityak Aug 14, 2019
f94ae83
Update ccpp.yml
artyomtrityak Aug 14, 2019
00dfff3
Update ccpp.yml
artyomtrityak Aug 14, 2019
43910e6
Update ccpp.yml
artyomtrityak Aug 14, 2019
2e1ada3
Update ccpp.yml
artyomtrityak Aug 14, 2019
5d1a57f
Update ccpp.yml
artyomtrityak Aug 14, 2019
e5b420f
Update ccpp.yml
artyomtrityak Aug 14, 2019
b29a818
Create atlantis-pr.yml
artyomtrityak Aug 14, 2019
a311489
Update atlantis-pr.yml
artyomtrityak Aug 14, 2019
aa28884
Create monthly.yml
artyomtrityak Aug 14, 2019
fdce31f
Add Quests rewards to log (#30)
artyomtrityak Aug 15, 2019
04a8fa5
Ocean and lakes fly riding bonus (#31)
artyomtrityak Aug 18, 2019
c9ba72f
Merge remote-tracking branch 'upstream/master'
artyomtrityak Aug 24, 2019
fd8a4e8
Regions Economy (#35)
artyomtrityak Sep 1, 2019
36a8679
Fix economy road routes
artyomtrityak Sep 1, 2019
0c677c9
Version down
artyomtrityak Sep 2, 2019
53609cd
Docs fixes (#38)
artyomtrityak Sep 2, 2019
1a36d8b
Regions grow (#40)
artyomtrityak Sep 5, 2019
3ee1ea3
Last orders by script
artyomtrityak Sep 16, 2019
7f58d9d
Fix prevent_sail_through workaround (#45)
sharcashmo Sep 30, 2019
c2da970
Bug/centaur catch (#51)
sgb Oct 2, 2019
a4b0afb
Prevent sailing towards null hex
artyomtrityak Oct 2, 2019
027cf83
Bug with moving too early to building with BUILD command (#43)
artyomtrityak Oct 5, 2019
6916ced
Bump version new building phase
artyomtrityak Oct 5, 2019
de27cb3
when sailing into a null region SailThroughCheck should always return…
sharcashmo Oct 26, 2019
6810e7b
Spawn monsters small map fix (#59)
artyomtrityak Oct 28, 2019
43bd110
Halloween (#60)
artyomtrityak Oct 28, 2019
74638a0
Version upd
artyomtrityak Oct 28, 2019
80b02b4
Cleanup HH and Quest boost (#63)
artyomtrityak Nov 2, 2019
b87ccf5
Devourer P1 (#68)
artyomtrityak Nov 12, 2019
9f47a72
Work order
artyomtrityak Nov 19, 2019
88ce9d9
fix cash
artyomtrityak Nov 19, 2019
b462148
Gate_Lore RANDOM LEVEL (order->gate = -2) should use same weight limi…
sharcashmo Nov 26, 2019
9ee18d1
Code assigns a value to dir when it should be comparing. (#71)
sharcashmo Nov 27, 2019
d2774e2
VFOR 1.2 (#70)
artyomtrityak Nov 28, 2019
47fbe20
void
artyomtrityak Dec 13, 2019
741a168
study to level bug (#72)
sharcashmo Dec 14, 2019
fcb9d5b
Void spreads fix
artyomtrityak Dec 17, 2019
2a0256e
Merge branch 'master' of github.com:artyomtrityak/Atlantis
artyomtrityak Dec 17, 2019
3f9a6b7
Avatar code
artyomtrityak Dec 19, 2019
d4dc9d8
Fix TAKE
artyomtrityak Dec 20, 2019
5a83a04
Leader avatar
artyomtrityak Dec 27, 2019
840d5f4
vfor dev[2
artyomtrityak Jan 10, 2020
b98e1db
Remove dropped
artyomtrityak Jan 10, 2020
a710f48
Drop unknown status players from ally list
artyomtrityak Jan 10, 2020
170490b
add ally1 - confirm
artyomtrityak Jan 10, 2020
9bb6a3f
VFOR spawn disabled
artyomtrityak Jan 16, 2020
7d99956
Devourer hits and msg
artyomtrityak Jan 28, 2020
4bcae62
Devourer hits and msg
artyomtrityak Jan 28, 2020
2baef41
Cleanup v1 from codebase, clean start (#76)
artyomtrityak Jan 30, 2020
69fcddb
NewOrigins v2 (#77)
artyomtrityak Feb 28, 2020
ce21c69
fix
artyomtrityak Feb 28, 2020
4210136
data
artyomtrityak Feb 28, 2020
14492a9
Teleport and docs
artyomtrityak Feb 29, 2020
c0d3708
Game fixes - illusory creatures and combat
artyomtrityak Mar 3, 2020
2e62c2c
magical healing
artyomtrityak Mar 3, 2020
9a3b48a
monsters and ent
artyomtrityak Mar 5, 2020
1b23a05
fixes for ent and some monsters
artyomtrityak Mar 11, 2020
854e882
Fix RGEM and Oasis
artyomtrityak Mar 13, 2020
62e1df7
Healing fix
artyomtrityak Mar 19, 2020
0268614
Description
artyomtrityak Mar 20, 2020
566af60
Table of terrain
artyomtrityak Mar 20, 2020
f3d15a9
Add 5% loses stop movement
artyomtrityak Mar 28, 2020
197526a
heal %
artyomtrityak Mar 28, 2020
7c32a45
Never spoils never spoils
artyomtrityak Apr 5, 2020
4e17ff1
Fix wrong number faction parsing
artyomtrityak Apr 16, 2020
3727a1f
HPOT
artyomtrityak Apr 24, 2020
79516a6
Fix build
artyomtrityak May 1, 2020
be2428b
Fix HPOT respore (#95)
artyomtrityak Oct 5, 2020
8018a39
WIP Neworigins v3 changes (#96)
artyomtrityak Feb 26, 2021
48197d3
Rules fixes (#115)
artyomtrityak Feb 28, 2021
b300dce
Pike FMI (#116)
artyomtrityak Feb 28, 2021
12a8959
Remove debug (#117)
artyomtrityak Mar 17, 2021
cd8fdfe
World events (#103)
valdisz Mar 21, 2021
aff6d76
Revert "World events (#103)"
atrytiak Mar 21, 2021
af218ee
Fix ROC fly speed
atrytiak Mar 21, 2021
5294436
World events (#118)
valdisz Mar 26, 2021
404a9cf
Detaild treasury report (#102)
valdisz Apr 3, 2021
afa7da0
moved faction treasury section after events section (#119)
valdisz Apr 6, 2021
d4cc107
removed extra newline from Treasure section (#120)
valdisz Apr 9, 2021
4e1257c
do not count ships in faction stats (#121)
valdisz Apr 12, 2021
5f57c1d
Fix QM
atrytiak Apr 23, 2021
8745948
Merge branch 'master' of github.com:artyomtrityak/Atlantis
atrytiak Apr 23, 2021
569a4b7
Win ritual
atrytiak May 10, 2021
e9adcee
Fix description
atrytiak May 14, 2021
a060fb4
Increase rewards
atrytiak May 25, 2021
82e08f8
Guard building something which does not have skill requrement
atrytiak Jun 18, 2021
4de82d1
do not mention unit who not made any attack in the battle log (#122)
valdisz Aug 17, 2021
96c93d8
Add Keep fix and report
atrytiak Sep 24, 2021
37fde52
Merge branch 'master' of github.com:artyomtrityak/Atlantis
atrytiak Sep 24, 2021
7c0a87c
Sacrifice
atrytiak Oct 12, 2021
7feee7d
Set relics to 0 when unit is given
atrytiak Oct 26, 2021
edc4b0d
Merge remote-tracking branch 'upstream/neworigins' into neworigins_v4
atrytiak Nov 13, 2021
091533e
NO merger
atrytiak Nov 13, 2021
dc72861
MakefileNO
atrytiak Nov 13, 2021
948be96
Merge pull request #58 from artyomtrityak/neworigins_v4
artyomtrityak Nov 13, 2021
18b51a6
merged war/trade (#79)
valdisz Nov 29, 2021
a44c2c3
Mac fixes and Github actions (#82)
valdisz Nov 29, 2021
780fa6d
Neworigins - assorted patch 1 (#62)
artyomtrityak Dec 1, 2021
ca52c06
non-instant building destruction (#80)
valdisz Dec 1, 2021
1b2e1b5
fixed kingdoms ruleset (#85)
valdisz Dec 2, 2021
d5566a7
Faster build by using target all which will build all rulesets at a t…
valdisz Dec 2, 2021
dcb86df
run test game after compilation (#84)
valdisz Dec 19, 2021
1fd6712
Half riding bonus (#86)
artyomtrityak Dec 21, 2021
849fc00
Update Magic defenses and price for CATP and STED (#87)
artyomtrityak Dec 21, 2021
887d4c4
Increase portal lore 500 -> 800 (#88)
artyomtrityak Dec 30, 2021
7867ef9
Spook (#90)
artyomtrityak Jan 2, 2022
8e60b90
Update to best swords and Baxe (#89)
Logintmg Jan 2, 2022
2f566bd
player option which will store battle log format (#91)
valdisz Jan 9, 2022
662144c
Update battle axe materials / skills and CLOA (#92)
artyomtrityak Jan 19, 2022
078be9c
New MAP generator (#95)
valdisz Jan 24, 2022
daa65e6
Gamedata changes pre game, change castable items (#94)
artyomtrityak Jan 24, 2022
48712de
Fix build for Windows (#96)
valdisz Jan 25, 2022
2b66295
New map generator (#97)
valdisz Jan 31, 2022
47fb332
Add food (#99)
artyomtrityak Feb 1, 2022
9a33309
Reduce reward q
atrytiak Feb 1, 2022
244cda9
Merge branch 'neworigins' of github.com:Atlantis-PBEM/Atlantis into n…
atrytiak Feb 1, 2022
6047e6b
Add nomarket
atrytiak Feb 2, 2022
66b349f
Add nospoils
atrytiak Feb 2, 2022
962b433
Resource and market stats after world generation (#100)
valdisz Feb 2, 2022
1928400
windows build is back (#101)
valdisz Feb 3, 2022
55677c3
PR adds SKILLOUT_PROGRESSIVE and changes food to 1/3/5 1/2/3 (#103)
artyomtrityak Feb 6, 2022
7ae8416
Update rules for quartermaster (#110)
rmstdope Feb 23, 2022
c34a3c7
Fix activity type check (#113)
artyomtrityak Feb 24, 2022
84012a9
display damage if only total dealed damage is more than 0 (#114)
valdisz Apr 21, 2022
e5cbf58
the end
atrytiak Jun 27, 2022
29f2ad3
Merge branch 'neworigins' of github.com:Atlantis-PBEM/Atlantis into n…
atrytiak Jun 27, 2022
cc3a96e
Monster move preferences (#115)
valdisz Aug 26, 2022
52faded
Map generation update (#116)
valdisz Aug 31, 2022
bdb6998
contagion works only with mages now (#118)
artyomtrityak Sep 1, 2022
d430ba0
Fix before mapgen PR later with a proper fix
atrytiak Sep 2, 2022
299c994
Update apprentice items (#119)
Logintmg Sep 5, 2022
49e9278
Better stories (#117)
valdisz Sep 12, 2022
8f76cd4
Updated description for FORGET to reflect the defined ruleset (#112)
rmstdope Sep 23, 2022
aa00dca
Fix for infinite loop into attacking ally during advance
atrytiak Oct 14, 2022
e9b99b3
Merge branch 'neworigins' of github.com:Atlantis-PBEM/Atlantis into n…
atrytiak Oct 14, 2022
85c3b4d
Fix magical study below 2 (#123)
veorg Dec 10, 2022
5d512af
Fix for PRODUCE ship (#125)
nedbrek Dec 10, 2022
522a6b8
Changes for v6 excluding volcanos, wip
atrytiak Sep 2, 2023
a2842aa
Fix evict and desert/lake
atrytiak Sep 4, 2023
00630d9
Adjust FLOA and Mushrooms
atrytiak Sep 4, 2023
99de2e3
Increase ODD based on settings mass
atrytiak Sep 4, 2023
4903157
Event Ordering and Formatting Fixes (#135)
valdisz Sep 14, 2023
2092f69
Allow @endturn on input orders (#136)
jt-traub Oct 4, 2023
b5cef9b
Update workflow runner (#137)
jt-traub Oct 5, 2023
0854b69
Clean up compiler warnings for all platforms (#138)
jt-traub Oct 6, 2023
e17a21f
Remove the arcadia directory (#140)
jt-traub Oct 10, 2023
4ae2adc
Move tests to snapshot-tests and enhance them (#141)
jt-traub Oct 10, 2023
8d91917
Remove last references to arcadia (#143)
jt-traub Oct 10, 2023
1194a91
Include boost-ext/ut micro unit test library (#139)
jt-traub Oct 10, 2023
7c1269a
Generate some more complex snapshots using neworigins (#144)
jt-traub Oct 11, 2023
87ac3d3
Fix Landmark ordering for events (#145)
jt-traub Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Event Ordering and Formatting Fixes (#135)
* fixed event order, now more significant events will be on top

* cossmetic update of the text art

* added missing space after number of looses

* even more missing spaces added back
  • Loading branch information
valdisz authored Sep 14, 2023
commit 4903157d957b9f0d66de3d53b3ede311c8729619
6 changes: 3 additions & 3 deletions events-battle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ const Event pvpBattle(BattleFact* fact) {
<< " between " << oneOf(TWO_SIDES) // between hostile forces
<< " happened in the " << fact->location.GetTerrainName(true) // happened in the plains
<< " of " << fact->location.province // of Cefelat
<< " where " << lost << plural(lost, "combatant", "combatants") // where 75 combatants
<< " where " << lost << " " << plural(lost, "combatant", "combatants") // where 75 combatants
<< " " << plural(lost, "was", "were") << " killed." // were killed
;

Expand Down Expand Up @@ -446,7 +446,7 @@ const Event pvpBattle(BattleFact* fact) {
buffer
<< " happened in the " << fact->location.GetTerrainName(true) // happened in the plains
<< " of " << fact->location.province // of Cefelat
<< " where " << lost << plural(lost, "combatant", "combatants") // where 75 combatants
<< " where " << lost << " " << plural(lost, "combatant", "combatants") // where 75 combatants
<< " " << plural(lost, "was", "were") << " killed." // were killed
;

Expand Down Expand Up @@ -496,7 +496,7 @@ const Event pvpBattle(BattleFact* fact) {
<< " and " << fact->defender.factionName
<< " happened in the " << fact->location.GetTerrainName(true) // happened in the plains
<< " of " << fact->location.province // of Cefelat
<< " where " << lost << plural(lost, "combatant", "combatants") // where 75 combatants
<< " where " << lost << " " << plural(lost, "combatant", "combatants") // where 75 combatants
<< " " << plural(lost, "was", "were") << " killed." // were killed
;

Expand Down
9 changes: 5 additions & 4 deletions events.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ void Events::AddFact(FactBase *fact) {
}

bool compareEvents(const Event &first, const Event &second) {
return first.score < second.score;
// return true if first should go before second
return first.score > second.score;
}

std::list<string> wrapText(std::string input, std::size_t width) {
Expand Down Expand Up @@ -383,10 +384,10 @@ std::string Events::Write(std::string worldName, std::string month, int year) {
}

text += "(__ _ _ _ _ _ _ _ _ __)\n";
text += " `-._.-' (___ _) `-._.-' `-._.-' ) ( `-._.-' `-._.-' (__ _ ) `-._.-'\n";
text += " '-._.-' (___ _) '-._.-' '-._.-' ) ( '-._.-' '-._.-' (__ _ ) '-._.-'\n";
text += " ( _ __) (_ _) (_ ___)\n";
text += " (__ _) `-._.-' (___ _)\n";
text += " `-._.-' `-._.-'\n";
text += " (__ _) '-._.-' (___ _)\n";
text += " '-._.-' '-._.-'\n";

return text;
}