mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-29 00:55:43 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fdb0741a78 | ||
|
|
1fa9bd1dd2 | ||
|
|
be1a17bb15 | ||
|
|
eeb8c82579 | ||
|
|
44606ece25 | ||
|
|
736ad50355 | ||
|
|
b858214821 |
@@ -17,6 +17,27 @@ src/main/csharp/**/Modern[[:space:]]UI[[:space:]]Pack/**/*.ttf !filter !diff !me
|
||||
*.tga filter=lfs diff=lfs merge=lfs -text
|
||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
||||
*.FBX filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
# Third-party asset packs: track Unity YAML files via LFS (never manually edited)
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.prefab filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.mat filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.asset filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.controller filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.anim filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.unity filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.shader filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.cginc filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.unitypackage filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/Polytope[[:space:]]Studio/**/*.terrainlayer filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/RRFreelance-Characters/**/*.prefab filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/RRFreelance-Characters/**/*.mat filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/RRFreelance-Characters/**/*.asset filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/RRFreelance-Characters/**/*.controller filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/RRFreelance-Characters/**/*.anim filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/DungeonMonsters2D/**/*.asset filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/DungeonMonsters2D/**/*.unity filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/DungeonMonsters2D/**/*.controller filter=lfs diff=lfs merge=lfs -text
|
||||
src/main/csharp/**/DungeonMonsters2D/**/*.anim filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Unity Smart Merge - use UnityYAMLMerge for Unity files
|
||||
# Requires configuring unityyamlmerge in ~/.gitconfig:
|
||||
|
||||
+14
-17
@@ -97,7 +97,11 @@ Human-type beasts (pirates, bandits, etc.) are matched via a `HumanBeastNames` H
|
||||
| demon | MonsterEffect | DungeonMonsters2D | Demon, Succubus |
|
||||
| orc | MonsterEffect | DungeonMonsters2D | Imp |
|
||||
| vampire | MonsterEffect | DungeonMonsters2D | Vampire |
|
||||
| human types (34 names) | MonsterEffect | DungeonMonsters2D | Butcher |
|
||||
| knight types (6 names) | AnimalEffect | Polytope Studio | PT_Male_Knight_01/02, PT_Female_Knight_01/02 (w/ HumanMapAnims controller) |
|
||||
| soldier types (8 names) | AnimalEffect | Polytope Studio | PT_Male_Soldier_01/02, PT_Female_Soldier_01/02 (w/ HumanMapAnims controller) |
|
||||
| archer types (3 names) | AnimalEffect | Polytope Studio | PT_Male_Archer_01/02, PT_Female_Archer_01/02 (w/ HumanMapAnims controller) |
|
||||
| militia types (8 names) | AnimalEffect | Polytope Studio | PT_Male_Militia_01/02, PT_Female_Militia_01/02 (w/ HumanMapAnims controller) |
|
||||
| peasant types (9 names) | AnimalEffect | Polytope Studio | PT_Male_Peasant_01, PT_Female_Peasant_01_a (w/ HumanMapAnims controller) |
|
||||
| clown | AnimalEffect | Clown Pack | Clown, Fat Clown (w/ per-prefab controller overrides) |
|
||||
| ogre, troll | AnimalEffect | Orc-Ogre Pack | OrcOgre_Animated (w/ OgreMapAnims controller) |
|
||||
| bear | AnimalEffect | Animal Pack Deluxe | Brown_bear |
|
||||
@@ -118,24 +122,17 @@ Human-type beasts (pirates, bandits, etc.) are matched via a `HumanBeastNames` H
|
||||
|
||||
### Human-type beasts
|
||||
|
||||
All 34 human-type beast names currently use the Butcher prefab (MonsterEffect). Grouped by likelihood:
|
||||
All 34 human-type beast names use 3D Polytope Studio characters grouped into 5 archetypes. Each archetype uses a shared `HumanMapAnims.controller` that retargets Clown animation clips (idle, walk, attack, damage) via Unity's Humanoid system.
|
||||
|
||||
| Likelihood | Beast Names |
|
||||
|---|---|
|
||||
| 0.20 | bandit, brigand |
|
||||
| 0.10 | agitator, crook, desperado, highwayman, hooligan, instigator, marauder, ne'er-do-well, nihilist, particularist, proud boy, rabble-rouser, robber, ruffian, scalawag, separatist, street tough, thief, traitor |
|
||||
| 0.05 | asshole, buccaneer, cultist, dacoit, freebooter, heretic, mobster, pirate |
|
||||
| 0.04 | cannibal, cossack, rebel, terrorist |
|
||||
| 0.01 | miscreant |
|
||||
| Archetype | Polytope Type | Beast Names (count) |
|
||||
|---|---|---|
|
||||
| **Knight** (heavy armor) | Knight M/F x2 | cultist, heretic, cannibal, terrorist, cossack, desperado (6) |
|
||||
| **Soldier** (medium armor) | Soldier M/F x2 | bandit, brigand, robber, highwayman, marauder, dacoit, freebooter, mobster (8) |
|
||||
| **Archer** (light armor, ranged) | Archer M/F x2 | thief, pirate, buccaneer (3) |
|
||||
| **Militia** (light armed) | Militia M/F x2 | hooligan, street tough, ruffian, scalawag, ne'er-do-well, crook, miscreant, asshole (8) |
|
||||
| **Peasant** (unarmed) | Peasant M/F | agitator, instigator, rabble-rouser, separatist, particularist, nihilist, proud boy, rebel, traitor (9) |
|
||||
|
||||
Thematic clusters for potential visual differentiation:
|
||||
|
||||
- **Armed outlaws** (bandit, brigand, robber, highwayman, thief, marauder, desperado, dacoit, freebooter) — armed with weapons, ambush travelers
|
||||
- **Political agitators** (agitator, instigator, rabble-rouser, separatist, particularist, nihilist, proud boy, rebel, traitor) — rabble-rousers and dissidents
|
||||
- **Thugs/ruffians** (hooligan, street tough, ruffian, scalawag, ne'er-do-well, crook, miscreant, asshole) — petty criminals and troublemakers
|
||||
- **Pirates/seafarers** (pirate, buccaneer) — nautical outlaws
|
||||
- **Dark/cultist types** (cultist, heretic, cannibal, terrorist) — sinister or fanatical
|
||||
- **Organized crime** (mobster, cossack) — organized groups
|
||||
Asset packs: Polytope Studio - Lowpoly Medieval Characters (Soldiers, Knights, Militia, Archers, Peasants)
|
||||
|
||||
### No custom animation (falls back to generic vultures)
|
||||
|
||||
|
||||
+3
-4081
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-4229
File diff suppressed because it is too large
Load Diff
+3
-2868
File diff suppressed because it is too large
Load Diff
+3
-1177
File diff suppressed because it is too large
Load Diff
+3
-2983
File diff suppressed because it is too large
Load Diff
+3
-5287
File diff suppressed because it is too large
Load Diff
+3
-4200
File diff suppressed because it is too large
Load Diff
+3
-3141
File diff suppressed because it is too large
Load Diff
+3
-3247
File diff suppressed because it is too large
Load Diff
+3
-3744
File diff suppressed because it is too large
Load Diff
+3
-4043
File diff suppressed because it is too large
Load Diff
+3
-2420
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-2934
File diff suppressed because it is too large
Load Diff
+3
-3427
File diff suppressed because it is too large
Load Diff
+3
-3203
File diff suppressed because it is too large
Load Diff
+3
-4232
File diff suppressed because it is too large
Load Diff
+3
-4538
File diff suppressed because it is too large
Load Diff
+3
-3432
File diff suppressed because it is too large
Load Diff
+3
-5903
File diff suppressed because it is too large
Load Diff
+3
-12825
File diff suppressed because it is too large
Load Diff
+3
-6642
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-2935
File diff suppressed because it is too large
Load Diff
+3
-10369
File diff suppressed because it is too large
Load Diff
+3
-9373
File diff suppressed because it is too large
Load Diff
+3
-9404
File diff suppressed because it is too large
Load Diff
+3
-7171
File diff suppressed because it is too large
Load Diff
+3
-4935
File diff suppressed because it is too large
Load Diff
+3
-3692
File diff suppressed because it is too large
Load Diff
+3
-5521
File diff suppressed because it is too large
Load Diff
+3
-4103
File diff suppressed because it is too large
Load Diff
+3
-2234
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-3227
File diff suppressed because it is too large
Load Diff
+3
-3293
File diff suppressed because it is too large
Load Diff
+3
-4424
File diff suppressed because it is too large
Load Diff
+3
-3550
File diff suppressed because it is too large
Load Diff
+3
-4612
File diff suppressed because it is too large
Load Diff
+3
-3689
File diff suppressed because it is too large
Load Diff
+3
-5695
File diff suppressed because it is too large
Load Diff
+3
-3231
File diff suppressed because it is too large
Load Diff
+3
-1624
File diff suppressed because it is too large
Load Diff
+3
-5155
File diff suppressed because it is too large
Load Diff
+3
-6425
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-4034
File diff suppressed because it is too large
Load Diff
+3
-4474
File diff suppressed because it is too large
Load Diff
+3
-4971
File diff suppressed because it is too large
Load Diff
+3
-2714
File diff suppressed because it is too large
Load Diff
+3
-3261
File diff suppressed because it is too large
Load Diff
+3
-2581
File diff suppressed because it is too large
Load Diff
+3
-1616
File diff suppressed because it is too large
Load Diff
+3
-6656
File diff suppressed because it is too large
Load Diff
+3
-6515
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-3938
File diff suppressed because it is too large
Load Diff
+3
-4452
File diff suppressed because it is too large
Load Diff
+3
-2763
File diff suppressed because it is too large
Load Diff
+3
-7610
File diff suppressed because it is too large
Load Diff
+3
-5531
File diff suppressed because it is too large
Load Diff
+3
-4258
File diff suppressed because it is too large
Load Diff
+3
-4090
File diff suppressed because it is too large
Load Diff
+3
-5039
File diff suppressed because it is too large
Load Diff
+3
-6752
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-9560
File diff suppressed because it is too large
Load Diff
+3
-3722
File diff suppressed because it is too large
Load Diff
+3
-3172
File diff suppressed because it is too large
Load Diff
+3
-3568
File diff suppressed because it is too large
Load Diff
+3
-2064
File diff suppressed because it is too large
Load Diff
+3
-1835
File diff suppressed because it is too large
Load Diff
+3
-1041
File diff suppressed because it is too large
Load Diff
+3
-2448
File diff suppressed because it is too large
Load Diff
+3
-2456
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-2204
File diff suppressed because it is too large
Load Diff
+3
-2773
File diff suppressed because it is too large
Load Diff
+3
-1898
File diff suppressed because it is too large
Load Diff
+3
-5803
File diff suppressed because it is too large
Load Diff
+3
-4009
File diff suppressed because it is too large
Load Diff
+3
-4892
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
+3
-5657
File diff suppressed because it is too large
Load Diff
+3
-10003
File diff suppressed because it is too large
Load Diff
+3
-9579
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
BIN
Binary file not shown.
+3
-4967
File diff suppressed because it is too large
Load Diff
+3
-7286
File diff suppressed because it is too large
Load Diff
+3
-6038
File diff suppressed because it is too large
Load Diff
+3
-5394
File diff suppressed because it is too large
Load Diff
+3
-3594
File diff suppressed because it is too large
Load Diff
+3
-8694
File diff suppressed because it is too large
Load Diff
+3
-8532
File diff suppressed because it is too large
Load Diff
+3
-5906
File diff suppressed because it is too large
Load Diff
+3
-5140
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user